合并

刘磊

2024-12-17 f7f1f176f931f5ad54056df7b8e8a9f028eea100

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs

@@ -461,6 +461,10 @@

        var result = _agingInOrOutInputService.GetOCVInputAsync(agingInputDto).Result;
        var respone = JsonConvert.DeserializeObject<ResponeAgingInputDto>(result.Data.ToString());
        if (respone.ProductionLine == null || respone.ParameterInfos == null || respone.SpecialParameterDuration.IsNullOrEmpty())
        {
            throw new Exception("MOM数据返回错误");
        }
        stock.LinedProcessFeedbackTime = respone.LinedProcessFeedbackTime;
        stock.SpecialParameterDuration = respone.SpecialParameterDuration;
        //2024年11月16日：新增字段计算应出库时间
@@ -888,6 +892,9 @@
        try
        {




            // 调用BaseDal.QueryFirstAsync方法，查询任务
            var task = await BaseDal.QueryFirstAsync(x => x.PalletCode == input.PalletCode);
            if (task != null && task.TaskState == (int)TaskInStatusEnum.InNew)
@@ -906,8 +913,7 @@
                    TaskType = task.TaskType,
                };
                return content.OK(data: task);
            }

            } 

            var stationManagers = _stationManagerRepository.QueryData(x => x.stationType == 6 && x.stationChildCode == input.Position).FirstOrDefault();
            if (stationManagers == null)