From cb58fdbdc4391136e7176210e3f1969606f11903 Mon Sep 17 00:00:00 2001
From: lss <Lss@HanInfo>
Date: 星期四, 29 五月 2025 16:52:21 +0800
Subject: [PATCH] 合肥佳通
---
HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/TaskProcess.cs | 58 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 43 insertions(+), 15 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 2655f71..c5c8430 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/TaskProcess.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/TaskProcess.cs
@@ -124,21 +124,29 @@
//浜曟澗鍙犵洏鏈哄畨鍏ㄤ氦浜� if (TN_Task.S_NOTE == "绌烘墭鍥炲簱")
{
- if (S7Helper.WriteDpj(1002, 1))
+ var Device = Settings.deviceInfos.Where(a => a.TN_Location == TN_Task.S_START_LOC).FirstOrDefault();
+ if (Device != null)
{
- int value = S7Helper.ReadDpj(2004, S7.Net.VarType.Byte);
- if (value == 1)
+ if (S7Helper.WriteDpj(Device.address, 1002, 1))
{
- NDCApi.ChangeOrderParam(TN_Task.S_CODE.Trim(), 6, "1");
+ int value = S7Helper.ReadDpj(Device.address, 2004, S7.Net.VarType.Byte);
+ if (value == 1)
+ {
+ NDCApi.ChangeOrderParam(TN_Task.S_CODE.Trim(), 6, "1");
+ }
+ else
+ {
+ LogHelper.Info("鍙犵洏鏈哄畨鍏ㄤ氦浜掑け璐ワ紝璇诲彇VB2004鐨勫�涓簕2004}");
+ }
}
else
{
- LogHelper.Info("鍙犵洏鏈哄畨鍏ㄤ氦浜掑け璐ワ紝璇诲彇VB2004鐨勫�涓簕2004}");
+ LogHelper.Info("鍙犵洏鏈哄畨鍏ㄤ氦浜掑け璐ワ紝鍐欏叆VB1002鍊�澶辫触");
}
}
else
{
- LogHelper.Info("鍙犵洏鏈哄畨鍏ㄤ氦浜掑け璐ワ紝鍐欏叆VB1002鍊�澶辫触");
+ LogHelper.Info($"鍙犵洏鏈哄畨鍏ㄤ氦浜掑け璐ワ紝鏍规嵁浠诲姟璧风偣{TN_Task.S_START_LOC},鏈壘鍒板彔鐩樻満閰嶇疆鏂囦欢");
}
}
@@ -168,14 +176,22 @@
}
if (TN_Task.S_NOTE == "绌烘墭鍥炲簱")
{
- //鍐欏叆澶辫触閲嶆柊鍐欏叆
- while (!S7Helper.WriteDpj(1001, 1))
+ var Device = Settings.deviceInfos.Where(a => a.TN_Location == TN_Task.S_START_LOC).FirstOrDefault();
+ if (Device != null)
{
- Thread.Sleep(1000);
+ //鍐欏叆澶辫触閲嶆柊鍐欏叆
+ while (!S7Helper.WriteDpj(Device.address, 1001, 1))
+ {
+ Thread.Sleep(1000);
+ }
+ while (!S7Helper.WriteDpj(Device.address, 1002, 0))
+ {
+ Thread.Sleep(1000);
+ }
}
- while (!S7Helper.WriteDpj(1002, 0))
+ else
{
- Thread.Sleep(1000);
+ LogHelper.Info($"鍙犵洏鏈哄畨鍏ㄤ氦浜掑け璐ワ紝鏍规嵁浠诲姟璧风偣{TN_Task.S_START_LOC},鏈壘鍒板彔鐩樻満閰嶇疆鏂囦欢");
}
}
}
@@ -854,7 +870,16 @@
//鍥炴姤鏁版嵁
Request<MesItemBackModel> request = new Request<MesItemBackModel>();
List<MesItemBackInfoModel> list = new List<MesItemBackInfoModel>();
-
+ string MesNo = mst.S_EQ_NO;
+ if (!string.IsNullOrEmpty(mst.S_MES_NO))
+ {
+ MesNo = mst.S_MES_NO;
+ }
+ //绮夋枡鍥炲簱涓嶉渶瑕佸洖鎶�+ if (cntritem != null && mst.S_TYPE == "浣欐枡杩斿洖" && cntritem.S_ITEM_CODE.StartsWith("4X"))
+ {
+ return;
+ }
//鑾峰彇鏃堕棿鎴� var time = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
//鐗╂枡鍒颁綅鎺ュ彛鍜岀姸鎬佸弽棣堝悓鏃惰皟IIOT锛屼负浜嗗尯鍒唅d锛岀墿鏂欏埌浣嶉暱搴﹀姞涓�尯鍒�@@ -862,7 +887,8 @@
request.UseToken = "iFQ5fExGrLYLXliHYWzs";
MesItemBackModel mesItemBackModel = new MesItemBackModel();
- mesItemBackModel.TaskNumber = mst.S_EQ_NO;
+
+ mesItemBackModel.TaskNumber = MesNo;
mesItemBackModel.WmsTaskNumber = mst.S_WMS_NO;
mesItemBackModel.Rfid = mst.S_CNTR_CODE;
mesItemBackModel.LocationNum = mst.S_END_LOC;
@@ -873,7 +899,7 @@
list.Add(new MesItemBackInfoModel()
{
LotNumber = cntritem.S_BATCH_NO,
- PartNumber = cntritem.S_ITEM_NAME,
+ PartNumber = cntritem.S_ITEM_CODE,
Subpool = cntritem.Subpool,
ReceiveLot = cntritem.ReceiveLot,
Supplier = cntritem.S_SUPPLIER_NO,
@@ -881,11 +907,13 @@
ProduceTime = cntritem.D_PRD_DATE,
Rfid = cntritem.S_CNTR_CODE,
Qty = cntritem.F_WEIGHT,
- Level = cntritem.LEV
+ PartLevel = cntritem.LEV,
+ WmsLot = cntritem.WmsLot
});
}
+
mesItemBackModel.List = list;
request.data = mesItemBackModel;
--
Gitblit v1.9.1