From f02d3a8ffc05a10a64859b2a16d5d43c8abb0fb9 Mon Sep 17 00:00:00 2001
From: xiaojiao <xiaojiao@kaokeziliao.com>
Date: 星期一, 23 三月 2026 11:13:36 +0800
Subject: [PATCH] 北京回长沙的最终版
---
项目代码/WCS/WIDESEA_WCSServer/WIDESEA_WCS/Jobs/ConveyorLine/OutboundArea/OutboundRequestAction.cs | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEA_WCSServer/WIDESEA_WCS/Jobs/ConveyorLine/OutboundArea/OutboundRequestAction.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEA_WCSServer/WIDESEA_WCS/Jobs/ConveyorLine/OutboundArea/OutboundRequestAction.cs"
index c3c4ab8..df32697 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEA_WCSServer/WIDESEA_WCS/Jobs/ConveyorLine/OutboundArea/OutboundRequestAction.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEA_WCSServer/WIDESEA_WCS/Jobs/ConveyorLine/OutboundArea/OutboundRequestAction.cs"
@@ -5,6 +5,7 @@
using System.Text;
using System.Threading;
using WIDESEA_Common;
+using WIDESEA_Common.LogEnum;
using WIDESEA_Common.TaskEnum;
using WIDESEA_Common.Tools;
using WIDESEA_Core.Utilities;
@@ -22,10 +23,11 @@
public static void OutboundCZ_PLC(IDt_TaskWCSinfoRepository taskWCSinfoRepository, IDt_TaskRGVinfoRepository taskRGVinfoRepository, PLCClient client)
{
- Dt_TaskWCSinfo hisTask = taskWCSinfoRepository.Find(r => r.wcstask_state == TaskState.TaskState_Box_Out_RGV_Finished.ToString()
- || r.wcstask_state == TaskState.TaskState_Empty_Out_RGV_Finished.ToString()
+ Dt_TaskWCSinfo hisTask = taskWCSinfoRepository.Find(r =>
+ r.wcstask_state == TaskState.TaskState_Box_Out_RGV_Finished.ToString()
+ || r.wcstask_state == TaskState.TaskState_Empty_Out_RGV_Finished.ToString()
|| r.wcstask_state == TaskState.TaskState_HoisterExecuting.ToString())
- .Where(r => OutboundStationLayerNo.Contains(r.wcstask_startPoint)
+ .Where(r => OutboundStationLayerNo.Contains(r.wcstask_startPoint)
&& (r.wcstask_type.Equals(TaskType.TaskType_Box_Pallet_Outbound.ToString()) || r.wcstask_type.Equals(TaskType.TaskType_Empty_Pallet_Outbound.ToString()))).OrderBy(x => x.wcstask_dispatcherTime).FirstOrDefault();
if (null != hisTask)
{
@@ -69,7 +71,6 @@
{
return false;
}
- // 杩欓噷瑕佸姞涓�涓垽鏂� 鎴戝厛鍘�70101鐨� 鑲畾瑕佸厛鍑哄幓锛屽摢鎬曡繖涓厛鐢熸垚鐨勪换鍔″彈鎹㈠眰鐨勫奖鍝�
//璇诲彇閫昏緫鎺у埗鍊� 鏌ョ湅绾夸綋鐘舵�侊紝鍑嗗缁欑嚎浣撲笅鍙戜换鍔′俊鎭�
int logicValue = int.Parse(client.ReadValue(CLineInfoDBName.R_Line_Logic.ToString(), lineCode).ToString());
@@ -97,9 +98,8 @@
wcsInfo.wcstask_dispatcherTime = DateTime.Now;
taskWCSinfoRepository.Update(wcsInfo, true);
}
-
}
- else if (logicValue == 4 || logicValue == 5)
+ else if (logicValue == 5)
{
string taskplc_Result = client.ReadValue(CLineInfoDBName.W_Line_Barcode.ToString(), lineCode).ToString();
if (taskplc_Result == wcsInfo.wcstask_barcode)
@@ -117,7 +117,9 @@
}
else
{
- Dt_TaskWCSinfo wcsInfoPLC = taskWCSinfoRepository.FindFirst(r => r.wcstask_barcode == rfidResult && r.wcstask_state == TaskState.TaskState_HoisterExecuting.ToString());
+ Dt_TaskWCSinfo wcsInfoPLC = taskWCSinfoRepository.FindFirst(r => r.wcstask_barcode == rfidResult
+ && r.wcstask_state == TaskState.TaskState_HoisterExecuting.ToString());
+
if (wcsInfoPLC != null)
{
string state = TaskState.TaskState_Box_Out_Line_Executing.ToString();
@@ -133,6 +135,8 @@
wcsInfoPLC.wcstask_dispatcherTime = DateTime.Now;
taskWCSinfoRepository.Update(wcsInfoPLC, true);
}
+
+
}
--
Gitblit v1.9.3