From 52ea328589f08585046bd519e4c57e5dce24e1dd Mon Sep 17 00:00:00 2001
From: zongzhibin <zongzhibin@weben-smart.com>
Date: 周六, 23 11月 2024 09:49:36 +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 | 77 ++++++--------------------------------
1 files changed, 13 insertions(+), 64 deletions(-)
diff --git a/SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs b/SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs
index 11d0cda..61b8c06 100644
--- a/SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs
+++ b/SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs
@@ -137,6 +137,7 @@
#region 鍐欏叆
// W_HandShake = W_DBHeaderWithSeparate + "0.0",
+
#endregion
};
@@ -164,6 +165,9 @@
W_InboundFinishConfirm = W_DBHeaderWithSeparate_BZ39 + "0.1",
W_Destination_In = W_DBHeaderWithSeparate_BZ39 + "2.0",
+ W_Inbound_TaskID = W_DBHeaderWithSeparate_BZ39 + "20.0",
+ W_Outbound_TaskID = W_DBHeaderWithSeparate_BZ39 + "22.0",
+
W_Length = W_DBHeaderWithSeparate_BZ39 + "6.0",
W_Width = W_DBHeaderWithSeparate_BZ39 + "8.0",
W_Height = W_DBHeaderWithSeparate_BZ39 + "10.0",
@@ -172,57 +176,13 @@
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"
});
return _dbBlockForWrite;
}
- ///// <summary>
- ///// 璇诲彇鍦板潃闆嗗悎璧嬪��
- ///// </summary>
- ///// <param name="_dbBlockForWrite"></param>
- ///// <param name="_dbBlockForRead"></param>
- //private static StationDBForWrite SetW_StationForWriteCommList2()
- //{
- // StationDBForWrite _dbBlockForRead = new StationDBForWrite()
- // {
- // //TODO:杩欓噷鍐欓厤缃殑DB鍦板潃
- // #region 璇诲彇
- // W_HandShake = "0.0",
-
- // #endregion
- // };
-
- // //璇诲彇鍦板潃
- // double default_STP = 2.0;
- // double default_Destination = 4.0;
- // double default_TaskID = 6.0;
-
- // int addValue = 16;
- // _dbBlockForRead.W_StationForWriteCommList = new List<StationDBForWriteComm>();
- // for (int i = 0; i < WareSdaStruct.StationStationList.Count; i++)
- // {
- // var stationCode = WareSdaStruct.StationStationList[i];
- // if (i > 0)
- // {
- // default_STP += addValue;
- // default_Destination += addValue;
- // default_TaskID += addValue;
- // }
- // _dbBlockForRead.W_StationForWriteCommList.Add(new StationDBForWriteComm()
- // {
- // StationCode = stationCode,
- // W_STP = default_STP.ToString("0.0"),
- // W_Destination = default_Destination.ToString("0.0"),
- // W_TaskID = default_TaskID.ToString("0.0"),
- // });
-
- // }
-
- // return _dbBlockForRead;
-
- //}
/// <summary>
/// 璇诲彇鍦板潃闆嗗悎璧嬪��
@@ -235,24 +195,9 @@
{
//TODO:杩欓噷鍐欓厤缃殑DB鍦板潃
#region 璇诲彇
- R_HandShake = R_DBHeaderWithSeparate + "0.0",
+ // R_HandShake = R_DBHeaderWithSeparate + "0.0",
- //娉ㄦ剰锛氳繖閲岀敤鐨勬壂鎻忕殑鍦板潃鍧�
- R_1015_Scan = R_DBHeader_ScanWithSeparate + "48.0",
- R_1019_Scan = R_DBHeader_ScanWithSeparate + "356.0",
- R_1019_CargoNoScan = R_DBHeader_ScanWithSeparate + "378.0",
- R_1002_Scan = R_DBHeader_ScanWithSeparate + "108.0",
- R_1004_Scan = R_DBHeader_ScanWithSeparate + "168.0",
- R_1006_Scan = R_DBHeader_ScanWithSeparate + "228.0",
- R_1007_Scan = R_DBHeader_ScanWithSeparate + "288.0",
- R_1009_High1 = R_DBHeader_ScanWithSeparate + "300.0",
- R_1009_High2 = R_DBHeader_ScanWithSeparate + "300.1",
- R_1009_High3 = R_DBHeader_ScanWithSeparate + "300.2",
-
- R_Station_Finish = R_DBHeaderWithSeparate + "349.0",
-
- R_Station_Coordinate = R_DBHeader_ScanWithSeparate + "304.0"
-
+ R_StationForReadCommList = new List<StationDBForReadComm>()
#endregion
};
@@ -268,12 +213,16 @@
{
StationCode = StationLocationEnum.BZ39.ToString(),
- R_ReqParseData = W_DBHeaderWithSeparate_BZ39 + "0.0",
+ R_ReqParseData = W_DBHeaderWithSeparate_BZ39 + "50.0",
R_InboundFinish = W_DBHeaderWithSeparate_BZ39 + "50.1",
R_OutboundFinish = W_DBHeaderWithSeparate_BZ39 + "50.2",
R_ReadCodeResult = W_DBHeaderWithSeparate_BZ39 + "52.0",
R_InboundNumber = W_DBHeaderWithSeparate_BZ39 + "104.0",
- R_OutboundNumber = W_DBHeaderWithSeparate_BZ39 + "108.0"
+ R_OutboundNumber = W_DBHeaderWithSeparate_BZ39 + "108.0",
+
+ R_Inbound_TaskID = W_DBHeaderWithSeparate_BZ39 + "112.0",
+ R_Outbound_TaskID = W_DBHeaderWithSeparate_BZ39 + "114.0",
+
});
--
Gitblit v1.9.3