From 046c489c854a12174d63d97e597d927789e9d76f Mon Sep 17 00:00:00 2001 From: pulg <plg@Haninfo> Date: 星期五, 25 七月 2025 18:55:18 +0800 Subject: [PATCH] 1 --- HH.WCS.QingXiNongfu/core/TaskCore.cs | 106 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 99 insertions(+), 7 deletions(-) diff --git a/HH.WCS.QingXiNongfu/core/TaskCore.cs b/HH.WCS.QingXiNongfu/core/TaskCore.cs index 093bc4d..15a7c28 100644 --- a/HH.WCS.QingXiNongfu/core/TaskCore.cs +++ b/HH.WCS.QingXiNongfu/core/TaskCore.cs @@ -91,6 +91,61 @@ TaskProcess.OperateStatus(wmsTask, 7); wmsTask.T_END_TIME = DateTime.Now; TaskHelper.UpdateStatus(wmsTask, "鍙栨秷"); + try + { + if (wmsTask.S_TYPE.Contains("娉ㄥ婊℃墭-鍏ュ簱")) + { + var plc = Settings.GetDeviceInfoList().Where(a => a.location.Any(str => str == wmsTask.S_START_LOC)).FirstOrDefault(); + if (plc != null) + { + for (var i = 0; i < plc.location.Length; i++) + { + if (wmsTask.S_START_LOC == plc.location[i]) + { + PlcHelper.SendHex(plc.address, "3F00" + (i + 1) + "0" + "0d0a"); + break; + } + } + } + } + else if (wmsTask.S_TYPE.Contains("娉ㄥ绌烘嫋-鍑哄簱")) + { + var plc = Settings.GetDeviceInfoList().Where(a => a.location.Any(str => str == wmsTask.S_END_LOC)).FirstOrDefault(); + if (plc != null) + { + for (var i = 0; i < plc.location.Length; i++) + { + if (wmsTask.S_END_LOC == plc.location[i]) + { + PlcHelper.SendHex(plc.address, "3F00" + (i + 1) + "0" + "0d0a"); + break; + } + } + } + } + else if (wmsTask.S_TYPE.Contains("鐡跺澂缈绘枟鏈烘弧鎵�鍑哄簱")) + { + var plc = Settings.GetDeviceInfoList().Where(a => a.location.Any(str => str == wmsTask.S_END_LOC)).FirstOrDefault(); + if (plc != null) + { + PlcHelper.SendHex(plc.address, "3F00110D0A"); + } + + } + else if (wmsTask.S_TYPE.Contains("鐡跺澂缈绘枟鏈虹┖鎵�鍏ュ簱")) + { + var plc = Settings.GetDeviceInfoList().Where(a => a.location.Any(str => str == wmsTask.S_START_LOC)).FirstOrDefault(); + if (plc != null) + { + PlcHelper.SendHex(plc.address, "3F00110D0A"); + } + } + } + catch (Exception ex) + { + + throw; + } break; case 8://寮哄埗瀹屾垚 - 鏈娇鐢� r = TaskProcess.OperateStatus(wmsTask, 8); @@ -98,7 +153,7 @@ TaskHelper.BeEnd(wmsTask); break; case 9://寮哄埗鍙栨秷 //璧风偣瑙g粦閿侀噴鏀�缁堢偣閿侀噴鏀�- var R = NDCHelper.CancelS(model.No); + // var R = NDCHelper.CancelS(model.No); r = TaskProcess.OperateStatus(wmsTask, 9); if (r.ResultCode != -1) { @@ -110,22 +165,51 @@ case 1101://鍙栬揣鐢宠 - { - NDCHelper.ChangeParam(wmsTask.S_TASK_NO, 1101, 18); var plc = Settings.GetDeviceInfoList().Where(a => a.location.Contains(wmsTask.S_START_LOC.Trim()) && a.enable == 1).FirstOrDefault(); - if (plc != null && plc.deviceType == 9) + if (plc != null) { - PlcHelper.SendHex(plc.address, "3F00" + "11" + "0d0a"); + if (plc.deviceType == 9) + { + PlcHelper.SendHex(plc.address, "3F00" + "11" + "0d0a"); + NDCHelper.ChangeParam(wmsTask.S_TASK_NO, 1101, 18); + } + else if (plc.deviceType == 5 && DeviceProcess.doorStatus.TryGetValue(wmsTask.S_START_LOC.Trim(), out var value) && value.info == "1100") + { + PlcHelper.SendHex(plc.address, "3F00" + "1221" + "0d0a"); + NDCHelper.ChangeParam(wmsTask.S_TASK_NO, 1101, 18); + } + else if (plc.deviceType == 8 && DeviceProcess.doorStatus.TryGetValue(wmsTask.S_START_LOC.Trim(), out var value8) && value8.info == "1100") + { + NDCHelper.ChangeParam(wmsTask.S_TASK_NO, 1101, 18); + } } + else + NDCHelper.ChangeParam(wmsTask.S_TASK_NO, 1101, 18); + } break; case 1103://鍗歌揣鐢宠 - 鏈娇鐢� { - NDCHelper.ChangeParam(wmsTask.S_TASK_NO, 1103, 18); var plc = Settings.GetDeviceInfoList().Where(a => a.location.Contains(wmsTask.S_END_LOC.Trim()) && a.enable == 1).FirstOrDefault(); - if (plc != null && plc.deviceType == 9) + if (plc != null) { - PlcHelper.SendHex(plc.address, "3F00" + "21" + "0d0a"); + if (plc.deviceType == 9) + { + PlcHelper.SendHex(plc.address, "3F00" + "21" + "0d0a"); + NDCHelper.ChangeParam(wmsTask.S_TASK_NO, 1103, 18); + } + else if (plc.deviceType == 5 && DeviceProcess.doorStatus.TryGetValue(wmsTask.S_END_LOC.Trim(), out var value) && value.info == "1100") + { + PlcHelper.SendHex(plc.address, "3F00" + "1221" + "0d0a"); + NDCHelper.ChangeParam(wmsTask.S_TASK_NO, 1103, 18); + } + else if (plc.deviceType == 5 && DeviceProcess.doorStatus.TryGetValue(wmsTask.S_END_LOC.Trim(), out var value8) && value8.info == "1100") + { + NDCHelper.ChangeParam(wmsTask.S_TASK_NO, 1103, 18); + } } + else + NDCHelper.ChangeParam(wmsTask.S_TASK_NO, 1103, 18); } break; case 1102://鍙栬揣瀹屾垚 - 鏈娇鐢�@@ -146,6 +230,14 @@ break; } } + else if (plc.deviceType == 5) + { + PlcHelper.SendHex(plc.address, "3F00" + "1020" + "0d0a"); + } + else if (plc.deviceType == 8) + { + PlcHelper.SendHex(plc.address, "3F00" + "30" + "0d0a"); + } } } break; -- Gitblit v1.9.1