From 9597b1df912c1ca4401a74970d9472e268b3a9c2 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周六, 07 12月 2024 15:12:59 +0800
Subject: [PATCH] 33

---
 SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs |   48 ++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs b/SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs
index 437d385..2bcbb2b 100644
--- a/SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs
+++ b/SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs
@@ -1,6 +1,5 @@
 锘縰sing iWareCommon.Utils;
 using iWareModel;
-using iWareSda.Devices._3_Station.StationModel;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -23,6 +22,10 @@
         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;
+        public static string W_DBHeaderWithSeparate_BZ30 = "3005" + WareSdaStruct.PLCDBADDRESS_SEPARATE;
+
+        public static string W_DBHeaderWithSeparate_269 = "3006" + WareSdaStruct.PLCDBADDRESS_SEPARATE;
+        public static string W_DBHeaderWithSeparate_3007 = "3007" + WareSdaStruct.PLCDBADDRESS_SEPARATE;
 
         /// <summary>
         /// 璇诲彇DB
@@ -146,9 +149,12 @@
             //鍐欏叆鍦板潃
             _dbBlockForWrite.W_StationForWriteCommList = new List<StationDBForWriteComm>();
 
+
             _dbBlockForWrite.W_StationForWriteCommList.Add(new StationDBForWriteComm()
             {
                 StationCode = StationLocationEnum.棣栨鎵爜宸ヤ綅.ToString(),
+
+                W_DataFinish = W_DBHeaderWithSeparate_269 + "0.0",
             });
             _dbBlockForWrite.W_StationForWriteCommList.Add(new StationDBForWriteComm()
             {
@@ -162,6 +168,8 @@
             _dbBlockForWrite.W_StationForWriteCommList.Add(new StationDBForWriteComm()
             {
                 StationCode = StationLocationEnum.BZ39.ToString(),
+
+                W_AllowIn = W_DBHeaderWithSeparate_BZ39 + "0.3",
 
                 W_DataFinish = W_DBHeaderWithSeparate_BZ39 + "0.0",
                 W_InboundFinishConfirm = W_DBHeaderWithSeparate_BZ39 + "0.1",
@@ -189,7 +197,7 @@
 
                 W_DataFinish = W_DBHeaderWithSeparate_BZ12 + "0.0",
                 W_EndMark = W_DBHeaderWithSeparate_BZ12 + "0.1",
-                W_FirstMark= W_DBHeaderWithSeparate_BZ12 + "0.3",
+                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",
@@ -200,7 +208,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_PalletizingBucketType = W_DBHeaderWithSeparate_BZ12 + "20.0",
                 W_PalletizingStation = W_DBHeaderWithSeparate_BZ12 + "10.0",
                 W_PalletizingTaskFinish = W_DBHeaderWithSeparate_BZ12 + "0.2",
             });
@@ -222,6 +230,15 @@
                 W_PackageWidth = W_DBHeaderWithSeparate_BZ21 + "4.0",
 
             });
+
+            _dbBlockForWrite.W_StationForWriteCommList.Add(new StationDBForWriteComm()
+            {
+                StationCode = StationLocationEnum.BZ30.ToString(),
+
+                W_DataFinish = W_DBHeaderWithSeparate_BZ30 + "0.0",
+                W_KittingInfo = W_DBHeaderWithSeparate_BZ30 + "2.0",
+            });
+
             return _dbBlockForWrite;
         }
 
@@ -242,6 +259,22 @@
                 R_StationForReadCommList = new List<StationDBForReadComm>()
                 #endregion
             };
+
+
+            _dbBlockForRead.R_StationForReadCommList.Add(new StationDBForReadComm()
+            {
+                StationCode = StationLocationEnum.BZ3007.ToString(),
+
+                R_AllowCut = W_DBHeaderWithSeparate_3007 + "0.0",
+            });
+
+            _dbBlockForRead.R_StationForReadCommList.Add(new StationDBForReadComm()
+            {
+                StationCode = StationLocationEnum.棣栨鎵爜宸ヤ綅.ToString(),
+
+                R_ReqParseData = W_DBHeaderWithSeparate_269 + "50.0",
+                R_ReadCodeResult = W_DBHeaderWithSeparate_269 + "52.0",
+            });
 
             _dbBlockForRead.R_StationForReadCommList.Add(new StationDBForReadComm()
             {
@@ -288,16 +321,19 @@
             _dbBlockForRead.R_StationForReadCommList.Add(new StationDBForReadComm()
             {
                 StationCode = StationLocationEnum.BZ21.ToString(),
-                R_PalletizingAck = W_DBHeaderWithSeparate_BZ12 + "50.2",
+                R_PalletizingAck = W_DBHeaderWithSeparate_BZ21 + "50.2",
 
                 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",
 
-
             });
-
+            _dbBlockForRead.R_StationForReadCommList.Add(new StationDBForReadComm()
+            {
+                StationCode = StationLocationEnum.BZ30.ToString(),
+                R_PalletizingAck = W_DBHeaderWithSeparate_BZ30 + "50.0",
+            });
             return _dbBlockForRead;
 
         }

--
Gitblit v1.9.3