From 71e1322fa3f5879b9d71930b783ed1a393477451 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 27 3月 2025 17:24:07 +0800
Subject: [PATCH] 下发 条件限制

---
 CC/iWareCC_ASRS/ThreadService/03_BZ12(机器人码包工位)/3、DataProcess_BZ12_FinishTask.cs |   16 ++++------------
 1 files changed, 4 insertions(+), 12 deletions(-)

diff --git "a/CC/iWareCC_ASRS/ThreadService/03_BZ12\050\346\234\272\345\231\250\344\272\272\347\240\201\345\214\205\345\267\245\344\275\215\051/3\343\200\201DataProcess_BZ12_FinishTask.cs" "b/CC/iWareCC_ASRS/ThreadService/03_BZ12\050\346\234\272\345\231\250\344\272\272\347\240\201\345\214\205\345\267\245\344\275\215\051/3\343\200\201DataProcess_BZ12_FinishTask.cs"
index 9869d9a..d781d38 100644
--- "a/CC/iWareCC_ASRS/ThreadService/03_BZ12\050\346\234\272\345\231\250\344\272\272\347\240\201\345\214\205\345\267\245\344\275\215\051/3\343\200\201DataProcess_BZ12_FinishTask.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/03_BZ12\050\346\234\272\345\231\250\344\272\272\347\240\201\345\214\205\345\267\245\344\275\215\051/3\343\200\201DataProcess_BZ12_FinishTask.cs"
@@ -22,7 +22,7 @@
             LogType logType = LogType.DataProcess_BZ12_FinishTask;
             while (true)
             {
-                Thread.Sleep(1000);//浼戠湢2绉掞紝灏嗕紤鐪犲啓鍒板墠闈紝鏄负浜嗕笅闈㈢殑continue鏂规硶鎵ц鍚庝笉鏄剧ず閿欒淇℃伅鐨勬彁绀猴紒锛侊紒銆怑ditBy shaocx,2022-05-24銆�
+                Thread.Sleep(900);//浼戠湢2绉掞紝灏嗕紤鐪犲啓鍒板墠闈紝鏄负浜嗕笅闈㈢殑continue鏂规硶鎵ц鍚庝笉鏄剧ず閿欒淇℃伅鐨勬彁绀猴紒锛侊紒銆怑ditBy shaocx,2022-05-24銆�
                 SystemWarningMsg._lbl_Alert_DataProcess_BZ12_FinishTask = string.Empty;
                 try
                 {
@@ -36,15 +36,7 @@
                         }
                         var obj = FormCC.stationView.R_StationForReadCommList.Where(x => x.StationCode == rgvLocation.ToString()).FirstOrDefault();
                         if (obj.R_PalletizingFinish)
-                        //if (true)//妯℃嫙
                         {
-                            //var result = obj.R_InboundNumber;
-                            //if (string.IsNullOrEmpty(result))
-                            //{
-                            //    SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTask = $"{rgvLocation.ToString()}- 鍏ュ簱搴撲綅鍙锋槸绌虹殑,姝ゆ寰幆缁撴潫";
-                            //    continue;
-                            //}
-                            //obj.R_Inbound_TaskID = 17797;//妯℃嫙
                             var result2 = obj.R_PalletizingTaskNo;
                             if (result2 == 0)
                             {
@@ -53,11 +45,12 @@
                             }
 
 
-                            var qitaoReault = false;
                             using (WmsDBModel wmsDB = new WmsDBModel())
                             {
                                 var task = wmsDB.wms_rbline_task.Where(x =>
                                  x.TaskNo == obj.R_PalletizingTaskNo.ToString()
+                                //澧炲姞杩欎袱涓檺鍒舵潯浠� 銆怑ditby shaocx,2025-03-27銆�
+                                && x.TaskStatus == (int)TaskStatusEnum.宸蹭笅鍙�
                                 && x.RbTaskType == (int)RbTaskTypeEnum.鐮佹澘浠诲姟
                                 ).OrderByDescending(x => x.Id).FirstOrDefault();
                                 if (task == null)
@@ -77,13 +70,12 @@
                                         continue;
                                     }
                                 }
-                                var upiobj = wmsDB.mes_batchOrderUPI_new.Where(x => x.UPI == task.UPI).FirstOrDefault();
+                                var upiobj = wmsDB.mes_batchOrderUPI_new.Where(x => x.UPI == task.Upi).FirstOrDefault();
                                 if (upiobj != null)
                                 {
                                     upiobj.UpiStatus = (int)UpiStatusEnum.宸茬爜鍨�;
                                 }
                                 task.TaskStatus = (int)TaskStatusEnum.宸插畬鎴�;
-                                task.TaskStatusName = TaskStatusEnum.宸插畬鎴�.ToString();
                                 task.FinishedTime = DateTime.Now;
 
                                 if (wmsDB.SaveChanges() > 0)

--
Gitblit v1.9.3