From afc3ef31921d5ca812f7db92dfb107e2c25eff4c Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 01 4月 2025 16:41:45 +0800
Subject: [PATCH] 上一次码垛包装号和站点 LastPalletizingData   加上 第几块板和 upi

---
 CC/iWareCC_ASRS/ThreadService/03_BZ12(机器人码包工位)/3、DataProcess_BZ12_FinishTask.cs |   35 ++++++++++++++++-------------------
 1 files changed, 16 insertions(+), 19 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 62fe5b0..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"
@@ -19,42 +19,40 @@
         public static void Handler()
         {
             var alertMsg = "";
-            LogType logType = LogType.DataProcess_BZ12;
+            LogType logType = LogType.DataProcess_BZ12_FinishTask;
             while (true)
             {
-                Thread.Sleep(1000);//浼戠湢2绉掞紝灏嗕紤鐪犲啓鍒板墠闈紝鏄负浜嗕笅闈㈢殑continue鏂规硶鎵ц鍚庝笉鏄剧ず閿欒淇℃伅鐨勬彁绀猴紒锛侊紒銆怑ditBy shaocx,2022-05-24銆�
-                SystemWarningMsg._lbl_alert_DataProcess_BZ12 = string.Empty;
+                Thread.Sleep(900);//浼戠湢2绉掞紝灏嗕紤鐪犲啓鍒板墠闈紝鏄负浜嗕笅闈㈢殑continue鏂规硶鎵ц鍚庝笉鏄剧ず閿欒淇℃伅鐨勬彁绀猴紒锛侊紒銆怑ditBy shaocx,2022-05-24銆�
+                SystemWarningMsg._lbl_Alert_DataProcess_BZ12_FinishTask = string.Empty;
                 try
                 {
                     if (SystemValue.isStartedModel)
                     {
                         var rgvLocation = StationLocationEnum.BZ12.ToString();
+                        if (FormCC.stationView == null)
+                        {
+                            SystemWarningMsg._lbl_Alert_DataProcess_BZ12_FinishTask = $"{rgvLocation.ToString()}-鑾峰彇PLC瀵硅薄涓簄ull";
+                            continue;
+                        }
                         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)
                             {
-                                SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()}- 鐮佹澘浠诲姟鍙锋槸绌虹殑,姝ゆ寰幆缁撴潫";
+                                SystemWarningMsg._lbl_Alert_DataProcess_BZ12_FinishTask = $"{rgvLocation.ToString()}- 鐮佹澘浠诲姟鍙锋槸绌虹殑,姝ゆ寰幆缁撴潫";
                                 continue;
                             }
 
 
-                            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();
+                                ).OrderByDescending(x => x.Id).FirstOrDefault();
                                 if (task == null)
                                 {
                                     SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTask = $"{rgvLocation.ToString()},鏍规嵁 R_InboundNumber:{obj.R_InboundNumber}娌℃湁鎵惧埌宸蹭笅鍙戠殑浠诲姟 ";
@@ -72,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.宸茬爜鍨�;
+                                    upiobj.UpiStatus = (int)UpiStatusEnum.宸茬爜鍨�;
                                 }
                                 task.TaskStatus = (int)TaskStatusEnum.宸插畬鎴�;
-                                task.TaskStatusName = TaskStatusEnum.宸插畬鎴�.ToString();
                                 task.FinishedTime = DateTime.Now;
 
                                 if (wmsDB.SaveChanges() > 0)
@@ -94,7 +91,7 @@
                                             var res = client.SetPalletizingTaskFinishAck((int)EDevice.Station, true, rgvLocation);
                                             if (!res.result)
                                             {
-                                                SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTask = $"{rgvLocation.ToString()}-涓嬪彂鐮佹澘浠诲姟 澶辫触,SetPalletizingTaskFinishAck 杩斿洖:{res.resMsg}";
+                                                SystemWarningMsg._lbl_Alert_DataProcess_BZ12_FinishTask = $"{rgvLocation.ToString()}-涓嬪彂鐮佹澘浠诲姟 澶辫触,SetPalletizingTaskFinishAck 杩斿洖:{res.resMsg}";
                                                 continue;
                                             }
                                             else
@@ -128,7 +125,7 @@
                 }
                 catch (Exception ex)
                 {
-                    SystemWarningMsg._lbl_alert_DataProcess_BZ12 += " 鍑虹幇寮傚父:" + ex.Message + SysGloble.SPLIT_STR;
+                    SystemWarningMsg._lbl_Alert_DataProcess_BZ12_FinishTask += " 鍑虹幇寮傚父:" + ex.Message + SysGloble.SPLIT_STR;
                     Log4NetHelper.WriteErrorLog(logType, " 鍑虹幇寮傚父锛�" + ex.Message, ex);
                 }
             }

--
Gitblit v1.9.3