From 3d2f1d836cd271a51f0c02b99f538070a783139d Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期一, 23 九月 2024 08:17:15 +0800
Subject: [PATCH] 增加WCS接受WMS下发任务的方法
---
Admin.NET/WCS.Application/PLC/PLCService.cs | 187 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 155 insertions(+), 32 deletions(-)
diff --git a/Admin.NET/WCS.Application/PLC/PLCService.cs b/Admin.NET/WCS.Application/PLC/PLCService.cs
index 87b4c3c..0a425c0 100644
--- a/Admin.NET/WCS.Application/PLC/PLCService.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCService.cs
@@ -10,6 +10,7 @@
using System;
using System.Data;
using System.Reflection.Emit;
+using WCS.Application.Util;
namespace WCS.Application;
public static class PLCService
@@ -70,7 +71,7 @@
}
// 鏍规嵁鐩爣鍦板潃鍜屽贩閬撹幏鍙栨斁璐у伐浣嶅搴旂殑鎺掑垪灞�
- PlcTaskInfo taskInfo = PLCCommon.GetCTaskInfo(modTask.EndLocate, modTask.TaskType.ToString(),
+ PlcTaskInfo taskInfo = PLCCommon.GetCTaskInfo(modTask.EndLocate, ((int)modTask.TaskType).ToString(),
modTask.StartRoadway, modTask.EndRoadway);
// 鐩爣宸ヤ綅涓嶄负null锛岄渶鍏堝垽鏂斁璐у伐浣嶆槸鍚︾┖闂�
@@ -197,7 +198,7 @@
{
// 鑾峰彇浠诲姟淇℃伅
string tasknoVal = val.ToString();
- var modTask = _db.Queryable<WcsTask>().First(m => m.Status == TaskStatusEnum.Doing && m.TaskNo == tasknoVal && m.IsDelete == true);
+ var modTask = _db.Queryable<WcsTask>().First(m => m.Status == TaskStatusEnum.Doing && m.TaskNo == tasknoVal && m.IsDelete == false);
if (modTask == null)
{
Log.Error(string.Format("PLC鎺у埗瀛�840:鏈壘鍒板搴旂殑浠诲姟銆�"));
@@ -218,16 +219,16 @@
{
// 鑾峰彇璺烘満璧峰宸ヤ綅鐐逛綅閰嶇疆,璇诲彇璧峰宸ヤ綅
var modPosStartStation = modDevice.listStation.FirstOrDefault(m => m.Text == "璧峰宸ヤ綅");
- var (startStationRes, startStationVal) = plcConn.GetPlcDBValue(PLCDataTypeEnum.String, modDevice.DbNumber, modPosStartStation.PlcPos);
+ var (startStationRes, startStationVal) = plcConn.GetPlcDBValue(PLCDataTypeEnum.Short, modDevice.DbNumber, modPosStartStation.PlcPos);
if (startStationRes.IsSucceed)
{
// 鏍规嵁宸ヤ綅鍙疯幏鍙栧搴旂殑杈撻�佺嚎IP
- var plcConveyorConn = PLCCommon.GetPlcIp(startStationVal);
+ var plcConveyorConn = PLCCommon.GetPlcIp(startStationVal.ToString());
if (plcConveyorConn.Connected)
{
// 鍚戝彇璐у伐浣嶅啓鍏ユ祦绋嬪瓧640 鍙栬揣宸插畬鎴�
- var ConveyorMod = PLCTaskAction.plcDevices.First(m => m.StationNum == startStationVal
- && m.DeviceType == DeviceTypeEnum.Business && m.IsDelete == true);
+ var ConveyorMod = PLCTaskAction.plcDevices.First(m => m.StationNum == startStationVal.ToString()
+ && m.DeviceType == DeviceTypeEnum.Business && m.IsDelete == false);
var retc = plcConveyorConn.SetPlcDBValue(ConveyorMod.PosType, ConveyorMod.DbNumber, ConveyorMod.WcsPos, "640");
var modcTaskMonitor = new WcsTaskMonitor()
{
@@ -236,7 +237,7 @@
PlcName = ConveyorMod.Text,
PalletNo = modTask.PalletNo,
Status = TaskStatusEnum.Complete,
- StartLocat = startStationVal,
+ StartLocat = startStationVal.ToString(),
EndLocat = modTask.EndLocate // 鐩爣鍌ㄤ綅鍦板潃
};
if (!retc.IsSucceed)
@@ -283,6 +284,11 @@
// 璁板綍浠诲姟鏄庣粏
modInsertTaskMonitor.InteractiveMsg = string.Format("鍌ㄤ綅鍦板潃锛歿0}鍙栬揣瀹屾垚", modTask.StartLocate);
modInsertTaskMonitor.EndLocat = endStation; // 鏀捐揣宸ヤ綅
+
+ // 鎻掑叆浜や簰鏃ュ織
+ _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
+ //涓嬪彂浠诲姟鏃ュ織
+ HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
}
else
{
@@ -295,12 +301,13 @@
modInsertTaskMonitor.InteractiveMsg = string.Format("鍌ㄤ綅鍦板潃锛歿0}鍙栬揣瀹屾垚", modTask.StartLocate);
modInsertTaskMonitor.EndLocat = endStation; // 鐩爣鍌ㄤ綅
- }
- // 鎻掑叆浜や簰鏃ュ織
- _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
- //涓嬪彂浠诲姟鏃ュ織
- HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+ // 鎻掑叆浜や簰鏃ュ織
+ _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
+ //涓嬪彂浠诲姟鏃ュ織
+ HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+ }
+
//淇敼led灞忎俊鎭�
//LedDisplay(modDevice.LedIP, "宸ヤ綅:" + modTask.EndLocate, "鍑哄簱涓� " + $"鍌ㄤ綅鍦板潃锛歿modTask.StartLocate}", "鎵樼洏鍙�:" + modTask.PalletNo);
}
@@ -315,7 +322,7 @@
if (res.IsSucceed)
{
string tasknoVal = val.ToString();
- var modTask = _db.Queryable<WcsTask>().First(m => m.Status == TaskStatusEnum.Doing && m.TaskNo == tasknoVal && m.IsDelete == true);
+ var modTask = _db.Queryable<WcsTask>().First(m => m.Status == TaskStatusEnum.Doing && m.TaskNo == tasknoVal && m.IsDelete == false);
if (modTask == null)
{
Log.Error(string.Format("璺烘満鎺у埗瀛�860:鏈壘鍒板搴旂殑浠诲姟銆�"));
@@ -352,24 +359,35 @@
if (modTask.Origin == "WMS")
{
// 鍙嶉WMS
- var requestMode = new TaskRequest()
+ var requestMode = new TaskRequestWMS()
{
TaskNo = modTask.TaskNo,
PalletNo = modTask.PalletNo,
- TaskType = TaskTypeEnum.In,
- TaskStatus = TaskStatusEnum.Complete
+ TaskType = ((int)TaskTypeEnum.In).ToString(),
+ TaskStatus = ((int)TaskStatusEnum.Complete).ToString()
};
HttpService httpService = new HttpService();
var modResponseTask = httpService.RequestTask(requestMode).Result;
- if (modResponseTask.StatusCode == "0")
+ if (modResponseTask.StatusCode == 0)
{
modTaskMonitor.InteractiveMsg = "浠诲姟瀹屾垚锛岃繑鍥炵粰WMS浠诲姟瀹屾垚";
}
+ else
+ {
+ Log.Error(string.Format("浠诲姟鍙嶉澶辫触锛歋tatusCode锛歿0};Msg锛歿1}", modResponseTask.StatusCode, modResponseTask.Msg));
+ }
}
+ // 鏍规嵁浠诲姟鍙疯幏鍙栬捣濮嬪伐浣嶅湴鍧�锛屾牴鎹捣濮嬪伐浣嶅湴鍧�鑾峰彇LEDIP 鎺ㄩ�佸埌LED灞忓箷銆�
+ var taskInfo = _db.Queryable<WcsTask>().First(w => w.TaskNo == modTask.TaskNo);
+ modDevice.LedIP = _db.Queryable<WcsDevice>().Where(w => w.StationNum == taskInfo.StartLocate).Select(s => s.LedIP).First();
+
// 鎻掑叆浜や簰鏃ュ織
_db.Insertable(modTaskMonitor).ExecuteCommand();
//涓嬪彂浠诲姟鏃ュ織
HubUtil.PublicTaskMonitor(modTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+
+ // led鏄剧ず鍐呭
+ LedDisplay(modDevice.LedIP, "宸ヤ綅:" + modTask.StartLocate, "鍏ュ簱瀹屾垚 " + $"浠诲姟瀹屾垚:{modTask.TaskNo}", "鎵樼洏鍙�:" + modTask.PalletNo);
// 姝ゅ娣诲姞涓嶇┖璺戜笟鍔�
}
@@ -478,16 +496,16 @@
if (modTask.Origin == "WMS")
{
// 鍙嶉WMS
- var requestMode = new TaskRequest()
+ var requestMode = new TaskRequestWMS()
{
TaskNo = modTask.TaskNo,
PalletNo = modTask.PalletNo,
- TaskType = TaskTypeEnum.Move,
- TaskStatus = TaskStatusEnum.Complete
+ TaskType = TaskTypeEnum.Move.ToString(),
+ TaskStatus = TaskStatusEnum.Complete.ToString()
};
HttpService httpService = new HttpService();
var modResponseTask = httpService.RequestTask(requestMode).Result;
- if (modResponseTask.StatusCode == "0")
+ if (modResponseTask.StatusCode == 0)
{
modcTaskMonitor.InteractiveMsg = "浠诲姟瀹屾垚锛岃繑鍥炵粰WMS浠诲姟瀹屾垚";
//淇敼鍌ㄤ綅淇℃伅 浠诲姟绫诲瀷 鎵ц鐘舵�� 璧峰浣嶇疆 鐩爣浣嶇疆
@@ -643,6 +661,82 @@
}
}
/// <summary>
+ /// 鍫嗗灈鏈轰笉绌鸿窇
+ /// </summary>
+ /// <param name="modTask">鎿嶄綔瀹屾垚鐨勪换鍔�</param>
+ /// <param name="plcConn">plc杩炴帴</param>
+ private static void ContinuousOperation(WcsTask modTask, PLCUtil plcConn)
+ {
+ //鍒� todo:涓婇潰浠ｇ爜鎷挎潵鐨勶紝杩欓噷涓嶇悊瑙ｄ负鍟ユ槸1,2 涓嶆槸2,2锛�
+ int col = modTask.EndLocate.Substring(1, 2).ToInt();
+ int row = modTask.EndLocate.Substring(0, 2).ToInt();
+ int storey = modTask.EndLocate.Substring(4, 2).ToInt();
+ int deep = modTask.EndLocate.Substring(6, 2).ToInt();
+ // 鏌ヨ鎵�鏈夊緟鎵ц鐨勪换鍔�
+ var listTask = _db.Queryable<WcsTask>().Where(s => s.Status == TaskStatusEnum.Wait).ToList();
+ switch (modTask.TaskType)
+ {
+ case TaskTypeEnum.In:
+ {
+ // 鍏堟壘鍑哄搴旀帓鍒楀眰鐨勫叆搴撲换鍔�
+ var listInTask = listTask.Where(s => s.TaskType == TaskTypeEnum.In)
+ .Select(s => s.EndLocate.Substring(0, 6))
+ .ToHashSet();
+
+ // 鎵惧嚭搴撲换鍔★紝瀵瑰簲宸烽亾鐨勪换鍔�
+ var listNextTask = listTask.Where(s => s.TaskType == TaskTypeEnum.Out && s.StartRoadway == modTask.EndRoadway).ToList();
+
+ foreach (var modNext in listNextTask)
+ {
+ // 濡傛灉鏈夊搴旀帓鍒楀眰鐨勫叆搴撲换鍔★紝閭ｅ氨涓嶈兘浼樺厛鎵ц
+ if (listInTask.Contains(modNext.EndLocate.Substring(0, 6)))
+ {
+ continue;
+ }
+
+ // todo: 鍐欏叆modNext浠诲姟淇℃伅缁檖lc
+ Console.WriteLine($"鍏ュ簱浠诲姟{modTask.TaskNo}鎵ц瀹屾垚鍚庯紝涓嶇┖璺戦�昏緫妫�娴嬩笅涓�浠诲姟涓簕modNext.TaskNo}");
+ break;
+ }
+ }
+ break;
+ case TaskTypeEnum.Out:
+ {
+ // 鍏堟壘鍑哄搴旀帓鍒楀眰鐨勫嚭搴撲换鍔�
+ var listInTask = listTask.Where(s => s.TaskType == TaskTypeEnum.Out)
+ .Select(s => s.EndLocate.Substring(0, 6))
+ .ToHashSet();
+
+ // 鎵惧叆搴撲换鍔★紝瀵瑰簲宸烽亾鐨勪换鍔�
+ var listNextTask = listTask.Where(s => s.TaskType == TaskTypeEnum.In && s.StartRoadway == modTask.EndRoadway).ToList();
+
+ foreach (var modNext in listNextTask)
+ {
+ // 濡傛灉鏈夊搴旀帓鍒楀眰鐨勫嚭搴撲换鍔★紝閭ｅ氨涓嶈兘浼樺厛鎵ц
+ if (listInTask.Contains(modNext.EndLocate.Substring(0, 6)))
+ {
+ continue;
+ }
+
+ // todo: 鍐欏叆modNext浠诲姟淇℃伅缁檖lc
+ Console.WriteLine($"鍑哄簱浠诲姟{modTask.TaskNo}鎵ц瀹屾垚鍚庯紝涓嶇┖璺戦�昏緫妫�娴嬩笅涓�浠诲姟涓簕modNext.TaskNo}");
+ break;
+ }
+ }
+ break;
+ case TaskTypeEnum.Move:
+ {
+ var modDevice = _db.Queryable<WcsDevice>().Where(s => s.PlcId == plcConn.PlcId && s.DeviceType == DeviceTypeEnum.Show).First();
+ var (result, value) = plcConn.GetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.PlcPos);
+ //褰撳墠鍫嗗灈鏈烘墍鍦ㄤ綅缃�
+ var height = Math.Round(value / 790000d * 200).ToInt();
+ //todo:杩欓噷鐪嬭兘涓嶈兘鎵惧埌鍫嗗灈鏈烘墍鍦ㄤ綅缃湪鍝釜鎺掑垪灞傦紝浼樺厛瀵绘壘闄勮繎鐨勪换鍔★紵
+ }
+ break;
+ }
+ }
+
+ /// <summary>
/// 杈撻�佺嚎涓氬姟澶勭悊
/// </summary>
/// <param name="modDevice"></param>
@@ -676,6 +770,10 @@
if (!strMsg.Contains("-1"))
{
+ // 鏍规嵁浠诲姟鍙疯幏鍙栬捣濮嬪伐浣嶅湴鍧�锛屾牴鎹捣濮嬪伐浣嶅湴鍧�鑾峰彇LEDIP 鎺ㄩ�佸埌LED灞忓箷銆�
+ var taskInfo = _db.Queryable<WcsTask>().First(w => w.TaskNo == TaskNo);
+ modDevice.LedIP = _db.Queryable<WcsDevice>().Where(w => w.StationNum == taskInfo.StartLocate).Select(s => s.LedIP).First();
+
// 鍐欏叆330
var ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "330");
@@ -699,9 +797,8 @@
// 閫氱煡浠诲姟鐣岄潰浠诲姟宸插瓨鍦ㄦ洿鏂� 璇锋洿鏂扮晫闈�
HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
- // led鏇存柊鍐呭
- //DataRow ConveyorsRow10 = PlcInfoDt.Select($"Level = '2' and StationNum = '{EndLocat}'")[0];
- //LedDisplay(ConveyorsRow10["LedIP"].ToString(), "宸ヤ綅:" + EndLocat, "鍑哄簱涓� " + $"鍌ㄤ綅鍦板潃锛歿StartLocat}", "鎵樼洏鍙�:" + PalletNo);
+ // led鏄剧ず鍐呭
+ LedDisplay(modDevice.LedIP, "宸ヤ綅:" + modDevice.StationNum, "鐢宠鍏ュ簱 " + $"鐩爣宸烽亾锛歿EndLocate}", "鎵樼洏鍙�:" + palletVal);
}
}
@@ -714,6 +811,7 @@
break;
case "330":
{
+
// 鍐欏叆浠诲姟 鎵樼洏绉诲姩 340
// 鑾峰彇宸ヤ綅鎵樼洏鐮佷俊鎭�
@@ -762,6 +860,8 @@
var ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "340");
+ // 鏍规嵁浠诲姟鍙疯幏鍙栬捣濮嬪伐浣嶅湴鍧�锛屾牴鎹捣濮嬪伐浣嶅湴鍧�鑾峰彇LEDIP 鎺ㄩ�佸埌LED灞忓箷銆�
+ modDevice.LedIP = _db.Queryable<WcsDevice>().Where(w => w.StationNum == modTask.StartLocate).Select(s => s.LedIP).First();
if (ret.IsSucceed)
{
@@ -784,8 +884,8 @@
// 閫氱煡浠诲姟鐣岄潰浠诲姟宸插瓨鍦ㄦ洿鏂� 璇锋洿鏂扮晫闈�
HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
- // led鏇存柊鍐呭
- //LedDisplay(modDevice.LedIP, "宸ヤ綅:" + modTask.EndLocate, "鍑哄簱涓� " + $"鍌ㄤ綅鍦板潃锛歿modTask.StartLocate}", "鎵樼洏鍙�:" + modTask.PalletNo);
+ // led鏄剧ず鍐呭
+ LedDisplay(modDevice.LedIP, "宸ヤ綅:" + modDevice.StationNum, "鍏ュ簱涓� " + $"鐩爣宸烽亾锛歿endLocatVlue}", "鎵樼洏鍙�:" + palletVal);
}
}
@@ -820,6 +920,11 @@
string TaskNo = "";
// 鍚慦MS鐢宠鍌ㄤ綅淇℃伅
strMsg = http.RequestLocate(palletVal, modDevice.StationNum, taskModel, roadway, ref TaskNo);
+
+ // 鏍规嵁浠诲姟鍙疯幏鍙栬捣濮嬪伐浣嶅湴鍧�锛屾牴鎹捣濮嬪伐浣嶅湴鍧�鑾峰彇LEDIP 鎺ㄩ�佸埌LED灞忓箷銆�
+ var taskInfo = _db.Queryable<WcsTask>().First(w => w.TaskNo == TaskNo);
+ modDevice.LedIP = _db.Queryable<WcsDevice>().Where(w => w.StationNum == taskInfo.StartLocate).Select(s => s.LedIP).First();
+
if (!strMsg.Contains("-1"))
{
// 鍐欏叆娴佺▼瀛� 630
@@ -845,9 +950,8 @@
// 閫氱煡浠诲姟鐣岄潰浠诲姟宸插瓨鍦ㄦ洿鏂� 璇锋洿鏂扮晫闈�
HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
- // led鏇存柊鍐呭
- //DataRow ConveyorsRow10 = PlcInfoDt.Select($"Level = '2' and StationNum = '{EndLocat}'")[0];
- //LedDisplay(ConveyorsRow10["LedIP"].ToString(), "宸ヤ綅:" + EndLocat, "鍑哄簱涓� " + $"鍌ㄤ綅鍦板潃锛歿StartLocat}", "鎵樼洏鍙�:" + PalletNo);
+ // led鏄剧ず鍐呭
+ LedDisplay(modDevice.LedIP, "宸ヤ綅:" + modDevice.StationNum, "鍏ュ簱涓� " + $"鐢宠鍌ㄤ綅鍦板潃:{strMsg}", "鎵樼洏鍙�:" + palletVal);
}
}
else
@@ -906,7 +1010,9 @@
string lie = int.Parse(endLocate.Substring(2, 2)).ToString();
string ceng = int.Parse(endLocate.Substring(4, 2)).ToString();
- var djMod = PLCTaskAction.plcDevices.First(m => m.StationNum == modTask.EndRoadway
+ var djmodel = _db.Queryable<WcsPlc>().First(m => m.IP == sInfo.Ip);
+
+ var djMod = PLCTaskAction.plcDevices.First(m => m.PlcId == djmodel.Id
&& m.DeviceType == DeviceTypeEnum.Business && m.IsDelete == false);
var djInfos = PLCTaskAction.plcPositions.Where(m => m.IsDelete == false && m.DeviceId == djMod.Id).ToList();
var djInfo = djInfos.First(m => m.Text == "PLC娴佺▼瀛�");
@@ -914,7 +1020,7 @@
// 鑾峰彇璺烘満褰撳墠鐘舵��
var (djRes, djVal) = plcStackeConn.GetPlcDBValue(djMod.PosType, djMod.DbNumber, djMod.PlcPos);
- if (!djRes.IsSucceed || djVal != "820")
+ if (!djRes.IsSucceed || djVal.ToString() != "820")
{
// 璺烘満闈炵┖闂茬瓑寰�
break;
@@ -928,7 +1034,7 @@
var modPosTaskType = djInfos.FirstOrDefault(s => s.Text == "浠诲姟绫诲瀷");
var taskTypeStr = (int)modTask.TaskType;
listResult.Add(plcStackeConn.SetPlcDBValue(modPosTaskType.PosType, djMod.DbNumber, modPosTaskType.PlcPos, taskTypeStr.ToString()));
- var modPosPalletNo = djInfos.FirstOrDefault(s => s.Text == "鎵樼洏鍙�");
+ var modPosPalletNo = djInfos.FirstOrDefault(s => s.Text == "鎵樼洏鐮�");
listResult.Add(plcStackeConn.SetPlcDBValue(modPosPalletNo.PosType, djMod.DbNumber, modPosPalletNo.PlcPos, modTask.PalletNo));
//璧峰宸ヤ綅
@@ -1126,6 +1232,23 @@
}
}
+ /// <summary>
+ /// Led灞忓睍绀轰俊鎭�
+ /// </summary>
+ /// <param name="ip">鍦板潃</param>
+ /// <param name="top">涓婃柟鍖哄煙</param>
+ /// <param name="content">涓棿鍖哄煙</param>
+ /// <param name="foot">搴曢儴鍖哄煙</param>
+ private static void LedDisplay(string ip, string top, string content, string foot)
+ {
+ try
+ {
+ LedDll Led = new LedDll();
+ Led.LEDstr(ip, top, content, foot);
+ }
+ catch { }
+ }
+
private static void Test(WcsDeviceDto modDevice)
{
//鍐欐娴嬭瘯璇籹tring
--
Gitblit v1.8.0