root/xiMenZi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add:fab功能

Browse Source
This commit is contained in:
zhangzq
2024-08-26 13:34:58 +08:00
parent 8bbee9c9d1
commit 7168662350
5 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/MobileAuthorizationController.java
View File

@@ -74,12 +74,12 @@ public class MobileAuthorizationController {
if (!userInfo.getIs_used()) { if (!userInfo.getIs_used()) {
throw new BadRequestException("账号未激活"); throw new BadRequestException("账号未激活");
} }
if (StringUtils.isNotEmpty(authUser.getRegin_code())){ if (StringUtils.isNotEmpty(authUser.getDevice())){
Object regin_code = redisUtils.get("JT_"+authUser.getUsername()); Object regin_code = redisUtils.get("JT_"+authUser.getUsername());
if (regin_code!=null){ if (regin_code!=null){
throw new BadRequestException("当前设备工序已经登陆,无法继续选择"); throw new BadRequestException("当前设备工序已经登陆,无法继续选择");
}else { }else {
redisUtils.set("JT_"+authUser.getUsername(),authUser.getRegin_code()); redisUtils.set("JT_"+authUser.getUsername(),authUser.getDevice());
} }
} }
// 登录输入，登出删除 // 登录输入，登出删除

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/dto/AuthUserDto.java
View File

@@ -36,5 +36,5 @@ public class AuthUserDto {
private String uuid = ""; private String uuid = "";
private String regin_code ; private String device ;
} }

1
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/fab/controller/FabController.java
View File

@@ -67,6 +67,7 @@ public class FabController {
// [{"num":"1","type":"IN","device_code":"222","vehicle_type","1"}] // [{"num":"1","type":"IN","device_code":"222","vehicle_type","1"}]
public ResponseEntity<Map> regionPoints(String regionCode){ public ResponseEntity<Map> regionPoints(String regionCode){
Assert.notBlank(regionCode,"请求参数不能为空"); Assert.notBlank(regionCode,"请求参数不能为空");
//TODO:改成查设备配置
SchBaseRegion baseRegion = iSchBaseRegionService.getOne(new QueryWrapper<SchBaseRegion>().eq("region_code", regionCode)); SchBaseRegion baseRegion = iSchBaseRegionService.getOne(new QueryWrapper<SchBaseRegion>().eq("region_code", regionCode));
String regionPoints = baseRegion.getRegion_points(); String regionPoints = baseRegion.getRegion_points();
List<DeviceConfig> deviceConfigs = JSONArray.parseArray(regionPoints, DeviceConfig.class); List<DeviceConfig> deviceConfigs = JSONArray.parseArray(regionPoints, DeviceConfig.class);

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml
View File

@@ -41,7 +41,7 @@
and sch_base_point.can_vehicle_type = #{vehicle_type} and sch_base_point.can_vehicle_type = #{vehicle_type}
</if> </if>
<if test="due_date != null and due_date != ''"> <if test="due_date != null and due_date != ''">
and sch_base_vehiclematerialgroup.vehicle_type > #{vehicle_type} and sch_base_vehiclematerialgroup.due_date > #{due_date}
</if> </if>
and has_work = false and has_work = false
AND sch_base_vehiclematerialgroup.region_code = #{region_code} AND sch_base_vehiclematerialgroup.region_code = #{region_code}

1
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java
View File

@@ -467,6 +467,7 @@ public class SchBasePointServiceImpl extends ServiceImpl<SchBasePointMapper, Sch
@Override @Override
public List<OrderMater> getStructList(String region_code, String vehicle_type) { public List<OrderMater> getStructList(String region_code, String vehicle_type) {
//1.查询的结果一个托盘有多个800，PC需要怎么展示？
Param dueDate = iSysParamService.findByCode("due_date"); Param dueDate = iSysParamService.findByCode("due_date");
if (dueDate!=null && StringUtils.isNotEmpty(dueDate.getValue())){ if (dueDate!=null && StringUtils.isNotEmpty(dueDate.getValue())){
DateUtil.offsetDay(new Date(), Integer.valueOf(dueDate.getValue())).toDateStr(); DateUtil.offsetDay(new Date(), Integer.valueOf(dueDate.getValue())).toDateStr();