From 96f2053a1a93193dc5f4eb064aaf455b2d692f0c Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期五, 20 六月 2025 13:31:57 +0800
Subject: [PATCH] 优化入库流程
---
Admin.NET/WCS.Application/PLC/PLCService.cs | 175 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 110 insertions(+), 65 deletions(-)
diff --git a/Admin.NET/WCS.Application/PLC/PLCService.cs b/Admin.NET/WCS.Application/PLC/PLCService.cs
index 1f94f94..430807e 100644
--- a/Admin.NET/WCS.Application/PLC/PLCService.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCService.cs
@@ -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;
@@ -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;
+ }
}
// 鍐欏叆鏀捐揣宸ヤ綅鍥哄畾鍦板潃
@@ -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();
@@ -1200,55 +1214,59 @@
#region#瀹炴椂鏄剧ず閲嶉噺鍒癓ED灞忓箷
var modPosPalletWeightIng = modDevice.listStation.FirstOrDefault(m => m.Text == "瀹為檯閲嶉噺");
- var (resPalletWeightIng, palletWeightValIng) = plcConn.GetPlcDBValue(modPosPalletWeightIng.PosType, modDevice.DbNumber, modPosPalletWeightIng.PlcPos);
- switch (modDevice.StationNum)
+ if (modPosPalletWeightIng != null)
{
- case "094":
- {
- if (Convert.ToDecimal(palletWeightValIng) != weight94)
+ var (resPalletWeightIng, palletWeightValIng) = plcConn.GetPlcDBValue(modPosPalletWeightIng.PosType, modDevice.DbNumber, modPosPalletWeightIng.PlcPos);
+ switch (modDevice.StationNum)
+ {
+ case "094":
{
- LedDisplay(modDevice.LedIP, $"褰撳墠閲嶉噺(KG)锛歿Convert.ToDecimal(palletWeightValIng)}");
- weight94 = Convert.ToDecimal(palletWeightValIng);
+ if (Convert.ToDecimal(palletWeightValIng) != weight94)
+ {
+ LedDisplay(modDevice.LedIP, $"褰撳墠閲嶉噺(KG)锛歿Convert.ToDecimal(palletWeightValIng)}");
+ weight94 = Convert.ToDecimal(palletWeightValIng);
+ }
}
- }
- break;
- case "160":
- {
- if (Convert.ToDecimal(palletWeightValIng) != weight160)
+ break;
+ case "160":
{
- LedDisplay(modDevice.LedIP, $"褰撳墠閲嶉噺(KG)锛歿Convert.ToDecimal(palletWeightValIng)}");
- weight160 = Convert.ToDecimal(palletWeightValIng);
+ if (Convert.ToDecimal(palletWeightValIng) != weight160)
+ {
+ LedDisplay(modDevice.LedIP, $"褰撳墠閲嶉噺(KG)锛歿Convert.ToDecimal(palletWeightValIng)}");
+ weight160 = Convert.ToDecimal(palletWeightValIng);
+ }
}
- }
- break;
- case "155":
- {
- if (Convert.ToDecimal(palletWeightValIng) != weight155)
+ break;
+ case "155":
{
- LedDisplay(modDevice.LedIP, $"褰撳墠閲嶉噺(KG)锛歿Convert.ToDecimal(palletWeightValIng)}");
- weight155 = Convert.ToDecimal(palletWeightValIng);
+ if (Convert.ToDecimal(palletWeightValIng) != weight155)
+ {
+ LedDisplay(modDevice.LedIP, $"褰撳墠閲嶉噺(KG)锛歿Convert.ToDecimal(palletWeightValIng)}");
+ weight155 = Convert.ToDecimal(palletWeightValIng);
+ }
}
- }
- break;
- case "152":
- {
- if (Convert.ToDecimal(palletWeightValIng) != weight152)
+ break;
+ case "152":
{
- LedDisplay(modDevice.LedIP, $"褰撳墠閲嶉噺(KG)锛歿Convert.ToDecimal(palletWeightValIng)}");
- weight152 = Convert.ToDecimal(palletWeightValIng);
+ if (Convert.ToDecimal(palletWeightValIng) != weight152)
+ {
+ LedDisplay(modDevice.LedIP, $"褰撳墠閲嶉噺(KG)锛歿Convert.ToDecimal(palletWeightValIng)}");
+ weight152 = Convert.ToDecimal(palletWeightValIng);
+ }
}
- }
- break;
- case "153":
- {
- if (Convert.ToDecimal(palletWeightValIng) != weight153)
+ break;
+ case "153":
{
- LedDisplay(modDevice.LedIP, $"褰撳墠閲嶉噺(KG)锛歿Convert.ToDecimal(palletWeightValIng)}");
- weight153 = Convert.ToDecimal(palletWeightValIng);
+ if (Convert.ToDecimal(palletWeightValIng) != weight153)
+ {
+ LedDisplay(modDevice.LedIP, $"褰撳墠閲嶉噺(KG)锛歿Convert.ToDecimal(palletWeightValIng)}");
+ weight153 = Convert.ToDecimal(palletWeightValIng);
+ }
}
- }
- break;
+ break;
+ }
}
+
#endregion
@@ -1442,6 +1460,27 @@
var http = new HttpService();
string TaskNo = "", EndLocate = "";
+
+ //鏍规嵁宸ヤ綅鍒ゆ柇鏄惁涓哄彔鎵樻満宸ヤ綅鐢宠绌烘墭鐩樿泛鍏ュ簱锛屾槸锛氬悜WMS鐢宠绌烘墭鐩樿泛缁勬墭
+ string groupMsg = "";
+ if (modDevice.StationNum == "72")
+ {
+ groupMsg = http.BindNullPalletWcs(10, palletVal);
+
+ if (groupMsg.Contains("-1"))
+ {
+ // 鍐欏叆杈撻�佺嚎閫�鍥炴寚浠�
+ var ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modPosEndLocat.PlcPos, modDevice.StationNum);
+ if (ret.IsSucceed)
+ {
+ plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "350");
+ }
+
+ break;
+ }
+ }
+
+ //鍚慦MS鐢宠宸烽亾
strMsg = http.RequestRoadWay(palletVal, modDevice.StationNum, taskModel, louCeng, ref EndLocate, ref TaskNo, (int)palletHeightVal);
if (!strMsg.Contains("-1"))
@@ -1789,9 +1828,12 @@
#endregion
var http = new HttpService();
- string TaskNo = "";
- // 鍚慦MS鐢宠鍌ㄤ綅淇℃伅
- strMsg = http.RequestLocate(palletVal, modDevice.StationNum, taskModel, roadway, ref TaskNo, (int)taskInfo2.PalletQty);
+ string TaskNo = "";
+ lock (RuKuLock)
+ {
+ // 鍚慦MS鐢宠鍌ㄤ綅淇℃伅
+ 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);
@@ -2363,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("浠诲姟鍙嶉澶辫触锛歋tatusCode锛歿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("浠诲姟鍙嶉澶辫触锛歋tatusCode锛歿0};Msg锛歿1}", modResponseTask.StatusCode, modResponseTask.Msg));
+ }
}
}
--
Gitblit v1.8.0