From 28e5551ac4525a12bf762b4836ef37a154ed56f5 Mon Sep 17 00:00:00 2001
From: cjs <2216046164@qq.com>
Date: 星期二, 15 七月 2025 18:03:56 +0800
Subject: [PATCH] 111
---
HH.WCS.Mobox3.NongFuLinZhi/process/DeviceProcess.cs | 47 ++++++++++++++++++++++++++---------------------
1 files changed, 26 insertions(+), 21 deletions(-)
diff --git a/HH.WCS.Mobox3.NongFuLinZhi/process/DeviceProcess.cs b/HH.WCS.Mobox3.NongFuLinZhi/process/DeviceProcess.cs
index 4826fa9..a4067b6 100644
--- a/HH.WCS.Mobox3.NongFuLinZhi/process/DeviceProcess.cs
+++ b/HH.WCS.Mobox3.NongFuLinZhi/process/DeviceProcess.cs
@@ -635,7 +635,11 @@
var workInfo = db.Queryable<LinZhiBCPWorkOrder>().Where(a => a.S_PLineNo == plc.deviceName).First();
if (workInfo != null && workInfo.S_WorkState == "鎵ц涓�)
{
- LogHelper.Info($"鏌ヨ鍒版墽琛屼腑鐨勫伐鍗曪紝宸ュ崟绫诲瀷锛歿workInfo.S_PLineNo}");
+ if (workInfo.S_ItemName == "灏忓寘瑁呯洊")
+ {
+ return;
+ }
+ LogHelper.Info($"鏌ヨ鍒版墽琛屼腑鐨勫伐鍗曪紝宸ュ崟绫诲瀷锛歿workInfo.S_PLineNo},鐗╂枡缂栫爜锛歿workInfo.S_ItemCode}锛岀墿鏂欑被鍨嬶細{workInfo.S_ITEM_TYPE}");
string startArea = "";
string fullTaskType = "";
string emptyTaskType = "";
@@ -718,7 +722,9 @@
if(itemInfo != null)
{
LogHelper.Info($"getFDSXArea:鏌ヨ鍒扮墿鏂欑紪鐮侊細{itemInfo.S_ITEM_CODE}");
- if (itemInfo.S_ITEM_CODE == workInfo.S_ItemCode)
+ LogHelper.Info($"getFDSXArea:鏌ヨ鍒扮墿鏂欐壒娆★細{itemInfo.S_BATCH_NO}");
+ if (workInfo.S_PLineNo.Contains("鐡跺澂")) workInfo.S_ITEM_TYPE = "";
+ if (itemInfo.S_ITEM_CODE + itemInfo.S_BATCH_NO == workInfo.S_ItemCode + workInfo.S_ITEM_TYPE)
{
result = a;
break;
@@ -754,20 +760,6 @@
LogHelper.Info($"{plc.deviceName}-{plc.address}-{data}", "鐡跺澂鏈�);
var db = new SqlHelper<object>().GetInstance();
- LogHelper.Info($"鐡跺澂鏈猴紝鏌ヨ浠诲姟缁堢偣锛歿plc.TN_Location[0]}");
- if (LineState.Keys.Contains(plc.TN_Location[0]))
- {
- LogHelper.Info("鐡跺澂鏈哄寘鍚浠诲姟缁堢偣");
- LineState[plc.TN_Location[0]].status = data;
- LineState[plc.TN_Location[0]].modify = DateTime.Now;
- }
- else
- {
- LogHelper.Info("鐡跺澂鏈烘湭鍖呭惈璇ヤ换鍔＄粓鐐�);
- LineState.Add(plc.TN_Location[0], new statemodel { status = data, modify = DateTime.Now });
- }
-
-
var workInfo = db.Queryable<LinZhiBCPWorkOrder>().Where(a => a.S_PLineNo == plc.deviceName).First();
if (workInfo != null && workInfo.S_WorkState == "鎵ц涓�)
{
@@ -787,9 +779,9 @@
//endArea = Settings.GetLinJiangBCPAreaList().Where(a => a.AreaName == "鐡跺澂婊℃墭" && a.Enable == "1").FirstOrDefault().AreaNo;
if (data.Length == 8)
{
- if (data.Substring(0,2) == "12") LinZhialysisBottleCapAndPreformTwo(plc, db, workInfo, endArea, taskType, plc.TN_Location[0], "鐡跺澂鏈�);
+ if (data.Substring(0, 2) == "12") LinZhialysisBottleCapAndPreformTwo(plc, db, workInfo, endArea, taskType, plc.TN_Location[0], "鐡跺澂鏈�, data);
- if (data.Substring(2,2) == "22") LinZhialysisBottleCapAndPreformTwo(plc, db, workInfo, endArea, taskType, plc.TN_Location[1], "鐡跺澂鏈�);
+ if (data.Substring(2, 2) == "22") LinZhialysisBottleCapAndPreformTwo(plc, db, workInfo, endArea, taskType, plc.TN_Location[1], "鐡跺澂鏈�, data);
}
}
else LogHelper.Info($"鐡跺澂鏈猴細{plc.deviceName} 鏈紑鍚伐鍗曪紝涓嶅彲瑙﹀彂婊℃墭涓嬬嚎", "鐡跺澂鏈�);
@@ -806,9 +798,22 @@
/// <param name="taskType"></param>
/// <param name="deviceBit"></param>
/// <param name="type"></param>
- private static void LinZhialysisBottleCapAndPreformTwo(Settings.deviceInfo plc, SqlSugar.SqlSugarClient db, LinZhiBCPWorkOrder workInfo, string endArea, string taskType, string deviceBit, string type)
+ private static void LinZhialysisBottleCapAndPreformTwo(Settings.deviceInfo plc, SqlSugar.SqlSugarClient db, LinZhiBCPWorkOrder workInfo, string endArea, string taskType, string deviceBit, string type,string data)
{
LogHelper.Info($"{type}娉ㄥ鏈轰换鍔″鐞嗗紑濮�);
+
+ LogHelper.Info($"鐡跺澂鏈猴紝鏌ヨ浠诲姟缁堢偣锛歿deviceBit}");
+ if (LineState.Keys.Contains(deviceBit))
+ {
+ LogHelper.Info("鐡跺澂鏈哄寘鍚浠诲姟缁堢偣");
+ LineState[deviceBit].status = data;
+ LineState[deviceBit].modify = DateTime.Now;
+ }
+ else
+ {
+ LogHelper.Info("鐡跺澂鏈烘湭鍖呭惈璇ヤ换鍔＄粓鐐�);
+ LineState.Add(deviceBit, new statemodel { status = data, modify = DateTime.Now });
+ }
//鍐嶆鍒ゆ柇淇″彿
if (LocationHelper.CheckLocFree(deviceBit))
{
@@ -862,12 +867,12 @@
{
LogHelper.Info($"{type}娉ㄥ鏈轰笂鏈粦瀹氭墭鐩�鑷姩缁戝畾鎵樼洏");
- TaskProcess.BindLocCntr(deviceBit, cntrCode, workInfo.S_ItemCode, "");
+ TaskProcess.BindLocCntr(deviceBit, cntrCode, workInfo.S_ItemCode, "","","",workInfo.S_ItemName);
}
else
{
cntrCode = cntrInfo.S_CNTR_CODE;
- TaskProcess.BindCntrItem(cntrCode, workInfo.S_ItemCode, "", "");
+ TaskProcess.BindCntrItem(cntrCode, workInfo.S_ItemCode, "", "",workInfo.S_ItemName);
}
//鍒涘缓浣滀笟
WMSHelper.CreateOpTask(deviceBit, "", "鍏ュ簱", taskType, cntrCode,"","",workInfo.S_WorkNo);
--
Gitblit v1.9.1