From c0db9d535378276c5f70442f90074529c3b6de90 Mon Sep 17 00:00:00 2001
From: chengsc <11752@DESKTOP-DS49RCP>
Date: 星期二, 29 四月 2025 08:41:04 +0800
Subject: [PATCH] 修改问题
---
Admin.NET/WCS.Application/PLC/PLCService.cs | 9 ++++-----
Admin.NET/WCS.Application/OpenApi/OpenApi.cs | 2 +-
Admin.NET/WCS.Application/PLC/PLCTaskAction.cs | 2 +-
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/Admin.NET/WCS.Application/OpenApi/OpenApi.cs b/Admin.NET/WCS.Application/OpenApi/OpenApi.cs
index c394ccf..ee7aed5 100644
--- a/Admin.NET/WCS.Application/OpenApi/OpenApi.cs
+++ b/Admin.NET/WCS.Application/OpenApi/OpenApi.cs
@@ -42,7 +42,7 @@
{
throw Oops.Bah("浠诲姟:" + models.TaskNo + ";涓嶅瓨鍦�!");
}
- var data1 = FourWayCarUtil.GetCarPath("090501", "080501","0");
+ var data1 = FourWayCarUtil.GetCarPath("091501", "091601","0");
if (data1 == null) //|| data1.Count == 0
{
throw Oops.Bah("鍒嗛厤璺緞涓嶅瓨鍦�!");
diff --git a/Admin.NET/WCS.Application/PLC/PLCService.cs b/Admin.NET/WCS.Application/PLC/PLCService.cs
index f62f828..371e13a 100644
--- a/Admin.NET/WCS.Application/PLC/PLCService.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCService.cs
@@ -34,7 +34,7 @@
AGV(mod); // AGV璋冨害
break;
case PLCTypeEnum.ShuttleCar: //绌挎杞�
- //ShuttleCar(mod);
+ ShuttleCar(mod);
break;
case PLCTypeEnum.RobotPalletizer:
RobotPalletizer(mod);//鐮佸灈鏈哄櫒浜�
@@ -180,10 +180,7 @@
if (modFinshTask == null)
{
break;//娌℃湁鏌ヨ鍒版�讳换鍔�
- }
- //鑾峰彇璺緞2鐨勪换鍔� 涓嬪彂
- carTaskNext = _db.Queryable<WcsCarTasks>().Where(m => m.IsDelete == false && m.TaskNo == carTask.TaskNo && m.CarNo == modDevice.PlcIdIP && m.Status <= TaskStatusEnum.Doing).OrderBy(m=>m.CreateTime).First();
-
+ }
if (carTask != null && carTask.Status != TaskStatusEnum.Complete)
{
carTask.Status = TaskStatusEnum.Complete;
@@ -201,6 +198,8 @@
HubUtil.PublicTaskMonitor(taskMonitor.Adapt<WcsTaskMonitorOutput>());
}
+ //鑾峰彇璺緞2鐨勪换鍔� 涓嬪彂
+ carTaskNext = _db.Queryable<WcsCarTasks>().Where(m => m.IsDelete == false && m.TaskNo == carTask.TaskNo && m.CarNo == modDevice.PlcIdIP && m.Status <= TaskStatusEnum.Doing).OrderBy(m => m.CreateTime).First();
//鎬讳换鍔′笅娌℃湁鍏朵粬鏈墽琛屽皬杞︾殑浠诲姟 鍙樻洿鎬讳换鍔′俊鎭�
if (carTaskNext == null && modFinshTask != null && modFinshTask.Status != TaskStatusEnum.Complete)
{
diff --git a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
index f22caec..18c7c4b 100644
--- a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
@@ -468,7 +468,7 @@
continue;//娌℃湁绌洪棽灏忚溅
}
- if (assignCar.Level != 0)
+ if (assignCar.Level != 1)
{
//鍒ゆ柇灏忚溅浣嶇疆鏄惁涓庝换鍔＄殑璧峰鍌ㄤ綅鐩稿悓,涓嶇浉鍚岋細鑾峰彇灏忚溅鍒板彇璐у偍浣嶈矾寰�
var carLocate = assignCar.X.ToString().PadLeft(2, '0')+assignCar.Y.ToString().PadLeft(2, '0')+ assignCar.Z.ToString().PadLeft(2, '0');
--
Gitblit v1.8.0