From 5a87419030eff0b13e8d29e2d5b770c73c9b49ca Mon Sep 17 00:00:00 2001
From: cjs <2216046164@qq.com>
Date: 星期五, 20 六月 2025 17:11:16 +0800
Subject: [PATCH] 111
---
HH.WCS.Mobox3.NongFuLinZhi/models/LinZhiWorkOrder.cs | 2
HH.WCS.Mobox3.NongFuLinZhi/process/DeviceProcess.cs | 37 ++++++------
HH.WCS.Mobox3.NongFuLinZhi/api/WmsController.cs | 9 ---
HH.WCS.Mobox3.NongFuLinZhi/process/TaskProcess.cs | 40 +++++++-----
HH.WCS.Mobox3.NongFuLinZhi/api/ApiModel.cs | 14 +---
HH.WCS.Mobox3.NongFuLinZhi/core/WCSCore.cs | 32 ++++++----
HH.WCS.Mobox3.NongFuLinZhi/wms/WMSHelper.cs | 2
HH.WCS.Mobox3.NongFuLinZhi/core/WMSCore.cs | 6 +
8 files changed, 73 insertions(+), 69 deletions(-)
diff --git a/HH.WCS.Mobox3.NongFuLinZhi/api/ApiModel.cs b/HH.WCS.Mobox3.NongFuLinZhi/api/ApiModel.cs
index d906db7..24d3a50 100644
--- a/HH.WCS.Mobox3.NongFuLinZhi/api/ApiModel.cs
+++ b/HH.WCS.Mobox3.NongFuLinZhi/api/ApiModel.cs
@@ -26,15 +26,11 @@
/// </summary>
public class AgvTaskState
{
- public int State { get; set; }
- public string No { get; set; }
- public string ForkliftNo { get; set; }
- public string ErrCode { get; set; }
- public string LockNo { get; set; }
- public string Ext1 { get; set; }
- public string Ext2 { get; set; }
- public string N_CNTR_COUNT { get; set; }
- public string ExtData { get; set; }
+ public int state { get; set; }
+ public string task_no { get; set; }
+ public string forklift_no { get; set; }
+ public string lock_no { get; set; }
+ public string ext_data { get; set; }
}
/// <summary>
/// hosttoagv涓婃姤杞﹁締鐘舵�锛堝弬鏁板湪hosttoagv鏈嶅姟閰嶇疆锛屽彲淇敼锛�diff --git a/HH.WCS.Mobox3.NongFuLinZhi/api/WmsController.cs b/HH.WCS.Mobox3.NongFuLinZhi/api/WmsController.cs
index e3baadb..7d018ce 100644
--- a/HH.WCS.Mobox3.NongFuLinZhi/api/WmsController.cs
+++ b/HH.WCS.Mobox3.NongFuLinZhi/api/WmsController.cs
@@ -25,14 +25,5 @@
public SimpleResult Putaway_Order_In(Putaway_Order_In model) {
return ApiHelper.Putaway_Order_In(model);
}
-
-
-
-
-
-
-
-
-
}
}
diff --git a/HH.WCS.Mobox3.NongFuLinZhi/core/WCSCore.cs b/HH.WCS.Mobox3.NongFuLinZhi/core/WCSCore.cs
index b2ef758..8b859c8 100644
--- a/HH.WCS.Mobox3.NongFuLinZhi/core/WCSCore.cs
+++ b/HH.WCS.Mobox3.NongFuLinZhi/core/WCSCore.cs
@@ -13,26 +13,26 @@
public const string AlterControlSwitch01 = "1";//浠诲姟涓婃姤MES鍙樻洿寮�彂 1-寮�惎 0-鍏抽棴
public static void OperateAgvTaskStatus(AgvTaskState model) {
- if (string.IsNullOrEmpty(model.No)) {
+ if (string.IsNullOrEmpty(model.task_no)) {
//鏃犱换鍔″彿璇锋眰(浜ょ)
//DeviceProcess.Traffic(model.ForkliftNo, model.LockNo, model.State==1023);
}
else {
- var TN_Task = WCSHelper.GetTask(model.No);
+ var TN_Task = WCSHelper.GetTask(model.task_no);
if (TN_Task != null) {
- if (model.State <= 7)
+ if (model.state <= 7)
{
- if (!WCSHelper.CheckActionRecordExist(model.No, model.State))
+ if (!WCSHelper.CheckActionRecordExist(model.task_no, model.state))
{
//鏈変换鍔″彿璇锋眰
- switch (model.State)
+ switch (model.state)
{
case 1:
WCSHelper.Begin(TN_Task);
break;
#region MyRegion
case 3:
- WCSHelper.UpdateStatus(TN_Task, "寮�鍙栬揣", model.ForkliftNo);
+ WCSHelper.UpdateStatus(TN_Task, "寮�鍙栬揣", model.forklift_no);
//if (TN_Task.S_TYPE == "娉ㄥ搴撳瓨婊℃墭涓嬬嚎锛堢摱鍧級" || TN_Task.S_TYPE == "娉ㄥ鍗充骇婊℃墭涓嬬嚎锛堢摱鍧級")
//{
// TaskProcess.writeSignal(TN_Task);
@@ -40,6 +40,10 @@
break;
case 4:
WCSHelper.UpdateStatus(TN_Task, "鍙栬揣瀹屾垚");
+ if (TN_Task.S_TYPE.Contains("婊℃墭涓嬬嚎"))
+ {
+ TaskProcess.writeSignal(TN_Task,4);
+ }
TaskProcess.OperateStatus(TN_Task, 4);
break;
case 5:
@@ -47,6 +51,10 @@
break;
case 6:
WCSHelper.UpdateStatus(TN_Task, "鍗歌揣瀹屾垚");
+ if (TN_Task.S_TYPE.Contains("绌烘墭涓婄嚎"))
+ {
+ TaskProcess.writeSignal(TN_Task,6);
+ }
TaskProcess.OperateStatus(TN_Task, 6);
break;
#endregion
@@ -70,18 +78,18 @@
//WMSHelper.End(TN_Task);
break;
}
- WCSHelper.AddActionRecord(model.No, model.State, model.ForkliftNo, model.ExtData);
+ WCSHelper.AddActionRecord(model.task_no, model.state, model.forklift_no, model.ext_data);
//璋冪敤绗笁鏂规帴鍙ｏ紙濡傛灉鏈夛級TaskProcess.ReportStatus
- TaskProcess.ThirdReportStatus(TN_Task, model.State, model.ForkliftNo);
- TaskProcess.UpdateAgvNo(TN_Task, model.ForkliftNo);
- if (AlterControlSwitch01 == "1") TaskProcess.GeneralInterFaceFunc(TN_Task, model.State.ToString(), model.ForkliftNo);
+ TaskProcess.ThirdReportStatus(TN_Task, model.state, model.forklift_no);
+ TaskProcess.UpdateAgvNo(TN_Task, model.forklift_no);
+ if (AlterControlSwitch01 == "1") TaskProcess.GeneralInterFaceFunc(TN_Task, model.state.ToString(), model.forklift_no);
}
}
else {
LogHelper.Info("瀹夊叏璇锋眰浜や簰");
//瀹夊叏璇锋眰绛�- TaskProcess.OperateReq(model.No, model.State, model.ForkliftNo, model.ExtData);
- WCSHelper.AddActionRecord(model.No, model.State, model.ForkliftNo, model.ExtData);
+ TaskProcess.OperateReq(model.task_no, model.state, model.forklift_no, model.ext_data);
+ WCSHelper.AddActionRecord(model.task_no, model.state, model.forklift_no, model.ext_data);
}
}
}
diff --git a/HH.WCS.Mobox3.NongFuLinZhi/core/WMSCore.cs b/HH.WCS.Mobox3.NongFuLinZhi/core/WMSCore.cs
index e0aabd2..3eb085f 100644
--- a/HH.WCS.Mobox3.NongFuLinZhi/core/WMSCore.cs
+++ b/HH.WCS.Mobox3.NongFuLinZhi/core/WMSCore.cs
@@ -87,7 +87,11 @@
N_CNTR_COUNT = 1,
S_CNTR_CODE = a.S_CNTR_CODE,
N_START_LAYER = startinfo.N_CURRENT_NUM,
- N_END_LAYER = endinfo.N_CURRENT_NUM + 1
+ N_END_LAYER = endinfo.N_CURRENT_NUM + 1,
+ S_TRAY_TYPE = a.S_TRAY_TYPE,
+ S_WORK_NO = a.S_WORK_NO,
+ S_ITEM_CODE = a.S_ITEM_CODE,
+ S_NOTE = a.S_NOTE
};
if (WCSHelper.CreateTask(wcsTask))
{
diff --git a/HH.WCS.Mobox3.NongFuLinZhi/models/LinZhiWorkOrder.cs b/HH.WCS.Mobox3.NongFuLinZhi/models/LinZhiWorkOrder.cs
index a3629fa..e46efbc 100644
--- a/HH.WCS.Mobox3.NongFuLinZhi/models/LinZhiWorkOrder.cs
+++ b/HH.WCS.Mobox3.NongFuLinZhi/models/LinZhiWorkOrder.cs
@@ -4,7 +4,7 @@
namespace HH.WCS.Mobox3.NFLZ
{
- [SugarTable("TN_LinZhiorkOrder")]
+ [SugarTable("TN_LinZhiWorkOrder")]
public class LinZhiWorkOrder : BaseModel
{
/// <summary>
diff --git a/HH.WCS.Mobox3.NongFuLinZhi/process/DeviceProcess.cs b/HH.WCS.Mobox3.NongFuLinZhi/process/DeviceProcess.cs
index 17dde07..f061deb 100644
--- a/HH.WCS.Mobox3.NongFuLinZhi/process/DeviceProcess.cs
+++ b/HH.WCS.Mobox3.NongFuLinZhi/process/DeviceProcess.cs
@@ -520,7 +520,7 @@
{
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;
@@ -574,19 +574,19 @@
//鍒濆鐘舵�锛屾棤鎵樼洏锛岀洿鎺ヤ笂婊℃墭(闈炲嵆浜у嵆鐢ㄩ渶瑕佹牎楠�濂楄瀹屾垚锛屽嵆浜у嵆鐢ㄧ洿鎺ヤ娇鐢�
if (workInfo.S_UsingNow == "Y")
{
- LogHelper.Info($"鐡惰儦鍗充骇鍗崇敤婊℃ 鏌ユ壘");
+ LogHelper.Info($"鐡惰儦鍗充骇婊℃ 鏌ユ壘");
startLoca = getFDSXArea(db, workInfo, startArea);
}
else
{
- LogHelper.Info($"鐡惰儦闈炲嵆浜у簱鍖�鏌ユ壘");
+ LogHelper.Info($"鐡惰儦缈绘枟鏈洪潪鍗充骇婊℃ 鏌ユ壘");
startLoca = getFDSXArea(db, workInfo, startArea);
}
if (startLoca != null)
{
//鍒涘缓浣滀笟
- WMSHelper.CreateOpTask(startLoca.S_CODE, locCode, "鍑哄簱", fullTaskType, startLoca.LocCntrRel.S_CNTR_CODE);
+ WMSHelper.CreateOpTask(startLoca.S_CODE, locCode, "鍑哄簱", fullTaskType, startLoca.LocCntrRel.S_CNTR_CODE, "", "", workInfo.S_WorkNo);
}
}
else
@@ -594,7 +594,7 @@
LogHelper.Info($"鐡跺澂缈绘枟鏈轰笂鏈夌┖鎵樼洏锛岀敓鎴愮┖鎵樹笅绾夸换鍔★紝鐡跺澂缈绘枟鏈虹偣浣嶏細{plc.TN_Location[0]}");
//鍒涘缓浣滀笟
- WMSHelper.CreateOpTask(locCode, "", "鍏ュ簱", emptyTaskType, plcLoca.S_CNTR_CODE);
+ WMSHelper.CreateOpTask(locCode, "", "鍏ュ簱", emptyTaskType, plcLoca.S_CNTR_CODE, "", "", workInfo.S_WorkNo);
}
}
}
@@ -682,14 +682,14 @@
if (startLoca != null)
{
//鍒涘缓浣滀笟
- WMSHelper.CreateOpTask(startLoca.S_CODE, locCode, "鍑哄簱", fullTaskType, startLoca.LocCntrRel.S_CNTR_CODE);
+ WMSHelper.CreateOpTask(startLoca.S_CODE, locCode, "鍑哄簱", fullTaskType, startLoca.LocCntrRel.S_CNTR_CODE,"","",workInfo.S_WorkNo);
}
}
else
{
LogHelper.Info($"鐡剁洊缈绘枟鏈轰笂鏈夌┖鎵樼洏锛岀敓鎴愮┖鎵樹笅绾夸换鍔★紝鐡剁洊缈绘枟鏈虹偣浣嶏細{locCode}");
//鍒涘缓浣滀笟
- WMSHelper.CreateOpTask(locCode, "", "鍏ュ簱", emptyTaskType, plcLoca.S_CNTR_CODE);
+ WMSHelper.CreateOpTask(locCode, "", "鍏ュ簱", emptyTaskType, plcLoca.S_CNTR_CODE,"","",workInfo.S_WorkNo);
}
}
}
@@ -837,7 +837,7 @@
if (startLoca != null)
{
//鍒涘缓浣滀笟
- WMSHelper.CreateOpTask(startLoca.S_CODE, deviceBit, "鍑哄簱", taskType, startLoca.LocCntrRel.S_CNTR_CODE);
+ WMSHelper.CreateOpTask(startLoca.S_CODE, deviceBit, "鍑哄簱", taskType, startLoca.LocCntrRel.S_CNTR_CODE, "", "", workInfo.S_WorkNo);
}
else
{
@@ -858,10 +858,10 @@
else
{
cntrCode = cntrInfo.S_CNTR_CODE;
- TaskProcess.BindCntrItem(deviceBit, cntrCode, workInfo.S_ItemCode, "");
+ TaskProcess.BindCntrItem(cntrCode, workInfo.S_ItemCode, "", "");
}
//鍒涘缓浣滀笟
- WMSHelper.CreateOpTask(deviceBit, "", "鍏ュ簱", taskType, cntrCode);
+ WMSHelper.CreateOpTask(deviceBit, "", "鍏ュ簱", taskType, cntrCode,"","",workInfo.S_WorkNo);
}
}
}
@@ -923,7 +923,7 @@
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);
- NDCApi.ChangeOrderParam(mst.S_CODE.Trim(), 1101, "18");
+ NDCApi.ChangeOrderParam(mst.S_CODE.Trim(), 18, "1101");
TaskProcess.sendSing(mst, 1101);
}
}
@@ -932,11 +932,10 @@
LogHelper.Info($"鏌ヨ杈撻�绾垮厑璁稿彇婊′俊鍙�鍏佽鍙栨弧淇″彿={LineState[mst.S_START_LOC.Trim()].status} 鏃堕棿闂撮殧={DateTime.Now.Subtract(LineState[mst.S_START_LOC.Trim()].modify).TotalSeconds}", "瀹夊叏浜や簰");
if (mst.S_TYPE.Contains("婊℃墭涓嬬嚎"))
{
- 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)
+ if ((LineState[mst.S_START_LOC.Trim()].status.Substring(4,2) == "01" || LineState[mst.S_START_LOC.Trim()].status.Substring(6,2) == "02") && DateTime.Now.Subtract(LineState[mst.S_START_LOC.Trim()].modify).TotalSeconds < 10)
{
//NDCHelper.ChangeParam(mst.S_CODE.Trim(), 1101, 18);
- NDCApi.ChangeOrderParam(mst.S_CODE.Trim(), 1101, "18");
- TaskProcess.sendSing(mst, 1101);
+ NDCApi.ChangeOrderParam(mst.S_CODE.Trim(), 18, "1101");
}
}
else
@@ -944,7 +943,7 @@
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);
- NDCApi.ChangeOrderParam(mst.S_CODE.Trim(), 1101, "18");
+ NDCApi.ChangeOrderParam(mst.S_CODE.Trim(), 18, "1101");
TaskProcess.sendSing(mst, 1101);
}
}
@@ -968,7 +967,7 @@
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);
- NDCApi.ChangeOrderParam(mst.S_CODE.Trim(), 1103, "18");
+ NDCApi.ChangeOrderParam(mst.S_CODE.Trim(), 18, "1103");
TaskProcess.sendSing(mst, 1103);
}
}
@@ -977,10 +976,10 @@
LogHelper.Info($"鏌ヨ杈撻�绾垮厑璁歌ˉ绌轰俊鍙�鍏佽琛ョ┖淇″彿={LineState[mst.S_END_LOC.Trim()].status} 鏃堕棿闂撮殧={DateTime.Now.Subtract(LineState[mst.S_END_LOC.Trim()].modify).TotalSeconds}", "瀹夊叏浜や簰");
if (mst.S_TYPE.Contains("绌烘墭涓婄嚎"))
{
- 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)
+ if ((LineState[mst.S_END_LOC.Trim()].status.Substring(4,2) == "01" || LineState[mst.S_END_LOC.Trim()].status.Substring(6,2) == "02") && DateTime.Now.Subtract(LineState[mst.S_END_LOC.Trim()].modify).TotalSeconds < 10)
{
//NDCHelper.ChangeParam(mst.S_CODE.Trim(), 1103, 18);
- NDCApi.ChangeOrderParam(mst.S_CODE.Trim(), 1103, "18");
+ NDCApi.ChangeOrderParam(mst.S_CODE.Trim(), 18, "1103");
TaskProcess.sendSing(mst, 1103);
}
}
@@ -989,7 +988,7 @@
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);
- NDCApi.ChangeOrderParam(mst.S_CODE.Trim(), 1103, "18");
+ NDCApi.ChangeOrderParam(mst.S_CODE.Trim(), 18, "1103");
TaskProcess.sendSing(mst, 1103);
}
}
diff --git a/HH.WCS.Mobox3.NongFuLinZhi/process/TaskProcess.cs b/HH.WCS.Mobox3.NongFuLinZhi/process/TaskProcess.cs
index 97abf92..068ddfe 100644
--- a/HH.WCS.Mobox3.NongFuLinZhi/process/TaskProcess.cs
+++ b/HH.WCS.Mobox3.NongFuLinZhi/process/TaskProcess.cs
@@ -146,15 +146,18 @@
if (mst.S_TYPE.Contains("绌烘墭涓婄嚎"))
{
LogHelper.Info($"{mst.S_TYPE}鍗歌揣瀹屾垚锛屽啓鍏ヤ俊鍙�);
- //鏍规嵁璧风偣鍒ゆ柇鏄疉鍙ｈ繕鏄疊鍙�- var locCode = mst.S_END_LOC;
- var devInfo = Settings.deviceInfos.Where(a => a.TN_Location.Contains(locCode)).FirstOrDefault();
- if (devInfo != null)
+ if(state == 6)
{
- var signal = devInfo.TN_Location[0] == mst.S_END_LOC ? "3F 00 10 0D 0A" : "3F 00 20 0D 0A";
- if (PlcHelper.SendHex(devInfo.address, signal)) LogHelper.Info($"{mst.S_TYPE}浠诲姟鍗歌揣瀹屾垚锛屽啓鍏ヤ俊鍙凤細{signal}锛宨p锛歿devInfo.address}");
+ //鏍规嵁璧风偣鍒ゆ柇鏄疉鍙ｈ繕鏄疊鍙�+ var locCode = mst.S_END_LOC;
+ var devInfo = Settings.deviceInfos.Where(a => a.TN_Location.Contains(locCode)).FirstOrDefault();
+ if (devInfo != null)
+ {
+ var signal = devInfo.TN_Location[0] == mst.S_END_LOC ? "3F 00 10 0D 0A" : "3F 00 20 0D 0A";
+ if (PlcHelper.SendHex(devInfo.address, signal)) LogHelper.Info($"{mst.S_TYPE}浠诲姟鍗歌揣瀹屾垚锛屽啓鍏ヤ俊鍙凤細{signal}锛宨p锛歿devInfo.address}");
+ }
+ else LogHelper.Info($"璁惧鏈壘鍒帮紝璐т綅鍙凤細{mst.S_END_LOC}");
}
- else LogHelper.Info($"璁惧鏈壘鍒帮紝璐т綅鍙凤細{mst.S_END_LOC}");
}
if (mst.S_TYPE.Contains("婊℃墭涓婄嚎"))
{
@@ -176,7 +179,7 @@
var devInfo = Settings.deviceInfos.Where(a => a.TN_Location.Contains(locCode)).FirstOrDefault();
if (devInfo != null)
{
- var signal = "3F 00 12 22 00 0D 0A";
+ var signal = "3F 00 12 21 0D 0A";
if (state == 1102) signal = "3F 00 10 20 0D 0A";
if (PlcHelper.SendHex(devInfo.address, signal)) LogHelper.Info($"{mst.S_TYPE}浠诲姟鍙栬揣瀹屾垚锛屽啓鍏ヤ俊鍙凤細{signal}锛宨p锛歿devInfo.address}");
}
@@ -185,15 +188,18 @@
if (mst.S_TYPE.Contains("婊℃墭涓嬬嚎"))
{
LogHelper.Info($"{mst.S_TYPE}鍙栬揣瀹屾垚锛屽啓鍏ヤ俊鍙�);
- //鏍规嵁璧风偣鍒ゆ柇鏄疉鍙ｈ繕鏄疊鍙�- var locCode = mst.S_START_LOC;
- var devInfo = Settings.deviceInfos.Where(a => a.TN_Location.Contains(locCode)).FirstOrDefault();
- if (devInfo != null)
+ if(state == 4)
{
- var signal = devInfo.TN_Location[0] == mst.S_START_LOC ? "3F 00 10 0D 0A" : "3F 00 20 0D 0A";
- if (PlcHelper.SendHex(devInfo.address, signal)) LogHelper.Info($"{mst.S_TYPE}浠诲姟鍙栬揣瀹屾垚锛屽啓鍏ヤ俊鍙凤細{signal}锛宨p锛歿devInfo.address}");
+ //鏍规嵁璧风偣鍒ゆ柇鏄疉鍙ｈ繕鏄疊鍙�+ var locCode = mst.S_START_LOC;
+ var devInfo = Settings.deviceInfos.Where(a => a.TN_Location.Contains(locCode)).FirstOrDefault();
+ if (devInfo != null)
+ {
+ var signal = devInfo.TN_Location[0] == mst.S_START_LOC ? "3F 00 10 0D 0A" : "3F 00 20 0D 0A";
+ if (PlcHelper.SendHex(devInfo.address, signal)) LogHelper.Info($"{mst.S_TYPE}浠诲姟鍙栬揣瀹屾垚锛屽啓鍏ヤ俊鍙凤細{signal}锛宨p锛歿devInfo.address}");
+ }
+ else LogHelper.Info($"璁惧鏈壘鍒帮紝璐т綅鍙凤細{mst.S_START_LOC}");
}
- else LogHelper.Info($"璁惧鏈壘鍒帮紝璐т綅鍙凤細{mst.S_START_LOC}");
}
}
@@ -656,7 +662,6 @@
if (state == 6)//鍗歌揣瀹屾垚
{
claimGoodsTime(mst, state);
- writeSignal(mst);
CacheBitUpdate(mst, false);
}
if (state == 7)
@@ -730,6 +735,7 @@
}
else
{
+ LogHelper.Info($"鐡惰儦缈绘枟鏈洪潪鍗充骇婊℃ 鏌ユ壘");
string areaName = bcpW.S_PLineNo.Split('-')[1].Substring(0, 1) + "鍙风摱鑳氱炕鏂楁満闈炲嵆浜ф弧妗�;
startArea = Settings.areaInfos.Where(a => a.areaName == areaName && a.enable == 1).FirstOrDefault().areaCode;
startLoca = DeviceProcess.getFDSXArea(db, bcpW, startArea);
@@ -746,7 +752,7 @@
var cntrInfo = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE == startLoca.S_CODE).First();
if (cntrInfo != null)
{
- WMSHelper.CreateOpTask(startLoca.S_CODE, mst.S_START_LOC, "鍑哄簱", taskType, cntrInfo.S_CNTR_CODE);
+ WMSHelper.CreateOpTask(startLoca.S_CODE, mst.S_START_LOC, "鍑哄簱", taskType, cntrInfo.S_CNTR_CODE,"","",bcpW.S_WorkNo);
}
else LogHelper.Info($"鏈粦瀹氭墭鐩橈紝璐т綅鍙凤細{startLoca.S_CODE}");
}
diff --git a/HH.WCS.Mobox3.NongFuLinZhi/wms/WMSHelper.cs b/HH.WCS.Mobox3.NongFuLinZhi/wms/WMSHelper.cs
index fb3b590..e6cc54a 100644
--- a/HH.WCS.Mobox3.NongFuLinZhi/wms/WMSHelper.cs
+++ b/HH.WCS.Mobox3.NongFuLinZhi/wms/WMSHelper.cs
@@ -602,7 +602,7 @@
//淇敼浣滀笟鐘舵� 閲嶆柊鍚姩
wmsTask.N_B_STATE = 2;
WMSHelper.UpdateTaskState(wmsTask);
- WCSHelper.UpdateStorStatus(task.S_CNTR_CODE, 4);
+ //WCSHelper.UpdateStorStatus(task.S_CNTR_CODE, 4);
}
--
Gitblit v1.9.1