MeiRuiAn/HuaiAn.git

			@@ -1271,7 +1271,7 @@
			Dt_InboundOrderDetail? inboundOrderDetail = null;
			Dt_ReturnOrder? returnOrder = null;
			//鏍囧噯鍏ュ簱娴佺▼鏌ユ壘鍏ュ簱鍗曟嵁
			if (inboundOrder != null && stockInfo.StockStatus == StockStatusEmun.鍏ュ簱纭.ObjToInt()&&(task.WarehouseId == WarehouseEnum.HA152.ObjToInt()\|\| task.WarehouseId == WarehouseEnum.HA58.ObjToInt()))
			if (inboundOrder != null && stockInfo.StockStatus == StockStatusEmun.鍏ュ簱纭.ObjToInt()&&(task.WarehouseId == 11 \|\| task.WarehouseId == 4))
			{
			inboundOrderDetail = inboundOrder.Details.FirstOrDefault(x => x.RowNo == stockInfo.Details.FirstOrDefault()?.InboundOrderRowNo);
			foreach (var item in stockInfo.Details)
			@@ -1297,11 +1297,15 @@
			}
			}
			}
			if(task.WarehouseId == WarehouseEnum.HA154.ObjToInt()\|\| task.WarehouseId == WarehouseEnum.HA152.ObjToInt() \|\| task.WarehouseId == WarehouseEnum.HA58.ObjToInt())
			if(task.WarehouseId == 11 \|\| task.WarehouseId == 4\|\|task.WarehouseId == 13)
			{
			_stockService.StockInfoService.Repository.DeleteAndMoveIntoHty(stockInfo, App.User.UserId == 0 ? OperateTypeEnum.鑷姩鍒犻櫎 : OperateTypeEnum.浜哄伐鍒犻櫎);
			_stockService.StockInfoDetailService.Repository.DeleteAndMoveIntoHty(stockInfo.Details, App.User.UserId == 0 ? OperateTypeEnum.鑷姩鍒犻櫎 : OperateTypeEnum.浜哄伐鍒犻櫎);
			}else
			}else if(task.WarehouseId == 6 && task.TaskType == TaskTypeEnum.ProductionReturn.ObjToInt())
			{
			stockInfo.StockStatus = StockStatusEmun.鍑哄簱瀹屾垚.ObjToInt();
			}
			else
			{
			stockInfo.StockStatus = StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt();
			}
			@@ -1310,7 +1314,10 @@
			FeedBackWCSTaskHandCancel(taskNum);
			_unitOfWorkManage.BeginTran();
			BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId > 0 ? OperateTypeEnum.浜哄伐鍒犻櫎 : OperateTypeEnum.浜哄伐鍒犻櫎);
			if(locationInfo != null)
			{
			_basicService.LocationInfoService.UpdateLocationStatus(locationInfo, stockInfo.PalletType, LocationStatusEnum.Free, stockInfo.WarehouseId);
			}
			_stockRepository.StockInfoRepository.UpdateData(stockInfo);
			if (inboundOrder != null && inboundOrderDetail != null)
			{