添加childDeviceCode至多个任务类，优化代码逻辑

肖洋

2024-12-11 68dbe298a5c67d8755cb4379e5106de7c54608c6

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

@@ -391,61 +391,9 @@
                }
            }

            //if (input.area != 3)
            //{
            //    if (input.PalletCode == null || input.PalletCode.Trim() == "")
            //        return content.Error("托盘条码为空");
            //}
            //创建一个TrayCellsStatusDto对象，并赋值
            //TrayCellsStatusDto trayCells = new TrayCellsStatusDto()
            //{
            //    Software = "WMS",
            //    TrayBarcode = input.PalletCode,
            //    //EquipmentCode = "EQ_CWJZ01"
            //    EquipmentCode = input.EquiCodeMOM
            //};

            // 调用GetTrayCellStatusAsync方法，获取整盘电芯
            //content = await GetTrayCellStatusAsync(trayCells);
            // 如果状态为false，则返回content
            //if (!content.Status) return content;

            // 添加组盘信息
            // 将content.Data转换为ResultTrayCellsStatus对象
            //var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
            //if (result.SerialNos.Count <= 0)
            //    return content.Error(result.MOMMessage);

            //Console.WriteLine(result);
            //// TODO 获取本地料框属性与整盘电芯属性获取的值进行对比，如果一致则继续，否则返回错误信息
            ////var productions = await _productionRepository.QueryDataAsync(x => result.TrayBarcodePropertys.Select(x => x.TrayBarcodeProperty).ToList().Contains(x.TrayBarcodeProperty));
            ////if (productions.Count <= 0)
            ////    return content.Error("料框属性不存在");

            //// 调用CreateBoxingInfo方法，创建组盘信息
            //var boxing = CreateBoxingInfo(result, input.PalletCode);
            //if (boxing == null) return content.Error("组盘失败");

            //// 调用GetProcessApplyAsync方法，获取工艺路线
            //ProcessApplyDto process = await GetProcessApplyAsync(input, result);

            //// 如果process为null，则返回content
            //if (process == null) return content;

            //// 调用_processApplyService.GetProcessApplyAsync方法，获取工艺申请
            //content = await _processApplyService.GetProcessApplyAsync(process);

            //// 如果状态为false，则返回null
            //if (!content.Status) return content.Error("工艺申请失败");

            ////// 调用GetProcessResponseAsync方法，获取工艺响应
            ////var processResponse = await GetProcessResponseAsync(process, input.Position);
            
            // 调用CreateNewTask方法，创建新任务
            content = await CreateNewTask(input);
            //if (content.Status)
            //{
            //    var isBox = await _boxingInfoRepository.AddDataNavAsync(boxing);
            //}
        }
        catch (Exception err)
        {
@@ -482,26 +430,8 @@
        }
        var task = await CreateNewTaskByStation(input, stationinfo);

        // 创建新任务实例
        //var task = new Dt_Task
        //{
        //    CurrentAddress = input.Position,
        //    Grade = 1,
        //    Roadway = input.Roadways,
        //    TargetAddress = locationInfo.LocationCode,
        //    Dispatchertime = DateTime.Now,
        //    MaterialNo = "",
        //    NextAddress = input.Roadways,
        //    OrderNo = null,
        //    PalletCode = input.PalletCode,
        //    SourceAddress = stationinfo.stationLocation,
        //    TaskState = (int)TaskInStatusEnum.Line_InFinish,
        //    TaskType = (int)TaskInboundTypeEnum.Inbound,
        //    TaskNum = await BaseDal.GetTaskNo(),
        //    Creater = "Systeam"
        //};

        // 尝试添加新任务
        if (task == null) return content.Error() ;
        var taskId = await BaseDal.AddDataAsync(task);
        bool isResult = taskId > 0;
        if (isResult)
@@ -604,6 +534,10 @@
                    Creater = "Systeam"
                };
                return taskNG;
            }
            else
            {
                return null;
            }
        }

@@ -1032,7 +966,7 @@

                var location = locations.OrderBy(x => x.Layer).ThenBy(x => x.Column).ThenBy(x => x.Row).FirstOrDefault();

                var stockInfo = await QueryStockInfoForEmptyTrayAsync("CWSC1", new List<string>());
                var stockInfo = await QueryStockInfoForEmptyTrayAsync("CWSC1");

                if (stockInfo != null)
                {