20250304测试完成后提交

qinchulong

2025-03-04 6acfe6b52441943b1ceb8468a2235326dad880fe

 项目代码/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;
@@ -674,6 +674,26 @@
                    //鎻愪氦浜嬪姟
                    _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)