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 | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 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..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"
@@ -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,12 +171,23 @@
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)
+
+ // 杩欓噷鍔犱竴涓� 鍘诲帇瑁呭彴鐨勫眰浠诲姟瀹屾垚涔嬪悗鎵嶄笅鍙戝綋灞傜殑浠诲姟 渚嬪涓や釜鍘�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;
}
}
@@ -208,7 +217,7 @@
}
- // 杩欓噷鑾峰彇涓�涓┖鎵樼洏鍥炲簱鐨勶紝濡傛灉鎴戠殑绌烘墭宸茬粡鍦ㄥ闈㈡帓闃熷緢闀夸簡 閭ｆ垜灏变笉鑳戒笅鍙戝叆搴撶殑浠诲姟浜�
+ // 杩欓噷鑾峰彇涓�涓┖鎵樼洏鍥炲簱鐨勶紝濡傛灉鎴戠殑绌烘墭宸茬粡鍦ㄥ闈㈡帓闃熷緢闀夸簡 閭ｆ垜灏变笉鑳戒笅鍙戝簱鐨勪换鍔′簡
// 杩欓噷瑕佽鍙栦竴涓俊鍙�
int Return_Quantity = int.Parse(client.ReadValue(CLineInfoDBName.Return_Quantity.ToString()).ToString());
if (Return_Quantity >= 8) // 鍙绌烘墭鐩樺湪璺笂鐨勬暟閲� >= 8 閭ｄ箞鍥炵┖鎵樼洏鐨勪紭鍏堢骇灏辫鎻愰珮浜�
@@ -224,7 +233,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