From 26edf1783992947f441096b155107128910aed82 Mon Sep 17 00:00:00 2001
From: lss <2538410689@qq.com>
Date: 星期二, 01 七月 2025 17:23:26 +0800
Subject: [PATCH] 变更优化
---
HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/TaskProcess.cs | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 insertions(+), 8 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 2be6a68..c611d82 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/TaskProcess.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/TaskProcess.cs
@@ -487,7 +487,7 @@
{
var mst2 = mstbyEqno.Where(a => a.S_TYPE == "鐢垫1").First();
if (mst2 == null)
- {
+ {
return result;
}
else
@@ -563,17 +563,17 @@
var start = "0"; var end = "0";
var taskType = mst.S_TYPE.Trim();
var list = db.Queryable<Location>().ToList().Count;
- //LogHelper.Info($"鏌ヨ鍏ㄩ儴璐т綅鏁版嵁{list}");
+
// if (mst.N_B_STATE == 0) {
if (mst.N_SCHEDULE_TYPE == 1)
{
LogHelper.Info($"浠诲姟鎺ㄩ�鏁版嵁锛歿JsonConvert.SerializeObject(mst)}");
- if (string.IsNullOrEmpty(mst.S_START_LOC)|| string.IsNullOrEmpty(mst.S_END_LOC))
+ if (string.IsNullOrEmpty(mst.S_START_LOC) || string.IsNullOrEmpty(mst.S_END_LOC))
{
LogHelper.Info($"浠诲姟{mst.S_CODE},璧风偣缁堢偣鏈夌┖鍙傛暟锛屼笉鎺ㄩ�浠诲姟");
}
-
-
+
+
start = LocationHelper.GetAgvSite(mst.S_START_LOC);
end = LocationHelper.GetAgvSite(mst.S_END_LOC);
//if (mst.N_START_LAYER > 1)
@@ -831,7 +831,24 @@
//鑾峰彇鏃堕棿鎴� var time = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
statusarrive.RequestId = "鏉弶AGV" + time;
-
+ string info = "";
+ switch (status)
+ {
+ case 1:
+ info = "agv宸叉帴鍙楀師鏂欏簱涓嬪彂鐨勪换鍔�;
+ break;
+ case 4:
+ info = "agv宸插彇璐у畬鎴�;
+ break;
+ case 6:
+ info = "agv宸插嵏璐у埌鎸囧畾浣嶇疆";
+ break;
+ case 2:
+ info = "agv宸插畬鎴愰�鏂欎换鍔�;
+ break;
+ }
+ string message = "1";
+ if (status == 7) { message = "agv浠诲姟宸插彇娑�; }
int flag = 0;
if (mst.S_NOTE == "绮夋枡")
{
@@ -843,9 +860,11 @@
statusArrive.TaskNumber = mst.S_EQ_NO;
statusArrive.LocationNum = mst.S_END_LOC;
statusArrive.Time = DateTime.Now.ToString();
- statusArrive.Status = status.ToString();
+ statusArrive.Status = mst.S_B_STATE;
statusArrive.Rfid = mst.S_CNTR_CODE;
statusArrive.Flag = flag;
+ statusArrive.Info = info;
+ statusArrive.Message = message;
//statusArrives.Add(statusArrive);
statusarrive.data = statusArrive;
@@ -928,7 +947,10 @@
Rfid = cntritem.S_CNTR_CODE,
Qty = cntritem.F_WEIGHT,
PartLevel = cntritem.LEV,
- WmsLot = cntritem.WmsLot
+ WmsLot = cntritem.WmsLot,
+ WeightBag = cntritem.F_WEIGHT1,
+ CurBagNum = (int)cntritem.F_QTY,
+ InitBagNum = cntritem.F_QTY1
});
--
Gitblit v1.9.1