From f44c5df9cc045644982f578fb0b3c3e60b88eb68 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期三, 25 九月 2024 18:54:17 +0800
Subject: [PATCH] 修改分拣任务读取
---
Admin.NET/WCS.Application/PLC/PLCService.cs | 251 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 235 insertions(+), 16 deletions(-)
diff --git a/Admin.NET/WCS.Application/PLC/PLCService.cs b/Admin.NET/WCS.Application/PLC/PLCService.cs
index 5e49384..74c5438 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.Entity;
using WCS.Application.Util;
namespace WCS.Application;
@@ -26,16 +27,16 @@
switch (mod.Type)
{
case PLCTypeEnum.StackingMachine:
- StackingMachine(mod);
+ StackingMachine(mod); // 璺烘満
break;
case PLCTypeEnum.ConveyorLine:
- ConveyorLine(mod);
+ ConveyorLine(mod); // 鎵樼洏杈撻�佺嚎
break;
case PLCTypeEnum.AGV:
- AGV(mod);
+ AGV(mod); // AGV璋冨害
break;
- case PLCTypeEnum.PalletMachine:
- PalletMachine(mod);
+ case PLCTypeEnum.RobotPalletizer:
+ RobotPalletizer(mod); // 鐮佸灈鏈哄櫒浜�
break;
case PLCTypeEnum.StackingRobot:
PalletMachine(mod);
@@ -332,7 +333,7 @@
//涓嬪彂浠诲姟鏃ュ織
HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
}
-
+
//淇敼led灞忎俊鎭�
//LedDisplay(modDevice.LedIP, "宸ヤ綅:" + modTask.EndLocate, "鍑哄簱涓� " + $"鍌ㄤ綅鍦板潃锛歿modTask.StartLocate}", "鎵樼洏鍙�:" + modTask.PalletNo);
}
@@ -397,7 +398,7 @@
{
modTaskMonitor.InteractiveMsg = "浠诲姟瀹屾垚锛岃繑鍥炵粰WMS浠诲姟瀹屾垚";
}
- else
+ else
{
Log.Error(string.Format("浠诲姟鍙嶉澶辫触锛歋tatusCode锛歿0};Msg锛歿1}", modResponseTask.StatusCode, modResponseTask.Msg));
}
@@ -697,15 +698,12 @@
/// </summary>
/// <param name="modTask">鎿嶄綔瀹屾垚鐨勪换鍔�</param>
/// <param name="plcConn">plc杩炴帴</param>
- private static void ContinuousOperation(WcsTask modTask, PLCUtil plcConn)
+ /// <param name="modDevice">璁惧淇℃伅</param>
+ private static void ContinuousOperation(WcsTask modTask, PLCUtil plcConn, WcsDeviceDto modDevice)
{
- //鍒� 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();
+ WcsTask modNextTask = null;
switch (modTask.TaskType)
{
case TaskTypeEnum.In:
@@ -728,6 +726,7 @@
// todo: 鍐欏叆modNext浠诲姟淇℃伅缁檖lc
Console.WriteLine($"鍏ュ簱浠诲姟{modTask.TaskNo}鎵ц瀹屾垚鍚庯紝涓嶇┖璺戦�昏緫妫�娴嬩笅涓�浠诲姟涓簕modNext.TaskNo}");
+ modNextTask = modNext;
break;
}
}
@@ -752,19 +751,103 @@
// todo: 鍐欏叆modNext浠诲姟淇℃伅缁檖lc
Console.WriteLine($"鍑哄簱浠诲姟{modTask.TaskNo}鎵ц瀹屾垚鍚庯紝涓嶇┖璺戦�昏緫妫�娴嬩笅涓�浠诲姟涓簕modNext.TaskNo}");
+ modNextTask = modNext;
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 modDevicePos = _db.Queryable<WcsDevice>().Where(s => s.PlcId == plcConn.PlcId && s.DeviceType == DeviceTypeEnum.Show).First();
+ var (result, value) = plcConn.GetPlcDBValue(modDevicePos.PosType, modDevicePos.DbNumber, modDevicePos.PlcPos);
//褰撳墠鍫嗗灈鏈烘墍鍦ㄤ綅缃�
var height = Math.Round(value / 790000d * 200).ToInt();
//todo:杩欓噷鐪嬭兘涓嶈兘鎵惧埌鍫嗗灈鏈烘墍鍦ㄤ綅缃湪鍝釜鎺掑垪灞傦紝浼樺厛瀵绘壘闄勮繎鐨勪换鍔★紵
}
break;
+ }
+ if (modNextTask != null)
+ {
+ // 鑾峰彇杞崲鍚庣殑璧峰鎺掑垪灞� 06010101
+ PlcTaskInfo startTaskInfo = PLCCommon.GetEndPai(modTask.StartRoadway.Substring(1, 2), modTask.StartLocate.Substring(2, 2),
+ modTask.StartLocate.Substring(0, 2), modTask.StartLocate.Substring(4, 2),
+ modTask.StartLocate.Substring(6, 2));
+
+ // 缁橮LC鍐欏叆浠诲姟鏁版嵁
+ var listResult = new List<Result>();
+ // 浠诲姟鍙锋墭鐩樺彿
+ var modPosTask = modDevice.listStation.FirstOrDefault(s => s.Text == "浠诲姟鍙�");
+ listResult.Add(plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, modTask.TaskNo));
+ var modPosPalletNo = modDevice.listStation.FirstOrDefault(s => s.Text == "鎵樼洏鐮�");
+ listResult.Add(plcConn.SetPlcDBValue(modPosPalletNo.PosType, modDevice.DbNumber, modPosPalletNo.PlcPos, modTask.PalletNo));
+ // 璧峰鎺掑垪灞�
+ var modPosRow = modDevice.listStation.FirstOrDefault(s => s.Text == "鍙栬揣鎺�");
+ listResult.Add(plcConn.SetPlcDBValue(modPosRow.PosType, modDevice.DbNumber, modPosRow.PlcPos, startTaskInfo.EndPai));
+ var modPosColumn = modDevice.listStation.FirstOrDefault(s => s.Text == "鍙栬揣鍒�");
+ listResult.Add(plcConn.SetPlcDBValue(modPosColumn.PosType, modDevice.DbNumber, modPosColumn.PlcPos, startTaskInfo.EndLie));
+ var modPosStorey = modDevice.listStation.FirstOrDefault(s => s.Text == "鍙栬揣灞�");
+ listResult.Add(plcConn.SetPlcDBValue(modPosStorey.PosType, modDevice.DbNumber, modPosStorey.PlcPos, startTaskInfo.EndCeng));
+ // 鐩爣鏀捐揣宸ヤ綅(鍥哄畾鎺掑垪灞�)
+ PlcTaskInfo taskInfo = PLCCommon.GetCTaskInfo(modTask.EndLocate, ((int)modTask.TaskType).ToString(),
+ modTask.StartRoadway, modTask.EndRoadway);
+ var modPosEndRow = modDevice.listStation.FirstOrDefault(s => s.Text == "鏀捐揣鎺�");
+ listResult.Add(plcConn.SetPlcDBValue(modPosEndRow.PosType, modDevice.DbNumber, modPosEndRow.PlcPos, taskInfo.EndPai));
+ var modPosEndColumn = modDevice.listStation.FirstOrDefault(s => s.Text == "鏀捐揣鍒�");
+ listResult.Add(plcConn.SetPlcDBValue(modPosEndColumn.PosType, modDevice.DbNumber, modPosEndColumn.PlcPos, taskInfo.EndLie));
+ var modPosEndStorey = modDevice.listStation.FirstOrDefault(s => s.Text == "鏀捐揣灞�");
+ listResult.Add(plcConn.SetPlcDBValue(modPosEndStorey.PosType, modDevice.DbNumber, modPosEndStorey.PlcPos, taskInfo.EndCeng));
+
+ // 鏄惁鍐欏叆鎴愬姛
+ if (listResult.All(s => s.IsSucceed))
+ {
+ // 鍐欏叆璺烘満浠诲姟涓嬪彂瀹屾垚
+ 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)
+ .ExecuteCommand();
+ HubUtil.PublicTask(modTask.Adapt<WcsTaskOutput>());
+ WcsTaskMonitor modInsertTaskMonitor;
+ if (string.IsNullOrEmpty(taskInfo.EndStation))
+ {
+ // 鍚屽贩閬撶Щ搴�
+ modInsertTaskMonitor = new WcsTaskMonitor()
+ {
+ TaskNo = modTask.TaskNo,
+ PlcId = modDevice.Id,
+ PlcName = modDevice.Text,
+ InteractiveMsg = $"鍐欏叆鎸囦护锛歿modTask.StartLocate}鍌ㄤ綅====銆媨modTask.EndLocate}鍌ㄤ綅銆�",
+ PalletNo = modTask.PalletNo,
+ Status = TaskStatusEnum.Complete,
+ StartLocat = modTask.StartLocate,
+ EndLocat = modTask.EndLocate,
+ };
+ }
+ else
+ {
+ // 鍑哄簱浠诲姟 璺ㄥ贩閬撶Щ搴�
+ modInsertTaskMonitor = new WcsTaskMonitor()
+ {
+ TaskNo = modTask.TaskNo,
+ PlcId = modDevice.Id,
+ PlcName = modDevice.Text,
+ InteractiveMsg = $"鍐欏叆鎸囦护锛歿modTask.StartLocate}鍌ㄤ綅====銆媨taskInfo.EndStation}宸ヤ綅銆�",
+ PalletNo = modTask.PalletNo,
+ Status = TaskStatusEnum.Complete,
+ StartLocat = modTask.StartLocate,
+ EndLocat = modTask.EndLocate,
+ };
+ }
+
+ // 鎻掑叆浜や簰鏃ュ織
+ _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
+ //涓嬪彂浠诲姟鏃ュ織
+ HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+ //淇敼led灞忎俊鎭�
+ //LedDisplay(modDevice.LedIP, "宸ヤ綅:" + modTask.EndLocate, "鍑哄簱涓� " + $"鍌ㄤ綅鍦板潃锛歿modTask.StartLocate}", "鎵樼洏鍙�:" + modTask.PalletNo);
+ }
}
}
@@ -843,7 +926,7 @@
break;
case "330":
{
-
+
// 鍐欏叆浠诲姟 鎵樼洏绉诲姩 340
// 鑾峰彇宸ヤ綅鎵樼洏鐮佷俊鎭�
@@ -1279,7 +1362,143 @@
/// <param name="modDevice"></param>
private static void PalletMachine(WcsDeviceDto modDevice)
{
+ var plcConn = modDevice.PLCUtil;
+ switch (modDevice.Value.ToString())
+ {
+ case "220":
+ // 娉ㄩ噴1
+ {
+
+ }
+ break;
+ case "230":
+ // 娉ㄩ噴2
+ {
+
+ }
+ break;
+ case "240":
+ {
+ }
+ break;
+ default: break;
+ }
+ }
+
+ /// <summary>
+ /// 鐮佸灈鏈哄櫒浜轰笟鍔″鐞�
+ /// </summary>
+ /// <param name="modDevice"></param>
+ private static void RobotPalletizer(WcsDeviceDto modDevice)
+ {
+ var plcConn = modDevice.PLCUtil;
+ switch (modDevice.Value.ToString())
+ {
+ case "1":
+ // 涓绘壂鐢宠鍒嗛亾 wcs鍐欏叆2
+ {
+
+ var taskModel = "";
+ // 鍒ゆ柇鏄惁婕旂ず妯″紡
+ if (PLCTaskAction.boDemo)
+ {
+ // 婕旂ず妯″紡
+ taskModel = "1";
+
+ // 鐩存帴
+ }
+ else
+ {
+ // 閫氶亾鍙�
+ var modPosTask = modDevice.listStation.FirstOrDefault(s => s.Text == "閫氶亾鍙�");
+
+ // 璇诲彇plc绠辩爜
+ var modBoxNo = modDevice.listStation.FirstOrDefault(m => m.Text == "绠辩爜");
+ var (res, boxNo) = plcConn.GetPlcDBValue(PLCDataTypeEnum.String, modDevice.DbNumber, modBoxNo.PlcPos);
+ if (string.IsNullOrWhiteSpace(boxNo.ToString()))
+ {
+ // 绠辩爜涓簄ull鍐欏叆鍓旈櫎閫氶亾鍙�
+ var ret = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, "0");
+ if (ret.IsSucceed)
+ {
+ // 鍐欏叆娴佺▼鎺у埗瀛� 2
+ var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
+ if (retVal.IsSucceed)
+ {
+ Log.Error("绠辩爜涓簄ull杩涜鍓旈櫎");
+ break;
+ }
+ }
+ }
+ else
+ {
+ // 鏍规嵁绠辩爜鑾峰彇绠卞唴淇℃伅
+ string boxNoVal = boxNo.ToString();
+ var boxInfo = _db.Queryable<WcsBoxInfo>().First(w => w.IsDelete == false && w.BoxNo == boxNoVal && string.IsNullOrEmpty(w.PalletNo));
+ if (boxInfo == null)
+ {
+ // 绠变俊鎭负null鍐欏叆鍓旈櫎閫氶亾鍙�
+ var ret = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, "0");
+ if (ret.IsSucceed)
+ {
+ // 鍐欏叆娴佺▼鎺у埗瀛� 2
+ var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
+ if (retVal.IsSucceed)
+ {
+ Log.Error("绠辩爜涓簄ull鎴栧凡缁戝畾鎵樼洏锛岃繘琛屽墧闄ゃ��");
+ break;
+ }
+ }
+ }
+ // 鏍规嵁绠卞唴鍝佺鍙疯幏鍙栫爜韬茬粦瀹氬伐浣嶅強瀵瑰簲鐨勫垎閬撳彿
+ var checkTaskInfo = _db.Queryable<WcsCheckTask>().First(w => w.SkuNo == boxInfo.SkuNo && w.SkuName == boxInfo.SkuName && w.LotNo == boxInfo.LotNo);
+ if (checkTaskInfo == null)
+ {
+ // 缁戝畾淇℃伅涓簄ull鍐欏叆鍓旈櫎閫氶亾鍙�
+ var ret = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, "0");
+ if (ret.IsSucceed)
+ {
+ // 鍐欏叆娴佺▼鎺у埗瀛� 2
+ var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
+ if (retVal.IsSucceed)
+ {
+ Log.Error("绠辩爜鏈粦瀹氬垎鎷ｄ换鍔★紝杩涜鍓旈櫎銆�");
+ break;
+ }
+ }
+ }
+ else
+ {
+ // 涓巔lc浜や簰鍐欏叆鍒嗛亾鍙峰拰娴佺▼鎺у埗瀛�
+ var ret = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, checkTaskInfo.RoboatNo);
+ if (ret.IsSucceed)
+ {
+ // 鍐欏叆娴佺▼鎺у埗瀛� 2
+ var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
+ if (retVal.IsSucceed)
+ {
+ break;
+ }
+ }
+ }
+ }
+ }
+ }
+ break;
+ case "230":
+ // 娉ㄩ噴2
+ {
+
+ }
+ break;
+ case "240":
+ {
+
+ }
+ break;
+ default: break;
+ }
}
/// <summary>
--
Gitblit v1.8.0