Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/LongDeLiLiKu

wangxinhui

2025-09-11 34de141a574a430527a210394359c1199ccde7a3

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

@@ -926,8 +926,8 @@
                    if (task.TaskState == (int)TaskStatusEnum.Line_Executing)
                    {
                        #region 鍏ュ簱璋冪敤鎺ュ彛鑾峰彇璐т綅鍦板潃
                        //string? local = RequestAssignLocation(task.TaskNum, task.Roadway);
                        string? local = "SC05_YLDual-002-090-009-01";
                        string? local = RequestAssignLocation(task.TaskNum, task.Roadway);
                        //string? local = "SC05_YLDual-002-090-009-01";
                        if (!string.IsNullOrEmpty(local))
                        {
                            task.CurrentAddress = stationManger.StackerCraneStationCode;
@@ -946,8 +946,8 @@
                    }
                    else if (task.TaskState == (int)TaskStatusEnum.AGV_Finish)
                    {
                        //content = AssignYLRoadwayNo(task.PalletCode);
                        content.OK(data: "SC05_YLDual");
                        content = AssignYLRoadwayNo(task.PalletCode);
                        //content.OK(data: "SC05_YLDual");
                        if (!content.Status)
                        {
                            return content.Error($"璇锋眰鍏ュ簱澶辫触锛歿content.Message}");
@@ -983,8 +983,8 @@
                }
                task.ModifyDate = DateTime.Now;
                task.Modifier = "System";
                BaseDal.UpdateData(task);
                //UpdateTask(task, nextStatus);
                //BaseDal.UpdateData(task);
                UpdateTask(task, nextStatus);
                content = WebResponseContent.Instance.OK();
            }
            catch (Exception ex)