From 4b2e89faeb6383335db4fc4a56d3cb71565abe08 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 26 11月 2024 17:42:24 +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 | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs b/SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs
index aa95371..f7acd63 100644
--- a/SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs
+++ b/SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs
@@ -22,6 +22,7 @@
public static string W_DBHeaderWithSeparate_BZ39 = "3002" + WareSdaStruct.PLCDBADDRESS_SEPARATE;
public static string W_DBHeaderWithSeparate_BZ12 = "3003" + WareSdaStruct.PLCDBADDRESS_SEPARATE;
public static string W_DBHeaderWithSeparate_BZ01 = "3001" + WareSdaStruct.PLCDBADDRESS_SEPARATE;
+ public static string W_DBHeaderWithSeparate_BZ21 = "3004" + WareSdaStruct.PLCDBADDRESS_SEPARATE;
/// <summary>
/// 璇诲彇DB
@@ -188,10 +189,12 @@
W_DataFinish = W_DBHeaderWithSeparate_BZ12 + "0.0",
W_EndMark = W_DBHeaderWithSeparate_BZ12 + "0.1",
+ W_FirstMark= W_DBHeaderWithSeparate_BZ12 + "0.3",
W_PalletizingPlaceX = W_DBHeaderWithSeparate_BZ12 + "12.0",
W_PalletizingPlaceY = W_DBHeaderWithSeparate_BZ12 + "14.0",
+ W_PalletizingPlaceZ = W_DBHeaderWithSeparate_BZ12 + "16.0",
- W_PalletizingTaskID = W_DBHeaderWithSeparate_BZ12 + "16.0",
+ W_PalletizingTaskID = W_DBHeaderWithSeparate_BZ12 + "18.0",
W_Rotate = W_DBHeaderWithSeparate_BZ12 + "8.0",
W_Length = W_DBHeaderWithSeparate_BZ12 + "2.0",
@@ -202,6 +205,23 @@
W_PalletizingTaskFinish = W_DBHeaderWithSeparate_BZ12 + "0.2",
});
+ _dbBlockForWrite.W_StationForWriteCommList.Add(new StationDBForWriteComm()
+ {
+ StationCode = StationLocationEnum.BZ21.ToString(),
+
+ W_DataFinish = W_DBHeaderWithSeparate_BZ21 + "0.0",
+ W_SurroundTaskFinish = W_DBHeaderWithSeparate_BZ21 + "0.1",
+ W_X_Offset = W_DBHeaderWithSeparate_BZ21 + "10.0",
+ W_Y_Offset = W_DBHeaderWithSeparate_BZ21 + "12.0",
+ W_SurroundTaskNo = W_DBHeaderWithSeparate_BZ21 + "14.0",
+
+ W_CartonHeight = W_DBHeaderWithSeparate_BZ21 + "6.0",
+ W_CartonWidth = W_DBHeaderWithSeparate_BZ21 + "8.0",
+
+ W_PackageLength = W_DBHeaderWithSeparate_BZ21 + "2.0",
+ W_PackageWidth = W_DBHeaderWithSeparate_BZ21 + "4.0",
+
+ });
return _dbBlockForWrite;
}
@@ -265,7 +285,17 @@
//R_Outbound_TaskID = W_DBHeaderWithSeparate_BZ12 + "114.0",
});
+ _dbBlockForRead.R_StationForReadCommList.Add(new StationDBForReadComm()
+ {
+ StationCode = StationLocationEnum.BZ21.ToString(),
+ R_ReqParseData = W_DBHeaderWithSeparate_BZ21 + "50.0",
+ R_SurrouondTaskFinish = W_DBHeaderWithSeparate_BZ21 + "50.1",
+ R_SurrouondTaskNo = W_DBHeaderWithSeparate_BZ21 + "104.0",
+ R_ReadCodeResult = W_DBHeaderWithSeparate_BZ21 + "52.0",
+
+
+ });
return _dbBlockForRead;
--
Gitblit v1.9.3