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 |   26 +++++++++++++++++++++-----
 1 files changed, 21 insertions(+), 5 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 c611d82..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
@@ -860,7 +860,7 @@
                 statusArrive.TaskNumber = mst.S_EQ_NO;
                 statusArrive.LocationNum = mst.S_END_LOC;
                 statusArrive.Time = DateTime.Now.ToString();
-                statusArrive.Status = mst.S_B_STATE;
+                statusArrive.Status = status.ToString();
                 statusArrive.Rfid = mst.S_CNTR_CODE;
                 statusArrive.Flag = flag;
                 statusArrive.Info = info;
@@ -935,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,
@@ -948,9 +964,9 @@
                         Qty = cntritem.F_WEIGHT,
                         PartLevel = cntritem.LEV,
                         WmsLot = cntritem.WmsLot,
-                        WeightBag = cntritem.F_WEIGHT1,
-                        CurBagNum = (int)cntritem.F_QTY,
-                        InitBagNum = cntritem.F_QTY1
+                        WeightBag = weightBag,
+                        CurBagNum = curBagNum,
+                        InitBagNum = initBagNum
                     });
 
 

--
Gitblit v1.9.1