From ad678d0d42f126e5c0d0e2f22f373d9727fb37a5 Mon Sep 17 00:00:00 2001
From: cjs <2216046164@qq.com>
Date: 星期四, 19 六月 2025 17:23:54 +0800
Subject: [PATCH] 111
---
HH.WCS.Mobox3.NongFuLinZhi/process/DeviceProcess.cs | 44 +++++++++++++++++++++-----------------------
1 files changed, 21 insertions(+), 23 deletions(-)
diff --git a/HH.WCS.Mobox3.NongFuLinZhi/process/DeviceProcess.cs b/HH.WCS.Mobox3.NongFuLinZhi/process/DeviceProcess.cs
index 95a01fb..17dde07 100644
--- a/HH.WCS.Mobox3.NongFuLinZhi/process/DeviceProcess.cs
+++ b/HH.WCS.Mobox3.NongFuLinZhi/process/DeviceProcess.cs
@@ -514,14 +514,13 @@
{
LogHelper.Info($"鏌ヨ鍒版墽琛屼腑鐨勫伐鍗曪紝宸ュ崟绫诲瀷锛歿workInfo.S_PLineNo}");
string startArea = "";
- string endArea = "";
string fullTaskType = "";
string emptyTaskType = "";
if (workInfo.S_UsingNow == "Y")
{
LogHelper.Info("鍗充骇鍗崇敤宸ュ崟");
//鍗充骇鍗崇敤鍦ㄨ捣鐐逛负绾胯竟
- var bcpInfo = Settings.areaInfos.Where(a => a.areaName == "鐡跺澂鍗充骇鍗崇敤A" && a.enable == 1).FirstOrDefault();
+ var bcpInfo = Settings.areaInfos.Where(a => a.areaName == "鐡惰儦鍗充骇鍗崇敤婊℃" && a.enable == 1).FirstOrDefault();
if (bcpInfo != null)
{
startArea = bcpInfo.areaCode;
@@ -533,7 +532,8 @@
{
LogHelper.Info("闈炲嵆浜у嵆鐢ㄥ伐鍗�);
//闈炲嵆浜у嵆鐢ㄨ捣鐐逛负搴撳尯
- var bcpInfo = Settings.areaInfos.Where(a => a.areaName == "鐡跺澂闈炲嵆浜у嵆鐢� && a.enable == 1).FirstOrDefault();
+ string areaName = plc.deviceName.Split('-')[1].Substring(0, 1) + "鍙风摱鑳氱炕鏂楁満闈炲嵆浜ф弧妗�;
+ var bcpInfo = Settings.areaInfos.Where(a => a.areaName == areaName && a.enable == 1).FirstOrDefault();
if (bcpInfo != null)
{
startArea = bcpInfo.areaCode;
@@ -541,8 +541,6 @@
fullTaskType = "缈绘枟鏈哄簱瀛樻弧鎵樹笂绾匡紙鐡跺澂锛�;
emptyTaskType = "缈绘枟鏈哄簱瀛樼┖鎵樹笅绾匡紙鐡跺澂锛�;
}
-
- endArea = Settings.areaInfos.Where(a => a.areaName == "鐡跺澂绌烘墭" && a.enable == 1).FirstOrDefault().areaCode;
if (data.Length == 6)
{
@@ -576,16 +574,12 @@
//鍒濆鐘舵�锛屾棤鎵樼洏锛岀洿鎺ヤ笂婊℃墭(闈炲嵆浜у嵆鐢ㄩ渶瑕佹牎楠�濂楄瀹屾垚锛屽嵆浜у嵆鐢ㄧ洿鎺ヤ娇鐢�
if (workInfo.S_UsingNow == "Y")
{
- LogHelper.Info($"鐡跺澂鍗充骇鍗崇敤A搴撳尯鏌ユ壘");
+ LogHelper.Info($"鐡惰儦鍗充骇鍗崇敤婊℃ 鏌ユ壘");
startLoca = getFDSXArea(db, workInfo, startArea);
- if (startLoca == null)
- {
- LogHelper.Info($"鐡跺澂鍗充骇鍗崇敤A搴撳尯鏈壘鍒版弧鎵橈紝鍘荤摱鍧嵆浜у嵆鐢˙搴撳尯鏌ユ壘");
- startLoca = TaskProcess.BCPInOrOut(db, false, "鐡跺澂鍗充骇鍗崇敤B", workInfo.S_ItemCode);
- }
}
else
{
+ LogHelper.Info($"鐡惰儦闈炲嵆浜у簱鍖�鏌ユ壘");
startLoca = getFDSXArea(db, workInfo, startArea);
}
@@ -643,12 +637,11 @@
{
LogHelper.Info($"鏌ヨ鍒版墽琛屼腑鐨勫伐鍗曪紝宸ュ崟绫诲瀷锛歿workInfo.S_PLineNo}");
string startArea = "";
- string endArea = "";
string fullTaskType = "";
string emptyTaskType = "";
LogHelper.Info("闈炲嵆浜у嵆鐢ㄥ伐鍗�);
//闈炲嵆浜у嵆鐢ㄨ捣鐐逛负搴撳尯
- var bcpInfo = Settings.areaInfos.Where(a => a.areaName == "鐡剁洊闈炲嵆浜у嵆鐢� && a.enable == 1).FirstOrDefault();
+ var bcpInfo = Settings.areaInfos.Where(a => a.areaName == "鐡剁洊闈炲嵆浜ф弧妗� && a.enable == 1).FirstOrDefault();
if (bcpInfo != null)
{
startArea = bcpInfo.areaCode;
@@ -657,7 +650,6 @@
fullTaskType = "缈绘枟鏈哄簱瀛樻弧鎵樹笂绾匡紙鐡剁洊锛�;
emptyTaskType = "缈绘枟鏈哄簱瀛樼┖鎵樹笅绾匡紙鐡剁洊锛�;
- endArea = Settings.areaInfos.Where(a => a.areaName == "鐡剁洊绌烘墭" && a.enable == 1).FirstOrDefault().areaCode;
if (data.Length == 6)
{
if (data.Substring(0, 2) == "11")
@@ -695,9 +687,9 @@
}
else
{
- LogHelper.Info($"鐡剁洊缈绘枟鏈轰笂鏈夌┖鎵樼洏锛岀敓鎴愮┖鎵樹笅绾夸换鍔★紝鐡剁洊缈绘枟鏈虹偣浣嶏細{plc.TN_Location[0]}");
+ LogHelper.Info($"鐡剁洊缈绘枟鏈轰笂鏈夌┖鎵樼洏锛岀敓鎴愮┖鎵樹笅绾夸换鍔★紝鐡剁洊缈绘枟鏈虹偣浣嶏細{locCode}");
//鍒涘缓浣滀笟
- WMSHelper.CreateOpTask(plc.TN_Location[0],"", "鍏ュ簱", emptyTaskType, plcLoca.S_CNTR_CODE);
+ WMSHelper.CreateOpTask(locCode, "", "鍏ュ簱", emptyTaskType, plcLoca.S_CNTR_CODE);
}
}
}
@@ -841,7 +833,7 @@
taskType = $"娉ㄥ搴撳瓨绌烘墭涓婄嚎({machine})";
}
- Location startLoca = TaskProcess.getMStartLoc(db);
+ Location startLoca = TaskProcess.getMStartLoc(db,workInfo.S_UsingNow);
if (startLoca != null)
{
//鍒涘缓浣滀笟
@@ -930,7 +922,8 @@
LogHelper.Info($"鏌ヨ缈绘枟鏈哄厑璁稿彇绌轰俊鍙�鍏佽鍙栫┖淇″彿={LineState[mst.S_START_LOC.Trim()].status} 鏃堕棿闂撮殧={DateTime.Now.Subtract(LineState[mst.S_START_LOC.Trim()].modify).TotalSeconds}", "瀹夊叏浜や簰");
if ((LineState[mst.S_START_LOC.Trim()].status == "112100" || LineState[mst.S_START_LOC.Trim()].status == "112200") && DateTime.Now.Subtract(LineState[mst.S_START_LOC.Trim()].modify).TotalSeconds < 10)
{
- NDCHelper.ChangeParam(mst.S_CODE.Trim(), 1101, 18);
+ //NDCHelper.ChangeParam(mst.S_CODE.Trim(), 1101, 18);
+ NDCApi.ChangeOrderParam(mst.S_CODE.Trim(), 1101, "18");
TaskProcess.sendSing(mst, 1101);
}
}
@@ -941,7 +934,8 @@
{
if ((LineState[mst.S_START_LOC.Trim()].status == "1122" || LineState[mst.S_START_LOC.Trim()].status == "1221") && DateTime.Now.Subtract(LineState[mst.S_START_LOC.Trim()].modify).TotalSeconds < 10)
{
- NDCHelper.ChangeParam(mst.S_CODE.Trim(), 1101, 18);
+ //NDCHelper.ChangeParam(mst.S_CODE.Trim(), 1101, 18);
+ NDCApi.ChangeOrderParam(mst.S_CODE.Trim(), 1101, "18");
TaskProcess.sendSing(mst, 1101);
}
}
@@ -949,7 +943,8 @@
{
if (LineState[mst.S_START_LOC.Trim()].status == "1220" && DateTime.Now.Subtract(LineState[mst.S_START_LOC.Trim()].modify).TotalSeconds < 10)
{
- NDCHelper.ChangeParam(mst.S_CODE.Trim(), 1101, 18);
+ //NDCHelper.ChangeParam(mst.S_CODE.Trim(), 1101, 18);
+ NDCApi.ChangeOrderParam(mst.S_CODE.Trim(), 1101, "18");
TaskProcess.sendSing(mst, 1101);
}
}
@@ -972,7 +967,8 @@
LogHelper.Info($"鏌ヨ缈绘枟鏈哄厑璁镐笂婊′俊鍙�鍏佽涓婃弧淇″彿={LineState[mst.S_END_LOC.Trim()].status} 鏃堕棿闂撮殧={DateTime.Now.Subtract(LineState[mst.S_END_LOC.Trim()].modify).TotalSeconds}", "瀹夊叏浜や簰");
if ((LineState[mst.S_END_LOC.Trim()].status == "112100" || LineState[mst.S_END_LOC.Trim()].status == "112200") && DateTime.Now.Subtract(LineState[mst.S_END_LOC.Trim()].modify).TotalSeconds < 10)
{
- NDCHelper.ChangeParam(mst.S_CODE.Trim(), 1103, 18);
+ //NDCHelper.ChangeParam(mst.S_CODE.Trim(), 1103, 18);
+ NDCApi.ChangeOrderParam(mst.S_CODE.Trim(), 1103, "18");
TaskProcess.sendSing(mst, 1103);
}
}
@@ -983,7 +979,8 @@
{
if ((LineState[mst.S_END_LOC.Trim()].status == "1122" || LineState[mst.S_END_LOC.Trim()].status == "1221") && DateTime.Now.Subtract(LineState[mst.S_END_LOC.Trim()].modify).TotalSeconds < 10)
{
- NDCHelper.ChangeParam(mst.S_CODE.Trim(), 1103, 18);
+ //NDCHelper.ChangeParam(mst.S_CODE.Trim(), 1103, 18);
+ NDCApi.ChangeOrderParam(mst.S_CODE.Trim(), 1103, "18");
TaskProcess.sendSing(mst, 1103);
}
}
@@ -991,7 +988,8 @@
{
if (LineState[mst.S_END_LOC.Trim()].status == "1021" && DateTime.Now.Subtract(LineState[mst.S_END_LOC.Trim()].modify).TotalSeconds < 10)
{
- NDCHelper.ChangeParam(mst.S_CODE.Trim(), 1103, 18);
+ //NDCHelper.ChangeParam(mst.S_CODE.Trim(), 1103, 18);
+ NDCApi.ChangeOrderParam(mst.S_CODE.Trim(), 1103, "18");
TaskProcess.sendSing(mst, 1103);
}
}
--
Gitblit v1.9.1