WCSNet6.git - Gitblit

			@@ -72,8 +72,18 @@
			break;
			}

			PlcTaskInfo taskInfo = new PlcTaskInfo();
			if (modTask.TaskType == TaskTypeEnum.Move)
			{
			taskInfo = PLCCommon.GetEndPai(modTask.EndLocate.Substring(1, 2), modTask.EndLocate.Substring(2, 2),
			modTask.EndLocate.Substring(0, 2), modTask.EndLocate.Substring(4, 2),
			modTask.EndLocate.Substring(6, 2));

			}
			else
			{
			// 根据目标地址和巷道获取放货工位对应的排列层
			PlcTaskInfo taskInfo = PLCCommon.GetCTaskInfo(modTask.EndLocate, ((int)modTask.TaskType).ToString(),
			taskInfo = PLCCommon.GetCTaskInfo(modTask.EndLocate, ((int)modTask.TaskType).ToString(),
			modTask.StartRoadway, modTask.EndRoadway);

			// 目标工位不为null，需先判断放货工位是否空闲
			@@ -95,6 +105,11 @@
			Log.Error(string.Format("任务号:{0}:放货工位占用，稍后执行。", modTask.TaskNo));
			break;
			}
			else if (value.ToString() == "720")
			{
			// 若空闲提前占用此工位，同工位出入公用口放开此程序
			// var ret = plcConn.SetPlcDBValue(ConveyorMod.PosType, ConveyorMod.DbNumber, ConveyorMod.WcsPos, "730");
			}
			}
			else
			{
			@@ -104,6 +119,7 @@
			else
			{
			break;
			}
			}
			}

			@@ -498,16 +514,16 @@
			case TaskTypeEnum.Move: // 移库任务
			{
			var modPosTask = modDevice.listStation.FirstOrDefault(s => s.Text == "任务号");
			var result = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modPosTask.PlcPos, modTask.TaskNo);
			var result = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, modTask.TaskNo);
			if (!result.IsSucceed)
			{
			Log.Error($"{modDevice.Text}写入任务号失败");
			break;
			}
			result = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "30");
			result = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "870");
			if (!result.IsSucceed)
			{
			Log.Error($"{modDevice.Text}控制字写入30失败");
			Log.Error($"{modDevice.Text}控制字写入870失败");
			break;
			}
			// 改变任务状态
			@@ -534,8 +550,8 @@
			{
			TaskNo = modTask.TaskNo,
			PalletNo = modTask.PalletNo,
			TaskType = TaskTypeEnum.Move.ToString(),
			TaskStatus = TaskStatusEnum.Complete.ToString()
			TaskType = ((int)TaskTypeEnum.Move).ToString(),
			TaskStatus = ((int)TaskStatusEnum.Complete).ToString()
			};
			HttpService httpService = new HttpService();
			var modResponseTask = httpService.RequestTask(requestMode).Result;
			@@ -543,7 +559,10 @@
			{
			modcTaskMonitor.InteractiveMsg = "任务完成，返回给WMS任务完成";
			//修改储位信息任务类型执行状态起始位置目标位置

			}
			else
			{
			Log.Error(string.Format("任务反馈失败：StatusCode：{0};Msg：{1}", modResponseTask.StatusCode, modResponseTask.Msg));
			}
			}
			// 插入交互日志
			@@ -695,7 +714,7 @@
			}
			}
			/// <summary>
			/// 堆垛机不空跑
			/// 不空跑
			/// </summary>
			/// <param name="modTask">操作完成的任务</param>
			/// <param name="plcConn">plc连接</param>
			@@ -873,10 +892,10 @@
			string strMsg = "";
			string taskModel = "";
			// 判断是否演示模式
			if (PLCTaskAction.boDemo)
			{
			taskModel = "1";// 演示模式
			}
			//if (PLCTaskAction.boDemo)
			//{
			// taskModel = "1";// 演示模式
			//}
			// 获取工位托盘码信息
			var modPosPallet = modDevice.listStation.FirstOrDefault(m => m.Text == "托盘码");
			var (res, palletVal) = plcConn.GetPlcDBValue(PLCDataTypeEnum.String, modDevice.DbNumber, modPosPallet.PlcPos);
			@@ -1353,6 +1372,13 @@
			case "50":
			// plc申请空托
			{
			// 防止重复叫空托跺
			var (res, palletVal) = plcConn.GetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos);
			if (palletVal != 0)
			{
			break;
			}

			// 调用WMS空托出库接口，返回出库任务存入出库表
			var strMsg = "";
			var http = new HttpService();
			@@ -1375,7 +1401,7 @@
			// 调用wms任务出库任务完成
			// 获取跺机点位配置
			var modPosTask = modDevice.listStation.FirstOrDefault(m => m.Text == "任务号");
			var (res, val) = plcConn.GetPlcDBValue(PLCDataTypeEnum.String, modDevice.DbNumber, modPosTask.PlcPos);
			var (res, val) = plcConn.GetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos);
			// 根据任务号获取任务信息
			if (res.IsSucceed)
			{
			@@ -1742,23 +1768,45 @@
			else
			{
			// 获取入库任务信息
			var taskModel = _db.Queryable<WcsTask>().First(m => m.TaskNo == TaskNo && m.IsDelete == false && m.Status == TaskStatusEnum.Wait);
			var taskModel = _db.Queryable<WcsTask>().First(m => m.TaskNo == TaskNo && m.IsDelete == false && (m.Status == TaskStatusEnum.Wait \|\| m.Status == TaskStatusEnum.Doing));
			if (taskModel != null)
			{
			// 获取入库取货工位
			string endLocatVlue = PLCCommon.RoadwayToStationNum(taskModel.EndRoadway, "2");

			// 写入托盘输送线码垛工位目的工位，写入交互流程组托成功执行入库{若需要可以写入任务号等等其他信息}
			var retVal = plcConn.SetPlcDBValue(posModel.PosType, numModel.DbNumber, posModel.PlcPos, endLocatVlue);
			if (retVal.IsSucceed)
			{
			// 写入码垛交互-组托回复流程字
			retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "50");
			var listResult = new List<Result>();

			// 写入托盘输送线码垛工位目的工位、任务号，写入交互流程组托成功执行入库{若需要可以写入任务号等等其他信息}
			listResult.Add(plcConn.SetPlcDBValue(posModel.PosType, numModel.DbNumber, posModel.PlcPos, endLocatVlue)); // 目标工位
			var modPosTask = PLCTaskAction.plcPositions.First(s => s.DeviceId == numModel.Id && s.Text == "任务号" && s.IsDelete == false);
			listResult.Add(plcConn.SetPlcDBValue(modPosTask.PosType, numModel.DbNumber, modPosTask.PlcPos, TaskNo));
			var modPosTaskType = PLCTaskAction.plcPositions.First(s => s.DeviceId == numModel.Id && s.Text == "任务类型" && s.IsDelete == false);
			var taskTypeStr = (int)taskModel.TaskType;
			listResult.Add(plcConn.SetPlcDBValue(modPosTaskType.PosType, numModel.DbNumber, modPosTaskType.PlcPos, taskTypeStr.ToString()));

			if (listResult.All(s => s.IsSucceed))
			{
			// 写入组托回复流程字
			var retVal1 = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "50");
			if (retVal1.IsSucceed)
			{
			// 将入库任务由正在执行改为正在执行
			taskModel.Status = TaskStatusEnum.Doing;
			_db.Updateable(taskModel).ExecuteCommand();
			}
			}

			//// 写入托盘输送线码垛工位目的工位，写入交互流程组托成功执行入库{若需要可以写入任务号等等其他信息}
			//var retVal = plcConn.SetPlcDBValue(posModel.PosType, numModel.DbNumber, posModel.PlcPos, endLocatVlue);
			//if (retVal.IsSucceed)
			//{
			// // 写入码垛交互-组托回复流程字
			// retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "50");

			// // 将入库任务由正在执行改为正在执行
			// taskModel.Status = TaskStatusEnum.Doing;
			// _db.Updateable(taskModel).ExecuteCommand();
			//}
			}
			}
			}
			@@ -1807,13 +1855,12 @@

			var listResult = new List<Result>();
			// 写入托盘输送线码垛工位目的工位、任务号，写入交互流程组托成功执行入库{若需要可以写入任务号等等其他信息}
			listResult.Add(plcConn.SetPlcDBValue(posModel.PosType, numModel.DbNumber, posModel.PlcPos, endLocatVlue));
			var modPosTask = PLCTaskAction.plcPositions.First(s => s.Text == "任务号");
			listResult.Add(plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, TaskNo));
			var modPosTaskType = PLCTaskAction.plcPositions.First(s => s.Text == "任务类型");
			listResult.Add(plcConn.SetPlcDBValue(posModel.PosType, numModel.DbNumber, posModel.PlcPos, endLocatVlue)); // 目标工位
			var modPosTask = PLCTaskAction.plcPositions.First(s => s.DeviceId == numModel.Id && s.Text == "任务号" && s.IsDelete == false);
			listResult.Add(plcConn.SetPlcDBValue(modPosTask.PosType, numModel.DbNumber, modPosTask.PlcPos, TaskNo));
			var modPosTaskType = PLCTaskAction.plcPositions.First(s => s.DeviceId == numModel.Id && s.Text == "任务类型" && s.IsDelete == false);
			var taskTypeStr = (int)taskModel.TaskType;
			listResult.Add(plcConn.SetPlcDBValue(modPosTaskType.PosType, modDevice.DbNumber, modPosTaskType.PlcPos, taskTypeStr.ToString()));

			listResult.Add(plcConn.SetPlcDBValue(modPosTaskType.PosType, numModel.DbNumber, modPosTaskType.PlcPos, taskTypeStr.ToString()));

			if (listResult.All(s => s.IsSucceed))
			{