From f0088fd96c74f68ba912593710dd9271bcee581d Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 23 12月 2024 10:12:32 +0800
Subject: [PATCH] NG处理，pda上增加一键 清理 板件队列（从 269 到bz01的队列数据）
---
CC/iWareSql/DataAccess/TaskHandler.cs | 54 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 47 insertions(+), 7 deletions(-)
diff --git a/CC/iWareSql/DataAccess/TaskHandler.cs b/CC/iWareSql/DataAccess/TaskHandler.cs
index cc87064..aa413f7 100644
--- a/CC/iWareSql/DataAccess/TaskHandler.cs
+++ b/CC/iWareSql/DataAccess/TaskHandler.cs
@@ -22,7 +22,7 @@
{
var isExist = wmsDB.wms_rbline_task.Where(x => x.TaskStatus != (int)TaskStatusEnum.宸插畬鎴�
&& x.TaskStatus != (int)TaskStatusEnum.宸插彇娑�
- && x.UPI == UPI
+ && x.Upi == UPI
).ToList();
if (isExist?.Count() > 0)
@@ -43,8 +43,8 @@
&& (
x.RbTaskType == (int)RbTaskTypeEnum.鍏ュ簱浠诲姟
||
- x.RbTaskType == (int)RbTaskTypeEnum.鍑哄簱浠诲姟
- ) && x.UPI == UPI
+ (x.RbTaskType == (int)RbTaskTypeEnum.榻愬寘鍑哄簱浠诲姟 || x.RbTaskType == (int)RbTaskTypeEnum.寮哄埗鍑哄簱浠诲姟)
+ ) && x.Upi == UPI
).ToList();
if (isExist?.Count() > 0)
@@ -64,7 +64,7 @@
&& (
x.RbTaskType == (int)RbTaskTypeEnum.鍏ュ簱浠诲姟
||
- x.RbTaskType == (int)RbTaskTypeEnum.鍑哄簱浠诲姟
+ (x.RbTaskType == (int)RbTaskTypeEnum.榻愬寘鍑哄簱浠诲姟 || x.RbTaskType == (int)RbTaskTypeEnum.寮哄埗鍑哄簱浠诲姟)
)
).ToList();
@@ -74,6 +74,29 @@
}
return true;
}
+
+ /// <summary>
+ /// 楠岃瘉 鏄惁瀛樺湪鏈粨鏉熺殑 鍑哄簱 浠诲姟
+ /// </summary>
+ /// <param name="wmsDB"></param>
+ /// <returns></returns>
+ public static bool ValidateIssueTaskForNoFinishTaskByOutStore(WmsDBModel.WmsDBModel wmsDB)
+ {
+ var isExist = wmsDB.wms_rbline_task.Where(x => x.TaskStatus != (int)TaskStatusEnum.宸插畬鎴�
+ && x.TaskStatus != (int)TaskStatusEnum.宸插彇娑�
+ && (
+ (x.RbTaskType == (int)RbTaskTypeEnum.榻愬寘鍑哄簱浠诲姟 || x.RbTaskType == (int)RbTaskTypeEnum.寮哄埗鍑哄簱浠诲姟)
+ )
+ ).ToList();
+
+ if (isExist?.Count() > 0)
+ {
+ return false;
+ }
+ return true;
+ }
+
+
/// <summary>
/// 楠岃瘉 鐮佹澘鏄惁鏈夋墽琛屼腑浠诲姟
/// </summary>
@@ -82,7 +105,7 @@
public static bool ValidateIssueTaskForBZ12(WmsDBModel.WmsDBModel wmsDB, string UPI)
{
var isExist = wmsDB.wms_rbline_task.Where(x => x.TaskStatus == (int)TaskStatusEnum.宸蹭笅鍙�
- && x.RbTaskType == (int)RbTaskTypeEnum.鐮佹澘浠诲姟 && x.UPI == UPI).ToList();
+ && x.RbTaskType == (int)RbTaskTypeEnum.鐮佹澘浠诲姟 && x.Upi == UPI).ToList();
if (isExist?.Count() > 0)
{
return false;
@@ -92,7 +115,7 @@
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();
+ && x.RbTaskType == (int)RbTaskTypeEnum.鍚堝寘浠诲姟 && x.Upi == str).ToList();
if (isExist?.Count() > 0)
{
return false;
@@ -109,7 +132,7 @@
var isExist = wmsDB.wms_rbline_task.Where(x => x.TaskStatus != (int)TaskStatusEnum.宸插畬鎴�
&& x.TaskStatus != (int)TaskStatusEnum.宸插彇娑�
&& (
- x.RbTaskType == (int)RbTaskTypeEnum.鍑哄簱浠诲姟
+ (x.RbTaskType == (int)RbTaskTypeEnum.榻愬寘鍑哄簱浠诲姟 || x.RbTaskType == (int)RbTaskTypeEnum.寮哄埗鍑哄簱浠诲姟)
)
).ToList();
@@ -120,6 +143,23 @@
return true;
}
+ /// <summary>
+ /// 楠岃瘉 鐮佹澘浠诲姟鏄惁瀛樺湪 鏈粨鏉� 鐨勪换鍔�
+ /// </summary>
+ /// <param name="wmsDB"></param>
+ /// <returns>true:涓嶅瓨鍦� false锛氬瓨鍦�</returns>
+ public static bool ValidateNoFinishOutTaskFor鐮佹澘浠诲姟(WmsDBModel.WmsDBModel wmsDB)
+ {
+ var isExist = wmsDB.wms_rbline_task.Where(x => x.TaskStatus != (int)TaskStatusEnum.宸插畬鎴�
+ && x.TaskStatus != (int)TaskStatusEnum.宸插彇娑�
+ && x.RbTaskType == (int)RbTaskTypeEnum.鐮佹澘浠诲姟
+ ).ToList();
+ if (isExist?.Count() > 0)
+ {
+ return false;
+ }
+ return true;
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.3