ZhongRui/ALDbanyunxiangmu.git

			@@ -3,10 +3,13 @@
			using Microsoft.AspNetCore.Http;
			using Microsoft.AspNetCore.Mvc;
			using Newtonsoft.Json;
			using System.Threading.Tasks;
			using WIDESEA_Common.OrderEnum;
			using WIDESEA_Core;
			using WIDESEA_Core.Attributes;
			using WIDESEA_Core.BaseController;
			using WIDESEA_Core.CodeConfigEnum;
			using WIDESEA_Core.Helper;
			using WIDESEA_DTO.Inbound;
			using WIDESEA_DTO.Outbound;
			using WIDESEA_IOutboundService;
			@@ -33,7 +36,7 @@
			/// <param name="model"></param>
			/// <returns></returns>
			[HttpPost, Route("ReceiveOutBoundOrder"), AllowAnonymous, MethodParamsValidate]
			public WebResponseContent ReceiveOutBoundOrder([FromBody] OutboundRequestModel model)
			public async Task<WebResponseContent> ReceiveOutBoundOrder([FromBody] OutboundRequestModel model)
			{
			_logger.LogInformation("OutboundOrderController ReceiveOutBoundOrder: " + JsonConvert.SerializeObject(model));
			Dt_OutboundOrder dt_OutboundOrder = new Dt_OutboundOrder() { Details = new List<Dt_OutboundOrderDetail>() };
			@@ -48,7 +51,11 @@
			Unit = detailitem.unit,
			WarehouseCode = detailitem.warehouseCode,
			MoveQty = detailitem.moveQty,
			OrderQuantity = detailitem.qty
			BarcodeMoveQty=detailitem.moveQty,
			BarcodeQty=detailitem.qty,
			BarcodeUnit=detailitem.unit,
			OrderQuantity = detailitem.qty,
			Remark = detailitem.remark??"",
			};
			dt_OutboundOrder.Details.Add(inboundOrderDetail);
			}
			@@ -56,8 +63,10 @@
			dt_OutboundOrder.BusinessType = model.business_type;
			dt_OutboundOrder.IsBatch = model.isBatch;
			dt_OutboundOrder.FactoryArea = model.factoryArea;
			dt_OutboundOrder.CreateType = OrderCreateTypeEnum.UpperSystemPush.ObjToInt();
			dt_OutboundOrder.DepartmentName = model.lineName??"";

			var content = Service.ReceiveOutboundOrder(dt_OutboundOrder, model.operationType);
			var content =await Service.ReceiveOutboundOrder(dt_OutboundOrder, model.operationType);

			if (content.Status) return WebResponseContent.Instance.OK(200);
			else return WebResponseContent.Instance.Error(content.Message);
			@@ -76,5 +85,11 @@
			}
			return WebResponseContent.Instance.OK(null, order);
			}

			[HttpGet, Route("GetOrderNoByPalletCode"), AllowAnonymous, MethodParamsValidate]
			public WebResponseContent GetOrderNoByPalletCode(string palletCode)
			{
			return Service.GetOrderNoByPalletCode(palletCode);
			}
			}
			}