diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/MobileAuthorizationController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/MobileAuthorizationController.java index 3f27960..7122554 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/MobileAuthorizationController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/MobileAuthorizationController.java @@ -74,12 +74,12 @@ public class MobileAuthorizationController { if (!userInfo.getIs_used()) { throw new BadRequestException("账号未激活"); } - if (StringUtils.isNotEmpty(authUser.getRegin_code())){ + if (StringUtils.isNotEmpty(authUser.getDevice())){ Object regin_code = redisUtils.get("JT_"+authUser.getUsername()); if (regin_code!=null){ throw new BadRequestException("当前设备工序已经登陆,无法继续选择"); }else { - redisUtils.set("JT_"+authUser.getUsername(),authUser.getRegin_code()); + redisUtils.set("JT_"+authUser.getUsername(),authUser.getDevice()); } } // 登录输入,登出删除 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/dto/AuthUserDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/dto/AuthUserDto.java index b6d3027..f39a853 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/dto/AuthUserDto.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/dto/AuthUserDto.java @@ -36,5 +36,5 @@ public class AuthUserDto { private String uuid = ""; - private String regin_code ; + private String device ; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/fab/controller/FabController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/fab/controller/FabController.java index c6d263d..67990b5 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/fab/controller/FabController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/fab/controller/FabController.java @@ -67,6 +67,7 @@ public class FabController { // [{"num":"1","type":"IN","device_code":"222","vehicle_type","1"}] public ResponseEntity regionPoints(String regionCode){ Assert.notBlank(regionCode,"请求参数不能为空"); + //TODO:改成查设备配置 SchBaseRegion baseRegion = iSchBaseRegionService.getOne(new QueryWrapper().eq("region_code", regionCode)); String regionPoints = baseRegion.getRegion_points(); List deviceConfigs = JSONArray.parseArray(regionPoints, DeviceConfig.class); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml index 75425af..4fb5794 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml @@ -41,7 +41,7 @@ and sch_base_point.can_vehicle_type = #{vehicle_type} - and sch_base_vehiclematerialgroup.vehicle_type > #{vehicle_type} + and sch_base_vehiclematerialgroup.due_date > #{due_date} and has_work = false AND sch_base_vehiclematerialgroup.region_code = #{region_code} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java index f35654e..5879e8b 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java @@ -467,6 +467,7 @@ public class SchBasePointServiceImpl extends ServiceImpl getStructList(String region_code, String vehicle_type) { + //1.查询的结果一个托盘有多个800,PC需要怎么展示? Param dueDate = iSysParamService.findByCode("due_date"); if (dueDate!=null && StringUtils.isNotEmpty(dueDate.getValue())){ DateUtil.offsetDay(new Date(), Integer.valueOf(dueDate.getValue())).toDateStr();