最新代码提交

wangxinhui

2025-09-06 1f121db427cc068eee97b699c410d1b5f320e867

 项目代码/WCS/WCSServices/WIDESEAWCS_TaskInfoService/TaskService.cs

@@ -194,10 +194,6 @@
                                task.CurrentAddress = router.StartPosi;
                                task.NextAddress = router.NextPosi;
                                task.DeviceCode = router.ChildPosiDeviceCode;
                                if (task.TaskType == TaskTypeEnum.ProductMD.ObjToInt())
                                {
                                    task.TaskState = TaskStatusEnum.Line_Executing.ObjToInt();
                                }
                            }
                            else //鍑哄簱
                            {
@@ -332,7 +328,31 @@
            }
            return content;
        }
        // <summary>
        /// 鍏ュ簱鐢宠
        /// </summary>
        public WebResponseContent YLPurchaseBoxing(string palletCode)
        {
            WebResponseContent? content = new WebResponseContent();
            try
            {
                string address = AppSettings.Get("WMSApiAddress");
                if (string.IsNullOrEmpty(address))
                {
                    return WebResponseContent.Instance.Error($"鏈壘鍒癢MSApi鍦板潃");
                }
                string responseStr = HttpHelper.Get($"{address}/api/Task/YLPurchaseBoxing?palletCode={palletCode}");
                WebResponseContent? responseContent = JsonConvert.DeserializeObject<WebResponseContent>(responseStr);

                content = responseContent;

            }
            catch (Exception ex)
            {
                content.Error(ex.Message);
            }
            return content;
        }
        // <summary>
        /// 璇锋眰鎴愬搧鍏ュ簱宸烽亾
        /// </summary>
@@ -880,7 +900,7 @@
            return BaseDal.QueryFirst(x => x.TaskNum == TaskNum && x.CurrentAddress == nextAddress && x.TaskState == (int)TaskStatusEnum.Line_Execute, TaskOrderBy);
        }

        public WebResponseContent UpdateTaskStatusToNext([NotNull] Dt_Task task,Dt_StationManger stationManger)
        public WebResponseContent UpdateTaskStatusToNext([NotNull] Dt_Task task, Dt_StationManger stationManger = null)
        {
            WebResponseContent content = new WebResponseContent();
            try
@@ -951,6 +971,11 @@
                        task.TaskState = (int)TaskStatusEnum.Line_Executing;
                        nextStatus = TaskStatusEnum.Line_Executing;
                    }
                    else if (task.TaskState == (int)TaskStatusEnum.SC_Execute)
                    {
                        task.TaskState = (int)TaskStatusEnum.SC_Executing;
                        nextStatus = TaskStatusEnum.SC_Executing;
                    }
                }
                else
                {