MeiRuiAn/HuaiAn.git

			@@ -5,6 +5,7 @@
			using System.Threading.Tasks;
			using WIDESEA_Common.StockEnum;
			using WIDESEA_Core;
			using WIDESEA_Core.BaseRepository;
			using WIDESEA_Core.BaseServices;
			using WIDESEA_Core.Enums;
			using WIDESEA_Core.Helper;
			@@ -22,12 +23,13 @@
			private readonly IRecordService _recordService;

			public IOutStockLockInfoRepository Repository => BaseDal;
			public IUnitOfWorkManage _unitOfWorkManage;


			public OutStockLockInfoService(IOutStockLockInfoRepository BaseDal, IStockService stockService, IRecordService recordService) : base(BaseDal)
			public OutStockLockInfoService(IOutStockLockInfoRepository BaseDal, IStockService stockService, IRecordService recordService, IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
			{
			_recordService = recordService;
			_stockService = stockService;
			_unitOfWorkManage = unitOfWorkManage;
			}

			public List<Dt_OutStockLockInfo> GetOutStockLockInfos(Dt_OutboundOrder outboundOrder, Dt_OutboundOrderDetail outboundOrderDetail, List<Dt_StockInfo> outStocks, int? taskNum = null)
			@@ -101,15 +103,16 @@
			Status = taskNum == null ? OutLockStockStatusEnum.å·²åé.ObjToInt() : OutLockStockStatusEnum.åºåºä¸.ObjToInt(),
			StockId = outStock.Id,
			TaskNum = taskNum,
			OrderQuantity = mesOutboundOrder.OrderQuantity
			OrderQuantity = mesOutboundOrder.OrderQuantity,
			Unit = mesOutboundOrder.Unit
			};

			return outStockLockInfo;
			}

			public List<Dt_OutStockLockInfo> GetByOrderDetailId(int orderDetailId, OutLockStockStatusEnum outStockStatus)
			public List<Dt_OutStockLockInfo> GetByOrderDetailId(int orderDetailId, OutLockStockStatusEnum? outStockStatus)
			{
			return BaseDal.QueryData(x => x.OrderDetailId == orderDetailId && x.Status == outStockStatus.ObjToInt());
			return BaseDal.QueryData(x => x.OrderDetailId == orderDetailId && outStockStatus==null?true:x.Status == outStockStatus.ObjToInt());
			}

			public List<Dt_OutStockLockInfo> GetStockOutboundOrder(SaveModel saveModel)