JC23WCS.git - Gitblit

			@@ -21,6 +21,8 @@
			public static class PLCService
			{
			private static readonly object OLock = new object();
			private static readonly object RuKuLock = new object();
			private static readonly object OutLock = new object();

			private static readonly ISqlSugarClient _db = SqlSugarSetup.ITenant.GetConnectionScope(SqlSugarConst.MainConfigId);
			private static decimal weight94 = 0;
			@@ -92,7 +94,7 @@
			if (modTask.TaskType == TaskTypeEnum.Move)
			{
			// 移库目标地址
			taskInfo = PLCCommon.GetEndPai(modTask.EndLocate.Substring(1, 2), modTask.EndLocate.Substring(2, 2),
			taskInfo = PLCCommon.GetEndPai(modTask.EndRoadway.Substring(1, 2), modTask.EndLocate.Substring(2, 2),
			modTask.EndLocate.Substring(0, 2), modTask.EndLocate.Substring(4, 2),
			modTask.EndLocate.Substring(6, 2));

			@@ -108,7 +110,7 @@
			{
			#region 跨跺机任务处理 ###########
			// 判断目标位置是否是跨跺机出库工位
			if (modTask.EndLocate == "266" && modTask.StartRoadway != "R05")
			if (modTask.EndLocate == "266")// && modTask.StartRoadway != "R05"
			{
			// 判断入库工位是否存在未完成的入库任务
			var modInTask = _db.Queryable<WcsTask>().OrderBy(m => m.Levels, OrderByType.Asc).OrderBy(m => m.CreateTime, OrderByType.Asc)
			@@ -133,17 +135,19 @@
			break;
			}
			}

			string aaa = PLCCommon.RoadwayToOutStationNum(modTask.StartRoadway, "1"); // 获取1楼中专工位号
			taskInfo.Ip = PLCCommon.GetPlcIp(aaa).PlcIP;
			taskInfo.EndPai = "2";
			taskInfo.EndLie = "60";
			taskInfo.EndCeng = "1";
			taskInfo.EndStation = aaa;
			if (modTask.StartRoadway != "R05")
			{
			string aaa = PLCCommon.RoadwayToOutStationNum(modTask.StartRoadway, "1"); // 获取1楼中专工位号
			taskInfo.Ip = PLCCommon.GetPlcIp(aaa).PlcIP;
			taskInfo.EndPai = "2";
			taskInfo.EndLie = "60";
			taskInfo.EndCeng = "1";
			taskInfo.EndStation = aaa;
			}

			}

			if (modTask.EndLocate == "265" && modTask.StartRoadway != "R05" && modTask.StartRoadway != "R06")
			if (modTask.EndLocate == "265") // && modTask.StartRoadway != "R05" && modTask.StartRoadway != "R06"
			{
			// 判断入库工位是否存在未完成的入库任务
			var modInTask = _db.Queryable<WcsTask>().OrderBy(m => m.Levels, OrderByType.Asc).OrderBy(m => m.CreateTime, OrderByType.Asc)
			@@ -168,13 +172,15 @@
			break;
			}
			}

			string aaa = PLCCommon.RoadwayToOutStationNum(modTask.StartRoadway, "1"); // 获取1楼中专工位号
			taskInfo.Ip = PLCCommon.GetPlcIp(aaa).PlcIP;
			taskInfo.EndPai = "2";
			taskInfo.EndLie = "60";
			taskInfo.EndCeng = "1";
			taskInfo.EndStation = aaa;
			if (modTask.StartRoadway != "R05" && modTask.StartRoadway != "R06")
			{
			string aaa = PLCCommon.RoadwayToOutStationNum(modTask.StartRoadway, "1"); // 获取1楼中专工位号
			taskInfo.Ip = PLCCommon.GetPlcIp(aaa).PlcIP;
			taskInfo.EndPai = "2";
			taskInfo.EndLie = "60";
			taskInfo.EndCeng = "1";
			taskInfo.EndStation = aaa;
			}
			}

			// 写入放货工位固定地址
			@@ -259,7 +265,7 @@
			// 写入跺机任务下发完成
			var ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "830");

			// 将移库任务待执行改为正在执行
			// 将任务待执行改为正在执行
			_db.Updateable<WcsTask>()
			.SetColumns(s => s.Status == TaskStatusEnum.Doing)
			.Where(s => s.Id == modTask.Id)
			@@ -378,6 +384,14 @@
			var retc = plcConveyorConn.SetPlcDBValue(ConveyorMod.PosType, ConveyorMod.DbNumber, ConveyorMod.WcsPos, "640");
			if (retc.IsSucceed)
			{
			// 再次读取wcs控制字,确保写入成功640
			var (ress2, va1s2) = plcConveyorConn.GetPlcDBValue(ConveyorMod.PosType, ConveyorMod.DbNumber, ConveyorMod.WcsPos);
			if (va1s2.ToString() == "630")//还是等于630说明640没有写入成功，再次写入640
			{
			retc = plcConveyorConn.SetPlcDBValue(ConveyorMod.PosType, ConveyorMod.DbNumber, ConveyorMod.WcsPos, "640");
			Log.Information($"840垛机取货完成写入640失败后再次写入，DbNumber：{ConveyorMod.DbNumber}");
			}

			modcTaskMonitor.InteractiveMsg = string.Format("工位：{0},写入取货完成:640", startStationVal);
			// 插入交互日志
			_db.Insertable(modcTaskMonitor).ExecuteCommand();
			@@ -824,14 +838,14 @@
			break;
			case TaskTypeEnum.Move: // 移库任务
			{
			var modPosTask = modDevice.listStation.FirstOrDefault(s => s.Text == "任务号");
			var result = plcConn.SetPlcDBValueRepeat(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, "870");
			//var modPosTask = modDevice.listStation.FirstOrDefault(s => s.Text == "任务号");
			//var result = plcConn.SetPlcDBValueRepeat(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, modTask.TaskNo);
			//if (!result.IsSucceed)
			//{
			// Log.Error($"{modDevice.Text}写入任务号失败");
			// break;
			//}
			var result = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "870");
			if (!result.IsSucceed)
			{
			Log.Error($"{modDevice.Text}控制字写入870失败");
			@@ -1814,9 +1828,12 @@
			#endregion

			var http = new HttpService();
			string TaskNo = "";
			// 向WMS申请储位信息
			strMsg = http.RequestLocate(palletVal, modDevice.StationNum, taskModel, roadway, ref TaskNo, (int)taskInfo2.PalletQty);
			string TaskNo = "";
			lock (RuKuLock)
			{
			// 向WMS申请储位信息
			strMsg = http.RequestLocate(palletVal, modDevice.StationNum, taskModel, roadway, ref TaskNo, (int)taskInfo2.PalletQty);
			}

			// 根据任务号获取起始工位地址，根据起始工位地址获取LEDIP 推送到LED屏幕。
			var taskInfo = _db.Queryable<WcsTask>().First(w => w.TaskNo == TaskNo);
			@@ -2388,15 +2405,18 @@
			TaskType = ((int)TaskTypeEnum.Out).ToString(),
			TaskStatus = ((int)TaskStatusEnum.Complete).ToString()
			};
			HttpService httpService = new HttpService();
			var modResponseTask = httpService.RequestTask(requestMode).Result;
			if (modResponseTask.StatusCode == 0)
			{
			modInsertTaskMonitor.InteractiveMsg += "，返回给WMS任务完成";
			}
			else
			{
			Log.Error(string.Format("任务反馈失败：StatusCode：{0};Msg：{1}", modResponseTask.StatusCode, modResponseTask.Msg));
			lock(OutLock)
			{
			HttpService httpService = new HttpService();
			var modResponseTask = httpService.RequestTask(requestMode).Result;
			if (modResponseTask.StatusCode == 0)
			{
			modInsertTaskMonitor.InteractiveMsg += "，返回给WMS任务完成";
			}
			else
			{
			Log.Error(string.Format("任务反馈失败：StatusCode：{0};Msg：{1}", modResponseTask.StatusCode, modResponseTask.Msg));
			}
			}
			}