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(机器人码包工位)/1、DataProcess_BZ12.cs |   35 +++++++++++++++++++++++++----------
 1 files changed, 25 insertions(+), 10 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 1ab3b30..de3b436 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"
@@ -69,10 +69,7 @@
                             }
                             var upiCode = result.Replace("/r", ""); ;
                             short lastnum = 0;//鏄惁鏈澘
-                            //short isrotate = 0;//鏄惁鏃嬭浆
-                            //short placeX = 0;
-                            //short placeY = 0;
-                            //short placeZ = 0;
+
                             string place = "";
                             using (WmsDBModel wmsDB = new WmsDBModel())
                             {
@@ -108,12 +105,23 @@
                                 //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}鐘舵�佸凡鏄�'宸茬爜鍨�'鎴�'鐮佸灈涓�' ";
+                                    MyExtendHelper.SetValueControlRequestDicts(PlcWarningAddressGloble.Num_BZ12_3, false, SystemWarningMsg._lbl_alert_DataProcess_BZ12);
+
+                                    var isAllow = MyExtendHelper.ValidateIsAllowRequest(PlcWarningAddressGloble.Num_BZ12_3, LogType.DataProcess_BZ12);
+                                    if (isAllow == false)
+                                    {
+                                        continue;
+                                    }
+                                    else
+                                    {
+                                        //鍐欏叆鎶ヨ淇℃伅
+                                        await MyExtendHelper.WriteBoolPlcDataForWarning(PlcWarningAddressGloble.Num_BZ12_3);
+                                    }
+
                                     continue;
                                 }
+                                MyExtendHelper.SetValueControlRequestDicts(PlcWarningAddressGloble.Num_BZ12_3, true, "");
                                 upiObj.UpiStatus = (int)UpiStatusEnum.鐮佸灈涓�;
                                 upiObj.AreaCode = (int)AreaCodeEnum.鐮佸灈鍖哄煙;
                                 //鏌ュ杩欏寘鎵�鏈夌殑鏁伴噺
@@ -159,7 +167,6 @@
                                 }
                                 else
                                 {//琛ㄧず杩欐槸 鍖呯殑绗竴鍧楁澘
-                                    lastnum = 1;
                                     palletizingUPI = upiObj.PackageCode;
                                     if (obj.R_PalletizingStation1 == 1)
                                     {
@@ -188,9 +195,17 @@
                                 //濡傛灉娆″簭绛変簬褰撻挶鍖呮�绘暟閲忥紝鏄惁鏈澘缃负true
                                 if (upiObj.Shelf == upiList.Count())
                                 {
-                                    lastnum = 2;
+                                    lastnum = 2;//锛�1棣栦欢锛�2鏈欢锛�0涓轰腑闂存澘锛�
                                     palletizingUPI = null;
                                     palletizingStation = 0;
+                                }
+                                else if (upiObj.Shelf == 1)
+                                {
+                                    lastnum = 1;//锛�1棣栦欢锛�2鏈欢锛�0涓轰腑闂存澘锛�
+                                }
+                                else
+                                {
+                                    lastnum = 0;//锛�1棣栦欢锛�2鏈欢锛�0涓轰腑闂存澘锛�
                                 }
 
 
@@ -241,7 +256,7 @@
                                 wmsDB.wms_rbline_task.Add(task);
 
                                 //鏇存柊閰嶇疆
-                                sysConfig.Value = palletizingUPI + "|" + palletizingStation;
+                                sysConfig.Value = palletizingUPI + "|" + palletizingStation + "|" + upiObj.UPI + "|绗�" + upiObj.Shelf + "鍧�";
 
 
                                 WmsRecordUpiProcessHandler.SaveWmsRecordUpiProcess(wmsDB, upiObj, "BZ12绔欑偣", "鐮佸寘");

--
Gitblit v1.9.3