From 9cba325e0d7c30644606e63e5df01faba0c42038 Mon Sep 17 00:00:00 2001
From: lss <2538410689@qq.com>
Date: 星期三, 06 八月 2025 17:18:41 +0800
Subject: [PATCH] 优化
---
HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/TaskProcess.cs | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/TaskProcess.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/TaskProcess.cs
index af77120..18d3283 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/TaskProcess.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/TaskProcess.cs
@@ -246,7 +246,7 @@
}
});
}
-
+
}
else
{
@@ -357,6 +357,7 @@
catch (Exception ex)
{
LogHelper.Info($"OperateReq Error ==銆媨ex.ToString()}");
+ throw ;
}
@@ -476,6 +477,17 @@
Console.WriteLine($"浠诲姟锛歿mst.S_CODE},璧风偣浠撳簱锛歿mst.S_START_WH}宸茬粡绂佺敤鎺ㄩ�");
return false;
}
+ var sendTask = db.Queryable<SendTask>().Where(a => a.AREA_CODE == mst.S_END_AREA && a.able == "1").First();
+ if (sendTask != null)
+ {
+ int taskNumber = WCSHelper.GetTaskByEndArea(sendTask.AREA_CODE, sendTask.loctioncode);
+ LogHelper.Info($"浠诲姟锛歿mst.S_CODE},缁堢偣浠撳簱锛歿sendTask.AREA_CODE}锛岃揣浣嶇被鍨�{sendTask.loctioncode},瀛樺湪浠诲姟鏁伴噺:{taskNumber}锛岄檺鍒朵换鍔℃暟閲忥細{sendTask.max}");
+ if (taskNumber >= sendTask.max)
+ {
+ Console.WriteLine($"浠诲姟锛歿mst.S_CODE},浠ヨ揪鍒伴檺鍒舵帹閫佹暟閲忥紝宸茬粡绂佺敤鎺ㄩ�");
+ return false;
+ }
+ }
var mstbyEqno = db.Queryable<WCSTask>().Where(a => a.S_EQ_NO == mst.S_EQ_NO).ToList();
if (mstbyEqno.Count() == 1)
@@ -577,7 +589,7 @@
var db = new SqlHelper<object>().GetInstance();
var result = false;
var start = "0"; var end = "0";
- var taskType = mst.S_TYPE.Trim();
+ // var taskType = mst.S_TYPE.Trim();
var list = db.Queryable<Location>().ToList().Count;
// if (mst.N_B_STATE == 0) {
@@ -881,17 +893,22 @@
info = "agv宸插畬鎴愰�鏂欎换鍔�;
break;
}
- string message = "1";
+ string message = null;
if (status == 7) { message = "agv浠诲姟宸插彇娑�; }
int flag = 0;
if (mst.S_NOTE == "绮夋枡")
{
flag = 1;
}
+ string number = mst.S_EQ_NO;
+ if (!string.IsNullOrEmpty(mst.S_MES_NO))
+ {
+ number = mst.S_MES_NO;
+ }
//List<StatusArrive> statusArrives = new List<StatusArrive>();
StatusArrive statusArrive = new StatusArrive();
statusarrive.UseToken = "iFQ5fExGrLYLXliHYWzs";
- statusArrive.TaskNumber = mst.S_EQ_NO;
+ statusArrive.TaskNumber = number;
if (status == 1 || status == 3 || status == 4)
{
statusArrive.LocationNum = mst.S_START_LOC;
@@ -966,7 +983,7 @@
//鐗╂枡鍒颁綅鎺ュ彛鍜岀姸鎬佸弽棣堝悓鏃惰皟IIOT锛屼负浜嗗尯鍒唅d锛岀墿鏂欏埌浣嶉暱搴﹀姞涓�尯鍒� request.RequestId = "鏉弶AGV" + time + "1";
request.UseToken = "iFQ5fExGrLYLXliHYWzs";
-
+
MesItemBackModel mesItemBackModel = new MesItemBackModel();
mesItemBackModel.TaskNumber = MesNo;
@@ -975,7 +992,7 @@
mesItemBackModel.LocationNum = mst.S_END_LOC;
mesItemBackModel.Result = "1";
mesItemBackModel.ArricalTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff");
-
+
if (cntritem != null)
{
string curBagNum = null;
--
Gitblit v1.9.1