From 3f016f3de352db04e5c2d99dae9e4b7472198359 Mon Sep 17 00:00:00 2001
From: Admin <Admin@ADMIN>
Date: 星期二, 23 十二月 2025 17:43:46 +0800
Subject: [PATCH] 最新

---
 项目代码/WMS/WIDESEA_WMSServer/WIDESEA.Services/Common/GetEmptyLocationAction.cs |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA.Services/Common/GetEmptyLocationAction.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA.Services/Common/GetEmptyLocationAction.cs"
index 6a93daa..f7a4b94 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA.Services/Common/GetEmptyLocationAction.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA.Services/Common/GetEmptyLocationAction.cs"
@@ -54,10 +54,11 @@
                 //}
             }
 
-            List<Dt_taskinfo> outboundTask = Dt_taskinfoRepository.Instance.Find(r => (r.task_type == TaskType.TaskType_Box_Pallet_Measure_Out.ToString() &&
-        //r.task_type.Contains("Out") &&
-        (r.task_state.Equals(TaskState.TaskState_RGV_Received.ToString()) || r.task_state.Equals(TaskState.TaskState_RGV_Finished.ToString())))
-        || r.task_type == TaskType.TaskType_Box_Pallet_Measure_Back.ToString());
+            List<Dt_taskinfo> outboundTask = Dt_taskinfoRepository.Instance.Find(r => ((r.task_type == TaskType.TaskType_Box_Pallet_Measure_Out.ToString() /*|| r.task_type == TaskType.TaskType_CheckOutbound.ToString()*/)
+      &&
+  (r.task_state.Equals(TaskState.TaskState_RGV_Received.ToString()) || r.task_state.Equals(TaskState.TaskState_RGV_Finished.ToString())))
+  || r.task_type == TaskType.TaskType_Box_Pallet_Measure_Back.ToString());
+
             if (null != outboundTask && outboundTask.Count > 0)
             {
                 List<string> fromStation = outboundTask.Select(r => r.task_fromlocationid).ToList();
@@ -127,6 +128,7 @@
               && !x.location_islocked && listLayer.Contains(x.location_layer)).OrderBy(x => x.location_layer).ThenBy(x => x.location_column).FirstOrDefault();
 
                 if (null != locationinfo)
+
                     return locationinfo;
             }
 

--
Gitblit v1.9.3