From 59575fe77af455478e81dff65e2e5e6979fdf7f6 Mon Sep 17 00:00:00 2001
From: zongzhibin <zongzhibin@weben-smart.com>
Date: 周日, 24 11月 2024 15:53:01 +0800
Subject: [PATCH] add

---
 CC/iWareCC_ASRS/ThreadService/03_BZ12(机器人码包工位)/DataProcess_BZ12.cs |    9 +++++----
 1 files changed, 5 insertions(+), 4 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/DataProcess_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/DataProcess_BZ12.cs"
index 0d53e87..93a2133 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/DataProcess_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/DataProcess_BZ12.cs"
@@ -26,7 +26,7 @@
                 SystemWarningMsg._lbl_alert_DataProcess_BZ12 = string.Empty;
                 try
                 {
-                    if (SystemValue.isAllowRuning_DataProcess_BZ39 && SystemValue.isStartedModel)
+                    if ( SystemValue.isStartedModel)
                     {
                         var rgvLocation = StationLocationEnum.BZ12.ToString();
                         /*
@@ -42,7 +42,7 @@
                                 SystemWarningMsg._lbl_alert_DataProcess_BZ39 = $"{rgvLocation.ToString()}-璇锋眰浜嗚В鐮侊紝浣嗘槸缁撴灉鏄┖鐨�,姝ゆ寰幆缁撴潫";
                                 continue;
                             }
-                            var upiCode = result;
+                            var upiCode = result.Replace("/r", ""); ;
                             bool islast = false;//鏄惁鏈澘
                             short isrotate = 0;//鏄惁鏃嬭浆
                             short placeX = 0;
@@ -75,7 +75,7 @@
                                     //鏌ヨ鏄惁娣锋壒
                                     if (!string.IsNullOrEmpty(wms_rbline_runmode.PalletizingUPI))
                                     {
-                                        if (upiCode != wms_rbline_runmode.PalletizingUPI)
+                                        if (upiObj.PackageCode != wms_rbline_runmode.PalletizingUPI)
                                         {
                                             SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()},UPI:{upiCode}鐮佸寘閮ㄤ欢娣锋壒 ";
                                             continue;
@@ -88,6 +88,7 @@
                                     }
                                     else
                                     {
+                                        wms_rbline_runmode.PalletizingUPI = upiObj.PackageCode;
                                         if (obj.R_PalletizingStation1 == 1)
                                         {
                                             place = "1";
@@ -98,7 +99,7 @@
 
                                         }
                                         else
-                                        {
+                                            {
                                             SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()},UPI:{upiCode}鏃犲彲鐢ㄧ爜鍨涚洰鏍囦綅 ";
                                             continue;
                                         }

--
Gitblit v1.9.3