ZhiHuiQiCe/LongDeLiLiKu.git

			@@ -1,4 +1,4 @@
			ï»¿

			using System;
			using System.Collections.Generic;
			using System.Linq;
			@@ -709,7 +709,7 @@
			}
			content.Message = result.Item6;
			//å¤çåºåºæ°æ®
			return GenerateOutboundTaskDataUpdate(tasks, stockInfos, outSGOrderDetails, outStockLockInfos, locationInfos);
			return GenerateOutboundTaskDataUpdate(tasks, stockInfos, outSGOrderDetails, outStockLockInfos, locationInfos, result.Item6);
			}
			catch (Exception ex)
			{
			@@ -746,6 +746,14 @@

			//åéåºå
			(List<Dt_StockInfo>, List<Dt_OutSGOrderDetail>, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>,string) result = _outboundService.OutSGOrderDetailService.AssignStockOutbound(outSGOrderDetails);

			//ä¿åç¼ºæç¶æï¼æ è®ºæ¯å¦çæäºä»»å¡
			var shortageDetails = result.Item2.Where(x => x.OutSGOrderDetailStatus == OutOrderStatusEnum.ç¼ºæ.ObjToInt()).ToList();
			if (shortageDetails.Any())
			{
			_outboundRepository.OutSGOrderDetailRepository.UpdateData(shortageDetails);
			}

			if (result.Item1 != null && result.Item1.Count > 0)
			{
			//è·åä»»å¡
			@@ -776,7 +784,8 @@
			}
			else
			{
			throw new Exception("æ åºå");
			//æ²¡æåºåï¼ä½å·²ç»å¨AssignStockOutboundæ¹æ³ä¸æ è®°äºç¼ºæç¶æï¼å¹¶ä¸å·²ç»ä¿å
			orderDetails = result.Item2;
			}

			return (tasks, stockInfos, orderDetails, outStockLockInfos, locationInfos, result.Item5);
			@@ -785,7 +794,7 @@
			/// å¤çåºåºæ°æ®
			/// </summary>
			/// <returns></returns>
			public WebResponseContent GenerateOutboundTaskDataUpdate(List<Dt_Task> tasks, List<Dt_StockInfo>? stockInfos = null, List<Dt_OutSGOrderDetail>? outboundOrderDetails = null, List<Dt_OutStockLockInfo>? outStockLockInfos = null, List<Dt_LocationInfo>? locationInfos = null)
			public WebResponseContent GenerateOutboundTaskDataUpdate(List<Dt_Task> tasks, List<Dt_StockInfo>? stockInfos = null, List<Dt_OutSGOrderDetail>? outboundOrderDetails = null, List<Dt_OutStockLockInfo>? outStockLockInfos = null, List<Dt_LocationInfo>? locationInfos = null, string message = "")
			{
			try
			{
			@@ -825,7 +834,7 @@
			}
			_unitOfWorkManage.CommitTran();
			PushTasksToWCS(tasks);
			return WebResponseContent.Instance.OK();
			return WebResponseContent.Instance.OK(message);
			}
			catch (Exception ex)
			{