From db825ff9bb1352e79c3e018a647b3c88713d6f69 Mon Sep 17 00:00:00 2001
From: pulg <plg@Haninfo>
Date: 星期六, 05 七月 2025 14:07:29 +0800
Subject: [PATCH] Merge branch 'master' of http://121.37.118.194:8000/r/WMSPrjInstance/HH-0014_NongFu_QingXi
---
HH.WCS.QingXiNongfu/wms/LocationHelper.cs | 4 ++--
HH.WCS.QingXiNongfu/process/TaskProcess.cs | 4 +++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/HH.WCS.QingXiNongfu/process/TaskProcess.cs b/HH.WCS.QingXiNongfu/process/TaskProcess.cs
index 5b96932..fa6bcc9 100644
--- a/HH.WCS.QingXiNongfu/process/TaskProcess.cs
+++ b/HH.WCS.QingXiNongfu/process/TaskProcess.cs
@@ -78,9 +78,11 @@
if (bbbbbbb)
{
+ bbbbbbb = false;
//UpdateElevatorTask(mst);
//todo锛�濡傛灉鏄數姊嵏璐т换鍔＄數姊换鍔′腑闂磋〃鐘舵�锛屽
- if (BeenOver)
+ //bbbbbbb = TaskHelper.CheckActionRecordExist(mst.S_TASK_NO, "5");
+ if (BeenOver || (mst.S_TYPE.Contains("鎴愬搧婊℃") && bbbbbbb))
{
//if (mst.S_TYPE.Trim().Contains("缈绘枟鏈哄彨婊�))
//{
diff --git a/HH.WCS.QingXiNongfu/wms/LocationHelper.cs b/HH.WCS.QingXiNongfu/wms/LocationHelper.cs
index f6881c0..a50a32f 100644
--- a/HH.WCS.QingXiNongfu/wms/LocationHelper.cs
+++ b/HH.WCS.QingXiNongfu/wms/LocationHelper.cs
@@ -1132,7 +1132,7 @@
#endregion
else if (plc.deviceType == 6 || plc.deviceType == 10 || plc.deviceType == 4)
{
- LogHelper.Info("plc.deviceType == 6.10.4" + workOrder.SQL_UsingNow);
+ LogHelper.Info("plc.deviceType == 6.10.4 鍗充骇?锛� + workOrder.SQL_UsingNow);
//var LineTo = workOrder.SQL_LinkLineNO;
var ba = Settings.GetBolAreaList().Find(x => x.DeviceName == plc.deviceName && x.deviceType == plc.deviceType);
if (ba == null)
@@ -1400,7 +1400,7 @@
}
else
{
- LogHelper.Info($"4610,娌℃湁鍙敤婊℃");
+ LogHelper.Info($"缈绘枟绾plc.deviceName},娌℃湁鍙敤婊℃");
}
}
else
--
Gitblit v1.9.1