From 7e47d1856a1db4367ce103a8b7de37fb0f3590b0 Mon Sep 17 00:00:00 2001
From: Tjiny <Tjinyu23@163.com>
Date: 星期二, 17 六月 2025 17:16:37 +0800
Subject: [PATCH] 2025-06-17日提交
---
HH.WCS.Mobox3.RiDong/generalMethod/LocationMethod.cs | 35 ++++++++++++++++++++++++++++-------
1 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/HH.WCS.Mobox3.RiDong/generalMethod/LocationMethod.cs b/HH.WCS.Mobox3.RiDong/generalMethod/LocationMethod.cs
index 77d4303..a32f4b9 100644
--- a/HH.WCS.Mobox3.RiDong/generalMethod/LocationMethod.cs
+++ b/HH.WCS.Mobox3.RiDong/generalMethod/LocationMethod.cs
@@ -131,8 +131,8 @@
var locations = sqlSugarClient.Queryable<Location>()
.Where(p => p.N_PRIORITY == priority && p.N_CURRENT_NUM == 0 && p.N_LOCK_STATE == 0 && p.N_PURPOSE == 1).ToList();
- // 浼樺厛鏌ヨ浠婃棩浠戒换鍔′腑鏈畬鎴愮殑锛堢瓑寰咃紝鎵ц涓級
- var notQueryList = AdoSqlMethod<Operation>.QueryList(p=>p.N_B_STATE < 2 && p.T_CREATE.Date == DateTime.Today);
+ var notQueryList = AdoSqlMethod<Task>
+ .QueryList(p=> p.N_B_STATE < 2 && p.T_CREATE.Date == DateTime.Today && (p.N_TYPE == 1 || p.N_TYPE == 3) && p.N_SCHEDULE_TYPE == 2);
if (notQueryList.Count > 0)
{
@@ -140,8 +140,8 @@
foreach (var item in groupBy)
{
- if (item.Key == 1 || item.Key == 2 || item.Key == 3 ||
- item.Key == 4)
+ if ((item.Key == 1 || item.Key == 2 || item.Key == 3 ||
+ item.Key == 4) )
{
locations = locations.Where(p=>p.N_ROADWAY != item.Key).ToList();
}
@@ -173,7 +173,28 @@
// 鏌ヨ鍑烘墍鏈夎浼樺厛绾х殑鍙敤璐т綅
var locations = sqlSugarClient.Queryable<Location>()
.Where(p => p.N_PRIORITY == priority && p.N_CURRENT_NUM == 0 && p.N_LOCK_STATE == 0 && p.N_PURPOSE == 1).ToList();
-
+
+ var notQueryList = AdoSqlMethod<Task>
+ .QueryList(p=> p.N_B_STATE < 2 && p.T_CREATE.Date == DateTime.Today && (p.N_TYPE == 1 || p.N_TYPE == 3) && p.N_SCHEDULE_TYPE == 2);
+
+ if (notQueryList.Count > 0)
+ {
+ var groupBy = notQueryList.GroupBy(p=>p.N_ROADWAY);
+
+ foreach (var item in groupBy)
+ {
+ if (item.Key == 1 || item.Key == 2 || item.Key == 3 ||
+ item.Key == 4)
+ {
+ locations = locations.Where(p=>p.N_ROADWAY != item.Key).ToList();
+ }
+ else if (item.Key == 5 && item.ToList().Count >= 3)
+ {
+ locations = locations.Where(p=>p.N_ROADWAY != item.Key).ToList();
+ }
+ }
+ }
+
// 瀛樺湪璇ヤ紭鍏堢骇鐨勫彲鐢ㄨ揣浣� if (locations.Count > 0)
{
@@ -198,8 +219,8 @@
var locations = sqlSugarClient.Queryable<Location>()
.Where(p => p.N_PRIORITY == i && p.N_CURRENT_NUM == 0 && p.N_LOCK_STATE == 0 && p.N_PURPOSE == 1).ToList();
- // 浼樺厛鏌ヨ浠婃棩浠戒换鍔′腑鏈畬鎴愮殑锛堢瓑寰咃紝鎵ц涓級
- var notQueryList = AdoSqlMethod<Operation>.QueryList(p=>p.N_B_STATE < 2 && p.T_CREATE.Date == DateTime.Today);
+ var notQueryList = AdoSqlMethod<Task>
+ .QueryList(p=> p.N_B_STATE < 2 && p.T_CREATE.Date == DateTime.Today && (p.N_TYPE == 1 || p.N_TYPE == 3) && p.N_SCHEDULE_TYPE == 2);
if (notQueryList.Count > 0)
{
--
Gitblit v1.9.1