WMSPrjInstance/HH-0014_NongFu_QingXi.git

			@@ -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://强制取消 //起点解绑锁释放终点锁释放
			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;