From 5c4192f0b813d72a427eaca183d08d42046f1b41 Mon Sep 17 00:00:00 2001
From: jinxin <1013386558@qq.com>
Date: 星期一, 23 六月 2025 14:43:44 +0800
Subject: [PATCH] 11
---
C#/HH.WCS.Mobox3.WeiLi/core/WMSCore.cs | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git "a/C\043/HH.WCS.Mobox3.WeiLi/core/WMSCore.cs" "b/C\043/HH.WCS.Mobox3.WeiLi/core/WMSCore.cs"
index 09b0caa..cad0d13 100644
--- "a/C\043/HH.WCS.Mobox3.WeiLi/core/WMSCore.cs"
+++ "b/C\043/HH.WCS.Mobox3.WeiLi/core/WMSCore.cs"
@@ -171,7 +171,7 @@
var startloc = db.Queryable<Location>().Where(it => it.S_CODE == a.S_LOC_CODE).First();
if (startloc != null)
{
- LogHelper.Info($"鎵樼洏{a.S_CNTR_CODE} 缁戝畾浣嶇疆{a.S_LOC_CODE} 閿佺姸鎬亄startloc.S_LOCK_STATE}");
+ LogHelper.Info($"鎵樼洏{a.S_CNTR_CODE} 缁戝畾浣嶇疆{a.S_LOC_CODE} 鐩樼偣鐘舵�{a.N_B_STATE} 閿佺姸鎬亄startloc.S_LOCK_STATE}");
if (a.N_B_STATE == 0 && startloc.S_LOCK_STATE == "鍏跺畠閿�)
{
if (Settings.LKCodes.Where(it => it.LiKuCode == startloc.S_AREA_CODE).FirstOrDefault() != null)
@@ -430,6 +430,8 @@
S_CNTR_CODE = a.S_CNTR_CODE,
};
+ var res = true;
+
if (type == "NDC" && (a.S_OP_DEF_NAME == "鍑哄簱" || a.S_OP_DEF_NAME == "鍒嗘嫞鍑� || a.S_OP_DEF_NAME == "绌烘鍑哄簱"))
{
string workNo = "";
@@ -464,26 +466,30 @@
{
LogHelper.Info($"涓彴杩斿洖缁堢偣{endbit} 涓嶅瓨鍦ㄨ揣浣嶄俊鎭�);
LocationHelper.UnLockLoc(end.S_CODE);
- break;
+ //break;
+ res = false;
}
}
else
{
LogHelper.Info($"涓彴骞舵湭杩斿洖缁堢偣");
LocationHelper.UnLockLoc(end.S_CODE);
- break;
+ res = false;
+ //break;
}
}
- if (WCSHelper.CreateTask(wcsTask))
+ if (res)
{
- LogHelper.Info($"浣滀笟{a.S_CODE} 鍒涘缓浠诲姟鎴愬姛 淇敼浣滀笟鐘舵�");
- //鏇存柊浣滀笟鐘舵�涓烘墽琛�- a.N_B_STATE = 1;
- a.S_B_STATE = "鎵ц";
- WMSHelper.UpdateTaskState(a);
+ if (WCSHelper.CreateTask(wcsTask))
+ {
+ LogHelper.Info($"浣滀笟{a.S_CODE} 鍒涘缓浠诲姟鎴愬姛 淇敼浣滀笟鐘舵�");
+ //鏇存柊浣滀笟鐘舵�涓烘墽琛�+ a.N_B_STATE = 1;
+ a.S_B_STATE = "鎵ц";
+ WMSHelper.UpdateTaskState(a);
+ }
}
-
}
}
}
--
Gitblit v1.9.1