'完善二楼出库放货中屏蔽光栅'

zhangchengsong

昨天 ce70974f99cd377579e9b07873c8ce79df6e05c3

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

@@ -123,14 +123,17 @@
                {
                    task.TaskState = (int)TaskOutStatusEnum.OutFinish;
                    BaseDal.UpdateData(task);

                    string Result = WMSTaskStatusEnum.outsuccess.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}");
                        if (command.status != "success")
                        {
                            WriteLog.Write_Log("调取上游返回失败", "完成堆垛机任务失败", $"条码:【{task.PalletCode}】,任务号：【{task.TaskNum}】");
                            return content.Error($"调取上游返回失败，完成堆垛机任务失败，条码：{task.PalletCode},任务号：{task.TaskNum}");
                        }
                    }
                    task.ModifyDate = DateTime.Now;
                    BaseDal.DeleteData(task);
@@ -147,7 +150,11 @@
                    {
                        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}");
                        if (command.status != "success")
                        {
                            WriteLog.Write_Log("调取上游返回失败", "完成堆垛机任务失败", $"条码:【{task.PalletCode}】,任务号：【{task.TaskNum}】");
                            return content.Error($"调取上游返回失败，完成堆垛机任务失败，条码：{task.PalletCode},任务号：{task.TaskNum}");
                        }
                    }
                    task.ModifyDate = DateTime.Now;
                    task.Modifier = "System";
@@ -165,7 +172,11 @@
                    {
                        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}");
                        if (command.status != "success")
                        {
                            WriteLog.Write_Log("调取上游返回失败", "完成堆垛机任务失败", $"条码:【{task.PalletCode}】,任务号：【{task.TaskNum}】");
                            return content.Error($"调取上游返回失败，完成堆垛机任务失败，条码：{task.PalletCode},任务号：{task.TaskNum}");
                        }
                    }
                    task.ModifyDate = DateTime.Now;
                    task.Modifier = "System";
@@ -503,7 +514,6 @@
                            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;
@@ -514,12 +524,12 @@
                    }
                    else
                    {
                        WebResponseContent.Instance.Error($"取消失败,只能取消入库任务");
                        return WebResponseContent.Instance.Error($"取消失败,只能取消入库任务");
                    }
                }
                else
                {
                    WebResponseContent.Instance.Error($"取消失败,该任务【{taskNum}】不存在");
                   return  WebResponseContent.Instance.Error($"取消失败,该任务【{taskNum}】不存在");
                }
                return content;
            }
@@ -615,9 +625,6 @@
            try
            {
                IDevice? device = Storage.Devices.FirstOrDefault(x => x.DeviceName.Contains("堆垛机"));



                // åˆ¤æ–­è®¾å¤‡æ˜¯å¦å­˜åœ¨
                if (device == null)
                {
@@ -670,7 +677,7 @@
                        {
                            // æ­£å¸¸åˆ›å»ºä»»åŠ¡
                            transfer.TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum));
                            transfer.TaskState = 200;
                            transfer.TaskState = 100;
                            transfer.CurrentAddress = transfer.SourceAddress;
                            transfer.NextAddress = transfer.TargetAddress;
                            transfer.Roadway = device.DeviceCode;
@@ -701,5 +708,51 @@
            }
            return content;
        }
        /// <summary>
        /// æ‰‹åŠ¨åˆ é™¤ä»»åŠ¡
        /// </summary>
        /// <param name="taskNum"></param>
        /// <returns></returns>

        public WebResponseContent CreateDelete(int taskNum)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
                if (task == null)
                    return WebResponseContent.Instance.Error($"未找到该任务信息,任务号:【{taskNum}】");
                task.ModifyDate = DateTime.Now;
                task.Modifier = App.User?.UserName;
                task.Remark = "人工手动删除";
                content.Status =  BaseDal.DeleteData(task);
                _task_HtyService.AddTaskHty(task);
                _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"手动删除任务");
            }
            catch(Exception e)
            {
                WebResponseContent.Instance.Error(e.Message);
            }
            return content;
        }
        /// <summary>
        /// ç¼–辑
        /// </summary>
        /// <param name="saveModel"></param>
        /// <returns></returns>
        public override WebResponseContent UpdateData(SaveModel saveModel)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                string json = JsonConvert.SerializeObject(saveModel.MainData);
                Dt_Task task = JsonConvert.DeserializeObject<Dt_Task>(json);
                content.Status = BaseDal.UpdateData(task);
            }catch(Exception e)
            {
                WebResponseContent.Instance.Error(e.Message);
            }
            return content;
        }
    }
}