MeiRuiAn/HuaiAn.git

			@@ -9,16 +9,25 @@
			using WIDESEA_Core.Enums;
			using WIDESEA_Core.Helper;
			using WIDESEA_IOutboundRepository;
			using WIDESEA_IRecordService;
			using WIDESEA_IStockService;
			using WIDESEA_Model.Models;

			namespace WIDESEA_IOutboundService
			{
			public partial class OutStockLockInfoService : ServiceBase<Dt_OutStockLockInfo, IOutStockLockInfoRepository>, IOutStockLockInfoService
			{

			private readonly IStockService _stockService;
			private readonly IRecordService _recordService;

			public IOutStockLockInfoRepository Repository => BaseDal;

			public OutStockLockInfoService(IOutStockLockInfoRepository BaseDal) : base(BaseDal)

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

			public List<Dt_OutStockLockInfo> GetOutStockLockInfos(Dt_OutboundOrder outboundOrder, Dt_OutboundOrderDetail outboundOrderDetail, List<Dt_StockInfo> outStocks, int? taskNum = null)
			@@ -57,7 +66,7 @@
			PalletCode = outStock.PalletCode,
			AssignQuantity = assignQuantity,
			MaterielCode = outboundOrderDetail.MaterielCode,
			BatchNo = outboundOrderDetail.BatchNo,
			BatchNo = outboundOrderDetail.BatchNo ?? outStock.Details.FirstOrDefault()?.BatchNo,
			LocationCode = outStock.LocationCode,
			MaterielName = outboundOrderDetail.MaterielName,
			OrderDetailId = outboundOrderDetail.Id,
			@@ -67,7 +76,8 @@
			Status = taskNum == null ? OutLockStockStatusEnum.å·²åé.ObjToInt() : OutLockStockStatusEnum.åºåºä¸.ObjToInt(),
			StockId = outStock.Id,
			TaskNum = taskNum,
			OrderQuantity = outboundOrderDetail.OrderQuantity
			OrderQuantity = outboundOrderDetail.OrderQuantity,
			Unit=outboundOrderDetail.Unit,
			};

			return outStockLockInfo;