From ae6edc2f0c2d5a73067c330318aff88719ba8203 Mon Sep 17 00:00:00 2001 From: hwh <332078369@qq.com> Date: 星期日, 29 九月 2024 08:01:15 +0800 Subject: [PATCH] ` --- Admin.NET/WCS.Application/PLC/PLCService.cs | 101 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 94 insertions(+), 7 deletions(-) diff --git a/Admin.NET/WCS.Application/PLC/PLCService.cs b/Admin.NET/WCS.Application/PLC/PLCService.cs index c9b3ec2..1be1883 100644 --- a/Admin.NET/WCS.Application/PLC/PLCService.cs +++ b/Admin.NET/WCS.Application/PLC/PLCService.cs @@ -861,6 +861,10 @@ var plcConn = modDevice.PLCUtil; // 鑾峰彇妤煎眰鏁癱eshi var louCeng = PLCCommon.GetRoadwayByStationNew(modDevice.StationNum); + if (louCeng == "") + { + return; + } switch (modDevice.Value.ToString()) { case "320": @@ -1345,20 +1349,95 @@ #endregion + #region 鍙┖鎵樼洏璺� case "50": // plc鐢宠绌烘墭 { // 璋冪敤WMS绌烘墭鍑哄簱鎺ュ彛锛岃繑鍥炲嚭搴撲换鍔″瓨鍏ュ嚭搴撹〃 - - // 鍐欏叆 + var strMsg = ""; + var http = new HttpService(); + strMsg = http.IssuePlnOutHouseWcs("1", "205"); + if (!strMsg.Contains("-1")) + { + // 鍐欏叆plc娴佺▼瀛�60 + var ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "60"); + } + else + { + // 鐢宠宸烽亾澶辫触锛丩ED鏄剧ず + Log.Error(string.Format($"宸ヤ綅鍙凤細{modDevice.StationNum}鐢宠绌烘墭璺哄け璐�:{strMsg};")); + } } break; case "80": // 绌烘墭鐩樿泛宸插埌浣� { + // 璋冪敤wms浠诲姟鍑哄簱浠诲姟瀹屾垚 + // 鑾峰彇璺烘満鐐逛綅閰嶇疆 + var modPosTask = modDevice.listStation.FirstOrDefault(m => m.Text == "浠诲姟鍙�"); + var (res, val) = plcConn.GetPlcDBValue(PLCDataTypeEnum.String, modDevice.DbNumber, modPosTask.PlcPos); + // 鏍规嵁浠诲姟鍙疯幏鍙栦换鍔′俊鎭� + if (res.IsSucceed) + { + string tasknoVal = val.ToString(); + var modTask = _db.Queryable<WcsTask>().First(m => m.Status == TaskStatusEnum.Doing && m.TaskNo == tasknoVal && m.IsDelete == false); + if (modTask == null) + { + Log.Error(string.Format($"宸ヤ綅鍙凤細{modDevice.StationNum}绌烘墭鐩樺埌杈撅紝鏈壘鍒板搴旂殑浠诲姟!浠诲姟鍙穥tasknoVal};")); + break; + } + // 鍐欏叆plc娴佺▼瀛�90 + var ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "90"); + if (ret.IsSucceed) + { + // 鏀瑰彉浠诲姟鐘舵�� + modTask.Status = TaskStatusEnum.Complete; + modTask.FinishDate = DateTime.Now; + _db.Updateable(modTask).ExecuteCommand(); + HubUtil.PublicTask(modTask.Adapt<WcsTaskOutput>()); + var modTaskMonitor = new WcsTaskMonitor() + { + TaskNo = modTask.TaskNo, + PlcId = modDevice.Id, + PlcName = modDevice.Text, + PalletNo = modTask.PalletNo, + Status = TaskStatusEnum.Complete, + StartLocat = modTask.StartLocate, + EndLocat = modTask.EndLocate, + InteractiveMsg = $"浠诲姟瀹屾垚" + }; + if (modTask.Origin == "WMS") + { + // 鍙嶉WMS + var requestMode = new TaskRequestWMS() + { + TaskNo = modTask.TaskNo, + PalletNo = modTask.PalletNo, + TaskType = ((int)TaskTypeEnum.Out).ToString(), + TaskStatus = ((int)TaskStatusEnum.Complete).ToString() + }; + HttpService httpService = new HttpService(); + var modResponseTask = httpService.RequestTask(requestMode).Result; + if (modResponseTask.StatusCode == 0) + { + modTaskMonitor.InteractiveMsg = "浠诲姟瀹屾垚锛岃繑鍥炵粰WMS浠诲姟瀹屾垚"; + } + else + { + Log.Error(string.Format("浠诲姟鍙嶉澶辫触锛歋tatusCode锛歿0};Msg锛歿1}", modResponseTask.StatusCode, modResponseTask.Msg)); + } + } + // 鎻掑叆浜や簰鏃ュ織 + _db.Insertable(modTaskMonitor).ExecuteCommand(); + //涓嬪彂浠诲姟鏃ュ織 + HubUtil.PublicTaskMonitor(modTaskMonitor.Adapt<WcsTaskMonitorOutput>()); + } + } } break; + #endregion + default: break; } @@ -1724,14 +1803,22 @@ if (taskModel != null) { // 鑾峰彇鍏ュ簱鍙栬揣宸ヤ綅 - string endLocatVlue = PLCCommon.RoadwayToStationNum(taskModel.EndRoadway, "2"); + string endLocatVlue = PLCCommon.RoadwayToStationNum(taskModel.EndRoadway, "2"); - // 鍐欏叆鎵樼洏杈撻�佺嚎鐮佸灈宸ヤ綅 鐩殑宸ヤ綅锛屽啓鍏ヤ氦浜掓祦绋嬬粍鎵樻垚鍔� 鎵ц鍏ュ簱{鑻ラ渶瑕佸彲浠ュ啓鍏ヤ换鍔″彿绛夌瓑鍏朵粬淇℃伅} - var retVal = plcConn.SetPlcDBValue(posModel.PosType, numModel.DbNumber, posModel.PlcPos, endLocatVlue); - if (retVal.IsSucceed) + 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 == "浠诲姟绫诲瀷"); + var taskTypeStr = (int)taskModel.TaskType; + listResult.Add(plcConn.SetPlcDBValue(modPosTaskType.PosType, modDevice.DbNumber, modPosTaskType.PlcPos, taskTypeStr.ToString())); + + + if (listResult.All(s => s.IsSucceed)) { // 鍐欏叆缁勬墭鍥炲娴佺▼瀛� - retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "50"); + var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "50"); if (retVal.IsSucceed) { // 灏嗗叆搴撲换鍔$敱姝e湪鎵ц鏀逛负姝e湪鎵ц -- Gitblit v1.8.0