From 81c361a3fab7d43fc14ad46777a18a1ab9215c06 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 21 11月 2024 17:57:46 +0800
Subject: [PATCH] 222
---
SDA/iWareSda/iWareSda.csproj | 1
SDA/iWareSda/Devices/4-Station/StationModel/StationEntity.cs | 88 +++++++-------
SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs | 84 ++++++-------
SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs | 133 ++++++++-------------
SDA/iWareSda/Model/StationLocationEnum.cs | 33 +++++
5 files changed, 171 insertions(+), 168 deletions(-)
diff --git a/SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs b/SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs
index 7923139..b47ac53 100644
--- a/SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs
+++ b/SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs
@@ -150,11 +150,16 @@
public string W_Destination_In { get; set; }
/// <summary>
- /// 浠诲姟鍙�
+ /// 鍏ュ簱浠诲姟鍙�
/// </summary>
- [Description("浠诲姟鍙�")]
- public string W_TaskID { get; set; }
+ [Description("鍏ュ簱浠诲姟鍙�")]
+ public string W_Inbound_TaskID { get; set; }
+ /// <summary>
+ /// 鍑哄簱浠诲姟鍙�
+ /// </summary>
+ [Description("鍑哄簱浠诲姟鍙�")]
+ public string W_Outbound_TaskID { get; set; }
/// <summary>
/// 鏉ユ枡闀垮害
@@ -186,6 +191,12 @@
/// </summary>
[Description("鍒嗛厤鍑哄簱搴撲綅鍙�")]
public string W_Destination_Out { get; set; }
+
+ /// <summary>
+ /// 妯″紡锛�1锛氬叆搴擄紝 2锛氬嚭搴� 3锛氬己鍒跺嚭搴擄級
+ /// </summary>
+ [Description("妯″紡锛�1锛氬叆搴擄紝 2锛氬嚭搴� 3锛氬己鍒跺嚭搴擄級")]
+ public string W_Mode { get; set; }
/// <summary>
/// 鏄惁鏃嬭浆
@@ -231,6 +242,20 @@
/// </summary>
[Description("鏀炬枡Y鍋忕Щ")]
public string W_Y_Offset { get; set; }
+
+
+
+
+ /// <summary>
+ /// 鍏ュ簱瀹屾垚宸茬‘璁�
+ /// </summary>
+ [Description("鍏ュ簱瀹屾垚宸茬‘璁�")]
+ public string W_InboundFinishConfirm { get; set; }
+ ///// <summary>
+ ///// 浠诲姟鍙�
+ ///// </summary>
+ //[Description("浠诲姟鍙�")]
+ //public string W_TaskID { get; set; }
}
@@ -357,57 +382,28 @@
public String R_ReadCodeResult { get; set; }
/// <summary>
- /// 鍏夌數1鐘舵��
+ /// 鏈哄櫒浜哄叆搴撳畬鎴�
/// </summary>
- [Description("鍏夌數1鐘舵��")]
- public string R_PH_1 { get; set; }
+ [Description("鏈哄櫒浜哄叆搴撳畬鎴�")]
+ public string R_InboundFinish { get; set; }
/// <summary>
- /// 鍏夌數2鐘舵��
+ /// 鏈哄櫒浜哄叆搴撳簱浣嶅彿
/// </summary>
- [Description("鍏夌數2鐘舵��")]
- public string R_PH_2 { get; set; }
+ [Description("鏈哄櫒浜哄叆搴撳簱浣嶅彿")]
+ public string R_InboundNumber { get; set; }
/// <summary>
- /// 鏀跺埌浠诲姟涓嬪彂鍙嶉
+ /// 鏈哄櫒浜哄嚭搴撳畬鎴�
/// </summary>
- [Description("鏀跺埌浠诲姟涓嬪彂鍙嶉")]
- public string R_ACK { get; set; }
+ [Description("鏈哄櫒浜哄嚭搴撳畬鎴�")]
+ public string R_OutboundFinish { get; set; }
/// <summary>
- /// 妯″紡
+ /// 鏈哄櫒浜哄嚭搴撳簱浣嶅彿
/// </summary>
- [Description("妯″紡")]
- public string R_Model { get; set; }
+ [Description("鏈哄櫒浜哄嚭搴撳簱浣嶅彿")]
+ public string R_OutboundNumber { get; set; }
- /// <summary>
- /// 杩愯鐘舵��
- /// </summary>
- [Description("杩愯鐘舵��")]
- public string R_State { get; set; }
-
- /// <summary>
- /// 鎶ヨ浠ｇ爜
- /// </summary>
- [Description("鎶ヨ浠ｇ爜")]
- public string R_AlarmCode { get; set; }
-
- /// <summary>
- /// 褰撳墠鐩爣鍦板潃
- /// </summary>
- [Description("褰撳墠鐩爣鍦板潃")]
- public string R_Destination { get; set; }
-
- /// <summary>
- /// 澶栧舰妫�娴�
- /// </summary>
- [Description("澶栧舰妫�娴�")]
- public string R_Shape { get; set; }
-
- /// <summary>
- /// 褰撳墠浠诲姟鍙�
- /// </summary>
- [Description("褰撳墠浠诲姟鍙�")]
- public string R_TaskID { get; set; }
}
}
diff --git a/SDA/iWareSda/Devices/4-Station/StationModel/StationEntity.cs b/SDA/iWareSda/Devices/4-Station/StationModel/StationEntity.cs
index fadb236..8d0dff3 100644
--- a/SDA/iWareSda/Devices/4-Station/StationModel/StationEntity.cs
+++ b/SDA/iWareSda/Devices/4-Station/StationModel/StationEntity.cs
@@ -92,56 +92,58 @@
/// <returns></returns>
public bool SendTask(int deviceId, int taskId, string sourcePlce, string toPlace, out string msg)
{
- try
- {
- msg = "";
- if (!CanSendTask(deviceId, out msg))
- {
- return false;
- }
+ msg = "";
+ return false;
+ //try
+ //{
+ // msg = "";
+ // if (!CanSendTask(deviceId, out msg))
+ // {
+ // return false;
+ // }
- //杩欓噷鐗规畩杞崲涓�涓�
- if (toPlace == ((int)EDevice.鍑哄簱鍙�1012).ToString())
- {
- toPlace = ((int)EDevice.鎻愬崌鏈�1030).ToString();
- }
+ // //杩欓噷鐗规畩杞崲涓�涓�
+ // if (toPlace == ((int)EDevice.鍑哄簱鍙�1012).ToString())
+ // {
+ // toPlace = ((int)EDevice.鎻愬崌鏈�1030).ToString();
+ // }
- StationDBForWriteComm w_db_source = this.DBBlockForWrite.W_StationForWriteCommList.FirstOrDefault(x => x.StationCode == sourcePlce);
- StationDB2ObjForWriteComm w_dbObj_source = this.View.W_StationForWriteCommList.FirstOrDefault(x => x.StationCode == sourcePlce);
+ // StationDBForWriteComm w_db_source = this.DBBlockForWrite.W_StationForWriteCommList.FirstOrDefault(x => x.StationCode == sourcePlce);
+ // StationDB2ObjForWriteComm w_dbObj_source = this.View.W_StationForWriteCommList.FirstOrDefault(x => x.StationCode == sourcePlce);
- //StationDBForWriteComm w_db_to = this.DBBlockForWrite.W_StationForWriteCommList.FirstOrDefault(x => x.StationCode == toPlace);
- //StationDB2ObjForWriteComm w_dbObj_to = this.View.W_StationForWriteCommList.FirstOrDefault(x => x.StationCode == toPlace);
- //濡傛灉ACK涓簍rue锛岃〃绀轰笉鑳藉彂浠诲姟
- var readObj = this.View.R_StationForReadCommList.FirstOrDefault(x => x.StationCode == sourcePlce);
- if (readObj.R_ACK == true)
- {
- msg = "ACK涓篢RUE锛屼笉鍏佽鍙戜换鍔�";
- return false;
- }
+ // //StationDBForWriteComm w_db_to = this.DBBlockForWrite.W_StationForWriteCommList.FirstOrDefault(x => x.StationCode == toPlace);
+ // //StationDB2ObjForWriteComm w_dbObj_to = this.View.W_StationForWriteCommList.FirstOrDefault(x => x.StationCode == toPlace);
+ // //濡傛灉ACK涓簍rue锛岃〃绀轰笉鑳藉彂浠诲姟
+ // var readObj = this.View.R_StationForReadCommList.FirstOrDefault(x => x.StationCode == sourcePlce);
+ // if (readObj.R_ACK == true)
+ // {
+ // msg = "ACK涓篢RUE锛屼笉鍏佽鍙戜换鍔�";
+ // return false;
+ // }
- MessageModel b2 = null;
- if (!b2.result)
- {
- msg = string.Format("鍚慡tation{0},璧风偣{1}鍙戦�佷换鍔2},鍐欏叆鐩爣绔欑偣{3}澶辫触,杩斿洖缁撴灉:" + b2.resMsg, this.View.DeviceName, sourcePlce, taskId, toPlace);
- return false;
- }
- b2 = this.plcService.WriteValuePoint(w_db_source.W_TaskID, Convert.ToInt32(taskId), w_dbObj_source.W_TaskID);
- if (!b2.result)
- {
- msg = string.Format("鍚慡tation{0},璧风偣{1}锛岀洰鏍囩偣{2},鍐欏叆浠诲姟鍙穥3}澶辫触,杩斿洖缁撴灉:" + b2.resMsg, this.View.DeviceName, sourcePlce, toPlace, taskId);
- return false;
- }
+ // MessageModel b2 = null;
+ // if (!b2.result)
+ // {
+ // msg = string.Format("鍚慡tation{0},璧风偣{1}鍙戦�佷换鍔2},鍐欏叆鐩爣绔欑偣{3}澶辫触,杩斿洖缁撴灉:" + b2.resMsg, this.View.DeviceName, sourcePlce, taskId, toPlace);
+ // return false;
+ // }
+ // b2 = this.plcService.WriteValuePoint(w_db_source.W_TaskID, Convert.ToInt32(taskId), w_dbObj_source.W_TaskID);
+ // if (!b2.result)
+ // {
+ // msg = string.Format("鍚慡tation{0},璧风偣{1}锛岀洰鏍囩偣{2},鍐欏叆浠诲姟鍙穥3}澶辫触,杩斿洖缁撴灉:" + b2.resMsg, this.View.DeviceName, sourcePlce, toPlace, taskId);
+ // return false;
+ // }
- return true;
- }
- catch (Exception ex)
- {
- msg = ex.Message;
- Log4NetHelper.WriteErrorLog(Station_CacheEntity.curLogType, "鍙戦�佷换鍔″嚭鐜板紓甯�:" + ex.Message, ex);
- return false;
- }
+ // return true;
+ //}
+ //catch (Exception ex)
+ //{
+ // msg = ex.Message;
+ // Log4NetHelper.WriteErrorLog(Station_CacheEntity.curLogType, "鍙戦�佷换鍔″嚭鐜板紓甯�:" + ex.Message, ex);
+ // return false;
+ //}
}
diff --git a/SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs b/SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs
index 81fb0af..11d0cda 100644
--- a/SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs
+++ b/SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs
@@ -19,7 +19,9 @@
/// <summary>
/// 鍐欏叆DB
/// </summary>
- public static string W_DBHeaderWithSeparate = "610" + WareSdaStruct.PLCDBADDRESS_SEPARATE;
+ public static string W_DBHeaderWithSeparate_BZ39 = "3002" + WareSdaStruct.PLCDBADDRESS_SEPARATE;
+ public static string W_DBHeaderWithSeparate_BZ01 = "3001" + WareSdaStruct.PLCDBADDRESS_SEPARATE;
+
/// <summary>
/// 璇诲彇DB
/// </summary>
@@ -133,35 +135,45 @@
{
//TODO:杩欓噷鍐欓厤缃殑DB鍦板潃
#region 鍐欏叆
- W_HandShake = W_DBHeaderWithSeparate + "0.0",
- W_1015_ReScan = R_DBHeader_ScanWithSeparate + "302.0", //1015浣嶇疆閲嶆柊鎵爜 銆怑ditBy shaocx,2022-05-02銆�
- W_1019_ReScan = R_DBHeader_ScanWithSeparate + "368.0", //1019浣嶇疆閲嶆柊鎵爜锛� 銆怑ditBy shaocx,2022-05-02銆�
- W_Station_FinishACK = W_DBHeaderWithSeparate + "146.0",
+ // W_HandShake = W_DBHeaderWithSeparate + "0.0",
- W_1002_ScanFailACK = R_DBHeader_ScanWithSeparate + "66.1",
- W_1004_ScanFailACK = R_DBHeader_ScanWithSeparate + "126.1",
- W_1006_ScanFailACK = R_DBHeader_ScanWithSeparate + "186.1",
- W_1007_ScanFailACK = R_DBHeader_ScanWithSeparate + "246.1",
-
- W_1002_ScanSuccessACK = R_DBHeader_ScanWithSeparate + "66.0",
- W_1004_ScanSuccessACK = R_DBHeader_ScanWithSeparate + "126.0",
- W_1006_ScanSuccessACK = R_DBHeader_ScanWithSeparate + "186.0",
- W_1007_ScanSuccessACK = R_DBHeader_ScanWithSeparate + "246.0",
-
- W_Out_MaterialModel = W_DBHeaderForXigangGetDataWithSeparate + "0.0",
- W_Out_OrderNo = W_DBHeaderForXigangGetDataWithSeparate + "18.0",
- W_Out_SerialNumber = W_DBHeaderForXigangGetDataWithSeparate + "36.0",
#endregion
};
//鍐欏叆鍦板潃
_dbBlockForWrite.W_StationForWriteCommList = new List<StationDBForWriteComm>();
- _dbBlockForWrite.W_StationForWriteCommList.Add(new StationDBForWriteComm() { StationCode = "1001", W_TaskID = W_DBHeaderWithSeparate + "6.0" });
- _dbBlockForWrite.W_StationForWriteCommList.Add(new StationDBForWriteComm() { StationCode = "1002", W_TaskID = W_DBHeaderWithSeparate + "14.0" });
- _dbBlockForWrite.W_StationForWriteCommList.Add(new StationDBForWriteComm() { StationCode = "1003", W_TaskID = W_DBHeaderWithSeparate + "22.0" });
+ _dbBlockForWrite.W_StationForWriteCommList.Add(new StationDBForWriteComm()
+ {
+ StationCode = StationLocationEnum.棣栨鎵爜宸ヤ綅.ToString(),
+ });
+ _dbBlockForWrite.W_StationForWriteCommList.Add(new StationDBForWriteComm()
+ {
+ StationCode = StationLocationEnum.BZ01.ToString(),
+ W_DataFinish = W_DBHeaderWithSeparate_BZ01 + "0.0",
+ W_KittingInfo = W_DBHeaderWithSeparate_BZ01 + "2.0",
+ });
+
+ _dbBlockForWrite.W_StationForWriteCommList.Add(new StationDBForWriteComm()
+ {
+ StationCode = StationLocationEnum.BZ39.ToString(),
+
+ W_DataFinish = W_DBHeaderWithSeparate_BZ39 + "0.0",
+ W_InboundFinishConfirm = W_DBHeaderWithSeparate_BZ39 + "0.1",
+ W_Destination_In = W_DBHeaderWithSeparate_BZ39 + "2.0",
+
+ W_Length = W_DBHeaderWithSeparate_BZ39 + "6.0",
+ W_Width = W_DBHeaderWithSeparate_BZ39 + "8.0",
+ W_Height = W_DBHeaderWithSeparate_BZ39 + "10.0",
+
+ //鍑哄簱
+ W_ReqOut = W_DBHeaderWithSeparate_BZ39 + "12.0",
+ W_Destination_Out = W_DBHeaderWithSeparate_BZ39 + "14.0",
+ W_Mode = W_DBHeaderWithSeparate_BZ39 + "18.0",
+
+ });
return _dbBlockForWrite;
}
@@ -244,67 +256,26 @@
#endregion
};
- //璇诲彇鍦板潃
- double default_PH_1 = 2.0;
- double default_PH_2 = 2.1;
- double default_ACK = 2.2;
- double default_Model = 4.0;
- double default_State = 6.0;
- double default_AlarmCode = 8.0;
- double default_Destination = 10.0;
- double default_Shape = 12.0;
- double default_TaskID = 14.0;
- int addValue = 16;
- _dbBlockForRead.R_StationForReadCommList = new List<StationDBForReadComm>();
- for (int i = 0; i < WareSdaStruct.StationStationList.Count; i++)
+ _dbBlockForRead.R_StationForReadCommList.Add(new StationDBForReadComm()
{
- var stationCode = WareSdaStruct.StationStationList[i];
- if (stationCode == "1019")
- {
- _dbBlockForRead.R_StationForReadCommList.Add(new StationDBForReadComm()
- {
- StationCode = stationCode,
- R_PH_1 = R_DBHeaderWithSeparate + "350.0",
- R_PH_2 = R_DBHeaderWithSeparate + "350.1",
- R_ACK = R_DBHeaderWithSeparate + "350.2",
- R_Model = R_DBHeaderWithSeparate + ("352.0"),
- R_State = R_DBHeaderWithSeparate + ("354.0"),
- R_AlarmCode = R_DBHeaderWithSeparate + ("356.0"),
- R_Destination = R_DBHeaderWithSeparate + ("358.0"),
- R_Shape = R_DBHeaderWithSeparate + ("360.0"),
- R_TaskID = R_DBHeaderWithSeparate + ("362.0")
- });
- }
- else
- {
- if (i > 0)
- {
- default_PH_1 += addValue;
- default_PH_2 += addValue;
- default_ACK += addValue;
- default_Model += addValue;
- default_State += addValue;
- default_AlarmCode += addValue;
- default_Destination += addValue;
- default_Shape += addValue;
- default_TaskID += addValue;
- }
- _dbBlockForRead.R_StationForReadCommList.Add(new StationDBForReadComm()
- {
- StationCode = stationCode,
- R_PH_1 = R_DBHeaderWithSeparate + default_PH_1.ToString("0.0"),
- R_PH_2 = R_DBHeaderWithSeparate + default_PH_2.ToString("0.0")
- ,
- R_ACK = R_DBHeaderWithSeparate + default_ACK.ToString("0.0"),
- R_Model = R_DBHeaderWithSeparate + default_Model.ToString("0.0"),
- R_State = R_DBHeaderWithSeparate + default_State.ToString("0.0"),
- R_AlarmCode = R_DBHeaderWithSeparate + default_AlarmCode.ToString("0.0"),
- R_Destination = R_DBHeaderWithSeparate + default_Destination.ToString("0.0"),
- R_Shape = R_DBHeaderWithSeparate + default_Shape.ToString("0.0"),
- R_TaskID = R_DBHeaderWithSeparate + default_TaskID.ToString("0.0")
- });
- }
- }
+ StationCode = StationLocationEnum.BZ01.ToString(),
+
+ R_ReqParseData = W_DBHeaderWithSeparate_BZ01 + "50.0",
+ R_ReadCodeResult = W_DBHeaderWithSeparate_BZ01 + "52.0",
+ });
+
+ _dbBlockForRead.R_StationForReadCommList.Add(new StationDBForReadComm()
+ {
+ StationCode = StationLocationEnum.BZ39.ToString(),
+
+ R_ReqParseData = W_DBHeaderWithSeparate_BZ39 + "0.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"
+ });
+
return _dbBlockForRead;
diff --git a/SDA/iWareSda/Model/StationLocationEnum.cs b/SDA/iWareSda/Model/StationLocationEnum.cs
new file mode 100644
index 0000000..fae8af5
--- /dev/null
+++ b/SDA/iWareSda/Model/StationLocationEnum.cs
@@ -0,0 +1,33 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace iWareModel
+{
+ /// <summary>
+ /// 绔欑偣鏋氫妇
+ /// </summary>
+ public enum StationLocationEnum
+ {
+ /// <summary>
+ /// 269宸ヤ綅
+ /// </summary>
+ 棣栨鎵爜宸ヤ綅 = 100,
+
+ /// <summary>
+ /// 娓呯伆锛屾礂鏉垮悗宸ヤ綅
+ /// </summary>
+ BZ01 = 101,
+
+ /// <summary>
+ /// 琛ユ澘鍚庡伐浣�
+ /// </summary>
+ BZ39 = 102,
+
+ BZ12 = 103,
+
+ BZ21 = 104
+ }
+}
diff --git a/SDA/iWareSda/iWareSda.csproj b/SDA/iWareSda/iWareSda.csproj
index 9fe70ce..d223aeb 100644
--- a/SDA/iWareSda/iWareSda.csproj
+++ b/SDA/iWareSda/iWareSda.csproj
@@ -139,6 +139,7 @@
<Compile Include="Interface\IDevice.cs" />
<Compile Include="Model\DeviceWarningInfo.cs" />
<Compile Include="Model\SdaResEntity.cs" />
+ <Compile Include="Model\StationLocationEnum.cs" />
<Compile Include="PLCService\Default\AB_HslCommunicationService.cs" />
<Compile Include="PLCService\Default\Siemens_HslCommunicationService.cs" />
<Compile Include="PLCService\Models\BasePlcParam.cs" />
--
Gitblit v1.9.3