From 660f077385ffbc8d9edd3c52e0f2e4f5f2e15349 Mon Sep 17 00:00:00 2001
From: Zhang-Hong-Lin <a3219986988@163.com>
Date: 星期三, 05 三月 2025 17:31:16 +0800
Subject: [PATCH] 1
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
index dd4b366..d1d6bf7 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -264,7 +264,7 @@
}
else if (workTpe.Equals("Out"))
{
- task = BaseDal.QueryData(v => v.TaskType == (int)TaskOutboundTypeEnum.Outbound && v.TaskState == (int)TaskOutStatusEnum.OutNew).OrderBy(v => v.CreateDate).First();
+ task = BaseDal.QueryData(v => (v.TaskType == (int)TaskOutboundTypeEnum.Outbound || v.TaskType == (int)TaskOutboundTypeEnum.OutInventory) && v.TaskState == (int)TaskOutStatusEnum.OutNew).OrderBy(v => v.CreateDate).First();
}
}
catch (Exception)
@@ -415,7 +415,7 @@
{
task.TaskState = (int)TaskInStatusEnum.Line_InGrabExecuting;
}
- else if (status == 2 && task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
+ else if (status == 2 && (task.TaskType == (int)TaskOutboundTypeEnum.Outbound || task.TaskType == (int)TaskOutboundTypeEnum.OutInventory))
{
task.TaskState = (int)TaskOutStatusEnum.Line_OutGrabExecuting;
}
@@ -423,7 +423,7 @@
{
task.TaskState = (int)TaskInStatusEnum.Line_InDownExecuting;
}
- else if (status == 3 && task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
+ else if (status == 3 && task.TaskType == (int)TaskOutboundTypeEnum.Outbound || task.TaskType == (int)TaskOutboundTypeEnum.OutInventory)
{
task.TaskState = (int)TaskOutStatusEnum.Line_OutWownExecuting;
}
@@ -653,7 +653,7 @@
taskhty.TaskNum = nawtask.TaskNum;
taskhty.Roadway = nawtask.Roadway;
taskhty.TaskType = nawtask.TaskType;
- taskhty.TaskState = (int)TaskInStatusEnum.Line_InFinish;
+ taskhty.TaskState = (int)TaskOutStatusEnum.OutFinish;
taskhty.SourceAddress = nawtask.SourceAddress;
taskhty.TargetAddress = nawtask.TargetAddress;
taskhty.ExceptionMessage = nawtask.ExceptionMessage;
@@ -669,11 +669,31 @@
_stockRepository.DeleteData(Towstock);
_locationRepository.UpdateData(location);
_locationRepository.UpdateData(locationTow);
- //_taskhtyRepository.AddData(taskhty);
+ _taskhtyRepository.AddData(taskhty);
BaseDal.DeleteData(nawtask);
//鎻愪氦浜嬪姟
_unitOfWorkManage.CommitTran();
}
+ else if (nawtask.TaskType == (int)TaskOutboundTypeEnum.OutInventory)
+ {
+ //澶勭悊浠诲姟淇℃伅
+ Dt_Task_hty taskhty = new Dt_Task_hty();
+ taskhty.TaskNum = nawtask.TaskNum;
+ taskhty.Roadway = nawtask.Roadway;
+ taskhty.TaskType = nawtask.TaskType;
+ taskhty.TaskState = (int)TaskOutStatusEnum.OutFinish;
+ taskhty.SourceAddress = nawtask.SourceAddress;
+ taskhty.TargetAddress = nawtask.TargetAddress;
+ taskhty.ExceptionMessage = nawtask.ExceptionMessage;
+ taskhty.Grade = nawtask.Grade;
+ taskhty.Dispatchertime = nawtask.Dispatchertime;
+ taskhty.Remark = nawtask.Remark;
+ taskhty.PalletCode = nawtask.PalletCode;
+ taskhty.NextAddress = nawtask.NextAddress;
+ taskhty.CurrentAddress = nawtask.CurrentAddress;
+ _taskhtyRepository.AddData(taskhty);
+ BaseDal.DeleteData(nawtask);
+ }
content = WebResponseContent.Instance.OK();
}
catch (Exception ex)
--
Gitblit v1.9.3