From 2ef8eda1ea4ef302d86dff34d722da0cce950eff Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 09 12月 2024 16:34:02 +0800
Subject: [PATCH] 1
---
SDA/iWareSda/Devices/4-Station/StationModel/StationEntity.cs | 70 ++++++++---------------------------
1 files changed, 16 insertions(+), 54 deletions(-)
diff --git a/SDA/iWareSda/Devices/4-Station/StationModel/StationEntity.cs b/SDA/iWareSda/Devices/4-Station/StationModel/StationEntity.cs
index d90f7f0..b7e1bf6 100644
--- a/SDA/iWareSda/Devices/4-Station/StationModel/StationEntity.cs
+++ b/SDA/iWareSda/Devices/4-Station/StationModel/StationEntity.cs
@@ -1156,8 +1156,6 @@
StationDB2ObjForReadComm StationDB2ObjForReadComm = this.View.R_StationForReadCommList.Where(x => x.StationCode == item.StationCode).First();
SdaHelper.SetPropertyValueForDB<StationDBForReadComm, StationDB2ObjForReadComm>(item, StationDB2ObjForReadComm, this.plcService, "");
}
- //杩欓噷鐗规畩澶勭悊 璇诲彇鐨勫彂鍔ㄦ満鐮�
- this.View.R_1019_CargoNoScan = GetNewCategoryNo(this.View.R_1019_CargoNoScan);
}
@@ -1208,52 +1206,33 @@
/// 鑾峰彇Station褰撳墠鎶ヨ淇℃伅
/// </summary>
/// <returns></returns>
- public List<DeviceWarningInfo> GetStationAlertDatas()
+ public List<DeviceWarningInfo> GetStationAlertDatas(List<WmsConfigDeviceWarning> configDeviceWarningList)
{
List<DeviceWarningInfo> db_warningList = new List<DeviceWarningInfo>();
try
{
- string _dbValue;
+ string _dbNumber;
+ string _dbOffset;
var isHasAlert = false;
- IDictionary<string, string> StationAlertDict = new Dictionary<string, string>();
- StationAlertDict = WareSdaStruct.StationAlertDict;
- foreach (var item in StationAlertDict)
+ //IDictionary<string, string> StationAlertDict = new Dictionary<string, string>();
+ //StationAlertDict = StationWarningStruct.AlertDict;
+ foreach (var item in configDeviceWarningList)
{
- _dbValue = item.Key;
- isHasAlert = Convert.ToBoolean(this.plcService.ReadValuePoint(Station_CacheEntity.R_DBHeader_Station_Alert, item.Key, typeof(bool)));
+ //var arr = item.Key.Split('|');
+ //_dbNumber = arr[0];
+ //_dbOffset = arr[1];
+
+ var arr = item.WarningCode.Split('|');
+ _dbNumber = arr[0];
+ _dbOffset = arr[1];
+ isHasAlert = Convert.ToBoolean(this.plcService.ReadValuePoint(_dbNumber, _dbOffset, typeof(bool)));
if (isHasAlert)
{
db_warningList.Add(new DeviceWarningInfo()
{
- Address = item.Key,
- Code = item.Key,
- Context = item.Value.Trim()
+ Code = item.WarningCode,
+ //Context = item.WarningContent.Trim(),
});
- }
- }
- }
- catch (Exception ex)
- {
- throw ex;
- }
- return db_warningList;
- }
-
- /// <summary>
- /// 鑾峰彇杈撻�佺嚎褰撳墠鎶ヨ淇℃伅
- /// </summary>
- /// <returns></returns>
- public List<DeviceWarningInfo> GetLineAlertDatas()
- {
- List<DeviceWarningInfo> db_warningList = new List<DeviceWarningInfo>();
- try
- {
- IDictionary<string, string> srmAlertDict = new Dictionary<string, string>();
- foreach (var item in this.View.R_StationForReadCommList)
- {
- if (item.R_AlarmCode > 0)
- {
- item.R_AlarmCodeMsg = WareSdaStruct.StationAlertDict[item.R_AlarmCode.ToString()];
}
}
}
@@ -1267,22 +1246,5 @@
#endregion
- /// <summary>
- /// 鐗规畩澶勭悊涓� 璇诲彇鐨勫彂鍔ㄦ満鐮�
- /// </summary>
- /// <param name="orgCategoryNo"></param>
- /// <returns></returns>
- private string GetNewCategoryNo(string orgCategoryNo)
- {
- Log4NetHelper.WriteInfoLog(Station_CacheEntity.curLogType, "璇诲彇鐨勫彂鍔ㄦ満鐮�,鍘熷璇诲彇鐨勫��:" + orgCategoryNo);
- //濡傛灉鏈� $R鍐呭锛屽氨鏇挎崲涓虹┖
- var repStr = "$R";
- if (!string.IsNullOrEmpty(orgCategoryNo) && orgCategoryNo.IndexOf(repStr) > -1)
- {
- orgCategoryNo = orgCategoryNo.Replace(repStr, "");
- }
- Log4NetHelper.WriteInfoLog(Station_CacheEntity.curLogType, "璇诲彇鐨勫彂鍔ㄦ満鐮�,鏇挎崲鍚庣殑鍊�:" + orgCategoryNo);
- return orgCategoryNo;
- }
}
}
--
Gitblit v1.9.3