From c58ba7324d1ca0eb0941ac2762334c19d7d92e3f Mon Sep 17 00:00:00 2001
From: liudl <673013083@qq.com>
Date: 星期日, 16 二月 2025 16:36:27 +0800
Subject: [PATCH] 演示模式修改为2个机器人同时分道
---
Admin.NET/WCS.Application/PLC/PLCService.cs | 40 +++++++++++++++++++++++++++++-----------
1 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/Admin.NET/WCS.Application/PLC/PLCService.cs b/Admin.NET/WCS.Application/PLC/PLCService.cs
index 11c55a9..cce8b64 100644
--- a/Admin.NET/WCS.Application/PLC/PLCService.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCService.cs
@@ -1749,8 +1749,22 @@
#endregion
+
}
break;
+ #region 灏忚溅鍙斁淇″彿
+ case "150":
+ { // 鑾峰彇宸ヤ綅浠诲姟鍙蜂俊鎭�
+ var strMsg = "";
+ var http = new HttpService();
+ var modPosPallet = modDevice.listStation.FirstOrDefault(m => m.Text == "鎵樼洏鐮�");
+ var (res, palletVal) = plcConn.GetPlcDBValue(PLCDataTypeEnum.String, modDevice.DbNumber, modPosPallet.PlcPos);
+ // 鑾峰彇鎵樼洏浠诲姟鍙�
+ var modPosTask = modDevice.listStation.FirstOrDefault(m => m.Text == "浠诲姟鍙�");
+ var (res1, val) = plcConn.GetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos);
+ }
+ break;
+ #endregion
default: break;
}
@@ -1816,10 +1830,13 @@
// 閫氶亾鍙�
var modPosTask = modDevice.listStation.FirstOrDefault(s => s.Text == "閫氶亾鍙�");
- // 婕旂ず妯″紡鐩存帴鍐欏叆1鍒嗛亾
- var ret = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, "1");
+ // 婕旂ず妯″紡鐩存帴鍐欏叆鍒嗛亾鍙�
+ Random random = new Random();
+ int ranNumber = random.Next(2) == 0 ? 1 : 5;
+ var ret = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, ranNumber.ToString());
if (ret.IsSucceed)
{
+ Log.Information(string.Format("鍒嗛亾鎴愬姛锛岄亾鍙锋槸锛�" + ranNumber));
// 鍐欏叆娴佺▼鎺у埗瀛� 2
var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
if (!retVal.IsSucceed)
@@ -2237,6 +2254,7 @@
}
var rowCount = _db.Updateable(boxInfo).ExecuteCommand();
+ Log.Information(string.Format("鎻掔爜鎴愬姛锛岀鐮佹槸锛�"+ boxNo, modDevice.StationNum));
if (rowCount > 0)
{
// 鎻掔爜鎴愬姛
@@ -2381,12 +2399,12 @@
}
break;
}
+ // 缁勬墭鎴愬姛鍚庡皢淇℃伅瀛樺埌log琛�
string sqlStr = $"insert into WCSBoxInfoLog select * from WCSBoxInfo where IsDelete=0 and PalletNo='{palletNo}'";
int insertCount = _db.Ado.ExecuteCommand(sqlStr);
if (insertCount > 0)
{
- // 缁勬墭鎴愬姛鍚庡皢淇℃伅瀛樺埌log琛�
- string sqlStr2 = $"delete from WCSBoxInfoLog where IsDelete=0 and PalletNo='{palletNo}'";
+ string sqlStr2 = $"delete from WCSBoxInfo where IsDelete=0 and PalletNo='{palletNo}'";
_db.Ado.ExecuteCommand(sqlStr2);
}
@@ -2487,7 +2505,7 @@
private static void StackingRobot(WcsDeviceDto modDevice)
{
var plcConn = modDevice.PLCUtil;
- if (modDevice.DbNumber == "DB131" && modDevice.DbNumber == "DB132" && modDevice.DbNumber == "DB133" && modDevice.DbNumber == "DB134")
+ if (modDevice.DbNumber == "DB131" || modDevice.DbNumber == "DB132" || modDevice.DbNumber == "DB133" || modDevice.DbNumber == "DB134")
{
switch (modDevice.Value.ToString())
{
@@ -2507,7 +2525,7 @@
// 鏍规嵁浠诲姟鍙疯幏鍙栦换鍔′俊鎭�
if (res1.IsSucceed)
{
- var modTask = _db.Queryable<WcsTask>().First(m => m.Status == TaskStatusEnum.Doing && m.TaskNo == tasknoVal && m.EndLocate == "009" && m.IsDelete == false);
+ var modTask = _db.Queryable<WcsTask>().First(m => m.TaskNo == tasknoVal && m.EndLocate == "009" && m.IsDelete == false);
if (modTask == null)
{
Log.Error(string.Format($"鍑哄簱浠诲姟鏈笅鍙戯紝璇蜂汉宸ュ鐞嗭紝鏃犳硶鎷嗗灈锛�"));
@@ -2517,22 +2535,22 @@
//閫氳繃浠诲姟鍙峰拰鎵樼洏鍙峰悜WMS鐢宠姝ゆ墭鐩樼殑鎷嗗灈淇℃伅
var http = new HttpService();
RequestBoxInfoCheckAll tasklist = http.RequestBoxCheckinfo(palletVal, tasknoVal);
- if (!tasklist.Success.Contains("-1"))
+ if (tasklist.Success != -1)
{
//鑾峰彇鎷嗗灈鐗╂枡鍝佺(闇�瑕佸鍔犵墿鏂欏垽鏂紝鍚屼竴涓墿鏂欏彿鍙兘浼氬嚭鐜颁笉鍚岀殑鐮佸灈瑙勫垯)
- var pz = _db.Queryable<WcsMateialPzInfo>().First(m => m.SkuNo == tasklist.list[0].SkuNo);
+ var pz = _db.Queryable<WcsMateialPzInfo>().First(m => m.SkuNo == tasklist.data.SkuNo);
//涓嬪彂鎷嗘墭瑙勬牸锛屾媶绠辨暟鍜屾墭鐩樹笂鎬荤鏁帮紙涓嶇粦瀹氭満鍣ㄤ汉锛屾媶鍨涗换鍔′俊鎭彧涓嬪彂涓�娆★級
// 缁橮LC鍐欏叆浠诲姟鏁版嵁
var listResult = new List<Result>();
// 鑾峰彇鎵樼洏瑙勫垯
var Standard = modDevice.listStation.FirstOrDefault(m => m.Text == "瑙勬牸");
- listResult.Add(plcConn.SetPlcDBValue(Standard.PosType, modDevice.DbNumber, Standard.PlcPos, tasklist.list[0].Standard));
+ listResult.Add(plcConn.SetPlcDBValue(Standard.PosType, modDevice.DbNumber, Standard.PlcPos, pz.PZNo));
//鎶撶鏁�
var qty = modDevice.listStation.FirstOrDefault(m => m.Text == "鎷嗙鏁伴噺");
- listResult.Add(plcConn.SetPlcDBValue(qty.PosType, modDevice.DbNumber, qty.PlcPos, tasklist.list[0].Qty.ToString()));
+ listResult.Add(plcConn.SetPlcDBValue(qty.PosType, modDevice.DbNumber, qty.PlcPos, tasklist.data.Qty.ToString()));
//鎬荤鏁�
var qtycount = modDevice.listStation.FirstOrDefault(m => m.Text == "鎬荤鏁�");
- listResult.Add(plcConn.SetPlcDBValue(qtycount.PosType, modDevice.DbNumber, qtycount.PlcPos, tasklist.list[0].QtyCount.ToString()));
+ listResult.Add(plcConn.SetPlcDBValue(qtycount.PosType, modDevice.DbNumber, qtycount.PlcPos, tasklist.data.QtyCount.ToString()));
// 鏄惁鍐欏叆鎴愬姛
--
Gitblit v1.8.0