From 6ce6570ddd3e37e8afb4deea7756e22f162b1cc4 Mon Sep 17 00:00:00 2001
From: youjie <j.you@huahengweld.com>
Date: Tue, 23 Feb 2021 16:24:39 +0800
Subject: [PATCH] update
---
src/main/java/com/huaheng/framework/web/controller/BaseController.java | 2 +-
src/main/java/com/huaheng/pc/config/location/service/LocationServiceImpl.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/huaheng/framework/web/controller/BaseController.java b/src/main/java/com/huaheng/framework/web/controller/BaseController.java
index a8e196f..66b7c68 100644
--- a/src/main/java/com/huaheng/framework/web/controller/BaseController.java
+++ b/src/main/java/com/huaheng/framework/web/controller/BaseController.java
@@ -195,7 +195,7 @@ public class BaseController
public AjaxResult handleMultiProcess(MultiProcessListener multiProcessListener) {
AjaxResult ajaxResult = null;
- int max_time = 10 * 1000;
+ int max_time = 30 * 1000;
int now = 0;
boolean avail = true;
while(avail) {
diff --git a/src/main/java/com/huaheng/pc/config/location/service/LocationServiceImpl.java b/src/main/java/com/huaheng/pc/config/location/service/LocationServiceImpl.java
index 8b437da..15f0c93 100644
--- a/src/main/java/com/huaheng/pc/config/location/service/LocationServiceImpl.java
+++ b/src/main/java/com/huaheng/pc/config/location/service/LocationServiceImpl.java
@@ -443,7 +443,7 @@ public class LocationServiceImpl extends ServiceImpl<LocationMapper, Location> i
public Location getInsideNear(Location location) {
LambdaQueryWrapper<Location> queryWrapper = Wrappers.lambdaQuery();
queryWrapper.eq(Location::getWarehouseCode, location.getWarehouseCode());
- queryWrapper.eq(Location::getZoneCode, "L");
+// queryWrapper.eq(Location::getZoneCode, "L");
queryWrapper.eq(Location::getRoadway, location.getRoadway());
queryWrapper.eq(Location::getIColumn, location.getIColumn());
queryWrapper.eq(Location::getILayer, location.getILayer());
--
libgit2 0.22.2