ALD自动小车搬运项目
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
huangxiaoqiang
2025-12-19 4a4c9c93c3ae8c809368dde96fe822a27fd86d53 
 项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs


@@ -15,6 +15,7 @@


using WIDESEA_Core.Helper;


using WIDESEA_Core.Seed;


using WIDESEA_Core.Utilities;


using WIDESEA_DTO.Base;


using WIDESEA_DTO.Inbound;


using WIDESEA_IBasicService;


using WIDESEA_IInboundService;


@@ -42,9 +43,10 @@


        private readonly IRepository<Dt_WarehouseArea> _warehouseAreaRepository;


        private readonly IRepository<Dt_LocationType> _locationTypeRepository;


        private readonly IRepository<Dt_StockInfo> _stockRepository;


        private readonly IBasicService _basicService;


        public IRepository<Dt_InboundOrder> Repository => BaseDal;




        public InboundOrderService(IRepository<Dt_InboundOrder> BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IRepository<Dt_InboundOrderDetail> inboundOrderDetailRepository, IRepository<Dt_Task> taskRepository, IStockService stockService, IInboundOrderDetailService inboundOrderDetailService, IMaterialUnitService materialUnitService, IRepository<Dt_StockInfoDetail> stockDetailRepository, IRepository<Dt_InboundOrder> inboundOrderRepository, IRepository<Dt_WarehouseArea> warehouseAreaRepository, IRepository<Dt_StockInfo> stockRepository, IRepository<Dt_LocationType> locationTypeRepository, IMaterielInfoService materielInfoService) : base(BaseDal)


        public InboundOrderService(IRepository<Dt_InboundOrder> BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IRepository<Dt_InboundOrderDetail> inboundOrderDetailRepository, IRepository<Dt_Task> taskRepository, IStockService stockService, IInboundOrderDetailService inboundOrderDetailService, IMaterialUnitService materialUnitService, IRepository<Dt_StockInfoDetail> stockDetailRepository, IRepository<Dt_InboundOrder> inboundOrderRepository, IRepository<Dt_WarehouseArea> warehouseAreaRepository, IRepository<Dt_StockInfo> stockRepository, IRepository<Dt_LocationType> locationTypeRepository, IMaterielInfoService materielInfoService, IBasicService basicService) : base(BaseDal)


        {


            _mapper = mapper;


            _unitOfWorkManage = unitOfWorkManage;


@@ -59,6 +61,7 @@


            _stockRepository = stockRepository;


            _locationTypeRepository = locationTypeRepository;


            _materielInfoService = materielInfoService;


            _basicService = basicService;


        }




        public async Task<WebResponseContent> ReceiveInboundOrder(List<Dt_InboundOrder> models, int operateType)


@@ -99,9 +102,11 @@




                    foreach (var item in model.Details)


                    {


                        var purchaseToStockResult = await _materialUnitService.ConvertPurchaseToStockAsync(item.MaterielCode, item.BarcodeQty);


                        item.Unit = purchaseToStockResult.Unit;


                        item.OrderQuantity = purchaseToStockResult.Quantity;


                        //var purchaseToStockResult = await _materialUnitService.ConvertPurchaseToStockAsync(item.MaterielCode, item.BarcodeQty);




                        UnitConvertResultDTO totalResult = _basicService.UnitQuantityConvert(item.MaterielCode, item.Unit, item.BarcodeUnit, item.OrderQuantity);


                        item.Unit = totalResult.ToUnit;


                        item.OrderQuantity = totalResult.ToQuantity;


                        if (materielInfos.Any())


                        {


                            item.MaterielName = materielInfos.FirstOrDefault(x => x.MaterielCode == item.MaterielCode)?.MaterielName ?? "";