From d3a84592bc645e929a702178497b570275e97ba8 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 28 11月 2024 13:18:44 +0800
Subject: [PATCH] 222
---
CC/iWareModel/EnumType/WMS/AreaCodeEnum.cs | 9 ++
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/WmsOrder/AreaCodeEnum.cs | 8 ++
CC/iWareCC_ASRS/ThreadService/05_BZ30(齐套验证)/DataProcess_ValidateQiTao.cs | 113 +++++++++++++++++++++----------------
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsTask/WmsOperationTaskService.cs | 8 ++
4 files changed, 86 insertions(+), 52 deletions(-)
diff --git "a/CC/iWareCC_ASRS/ThreadService/05_BZ30\050\351\275\220\345\245\227\351\252\214\350\257\201\051/DataProcess_ValidateQiTao.cs" "b/CC/iWareCC_ASRS/ThreadService/05_BZ30\050\351\275\220\345\245\227\351\252\214\350\257\201\051/DataProcess_ValidateQiTao.cs"
index e9df6a5..adb6ebe 100644
--- "a/CC/iWareCC_ASRS/ThreadService/05_BZ30\050\351\275\220\345\245\227\351\252\214\350\257\201\051/DataProcess_ValidateQiTao.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/05_BZ30\050\351\275\220\345\245\227\351\252\214\350\257\201\051/DataProcess_ValidateQiTao.cs"
@@ -37,65 +37,78 @@
if (SystemValue.isAllowRuning_DataProcess_ValidateQiTao && SystemValue.isStartedModel)
{
var rgvLocation = StationLocationEnum.BZ39.ToString();
- if (FormCC.IsAllowRunOutMode)
+
+ using (WmsDBModel wmsDB = new WmsDBModel())
{
- using (WmsDBModel wmsDB = new WmsDBModel())
+ var bz30Config = wmsDB.SysConfig.Where(x => x.Code == "wms_bz30_qitao").FirstOrDefault();
+ if (bz30Config == null)
{
- var rbRunMode = wmsDB.wms_rbline_runmode.FirstOrDefault();
+ SystemWarningMsg._lbl_Alert_DataProcess_ValidateQiTao = $"娌℃湁閰嶇疆 wms_bz30_qitao 鍊�";
+ continue;
+ }
+ var configValue = bz30Config.Value;
+ if (string.IsNullOrEmpty(configValue) || configValue.IndexOf('|') <= -1)
+ {
+ SystemWarningMsg._lbl_Alert_DataProcess_ValidateQiTao = $"閰嶇疆 wms_bz30_qitao 鍊納configValue}涓虹┖鎴栦笉姝ｇ‘";
+ continue;
+ }
+ var configValues = configValue.Split('|');
+ var packageCode = configValues[0];
+ var qitaoValue = configValues[1];//榻愬 涓嶉綈濂�
- if (TaskHandler.ValidateNoFinishOutTaskForRobotBuffer(wmsDB))
- {//涓嶅瓨鍦�
- rbRunMode.LineRunMode = (int)RbRunModeEnum.鍏ュ簱妯″紡;
- rbRunMode.LineRunModeName = RbRunModeEnum.鍏ュ簱妯″紡.ToString();
- rbRunMode.UpdateTime = DateTime.Now;
-
- //鎺ㄩ�佺粰PLC鍒囨崲妯″紡
- using (StationServiceClient client = new StationServiceClient())
- {
- var res = await client.ChangeModeAsync((int)EDevice.Station, (int)RbRunModeEnum.鍏ュ簱妯″紡, rgvLocation);
- if (!res.result)
- {
- SystemWarningMsg._lbl_Alert_DataProcess_ValidateQiTao = $"{rgvLocation.ToString()}-鎺ㄩ�佺粰PLC鍒囨崲妯″紡 澶辫触,ChangeModeAsync 杩斿洖:{res.resMsg}";
- continue;
- }
- else
- {
- Log4NetHelper.WriteInfoLog(logType, $"{rgvLocation.ToString()}-鎺ㄩ�佺粰PLC鍒囨崲妯″紡 鎴愬姛,ChangeModeAsync锛屽弬鏁�: 绔欑偣{rgvLocation}");
- }
- }
- FormCC.IsAllowRunOutMode = false;
+ //TODO:鎺ㄩ�佺粰PLC 鍘诲摢涓柟鍚戯紵
+ /*
+ using (StationServiceClient client = new StationServiceClient())
+ {
+ var res = await client.ChangeModeAsync((int)EDevice.Station, (int)RbRunModeEnum.鍏ュ簱妯″紡, rgvLocation);
+ if (!res.result)
+ {
+ SystemWarningMsg._lbl_Alert_DataProcess_ValidateQiTao = $"{rgvLocation.ToString()}-鎺ㄩ�佺粰PLC鍒囨崲妯″紡 澶辫触,ChangeModeAsync 杩斿洖:{res.resMsg}";
+ continue;
}
else
- {//瀛樺湪
- if (rbRunMode.LineRunMode == (int)RbRunModeEnum.鍑哄簱妯″紡)
- {
- SystemWarningMsg._lbl_Alert_DataProcess_ValidateQiTao = $"宸茬粡鏄嚭搴撴ā寮忎簡,姝ゆ寰幆缁撴潫";
- continue;
- }
- rbRunMode.LineRunMode = (int)RbRunModeEnum.鍑哄簱妯″紡;
- rbRunMode.LineRunModeName = RbRunModeEnum.鍑哄簱妯″紡.ToString();
- rbRunMode.UpdateTime = DateTime.Now;
-
- //鎺ㄩ�佺粰PLC鍒囨崲妯″紡
- using (StationServiceClient client = new StationServiceClient())
- {
- var res = await client.ChangeModeAsync((int)EDevice.Station, (int)RbRunModeEnum.鍑哄簱妯″紡, rgvLocation);
- if (!res.result)
- {
- SystemWarningMsg._lbl_Alert_DataProcess_ValidateQiTao = $"{rgvLocation.ToString()}-鎺ㄩ�佺粰PLC鍒囨崲妯″紡 澶辫触,ChangeModeAsync 杩斿洖:{res.resMsg}";
- continue;
- }
- else
- {
- Log4NetHelper.WriteInfoLog(logType, $"{rgvLocation.ToString()}-鎺ㄩ�佺粰PLC鍒囨崲妯″紡 鎴愬姛,ChangeModeAsync锛屽弬鏁�: 绔欑偣{rgvLocation}");
- }
- }
+ {
+ Log4NetHelper.WriteInfoLog(logType, $"{rgvLocation.ToString()}-鎺ㄩ�佺粰PLC鍒囨崲妯″紡 鎴愬姛,ChangeModeAsync锛屽弬鏁�: 绔欑偣{rgvLocation}");
}
-
- wmsDB.SaveChanges();
}
+ //*/
+
+
+ //鏇存柊鍊�
+ bz30Config.Value = "";
+ var gahter = wmsDB.mes_package_gather.Where(x => x.PackageCode == packageCode).FirstOrDefault();
+ if (gahter != null)
+ {
+ gahter.UpiStatus = (int)UpiStatusEnum.宸蹭笅绾�;
+ gahter.AreaCode = (int)AreaCodeEnum.涓嬬嚎鍖哄煙;
+ }
+ var upiList = wmsDB.mes_batchOrderUPI_new.Where(x => x.PackageCode == packageCode).ToList();
+ foreach (var item in upiList)
+ {
+ item.UpiStatus = (int)UpiStatusEnum.宸蹭笅绾�;
+ item.AreaCode = (int)AreaCodeEnum.涓嬬嚎鍖哄煙;
+ item.UpdateTime = DateTime.Now;
+ }
+ //鍒犻櫎闃熷垪淇℃伅
+ var lineQueue = wmsDB.mes_package_linequeue.Where(x => x.PackageCode == packageCode).FirstOrDefault();
+ if (lineQueue != null)
+ {
+ wmsDB.mes_package_linequeue.Remove(lineQueue);
+ }
+ //鏂板涓嬬嚎璁板綍
+ mes_package_unline_record record = new mes_package_unline_record();
+ record = ClassHelper.RotationMapping<mes_package_unline_record, mes_package_gather>(gahter);
+ record.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+ record.CreateTime = DateTime.Now;
+ record.UpdateTime = DateTime.Now;
+ record.OpRemark = "涓嬬嚎";
+ wmsDB.mes_package_unline_record.Add(record);
+
+
+ wmsDB.SaveChanges();
}
}
+
}
catch (Exception ex)
{
diff --git a/CC/iWareModel/EnumType/WMS/AreaCodeEnum.cs b/CC/iWareModel/EnumType/WMS/AreaCodeEnum.cs
index 3540074..87cd603 100644
--- a/CC/iWareModel/EnumType/WMS/AreaCodeEnum.cs
+++ b/CC/iWareModel/EnumType/WMS/AreaCodeEnum.cs
@@ -54,8 +54,15 @@
/// </summary>
[Description("鍖呰绾垮尯鍩�")]
- 鍖呰绾垮尯鍩� = 6
+ 鍖呰绾垮尯鍩� = 6,
+
+ /// <summary>
+ /// 涓嬬嚎鍖哄煙
+ /// </summary>
+ [Description("涓嬬嚎鍖哄煙")]
+
+ 涓嬬嚎鍖哄煙 = 7
}
}
\ No newline at end of file
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/WmsOrder/AreaCodeEnum.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/WmsOrder/AreaCodeEnum.cs
index 96932b4..4c63e17 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/WmsOrder/AreaCodeEnum.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/WmsOrder/AreaCodeEnum.cs
@@ -52,6 +52,12 @@
/// </summary>
[Description("鍖呰绾垮尯鍩�")]
- 鍖呰绾垮尯鍩� = 6
+ 鍖呰绾垮尯鍩� = 6,
+ /// <summary>
+ /// 涓嬬嚎鍖哄煙
+ /// </summary>
+ [Description("涓嬬嚎鍖哄煙")]
+
+ 涓嬬嚎鍖哄煙 = 7
}
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsTask/WmsOperationTaskService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsTask/WmsOperationTaskService.cs
index c884e1d..4ac2060 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsTask/WmsOperationTaskService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsTask/WmsOperationTaskService.cs
@@ -107,6 +107,14 @@
}
var sysConfig = await _sysConfigRep.GetFirstAsync(x => x.Code == CommonConst.WmsBZ30_QiTao);
+ if (sysConfig == null)
+ {
+ throw Oops.Oh($"娌℃湁閰嶇疆 鍒ゆ柇榻愬 鍊�");
+ }
+ if (!string.IsNullOrEmpty(sysConfig.Value))
+ {
+ throw Oops.Oh($"鍒ゆ柇榻愬鍊煎凡缁忓瓨鍦ㄥ�納sysConfig.Value},涓嶅厑璁告搷浣�");
+ }
sysConfig.Value = setValue;
await _sysConfigRep.UpdateAsync(sysConfig);
--
Gitblit v1.9.3