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 | 4 ++--
SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs | 6 +++---
2 files changed, 5 insertions(+), 5 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 b5f5d9b..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"
@@ -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;
@@ -99,7 +99,7 @@
}
else
- {
+ {
SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()},UPI:{upiCode}鏃犲彲鐢ㄧ爜鍨涚洰鏍囦綅 ";
continue;
}
diff --git a/SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs b/SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs
index 27dc1b7..aa95371 100644
--- a/SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs
+++ b/SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs
@@ -191,7 +191,7 @@
W_PalletizingPlaceX = W_DBHeaderWithSeparate_BZ12 + "12.0",
W_PalletizingPlaceY = W_DBHeaderWithSeparate_BZ12 + "14.0",
- W_PalletizingTaskID = W_DBHeaderWithSeparate_BZ12 + "20.0",
+ W_PalletizingTaskID = W_DBHeaderWithSeparate_BZ12 + "16.0",
W_Rotate = W_DBHeaderWithSeparate_BZ12 + "8.0",
W_Length = W_DBHeaderWithSeparate_BZ12 + "2.0",
@@ -199,7 +199,7 @@
W_Height = W_DBHeaderWithSeparate_BZ12 + "6.0",
W_PalletizingStation = W_DBHeaderWithSeparate_BZ12 + "10.0",
-
+ W_PalletizingTaskFinish = W_DBHeaderWithSeparate_BZ12 + "0.2",
});
return _dbBlockForWrite;
@@ -256,7 +256,7 @@
R_ReqParseData = W_DBHeaderWithSeparate_BZ12 + "50.0",
R_PalletizingFinish = W_DBHeaderWithSeparate_BZ12 + "50.1",
- R_PalletizingTaskNo = W_DBHeaderWithSeparate_BZ12 + "50.2",
+ R_PalletizingTaskNo = W_DBHeaderWithSeparate_BZ12 + "108.0",
R_ReadCodeResult = W_DBHeaderWithSeparate_BZ12 + "52.0",
R_PalletizingStation1 = W_DBHeaderWithSeparate_BZ12 + "104.0",
R_PalletizingStation2 = W_DBHeaderWithSeparate_BZ12 + "106.0",
--
Gitblit v1.9.3