From ce35b6cf3c6c35e485429c2a9d061e0fe2122151 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 11 12月 2024 10:42:44 +0800
Subject: [PATCH] 22

---
 CC/iWareCC_ASRS/ThreadService/03_BZ12(机器人码包工位)/1、DataProcess_BZ12.cs |   42 ++++++++++++++++++++++++++++++++++--------
 1 files changed, 34 insertions(+), 8 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/1\343\200\201DataProcess_BZ12.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/1\343\200\201DataProcess_BZ12.cs"
index ef00399..ca6e09a 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/1\343\200\201DataProcess_BZ12.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/1\343\200\201DataProcess_BZ12.cs"
@@ -1,4 +1,5 @@
 锘縰sing Admin.NET.Application;
+using iWareCC.Common.Helper;
 using iWareCC.StationService;
 using iWareCommon.Common.Globle;
 using iWareCommon.Utils;
@@ -16,7 +17,7 @@
 {
     public class DataProcess_BZ12
     {
-        public static void Hander()
+        public static async void Hander()
         {
             var alertMsg = "";
             LogType logType = LogType.DataProcess_BZ12;
@@ -33,6 +34,11 @@
                          * 1銆佷粠鏁版嵁搴撲腑鍒ゆ柇鏄惁榻愬
                          * 2銆佹牴鎹綈濂楃粨鏋滐紝鎺ㄩ�佺粰PLC
                          */
+                        if (FormCC.stationView == null)
+                        {
+                            SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()}-鑾峰彇PLC瀵硅薄涓簄ull";
+                            continue;
+                        }
                         var obj = FormCC.stationView.R_StationForReadCommList.Where(x => x.StationCode == rgvLocation.ToString()).FirstOrDefault();
                         if (obj.R_PalletizingAck)
                         {
@@ -42,7 +48,7 @@
                                 var res = client.WriteStation_ACK((int)EDevice.Station, false, rgvLocation);
                                 if (!res.result)
                                 {
-                                    SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTask = $"{rgvLocation.ToString()}-涓嬪彂鐮佹澘浠诲姟 澶辫触,SetPalletizingTaskFinishAck 杩斿洖:{res.resMsg}";
+                                    SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()}-涓嬪彂鐮佹澘浠诲姟 澶辫触,SetPalletizingTaskFinishAck 杩斿洖:{res.resMsg}";
                                     continue;
                                 }
                                 else
@@ -80,6 +86,9 @@
                                 var upiObj = wmsDB.mes_batchOrderUPI_new.Where(x => x.UPI == upiCode).FirstOrDefault();
                                 if (upiObj == null)
                                 {
+                                    //鍐欏叆鎶ヨ淇℃伅
+                                    await MyExtendHelper.WriteBoolPlcDataForWarning(PlcWarningAddressGloble.Num_BZ12_1);
+
                                     SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()},鏍规嵁UPI:{upiCode}娌℃湁鎵惧埌瀵硅薄 ";
                                     continue;
                                 }
@@ -89,6 +98,10 @@
                                 //placeZ = (short)upiObj.MachineZCenter;
                                 if (upiObj.UpiStatus == (int)UpiStatusEnum.宸茬爜鍨� || upiObj.UpiStatus == (int)UpiStatusEnum.鐮佸灈涓�)
                                 {
+                                    //鍐欏叆鎶ヨ淇℃伅
+                                    await MyExtendHelper.WriteBoolPlcDataForWarning(PlcWarningAddressGloble.Num_BZ12_3);
+
+                                    SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()},鏍规嵁UPI:{upiCode}鐘舵�佸凡鏄�'宸茬爜鍨�'鎴�'鐮佸灈涓�' ";
                                     continue;
                                 }
                                 upiObj.UpiStatus = (int)UpiStatusEnum.鐮佸灈涓�;
@@ -104,6 +117,9 @@
                                     {
                                         if (upiObj.PackageCode != wms_rbline_runmode.PalletizingUPI)
                                         {
+                                            //鍐欏叆鎶ヨ淇℃伅
+                                            await MyExtendHelper.WriteBoolPlcDataForWarning(PlcWarningAddressGloble.Num_BZ12_4);
+
                                             SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()},UPI:{upiCode}鐮佸寘閮ㄤ欢娣锋壒 ";
                                             continue;
                                         }
@@ -128,6 +144,9 @@
                                         }
                                         else
                                         {
+                                            //鍐欏叆鎶ヨ淇℃伅
+                                            await MyExtendHelper.WriteBoolPlcDataForWarning(PlcWarningAddressGloble.Num_BZ12_6);
+
                                             SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()},UPI:{upiCode}鏃犲彲鐢ㄧ爜鍨涚洰鏍囦綅 ";
                                             continue;
                                         }
@@ -146,6 +165,9 @@
                                 var oldupi = upiList.Where(x => x.Shelf < upiObj.Shelf && (x.UpiStatus != (int)UpiStatusEnum.宸茬爜鍨� && x.UpiStatus != (int)UpiStatusEnum.鐮佸灈涓�)).FirstOrDefault();
                                 if (oldupi != null)
                                 {
+                                    //鍐欏叆鎶ヨ淇℃伅
+                                    await MyExtendHelper.WriteBoolPlcDataForWarning(PlcWarningAddressGloble.Num_BZ12_5);
+
                                     SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()},UPI:{upiCode}鐮佸寘椤哄簭閿欒 ";
                                     continue;
                                 }
@@ -157,25 +179,29 @@
                                 {
                                     Id = _id,
                                     TaskNo = plcTaskNo,
-                                    UPI = upiObj.UPI,
+                                    Upi = upiObj.UPI,
                                     Length = upiObj.Length,
                                     Width = upiObj.Width,
                                     Thk = upiObj.Thk,
-                                    IssueTime = DateTime.Now,
+                                   
                                     PlanNo = upiObj.PlanNo,
                                     OrderId = upiObj.OrderId,
                                     PackageCode = upiObj.PackageCode,
                                     RbTaskType = (int)RbTaskTypeEnum.鐮佹澘浠诲姟,
-                                    RbTaskTypeEnumName = RbTaskTypeEnum.鐮佹澘浠诲姟.ToString(),
                                     TaskStatus = (int)TaskStatusEnum.鏂板缓,
-                                    TaskStatusName = TaskStatusEnum.鏂板缓.ToString(),
                                     TaskMsg = "鐮佹澘",
                                     CreateTime = DateTime.Now,
                                     CreateUserName = "CC",
                                     UpdateTime = DateTime.Now,
                                     UpdateUserName = "CC",
                                     PlaceCode = place,
-                                    LastNum = lastnum
+                                    LastNum = lastnum,
+
+                                    Info17 = upiObj.Info17,
+                                    MachineXCenter = upiObj.MachineXCenter,
+                                    MachineYCenter = upiObj.MachineYCenter,
+                                    MachineZCenter = upiObj.MachineZCenter,
+                                    Sequence = upiObj.Sequence,
                                 };
 
                                 wmsDB.wms_rbline_task.Add(task);
@@ -192,7 +218,7 @@
                 }
                 catch (Exception ex)
                 {
-                    SystemWarningMsg._lbl_alert_DataProcess_BZ39 += " 鍑虹幇寮傚父:" + ex.Message + SysGloble.SPLIT_STR;
+                    SystemWarningMsg._lbl_alert_DataProcess_BZ12 += " 鍑虹幇寮傚父:" + ex.Message + SysGloble.SPLIT_STR;
                     Log4NetHelper.WriteErrorLog(logType, " 鍑虹幇寮傚父锛�" + ex.Message, ex);
                 }
             }

--
Gitblit v1.9.3