From 8719efbc72f2cd283373875b0ea34ed99ea5a79a Mon Sep 17 00:00:00 2001
From: 刘磊 <1161824510@qq.com>
Date: 星期六, 14 十二月 2024 15:07:28 +0800
Subject: [PATCH] 常温-OCV出库校验防呆
---
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
index 4b333bf..5dee342 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
@@ -170,7 +170,7 @@
if (task.TaskType == (int)TaskInboundTypeEnum.InNG)
{
var station = await _stationManagerRepository.QueryFirstAsync(x => x.stationChildCode == task.SourceAddress);
- Dt_Task _Task = _mapper.Map<Dt_Task>(task);
+ Dt_Task _Task = _mapper.Map<Dt_Task>(task);
_Task.TaskState = (int)TaskInStatusEnum.InNew;
_Task.CurrentAddress = task.SourceAddress;
_Task.NextAddress = station.stationNGChildCode;
@@ -623,9 +623,17 @@
else
{
task.TaskState = (int)TaskOutStatusEnum.OutFinish;
+ //濡傞珮娓╁嚭搴撳悗 NG 鍒欏皢浠诲姟鏍囪涓篘G 骞跺湪鍑哄簱鐢宠鍚庡皢浠诲姟鍑鸿嚦NG鍙�
+ if (task.Remark == "NG")
+ {
+ BaseDal.UpdateData(task);
+ }
+ else
+ {
+ BaseDal.DeleteData(task);
+ ConsoleHelper.WriteWarningLine($"楂樻俯鍑哄簱鐩殑鍦板潃{task.TargetAddress}");
+ }
- BaseDal.DeleteData(task);
- ConsoleHelper.WriteWarningLine($"楂樻俯鍑哄簱鐩殑鍦板潃{task.TargetAddress}");
var taskHty = task.Adapt<Dt_Task_Hty>();
_taskHtyRepository.AddData(taskHty);
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍫嗗灈鏈哄嚭搴撳畬鎴�");
@@ -777,5 +785,10 @@
{
return BaseDal.QueryFirst(x => x.Roadway == deviceNo && x.TaskType == (int)TaskRelocationTypeEnum.Relocation && x.TaskState == (int)TaskStatus.Created);
}
+
+ public Dt_Task QueryExecutingTaskByBarcode(string barcode, string nextAddress)
+ {
+ return BaseDal.QueryFirst(x => x.PalletCode == barcode && x.NextAddress == nextAddress && (x.TaskState == (int)TaskInStatusEnum.Line_InExecuting || x.TaskState == (int)TaskOutStatusEnum.Line_OutExecuting), TaskOrderBy);
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.3