From ce35b6cf3c6c35e485429c2a9d061e0fe2122151 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 11 12月 2024 10:42:44 +0800
Subject: [PATCH] 22

---
 SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs |   54 +++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs b/SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs
index d55221d..73e615f 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;
@@ -26,6 +25,9 @@
         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;
+
+        public static string W_DBHeaderWithSeparate_3000 = "3000" + WareSdaStruct.PLCDBADDRESS_SEPARATE;
 
         /// <summary>
         /// 璇诲彇DB
@@ -140,7 +142,7 @@
             {
                 //TODO:杩欓噷鍐欓厤缃殑DB鍦板潃
                 #region 鍐欏叆
-                // W_HandShake = W_DBHeaderWithSeparate + "0.0",
+                W_HandShake = W_DBHeaderWithSeparate_3000 + "80.0",
 
 
                 #endregion
@@ -148,6 +150,7 @@
 
             //鍐欏叆鍦板潃
             _dbBlockForWrite.W_StationForWriteCommList = new List<StationDBForWriteComm>();
+
 
             _dbBlockForWrite.W_StationForWriteCommList.Add(new StationDBForWriteComm()
             {
@@ -161,12 +164,14 @@
 
                 W_DataFinish = W_DBHeaderWithSeparate_BZ01 + "0.0",
                 W_KittingInfo = W_DBHeaderWithSeparate_BZ01 + "2.0",
-
+                //W_PersonAllow = W_DBHeaderWithSeparate_BZ01 + "0.1",
             });
 
             _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",
@@ -214,6 +219,8 @@
             {
                 StationCode = StationLocationEnum.BZ21.ToString(),
 
+                W_NgFlag = W_DBHeaderWithSeparate_BZ21 + "0.2",
+
                 W_DataFinish = W_DBHeaderWithSeparate_BZ21 + "0.0",
                 W_SurroundTaskFinish = W_DBHeaderWithSeparate_BZ21 + "0.1",
                 W_X_Offset = W_DBHeaderWithSeparate_BZ21 + "10.0",
@@ -227,6 +234,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,11 +258,33 @@
             {
                 //TODO:杩欓噷鍐欓厤缃殑DB鍦板潃
                 #region 璇诲彇
-                // R_HandShake = R_DBHeaderWithSeparate + "0.0",
+                R_HandShake_FJ = W_DBHeaderWithSeparate_3000 + "0.0",
+                R_Mode_FJ = W_DBHeaderWithSeparate_3000 + "2.0",
+                R_Warning_FJ = W_DBHeaderWithSeparate_3000 + "4.0",
+
+                R_HandShake_MB = W_DBHeaderWithSeparate_3000 + "20.0",
+                R_Mode_MB = W_DBHeaderWithSeparate_3000 + "22.0",
+                R_Warning_MB = W_DBHeaderWithSeparate_3000 + "24.0",
+
+                R_HandShake_HB = W_DBHeaderWithSeparate_3000 + "40.0",
+                R_Mode_HB = W_DBHeaderWithSeparate_3000 + "42.0",
+                R_Warning_HB = W_DBHeaderWithSeparate_3000 + "44.0",
+
+                R_HandShake_FX = W_DBHeaderWithSeparate_3000 + "60.0",
+                R_Mode_FX = W_DBHeaderWithSeparate_3000 + "62.0",
+                R_Warning_FX = W_DBHeaderWithSeparate_3000 + "64.0",
 
                 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()
             {
@@ -312,13 +350,7 @@
             _dbBlockForRead.R_StationForReadCommList.Add(new StationDBForReadComm()
             {
                 StationCode = StationLocationEnum.BZ30.ToString(),
-                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",
-
+                R_PalletizingAck = W_DBHeaderWithSeparate_BZ30 + "50.0",
             });
             return _dbBlockForRead;
 

--
Gitblit v1.9.3