百步立体仓库
blame | 历史 | 补丁 | 提交 | 提交对比 | 显示空白
刘磊
2024-11-26 a1c804eed3b8d936e6392ce3ca82e9ad65e12094 
 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs


@@ -1,18 +1,9 @@


using log4net.Core;


using Mapster;


using Mapster;


using Masuit.Tools;


using Masuit.Tools.Models;


using Microsoft.EntityFrameworkCore;


using System.Linq;


using System.Threading.Tasks;


using WIDESEA_DTO.MOM;


using WIDESEA_DTO.WMS;


using WIDESEA_IStorageBasicRepository;


using WIDESEA_IStoragIntegrationServices;


using WIDESEA_Model.Models;


using WIDESEA_StorageBasicRepository;


using WIDESEA_StorageTaskRepository;


using WIDESEA_StoragIntegrationServices;


using WIDESEAWCS_BasicInfoRepository;




namespace WIDESEA_StorageOutTaskServices;


@@ -120,7 +111,8 @@


                await UpdateLocationAsync(loc);


                await DeleteStockInfoAsync(stock.Id);


                await DeleteStockInfoDetailsAsync(stock.StockInfoDetails);


                //await DeleteTaskAsync(task.TaskId);


                if (task.Roadway.Contains("FR"))   //如果是分容 将任务删除


                    await DeleteTaskAsync(task.TaskId);


            });




            return content.OK("任务完成成功");


@@ -317,7 +309,7 @@






            // 执行数据库事务


            bool isResult = await ExecuteTransaction(stock, taskHty, locationInf, task.TaskId);


            bool isResult = await ExecuteTransaction(stock, taskHty, locationInf, task.TaskId, boxing);


            if (isResult)


            {


                content.OK("入库任务完成成功");


@@ -434,7 +426,7 @@


        stock.LinedProcessFeedbackTime = respone.LinedProcessFeedbackTime;


        stock.SpecialParameterDuration = respone.SpecialParameterDuration;


        //2024年11月16日：新增字段计算应出库时间


        stock.OutboundTime = Convert.ToDateTime(respone.LinedProcessFeedbackTime).AddHours(Convert.ToDouble(respone.SpecialParameterDuration));


        stock.OutboundTime = Convert.ToDateTime(respone.LinedProcessFeedbackTime == null ? DateTime.Now : respone.LinedProcessFeedbackTime).AddHours(Convert.ToDouble(respone.SpecialParameterDuration));


        stock.ProductionLine = respone.ProductionLine;


        stock.ParameterInfos = respone.ParameterInfos.ToJsonString();


        stock.StockStatus = 1;


@@ -592,6 +584,7 @@


                content = await RequestTrayInTaskAsync(input);


                return content;


            }


            //Console.WriteLine("qqqqq");




            // TODO 获取本地料框属性与整盘电芯属性获取的值进行对比，如果一致则继续，否则返回错误信息


            //var productions = await _productionRepository.QueryDataAsync(x => result.TrayBarcodePropertys.Select(x => x.TrayBarcodeProperty).ToList().Contains(x.TrayBarcodeProperty));


@@ -601,6 +594,7 @@


            // 调用CreateBoxingInfo方法，创建组盘信息




            var boxing = CreateBoxingInfo(result, input.PalletCode);


            //Console.WriteLine(boxing.ToJsonString());


            if (boxing == null) return content.Error("组盘失败");




            // 调用GetProcessApplyAsync方法，获取工艺路线


@@ -631,7 +625,7 @@


                throw new Exception("未找到NG入库站台配置");


            }


            List<string> strings = stationManagers.Select(x=>x.Roadway).ToList();


            // 调用CreateNewTask方法，创建新任务


            //// 调用CreateNewTask方法，创建新任务


            content = await CreateNewTask(input, strings);


            if (content.Status)


            {