From 79db8fda0f71b65dfe1e1c72f307b29efc565126 Mon Sep 17 00:00:00 2001
From: lss <2538410689@qq.com>
Date: 星期一, 04 八月 2025 17:31:22 +0800
Subject: [PATCH] 111
---
HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/TaskProcess.cs | 89 +++++++++++++++++++++++++++++++++++---------
1 files changed, 71 insertions(+), 18 deletions(-)
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/TaskProcess.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/TaskProcess.cs
index 09726b1..15df55b 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/TaskProcess.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/TaskProcess.cs
@@ -15,6 +15,7 @@
using System.Diagnostics.Eventing.Reader;
using System.IdentityModel.Protocols.WSTrust;
using System.Linq;
+using System.Net.NetworkInformation;
using System.Security.Cryptography;
using System.Threading;
using System.Threading.Tasks;
@@ -79,6 +80,17 @@
{
//鏍规嵁瀹㈡埛鐜板満瑕佹眰锛屽鏋滃彇璐у畬鎴愪换鍔″け璐ヤ汉宸ユ媺鍒扮粓鐐癸紝鎴戜滑灏卞綋鍗歌揣瀹屾垚澶勭悊锛涘鏋滄槸浜哄伐鎷夎蛋鍒板叾瀹冨尯鍩燂紝鎴戜滑灏辫В閿佺粓鐐癸紝鍒犻櫎鎵樼洏銆� //缁堢偣缁戝畾
+ //鐗╂枡鍒颁綅閫氱煡
+ if (mst.S_TYPE == "鍑哄钩搴� || mst.S_TYPE == "浣欐枡杩斿洖")
+ {
+ string urlitem = Settings.tableUrls.Find(a => a.id == 5).url;
+ TaskProcess.MESIteminfoback(mst, urlitem);
+ }
+ if ((mst.S_NOTE == "鍑哄簱" || mst.S_NOTE == "寮傚父搴撳尯鍏ュ簱") && !string.IsNullOrEmpty(mst.S_MES_NO))
+ {
+ string urlitem = Settings.tableUrls.Find(a => a.id == 5).url;
+ TaskProcess.MESIteminfoback(mst, urlitem);
+ }
CacheBitUpdate(mst, false);
LocationHelper.UnLockLoc(mst.S_END_LOC);
}
@@ -156,6 +168,7 @@
//浜曟澗鍙犵洏鏈哄畨鍏ㄤ氦浜� if (TN_Task.S_NOTE == "绌烘墭鍥炲簱")
{
+ LogHelper.Info($"-------鍙犵洏鏈哄畨鍏ㄨ姹�-----");
var Device = Settings.deviceInfos.Where(a => a.TN_Location == TN_Task.S_START_LOC).FirstOrDefault();
if (Device != null)
{
@@ -208,9 +221,20 @@
}
if (TN_Task.S_NOTE == "绌烘墭鍥炲簱")
{
+ LogHelper.Info($"-------鍙犵洏鏈哄畨鍏ㄨ姹�-----");
var Device = Settings.deviceInfos.Where(a => a.TN_Location == TN_Task.S_START_LOC).FirstOrDefault();
if (Device != null)
{
+ if (!S7Helper.WriteDpj(Device.address, 1002, 0))
+ {
+ Task.Run(() =>
+ {
+ while (!S7Helper.WriteDpj(Device.address, 1002, 0))
+ {
+ Thread.Sleep(1000);
+ }
+ });
+ }
//鍐欏叆澶辫触閲嶆柊鍐欏叆
if (!S7Helper.WriteDpj(Device.address, 1001, 1))
{
@@ -222,16 +246,7 @@
}
});
}
- if (!S7Helper.WriteDpj(Device.address, 1002, 0))
- {
- Task.Run(() =>
- {
- while (!S7Helper.WriteDpj(Device.address, 1002, 0))
- {
- Thread.Sleep(1000);
- }
- });
- }
+
}
else
{
@@ -461,6 +476,17 @@
Console.WriteLine($"浠诲姟锛歿mst.S_CODE},璧风偣浠撳簱锛歿mst.S_START_WH}宸茬粡绂佺敤鎺ㄩ�");
return false;
}
+ var sendTask = db.Queryable<SendTask>().Where(a => a.AREA_CODE == mst.S_END_AREA && a.able == "1").First();
+ if (sendTask != null)
+ {
+ int taskNumber = WCSHelper.GetTaskByEndArea(sendTask.AREA_CODE, sendTask.loctioncode);
+ LogHelper.Info($"浠诲姟锛歿mst.S_CODE},缁堢偣浠撳簱锛歿sendTask.AREA_CODE}锛岃揣浣嶇被鍨�{sendTask.loctioncode},瀛樺湪浠诲姟鏁伴噺:{taskNumber}锛岄檺鍒朵换鍔℃暟閲忥細{sendTask.max}");
+ if (taskNumber >= sendTask.max)
+ {
+ Console.WriteLine($"浠诲姟锛歿mst.S_CODE},浠ヨ揪鍒伴檺鍒舵帹閫佹暟閲忥紝宸茬粡绂佺敤鎺ㄩ�");
+ return false;
+ }
+ }
var mstbyEqno = db.Queryable<WCSTask>().Where(a => a.S_EQ_NO == mst.S_EQ_NO).ToList();
if (mstbyEqno.Count() == 1)
@@ -672,7 +698,22 @@
// }
return result;
}
-
+ /// <summary>
+ /// 绌烘墭绛夊緟浠诲姟 瓒呮椂5鍒嗙粍鐩存帴鎺ㄩ�
+ /// </summary>
+ /// <param name="mst"></param>
+ /// <returns></returns>
+ internal static void WaitSend(WCSTask mst)
+ {
+ // 璁＄畻涓庡綋鍓嶆椂闂寸殑宸�
+ TimeSpan timeDifference = DateTime.Now - mst.T_CREATE;
+ if (timeDifference.TotalMinutes > 5)
+ {
+ var db = new SqlHelper<WCSTask>().GetInstance();
+ mst.S_B_STATE = "绛夊緟";
+ db.Updateable(mst).UpdateColumns(it => new { it.S_B_STATE }).ExecuteCommand();
+ }
+ }
/// <summary>
/// 浠诲姟鐘舵�鍥炴姤
/// </summary>
@@ -851,18 +892,30 @@
info = "agv宸插畬鎴愰�鏂欎换鍔�;
break;
}
- string message = "1";
+ string message = null;
if (status == 7) { message = "agv浠诲姟宸插彇娑�; }
int flag = 0;
if (mst.S_NOTE == "绮夋枡")
{
flag = 1;
}
+ string number = mst.S_EQ_NO;
+ if (!string.IsNullOrEmpty(mst.S_MES_NO))
+ {
+ number = mst.S_MES_NO;
+ }
//List<StatusArrive> statusArrives = new List<StatusArrive>();
StatusArrive statusArrive = new StatusArrive();
statusarrive.UseToken = "iFQ5fExGrLYLXliHYWzs";
- statusArrive.TaskNumber = mst.S_EQ_NO;
- statusArrive.LocationNum = mst.S_END_LOC;
+ statusArrive.TaskNumber = number;
+ if (status == 1 || status == 3 || status == 4)
+ {
+ statusArrive.LocationNum = mst.S_START_LOC;
+ }
+ else
+ {
+ statusArrive.LocationNum = mst.S_END_LOC;
+ }
statusArrive.Time = DateTime.Now.ToString();
statusArrive.Status = status.ToString();
statusArrive.Rfid = mst.S_CNTR_CODE;
@@ -929,7 +982,7 @@
//鐗╂枡鍒颁綅鎺ュ彛鍜岀姸鎬佸弽棣堝悓鏃惰皟IIOT锛屼负浜嗗尯鍒唅d锛岀墿鏂欏埌浣嶉暱搴﹀姞涓�尯鍒� request.RequestId = "鏉弶AGV" + time + "1";
request.UseToken = "iFQ5fExGrLYLXliHYWzs";
-
+
MesItemBackModel mesItemBackModel = new MesItemBackModel();
mesItemBackModel.TaskNumber = MesNo;
@@ -938,7 +991,7 @@
mesItemBackModel.LocationNum = mst.S_END_LOC;
mesItemBackModel.Result = "1";
mesItemBackModel.ArricalTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff");
-
+
if (cntritem != null)
{
string curBagNum = null;
@@ -970,9 +1023,9 @@
Qty = cntritem.F_WEIGHT,
PartLevel = cntritem.LEV,
WmsLot = cntritem.WmsLot,
- WeightBag = weightBag,
+ WeightBag = initBagNum,
CurBagNum = curBagNum,
- InitBagNum = initBagNum
+ InitBagNum = weightBag
});
--
Gitblit v1.9.1