MeiRuiAn/JiAnLiKu.git

			@@ -46,7 +46,7 @@

			public IInboundOrderRepository Repository => BaseDal;

			public InboundOrderService(IInboundOrderRepository BaseDal, IMapper mapper, IBasicService basicService,IBasicRepository basicRepository, IInboundRepository inboundRepository, IUnitOfWorkManage unitOfWorkManage, ITaskRepository taskRepository, IStockService stockService, IInboundOrderDetailService inboundOrderDetailService, IInboundOrder_HtyService inboundOrderHtyService, IInboundOrderDetail_HtyService inboundOrderDetail_HtyService) : base(BaseDal)
			public InboundOrderService(IInboundOrderRepository BaseDal, IMapper mapper, IBasicService basicService, IBasicRepository basicRepository, IInboundRepository inboundRepository, IUnitOfWorkManage unitOfWorkManage, ITaskRepository taskRepository, IStockService stockService, IInboundOrderDetailService inboundOrderDetailService, IInboundOrder_HtyService inboundOrderHtyService, IInboundOrderDetail_HtyService inboundOrderDetail_HtyService) : base(BaseDal)
			{
			_mapper = mapper;
			_unitOfWorkManage = unitOfWorkManage;
			@@ -118,7 +118,6 @@
			{
			Dt_InboundOrderDetail orderDetail = new Dt_InboundOrderDetail()
			{
			OrderId = inboundOrderOld.Id,
			MaterielCode = item.MaterielCode,
			BatchNo = item.BatchNo,
			OrderQuantity = item.OrderQuantity,
			@@ -126,13 +125,15 @@
			OverInQuantity = 0,
			OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),
			LinId = item.LinId,
			LPNNo=item.LPN_No,
			LPNNo = item.LPN_No,
			MaterielName = item.MaterielName,
			MaterieSpec = item.MaterieSpec
			MaterieSpec = item.MaterieSpec,
			Creater = "上游WMS"
			};

			Dt_InboundOrder inboundOrder = new Dt_InboundOrder()
			{
			OrderNo = model.AsnNo,
			UpperOrderNo = model.AsnNo,
			WarehouseId = warehouse.WarehouseId,
			//SupplierId = "",
			@@ -142,6 +143,7 @@
			TransactionCode = model.TransactionCode,
			InoutType = model.OrderType,
			OrderType = model.InoutType.ObjToInt(),
			Creater = "上游WMS",
			Details = new List<Dt_InboundOrderDetail> { orderDetail }
			};
			//switch (model.OrderType)//单据类型
			@@ -311,6 +313,33 @@
			return content;
			}

			public WebResponseContent GetInboundOrders(SaveModel saveModel)
			{
			WebResponseContent content = new WebResponseContent();
			try
			{
			int pageNo = saveModel.MainData["pageNo"].ObjToInt();
			string? orderNo = saveModel.MainData["orderNo"].ToString();
			int warehouseId = saveModel.MainData["warehouseId"].ObjToInt();
			List<Dt_InboundOrder> dt_ReceiveOrders = new List<Dt_InboundOrder>();
			if (string.IsNullOrEmpty(orderNo))
			{
			dt_ReceiveOrders = Db.Queryable<Dt_InboundOrder>().Where(x => x.OrderStatus < InboundStatusEnum.入库完成.ObjToInt() && x.WarehouseId == warehouseId).Includes(x => x.Details).OrderByDescending(x => x.CreateDate).ToPageList(pageNo, 10);
			}
			else
			{
			dt_ReceiveOrders = Db.Queryable<Dt_InboundOrder>().Where(x => (x.OrderNo.Contains(orderNo)) && x.OrderStatus < InboundStatusEnum.入库完成.ObjToInt() && x.WarehouseId == warehouseId).Includes(x => x.Details).OrderByDescending(x => x.CreateDate).ToPageList(pageNo, 10);
			}

			content.OK(data: dt_ReceiveOrders);
			}
			catch (Exception ex)
			{
			content.Error(ex.Message);
			}
			return content;
			}

			/// <summary>
			/// 验证单据添加DTO对象
			/// </summary>