From 09d0a68dcc8a48a79e472b87c4aa3c90e9770154 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周日, 08 12月 2024 10:43:35 +0800
Subject: [PATCH] 2

---
 CC/iWareCC_ASRS/ThreadService/03_BZ12(机器人码包工位)/1、DataProcess_BZ12.cs |   38 ++++++++++++++++++++++++--------------
 1 files changed, 24 insertions(+), 14 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 a1b27f0..61b35ac 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"
@@ -33,6 +33,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 +47,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
@@ -63,10 +68,10 @@
                             }
                             var upiCode = result.Replace("/r", ""); ;
                             short lastnum = 0;//鏄惁鏈澘
-                            short isrotate = 0;//鏄惁鏃嬭浆
-                            short placeX = 0;
-                            short placeY = 0;
-                            short placeZ = 0;
+                            //short isrotate = 0;//鏄惁鏃嬭浆
+                            //short placeX = 0;
+                            //short placeY = 0;
+                            //short placeZ = 0;
                             string place = "";
                             using (WmsDBModel wmsDB = new WmsDBModel())
                             {
@@ -83,12 +88,13 @@
                                     SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()},鏍规嵁UPI:{upiCode}娌℃湁鎵惧埌瀵硅薄 ";
                                     continue;
                                 }
-                                isrotate = short.Parse(upiObj.Info17);
-                                placeX = (short)upiObj.MachineXCenter;
-                                placeY = (short)upiObj.MachineYCenter;
-                                placeZ = (short)upiObj.MachineZCenter;
+                                //isrotate = short.Parse(upiObj.Info17);
+                                //placeX = (short)upiObj.MachineXCenter;
+                                //placeY = (short)upiObj.MachineYCenter;
+                                //placeZ = (short)upiObj.MachineZCenter;
                                 if (upiObj.UpiStatus == (int)UpiStatusEnum.宸茬爜鍨� || upiObj.UpiStatus == (int)UpiStatusEnum.鐮佸灈涓�)
                                 {
+                                    SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()},鏍规嵁UPI:{upiCode}鐘舵�佸凡鏄�'宸茬爜鍨�'鎴�'鐮佸灈涓�' ";
                                     continue;
                                 }
                                 upiObj.UpiStatus = (int)UpiStatusEnum.鐮佸灈涓�;
@@ -157,7 +163,7 @@
                                 {
                                     Id = _id,
                                     TaskNo = plcTaskNo,
-                                    UPI = upiObj.UPI,
+                                    Upi = upiObj.UPI,
                                     Length = upiObj.Length,
                                     Width = upiObj.Width,
                                     Thk = upiObj.Thk,
@@ -166,16 +172,20 @@
                                     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 +202,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