From 557f02072fa311eefe3123aa44afebac22adc465 Mon Sep 17 00:00:00 2001
From: xiaojiao <xiaojiao@kaokeziliao.com>
Date: 星期五, 24 四月 2026 17:24:43 +0800
Subject: [PATCH] 4-24
---
项目代码/WCS/WIDESEA_WCSServer/WIDESEA_WCS/Jobs/RGV/RgvDispatchJob.cs | 41 ++++++++++++++++++++++++++---------------
1 files changed, 26 insertions(+), 15 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 161fe4e..ada86b8 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"
@@ -166,20 +166,31 @@
// 杩欓噷鍔犱竴涓垽鏂紝姣斿鎴戞湁涓や釜浠诲姟鍘�70101 鎴戜换鍔鍏堜笅鍙� 鐞嗗簲鍏堝埌70101 浣嗗彲鑳戒换鍔鍙梤gv鎹㈠眰鐨勫奖鍝� 浠诲姟B 鍏堝埌鍑哄簱鍖虹殑缂撳瓨鏋� 瀵艰嚧B鍏堣繃鍘诲埌浜�70101閭ｈ竟
// 杩欓噷瑕佸垽鏂� 濡傛灉鎴戜换鍔鐨凴GV浠诲姟瑕佷笅鍙戠殑鏃跺�欙紝鍒ゆ柇鍓嶉潰鏄惁鏈変换鍔★紝濡傛灉鏈夛紝鍒ゆ柇杩欎釜浠诲姟鏄惁宸插埌杈剧紦瀛樻灦鎴栬�呮槸浠诲姟鍑哄簱杈撻�佺嚎鎵ц涓墠鑳戒笅鍙�
- //if (endStationNo.Contains(wcsInfo.wcstask_endPoint)) // 璇佹槑鏄幓鍘嬭鍙扮殑
- //{
- // 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_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())
- // );
- // if (WcsTask != null)
- // {
- // continue;
- // }
- //}
+ if (endStationNo.Contains(wcsInfo.wcstask_endPoint)) // 璇佹槑鏄幓鍘嬭鍙扮殑
+ {
+ 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_state != TaskState.TaskState_Assigned.ToString()
+ && x.wcstask_state != TaskState.TaskState_Box_Out_Line_Executing.ToString()
+ && x.wcstask_state != TaskState.TaskState_HoisterExecuting.ToString()
+ );
+
+ // 杩欓噷鍔犱竴涓� 鍘诲帇瑁呭彴鐨勫眰浠诲姟瀹屾垚涔嬪悗鎵嶄笅鍙戝綋灞傜殑浠诲姟 渚嬪涓や釜鍘�70101 鍓嶅ご鐨勮杈撻�佺嚎鎵ц涓墠琛屽彂閫佷换鍔★紝鎻愬崌鏈鸿繍琛屼腑鎴栬�呮槸浠�涔堢殑閮戒笉琛�
+ Dt_TaskWCSinfo WcsTask2 = taskWCSinfoRepository.FindFirst(x =>
+ x.wcstask_startPoint == wcsInfo.wcstask_startPoint
+ && x.wcstask_taskNumber != wcsInfo.wcstask_taskNumber
+ && (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_Assigned.ToString())
+ );
+ if (WcsTask != null || WcsTask2 != null)
+ {
+ Console.WriteLine($"褰撳墠灞傜殑浠诲姟杩樻病鍑哄幓 璇风瓑寰呫�傘�傘�傘��");
+ continue;
+ }
+ }
//鍐嶅仛涓�涓繚鎶わ紝鏌ョ湅瀵瑰簲鐨勬斁璐х珯鍙颁笂鏄湁鏈夎揣锛屽嵆璇诲彇绔欏彴鏄惁澶勪簬璐熻浇寰呮満鐨勭姸鎬侊紝濡傛灉鏄紝璇存槑鏈変笢瑗�
@@ -206,7 +217,7 @@
}
- // 杩欓噷鑾峰彇涓�涓┖鎵樼洏鍥炲簱鐨勶紝濡傛灉鎴戠殑绌烘墭宸茬粡鍦ㄥ闈㈡帓闃熷緢闀夸簡 閭ｆ垜灏变笉鑳戒笅鍙戝叆搴撶殑浠诲姟浜�
+ // 杩欓噷鑾峰彇涓�涓┖鎵樼洏鍥炲簱鐨勶紝濡傛灉鎴戠殑绌烘墭宸茬粡鍦ㄥ闈㈡帓闃熷緢闀夸簡 閭ｆ垜灏变笉鑳戒笅鍙戝簱鐨勪换鍔′簡
// 杩欓噷瑕佽鍙栦竴涓俊鍙�
int Return_Quantity = int.Parse(client.ReadValue(CLineInfoDBName.Return_Quantity.ToString()).ToString());
if (Return_Quantity >= 8) // 鍙绌烘墭鐩樺湪璺笂鐨勬暟閲� >= 8 閭ｄ箞鍥炵┖鎵樼洏鐨勪紭鍏堢骇灏辫鎻愰珮浜�
--
Gitblit v1.9.3