MeiRuiAn/JiAnLiKu.git

			@@ -106,6 +106,7 @@
			private readonly IOutboundOrderDetail_HtyService _outboundOrderDetail_HtyService;
			private readonly IPalletTypeInfoRepository _palletTypeInfoRepository;
			private readonly IOutboundOrderDetailRepository _outboundOrderDetailRepository;
			private readonly INewOutboundOrderDetailRepository _newOutboundOrderDetailRepository;
			private readonly IStockInfoDetailRepository _stockInfoDetailRepository;
			private readonly IReturnOrderRepository _returnOrderRepository;
			private readonly IProductionRepository _productionRepository;
			@@ -113,7 +114,7 @@

			public ITaskRepository Repository => BaseDal;

			public TaskService(ITaskRepository BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IMaterielInfoService materielInfoService, IInboundOrderDetail_HtyService inboundOrderDetail_HtyService, IOutboundOrder_HtyService outboundOrder_HtyService, IOutboundOrderDetail_HtyService outboundOrderDetail_HtyService, IInboundOrder_HtyService inboundOrder_HtyService, IStockRepository stockRepository, IInboundOrderDetailService inboundOrderDetailService, IBasicService basicService, IOutboundService outboundService, IInboundService inboundService, IRecordService recordService, IStockService stockService, ITask_HtyService taskHtyService, ILocationInfoService locationInfoService, IOutboundOrderDetailRepository outboundOrderDetailRepository, IBasicRepository basicRepository, IStockInfoDetailRepository stockInfoDetailRepository, IPalletTypeInfoRepository palletTypeInfoRepository, IReturnOrderRepository returnOrderRepository, IProductionRepository productionRepository, IInboundRepository inboundRepository) : base(BaseDal)
			public TaskService(ITaskRepository BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IMaterielInfoService materielInfoService, IInboundOrderDetail_HtyService inboundOrderDetail_HtyService, IOutboundOrder_HtyService outboundOrder_HtyService, IOutboundOrderDetail_HtyService outboundOrderDetail_HtyService, IInboundOrder_HtyService inboundOrder_HtyService, IStockRepository stockRepository, IInboundOrderDetailService inboundOrderDetailService, IBasicService basicService, IOutboundService outboundService, IInboundService inboundService, IRecordService recordService, IStockService stockService, ITask_HtyService taskHtyService, ILocationInfoService locationInfoService, IOutboundOrderDetailRepository outboundOrderDetailRepository, IBasicRepository basicRepository, IStockInfoDetailRepository stockInfoDetailRepository, IPalletTypeInfoRepository palletTypeInfoRepository, IReturnOrderRepository returnOrderRepository, IProductionRepository productionRepository, IInboundRepository inboundRepository,INewOutboundOrderDetailRepository newOutboundOrderDetailRepository) : base(BaseDal)
			{
			_mapper = mapper;
			_stockRepository = stockRepository;
			@@ -138,6 +139,7 @@
			_returnOrderRepository = returnOrderRepository;
			_productionRepository = productionRepository;
			_inboundRepository = inboundRepository;
			_newOutboundOrderDetailRepository = newOutboundOrderDetailRepository;
			}

			public string ReceiveWMSTaskin = WIDESEA_Core.Helper.AppSettings.Configuration["ReceiveWMSTaskin"];
			@@ -492,7 +494,7 @@

			dt_StockInfo.LocationCode = dt_LocationInfo.LocationCode;

			if (warehouse.WarehouseCode.Contains("TestJCLK"))
			if (warehouse.WarehouseCode.Contains("CP"))
			{
			// 1. 获取入库单信息
			Dt_InboundOrder? inboundOrder = null;
			@@ -691,49 +693,49 @@
			ApiType = "AsnController",
			Method = "AsrsGroudingAsn",
			Parameters = new List<HouseInboundPassBack.data>
			{
			new HouseInboundPassBack.data
			{
			Value = new List<data.data1>
			{
			new data.data1
			{
			AsnNo = inboundOrder.OrderNo,
			//InWarehouse = task.Roadway,
			TransactionCode = inboundOrder.TransactionCode,
			InoutType = inboundOrder.OrderType,
			OrderType = inboundOrder.InoutType,
			// 遍历所有库存明细，添加到 DetailList
			DetailList = StockInfos.Select(d => new data.data1.Inbound
			{
			LinId = d.Details.FirstOrDefault()?.LinId?? "",
			MaterielCode = d.Details.FirstOrDefault()?.MaterielCode?? "",
			OrderQuantity = d.Details.FirstOrDefault().StockQuantity,
			BatchNo = d.Details.FirstOrDefault()?.BatchNo,
			LPNNo = d.PalletCode,
			FinishQty = d.Details.FirstOrDefault().StockQuantity,
			LocationName = d.LocationCode,
			LabelList= d.Details
			.Where(detail => detail.StockDetails != null)
			.SelectMany(detail => detail.StockDetails)
			.Where(stockDetail => !string.IsNullOrEmpty(stockDetail.BoxCode))
			.Select(stockDetail => stockDetail.BoxCode )
			.ToList()
			}).ToList()
			}
			}
			}
			}
			{
			new HouseInboundPassBack.data
			{
			Value = new List<data.data1>
			{
			new data.data1
			{
			AsnNo = inboundOrder.OrderNo,
			//InWarehouse = task.Roadway,
			TransactionCode = inboundOrder.TransactionCode,
			InoutType = inboundOrder.OrderType,
			OrderType = inboundOrder.InoutType,
			// 遍历所有库存明细，添加到 DetailList
			DetailList = StockInfos.Select(d => new data.data1.Inbound
			{
			LinId = d.Details.FirstOrDefault()?.LinId?? "",
			MaterielCode = d.Details.FirstOrDefault()?.MaterielCode?? "",
			OrderQuantity = d.Details.FirstOrDefault().StockQuantity,
			BatchNo = d.Details.FirstOrDefault()?.BatchNo,
			LPNNo = d.PalletCode,
			FinishQty = d.Details.FirstOrDefault().StockQuantity,
			LocationName = d.LocationCode,
			LabelList= d.Details
			.Where(detail => detail.StockDetails != null)
			.SelectMany(detail => detail.StockDetails)
			.Where(stockDetail => !string.IsNullOrEmpty(stockDetail.BoxCode))
			.Select(stockDetail => stockDetail.BoxCode )
			.ToList()
			}).ToList()
			}
			}
			}
			}
			};

			var authResult = AuthenticateWithWMS();
			if (authResult.IsSuccess)
			{
			houseInboundPassBack.Context = new Dictionary<string, string>
			{
			{ "Ticket", authResult.Ticket },
			{ "InvOrgId", authResult.InvOrgId }
			};
			{
			{ "Ticket", authResult.Ticket },
			{ "InvOrgId", authResult.InvOrgId }
			};

			var response = HttpHelper.Post<MomRequestContent>(ReceiveWMSTaskin, houseInboundPassBack, "立库入库数量回传WMS");
			// 判断Success的值
			@@ -747,7 +749,68 @@
			}
			else if (inboundOrder.OrderStatus == InboundStatusEnum.入库完成.ObjToInt() && inboundOrder.OrderType == 2 && inboundOrder.System.Equals("SMOM"))
			{
			SendAllocateInfoToWMS(task, inboundOrder, dt_StockInfo);
			List<Dt_StockInfo> StockInfos = _stockRepository.StockInfoRepository.Db
			.Queryable<Dt_StockInfo>()
			.Includes(x => x.Details, d => d.StockDetails)
			.Where(x => x.WarehouseId == task.WarehouseId &&
			x.Details.Any(v => v.OrderNo == inboundOrder.OrderNo))
			.ToList();

			if (StockInfos.Count == 0) throw new Exception("未找到库存信息");
			var inventoryAllocate = new InventoryAllocate
			{
			ApiType = "InventoryAllocateController",
			Method = "AsrsFinishedStockCount",
			Parameters = new List<InventoryAllocate.Allocate>
			{
			new InventoryAllocate.Allocate
			{
			Value = new List<Allocate.data1>
			{
			new Allocate.data1
			{
			No = inboundOrder.OrderNo,
			//InWarehouse = task.Roadway,
			TransactionCode = inboundOrder.TransactionCode,
			InoutType = inboundOrder.OrderType,
			OrderType = inboundOrder.InoutType,
			DetailList = StockInfos.Select(d => new Allocate.data1.Inventory
			{
			LinId = d.Details.FirstOrDefault()?.LinId?? "",
			MaterielCode = d.Details.FirstOrDefault()?.MaterielCode?? "",
			OrderQuantity = d.Details.FirstOrDefault().StockQuantity,
			BatchNo = d.Details.FirstOrDefault()?.BatchNo,
			LPNNo = d.PalletCode,
			FinishQty = d.Details.FirstOrDefault().StockQuantity,
			LocationName = d.LocationCode,
			LabelList= d.Details
			.Where(detail => detail.StockDetails != null)
			.SelectMany(detail => detail.StockDetails)
			.Where(stockDetail => !string.IsNullOrEmpty(stockDetail.BoxCode))
			.Select(stockDetail => stockDetail.BoxCode )
			.ToList()
			}).ToList()
			}
			}
			}
			}
			};

			var authResult = AuthenticateWithWMS();
			if (authResult.IsSuccess)
			{
			inventoryAllocate.Context = new Dictionary<string, string>
			{
			{ "Ticket", authResult.Ticket },
			{ "InvOrgId", authResult.InvOrgId }
			};

			var response = HttpHelper.Post<MomRequestContent>(ReceiveWMSTaskAllocatein, inventoryAllocate, "调拨入库数量回传WMS");
			if (!response.Success)
			{
			throw new Exception($"操作失败：{response.Message ?? "未提供错误信息"}");
			}
			}
			}

			_unitOfWorkManage.CommitTran();
			@@ -760,8 +823,6 @@
			}
			}
			}


			else
			{
			Dt_InboundOrder? inboundOrder = _inboundService.InbounOrderService.Db.Queryable<Dt_InboundOrder>().Where(x => x.OrderNo == dt_StockInfo.Details.FirstOrDefault().OrderNo).Includes(x => x.Details).First();
			@@ -890,7 +951,7 @@
			}
			if (inboundOrder.OrderStatus == InboundStatusEnum.入库完成.ObjToInt() && inboundOrder.OrderType == 0 && inboundOrder.System.Equals("SMOM"))
			{
			SendInboundInfoToWMS(task, inboundOrder, stockInfo);
			//SendInboundInfoToWMS(task, inboundOrder, stockInfo);
			}
			else if (inboundOrder.OrderStatus == InboundStatusEnum.入库完成.ObjToInt() && inboundOrder.OrderType == 2 && inboundOrder.System.Equals("SMOM"))
			{
			@@ -1288,7 +1349,7 @@
			MaterielCode = d.Details.FirstOrDefault()?.MaterielCode?? "",
			OrderQuantity = d.Details.FirstOrDefault().StockQuantity,
			BatchNo = d.BatchNo,
			LPN_No = d.PalletCode,
			LPNNo = d.PalletCode,
			FinishQty = d.Details.FirstOrDefault().StockQuantity,
			LocationName = d.LocationCode
			}).ToList()
			@@ -1370,41 +1431,242 @@
			if (!validationResult.Status) return validationResult;

			int lastStatus = locationInfo.LocationStatus;
			Dt_Task task1 = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
			if (task1 == null)
			{
			return WebResponseContent.Instance.Error("未找到该任务信息");
			}

			///盘点出库任务完成逻辑
			if ((task.TaskType == TaskTypeEnum.OutInventory.ObjToInt()))
			{
			return OutInventoryCompleted(task, stockInfo, locationInfo);
			}
			Dt_OutboundOrder inboundOrder = _outboundService.OutboundOrderService.Db.Queryable<Dt_OutboundOrder>()
			.Where(x => x.OrderNo == task1.OrderNo)
			.Includes(x => x.Details)
			.First();
			Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseId == task.WarehouseId);

			if (inboundOrder == null) return WebResponseContent.Instance.Error("未找到出库单信息");

			Dt_OutboundOrderDetail outboundOrderDetails = _outboundService.OutboundOrderService.Db.Queryable<Dt_OutboundOrderDetail>()
			.Where(x => x.OrderId == inboundOrder.Id && x.BatchNo == stockInfo.Details.FirstOrDefault().BatchNo)
			.First();
			if (outboundOrderDetails.LocationName != null && outboundOrderDetails.LocationName != "")
			if (warehouse.WarehouseCode.Contains("CP"))
			{
			outboundOrderDetails = _outboundService.OutboundOrderService.Db.Queryable<Dt_OutboundOrderDetail>()
			.Where(x => x.OrderId == inboundOrder.Id && x.BatchNo == stockInfo.Details.FirstOrDefault().BatchNo && x.LocationName == stockInfo.LocationCode)
			.First();
			try
			{
			Dt_NewOutboundOrder outboundOrder = _outboundService.NewOutboundOrderService.Db.Queryable<Dt_NewOutboundOrder>().Where(x => x.OrderNo == task.OrderNo).Includes(x => x.Details)
			.First();

			Dt_NewOutboundOrderDetail outboundOrderDetails = _outboundService.NewOutboundOrderDetailService.Db.Queryable<Dt_NewOutboundOrderDetail>()
			.Where(x => x.OrderId == outboundOrder.Id && x.LocationName == stockInfo.LocationCode)
			.First();
			//List<Dt_StockInfoDetail> stockInfoDetail = _stockInfoDetailRepository.QueryData(x => x.StockId == stockInfo.Id).ToList();
			//foreach (var item in stockInfoDetail)
			//{
			// outboundOrderDetails = _outboundService.NewOutboundOrderDetailService.Db.Queryable<Dt_NewOutboundOrderDetail>()
			// .Where(x => x.OrderId == outboundOrder.Id && x.BatchNo == item.BatchNo && x.LocationName == stockInfo.LocationCode)
			// .First();

			// item.OutboundQuantity += outboundOrderDetails.OverOutQuantity;
			//}

			int overCount = outboundOrder.Details.Count(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt());

			foreach (var item in stockInfo.Details)
			{
			if (outboundOrderDetails == null) continue;

			outboundOrderDetails.OverOutQuantity += item.OutboundQuantity;

			if (outboundOrderDetails.OverOutQuantity == outboundOrderDetails.OrderQuantity)
			{
			outboundOrderDetails.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
			overCount++;
			}
			}
			if (outboundOrder.Details.Count == overCount)
			{
			outboundOrder.OrderStatus = OutboundStatusEnum.出库完成.ObjToInt();
			}

			_unitOfWorkManage.BeginTran();
			///更新出库单
			_outboundService.NewOutboundOrderService.Repository.UpdateData(outboundOrder);
			// 更新出库订单详情
			_outboundService.NewOutboundOrderDetailService.Repository.UpdateData(outboundOrderDetails);

			// 更新库存状态
			AddCPRetrueOrder(stockInfo, outboundOrder);

			// 区分单据数据来源更新货位状态
			if (outboundOrder.System == null)
			{
			return WebResponseContent.Instance.Error("出库单数据源为空");
			}
			if (!outboundOrder.System.Equals("SMOM"))
			{
			UpdateLocationStatus(locationInfo);
			}
			// 处理任务完成
			CompleteTask(task);

			// 添加状态变更记录
			AddStatusChangeRecord(task, stockInfo, locationInfo);

			string path = "http://fr.mankun.com:8080/webroot/decision/view/report?viewlet=fr-report\\SMOM/Product/Produce/OutBoundDetileReport.cpt&op=write&format=pdf";
			string fullPath = AppDomain.CurrentDomain.BaseDirectory;
			var url = Path.Combine(fullPath, "wwwroot", "Reports");
			string savePath = Path.Combine(url, "本次出库.pdf");


			if (outboundOrderDetails.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt() && outboundOrder.System.Equals("ERP"))
			{
			FeedBackOutERP(outboundOrder.OrderNo, outboundOrderDetails.LinId);
			DownloadReport(path, savePath, outboundOrderDetails.Id);
			}
			///单据完成推送SMOM系统
			if (outboundOrder.OrderStatus == OutboundStatusEnum.出库完成.ObjToInt() && outboundOrder.System.Equals("SMOM"))
			{
			var stockInfoDetail1 = stockInfo.Details.FirstOrDefault();
			List<Dt_OutStockLockInfo> outStockLockInfo = _outboundService.OutboundStockLockInfoService.Repository.QueryData(x => x.OrderNo == outboundOrder.OrderNo);

			if (outStockLockInfo.Count == 0) throw new Exception("未找到库存信息");
			//采购出库
			if (outboundOrder.OrderType == 1)
			{
			var passBack = new HouseoutboundPassBack
			{
			ApiType = "ShippingOrderController",
			Method = "AsrsOutboundSO",
			Parameters = new List<HouseoutboundPassBack.datas>
			{
			new HouseoutboundPassBack.datas
			{
			Value = new List<HouseoutboundPassBack.datas.data1>
			{
			new HouseoutboundPassBack.datas.data1
			{
			No = outboundOrder.OrderNo,
			OutWareHouse = task.Roadway,
			TransactionCode = outboundOrder.TransactionCode,
			InoutType = outboundOrder.OrderType,
			OrderType = outboundOrder.InoutType,
			DetailList = outStockLockInfo.Select(d => new HouseoutboundPassBack.datas.data1.Inbound
			{
			LinId = d.LinId?? "",
			LPN_No = d.PalletCode,
			MaterielCode = d.MaterielCode?? "",
			OrderQuantity = d.OrderQuantity,
			BatchNo = d.BatchNo,
			FinishQty = d.OrderQuantity,
			LocationName = d.LocationCode
			})
			.ToList()

			}
			}
			}
			}
			};

			var authResult = AuthenticateWithWMS();
			if (authResult.IsSuccess)
			{
			passBack.Context = new Dictionary<string, string>
			{
			{ "Ticket", authResult.Ticket },
			{ "InvOrgId", authResult.InvOrgId }
			};
			var response = HttpHelper.Post<MomRequestContent>(ReceiveWMSTaskout, passBack, "立库出库数量回传WMS");
			if (!response.Success)
			{
			throw new Exception($"操作失败: {response.Message ?? "未提供错误信息"}");
			}
			}
			}
			//调拨出库
			if (outboundOrder.OrderType == 2)
			{
			var allocate = new InventoryAllocate
			{
			ApiType = "InventoryAllocateController",
			Method = "AsrsFinishedStockCount",
			Parameters = new List<Allocate>
			{
			new Allocate
			{
			Value = new List<Allocate.data1>
			{
			new Allocate.data1
			{
			No = outboundOrder.OrderNo,
			InWarehouse = task.Roadway,
			TransactionCode = outboundOrder.TransactionCode,
			InoutType = outboundOrder.OrderType,
			OrderType = outboundOrder.InoutType,
			DetailList = outStockLockInfos.Select(item =>
			{
			return new Allocate.data1.Inventory
			{
			LinId = outboundOrderDetails.LinId,
			LPNNo = item.PalletCode,
			MaterielCode = outboundOrderDetails.MaterielCode,
			OrderQuantity = outboundOrderDetails.OrderQuantity,
			BatchNo = outboundOrderDetails.BatchNo,
			FinishQty = outboundOrderDetails.OrderQuantity,
			LocationName = task.SourceAddress
			};
			}).ToList()
			}
			}
			}
			}
			};

			var authResult = AuthenticateWithWMS();
			if (authResult.IsSuccess)
			{
			allocate.Context = new Dictionary<string, string>
			{
			{ "Ticket", authResult.Ticket },
			{ "InvOrgId", authResult.InvOrgId }
			};
			var response = HttpHelper.Post<MomRequestContent>(ReceiveWMSTaskin, allocate, "立库入库数量回传WMS");
			if (!response.Success)
			{
			throw new Exception($"操作失败: {response.Message ?? "未提供错误信息"}");
			}
			}
			}
			}

			if (outboundOrder.OrderType == 240) // 盘点出库
			{
			// 盘点出库特殊处理逻辑
			}

			_unitOfWorkManage.CommitTran();
			return WebResponseContent.Instance.OK();
			}
			catch
			{
			_unitOfWorkManage.RollbackTran();
			throw;
			}
			}
			if (outboundOrderDetails == null) return WebResponseContent.Instance.Error("未找到出库单信息");
			else
			{
			Dt_OutboundOrder inboundOrder = _outboundService.OutboundOrderService.Db.Queryable<Dt_OutboundOrder>()
			.Where(x => x.OrderNo == task.OrderNo)
			.Includes(x => x.Details)
			.First();

			// 2. 处理出库订单详情
			//var outboundOrderDetails = ProcessOutboundOrderDetails(outStockLockInfos);
			if (inboundOrder == null) return WebResponseContent.Instance.Error("未找到出库单信息");

			UpdateOutboundOrderDetails(stockInfo, inboundOrder, ref outboundOrderDetails);
			Dt_OutboundOrderDetail outboundOrderDetails = _outboundService.OutboundOrderService.Db.Queryable<Dt_OutboundOrderDetail>()
			.Where(x => x.OrderId == inboundOrder.Id && x.BatchNo == stockInfo.Details.FirstOrDefault().BatchNo)
			.First();
			if (outboundOrderDetails.LocationName != null && outboundOrderDetails.LocationName != "")
			{
			outboundOrderDetails = _outboundService.OutboundOrderService.Db.Queryable<Dt_OutboundOrderDetail>()
			.Where(x => x.OrderId == inboundOrder.Id && x.BatchNo == stockInfo.Details.FirstOrDefault().BatchNo && x.LocationName == stockInfo.LocationCode)
			.First();
			}
			if (outboundOrderDetails == null) return WebResponseContent.Instance.Error("未找到出库单信息");
			UpdateOutboundOrderDetails(stockInfo, inboundOrder, ref outboundOrderDetails);
			// 3. 执行核心出库逻辑
			return ExecuteOutboundLogic(task, stockInfo, locationInfo, outboundOrderDetails, inboundOrder);
			}

			// 3. 执行核心出库逻辑
			return ExecuteOutboundLogic(task, stockInfo, locationInfo, outboundOrderDetails, inboundOrder);
			}
			catch (Exception ex)
			{
			@@ -1784,7 +2046,7 @@
			return new Allocate.data1.Inventory
			{
			LinId = outDetail.LinId,
			LPN_No = item.PalletCode,
			LPNNo = item.PalletCode,
			MaterielCode = outDetail.MaterielCode,
			OrderQuantity = outDetail.OrderQuantity,
			BatchNo = outDetail.BatchNo,
			@@ -1885,6 +2147,74 @@
			}

			}

			//成品回库单
			private void AddCPRetrueOrder(Dt_StockInfo stockInfo, Dt_NewOutboundOrder outboundOrder)
			{
			Dt_StockInfoDetail stockInfoDetail = _stockService.StockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
			.Where(x => x.StockId == stockInfo.Id)
			.First();
			if (stockInfoDetail == null)
			{
			throw new Exception("建立回库单时，未找到该库存信息");
			}
			if (outboundOrder.OrderType == OrderTypeEnum.反拣出库单.ObjToInt())
			{
			Dt_ReturnOrder returnOrder = _returnOrderRepository.QueryFirst(x => x.LPNNo == stockInfo.PalletCode && x.LocationCode == stockInfo.LocationCode && x.OrderStatus == InOrderStatusEnum.未开始.ObjToInt());
			if (returnOrder == null)
			{
			throw new Exception("反拣出库后，未找到对应反拣回库单信息");
			}
			stockInfo.LocationCode = "";
			stockInfo.StockStatus = StockStatusEmun.反拣入库.ObjToInt();
			stockInfo.Remark = "反拣入库";
			stockInfoDetail.OutboundQuantity = 0;
			stockInfoDetail.StockQuantity += returnOrder.OrderQuantity;
			stockInfoDetail.OrderNo = returnOrder.OrderNo;
			}
			else
			{
			decimal returnQuantity = stockInfoDetail.StockQuantity - stockInfoDetail.OutboundQuantity;
			if (returnQuantity > 0)
			{
			Dt_ReturnOrder returnOrder = new Dt_ReturnOrder
			{
			MaterielCode = stockInfoDetail.MaterielCode,
			MaterielName = stockInfoDetail.MaterielName,
			BatchNo = stockInfoDetail.BatchNo,
			OrderQuantity = returnQuantity,
			ReceiptQuantity = returnQuantity,
			OrderStatus = InOrderStatusEnum.未开始.ObjToInt(),
			LinId = stockInfoDetail.LinId,
			LPNNo = stockInfo.PalletCode,
			Creater = "LK",
			CreateDate = DateTime.Now,
			OrderType = OrderTypeEnum.余料回库单.ObjToInt(),
			System = "WMS"
			};
			if (outboundOrder.System == "SMOM" && stockInfo.LocationCode != null)
			{
			returnOrder.LocationCode = stockInfo.LocationCode;
			}
			_unitOfWorkManage.BeginTran();
			_returnOrderRepository.AddData(returnOrder);
			stockInfo.LocationCode = "";
			stockInfo.StockStatus = StockStatusEmun.余料退库.ObjToInt();
			stockInfo.Remark = "余料退库";
			stockInfoDetail.OutboundQuantity = 0;
			stockInfoDetail.StockQuantity = returnQuantity;
			stockInfoDetail.OrderNo = returnOrder.OrderNo;
			_stockService.StockInfoService.Repository.UpdateData(stockInfo);
			_stockService.StockInfoDetailService.Repository.UpdateData(stockInfoDetail);
			_unitOfWorkManage.CommitTran();
			}
			else
			{
			DeleteAndMoveIntoHtStockStatus(stockInfo);
			}
			}

			}
			/// <summary>
			/// 单据明细出库完成回调ERP(表单提交)
			/// </summary>