From 02dd21ca9a064b98aacfdc8c6ffec5a2b575967d Mon Sep 17 00:00:00 2001
From: xiaojiao <xiaojiao@kaokeziliao.com>
Date: 星期四, 26 三月 2026 09:54:56 +0800
Subject: [PATCH] PDA优化选配确认页面

---
 项目代码/WCS/WIDESEA_WCSServer/WIDESEA_WCS/Jobs/RGV/RgvDispatchJob.cs |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEA_WCSServer/WIDESEA_WCS/Jobs/RGV/RgvDispatchJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEA_WCSServer/WIDESEA_WCS/Jobs/RGV/RgvDispatchJob.cs"
index 3d6300e..d05e8e3 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEA_WCSServer/WIDESEA_WCS/Jobs/RGV/RgvDispatchJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEA_WCSServer/WIDESEA_WCS/Jobs/RGV/RgvDispatchJob.cs"
@@ -30,13 +30,11 @@
     [DisallowConcurrentExecution]
     public partial class RgvDispatchJob : JobBase, IJob
     {
-
         /// <summary>
         /// RGV(鏈夎建灏忚溅)璋冨害
         /// </summary>
         /// <param name="context"></param>
         /// <returns></returns>
-
         public Task Execute(IJobExecutionContext context)
         {
             return Task.Run(() =>
@@ -173,9 +171,10 @@
                             Dt_TaskWCSinfo WcsTask = taskWCSinfoRepository.FindFirst(x =>
                             x.wcstask_endPoint == wcsInfo.wcstask_endPoint
                             && x.wcstask_taskNumber != wcsInfo.wcstask_taskNumber
-                            && (x.wcstask_type == TaskType.TaskType_Box_Pallet_Outbound.ToString() || x.wcstask_type == TaskType.TaskType_Empty_Pallet_Outbound.ToString())
+                            && x.wcstask_type == TaskType.TaskType_Box_Pallet_Outbound.ToString()
                             && x.wcstask_state != TaskState.TaskState_Assigned.ToString()
-                            && (x.wcstask_state != TaskState.TaskState_Box_Out_Line_Executing.ToString() || x.wcstask_state != TaskState.TaskState_Empty_Out_Line_Executing.ToString())
+                            && x.wcstask_state != TaskState.TaskState_Box_Out_Line_Executing.ToString()
+                            && x.wcstask_state != TaskState.TaskState_HoisterExecuting.ToString()
                             );
                             if (WcsTask != null)
                             {
@@ -208,7 +207,7 @@
                             }
 
 
-                            // 杩欓噷鑾峰彇涓�涓┖鎵樼洏鍥炲簱鐨勶紝濡傛灉鎴戠殑绌烘墭宸茬粡鍦ㄥ闈㈡帓闃熷緢闀夸簡 閭f垜灏变笉鑳戒笅鍙戝叆搴撶殑浠诲姟浜�
+                            // 杩欓噷鑾峰彇涓�涓┖鎵樼洏鍥炲簱鐨勶紝濡傛灉鎴戠殑绌烘墭宸茬粡鍦ㄥ闈㈡帓闃熷緢闀夸簡 閭f垜灏变笉鑳戒笅鍙戝簱鐨勪换鍔′簡
                             // 杩欓噷瑕佽鍙栦竴涓俊鍙� 
                             int Return_Quantity = int.Parse(client.ReadValue(CLineInfoDBName.Return_Quantity.ToString()).ToString());
                             if (Return_Quantity >= 8) // 鍙绌烘墭鐩樺湪璺笂鐨勬暟閲� >= 8 閭d箞鍥炵┖鎵樼洏鐨勪紭鍏堢骇灏辫鎻愰珮浜�
@@ -224,7 +223,6 @@
 
                             if (TempHK)
                             {
-
                                 if ((wcsInfo.wcstask_type == TaskType.TaskType_Box_Pallet_Outbound.ToString() || wcsInfo.wcstask_type == TaskType.TaskType_Empty_Pallet_Outbound.ToString())
                                     && wcsInfo.wcstask_state == TaskState.TaskState_Assigned.ToString()
                                     && endStationNo.Contains(wcsInfo.wcstask_endPoint))

--
Gitblit v1.9.3