ZhongRui/ALDbanyunxiangmu.git

			@@ -95,7 +95,7 @@

			public List<int> TaskOutboundTypes => typeof(TaskTypeEnum).GetEnumIndexList();

			public TaskService(IRepository<Dt_Task> BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IRepository<Dt_StockInfo> stockRepository, ILocationInfoService locationInfoService, IInboundOrderService inboundOrderService, ILocationStatusChangeRecordService locationStatusChangeRecordService, IESSApiService eSSApiService, ILogger<TaskService> logger, IStockService stockService, IRecordService recordService, IInboundOrderDetailService inboundOrderDetailService, IOutboundOrderService outboundOrderService, IOutboundOrderDetailService outboundOrderDetailService, IInvokeMESService invokeMESService, IOutStockLockInfoService outStockLockInfoService, IAllocateService allocateService) : base(BaseDal)
			public TaskService(IRepository<Dt_Task> BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IRepository<Dt_StockInfo> stockRepository, ILocationInfoService locationInfoService, IInboundOrderService inboundOrderService, ILocationStatusChangeRecordService locationStatusChangeRecordService, IESSApiService eSSApiService, ILogger<TaskService> logger, IStockService stockService, IRecordService recordService, IInboundOrderDetailService inboundOrderDetailService, IOutboundOrderService outboundOrderService, IOutboundOrderDetailService outboundOrderDetailService, IInvokeMESService invokeMESService, IOutStockLockInfoService outStockLockInfoService, IAllocateService allocateService, IRepository<Dt_OutboundBatch> outboundBatchRepository) : base(BaseDal)
			{
			_mapper = mapper;
			_unitOfWorkManage = unitOfWorkManage;
			@@ -113,6 +113,7 @@
			_invokeMESService = invokeMESService;
			_outStockLockInfoService = outStockLockInfoService;
			_allocateService = allocateService;
			_OutboundBatchRepository = outboundBatchRepository;
			}


			@@ -326,6 +327,10 @@
			{

			}
			else if (inboundOrder.OrderType == InOrderTypeEnum.InternalAllocat.ObjToInt()) //æºä»è°æºä»
			{
			_logger.LogInformation($"InboundTaskCompleted ååMES : {inboundOrder.InboundOrderNo } ,ordertype: {InOrderTypeEnum.InternalAllocat.ObjToInt()} " );
			}
			else
			{
			if (inboundOrder != null && inboundOrder.OrderStatus == InOrderStatusEnum.å¥åºå®æ.ObjToInt())
			@@ -384,6 +389,13 @@
			return WebResponseContent.Instance.OK();
			}


			public async Task<WebResponseContent> OutAllocateTaskCompleted(Dt_Task task)
			{
			_logger.LogInformation($"TaskService OutAllocateTaskCompleted: {task.TaskNum}");

			return await OutboundTaskCompleted(task);
			}
			public async Task<WebResponseContent> OutboundTaskCompleted(Dt_Task task)
			{
			_logger.LogInformation($"TaskService OutboundTaskCompleted: {task.TaskNum}");
			@@ -585,6 +597,7 @@
			bool allCompleted = true;
			foreach (var detail in orderDetails)
			{
			_logger.LogInformation($"TaskService HandleOutboundOrderToMESCompletion: {outboundOrder.OrderNo} , {detail.NeedOutQuantity}");
			if (detail.OverOutQuantity < detail.NeedOutQuantity)
			{
			allCompleted = false;
			@@ -654,7 +667,6 @@

			allocatefeedmodel.Details.Add(detailModel);
			}

			var result = await _invokeMESService.FeedbackAllocate(allocatefeedmodel);
			if (result != null && result.code == 200)
			{
			@@ -672,7 +684,7 @@
			}
			else if (outboundOrder.OrderType == OutOrderTypeEnum.ReCheck.ObjToInt())
			{

			//ä¸ç¨åä¼
			}
			else
			{
			@@ -720,7 +732,6 @@

			feedmodel.details.Add(detailModel);
			}

			var result = await _invokeMESService.FeedbackOutbound(feedmodel);
			if (result != null && result.code == 200)
			{