From aa00074986140e57be1f56272311e84abd8566ac Mon Sep 17 00:00:00 2001
From: zongzhibin <zongzhibin@weben-smart.com>
Date: 周六, 30 11月 2024 17:04:28 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine
---
CC/iWareSql/DataAccess/TaskHandler.cs | 45 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 40 insertions(+), 5 deletions(-)
diff --git a/CC/iWareSql/DataAccess/TaskHandler.cs b/CC/iWareSql/DataAccess/TaskHandler.cs
index 97fd002..55ab793 100644
--- a/CC/iWareSql/DataAccess/TaskHandler.cs
+++ b/CC/iWareSql/DataAccess/TaskHandler.cs
@@ -18,14 +18,14 @@
/// </summary>
/// <param name="wmsDB"></param>
/// <returns></returns>
- public static bool ValidateIssueTaskForRobotBuffer(WmsDBModel.WmsDBModel wmsDB)
+ public static bool ValidateIssueTaskForRobotBuffer(WmsDBModel.WmsDBModel wmsDB,string UPI)
{
var isExist = wmsDB.wms_rbline_task.Where(x => x.TaskStatus == (int)TaskStatusEnum.宸蹭笅鍙�
&& (
x.RbTaskType == (int)RbTaskTypeEnum.鍏ュ簱浠诲姟
||
x.RbTaskType == (int)RbTaskTypeEnum.鍑哄簱浠诲姟
- )
+ )&&x.UPI== UPI
).ToList();
if (isExist?.Count() > 0)
@@ -34,17 +34,52 @@
}
return true;
}
+ /// <summary>
+ /// 楠岃瘉 鏈哄櫒浜虹紦瀛樺矝鏄惁瀛樺湪宸蹭笅鍙戠殑浠诲姟
+ /// </summary>
+ /// <param name="wmsDB"></param>
+ /// <returns></returns>
+ public static bool ValidateIssueOutTaskForRobotBuffer(WmsDBModel.WmsDBModel wmsDB)
+ {
+ var isExist = wmsDB.wms_rbline_task.Where(x => x.TaskStatus == (int)TaskStatusEnum.宸蹭笅鍙�
+ && (
+ x.RbTaskType == (int)RbTaskTypeEnum.鍏ュ簱浠诲姟
+ ||
+ x.RbTaskType == (int)RbTaskTypeEnum.鍑哄簱浠诲姟
+ )
+ ).ToList();
+ if (isExist?.Count() > 0)
+ {
+ return false;
+ }
+ return true;
+ }
/// <summary>
/// 楠岃瘉 鐮佹澘鏄惁鏈夋墽琛屼腑浠诲姟
/// </summary>
/// <param name="wmsDB"></param>
/// <returns></returns>
- public static bool ValidateIssueTaskForBZ12(WmsDBModel.WmsDBModel wmsDB)
+ public static bool ValidateIssueTaskForBZ12(WmsDBModel.WmsDBModel wmsDB,string str)
{
var isExist = wmsDB.wms_rbline_task.Where(x => x.TaskStatus == (int)TaskStatusEnum.宸蹭笅鍙�
- && x.RbTaskType == (int)RbTaskTypeEnum.鐮佹澘浠诲姟).ToList();
-
+ && x.RbTaskType == (int)RbTaskTypeEnum.鐮佹澘浠诲姟 && x.UPI == str).ToList();
+ if (isExist?.Count() > 0)
+ {
+ return false;
+ }
+ return true;
+ }
+ public static bool ValidateIssueTaskForBZ21(WmsDBModel.WmsDBModel wmsDB,string str)
+ {
+ var isExist = wmsDB.wms_rbline_task.Where(x => x.TaskStatus == (int)TaskStatusEnum.宸蹭笅鍙�
+ && x.RbTaskType == (int)RbTaskTypeEnum.澶规澘浠诲姟&&x.UPI==str).ToList();
+ if (isExist?.Count() > 0)
+ {
+ return false;
+ }
+ return true;
+ }
/// <summary>
/// 楠岃瘉 鏈哄櫒浜虹紦瀛樺矝鏄惁瀛樺湪 鏈粨鏉� 鐨勫嚭搴撲换鍔�
/// </summary>
--
Gitblit v1.9.3