From 6be2bc8324ca81145830b758c110255d9dfdc00b Mon Sep 17 00:00:00 2001
From: duyongjia <adu_555@163.com>
Date: 星期六, 28 十二月 2024 17:13:44 +0800
Subject: [PATCH] 增加出库单历史 库存历史查询功能
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 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 d400cbd..6d2fda4 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"
@@ -95,26 +95,31 @@
}
Dt_Task task = _mapper.Map<Dt_Task>(item);
task.Creater = "WMS";
- //绌鸿溅鍏ュ簱
- if (item.TaskType == (int)TaskInboundTypeEnum.InInventory)
- {
- task.TaskType= (int)TaskInboundTypeEnum.InInventory;
- task.TaskState= (int)TaskInStatusEnum.InNew;
- }
- else if(item.TaskType==(int)TaskOutboundTypeEnum.OutInventory)
+ if(item.TaskType==(int)TaskOutboundTypeEnum.OutInventory)
{
task.TaskType=(int)TaskOutboundTypeEnum.OutInventory;
task.TaskState=(int)TaskOutStatusEnum.OutNew;
+
+ }
+ else if (item.TaskType == (int)TaskOutboundTypeEnum.Outbound)
+ {
+ task.TaskType = (int)TaskOutboundTypeEnum.Outbound;
+ task.TaskState = (int)TaskOutStatusEnum.OutNew;
}
else if (item.TaskType == (int)TaskInboundTypeEnum.Inbound)
{
task.TaskType = (int)TaskInboundTypeEnum.Inbound;
task.TaskState = (int)TaskInStatusEnum.InNew;
}
- else if (item.TaskType == (int)TaskOutboundTypeEnum.Outbound)
+ else if (item.TaskType == (int)TaskInboundTypeEnum.InInventory)
{
- task.TaskType = (int)TaskOutboundTypeEnum.Outbound;
- task.TaskState = (int)TaskOutStatusEnum.OutNew;
+ task.TaskType = (int)TaskInboundTypeEnum.InInventory;
+ task.TaskState = (int)TaskInStatusEnum.InNew;
+ }
+ else if (item.TaskType == (int)TaskInboundTypeEnum.InPick)
+ {
+ task.TaskType = (int)TaskInboundTypeEnum.InPick;
+ task.TaskState = (int)TaskInStatusEnum.InNew;
}
tasks.Add(task);
}
@@ -475,6 +480,7 @@
_unitOfWorkManage.BeginTran();
UpdateTaskStatus(task.TaskId, (int)TaskOutStatusEnum.SC_OutFinish);
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍫嗗灈鏈哄嚭搴撳畬鎴�");
+ HttpHelpers.Post<WebResponseContent>(url.Replace("PDA", "Task") + "UpdateTaskStatus?taskNum=" + task.TaskNum, "", "鏇存柊浠诲姟鐘舵��");
_unitOfWorkManage.CommitTran();
return content.OK();
}
@@ -487,11 +493,12 @@
}
- else if (task.TaskType == (int)TaskInboundTypeEnum.Inbound || task.TaskType == (int)TaskInboundTypeEnum.InInventory)
+ else if (task.TaskType == (int)TaskInboundTypeEnum.Inbound || task.TaskType == (int)TaskInboundTypeEnum.InInventory || task.TaskType == (int)TaskInboundTypeEnum.InPick)
{
_unitOfWorkManage.BeginTran();
UpdateTaskStatus(task.TaskId, (int)TaskInStatusEnum.SC_InFinish);
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍫嗗灈鏈哄叆搴撳畬鎴�");
+ HttpHelpers.Post<WebResponseContent>(url.Replace("PDA", "Task") + "UpdateTaskStatus?taskNum=" + task.TaskNum, "", "鏇存柊浠诲姟鐘舵��");
UpdateTaskStatus(task.TaskId, (int)TaskInStatusEnum.InFinish);
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍏ュ簱浠诲姟瀹屾垚");
//if (App.User.UserId > 0)
--
Gitblit v1.9.3