From e888bfb15f44a57f4fd61182c00bad066f093ee9 Mon Sep 17 00:00:00 2001
From: lss <2538410689@qq.com>
Date: 星期四, 03 七月 2025 22:56:51 +0800
Subject: [PATCH] 111
---
HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/TaskProcess.cs | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 52 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 c1c92d2..eae1cba 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/TaskProcess.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/TaskProcess.cs
@@ -47,7 +47,7 @@
else
{
LogHelper.Info($"浠诲姟{mst.S_CODE} 鎵樼洏涓虹┖ ,鍙В閿佽揣浣�);
- LocationHelper.UnlockLoc(mst.S_START_LOC);
+ LocationHelper.UnlockLocDeleteCntrs(mst.S_START_LOC);
}
}
else
@@ -458,7 +458,7 @@
if (taskLimit != null)
{
Console.WriteLine($"浠诲姟锛歿mst.S_CODE},璧风偣浠撳簱锛歿mst.S_START_WH}宸茬粡绂佺敤鎺ㄩ�");
- return result;
+ return false;
}
var mstbyEqno = db.Queryable<WCSTask>().Where(a => a.S_EQ_NO == mst.S_EQ_NO).ToList();
@@ -487,7 +487,7 @@
{
var mst2 = mstbyEqno.Where(a => a.S_TYPE == "鐢垫1").First();
if (mst2 == null)
- {
+ {
return result;
}
else
@@ -558,14 +558,22 @@
internal static bool SendTask(WCSTask mst)
{
-
+ var db = new SqlHelper<object>().GetInstance();
var result = false;
var start = "0"; var end = "0";
var taskType = mst.S_TYPE.Trim();
+ var list = db.Queryable<Location>().ToList().Count;
+
// 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))
+ {
+ 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)
@@ -823,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 == "绮夋枡")
{
@@ -838,6 +863,8 @@
statusArrive.Status = status.ToString();
statusArrive.Rfid = mst.S_CNTR_CODE;
statusArrive.Flag = flag;
+ statusArrive.Info = info;
+ statusArrive.Message = message;
//statusArrives.Add(statusArrive);
statusarrive.data = statusArrive;
@@ -908,8 +935,24 @@
if (cntritem != null)
{
+ string curBagNum = null;
+ string weightBag = null;
+ string initBagNum = null;
+ if (cntritem.F_QTY > 0)
+ {
+ curBagNum = cntritem.F_QTY.ToString();
+ }
+ if (!string.IsNullOrEmpty(cntritem.F_WEIGHT1) && int.Parse(cntritem.F_WEIGHT1) > 0)
+ {
+ weightBag = cntritem.F_WEIGHT1;
+ }
+ if (!string.IsNullOrEmpty(cntritem.F_QTY1) && int.Parse(cntritem.F_QTY1) > 0)
+ {
+ initBagNum = cntritem.F_QTY1;
+ }
list.Add(new MesItemBackInfoModel()
{
+
LotNumber = cntritem.S_BATCH_NO,
PartNumber = cntritem.S_ITEM_CODE,
Subpool = cntritem.Subpool,
@@ -920,7 +963,10 @@
Rfid = cntritem.S_CNTR_CODE,
Qty = cntritem.F_WEIGHT,
PartLevel = cntritem.LEV,
- WmsLot = cntritem.WmsLot
+ WmsLot = cntritem.WmsLot,
+ WeightBag = weightBag,
+ CurBagNum = curBagNum,
+ InitBagNum = initBagNum
});
--
Gitblit v1.9.1