duyongjia
2024-12-28 6be2bc8324ca81145830b758c110255d9dfdc00b
ÏîÄ¿´úÂë/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)