From 62c5a7fad29fa380874f6cf81bb4074ce5f488e7 Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期五, 30 五月 2025 17:32:06 +0800
Subject: [PATCH] 优先级修改
---
process/TaskProcess.cs | 38 ++++----------------------------------
1 files changed, 4 insertions(+), 34 deletions(-)
diff --git a/process/TaskProcess.cs b/process/TaskProcess.cs
index e00b8f6..b601426 100644
--- a/process/TaskProcess.cs
+++ b/process/TaskProcess.cs
@@ -1346,23 +1346,6 @@
//濡傛灉闇�涓嬪彂wcs绔嬪簱锛屽垯闇�瀵绘壘鍙敤鎺ラ┏浣� if (workFlow.SENDWCS == "Y") {
- //娴嬭瘯榛樿鍙栦竴涓帴椹充綅
- //var connectionList = LocationHelper.GetAllLocList1(workFlow.CONNECTION);
- //foreach (var item in connectionList)
- //{
- // if (item.S_LOCK_STATE == "鏃� && item.N_CURRENT_NUM < 2)
- // {
- // connection = item.S_CODE;
- // LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟涓嬪彂瀵绘壘鍒板彲鐢ㄦ帴椹充綅{connection}", "Mes浠诲姟涓嬪彂");
- // }
- //}
-
- //if (connection=="")
- //{
- // LogHelper.Info($"ZCSendTask浠诲姟涓嬪彂瀵绘壘鎺ラ┏浣嶅け璐�, "Mes浠诲姟涓嬪彂");
- // throw new Exception($"ZCSendTask浠诲姟涓嬪彂瀵绘壘鎺ラ┏浣嶅け璐�);
- //}
-
//姝ｅ紡浠ｇ爜锛岃皟鐢ㄦ帴鍙ｅ鎵惧彲鐢ㄦ帴椹充綅
var connectionList = LocationHelper.GetConnectionList(workFlow.CONNECTION);
var usableConnectionList = WcsTask.WcsPositionAvailable(model.task_no, connectionList);
@@ -1671,6 +1654,10 @@
result.errMsg = "婊℃墭鍑哄簱浣滀笟鏈夊簱瀛樹絾璁惧鎶ヨ";
result.errCode = 2001;
result.success = true;
+ mesRes.errCode = result.errCode;
+ mesRes.errMsg = result.errMsg;
+ //淇濆瓨mes璁板綍
+ CreatMesRes(mesRes);
return result;
}
}
@@ -1759,23 +1746,6 @@
if (workFlow.SENDWCS == "Y")
{
- //娴嬭瘯榛樿鍙栦竴涓帴椹充綅
- //var connectionList = LocationHelper.GetAllLocList1(workFlow.CONNECTION);
- //foreach (var item in connectionList)
- //{
- // if (item.S_LOCK_STATE == "鏃� && item.N_CURRENT_NUM < 2)
- // {
- // connection = item.S_CODE;
- // LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟涓嬪彂瀵绘壘鍒板彲鐢ㄦ帴椹充綅{connection}", "Mes浠诲姟涓嬪彂");
- // }
- //}
-
- //if (connection == "")
- //{
- // LogHelper.Info($"ZCSendTask浠诲姟涓嬪彂瀵绘壘鎺ラ┏浣嶅け璐�, "Mes浠诲姟涓嬪彂");
- // throw new Exception($"ZCSendTask浠诲姟涓嬪彂瀵绘壘鎺ラ┏浣嶅け璐�);
- //}
-
//姝ｅ紡浠ｇ爜锛岃皟鐢ㄦ帴鍙ｅ鎵惧彲鐢ㄦ帴椹充綅
var connectionList = LocationHelper.GetConnectionList(workFlow.CONNECTION);
--
Gitblit v1.9.1