修改堆垛机通讯协议及交互逻辑

dengjunjie

2025-06-11 2ae5aa151f7b40a082e34aa7ed22b4b64edd1d3c

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs

@@ -128,9 +128,14 @@
            }
            finally
            {
                WriteLog.GetLog("任务完成").Write($"操作人：{(App.User.UserId>0? App.User.UserName: "System")}{ Environment.NewLine}{ JsonConvert.SerializeObject(content)}", "任务完成");
                WriteLog.GetLog("任务完成").Write($"操作人：{(App.User.UserId>0? App.User.UserName: "System")}{ Environment.NewLine}任务号：{taskNum}{Environment.NewLine}{ JsonConvert.SerializeObject(content)}", "任务完成");
            }
        }
        /// <summary>
        /// ä»»åŠ¡å–消
        /// </summary>
        /// <param name="taskNum"></param>
        /// <returns></returns>
        public WebResponseContent TaskCancel(int taskNum)
        {
            WebResponseContent content = new WebResponseContent();
@@ -175,7 +180,7 @@
            }
            finally
            {
                WriteLog.GetLog("任务取消").Write($"操作人：{(App.User.UserId > 0 ? App.User.UserName : "System")}{Environment.NewLine}{JsonConvert.SerializeObject(content)}", "任务取消");
                WriteLog.GetLog("任务取消").Write($"操作人：{(App.User.UserId > 0 ? App.User.UserName : "System")}{Environment.NewLine}任务号：{taskNum}{Environment.NewLine}{JsonConvert.SerializeObject(content)}", "任务取消");
            }
        }

@@ -199,7 +204,7 @@
                }
                else if (task.TaskType == TaskTypeEnum.Relocation.ObjToInt())
                {
                    task.TaskStatus = InTaskStatusEnum.RelocationExecuting.ObjToInt();
                    task.TaskStatus = RelocationTaskStatusEnum.RelocationExecuting.ObjToInt();
                }
                else
                {
@@ -208,7 +213,7 @@
                _unitOfWorkManage.BeginTran();
                task.Dispatchertime = DateTime.Now;
                task.ModifyDate = DateTime.Now;
                task.Modifier = "System";
                task.Modifier = App.User.UserId > 0 ? App.User.UserName : "System";
                BaseDal.UpdateData(task);
                _unitOfWorkManage.CommitTran();
                 return content = WebResponseContent.Instance.OK();
@@ -277,7 +282,7 @@
                    LocationCode = task.TargetAddress,
                    StockStatus = StockStatusEmun.已入库.ObjToInt(),
                    Creater = App.User.UserId > 0 ? App.User.UserName : "System",
                    CreateDate = App.User.UserId > 0 ? DateTime.Now : DateTime.Now,
                    CreateDate = DateTime.Now,
                };
                Dt_LocationInfo locationInfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.TargetAddress);

@@ -451,7 +456,7 @@

                _basicService.LocationInfoService.RelocationFree(locationEnd, task.TaskNum);

                task.TaskStatus = InTaskStatusEnum.RelocationFinish.ObjToInt();
                task.TaskStatus = RelocationTaskStatusEnum.RelocationFinish.ObjToInt();
                BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateType.自动完成 : OperateType.人工完成);

                _unitOfWorkManage.CommitTran();
@@ -647,7 +652,7 @@
                _basicService.LocationInfoService.RelocationFree(locationStart, task.TaskNum);
                _basicService.LocationInfoService.Repository.UpdateData(locationEnd);

                task.TaskStatus = InTaskStatusEnum.RelocationCancel.ObjToInt();
                task.TaskStatus = RelocationTaskStatusEnum.RelocationCancel.ObjToInt();
                BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateType.自动完成 : OperateType.人工完成);

                _unitOfWorkManage.CommitTran();