From 5a3f34856055ffbbbe9c2519a52b8be50c6f4562 Mon Sep 17 00:00:00 2001
From: zongzhibin <zongzhibin@weben-smart.com>
Date: 周一, 25 11月 2024 13:59:28 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine
---
SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs b/SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs
index 446480d..aa95371 100644
--- a/SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs
+++ b/SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs
@@ -177,7 +177,8 @@
W_ReqOut = W_DBHeaderWithSeparate_BZ39 + "12.0",
W_Destination_Out = W_DBHeaderWithSeparate_BZ39 + "14.0",
W_Mode = W_DBHeaderWithSeparate_BZ39 + "18.0",
- W_OutboundFinishConfirm = W_DBHeaderWithSeparate_BZ39 + "0.2"
+ W_OutboundFinishConfirm = W_DBHeaderWithSeparate_BZ39 + "0.2",
+
});
@@ -190,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",
@@ -198,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;
@@ -244,6 +245,8 @@
R_Inbound_TaskID = W_DBHeaderWithSeparate_BZ39 + "112.0",
R_Outbound_TaskID = W_DBHeaderWithSeparate_BZ39 + "114.0",
+ R_ForceOutboundMode = W_DBHeaderWithSeparate_BZ39 + "50.3",
+
});
@@ -253,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