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

wangxinhui

2025-09-11 34de141a574a430527a210394359c1199ccde7a3

 项目代码/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>
@@ -906,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;
@@ -926,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}");
@@ -963,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)