ZhongRui/ALDbanyunxiangmu.git

			@@ -87,7 +87,7 @@
			public OutboundPickingService(IRepository<Dt_PickingRecord> BaseDal, IUnitOfWorkManage unitOfWorkManage, IStockInfoService stockInfoService, IStockService stockService,
			IOutStockLockInfoService outStockLockInfoService, IStockInfoDetailService stockInfoDetailService, ILocationInfoService locationInfoService,
			IOutboundOrderDetailService outboundOrderDetailService, ISplitPackageService splitPackageService, IOutboundOrderService outboundOrderService,
			IRepository<Dt_Task> taskRepository, IESSApiService eSSApiService, ILogger<OutboundPickingService> logger, IInvokeMESService invokeMESService, IDailySequenceService dailySequenceService, IAllocateService allocateService, IRepository<Dt_InboundOrder> inboundOrderRepository, IInboundOrderDetailService inboundOrderDetailService, IRepository<Dt_WarehouseArea> warehouseAreaRepository, IReCheckOrderService reCheckOrderService, ITask_HtyService task_HtyService,IRepository<Dt_InterfaceLog> interfaceLog) : base(BaseDal)
			IRepository<Dt_Task> taskRepository, IESSApiService eSSApiService, ILogger<OutboundPickingService> logger, IInvokeMESService invokeMESService, IDailySequenceService dailySequenceService, IAllocateService allocateService, IRepository<Dt_InboundOrder> inboundOrderRepository, IInboundOrderDetailService inboundOrderDetailService, IRepository<Dt_WarehouseArea> warehouseAreaRepository, IReCheckOrderService reCheckOrderService, ITask_HtyService task_HtyService, IRepository<Dt_InterfaceLog> interfaceLog) : base(BaseDal)
			{
			_unitOfWorkManage = unitOfWorkManage;
			_stockInfoService = stockInfoService;
			@@ -304,7 +304,11 @@

			var statusAnalysis = await AnalyzePalletStatus(orderNo, palletCode, stockInfo.Id);
			if (!statusAnalysis.HasItemsToReturn)
			return await HandleNoReturnItems(orderNo, palletCode, task, stockInfo.Id);
			{
			var result = await HandleNoReturnItems(orderNo, palletCode, task, stockInfo.Id);
			_unitOfWorkManage.CommitTran();
			return result;
			}

			// 4. æ£æ¥æ¯å¦æè¿è¡ä¸çä»»å¡
			if (statusAnalysis.HasActiveTasks)
			@@ -1700,7 +1704,7 @@
			throw new Exception("åå»ºä»»å¡å¤±è´¥ï¼");
			}
			}
			catch (Exception ex)
			catch (Exception ex)
			{
			_logger.LogInformation($"CreateReturnTaskAndHandleESS åå»ºä»»å¡å¤±è´¥: {orderNo} ï¼ {palletCode}");
			throw new Exception("åå»ºä»»å¡å¤±è´¥ï¼");
			@@ -2119,8 +2123,7 @@
			.Where(x => x.StockId == stockId && x.StockQuantity == 0)
			.ExecuteCommandAsync();

			await _stockInfoService.Db.Deleteable<Dt_StockInfo>()
			.Where(x => x.Id == stockId).ExecuteCommandAsync();
			_stockInfoService.DeleteData(stockId);

			_logger.LogInformation($"æ¸çé¶åºåæç»è®°å½ - StockId: {stockId}, å é¤è®°å½æ°: {deleteDetailCount}");

			@@ -2937,7 +2940,7 @@

			await _interfaceLog.Db.Updateable<Dt_InterfaceLog>()
			.SetColumns(x => x.ReturnToMESStatus == 1)
			.Where(x=>x.DocumentNo == documentNo)
			.Where(x => x.DocumentNo == documentNo)
			.ExecuteCommandAsync();
			}
			return WebResponseContent.Instance.OK();