最新

zhangchengsong

12 小时以前 f59f3b24814387573b5bca9a9b6c832a3720ee7e

 ÏîÄ¿´úÂë/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs

@@ -130,11 +130,7 @@
                        //同步给上游反馈任务完成
                        Dt_roadwayinfo roadwayinfo = _Dt_roadwayinfoService.GetRoadwayinfo(task.Roadway);
                        CommandResult command = taskreturn(int.Parse(task.WMStaskid), Result, roadwayinfo.WarehouseInvType, "");
                        if (command.status != "success")
                        {
                            WriteLog.Write_Log("调取上游返回失败", "完成堆垛机任务失败", $"条码:【{task.PalletCode}】,任务号：【{task.TaskNum}】");
                            return content.Error($"调取上游返回失败，完成堆垛机任务失败，条码：{task.PalletCode},任务号：{task.TaskNum}");
                        }
                        if (command.status != "success")return content.Error($"调取上游返回失败，完成堆垛机任务失败，条码：{task.PalletCode},任务号：{task.TaskNum}");
                    }
                    task.ModifyDate = DateTime.Now;
                    BaseDal.DeleteData(task);
@@ -151,11 +147,7 @@
                    {
                        Dt_roadwayinfo roadwayinfo = _Dt_roadwayinfoService.GetRoadwayinfo(task.Roadway);
                        CommandResult command = taskreturn(int.Parse(task.WMStaskid), Result, roadwayinfo.WarehouseInvType, "");
                        if (command.status != "success")
                        {
                            WriteLog.Write_Log("调取上游返回失败", "完成堆垛机任务失败", $"条码:【{task.PalletCode}】,任务号：【{task.TaskNum}】");
                            return content.Error($"调取上游返回失败，完成堆垛机任务失败，条码：{task.PalletCode},任务号：{task.TaskNum}");
                        }
                        if (command.status != "success") return content.Error($"调取上游返回失败，完成堆垛机任务失败，条码：{task.PalletCode},任务号：{task.TaskNum}");
                    }
                    task.ModifyDate = DateTime.Now;
                    task.Modifier = "System";
@@ -168,16 +160,11 @@
                    task.TaskState = (int)TaskinventoryStatusEnum.inventoryFinish;
                    BaseDal.UpdateData(task);
                    string Result = WMSTaskStatusEnum.insuccess.GetDescription();
                    
                    if (task.Creater.Equals("WMS"))
                    {
                        Dt_roadwayinfo roadwayinfo = _Dt_roadwayinfoService.GetRoadwayinfo(task.Roadway);
                        CommandResult command = taskreturn(int.Parse(task.WMStaskid), Result, roadwayinfo.WarehouseInvType, "");
                        if (command.status != "success")
                        {
                            WriteLog.Write_Log("调取上游返回失败", "完成堆垛机任务失败", $"条码:【{task.PalletCode}】,任务号：【{task.TaskNum}】");
                            return content.Error($"调取上游返回失败，完成堆垛机任务失败，条码：{task.PalletCode},任务号：{task.TaskNum}");
                        }
                        if (command.status != "success")return content.Error($"调取上游返回失败，完成堆垛机任务失败，条码：{task.PalletCode},任务号：{task.TaskNum}");
                    }
                    task.ModifyDate = DateTime.Now;
                    task.Modifier = "System";
@@ -503,35 +490,21 @@
            try
            {
                Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
                if (task != null)
                if (task == null) return WebResponseContent.Instance.Error($"未找到该任务信息,任务号:【{taskNum}】");
                string Result = task.TaskType == 200 || task.TaskType == 300 ? WMSTaskStatusEnum.inerror.GetDescription(): WMSTaskStatusEnum.outerror.GetDescription();
                if (task.Creater.Equals("WMS"))
                {
                    //上报入库任务异常
                    //if (task.TaskType == (int)TaskTypeEnum.Inbound)
                    //{
                        string Result = WMSTaskStatusEnum.inerror.GetDescription();
                        if (task.Creater.Equals("WMS"))
                        {
                            Dt_roadwayinfo roadwayinfo = _Dt_roadwayinfoService.GetRoadwayinfo(task.Roadway);
                            CommandResult command = taskreturn(int.Parse(task.WMStaskid), Result, roadwayinfo.WarehouseInvType, "");
                            if (command.status != "success") return content.Error($"调取上游返回失败，任务取消失败，条码：{task.PalletCode},任务号：{task.TaskNum}");
                        }
                        BaseDal.DeleteData(task);
                        task.ModifyDate = DateTime.Now;
                        task.Modifier = App.User?.UserName;
                        task.Remark = "人工手动取消";
                        BaseDal.DeleteData(task);
                        _task_HtyService.AddTaskHty(task);
                        content.Status = true;
                    //}
                    //else
                    //{
                    //    return WebResponseContent.Instance.Error($"取消失败,只能取消入库任务");
                    //}
                     Dt_roadwayinfo roadwayinfo = _Dt_roadwayinfoService.GetRoadwayinfo(task.Roadway);
                     CommandResult command = taskreturn(int.Parse(task.WMStaskid), Result, roadwayinfo.WarehouseInvType, "");
                     if (command.status != "success") return content.Error($"调取上游返回失败，任务取消失败，条码：{task.PalletCode},任务号：{task.TaskNum}");
                }
                else
                {
                   return  WebResponseContent.Instance.Error($"取消失败,该任务【{taskNum}】不存在");
                }
                BaseDal.DeleteData(task);
                task.ModifyDate = DateTime.Now;
                task.Modifier = App.User?.UserName;
                task.Remark = "人工手动取消";
                BaseDal.DeleteData(task);
                _task_HtyService.AddTaskHty(task);
                content.Status = true;
                return content;
            }
            catch (Exception e)
@@ -561,7 +534,7 @@
                        CommandResult command = taskreturn(int.Parse(task.WMStaskid), Result, roadwayinfo.WarehouseInvType, "");
                        if (command.status != "success") return content.Error($"调取上游返回失败，完成堆垛机任务失败，条码：{task.PalletCode},任务号：{task.TaskNum}");
                    }
                        task.ModifyDate = DateTime.Now;
                    task.ModifyDate = DateTime.Now;
                    task.Modifier = App.User?.UserName;
                    task.Remark = "人工手动完成";
                    BaseDal.DeleteData(task);
@@ -577,7 +550,8 @@
                        CommandResult command = taskreturn(int.Parse(task.WMStaskid), Result, roadwayinfo.WarehouseInvType, "");
                        if (command.status != "success") return content.Error($"调取上游返回失败，完成堆垛机任务失败，条码：{task.PalletCode},任务号：{task.TaskNum}");
                    }
                        task.ModifyDate = DateTime.Now;
                    
                    task.ModifyDate = DateTime.Now;
                    task.Modifier = App.User?.UserName;
                    task.Remark = "人工手动完成";
                    BaseDal.DeleteData(task);
@@ -585,20 +559,21 @@
                    _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"手动入库完成");
                }
                else if (task.TaskType == (int)TaskTypeEnum.Inventorybound)
                {;
                {
                    string Result = WMSTaskStatusEnum.insuccess.GetDescription();
                    if (task.Creater.Equals("WMS"))
                    {
                        Dt_roadwayinfo roadwayinfo = _Dt_roadwayinfoService.GetRoadwayinfo(task.Roadway);
                        CommandResult command = taskreturn(int.Parse(task.WMStaskid), Result, roadwayinfo.WarehouseInvType, "");
                        if (command.status != "success") return content.Error($"调取上游返回失败，完成堆垛机任务失败，条码：{task.PalletCode},任务号：{task.TaskNum}");

                    }
                    task.ModifyDate = DateTime.Now;
                    task.Modifier = App.User?.UserName;
                    task.Remark = "人工手动完成";
                    BaseDal.DeleteData(task);
                    _task_HtyService.AddTaskHty(task);
                    _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"手动入库完成");
                    _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"手动盘点完成");
                }
                else
                {
@@ -714,8 +689,6 @@

                        return content;
                    }


                }
                else
                {