From b174ea476eb1afd872985b2c261241a814e0185d Mon Sep 17 00:00:00 2001
From: xiaojiao <xiaojiao@kaokeziliao.com>
Date: 星期四, 12 三月 2026 09:55:27 +0800
Subject: [PATCH] 一次大的提交,涉及,wms,wcs,pda
---
项目代码/WCS/WIDESEA_WCSServer/WIDESEA_WCS/Jobs/RGV/RgvDispatchJob.cs | 31 ++++++++++++++-----------------
1 files changed, 14 insertions(+), 17 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..161fe4e 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(() =>
@@ -168,20 +166,20 @@
// 杩欓噷鍔犱竴涓垽鏂紝姣斿鎴戞湁涓や釜浠诲姟鍘�70101 鎴戜换鍔鍏堜笅鍙� 鐞嗗簲鍏堝埌70101 浣嗗彲鑳戒换鍔鍙梤gv鎹㈠眰鐨勫奖鍝� 浠诲姟B 鍏堝埌鍑哄簱鍖虹殑缂撳瓨鏋� 瀵艰嚧B鍏堣繃鍘诲埌浜�70101閭h竟
// 杩欓噷瑕佸垽鏂� 濡傛灉鎴戜换鍔鐨凴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_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;
+ // }
+ //}
//鍐嶅仛涓�涓繚鎶わ紝鏌ョ湅瀵瑰簲鐨勬斁璐х珯鍙颁笂鏄湁鏈夎揣锛屽嵆璇诲彇绔欏彴鏄惁澶勪簬璐熻浇寰呮満鐨勭姸鎬侊紝濡傛灉鏄紝璇存槑鏈変笢瑗�
@@ -224,7 +222,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