ZhongRui/ALDbanyunxiangmu.git

			@@ -8,6 +8,7 @@
			using WIDESEA_Core;
			using WIDESEA_Core.Attributes;
			using WIDESEA_Core.BaseController;
			using WIDESEA_Core.BaseRepository;
			using WIDESEA_DTO.Allocate;
			using WIDESEA_IAllocateService;
			using WIDESEA_IInboundService;
			@@ -26,9 +27,11 @@
			public class AllocateOrderController : ApiBaseController<IAllocateService, Dt_AllocateOrder>
			{
			private readonly ILogger<AllocateOrderController> _logger;
			public AllocateOrderController(IAllocateService service, ILogger<AllocateOrderController> logger) : base(service)
			private readonly IRepository<Dt_MaterielInfo> _materialInfoRepository;
			public AllocateOrderController(IAllocateService service, ILogger<AllocateOrderController> logger,IRepository<Dt_MaterielInfo> materialInfoRepository) : base(service)
			{
			_logger = logger;
			_materialInfoRepository = materialInfoRepository;
			}

			[HttpPost, Route("ReceiveAllocateOrder"), MethodParamsValidate, AllowAnonymous]
			@@ -57,6 +60,10 @@
			{
			allocateOrder.OrderType = 115;
			}
			else if (businessType == BusinessTypeEnum.æºä»è°æºä»)
			{
			allocateOrder.OrderType = 117;
			}

			foreach (var detailDto in model.Details)
			{
			@@ -64,6 +71,7 @@
			{
			return WebResponseContent.Instance.Error($"æ¡ç ä¸è½ä¸ºç©º");
			}
			var materialName = _materialInfoRepository.QueryFirst(x => x.MaterielCode == detailDto.MaterialCode).MaterielName;
			if (detailDto.Barcodes != null && detailDto.Barcodes.Any())
			{
			foreach (var barcodeDto in detailDto.Barcodes)
			@@ -72,6 +80,7 @@
			{
			WarehouseCode = detailDto.WarehouseCode,
			MaterielCode = detailDto.MaterialCode,
			MaterielName = materialName,
			LineNo = detailDto.LineNo,
			OrderQuantity = detailDto.Qty,
			SupplyCode = barcodeDto.SupplyCode,
			@@ -81,7 +90,7 @@
			BarcodeQty = barcodeDto.Qty,
			BarcodeUnit = barcodeDto.Unit,
			ValidDate = barcodeDto.validDate,

			BoxSN = barcodeDto.BoxSN
			};
			allocateOrder.Details.Add(orderDetail);
			}
			@@ -97,7 +106,7 @@
			Unit = detailDto.Unit,
			BarcodeUnit =detailDto.Unit,
			BarcodeQty=detailDto.Qty,

			MaterielName = materialName
			};
			allocateOrder.Details.Add(orderDetail);
			}