Commit 6ce6570ddd3e37e8afb4deea7756e22f162b1cc4
1 parent
f5f205ce
update
Showing
2 changed files
with
2 additions
and
2 deletions
src/main/java/com/huaheng/framework/web/controller/BaseController.java
@@ -195,7 +195,7 @@ public class BaseController | @@ -195,7 +195,7 @@ public class BaseController | ||
195 | 195 | ||
196 | public AjaxResult handleMultiProcess(MultiProcessListener multiProcessListener) { | 196 | public AjaxResult handleMultiProcess(MultiProcessListener multiProcessListener) { |
197 | AjaxResult ajaxResult = null; | 197 | AjaxResult ajaxResult = null; |
198 | - int max_time = 10 * 1000; | 198 | + int max_time = 30 * 1000; |
199 | int now = 0; | 199 | int now = 0; |
200 | boolean avail = true; | 200 | boolean avail = true; |
201 | while(avail) { | 201 | while(avail) { |
src/main/java/com/huaheng/pc/config/location/service/LocationServiceImpl.java
@@ -443,7 +443,7 @@ public class LocationServiceImpl extends ServiceImpl<LocationMapper, Location> i | @@ -443,7 +443,7 @@ public class LocationServiceImpl extends ServiceImpl<LocationMapper, Location> i | ||
443 | public Location getInsideNear(Location location) { | 443 | public Location getInsideNear(Location location) { |
444 | LambdaQueryWrapper<Location> queryWrapper = Wrappers.lambdaQuery(); | 444 | LambdaQueryWrapper<Location> queryWrapper = Wrappers.lambdaQuery(); |
445 | queryWrapper.eq(Location::getWarehouseCode, location.getWarehouseCode()); | 445 | queryWrapper.eq(Location::getWarehouseCode, location.getWarehouseCode()); |
446 | - queryWrapper.eq(Location::getZoneCode, "L"); | 446 | +// queryWrapper.eq(Location::getZoneCode, "L"); |
447 | queryWrapper.eq(Location::getRoadway, location.getRoadway()); | 447 | queryWrapper.eq(Location::getRoadway, location.getRoadway()); |
448 | queryWrapper.eq(Location::getIColumn, location.getIColumn()); | 448 | queryWrapper.eq(Location::getIColumn, location.getIColumn()); |
449 | queryWrapper.eq(Location::getILayer, location.getILayer()); | 449 | queryWrapper.eq(Location::getILayer, location.getILayer()); |