From 824a8449937515bf2ea9eff889e8dab454aa5be0 Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周五, 29 11月 2024 15:11:26 +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 |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs b/SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs
index f7acd63..03589a6 100644
--- a/SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs
+++ b/SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs
@@ -200,7 +200,7 @@
                 W_Length = W_DBHeaderWithSeparate_BZ12 + "2.0",
                 W_Width = W_DBHeaderWithSeparate_BZ12 + "4.0",
                 W_Height = W_DBHeaderWithSeparate_BZ12 + "6.0",
-
+                W_PalletizingBucketType= W_DBHeaderWithSeparate_BZ12 + "20.0",
                 W_PalletizingStation = W_DBHeaderWithSeparate_BZ12 + "10.0",
                 W_PalletizingTaskFinish = W_DBHeaderWithSeparate_BZ12 + "0.2",
             });
@@ -280,7 +280,7 @@
                 R_ReadCodeResult = W_DBHeaderWithSeparate_BZ12 + "52.0",
                 R_PalletizingStation1 = W_DBHeaderWithSeparate_BZ12 + "104.0",
                 R_PalletizingStation2 = W_DBHeaderWithSeparate_BZ12 + "106.0",
-
+                R_PalletizingAck = W_DBHeaderWithSeparate_BZ12 + "50.2",
                 //R_Inbound_TaskID = W_DBHeaderWithSeparate_BZ12 + "112.0",
                 //R_Outbound_TaskID = W_DBHeaderWithSeparate_BZ12 + "114.0",
 
@@ -288,6 +288,7 @@
             _dbBlockForRead.R_StationForReadCommList.Add(new StationDBForReadComm()
             {
                 StationCode = StationLocationEnum.BZ21.ToString(),
+                R_PalletizingAck = W_DBHeaderWithSeparate_BZ21 + "50.2",
 
                 R_ReqParseData = W_DBHeaderWithSeparate_BZ21 + "50.0",
                 R_SurrouondTaskFinish = W_DBHeaderWithSeparate_BZ21 + "50.1",

--
Gitblit v1.9.3