From f80938e8a03d9343672b4fb3179836b019f6b9d8 Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期六, 28 六月 2025 21:38:46 +0800
Subject: [PATCH] 0628
---
dispatch/WcsTask.cs | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/dispatch/WcsTask.cs b/dispatch/WcsTask.cs
index 1ba6803..1c79251 100644
--- a/dispatch/WcsTask.cs
+++ b/dispatch/WcsTask.cs
@@ -62,6 +62,13 @@
if (workFlow.INOROUT.Contains("鍑哄簱"))
{
Type = "2";
+ var count = TaskHelper.GetConnectionTask(mst.S_END_LOC);
+ if (count>=2)
+ {
+ return false;
+ }
+
+
}
}
@@ -262,7 +269,7 @@
LogHelper.Info("Wcs涓嬪彂浠诲姟寮傚父" + ex.Message, "Wcs涓嬪彂浠诲姟");
return result;
}
- return result;
+
}
/// <summary>
/// Wcs婊℃墭鍏ュ拰绌烘墭鍑�@@ -574,10 +581,13 @@
}
- ///// <summary>
- /// Wcs浠诲姟鎵ц閫氱煡
- /// </summary>
- internal static WcsWarningReurn WcsOperateTask(WcsOperateTaskParme model) {
+
+
+
+ ///// <summary>
+ /// Wcs浠诲姟鎵ц閫氱煡
+ /// </summary>
+ internal static WcsWarningReurn WcsOperateTask(WcsOperateTaskParme model) {
var result = new WcsWarningReurn();
var newDb = new SqlHelper<object>().GetInstance();
@@ -595,7 +605,7 @@
{
taskNo = model.requestPk;
}
- var transportTask = newDb.Queryable<WMSTask>().Where(e => e.S_CODE == taskNo)?.First();
+ var transportTask = newDb.Queryable<WMSTask>().Where(e => e.S_CODE == taskNo && e.S_SCHEDULE_TYPE.Contains("wcs"))?.First();
if (transportTask == null)
{
@@ -674,7 +684,7 @@
//鏌ユ壘缁堢偣
var endList = LocationHelper.GetAllLocList1(workFlow.ERRORAREA);
- var end = LocationHelper.FindEndcolByLocList(endList, workFlow.ERRORAREA,workFlow.ROADWAY);
+ var end = LocationHelper.FindBalanceEndcolByLocList(endList, workFlow.ERRORAREA,workFlow.ROADWAY);
LogHelper.Info($"RFID鏍￠獙澶辫触涓嬪彂寮傚父缁堢偣淇℃伅" + JsonConvert.SerializeObject(end), "Wcs浠诲姟鎵ц閫氱煡");
@@ -695,8 +705,6 @@
throw new Exception("淇敼浠诲姟琛ㄥけ璐�);
}
newDb.CommitTran();
- //鏀瑰弬鏁伴�鐭ュ皬杞�-
}
}
--
Gitblit v1.9.1