diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/logicflow/service/impl/StageImageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/modules/logicflow/service/impl/StageImageServiceImpl.java index 7a0843909..dceee27e5 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/logicflow/service/impl/StageImageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/logicflow/service/impl/StageImageServiceImpl.java @@ -62,7 +62,9 @@ public class StageImageServiceImpl implements StageImageService { @Transactional(rollbackFor = Exception.class) public void update(StageImageDto dto) { StageImageDto entity = this.findById(dto.getImage_uuid()); - if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); + if (entity == null) { + throw new BadRequestException("被删除或无权限，操作失败!"); + } String currentUsername = SecurityUtils.getCurrentUsername(); String now = DateUtil.now(); diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/logicflow/service/impl/StageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/modules/logicflow/service/impl/StageServiceImpl.java index 9e6eb6abb..02a40b100 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/logicflow/service/impl/StageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/logicflow/service/impl/StageServiceImpl.java @@ -59,7 +59,9 @@ public class StageServiceImpl implements StageService { @Transactional(rollbackFor = Exception.class) public void update(StageDto dto) { StageDto entity = this.findById(dto.getStage_uuid()); - if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); + if (entity == null) { + throw new BadRequestException("被删除或无权限，操作失败!"); + } String currentUsername = SecurityUtils.getCurrentUsername(); String now = DateUtil.now(); diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GridFieldServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GridFieldServiceImpl.java index 125df219a..edb525d66 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GridFieldServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GridFieldServiceImpl.java @@ -75,7 +75,9 @@ public class GridFieldServiceImpl implements GridFieldService { @Transactional(rollbackFor = Exception.class) public void update(GridFieldDto dto) { GridFieldDto entity = this.findById(dto.getId()); - if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); + if (entity == null) { + throw new BadRequestException("被删除或无权限，操作失败!"); + } String currentUsername = SecurityUtils.getCurrentUsername(); String now = DateUtil.now(); diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GridServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GridServiceImpl.java index 27e240c32..7c3643857 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GridServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GridServiceImpl.java @@ -72,7 +72,9 @@ public class GridServiceImpl implements GridService { @Transactional(rollbackFor = Exception.class) public void update(GridDto dto) { GridDto entity = this.findById(dto.getId()); - if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); + if (entity == null) { + throw new BadRequestException("被删除或无权限，操作失败!"); + } String currentUsername = SecurityUtils.getCurrentUsername(); String now = DateUtil.now(); diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/wql/util/Calculate.java b/lms/nladmin-system/src/main/java/org/nl/modules/wql/util/Calculate.java index 763e40065..cd3ecc63e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/wql/util/Calculate.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/wql/util/Calculate.java @@ -40,8 +40,9 @@ public class Calculate { || s1.equals("/") || s1.equals("^") || s1.equals("(") || s1.equals(")") || s1.equals("sqrt(") || s1.equals("sin(") || s1.equals("cos(") - || s1.equals("pow(")) + || s1.equals("pow(")) { flag = true; + } } return flag; } @@ -54,15 +55,16 @@ public class Calculate { Double f1 = new Double((String) (s)); post.add(s); } catch (NumberFormatException e) { - if (Operator.empty()) + if (Operator.empty()) { Operator.push(s); - else { + } else { int tmp = fix_compare(s); switch (tmp) { case 1: do { - if (Operator.empty()) + if (Operator.empty()) { errReport(); + } post.add(Operator.pop()); } while (stack_compare((String) Operator.peek()) != 1); String tmp_ss = (String) Operator.pop(); diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java index 1163b4ded..12e97ef8b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java @@ -41,7 +41,9 @@ public class SysDictServiceImpl extends ServiceImpl impleme @Override public IPage queryAll(Map whereJson, PageQuery page) { String blurry = null; - if (ObjectUtil.isNotEmpty(whereJson.get("blurry"))) blurry = whereJson.get("blurry").toString(); + if (ObjectUtil.isNotEmpty(whereJson.get("blurry"))) { + blurry = whereJson.get("blurry").toString(); + } IPage pages = new Page<>(page.getPage() + 1, page.getSize()); QueryWrapper lam = new QueryWrapper<>(); lam.select("MAX(dict_id) AS dictId, code, name") @@ -63,7 +65,9 @@ public class SysDictServiceImpl extends ServiceImpl impleme String date = DateUtil.now(); List oldDict = sysDictMapper.selectList(new LambdaQueryWrapper() .eq(ObjectUtil.isNotEmpty(dict.getCode()), Dict::getCode, dict.getCode())); - if (ObjectUtil.isNotEmpty(oldDict)) throw new BadRequestException("字典[" + dict.getCode() + "]已存在"); + if (ObjectUtil.isNotEmpty(oldDict)) { + throw new BadRequestException("字典[" + dict.getCode() + "]已存在"); + } dict.setDictId(IdUtil.getSnowflake(1, 1).nextIdStr()); dict.setCreateId(currentUserId); dict.setCreateName(nickName); @@ -79,8 +83,9 @@ public class SysDictServiceImpl extends ServiceImpl impleme public void updateDict(Dict dto) { Dict dict = sysDictMapper.selectById(dto.getDictId()); List dictList = sysDictMapper.selectList(new LambdaQueryWrapper().eq(Dict::getCode, dto.getCode())); - if (ObjectUtil.isNotEmpty(dictList) && !dto.getCode().equals(dict.getCode())) + if (ObjectUtil.isNotEmpty(dictList) && !dto.getCode().equals(dict.getCode())) { throw new BadRequestException("字典[" + dto.getCode() + "]已存在"); + } String currentUserId = SecurityUtils.getCurrentUserId(); String currentNickName = SecurityUtils.getCurrentNickName(); // 根据code获取所有字典 @@ -131,7 +136,9 @@ public class SysDictServiceImpl extends ServiceImpl impleme // 校验是否已经有标签 Dict one = sysDictMapper.selectOne(new LambdaQueryWrapper().eq(Dict::getLabel, dict.getLabel()) .eq(Dict::getCode, dict.getCode())); - if (ObjectUtil.isNotEmpty(one)) throw new BadRequestException("标签[" + dict.getLabel() + "]已存在"); + if (ObjectUtil.isNotEmpty(one)) { + throw new BadRequestException("标签[" + dict.getLabel() + "]已存在"); + } // 判断是否有空的值 List selectOne = sysDictMapper.selectList(new LambdaQueryWrapper().eq(Dict::getCode, dict.getCode())); Dict dic = selectOne.get(0); @@ -165,11 +172,15 @@ public class SysDictServiceImpl extends ServiceImpl impleme @Transactional(rollbackFor = Exception.class) public void updateDetail(Dict resources) { Dict dict = sysDictMapper.selectById(resources.getDictId()); - if (ObjectUtil.isEmpty(dict)) throw new BadRequestException("被删除或无权限，操作失败!"); + if (ObjectUtil.isEmpty(dict)) { + throw new BadRequestException("被删除或无权限，操作失败!"); + } // 校验是否已经有标签 List dictList = sysDictMapper.selectList(new LambdaQueryWrapper().eq(Dict::getLabel, resources.getLabel()) .eq(Dict::getCode, resources.getCode())); - if (ObjectUtil.isNotEmpty(dictList) && !resources.getLabel().equals(dict.getLabel())) throw new BadRequestException("标签[" + dict.getLabel() + "]已存在"); + if (ObjectUtil.isNotEmpty(dictList) && !resources.getLabel().equals(dict.getLabel())) { + throw new BadRequestException("标签[" + dict.getLabel() + "]已存在"); + } resources.setUpdateId(SecurityUtils.getCurrentUserId()); resources.setUpdateName(SecurityUtils.getCurrentNickName()); resources.setUpdateTime(DateUtil.now()); diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java index dfb886bb3..0c5f85467 100644 --- a/lms/nladmin-system/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java @@ -251,7 +251,9 @@ public class SysMenuServiceImpl extends ServiceImpl impl if (menuId != null) { int count = baseMapper.findByPid(menuId).size(); SysMenu sysMenu = baseMapper.selectById(menuId); - if (ObjectUtil.isEmpty(sysMenu)) return; + if (ObjectUtil.isEmpty(sysMenu)) { + return; + } sysMenu.setSubCount(count); baseMapper.updateById(sysMenu); } diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/param/impl/SysParamServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/system/service/param/impl/SysParamServiceImpl.java index d8adf07d6..1ad643569 100644 --- a/lms/nladmin-system/src/main/java/org/nl/system/service/param/impl/SysParamServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/system/service/param/impl/SysParamServiceImpl.java @@ -49,7 +49,9 @@ public class SysParamServiceImpl extends ServiceImpl impl @Transactional(rollbackFor = Exception.class) public void create(Param param) { List code = paramMapper.selectByMap(MapOf.of("code", param.getCode())); - if (ObjectUtil.isNotEmpty(code)) throw new BadRequestException("编码不能一致"); + if (ObjectUtil.isNotEmpty(code)) { + throw new BadRequestException("编码不能一致"); + } param.setId(IdUtil.getSnowflake(1, 1).nextIdStr()); String currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); @@ -67,7 +69,9 @@ public class SysParamServiceImpl extends ServiceImpl impl @Transactional(rollbackFor = Exception.class) public void update(Param param) { Param paramObj = paramMapper.selectById(param.getId()); - if (ObjectUtil.isEmpty(paramObj)) throw new BadRequestException("被删除或无权限，操作失败!"); + if (ObjectUtil.isEmpty(paramObj)) { + throw new BadRequestException("被删除或无权限，操作失败!"); + } param.setUpdateId(SecurityUtils.getCurrentUserId()); param.setUpdateName(SecurityUtils.getCurrentNickName()); param.setUpdateTime(DateUtil.now()); diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/permission/impl/SysDataPermissionServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/system/service/permission/impl/SysDataPermissionServiceImpl.java index 3491425a3..341cc8140 100644 --- a/lms/nladmin-system/src/main/java/org/nl/system/service/permission/impl/SysDataPermissionServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/system/service/permission/impl/SysDataPermissionServiceImpl.java @@ -54,7 +54,9 @@ public class SysDataPermissionServiceImpl extends ServiceImpl().eq(SysDataPermission::getCode, permission.getCode())); - if (ObjectUtil.isNotEmpty(sysDataPermission)) throw new BadRequestException("编码为[" + permission.getCode() + "]的数据权限已存在"); + if (ObjectUtil.isNotEmpty(sysDataPermission)) { + throw new BadRequestException("编码为[" + permission.getCode() + "]的数据权限已存在"); + } String currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); String now = DateUtil.now(); @@ -73,7 +75,9 @@ public class SysDataPermissionServiceImpl extends ServiceImpl ids) { ids.forEach(id -> { List permissions = userService.getUserDataPermissionByPermissionId(id); - if (ObjectUtil.isNotEmpty(permissions)) throw new BadRequestException("存在相关联的数据权限，请解除关联后删除"); + if (ObjectUtil.isNotEmpty(permissions)) { + throw new BadRequestException("存在相关联的数据权限，请解除关联后删除"); + } dataPermissionMapper.deleteById(id); }); } @@ -107,13 +113,19 @@ public class SysDataPermissionServiceImpl extends ServiceImpl().eq(SysDataPermission::getPermissionId, userDataPermissionDto.getPermissionId())); if (sysDataPermission.getCode().equals(DataScopeEnum.USER.getCode())) { // 用户权限 List userIds = dataPermissionMapper.findDataScopeUserIdBySelfUserIdAndScopeType(userId, userDataPermissionDto.getPermissionScopeType()); - if (ObjectUtil.isNotEmpty(userIds)) userDataPermissionDto.setUsers(userIds); + if (ObjectUtil.isNotEmpty(userIds)) { + userDataPermissionDto.setUsers(userIds); + } } else if (sysDataPermission.getCode().equals(DataScopeEnum.DEPT.getCode())) { // 部门权限 List deptIds = dataPermissionMapper.findDataScopeDeptIdBySelfUserIdAndScopeType(userId, userDataPermissionDto.getPermissionScopeType()); - if (ObjectUtil.isNotEmpty(deptIds)) userDataPermissionDto.setDepts(deptIds); + if (ObjectUtil.isNotEmpty(deptIds)) { + userDataPermissionDto.setDepts(deptIds); + } } else if (sysDataPermission.getCode().equals(DataScopeEnum.SELF.getCode())) { // 自身 List userIds = dataPermissionMapper.findDataScopeUserIdBySelfUserIdAndScopeType(userId, userDataPermissionDto.getPermissionScopeType()); - if (ObjectUtil.isNotEmpty(userIds)) userDataPermissionDto.setUsers(userIds); + if (ObjectUtil.isNotEmpty(userIds)) { + userDataPermissionDto.setUsers(userIds); + } } // 其他不做处理 }); @@ -125,7 +137,9 @@ public class SysDataPermissionServiceImpl extends ServiceImpl impl @Override public IPage query(Map param, PageQuery page) { String blurry = null; - if (ObjectUtil.isNotEmpty(param.get("blurry"))) blurry = param.get("blurry").toString(); + if (ObjectUtil.isNotEmpty(param.get("blurry"))) { + blurry = param.get("blurry").toString(); + } LambdaQueryWrapper lam = new LambdaQueryWrapper<>(); lam.like(ObjectUtil.isNotEmpty(blurry), SysRole::getName, blurry); IPage pages = new Page<>(page.getPage() + 1, page.getSize()); @@ -63,12 +65,16 @@ public class SysRoleServiceImpl extends ServiceImpl impl public void create(JSONObject param) { //判断角色名字是否存在 String name = param.getString("name"); - if (StrUtil.isEmpty(name)) throw new BadRequestException("角色名字不能为空!"); + if (StrUtil.isEmpty(name)) { + throw new BadRequestException("角色名字不能为空!"); + } SysRole sysRole = JSONObject.parseObject(JSONObject.toJSONString(param), SysRole.class); //判断角色名字是否存在 SysRole role = roleMapper.selectOne(new LambdaQueryWrapper().eq(SysRole::getName, sysRole.getName())); - if (ObjectUtil.isNotEmpty(role)) throw new BadRequestException("角色【" + name + "】已存在!"); + if (ObjectUtil.isNotEmpty(role)) { + throw new BadRequestException("角色【" + name + "】已存在!"); + } String userId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); String now = DateUtil.now(); @@ -89,12 +95,16 @@ public class SysRoleServiceImpl extends ServiceImpl impl SysRole sysRole = JSONObject.parseObject(JSONObject.toJSONString(param), SysRole.class); //判断角色名字是否存在 String name = sysRole.getName(); - if (StrUtil.isEmpty(name)) throw new BadRequestException("角色名字不能为空!"); + if (StrUtil.isEmpty(name)) { + throw new BadRequestException("角色名字不能为空!"); + } //判断角色名字是否存在 SysRole role = roleMapper.selectOne(new LambdaQueryWrapper().eq(SysRole::getName, sysRole.getName()) .ne(SysRole::getRoleId, sysRole.getRoleId())); - if (ObjectUtil.isNotEmpty(role)) throw new BadRequestException("角色【" + name + "】已存在!"); + if (ObjectUtil.isNotEmpty(role)) { + throw new BadRequestException("角色【" + name + "】已存在!"); + } String userId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); String now = DateUtil.now(); @@ -135,7 +145,9 @@ public class SysRoleServiceImpl extends ServiceImpl impl // 查看是否为管理员 String currentUserId = SecurityUtils.getCurrentUserId(); SysUser sysUser = userMapper.selectOne(new LambdaQueryWrapper().eq(SysUser::getUserId, currentUserId)); - if ( ObjectUtil.isNotEmpty(sysUser.getIsAdmin()) && sysUser.getIsAdmin()) permission.add("admin"); + if ( ObjectUtil.isNotEmpty(sysUser.getIsAdmin()) && sysUser.getIsAdmin()) { + permission.add("admin"); + } permission.addAll(sysMenuMapper.getPermissionByUserId(userDto.getString("userId"))); return permission; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/ClassstandardServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/ClassstandardServiceImpl.java index 50736c2f5..b10810e3b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/ClassstandardServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/ClassstandardServiceImpl.java @@ -90,7 +90,9 @@ public class ClassstandardServiceImpl implements ClassstandardService { public ClassstandardDto findByCode(String code) { WQLObject wo = WQLObject.getWQLObject("MD_PB_ClassStandard"); JSONObject json = wo.query("class_code ='" + code + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(json)) return null; + if (ObjectUtil.isEmpty(json)) { + return null; + } final ClassstandardDto obj = json.toJavaObject(ClassstandardDto.class); return obj; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/CustomerbaseServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/CustomerbaseServiceImpl.java index 524f831c1..f97eb956b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/CustomerbaseServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/CustomerbaseServiceImpl.java @@ -65,7 +65,9 @@ public class CustomerbaseServiceImpl implements CustomerbaseService { public CustomerbaseDto findById(Long cust_id) { WQLObject wo = WQLObject.getWQLObject("md_cs_customerbase"); JSONObject json = wo.query("cust_id =" + cust_id + "").uniqueResult(0); - if (ObjectUtil.isEmpty(json)) return null; + if (ObjectUtil.isEmpty(json)) { + return null; + } final CustomerbaseDto obj = json.toJavaObject(CustomerbaseDto.class); return obj; } @@ -74,7 +76,9 @@ public class CustomerbaseServiceImpl implements CustomerbaseService { public CustomerbaseDto findByCode(String code) { WQLObject wo = WQLObject.getWQLObject("md_cs_customerbase"); JSONObject json = wo.query("cust_code ='" + code + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(json)) return null; + if (ObjectUtil.isEmpty(json)) { + return null; + } final CustomerbaseDto obj = json.toJavaObject(CustomerbaseDto.class); return obj; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/FaultDeviceServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/FaultDeviceServiceImpl.java index 0a64a7567..141b9b380 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/FaultDeviceServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/FaultDeviceServiceImpl.java @@ -125,7 +125,9 @@ public class FaultDeviceServiceImpl implements FaultDeviceService { JSONObject jsonDevice = WQL.getWO("QMD_BI_FAULT").addParamMap(map).process().uniqueResult(0); - if (ObjectUtil.isEmpty(jsonDevice)) continue; + if (ObjectUtil.isEmpty(jsonDevice)) { + continue; + } // 单独处理agv报警 if (StrUtil.equals(json.getString("fault_type"), "agv_error_type")) { @@ -209,7 +211,9 @@ public class FaultDeviceServiceImpl implements FaultDeviceService { public CustomerbaseDto findById(Long cust_id) { WQLObject wo = WQLObject.getWQLObject("md_cs_customerbase"); JSONObject json = wo.query("cust_id =" + cust_id + "").uniqueResult(0); - if (ObjectUtil.isEmpty(json)) return null; + if (ObjectUtil.isEmpty(json)) { + return null; + } final CustomerbaseDto obj = json.toJavaObject(CustomerbaseDto.class); return obj; } @@ -218,7 +222,9 @@ public class FaultDeviceServiceImpl implements FaultDeviceService { public CustomerbaseDto findByCode(String code) { WQLObject wo = WQLObject.getWQLObject("md_cs_customerbase"); JSONObject json = wo.query("cust_code ='" + code + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(json)) return null; + if (ObjectUtil.isEmpty(json)) { + return null; + } final CustomerbaseDto obj = json.toJavaObject(CustomerbaseDto.class); return obj; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/InterfacebackServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/InterfacebackServiceImpl.java index ecd99f73a..c15bcc819 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/InterfacebackServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/InterfacebackServiceImpl.java @@ -45,7 +45,9 @@ public class InterfacebackServiceImpl implements InterfacebackService { JSONObject map = new JSONObject(); map.put("flag", "1"); - if (ObjectUtil.isNotEmpty(interface_name)) map.put("interface_name", "%" + interface_name + "%"); + if (ObjectUtil.isNotEmpty(interface_name)) { + map.put("interface_name", "%" + interface_name + "%"); + } JSONObject json = WQL.getWO("QMD_PB_INTERFACEBACK").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "interface_type ASC"); @@ -69,7 +71,9 @@ public class InterfacebackServiceImpl implements InterfacebackService { public List queryAll(Map whereJson) { WQLObject wo = WQLObject.getWQLObject("md_pb_interfaceback"); JSONArray arr = wo.query().getResultJSONArray(0); - if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(InterfacebackDto.class); + if (ObjectUtil.isNotEmpty(arr)) { + return arr.toJavaList(InterfacebackDto.class); + } return null; } @@ -113,7 +117,9 @@ public class InterfacebackServiceImpl implements InterfacebackService { @Transactional(rollbackFor = Exception.class) public void update(InterfacebackDto dto) { InterfacebackDto entity = this.findById(dto.getInterface_id()); - if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); + if (entity == null) { + throw new BadRequestException("被删除或无权限，操作失败!"); + } WQLObject wo = WQLObject.getWQLObject("md_pb_interfaceback"); JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialbaseServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialbaseServiceImpl.java index 4a7a1d255..a367f30f1 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialbaseServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialbaseServiceImpl.java @@ -124,7 +124,9 @@ public class MaterialbaseServiceImpl implements MaterialbaseService { code = code.replace("\\", "\\\\"); } JSONObject json = wo.query("material_code ='" + code + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(json)) return null; + if (ObjectUtil.isEmpty(json)) { + return null; + } String unit_name = WQLObject.getWQLObject("md_pb_measureunit").query("measure_unit_id= '" + json.getString("base_unit_id") + "'").uniqueResult(0).getString("unit_name"); json.put("base_unit_name", unit_name); final MaterialbaseDto obj = json.toJavaObject(MaterialbaseDto.class); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/StoragevehicleinfoServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/StoragevehicleinfoServiceImpl.java index def887b45..d157fb6c8 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/StoragevehicleinfoServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/StoragevehicleinfoServiceImpl.java @@ -127,6 +127,8 @@ public class StoragevehicleinfoServiceImpl implements StoragevehicleinfoService //气涨轴编码 code = "VEHICCLE_CODE_QZZ"; break; + default: + break; } if (StrUtil.isEmpty(code)) { throw new BadRequestException("请选择正确的载具类型！"); @@ -161,7 +163,9 @@ public class StoragevehicleinfoServiceImpl implements StoragevehicleinfoService throw new BadRequestException("此载具已存在"); } StoragevehicleinfoDto entity = this.findById(dto.getStoragevehicle_id()); - if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); + if (entity == null) { + throw new BadRequestException("被删除或无权限，操作失败!"); + } String currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); @@ -223,6 +227,8 @@ public class StoragevehicleinfoServiceImpl implements StoragevehicleinfoService case "01": term = "VEHICCLE_CODE_TTP"; break; + default: + break; } HashMap map = new HashMap<>(); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/SupplierbaseServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/SupplierbaseServiceImpl.java index c60baf8ab..79ae57aed 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/SupplierbaseServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/SupplierbaseServiceImpl.java @@ -65,7 +65,9 @@ public class SupplierbaseServiceImpl implements SupplierbaseService { public SupplierbaseDto findById(Long supp_id) { WQLObject wo = WQLObject.getWQLObject("md_cs_supplierbase"); JSONObject json = wo.query("supp_id =" + supp_id + "").uniqueResult(0); - if (ObjectUtil.isEmpty(json)) return null; + if (ObjectUtil.isEmpty(json)) { + return null; + } final SupplierbaseDto obj = json.toJavaObject(SupplierbaseDto.class); return obj; } @@ -74,7 +76,9 @@ public class SupplierbaseServiceImpl implements SupplierbaseService { public SupplierbaseDto findByCode(String code) { WQLObject wo = WQLObject.getWQLObject("md_cs_supplierbase"); JSONObject json = wo.query("supp_code ='" + code + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(json)) return null; + if (ObjectUtil.isEmpty(json)) { + return null; + } final SupplierbaseDto obj = json.toJavaObject(SupplierbaseDto.class); return obj; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/TransportationbaseServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/TransportationbaseServiceImpl.java index 4ab959619..ca3ad075f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/TransportationbaseServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/TransportationbaseServiceImpl.java @@ -45,8 +45,12 @@ public class TransportationbaseServiceImpl implements TransportationbaseService JSONObject map = new JSONObject(); map.put("flag", "1"); map.put("is_used",MapUtil.getStr(whereJson,"is_used")); - if (ObjectUtil.isNotEmpty(cust_code)) map.put("cust_code","%"+cust_code+"%"); - if (ObjectUtil.isNotEmpty(cust_name)) map.put("cust_name","%"+cust_name+"%"); + if (ObjectUtil.isNotEmpty(cust_code)) { + map.put("cust_code","%"+cust_code+"%"); + } + if (ObjectUtil.isNotEmpty(cust_name)) { + map.put("cust_name","%"+cust_name+"%"); + } JSONObject json = WQL.getWO("QMD_CS_TRANSPORAIONL").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "update_time ASC"); return json; } @@ -55,7 +59,9 @@ public class TransportationbaseServiceImpl implements TransportationbaseService public List queryAll(Map whereJson) { WQLObject wo = WQLObject.getWQLObject("md_cs_transportationbase"); JSONArray arr = wo.query().getResultJSONArray(0); - if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(TransportationbaseDto.class); + if (ObjectUtil.isNotEmpty(arr)) { + return arr.toJavaList(TransportationbaseDto.class); + } return null; } @@ -85,7 +91,9 @@ public class TransportationbaseServiceImpl implements TransportationbaseService WQLObject tab = WQLObject.getWQLObject("MD_CS_TransportationBase"); JSONObject jsonObject = tab.query("cust_code = '" + dto.getCust_code() + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(jsonObject)) throw new BadRequestException("此编码已存在"); + if (ObjectUtil.isNotEmpty(jsonObject)) { + throw new BadRequestException("此编码已存在"); + } String currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); @@ -108,7 +116,9 @@ public class TransportationbaseServiceImpl implements TransportationbaseService @Transactional(rollbackFor = Exception.class) public void update(TransportationbaseDto dto) { TransportationbaseDto entity = this.findById(dto.getCust_id()); - if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); + if (entity == null) { + throw new BadRequestException("被删除或无权限，操作失败!"); + } String currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/UnitServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/UnitServiceImpl.java index 8014a24aa..557f5a2c6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/UnitServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/UnitServiceImpl.java @@ -60,7 +60,9 @@ public class UnitServiceImpl implements UnitService { public UnitDto findById(Long measure_unit_id) { WQLObject wo = WQLObject.getWQLObject("md_pb_measureunit"); JSONObject json = wo.query("measure_unit_id =" + measure_unit_id + "").uniqueResult(0); - if (ObjectUtil.isEmpty(json)) return null; + if (ObjectUtil.isEmpty(json)) { + return null; + } final UnitDto obj = json.toJavaObject(UnitDto.class); return obj; } @@ -69,7 +71,9 @@ public class UnitServiceImpl implements UnitService { public UnitDto findByCode(String code) { WQLObject wo = WQLObject.getWQLObject("md_pb_measureunit"); JSONObject json = wo.query("unit_code ='" + code + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(json)) return null; + if (ObjectUtil.isEmpty(json)) { + return null; + } final UnitDto obj = json.toJavaObject(UnitDto.class); return obj; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/SectattrServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/SectattrServiceImpl.java index 847773b61..71bfa4886 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/SectattrServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/SectattrServiceImpl.java @@ -54,7 +54,9 @@ public class SectattrServiceImpl implements SectattrService { UserStorServiceImpl userStorService = new UserStorServiceImpl(); String in_stor_id = userStorService.getInStor(); - if (ObjectUtil.isNotEmpty(in_stor_id)) map.put("in_stor_id", in_stor_id); + if (ObjectUtil.isNotEmpty(in_stor_id)) { + map.put("in_stor_id", in_stor_id); + } JSONObject jo = WQL.getWO("QST_SECT_ATTR").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "update_time desc"); return jo; @@ -72,7 +74,9 @@ public class SectattrServiceImpl implements SectattrService { public SectattrDto findById(Long sect_id) { WQLObject wo = WQLObject.getWQLObject("st_ivt_sectattr"); JSONObject json = wo.query("sect_id =" + sect_id + "").uniqueResult(0); - if (ObjectUtil.isEmpty(json)) return null; + if (ObjectUtil.isEmpty(json)) { + return null; + } final SectattrDto obj = json.toJavaObject(SectattrDto.class); return obj; } @@ -81,7 +85,9 @@ public class SectattrServiceImpl implements SectattrService { public SectattrDto findByCode(String code) { WQLObject wo = WQLObject.getWQLObject("st_ivt_sectattr"); JSONObject json = wo.query("sect_code ='" + code + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(json)) return null; + if (ObjectUtil.isEmpty(json)) { + return null; + } final SectattrDto obj = json.toJavaObject(SectattrDto.class); return obj; } @@ -93,7 +99,9 @@ public class SectattrServiceImpl implements SectattrService { WQLObject tab = WQLObject.getWQLObject("st_ivt_sectattr"); JSONObject json2 = tab.query("sect_code = '" + sect_code + "' and stor_id = '" + dto.getStor_id() + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json2)) throw new BadRequestException("存在相同仓库的库区编号"); + if (ObjectUtil.isNotEmpty(json2)) { + throw new BadRequestException("存在相同仓库的库区编号"); + } String currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); @@ -146,7 +154,9 @@ public class SectattrServiceImpl implements SectattrService { wo.update(json); JSONArray resultJSONArray = tab.query("sect_code = '" + sect_code + "' and stor_id = '" + dto.getStor_id() + "'").getResultJSONArray(0); - if (resultJSONArray.size() > 1) throw new BadRequestException("存在相同仓库的库区编号"); + if (resultJSONArray.size() > 1) { + throw new BadRequestException("存在相同仓库的库区编号"); + } } @Override diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StorattrServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StorattrServiceImpl.java index c4bce773b..c0ab3dcaf 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StorattrServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StorattrServiceImpl.java @@ -60,7 +60,9 @@ public class StorattrServiceImpl implements StorattrService { public StorattrDto findById(Long stor_id) { WQLObject wo = WQLObject.getWQLObject("st_ivt_bsrealstorattr"); JSONObject json = wo.query("stor_id =" + stor_id + "").uniqueResult(0); - if (ObjectUtil.isEmpty(json)) return null; + if (ObjectUtil.isEmpty(json)) { + return null; + } final StorattrDto obj = json.toJavaObject(StorattrDto.class); return obj; } @@ -69,7 +71,9 @@ public class StorattrServiceImpl implements StorattrService { public StorattrDto findByCode(String code) { WQLObject wo = WQLObject.getWQLObject("st_ivt_bsrealstorattr"); JSONObject json = wo.query("stor_code ='" + code + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(json)) return null; + if (ObjectUtil.isEmpty(json)) { + return null; + } final StorattrDto obj = json.toJavaObject(StorattrDto.class); return obj; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java index c62e6d357..06f0b8728 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java @@ -67,7 +67,9 @@ public class StructattrServiceImpl implements StructattrService { UserStorServiceImpl userStorService = new UserStorServiceImpl(); String in_stor_id = userStorService.getInStor(); - if (ObjectUtil.isNotEmpty(in_stor_id)) map.put("in_stor_id",in_stor_id); + if (ObjectUtil.isNotEmpty(in_stor_id)) { + map.put("in_stor_id",in_stor_id); + } JSONObject jo = WQL.getWO("QST_STRUCT_ATTR").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "struct_code asc"); return jo; @@ -85,7 +87,9 @@ public class StructattrServiceImpl implements StructattrService { public StructattrDto findById(Long struct_id) { WQLObject wo = WQLObject.getWQLObject("st_ivt_structattr"); JSONObject json = wo.query("struct_id =" + struct_id + "").uniqueResult(0); - if (ObjectUtil.isEmpty(json)) return null; + if (ObjectUtil.isEmpty(json)) { + return null; + } final StructattrDto obj = json.toJavaObject(StructattrDto.class); return obj; } @@ -94,7 +98,9 @@ public class StructattrServiceImpl implements StructattrService { public StructattrDto findByCode(String code) { WQLObject wo = WQLObject.getWQLObject("st_ivt_structattr"); JSONObject json = wo.query("struct_code ='" + code + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(json)) return null; + if (ObjectUtil.isEmpty(json)) { + return null; + } final StructattrDto obj = json.toJavaObject(StructattrDto.class); return obj; } @@ -130,7 +136,9 @@ public class StructattrServiceImpl implements StructattrService { if (ObjectUtil.isNotEmpty(storagevehicle_code)) { WQLObject vehicleTab = WQLObject.getWQLObject("md_pb_storagevehicleinfo"); JSONObject obj = vehicleTab.query("storagevehicle_code = '" + storagevehicle_code + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(obj)) throw new BadRequestException("未发现载具号为【" + storagevehicle_code + "】的载具信息"); + if (ObjectUtil.isEmpty(obj)) { + throw new BadRequestException("未发现载具号为【" + storagevehicle_code + "】的载具信息"); + } dto.setStoragevehicle_id(obj.getLong ("storagevehicle_id")); @@ -258,7 +266,9 @@ public class StructattrServiceImpl implements StructattrService { JSONObject js = jsonArray.getJSONObject(i); String struct_id = js.getString("struct_id"); - if (ObjectUtil.isEmpty(struct_id)) continue; + if (ObjectUtil.isEmpty(struct_id)) { + continue; + } int struct_status = 2; // 获取信息 1蓝色空载具 2黄色木箱 3绿色空位 4灰色禁用 @@ -316,7 +326,9 @@ public class StructattrServiceImpl implements StructattrService { JSONObject js = jsonArray.getJSONObject(i); String struct_id = js.getString("struct_id"); - if (ObjectUtil.isEmpty(struct_id)) continue; + if (ObjectUtil.isEmpty(struct_id)) { + continue; + } int struct_status = 2; // 获取信息 1蓝色空载具 2黄色木箱 3绿色空位 4灰色禁用 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java index c1886edee..78acdd311 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java @@ -101,7 +101,9 @@ public class StructivtServiceImpl implements StructivtService { UserStorServiceImpl userStorService = new UserStorServiceImpl(); String in_stor_id = userStorService.getInStor(); - if (ObjectUtil.isNotEmpty(in_stor_id)) map.put("in_stor_id", in_stor_id); + if (ObjectUtil.isNotEmpty(in_stor_id)) { + map.put("in_stor_id", in_stor_id); + } JSONObject jsonObject = WQL.getWO("QST_STRUCTIVT001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "a.instorage_time desc,a.package_box_sn"); @@ -112,7 +114,9 @@ public class StructivtServiceImpl implements StructivtService { public List queryAll(Map whereJson) { WQLObject wo = WQLObject.getWQLObject("st_ivt_structivt"); JSONArray arr = wo.query().getResultJSONArray(0); - if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(StructivtDto.class); + if (ObjectUtil.isNotEmpty(arr)) { + return arr.toJavaList(StructivtDto.class); + } return null; } @@ -151,7 +155,9 @@ public class StructivtServiceImpl implements StructivtService { @Transactional(rollbackFor = Exception.class) public void update(StructivtDto dto) { StructivtDto entity = this.findById(dto.getStockrecord_id()); - if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); + if (entity == null) { + throw new BadRequestException("被删除或无权限，操作失败!"); + } WQLObject wo = WQLObject.getWQLObject("st_ivt_structivt"); JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); wo.update(json); @@ -248,7 +254,9 @@ public class StructivtServiceImpl implements StructivtService { UserStorServiceImpl userStorService = new UserStorServiceImpl(); String in_stor_id = userStorService.getInStor(); - if (ObjectUtil.isNotEmpty(in_stor_id)) map.put("in_stor_id", in_stor_id); + if (ObjectUtil.isNotEmpty(in_stor_id)) { + map.put("in_stor_id", in_stor_id); + } if (ObjectUtil.isNotNull(ivt_flag)){ StringJoiner joiner = new StringJoiner(",","(",")"); @@ -279,6 +287,7 @@ public class StructivtServiceImpl implements StructivtService { mp.put("客户编码", json.getString("customer_name")); mp.put("客户名称", json.getString("customer_description")); mp.put("销售订单", json.getString("sale_order_name")); + mp.put("业务员", json.getString("sales_owner")); mp.put("入库日期", json.getString("instorage_time")); mp.put("生产日期", json.getString("date_of_production")); mp.put("产品规格（幅宽）",String.format("%.0f", json.getDoubleValue("width"))); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/UserStorServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/UserStorServiceImpl.java index cb443f346..9c3f6229c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/UserStorServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/UserStorServiceImpl.java @@ -133,7 +133,9 @@ public class UserStorServiceImpl implements UserStorService { //获取人员对应的仓库 String in_stor_id = this.getInStor(); - if (ObjectUtil.isNotEmpty(in_stor_id)) stor_map.put("in_stor_id",in_stor_id); + if (ObjectUtil.isNotEmpty(in_stor_id)) { + stor_map.put("in_stor_id",in_stor_id); + } JSONArray stor_ja = WQL.getWO("QST_STOR_ATTR").addParamMap(stor_map).process().getResultJSONArray(0); for (int i = 0; i < stor_ja.size(); i++) { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java index 795883fd9..97f8f88d1 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java @@ -210,6 +210,8 @@ public class BakingServiceImpl implements BakingService { case "A4": reging_id = RegionTypeEnum.D_HKZC.getId(); break; + default: + break; } JSONObject map = new JSONObject(); map.put("flag", "1"); @@ -356,6 +358,8 @@ public class BakingServiceImpl implements BakingService { case "A4": reging_id = RegionTypeEnum.D_HKZC.getId(); break; + default: + break; } JSONObject map = new JSONObject(); map.put("flag", "1"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/HandleBakingServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/HandleBakingServiceImpl.java index f04a28f12..c79b95cea 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/HandleBakingServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/HandleBakingServiceImpl.java @@ -70,13 +70,21 @@ public class HandleBakingServiceImpl implements HandleBakingService { JSONObject jsonRaw = rawTab.query("container_name = '" + container_name + "' and is_delete = '0'").uniqueResult(0); JSONObject jsonMater = materTab.query("material_code = '" + jsonRaw.getString("product_name") + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(jsonMater)) throw new BadRequestException("物料基础信息中无此物料"); + if (ObjectUtil.isEmpty(jsonMater)) { + throw new BadRequestException("物料基础信息中无此物料"); + } if (StrUtil.equals(option, "1")) { - if (ObjectUtil.isEmpty(container_name)) throw new BadRequestException("母卷号不能为空"); - if (ObjectUtil.isEmpty(point_code1)) throw new BadRequestException("起点不能为空！"); - if (ObjectUtil.isEmpty(next_point_code)) throw new BadRequestException("终点不能为空"); + if (ObjectUtil.isEmpty(container_name)) { + throw new BadRequestException("母卷号不能为空"); + } + if (ObjectUtil.isEmpty(point_code1)) { + throw new BadRequestException("起点不能为空！"); + } + if (ObjectUtil.isEmpty(next_point_code)) { + throw new BadRequestException("终点不能为空"); + } JSONObject cool_ivt = WQLObject.getWQLObject("st_ivt_coolpointivt").query("full_point_code = '" + point_code1 + "'").uniqueResult(0); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/RawFoilServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/RawFoilServiceImpl.java index 63cc3bb1e..b7fb98b02 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/RawFoilServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/RawFoilServiceImpl.java @@ -62,7 +62,9 @@ public class RawFoilServiceImpl implements RawFoilService { map.put("point_code", point_code); map.put("container_name", container_name); map.put("product_area", product_area); - if (ObjectUtil.isNotEmpty(in_area_id)) map.put("in_area_id", in_area_id); + if (ObjectUtil.isNotEmpty(in_area_id)) { + map.put("in_area_id", in_area_id); + } /*// 如果都为空则默认区域为 A1 if (ObjectUtil.isEmpty(point_code) && ObjectUtil.isEmpty(container_name) && ObjectUtil.isEmpty(product_area)) { @@ -131,7 +133,9 @@ public class RawFoilServiceImpl implements RawFoilService { //获取人员对应的区域 UserAreaServiceImpl userAreaService = new UserAreaServiceImpl(); String in_area_id = userAreaService.getInArea(); - if (ObjectUtil.isNotEmpty(in_area_id)) map.put("in_area_id", in_area_id); + if (ObjectUtil.isNotEmpty(in_area_id)) { + map.put("in_area_id", in_area_id); + } JSONObject resultJSONArray = WQL.getWO("PDA_RAWFOIL_01").addParamMap(map).pageQuery(ctx, "container_name"); JSONObject jo = new JSONObject(); jo.put("data", resultJSONArray.getJSONArray("content")); @@ -153,10 +157,14 @@ public class RawFoilServiceImpl implements RawFoilService { JSONObject raw_jo = whereJson.getJSONObject("raw_jo"); JSONObject jsonRaw = rawTab.query("workorder_id = '" + raw_jo.getString("workorder_id") + "'").uniqueResult(0); - if (!StrUtil.equals(jsonRaw.getString("status"), "01")) throw new BadRequestException("工单状态不为开始"); + if (!StrUtil.equals(jsonRaw.getString("status"), "01")) { + throw new BadRequestException("工单状态不为开始"); + } JSONObject jsonSb = sbTab.query("ext_code = '" + jsonRaw.getString("resource_name") + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(jsonSb)) throw new BadRequestException("点位："+jsonRaw.getString("resource_name")+"生箔设备不存在"); + if (ObjectUtil.isEmpty(jsonSb)) { + throw new BadRequestException("点位："+jsonRaw.getString("resource_name")+"生箔设备不存在"); + } if (StrUtil.equals("0", jsonSb.getString("is_used"))) { throw new BadRequestException("当前生箔机："+jsonSb.getString("ext_code")+"未启用！"); @@ -261,7 +269,9 @@ public class RawFoilServiceImpl implements RawFoilService { JSONObject raw_jo = whereJson.getJSONObject("raw_jo"); JSONObject jsonRaw = rawTab.query("workorder_id = '" + raw_jo.getString("workorder_id") + "'").uniqueResult(0); - if (!StrUtil.equals(jsonRaw.getString("status"), "02")) throw new BadRequestException("工单状态不为空轴搬出"); + if (!StrUtil.equals(jsonRaw.getString("status"), "02")) { + throw new BadRequestException("工单状态不为空轴搬出"); + } //查询该母卷号对应的任务 String container_name = jsonRaw.getString("container_name"); @@ -270,7 +280,9 @@ public class RawFoilServiceImpl implements RawFoilService { // 查询生箔点位库存表 // JSONObject jsonSb = sbTab.query("ext_code = '" + jsonRaw.getString("resource_name") + "'and is_used = '1'").uniqueResult(0); JSONObject jsonSb = sbTab.query("ext_code = '" + jsonRaw.getString("resource_name") + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(jsonSb)) throw new BadRequestException("点位不存在"); + if (ObjectUtil.isEmpty(jsonSb)) { + throw new BadRequestException("点位不存在"); + } //下发ACS，执行取满放空的AGV动作 JSONArray paramArr = new JSONArray(); @@ -304,7 +316,9 @@ public class RawFoilServiceImpl implements RawFoilService { WQLObject rawTab = WQLObject.getWQLObject("PDM_BI_RawFoilWorkOrder"); // 生箔工单表 JSONObject jsonRaw = rawTab.query("container_name = '" + raw_jo.getString("container_name") + "'").uniqueResult(0); - if (!StrUtil.equals(jsonRaw.getString("status"), "03")) throw new BadRequestException("工单不为确认下卷"); + if (!StrUtil.equals(jsonRaw.getString("status"), "03")) { + throw new BadRequestException("工单不为确认下卷"); + } //查询该母卷号对应的任务 String container_name = jsonRaw.getString("container_name"); @@ -313,7 +327,9 @@ public class RawFoilServiceImpl implements RawFoilService { // 查询生箔点位库存表 // JSONObject jsonSb = WQLObject.getWQLObject("st_ivt_sbpointivt").query("ext_code = '" + jsonRaw.getString("resource_name") + "'and is_used = '1'").uniqueResult(0); JSONObject jsonSb = WQLObject.getWQLObject("st_ivt_sbpointivt").query("ext_code = '" + jsonRaw.getString("resource_name") + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(jsonSb)) throw new BadRequestException("点位不存在"); + if (ObjectUtil.isEmpty(jsonSb)) { + throw new BadRequestException("点位不存在"); + } //下发ACS，执行取满放空的AGV动作 JSONArray paramArr = new JSONArray(); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/CoolInServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/CoolInServiceImpl.java index f4cabe8d6..c7cb83e1c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/CoolInServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/CoolInServiceImpl.java @@ -37,7 +37,9 @@ public class CoolInServiceImpl implements CoolInService { JSONObject map = new JSONObject(); map.put("flag", "1"); - if (ObjectUtil.isNotEmpty(container_name)) map.put("container_name", "%"+container_name+"%"); + if (ObjectUtil.isNotEmpty(container_name)) { + map.put("container_name", "%"+container_name+"%"); + } //获取人员对应的区域 UserAreaServiceImpl userAreaService = new UserAreaServiceImpl(); @@ -70,7 +72,9 @@ public class CoolInServiceImpl implements CoolInService { // 查询终点在冷却区是否存在 JSONObject jsonCoolIvt = coolIvtTab.query("full_point_code = '" + point_code + "' and full_point_status = '01' and empty_point_status = '01' and is_used = '1'").uniqueResult(0); - if (ObjectUtil.isEmpty(jsonCoolIvt)) throw new BadRequestException("冷却区不存在该满轴点位或空轴、满轴点位上有货！"); + if (ObjectUtil.isEmpty(jsonCoolIvt)) { + throw new BadRequestException("冷却区不存在该满轴点位或空轴、满轴点位上有货！"); + } //查询该点位是否存在任务 JSONObject task_jo = WQLObject.getWQLObject("sch_base_task").query("(point_code1 like '%"+jsonCoolIvt.getString("point_code")+"%' OR point_code2 like '%"+jsonCoolIvt.getString("point_code")+"%') AND is_delete = '0' AND task_status < '07'").uniqueResult(0); @@ -100,7 +104,9 @@ public class CoolInServiceImpl implements CoolInService { coolIvtTab.insert(jsonCool);*/ // 校验母卷号是否已存在 JSONObject json = coolIvtTab.query("container_name = '" + raw_jo.getString("container_name") + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)) throw new BadRequestException("冷却区中此母卷库存已存在"); + if (ObjectUtil.isNotEmpty(json)) { + throw new BadRequestException("冷却区中此母卷库存已存在"); + } //查询对应母卷信息 JSONObject mom_jo = WQLObject.getWQLObject("pdm_bi_rawfoilworkorder").query("container_name = '"+raw_jo.getString("container_name")+"'").uniqueResult(0); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/CoolOutServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/CoolOutServiceImpl.java index 48d93fc59..cde254bf7 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/CoolOutServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/CoolOutServiceImpl.java @@ -61,7 +61,9 @@ public class CoolOutServiceImpl // 查询终点在冷却区是否存在 JSONObject jsonCoolIvt = coolIvtTab.query("full_point_code = '" + point_code + "' and full_point_status = '02' and is_used = '1'").uniqueResult(0); - if (ObjectUtil.isEmpty(jsonCoolIvt)) throw new BadRequestException("点位："+point_code+"不符，请扫描冷却区满轴点位！"); + if (ObjectUtil.isEmpty(jsonCoolIvt)) { + throw new BadRequestException("点位："+point_code+"不符，请扫描冷却区满轴点位！"); + } // 更新点位状态 jsonCoolIvt.put("full_point_status", "01"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PdaCheckServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PdaCheckServiceImpl.java index effea862a..15de9e7f4 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PdaCheckServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PdaCheckServiceImpl.java @@ -41,11 +41,15 @@ public class PdaCheckServiceImpl implements PdaCheckService { JSONObject map = new JSONObject(); map.put("flag", "1"); map.put("stor_id",stor_id); - if (ObjectUtil.isNotEmpty(check_code)) map.put("check_code","%"+check_code+"%"); + if (ObjectUtil.isNotEmpty(check_code)) { + map.put("check_code","%"+check_code+"%"); + } //获取人员对应的仓库 UserStorServiceImpl userStorService = new UserStorServiceImpl(); String in_stor_id = userStorService.getInStor(); - if (ObjectUtil.isNotEmpty(in_stor_id)) map.put("in_stor_id",in_stor_id); + if (ObjectUtil.isNotEmpty(in_stor_id)) { + map.put("in_stor_id",in_stor_id); + } JSONArray resultJSONArray = WQL.getWO("PDA_CHECK").addParamMap(map).process().getResultJSONArray(0); @@ -65,7 +69,9 @@ public class PdaCheckServiceImpl implements PdaCheckService { JSONObject map = new JSONObject(); map.put("flag", "2"); map.put("check_code", whereJson.getString("check_code")); - if (ObjectUtil.isNotEmpty(box_no)) map.put("storagevehicle_code","%"+box_no+"%"); + if (ObjectUtil.isNotEmpty(box_no)) { + map.put("storagevehicle_code","%"+box_no+"%"); + } JSONObject jsonDtl = dtlTab.query("check_code = '" + whereJson.getString("check_code") + "' and storagevehicle_code = '" + box_no + "'").uniqueResult(0); if (ObjectUtil.isEmpty(jsonDtl)) { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PrintServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PrintServiceImpl.java index 121c70358..325d6c904 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PrintServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PrintServiceImpl.java @@ -104,9 +104,13 @@ public class PrintServiceImpl implements PrintService { // 根据客户条件选择对应模板 JSONObject jsonCust = custTab.query("cust_code = '" + box_jo.getString("customer_name") + "' and is_delete = '0' and is_used = '1'").uniqueResult(0); - if (ObjectUtil.isEmpty(jsonCust)) throw new BadRequestException("客户不存在或未启用"); + if (ObjectUtil.isEmpty(jsonCust)) { + throw new BadRequestException("客户不存在或未启用"); + } - if (ObjectUtil.isEmpty(jsonCust.getString("bz_print_no"))) throw new BadRequestException("请先设置客户打印模板"); + if (ObjectUtil.isEmpty(jsonCust.getString("bz_print_no"))) { + throw new BadRequestException("请先设置客户打印模板"); + } String bz_print_no = jsonCust.getString("bz_print_no"); double weight = 0; @@ -240,9 +244,13 @@ public class PrintServiceImpl implements PrintService { // 根据客户条件选择对应模板 JSONObject jsonCust = custTab.query("cust_code = '" + box_jo.getString("customer_name") + "' and is_delete = '0' and is_used = '1'").uniqueResult(0); - if (ObjectUtil.isEmpty(jsonCust)) throw new BadRequestException("客户不存在或未启用"); + if (ObjectUtil.isEmpty(jsonCust)) { + throw new BadRequestException("客户不存在或未启用"); + } - if (ObjectUtil.isEmpty(jsonCust.getString("bz_print_no"))) throw new BadRequestException("请先设置客户打印模板"); + if (ObjectUtil.isEmpty(jsonCust.getString("bz_print_no"))) { + throw new BadRequestException("请先设置客户打印模板"); + } String bz_print_no = jsonCust.getString("bz_print_no"); double weight = 0; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductInstorServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductInstorServiceImpl.java index b0a01bf09..5f1b2b775 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductInstorServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductInstorServiceImpl.java @@ -197,7 +197,9 @@ public class ProductInstorServiceImpl implements ProductInstorService { //判断是否虚拟 if (!is_virtual.equals("1")) { - if (sub_jo.getString("ext_code").equals("BC01")) throw new BadRequestException("二期仓库木箱，请进行虚拟入库!"); + if (sub_jo.getString("ext_code").equals("BC01")) { + throw new BadRequestException("二期仓库木箱，请进行虚拟入库!"); + } //判断是该包装计划是否存在长宽高 Double box_length = sub_jo.getDoubleValue("box_length"); @@ -223,11 +225,11 @@ public class ProductInstorServiceImpl implements ProductInstorService { throw new BadRequestException("无法入立体库,木箱超长;当前木箱长度为："+box_length); } - if (!(box_width <= box_with_up)) { + if (box_width > box_with_up) { throw new BadRequestException("无法入立体库,木箱超宽;当前木箱宽度为："+box_width); } - if (!(box_high <= box_high_up)) { + if (box_high > box_high_up) { throw new BadRequestException("无法入立体库,木箱超高;当前木箱高度为："+box_high); } @@ -353,7 +355,9 @@ public class ProductInstorServiceImpl implements ProductInstorService { @Transactional(rollbackFor = Exception.class) public JSONObject mendCode(JSONObject whereJson) { String vehicle_code = whereJson.getString("box_no"); - if (ObjectUtil.isEmpty(vehicle_code)) throw new BadRequestException("木箱号不能为空"); + if (ObjectUtil.isEmpty(vehicle_code)) { + throw new BadRequestException("木箱号不能为空"); + } JSONObject param = new JSONObject(); param.put("vehicle_code", vehicle_code); @@ -462,7 +466,9 @@ public class ProductInstorServiceImpl implements ProductInstorService { // 查询对应任务 JSONObject json = WQL.getWO("PDA_ST_01").addParamMap(map).process().uniqueResult(0); - if (ObjectUtil.isEmpty(json)) throw new BadRequestException("木箱不存在或任务不存在!"); + if (ObjectUtil.isEmpty(json)) { + throw new BadRequestException("木箱不存在或任务不存在!"); + } //查询对应的包装关系，如果为需要解绑删除的则删除包装关系 JSONArray sub_rows = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("package_box_sn = '"+vehicle_code+"'").getResultJSONArray(0); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductionOutServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductionOutServiceImpl.java index 7bb342171..33c6faf6b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductionOutServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductionOutServiceImpl.java @@ -33,8 +33,12 @@ public class ProductionOutServiceImpl implements ProductionOutService { JSONObject map = new JSONObject(); map.put("flag", "1"); - if (ObjectUtil.isNotEmpty(box_no)) map.put("box_no","%"+box_no+"%"); - if (ObjectUtil.isNotEmpty(bill_code)) map.put("bill_code","%"+bill_code+"%"); + if (ObjectUtil.isNotEmpty(box_no)) { + map.put("box_no","%"+box_no+"%"); + } + if (ObjectUtil.isNotEmpty(bill_code)) { + map.put("bill_code","%"+bill_code+"%"); + } JSONArray resultJSONArray = WQL.getWO("PDA_PRODUVTIONOUT").addParamMap(map).process().getResultJSONArray(0); @@ -51,7 +55,9 @@ public class ProductionOutServiceImpl implements ProductionOutService { WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); // 点位表 String box_no = whereJson.getString("box_no"); - if (ObjectUtil.isEmpty(box_no)) throw new BadRequestException("木箱不能为空"); + if (ObjectUtil.isEmpty(box_no)) { + throw new BadRequestException("木箱不能为空"); + } JSONObject jsonPoint = pointTab.query("vehicle_code = '" + box_no + "' and is_delete = '0' and is_used = '1' and point_type = '9'").uniqueResult(0); @@ -109,7 +115,9 @@ public class ProductionOutServiceImpl implements ProductionOutService { JSONObject map = new JSONObject(); map.put("flag", "2"); map.put("bill_code", bill_code); - if (ObjectUtil.isNotEmpty(box_no)) map.put("box_no","%"+box_no+"%"); + if (ObjectUtil.isNotEmpty(box_no)) { + map.put("box_no","%"+box_no+"%"); + } JSONArray resultJSONArray = WQL.getWO("PDA_PRODUVTIONOUT").addParamMap(map).process().getResultJSONArray(0); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/VirtualOutServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/VirtualOutServiceImpl.java index 3ddb6028a..cb77c7c1f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/VirtualOutServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/VirtualOutServiceImpl.java @@ -45,7 +45,9 @@ public class VirtualOutServiceImpl implements VirtualOutService { //获取人员对应的仓库 UserStorServiceImpl userStorService = new UserStorServiceImpl(); String in_stor_id = userStorService.getInStor(); - if (ObjectUtil.isNotEmpty(in_stor_id)) map.put("in_stor_id",in_stor_id); + if (ObjectUtil.isNotEmpty(in_stor_id)) { + map.put("in_stor_id",in_stor_id); + } JSONArray resultJSONArray = WQL.getWO("PDA_VIRTUALOUT").addParamMap(map).process().getResultJSONArray(0); @@ -114,7 +116,9 @@ public class VirtualOutServiceImpl implements VirtualOutService { JSONArray box_rows = whereJson.getJSONArray("box_rows"); String box_no = whereJson.getString("box_no"); - if (ObjectUtil.isEmpty(box_no)) throw new BadRequestException("木箱不能为空"); + if (ObjectUtil.isEmpty(box_no)) { + throw new BadRequestException("木箱不能为空"); + } /* for (int i = 0; i < box_rows.size(); i++) { @@ -127,7 +131,9 @@ public class VirtualOutServiceImpl implements VirtualOutService { // 传单据号 JSONArray disArr = WQL.getWO("PDA_ST_01").addParam("flag", "7").addParam("box_no", box_no).process().getResultJSONArray(0); - if (ObjectUtil.isEmpty(disArr)) throw new BadRequestException("木箱码无效"); + if (ObjectUtil.isEmpty(disArr)) { + throw new BadRequestException("木箱码无效"); + } for (int i = 0; i < disArr.size(); i++) { JSONObject jsonDis = disArr.getJSONObject(i); // 更新状态为完成 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/task/service/impl/PdaTaskServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/task/service/impl/PdaTaskServiceImpl.java index 575e0baab..22cb2b415 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/task/service/impl/PdaTaskServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/task/service/impl/PdaTaskServiceImpl.java @@ -41,7 +41,9 @@ public class PdaTaskServiceImpl implements PdaTaskService { JSONObject map = new JSONObject(); map.put("flag", "1"); - if (ObjectUtil.isNotEmpty(search)) map.put("search", "%" + search + "%"); + if (ObjectUtil.isNotEmpty(search)) { + map.put("search", "%" + search + "%"); + } //获取人员对应的区域 UserAreaServiceImpl userAreaService = new UserAreaServiceImpl(); String in_area_id = userAreaService.getInArea(); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/service/impl/SubpackagerelationServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/service/impl/SubpackagerelationServiceImpl.java index 86d4d8063..c4f108305 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/service/impl/SubpackagerelationServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/service/impl/SubpackagerelationServiceImpl.java @@ -66,15 +66,31 @@ public class SubpackagerelationServiceImpl implements SubpackagerelationService JSONObject map = new JSONObject(); map.put("flag", "1"); - if (ObjectUtil.isNotEmpty(material_code)) map.put("material_code","%"+material_code+"%"); - if (ObjectUtil.isNotEmpty(package_box_sn)) map.put("package_box_sn","%"+package_box_sn+"%"); - if (ObjectUtil.isNotEmpty(material_name)) map.put("material_name","%"+material_name+"%"); - if (ObjectUtil.isNotEmpty(sale_order_name)) map.put("sale_order_name","%"+sale_order_name+"%"); - if (ObjectUtil.isNotEmpty(customer_name)) map.put("customer_name","%"+customer_name+"%"); - if (ObjectUtil.isNotEmpty(customer_description)) map.put("customer_description","%"+customer_description+"%"); + if (ObjectUtil.isNotEmpty(material_code)) { + map.put("material_code","%"+material_code+"%"); + } + if (ObjectUtil.isNotEmpty(package_box_sn)) { + map.put("package_box_sn","%"+package_box_sn+"%"); + } + if (ObjectUtil.isNotEmpty(material_name)) { + map.put("material_name","%"+material_name+"%"); + } + if (ObjectUtil.isNotEmpty(sale_order_name)) { + map.put("sale_order_name","%"+sale_order_name+"%"); + } + if (ObjectUtil.isNotEmpty(customer_name)) { + map.put("customer_name","%"+customer_name+"%"); + } + if (ObjectUtil.isNotEmpty(customer_description)) { + map.put("customer_description","%"+customer_description+"%"); + } - if (ObjectUtil.isNotEmpty(container_name)) map.put("container_name","%"+container_name+"%"); - if (ObjectUtil.isNotEmpty(sap_pcsn)) map.put("sap_pcsn","%"+sap_pcsn+"%"); + if (ObjectUtil.isNotEmpty(container_name)) { + map.put("container_name","%"+container_name+"%"); + } + if (ObjectUtil.isNotEmpty(sap_pcsn)) { + map.put("sap_pcsn","%"+sap_pcsn+"%"); + } map.put("is_un_plan_production",is_un_plan_production); map.put("date_of_production",date_of_production); map.put("date_of_FG_inbound",date_of_FG_inbound); @@ -89,7 +105,9 @@ public class SubpackagerelationServiceImpl implements SubpackagerelationService public List queryAll(Map whereJson){ WQLObject wo = WQLObject.getWQLObject("pdm_bi_subpackagerelation"); JSONArray arr = wo.query().getResultJSONArray(0); - if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(SubpackagerelationDto.class); + if (ObjectUtil.isNotEmpty(arr)) { + return arr.toJavaList(SubpackagerelationDto.class); + } return null; } @@ -134,7 +152,9 @@ public class SubpackagerelationServiceImpl implements SubpackagerelationService @Transactional(rollbackFor = Exception.class) public void update(SubpackagerelationDto dto) { SubpackagerelationDto entity = this.findById(dto.getWorkorder_id()); - if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); + if (entity == null) { + throw new BadRequestException("被删除或无权限，操作失败!"); + } WQLObject wo = WQLObject.getWQLObject("pdm_bi_subpackagerelation"); JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); //判断包装关系状态，只能修改状态为生成的 @@ -185,15 +205,31 @@ public class SubpackagerelationServiceImpl implements SubpackagerelationService JSONObject map = new JSONObject(); map.put("flag", "1"); - if (ObjectUtil.isNotEmpty(material_code)) map.put("material_code","%"+material_code+"%"); - if (ObjectUtil.isNotEmpty(package_box_sn)) map.put("package_box_sn","%"+package_box_sn+"%"); - if (ObjectUtil.isNotEmpty(material_name)) map.put("material_name","%"+material_name+"%"); - if (ObjectUtil.isNotEmpty(sale_order_name)) map.put("sale_order_name","%"+sale_order_name+"%"); - if (ObjectUtil.isNotEmpty(customer_name)) map.put("customer_name","%"+customer_name+"%"); - if (ObjectUtil.isNotEmpty(customer_description)) map.put("customer_description","%"+customer_description+"%"); + if (ObjectUtil.isNotEmpty(material_code)) { + map.put("material_code","%"+material_code+"%"); + } + if (ObjectUtil.isNotEmpty(package_box_sn)) { + map.put("package_box_sn","%"+package_box_sn+"%"); + } + if (ObjectUtil.isNotEmpty(material_name)) { + map.put("material_name","%"+material_name+"%"); + } + if (ObjectUtil.isNotEmpty(sale_order_name)) { + map.put("sale_order_name","%"+sale_order_name+"%"); + } + if (ObjectUtil.isNotEmpty(customer_name)) { + map.put("customer_name","%"+customer_name+"%"); + } + if (ObjectUtil.isNotEmpty(customer_description)) { + map.put("customer_description","%"+customer_description+"%"); + } - if (ObjectUtil.isNotEmpty(container_name)) map.put("container_name","%"+container_name+"%"); - if (ObjectUtil.isNotEmpty(sap_pcsn)) map.put("sap_pcsn","%"+sap_pcsn+"%"); + if (ObjectUtil.isNotEmpty(container_name)) { + map.put("container_name","%"+container_name+"%"); + } + if (ObjectUtil.isNotEmpty(sap_pcsn)) { + map.put("sap_pcsn","%"+sap_pcsn+"%"); + } map.put("is_un_plan_production",is_un_plan_production); map.put("date_of_production",date_of_production); map.put("date_of_FG_inbound",date_of_FG_inbound); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/CoolPointIvtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/CoolPointIvtServiceImpl.java index 9b7f6a303..49c501614 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/CoolPointIvtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/CoolPointIvtServiceImpl.java @@ -49,10 +49,12 @@ public class CoolPointIvtServiceImpl implements CoolPointIvtService { String in_area_id = userAreaService.getInArea(); HashMap map = new HashMap(); map.put("flag", "1"); - if (whereJson.get("point_code")!=null) + if (whereJson.get("point_code")!=null) { map.put("point_code", "%" + whereJson.get("point_code") + "%"); - if (whereJson.get("container_name")!=null) + } + if (whereJson.get("container_name")!=null) { map.put("container_name", "%" + whereJson.get("container_name") + "%"); + } map.put("full_point_status", whereJson.get("full_point_status")); map.put("empty_point_status", whereJson.get("empty_point_status")); map.put("cool_ivt_status", whereJson.get("cool_ivt_status")); @@ -61,7 +63,9 @@ public class CoolPointIvtServiceImpl implements CoolPointIvtService { map.put("begin_time", whereJson.get("begin_time")); map.put("end_time", whereJson.get("end_time")); map.put("point_location",whereJson.get("point_location")); - if (ObjectUtil.isNotEmpty(in_area_id)) map.put("in_area_id", in_area_id); + if (ObjectUtil.isNotEmpty(in_area_id)) { + map.put("in_area_id", in_area_id); + } JSONObject json = WQL.getWO("ST_IVT_COOLPOINTIVT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "product_area,point_code"); return json; } @@ -70,7 +74,9 @@ public class CoolPointIvtServiceImpl implements CoolPointIvtService { public List queryAll(Map whereJson){ WQLObject wo = WQLObject.getWQLObject("st_ivt_coolpointivt"); JSONArray arr = wo.query().getResultJSONArray(0); - if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(CoolPointIvtDto.class); + if (ObjectUtil.isNotEmpty(arr)) { + return arr.toJavaList(CoolPointIvtDto.class); + } return null; } @@ -118,7 +124,9 @@ public class CoolPointIvtServiceImpl implements CoolPointIvtService { @Transactional(rollbackFor = Exception.class) public void update(CoolPointIvtDto dto) { CoolPointIvtDto entity = this.findById(dto.getIvt_id()); - if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); + if (entity == null) { + throw new BadRequestException("被删除或无权限，操作失败!"); + } String currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); @@ -170,10 +178,18 @@ public class CoolPointIvtServiceImpl implements CoolPointIvtService { map.put("flag", "2"); map.put("begin_time", whereJson.get("begin_time")); map.put("end_time", whereJson.get("end_time")); - if (ObjectUtil.isNotEmpty(start_point_code)) map.put("start_point_code","%"+start_point_code+"%"); - if (ObjectUtil.isNotEmpty(end_point_code)) map.put("end_point_code","%"+end_point_code+"%"); - if (ObjectUtil.isNotEmpty(pcsn)) map.put("pcsn","%"+pcsn+"%"); - if (ObjectUtil.isNotEmpty(vehicle_code)) map.put("vehicle_code","%"+vehicle_code+"%"); + if (ObjectUtil.isNotEmpty(start_point_code)) { + map.put("start_point_code","%"+start_point_code+"%"); + } + if (ObjectUtil.isNotEmpty(end_point_code)) { + map.put("end_point_code","%"+end_point_code+"%"); + } + if (ObjectUtil.isNotEmpty(pcsn)) { + map.put("pcsn","%"+pcsn+"%"); + } + if (ObjectUtil.isNotEmpty(vehicle_code)) { + map.put("vehicle_code","%"+vehicle_code+"%"); + } JSONObject json = WQL.getWO("ST_IVT_COOLPOINTIVT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "update_time desc"); return json; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/CutPointIvtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/CutPointIvtServiceImpl.java index b1be37324..eafa4cfe9 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/CutPointIvtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/CutPointIvtServiceImpl.java @@ -50,7 +50,9 @@ public Map queryAll(Map whereJson, Pageable page){ map.put("empty_point_status", whereJson.get("empty_point_status")); map.put("product_area", whereJson.get("product_area")); map.put("is_used", whereJson.get("is_used")); - if (ObjectUtil.isNotEmpty(in_area_id)) map.put("in_area_id", in_area_id); + if (ObjectUtil.isNotEmpty(in_area_id)) { + map.put("in_area_id", in_area_id); + } JSONObject json = WQL.getWO("ST_IVT_CUTPOINTIVT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "product_area,point_code"); return json; } @@ -59,7 +61,9 @@ public Map queryAll(Map whereJson, Pageable page){ public List queryAll(Map whereJson){ WQLObject wo = WQLObject.getWQLObject("st_ivt_cutpointivt"); JSONArray arr = wo.query().getResultJSONArray(0); - if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(CutPointIvtDto.class); + if (ObjectUtil.isNotEmpty(arr)) { + return arr.toJavaList(CutPointIvtDto.class); + } return null; } @@ -107,7 +111,9 @@ public List queryAll(Map whereJson){ @Transactional(rollbackFor = Exception.class) public void update(CutPointIvtDto dto) { CutPointIvtDto entity = this.findById(dto.getIvt_id()); - if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); + if (entity == null) { + throw new BadRequestException("被删除或无权限，操作失败!"); + } String currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/DeliveryPointIvtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/DeliveryPointIvtServiceImpl.java index 22e320758..e4dc88bc7 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/DeliveryPointIvtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/DeliveryPointIvtServiceImpl.java @@ -42,12 +42,15 @@ public Map queryAll(Map whereJson, Pageable page){ String in_area_id = userAreaService.getInArea(); JSONObject map = new JSONObject(); map.put("flag", "1"); - if (!ObjectUtil.isNull(whereJson.get("point_code"))) + if (!ObjectUtil.isNull(whereJson.get("point_code"))) { map.put("point_code", "%" + whereJson.get("point_code") + "%"); + } map.put("product_area", whereJson.get("product_area")); map.put("point_status", whereJson.get("point_status")); map.put("is_used", whereJson.get("is_used")); - if (ObjectUtil.isNotEmpty(in_area_id)) map.put("in_area_id", in_area_id); + if (ObjectUtil.isNotEmpty(in_area_id)) { + map.put("in_area_id", in_area_id); + } JSONObject json = WQL.getWO("ST_IVT_DELIVERYPOINTIVT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "product_area,point_code"); return json; } @@ -56,7 +59,9 @@ public Map queryAll(Map whereJson, Pageable page){ public List queryAll(Map whereJson){ WQLObject wo = WQLObject.getWQLObject("st_ivt_deliverypointivt"); JSONArray arr = wo.query().getResultJSONArray(0); - if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(DeliveryPointIvtDto.class); + if (ObjectUtil.isNotEmpty(arr)) { + return arr.toJavaList(DeliveryPointIvtDto.class); + } return null; } @@ -104,7 +109,9 @@ public List queryAll(Map whereJson){ @Transactional(rollbackFor = Exception.class) public void update(DeliveryPointIvtDto dto) { DeliveryPointIvtDto entity = this.findById(dto.getIvt_id()); - if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); + if (entity == null) { + throw new BadRequestException("被删除或无权限，操作失败!"); + } String currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/HotPointIvtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/HotPointIvtServiceImpl.java index 7e2bab5be..32afdb5b4 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/HotPointIvtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/HotPointIvtServiceImpl.java @@ -62,7 +62,9 @@ public class HotPointIvtServiceImpl implements HotPointIvtService { map.put("end_time", whereJson.get("end_time")); map.put("point_location", whereJson.get("point_location")); - if (ObjectUtil.isNotEmpty(in_area_id)) map.put("in_area_id", in_area_id); + if (ObjectUtil.isNotEmpty(in_area_id)) { + map.put("in_area_id", in_area_id); + } JSONObject json = WQL.getWO("ST_IVT_HOTPOINTIVT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "product_area,point_code"); JSONArray rows = json.getJSONArray("content"); JSONArray new_rows = new JSONArray(); @@ -82,7 +84,9 @@ public class HotPointIvtServiceImpl implements HotPointIvtService { public List queryAll(Map whereJson) { WQLObject wo = WQLObject.getWQLObject("st_ivt_hotpointivt"); JSONArray arr = wo.query().getResultJSONArray(0); - if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(HotPointIvtDto.class); + if (ObjectUtil.isNotEmpty(arr)) { + return arr.toJavaList(HotPointIvtDto.class); + } return null; } @@ -130,7 +134,9 @@ public class HotPointIvtServiceImpl implements HotPointIvtService { @Transactional(rollbackFor = Exception.class) public void update(HotPointIvtDto dto) { HotPointIvtDto entity = this.findById(dto.getIvt_id()); - if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); + if (entity == null) { + throw new BadRequestException("被删除或无权限，操作失败!"); + } String currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); @@ -224,9 +230,15 @@ public class HotPointIvtServiceImpl implements HotPointIvtService { map.put("begin_time", whereJson.get("begin_time")); map.put("end_time", whereJson.get("end_time")); map.put("container_name", container_name); - if (ObjectUtil.isNotEmpty(task_code)) map.put("task_code", "%" + task_code + "%"); - if (ObjectUtil.isNotEmpty(start_point_code)) map.put("start_point_code", "%" + start_point_code + "%"); - if (ObjectUtil.isNotEmpty(next_point_code)) map.put("next_point_code", "%" + next_point_code + "%"); + if (ObjectUtil.isNotEmpty(task_code)) { + map.put("task_code", "%" + task_code + "%"); + } + if (ObjectUtil.isNotEmpty(start_point_code)) { + map.put("start_point_code", "%" + start_point_code + "%"); + } + if (ObjectUtil.isNotEmpty(next_point_code)) { + map.put("next_point_code", "%" + next_point_code + "%"); + } JSONObject json = WQL.getWO("ST_IVT_HOTPOINTIVT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "create_time DESC"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/SbPointIvtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/SbPointIvtServiceImpl.java index 4a350aa51..77ee29ddc 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/SbPointIvtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/SbPointIvtServiceImpl.java @@ -42,12 +42,15 @@ public class SbPointIvtServiceImpl implements SbPointIvtService { String in_area_id = userAreaService.getInArea(); JSONObject map = new JSONObject(); map.put("flag", "1"); - if (!ObjectUtil.isNull(whereJson.get("point_code"))) + if (!ObjectUtil.isNull(whereJson.get("point_code"))) { map.put("point_code", "%" + whereJson.get("point_code") + "%"); + } map.put("product_area", whereJson.get("product_area")); map.put("is_used", whereJson.get("is_used")); map.put("mes_used", whereJson.get("mes_used")); - if (ObjectUtil.isNotEmpty(in_area_id)) map.put("in_area_id", in_area_id); + if (ObjectUtil.isNotEmpty(in_area_id)) { + map.put("in_area_id", in_area_id); + } JSONObject json = WQL.getWO("ST_IVT_SBPOINTIVT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "product_area,point_code"); return json; } @@ -56,7 +59,9 @@ public class SbPointIvtServiceImpl implements SbPointIvtService { public List queryAll(Map whereJson){ WQLObject wo = WQLObject.getWQLObject("st_ivt_sbpointivt"); JSONArray arr = wo.query().getResultJSONArray(0); - if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(SbPointIvtDto.class); + if (ObjectUtil.isNotEmpty(arr)) { + return arr.toJavaList(SbPointIvtDto.class); + } return null; } @@ -104,7 +109,9 @@ public class SbPointIvtServiceImpl implements SbPointIvtService { @Transactional(rollbackFor = Exception.class) public void update(SbPointIvtDto dto) { SbPointIvtDto entity = this.findById(dto.getPoint_id()); - if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); + if (entity == null) { + throw new BadRequestException("被删除或无权限，操作失败!"); + } String currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/RawfoilworkorderServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/RawfoilworkorderServiceImpl.java index 2adf3ac17..2d296a4ca 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/RawfoilworkorderServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/RawfoilworkorderServiceImpl.java @@ -55,13 +55,19 @@ public class RawfoilworkorderServiceImpl implements RawfoilworkorderService { JSONObject map = new JSONObject(); map.put("flag", "1"); - if (ObjectUtil.isNotEmpty(resource_name)) map.put("resource_name","%"+resource_name+"%"); - if (ObjectUtil.isNotEmpty(container_name)) map.put("container_name","%"+container_name+"%"); + if (ObjectUtil.isNotEmpty(resource_name)) { + map.put("resource_name","%"+resource_name+"%"); + } + if (ObjectUtil.isNotEmpty(container_name)) { + map.put("container_name","%"+container_name+"%"); + } map.put("begin_time",begin_time); map.put("end_time",end_time); map.put("product_area",product_area); map.put("status",status); - if (ObjectUtil.isNotEmpty(in_area_id)) map.put("in_area_id", in_area_id); + if (ObjectUtil.isNotEmpty(in_area_id)) { + map.put("in_area_id", in_area_id); + } JSONObject json = WQL.getWO("PDM_BI_RAWFOILWORKORDER_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "der.container_name"); return json; @@ -71,7 +77,9 @@ public class RawfoilworkorderServiceImpl implements RawfoilworkorderService { public List queryAll(Map whereJson) { WQLObject wo = WQLObject.getWQLObject("pdm_bi_rawfoilworkorder"); JSONArray arr = wo.query().getResultJSONArray(0); - if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(RawfoilworkorderDto.class); + if (ObjectUtil.isNotEmpty(arr)) { + return arr.toJavaList(RawfoilworkorderDto.class); + } return null; } @@ -104,17 +112,23 @@ public class RawfoilworkorderServiceImpl implements RawfoilworkorderService { String container_name = dto.getContainer_name(); JSONObject json = wo.query("container_name = '" + container_name + "' and status <> '09'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)) throw new BadRequestException("母卷号已存在"); + if (ObjectUtil.isNotEmpty(json)) { + throw new BadRequestException("母卷号已存在"); + } String currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); String now = DateUtil.now(); JSONObject jsonPoint = pointTab.query("ext_code ='" + dto.getResource_name() + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(jsonPoint)) throw new BadRequestException("点位设备不存在"); + if (ObjectUtil.isEmpty(jsonPoint)) { + throw new BadRequestException("点位设备不存在"); + } JSONObject josnMater = materTab.query("material_code ='" + dto.getProduct_name() + "' and is_delete = '0' and is_used = '1'").uniqueResult(0); - if (ObjectUtil.isEmpty(josnMater)) throw new BadRequestException("物料不存在"); + if (ObjectUtil.isEmpty(josnMater)) { + throw new BadRequestException("物料不存在"); + } dto.setWorkorder_id(IdUtil.getSnowflake(1, 1).nextId()); @@ -137,7 +151,9 @@ public class RawfoilworkorderServiceImpl implements RawfoilworkorderService { @Transactional(rollbackFor = Exception.class) public void update(RawfoilworkorderDto dto) { RawfoilworkorderDto entity = this.findById(dto.getWorkorder_id()); - if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); + if (entity == null) { + throw new BadRequestException("被删除或无权限，操作失败!"); + } WQLObject pointTab = WQLObject.getWQLObject("ST_IVT_SbPointIvt"); WQLObject wo = WQLObject.getWQLObject("pdm_bi_rawfoilworkorder"); @@ -150,10 +166,14 @@ public class RawfoilworkorderServiceImpl implements RawfoilworkorderService { String now = DateUtil.now(); JSONObject jsonPoint = pointTab.query("ext_code ='" + dto.getResource_name() + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(jsonPoint)) throw new BadRequestException("点位设备不存在"); + if (ObjectUtil.isEmpty(jsonPoint)) { + throw new BadRequestException("点位设备不存在"); + } JSONObject josnMater = materTab.query("material_code ='" + dto.getProduct_name() + "' and is_delete = '0' and is_used = '1'").uniqueResult(0); - if (ObjectUtil.isEmpty(josnMater)) throw new BadRequestException("物料不存在"); + if (ObjectUtil.isEmpty(josnMater)) { + throw new BadRequestException("物料不存在"); + } dto.setUpdate_time(now); @@ -166,7 +186,9 @@ public class RawfoilworkorderServiceImpl implements RawfoilworkorderService { wo.update(json); JSONArray resultJSONArray = wo.query("container_name = '" + container_name + "' and status <> '09'").getResultJSONArray(0); - if (resultJSONArray.size() > 1) throw new BadRequestException("母卷号已存在"); + if (resultJSONArray.size() > 1) { + throw new BadRequestException("母卷号已存在"); + } } @Override diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/SlittingproductionplanServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/SlittingproductionplanServiceImpl.java index 8f55b2433..da4545bd1 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/SlittingproductionplanServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/SlittingproductionplanServiceImpl.java @@ -75,11 +75,21 @@ public class SlittingproductionplanServiceImpl implements Slittingproductionplan map.put("is_child_tz_ok", is_child_tz_ok); map.put("is_child_ps_ok", is_child_ps_ok); map.put("is_call", is_call); - if (ObjectUtil.isNotEmpty(resource_name)) map.put("resource_name","%"+resource_name+"%"); - if (ObjectUtil.isNotEmpty(parent_container_name)) map.put("parent_container_name","%"+parent_container_name+"%"); - if (ObjectUtil.isNotEmpty(container_name)) map.put("container_name","%"+container_name+"%"); - if (ObjectUtil.isNotEmpty(qzzno)) map.put("qzzno","%"+qzzno+"%"); - if (ObjectUtil.isNotEmpty(in_area_id)) map.put("in_area_id", in_area_id); + if (ObjectUtil.isNotEmpty(resource_name)) { + map.put("resource_name","%"+resource_name+"%"); + } + if (ObjectUtil.isNotEmpty(parent_container_name)) { + map.put("parent_container_name","%"+parent_container_name+"%"); + } + if (ObjectUtil.isNotEmpty(container_name)) { + map.put("container_name","%"+container_name+"%"); + } + if (ObjectUtil.isNotEmpty(qzzno)) { + map.put("qzzno","%"+qzzno+"%"); + } + if (ObjectUtil.isNotEmpty(in_area_id)) { + map.put("in_area_id", in_area_id); + } JSONObject json = WQL.getWO("PDM_BI_SLIDTTINGPLAN_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "LEFT(plan.start_time,10) DESC, container_name desc, split_group"); return json; @@ -89,7 +99,9 @@ public class SlittingproductionplanServiceImpl implements Slittingproductionplan public List queryAll(Map whereJson) { WQLObject wo = WQLObject.getWQLObject("pdm_bi_slittingproductionplan"); JSONArray arr = wo.query().getResultJSONArray(0); - if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(SlittingproductionplanDto.class); + if (ObjectUtil.isNotEmpty(arr)) { + return arr.toJavaList(SlittingproductionplanDto.class); + } return null; } @@ -142,7 +154,9 @@ public class SlittingproductionplanServiceImpl implements Slittingproductionplan @Transactional(rollbackFor = Exception.class) public void update(SlittingproductionplanDto dto) { SlittingproductionplanDto entity = this.findById(dto.getWorkorder_id()); - if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); + if (entity == null) { + throw new BadRequestException("被删除或无权限，操作失败!"); + } String currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsTaskDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsTaskDto.java index ad07f191e..ab186e740 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsTaskDto.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsTaskDto.java @@ -6,44 +6,95 @@ import lombok.Data; @Data @Builder public class AcsTaskDto { - //任务标识 + /** + * 任务标识 + */ private String ext_task_id; - //任务编码 + /** + * 任务编码 + */ private String task_code; - //取货点1 + /** + * 取货点1 + */ private String start_device_code; - //放货点1 + /** + * 放货点1 + */ private String next_device_code; - //取货点2 + /** + * 取货点2 + */ private String start_device_code2; - //放货点2 + /** + * 放货点2 + */ private String next_device_code2; - //烘箱放货点 + /** + * 烘箱放货点 + */ private String put_device_code; - //优先级 + /** + * 优先级 + */ private String priority; - //载具号 + /** + * 载具号 + */ private String vehicle_code; - //任务类型 + /** + * 任务类型 + */ private String task_type; - //Agv系统类型 + /** + * Agv系统类型 + */ private String agv_system_type; - //备注 + /** + * 备注 + */ private String remark; - //扩展参数 + /** + * 扩展参数 + */ private String params; - //温度 + /** + * 温度 + */ private String temperature; - //烘烤时间 + /** + * 烘烤时间 + */ private String oven_time; - //密集库明细类型 + /** + * 密集库明细类型 + */ private String dtl_type; - //发货区起点高度 + /** + * 发货区起点高度 + */ private String start_height; - //发货区终点高度 + /** + * 发货区终点高度 + */ private String next_height; - //LMS任务类型 + /** + * LMS任务类型 + */ private String class_type; - //生产区域 + /** + * 生产区域 + */ private String product_area; -} + /** + * 纸管数组 + */ + private String paper_array; + /** + * 桁架任务类型 + */ + private String truss_type; + /** + * 气涨轴版本 + */ + private String version;} \ No newline at end of file diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryProudDayData.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryProudDayData.java index 2d187f54f..e76595b6f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryProudDayData.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryProudDayData.java @@ -471,13 +471,23 @@ public class AutoQueryProudDayData { case "A2": result.put("Areaqty2", num); break; case "A3": result.put("Areaqty3", num); break; case "A4": result.put("Areaqty4", num); break; + default: + break; } } - if (ObjectUtil.isEmpty(result.getString("Areaqty1"))) result.put("Areaqty1","0"); - if (ObjectUtil.isEmpty(result.getString("Areaqty2"))) result.put("Areaqty2","0"); - if (ObjectUtil.isEmpty(result.getString("Areaqty3"))) result.put("Areaqty3","0"); - if (ObjectUtil.isEmpty(result.getString("Areaqty4"))) result.put("Areaqty4","0"); + if (ObjectUtil.isEmpty(result.getString("Areaqty1"))) { + result.put("Areaqty1","0"); + } + if (ObjectUtil.isEmpty(result.getString("Areaqty2"))) { + result.put("Areaqty2","0"); + } + if (ObjectUtil.isEmpty(result.getString("Areaqty3"))) { + result.put("Areaqty3","0"); + } + if (ObjectUtil.isEmpty(result.getString("Areaqty4"))) { + result.put("Areaqty4","0"); + } return result; } @@ -519,13 +529,23 @@ public class AutoQueryProudDayData { case "A2": result.put("Areaqty2", num); break; case "A3": result.put("Areaqty3", num); break; case "A4": result.put("Areaqty4", num); break; + default: + break; } } - if (ObjectUtil.isEmpty(result.getString("Areaqty1"))) result.put("Areaqty1","0"); - if (ObjectUtil.isEmpty(result.getString("Areaqty2"))) result.put("Areaqty2","0"); - if (ObjectUtil.isEmpty(result.getString("Areaqty3"))) result.put("Areaqty3","0"); - if (ObjectUtil.isEmpty(result.getString("Areaqty4"))) result.put("Areaqty4","0"); + if (ObjectUtil.isEmpty(result.getString("Areaqty1"))) { + result.put("Areaqty1","0"); + } + if (ObjectUtil.isEmpty(result.getString("Areaqty2"))) { + result.put("Areaqty2","0"); + } + if (ObjectUtil.isEmpty(result.getString("Areaqty3"))) { + result.put("Areaqty3","0"); + } + if (ObjectUtil.isEmpty(result.getString("Areaqty4"))) { + result.put("Areaqty4","0"); + } return result; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java index 49719f43a..bafb8052d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java @@ -289,8 +289,11 @@ public class PointServiceImpl implements PointService { String used = jsonObject.getString("used"); for (int i = 0; i < data.size(); i++) { JSONObject object = data.getJSONObject(i); - if (used.equals("1")) object.put("is_used", 1); - else object.put("is_used", 0); + if (used.equals("1")) { + object.put("is_used", 1); + } else { + object.put("is_used", 0); + } wo.update(object); } } @@ -307,8 +310,11 @@ public class PointServiceImpl implements PointService { String lock = jsonObject.getString("lock_type"); for (int i = 0; i < data.size(); i++) { JSONObject object = data.getJSONObject(i); - if (lock.equals("1")) object.put("lock_type", 1); - else object.put("lock_type", 2); + if (lock.equals("1")) { + object.put("lock_type", 1); + } else { + object.put("lock_type", 2); + } wo.update(object); } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/RegionServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/RegionServiceImpl.java index e02629382..f5d1000df 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/RegionServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/RegionServiceImpl.java @@ -42,7 +42,9 @@ public class RegionServiceImpl implements RegionService { HashMap map = new HashMap<>(); map.put("flag", "1"); - if (ObjectUtil.isNotEmpty(region_code)) map.put("region_code",region_code+"%"); + if (ObjectUtil.isNotEmpty(region_code)) { + map.put("region_code",region_code+"%"); + } JSONObject json = WQL.getWO("QSCH_REGION_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "region.region_code ASC"); return json; @@ -52,7 +54,9 @@ public class RegionServiceImpl implements RegionService { public List queryAll(Map whereJson) { WQLObject wo = WQLObject.getWQLObject("sch_base_region"); JSONArray arr = wo.query().getResultJSONArray(0); - if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(RegionDto.class); + if (ObjectUtil.isNotEmpty(arr)) { + return arr.toJavaList(RegionDto.class); + } return null; } @@ -86,7 +90,9 @@ public class RegionServiceImpl implements RegionService { String now = DateUtil.now(); JSONObject jsonDto = wo.query("region_code = '" + dto.getRegion_code() + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(jsonDto)) throw new BadRequestException("编码已存在"); + if (ObjectUtil.isNotEmpty(jsonDto)) { + throw new BadRequestException("编码已存在"); + } dto.setRegion_id(IdUtil.getSnowflake(1, 1).nextId()); dto.setCreate_id(currentUserId); @@ -104,7 +110,9 @@ public class RegionServiceImpl implements RegionService { @Transactional(rollbackFor = Exception.class) public void update(RegionDto dto) { RegionDto entity = this.findById(dto.getRegion_id()); - if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); + if (entity == null) { + throw new BadRequestException("被删除或无权限，操作失败!"); + } String currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); @@ -142,7 +150,9 @@ public class RegionServiceImpl implements RegionService { */ JSONArray res = new JSONArray(); String point_status_explain = findById(region_id).getPoint_status_explain(); - if (ObjectUtil.isEmpty(point_status_explain)) return res; + if (ObjectUtil.isEmpty(point_status_explain)) { + return res; + } String[] explain = point_status_explain.split("，"); for (int i = 0; i < explain.length; i++) { String[] status = explain[i].split("-"); @@ -167,7 +177,9 @@ public class RegionServiceImpl implements RegionService { */ JSONArray res = new JSONArray(); String point_type_explain = findById(region_id).getPoint_type_explain(); - if (ObjectUtil.isEmpty(point_type_explain)) return res; + if (ObjectUtil.isEmpty(point_type_explain)) { + return res; + } String[] explain = point_type_explain.split("，"); for (int i = 0; i < explain.length; i++) { String[] types = explain[i].split("-"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java index 3f6ff8363..a91cba39d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java @@ -141,7 +141,9 @@ public class TaskServiceImpl implements TaskService { // 调用每个任务类的method_name()强制结束方法 Method m = obj.getClass().getMethod(method_name, String.class); JSONObject result = (JSONObject) m.invoke(obj, task_id); - if (ObjectUtil.isEmpty(result)) return; + if (ObjectUtil.isEmpty(result)) { + return; + } JSONArray arr = result.getJSONArray("errArr"); WQLObject wo = WQLObject.getWQLObject("sch_base_task"); if (ObjectUtil.isNotEmpty(arr)) { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpReelTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpReelTask.java index f062792ae..79fffbe04 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpReelTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpReelTask.java @@ -178,7 +178,9 @@ public class CallEmpReelTask extends AbstractAcsTask { // 取满放空 // 校验起点是否存在 JSONObject jsonIvt = ivtTab.query("empty_point_code ='" + point_code1 + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(jsonIvt)) throw new BadRequestException("未找到可用点位:" + point_code1); + if (ObjectUtil.isEmpty(jsonIvt)) { + throw new BadRequestException("未找到可用点位:" + point_code1); + } // 校验终点是否存在 /*JSONObject nextDto = sbTab.query("point_code ='" + point_code2.substring(point_code2.length()-2) + "'").uniqueResult(0); if (ObjectUtil.isEmpty(nextDto)) @@ -191,7 +193,9 @@ public class CallEmpReelTask extends AbstractAcsTask { // 校验终点是否存在 JSONObject jsonIvt2 = ivtTab.query("full_point_code ='" + point_code4 + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(jsonIvt)) throw new BadRequestException("终点未找到可用点位:" + point_code2); + if (ObjectUtil.isEmpty(jsonIvt)) { + throw new BadRequestException("终点未找到可用点位:" + point_code2); + } // 更新工单状态为完成 //更新母卷工单状态 @@ -215,7 +219,9 @@ public class CallEmpReelTask extends AbstractAcsTask { // 插入入库单 JSONObject jsonMater = WQLObject.getWQLObject("md_me_materialbase").query("material_code = '" + jsonRaw.getString("product_name") + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(jsonMater)) throw new BadRequestException("产品不存在"); + if (ObjectUtil.isEmpty(jsonMater)) { + throw new BadRequestException("产品不存在"); + } JSONObject jsonRegion = new JSONObject(); jsonRegion.put("iostorinv_id", IdUtil.getSnowflake(1, 1).nextId()); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutConveyorTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutConveyorTask.java index 6256d091b..3ae026a58 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutConveyorTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutConveyorTask.java @@ -183,6 +183,30 @@ public class CutConveyorTask extends AbstractAcsTask { } } + + //判断载具上是否存在气涨轴 + String vehicle_code = jsonTask.getString("vehicle_code"); + if (StrUtil.isNotEmpty(vehicle_code)) { + JSONObject out_jo = WQLObject.getWQLObject("st_ivt_deliverypointivt").query("point_code = '" + jsonTask.getString("point_code1") + "'").uniqueResult(0); + if (ObjectUtil.isEmpty(out_jo)) { + throw new BadRequestException("未查询到对应的点位！"); + } + String point_location = out_jo.getString("point_location"); + JSONObject vehicle_jo = WQLObject.getWQLObject("md_pb_vehiclearea").query("point_location = '" + point_location + "' AND product_area = '" + jsonTask.getString("product_area") + "'").uniqueResult(0); + String qzz_generation = vehicle_jo.getString("qzz_generation"); + JSONObject jo = new JSONObject(); + jo.put("task_type", "010605"); + jo.put("point_code1", "A1_FQSS_OUT"); + jo.put("point_code2", "A1_RGV"); + jo.put("truss_type", "1"); + jo.put("vehicle_code", jsonTask.getString("vehicle_code")); + jo.put("product_area", jsonTask.getString("product_area")); + JSONObject request_param = new JSONObject(); + request_param.put("have_generation", qzz_generation); + jo.put("request_param", request_param.toString()); + PaperTrussTask paperTrussTask = SpringContextHolder.getBean(PaperTrussTask.class); + paperTrussTask.createTask(jo); + } } //分切输送入任务 @@ -309,7 +333,7 @@ public class CutConveyorTask extends AbstractAcsTask { new CutTrussTask().immediateNotifyAcs(null); } - }else{ + } else { if (StrUtil.isNotEmpty(jsonTask.getString("vehicle_code2"))) { //如果载具横移完成时，判断该空载具是否存在对应终点为空的末次下卷或者废箔下卷任务 JSONObject task_jo2 = WQLObject.getWQLObject("sch_base_task").query("vehicle_code2 = '" + jsonTask.getString("vehicle_code2") + "' AND is_delete = '0' AND task_status = '02'").uniqueResult(0); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InCoolIvtTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InCoolIvtTask.java index 06982d6b9..ec9be2bed 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InCoolIvtTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InCoolIvtTask.java @@ -116,11 +116,15 @@ public class InCoolIvtTask extends AbstractAcsTask { PointService point = SpringContextHolder.getBean(PointService.class); // 校验起点是否存在 PointDto startDto = point.findByCode(point_code1); - if (ObjectUtil.isEmpty(startDto)) throw new BadRequestException("起点未找到可用点位:" + point_code1); + if (ObjectUtil.isEmpty(startDto)) { + throw new BadRequestException("起点未找到可用点位:" + point_code1); + } // 校验终点是否存在 JSONObject jsonIvt = ivtTab.query("full_point_code ='" + point_code2 + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(jsonIvt)) throw new BadRequestException("终点未找到可用点位:" + point_code2); + if (ObjectUtil.isEmpty(jsonIvt)) { + throw new BadRequestException("终点未找到可用点位:" + point_code2); + } // 更新暂存位状态为空位 JSONObject jsonPoint = pointTab.query("point_code = '" + point_code1 + "'").uniqueResult(0); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InTask.java index 0c9c8b75d..c86da010b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InTask.java @@ -110,7 +110,9 @@ public class InTask extends AbstractAcsTask { map.put("is_delete","1"); JSONObject jsonDis = disTab.query("task_id ='" + taskObj.getString("task_id") + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(jsonDis)) throw new BadRequestException("分配明细不存在"); + if (ObjectUtil.isEmpty(jsonDis)) { + throw new BadRequestException("分配明细不存在"); + } String iostorinv_id = jsonDis.getString("iostorinv_id"); // 解锁货位 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendOutTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendOutTask.java index 63a7d5010..070516468 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendOutTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendOutTask.java @@ -50,7 +50,9 @@ public class SendOutTask extends AbstractAcsTask { // 判断此木箱是在2层还是1层 JSONObject jsonPoint = WQLObject.getWQLObject("sch_base_point").query("point_code = '" + json.getString("point_code2") + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(jsonPoint)) throw new BadRequestException("终点点位不存在！"); + if (ObjectUtil.isEmpty(jsonPoint)) { + throw new BadRequestException("终点点位不存在！"); + } if (StrUtil.equals(jsonPoint.getString("layer_num"), "2")) { JSONObject jsonSub = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("package_box_sn = '" + json.getString("vehicle_code") + "'").uniqueResult(0); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InbillServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InbillServiceImpl.java index 41fb7c382..eeae8c781 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InbillServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InbillServiceImpl.java @@ -80,6 +80,8 @@ public class InbillServiceImpl { struct_map.put("inv_code", ""); struct_table.update(struct_map, "struct_code = '" + end_point + "'"); break; + default: + break; } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InchargeServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InchargeServiceImpl.java index c1f9baf7e..0ed0d1bf0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InchargeServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InchargeServiceImpl.java @@ -58,15 +58,23 @@ public class InchargeServiceImpl implements InchargeService { map.put("end_time", MapUtil.getStr(whereJson, "end_time")); map.put("create_mode", MapUtil.getStr(whereJson, "create_mode")); map.put("bill_type", MapUtil.getStr(whereJson, "bill_type")); - if (ObjectUtil.isNotEmpty(bill_code)) map.put("bill_code","%"+bill_code + "%"); - if (ObjectUtil.isNotEmpty(sap_pcsn)) map.put("sap_pcsn","%"+sap_pcsn + "%"); - if (ObjectUtil.isNotEmpty(pcsn)) map.put("pcsn","%"+pcsn + "%"); + if (ObjectUtil.isNotEmpty(bill_code)) { + map.put("bill_code","%"+bill_code + "%"); + } + if (ObjectUtil.isNotEmpty(sap_pcsn)) { + map.put("sap_pcsn","%"+sap_pcsn + "%"); + } + if (ObjectUtil.isNotEmpty(pcsn)) { + map.put("pcsn","%"+pcsn + "%"); + } //获取人员对应的仓库 UserStorServiceImpl userStorService = new UserStorServiceImpl(); String in_stor_id = userStorService.getInStor(); - if (ObjectUtil.isNotEmpty(in_stor_id)) map.put("in_stor_id",in_stor_id); + if (ObjectUtil.isNotEmpty(in_stor_id)) { + map.put("in_stor_id",in_stor_id); + } JSONObject json = WQL.getWO("QST_IVT_INCHARGE").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "ios.input_time DESC"); return json; @@ -76,7 +84,9 @@ public class InchargeServiceImpl implements InchargeService { public List queryAll(Map whereJson) { WQLObject wo = WQLObject.getWQLObject("st_ivt_emptyvehiclerecord"); JSONArray arr = wo.query().getResultJSONArray(0); - if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(EmptyvehiclerecordDto.class); + if (ObjectUtil.isNotEmpty(arr)) { + return arr.toJavaList(EmptyvehiclerecordDto.class); + } return null; } @@ -112,7 +122,9 @@ public class InchargeServiceImpl implements InchargeService { String start_point_code = dto.getStart_point_code(); String next_point_code = dto.getNext_point_code(); // 判断起点是否为空！ 入库起点不能为空 - if (ObjectUtil.isEmpty(start_point_code)) throw new BadRequestException("起点不能为空"); + if (ObjectUtil.isEmpty(start_point_code)) { + throw new BadRequestException("起点不能为空"); + } // 根据点位编码找到对应的所属区域 Long start_region_id = pointTab.query("point_code = '" + start_point_code + "'").uniqueResult(0).getLongValue("region_id"); if (ObjectUtil.isNotEmpty(next_point_code)) { @@ -141,14 +153,18 @@ public class InchargeServiceImpl implements InchargeService { @Transactional(rollbackFor = Exception.class) public void update(EmptyvehiclerecordDto dto) { EmptyvehiclerecordDto entity = this.findById(dto.getRecord_uuid()); - if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); + if (entity == null) { + throw new BadRequestException("被删除或无权限，操作失败!"); + } WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); String start_point_code = dto.getStart_point_code(); String next_point_code = dto.getNext_point_code(); // 判断起点是否为空！ 入库起点不能为空 - if (ObjectUtil.isEmpty(start_point_code)) throw new BadRequestException("起点不能为空"); + if (ObjectUtil.isEmpty(start_point_code)) { + throw new BadRequestException("起点不能为空"); + } // 根据点位编码找到对应的所属区域 Long start_region_id = pointTab.query("point_code = '" + start_point_code + "'").uniqueResult(0).getLongValue("region_id"); if (ObjectUtil.isNotEmpty(next_point_code)) { @@ -299,7 +315,9 @@ public class InchargeServiceImpl implements InchargeService { //更新库存 JSONObject jsonIvt = ivtTab.query("pcsn = '" + jsonOutDis.getString("pcsn") + "' and canuse_qty = '"+json2.getDoubleValue("real_qty")+"'").uniqueResult(0); - if (ObjectUtil.isEmpty(jsonIvt)) throw new BadRequestException("库存不存在或库存数量不正确"); + if (ObjectUtil.isEmpty(jsonIvt)) { + throw new BadRequestException("库存不存在或库存数量不正确"); + } jsonIvt.put("bill_type_scode", jsonOutMst.getString("bill_type")); jsonIvt.put("inv_id", jsonOutMst.getString("iostorinv_id")); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/OutChargeServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/OutChargeServiceImpl.java index 690becf61..900747a21 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/OutChargeServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/OutChargeServiceImpl.java @@ -55,21 +55,41 @@ public class OutChargeServiceImpl implements OutChargeService { map.put("bill_status", MapUtil.getStr(whereJson, "bill_status")); map.put("bill_type", MapUtil.getStr(whereJson, "bill_type")); map.put("stor_id", MapUtil.getStr(whereJson, "stor_id")); - if (ObjectUtil.isNotEmpty(bill_code)) map.put("bill_code", bill_code + "%"); - if (ObjectUtil.isNotEmpty(vehicle_code)) map.put("vehicle_code", vehicle_code + "%"); - if (ObjectUtil.isNotEmpty(material_code)) map.put("material_code", material_code + "%"); - if (ObjectUtil.isNotEmpty(pcsn)) map.put("pcsn", pcsn + "%"); - if (ObjectUtil.isNotEmpty(sap_pcsn)) map.put("sap_pcsn", sap_pcsn + "%"); - if (ObjectUtil.isNotEmpty(start_point_code)) map.put("start_point_code", start_point_code + "%"); - if (ObjectUtil.isNotEmpty(end_point_code)) map.put("end_point_code", end_point_code + "%"); - if (ObjectUtil.isNotEmpty(start_region_code)) map.put("start_region_code", start_region_code + "%"); - if (ObjectUtil.isNotEmpty(end_region_code)) map.put("end_region_code", end_region_code + "%"); + if (ObjectUtil.isNotEmpty(bill_code)) { + map.put("bill_code", bill_code + "%"); + } + if (ObjectUtil.isNotEmpty(vehicle_code)) { + map.put("vehicle_code", vehicle_code + "%"); + } + if (ObjectUtil.isNotEmpty(material_code)) { + map.put("material_code", material_code + "%"); + } + if (ObjectUtil.isNotEmpty(pcsn)) { + map.put("pcsn", pcsn + "%"); + } + if (ObjectUtil.isNotEmpty(sap_pcsn)) { + map.put("sap_pcsn", sap_pcsn + "%"); + } + if (ObjectUtil.isNotEmpty(start_point_code)) { + map.put("start_point_code", start_point_code + "%"); + } + if (ObjectUtil.isNotEmpty(end_point_code)) { + map.put("end_point_code", end_point_code + "%"); + } + if (ObjectUtil.isNotEmpty(start_region_code)) { + map.put("start_region_code", start_region_code + "%"); + } + if (ObjectUtil.isNotEmpty(end_region_code)) { + map.put("end_region_code", end_region_code + "%"); + } //获取人员对应的仓库 UserStorServiceImpl userStorService = new UserStorServiceImpl(); String in_stor_id = userStorService.getInStor(); - if (ObjectUtil.isNotEmpty(in_stor_id)) map.put("in_stor_id",in_stor_id); + if (ObjectUtil.isNotEmpty(in_stor_id)) { + map.put("in_stor_id",in_stor_id); + } JSONObject json = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "ios.iostorinv_id DESC"); return json; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java index ec9409666..e592ce2a6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java @@ -105,7 +105,9 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService { UserStorServiceImpl userStorService = new UserStorServiceImpl(); String in_stor_id = userStorService.getInStor(); - if (ObjectUtil.isNotEmpty(in_stor_id)) map.put("in_stor_id", in_stor_id); + if (ObjectUtil.isNotEmpty(in_stor_id)) { + map.put("in_stor_id", in_stor_id); + } JSONObject jo = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "iostorinv_id desc"); return jo; @@ -1322,7 +1324,9 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService { String col_num = whereJson.getString("layer_num"); // 转库时用 JSONObject sub_jo = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("package_box_sn = '" + box_no + "' AND status < 3").uniqueResult(0); - if (ObjectUtil.isEmpty(sub_jo)) throw new BadRequestException("子卷包装关系不存在或已出库，请检查！"); + if (ObjectUtil.isEmpty(sub_jo)) { + throw new BadRequestException("子卷包装关系不存在或已出库，请检查！"); + } String material_code = sub_jo.getString("product_name"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/StorPublicServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/StorPublicServiceImpl.java index 58fe839dc..7512a52d6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/StorPublicServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/StorPublicServiceImpl.java @@ -5,12 +5,11 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.nl.modules.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; +import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.wms.st.inbill.service.StorPublicService; @@ -212,7 +211,9 @@ public class StorPublicServiceImpl implements StorPublicService { map.put("pcsn", pcsn_In); map.put("quality_scode", quality_scode_In); if (StrUtil.equals(change_type_scode, "12")) { - if (ObjectUtil.isNotEmpty(storagevehicle_code)) map.put("storagevehicle_code",storagevehicle_code); + if (ObjectUtil.isNotEmpty(storagevehicle_code)) { + map.put("storagevehicle_code", storagevehicle_code); + } } // 获取仓位物料信息 @@ -230,7 +231,7 @@ public class StorPublicServiceImpl implements StorPublicService { jo_in.put("frozen_qty", jo_in.getDoubleValue("frozen_qty") + change_qty); double ivt_num_now = jo_in.getDoubleValue("canuse_qty") + jo_in.getDoubleValue("frozen_qty"); - if (ivt_num_now != ivt_qty) { + if (Double.compare(ivt_num_now, ivt_qty) != 0) { throw new BadRequestException("输入数据异常，请检查"); } @@ -246,7 +247,7 @@ public class StorPublicServiceImpl implements StorPublicService { jo_in.put("frozen_qty", NumberUtil.sub(jo_in.getDoubleValue("frozen_qty"), change_qty)); double ivt_num_now = jo_in.getDoubleValue("canuse_qty") + jo_in.getDoubleValue("frozen_qty"); - if (ivt_num_now != ivt_qty) { + if (Double.compare(ivt_num_now, ivt_qty) != 0) { throw new BadRequestException("输入数据异常，请检查"); } if (jo_in.getDoubleValue("frozen_qty") < 0) { @@ -264,7 +265,7 @@ public class StorPublicServiceImpl implements StorPublicService { jo_in.put("frozen_qty", NumberUtil.sub(jo_in.getDoubleValue("frozen_qty"), change_qty)); double ivt_num_now = jo_in.getDoubleValue("canuse_qty") + jo_in.getDoubleValue("frozen_qty"); - if (ivt_num_now != ivt_qty) { + if (Double.compare(ivt_num_now, ivt_qty) != 0) { throw new BadRequestException("输入数据异常，请检查"); } if (jo_in.getDoubleValue("ivt_qty") < 0) { @@ -285,7 +286,7 @@ public class StorPublicServiceImpl implements StorPublicService { jo_in.put("frozen_qty", jo_in.getDoubleValue("frozen_qty") + change_qty); double ivt_num_now = jo_in.getDoubleValue("canuse_qty") + jo_in.getDoubleValue("frozen_qty"); - if (ivt_num_now != ivt_qty) { + if (Double.compare(ivt_num_now, ivt_qty) != 0) { throw new BadRequestException("输入数据异常，请检查"); } wql.update(jo_in, "stockrecord_id='" + jo_in.getString("stockrecord_id") + "'"); @@ -304,7 +305,7 @@ public class StorPublicServiceImpl implements StorPublicService { jo_in.put("canuse_qty", jo_in.getDoubleValue("canuse_qty") + change_qty); double ivt_num_now = jo_in.getDoubleValue("canuse_qty") + jo_in.getDoubleValue("frozen_qty"); - if (ivt_num_now != ivt_qty) { + if (Double.compare(ivt_num_now, ivt_qty) != 0) { throw new BadRequestException("输入数据异常，请检查"); } if (jo_in.getDoubleValue("canuse_qty") < 0) { @@ -327,7 +328,7 @@ public class StorPublicServiceImpl implements StorPublicService { jo_in.put("canuse_qty", NumberUtil.sub(jo_in.getDoubleValue("canuse_qty"), change_qty)); double ivt_num_now = jo_in.getDoubleValue("canuse_qty") + jo_in.getDoubleValue("frozen_qty"); - if (ivt_num_now != ivt_qty) { + if (Double.compare(ivt_num_now, ivt_qty) != 0) { throw new BadRequestException("输入数据异常，请检查"); } if (jo_in.getDoubleValue("ivt_qty") < 0) { @@ -372,7 +373,7 @@ public class StorPublicServiceImpl implements StorPublicService { jo_in.put("warehousing_qty", NumberUtil.sub(jo_in.getDoubleValue("warehousing_qty"), change_qty)); double ivt_num_now = jo_in.getDoubleValue("canuse_qty") + jo_in.getDoubleValue("frozen_qty"); - if (ivt_num_now != ivt_qty) { + if (Double.compare(ivt_num_now, ivt_qty) != 0) { throw new BadRequestException("输入数据异常，请检查"); } if (jo_in.getDoubleValue("warehousing_qty") < 0) { @@ -391,7 +392,7 @@ public class StorPublicServiceImpl implements StorPublicService { jo_in.put("warehousing_qty", jo_in.getDoubleValue("warehousing_qty") + change_qty); double ivt_num_now = jo_in.getDoubleValue("canuse_qty") + jo_in.getDoubleValue("frozen_qty"); - if (ivt_num_now != ivt_qty) { + if (Double.compare(ivt_num_now, ivt_qty) != 0) { throw new BadRequestException("输入数据异常，请检查"); } if (jo_in.getDoubleValue("ivt_qty") < 0) { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/ChangeServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/ChangeServiceImpl.java index a5325809d..58953b691 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/ChangeServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/ChangeServiceImpl.java @@ -61,7 +61,9 @@ public class ChangeServiceImpl implements ChangeService { UserStorServiceImpl userStorService = new UserStorServiceImpl(); String in_stor_id = userStorService.getInStor(); - if (ObjectUtil.isNotEmpty(in_stor_id)) map.put("in_stor_id", in_stor_id); + if (ObjectUtil.isNotEmpty(in_stor_id)) { + map.put("in_stor_id", in_stor_id); + } JSONObject jo = WQL.getWO("QST_IVT_CHANGE").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "bill_code desc"); return jo; @@ -584,7 +586,9 @@ public class ChangeServiceImpl implements ChangeService { String pcsn = jo.getString("pcsn"); JSONObject old_sub = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("container_name = '" + pcsn + "' AND status = '2'").uniqueResult(0); - if (ObjectUtil.isEmpty(old_sub)) throw new BadRequestException("子卷包装关系不存在或不在库内!"); + if (ObjectUtil.isEmpty(old_sub)) { + throw new BadRequestException("子卷包装关系不存在或不在库内!"); + } old_sub.put("change_type_scode", "02"); old_sub.put("change_order_id", jo_mst.getString("changeinv_id")); old_sub.put("change_order_code", jo_mst.getString("bill_code")); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/CheckServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/CheckServiceImpl.java index a20b5a3f5..522788b79 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/CheckServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/CheckServiceImpl.java @@ -60,7 +60,9 @@ public class CheckServiceImpl implements CheckService { UserStorServiceImpl userStorService = new UserStorServiceImpl(); String in_stor_id = userStorService.getInStor(); - if (ObjectUtil.isNotEmpty(in_stor_id)) map.put("in_stor_id",in_stor_id); + if (ObjectUtil.isNotEmpty(in_stor_id)) { + map.put("in_stor_id",in_stor_id); + } JSONObject jo = WQL.getWO("QST_IVT_CHECK").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "check_code desc"); JSONArray content = jo.getJSONArray("content"); @@ -112,8 +114,12 @@ public class CheckServiceImpl implements CheckService { map.put("box_no",box_no); map.put("flag","9"); - if (ObjectUtil.isNotEmpty(pcsn)) map.put("pcsn", "%"+pcsn+"%"); - if (ObjectUtil.isNotEmpty(sap_pcsn)) map.put("sap_pcsn", "%"+sap_pcsn+"%"); + if (ObjectUtil.isNotEmpty(pcsn)) { + map.put("pcsn", "%"+pcsn+"%"); + } + if (ObjectUtil.isNotEmpty(sap_pcsn)) { + map.put("sap_pcsn", "%"+sap_pcsn+"%"); + } JSONObject json = WQL.getWO("QST_IVT_CHECK").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "sub.container_name ASC"); @@ -129,7 +135,9 @@ public class CheckServiceImpl implements CheckService { map.put("check_code",check_code); map.put("flag","10"); - if (ObjectUtil.isNotEmpty(box_no)) map.put("box_no", "%"+box_no+"%"); + if (ObjectUtil.isNotEmpty(box_no)) { + map.put("box_no", "%"+box_no+"%"); + } JSONObject json = WQL.getWO("QST_IVT_CHECK").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "dtl.seq_no ASC"); @@ -909,7 +917,9 @@ public class CheckServiceImpl implements CheckService { JSONObject jsonMst = mstTab.query("check_code = '" + whereJson.getString("check_code") + "'").uniqueResult(0); JSONObject jsonMater = materTab.query("material_code = '" + whereJson.getString("material_code") + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(jsonMater)) throw new BadRequestException("此物料信息不存在!"); + if (ObjectUtil.isEmpty(jsonMater)) { + throw new BadRequestException("此物料信息不存在!"); + } // 新增明细 JSONObject jsonDtl = new JSONObject(); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java index 071ac4567..9c4a5ca90 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java @@ -62,7 +62,9 @@ public class HandMoveStorServiceImpl implements HandMoveStorService { UserStorServiceImpl userStorService = new UserStorServiceImpl(); String in_stor_id = userStorService.getInStor(); - if (ObjectUtil.isNotEmpty(in_stor_id)) map.put("in_stor_id",in_stor_id); + if (ObjectUtil.isNotEmpty(in_stor_id)) { + map.put("in_stor_id",in_stor_id); + } JSONObject jo = WQL.getWO("QST_IVT_HANDMOVESTOR").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "bill_code desc"); return jo; @@ -213,7 +215,9 @@ public class HandMoveStorServiceImpl implements HandMoveStorService { // 判断此区有没有被锁住的货位 JSONArray resultJSONArray = attrTab.query("block_num = '" + block_num + "' and is_used = '1' and is_delete = '0' and row_num = '7' and lock_type <> '1'").getResultJSONArray(0); - if (ObjectUtil.isNotEmpty(resultJSONArray)) throw new BadRequestException("有正在运行的任务或已锁定未生成任务"); + if (ObjectUtil.isNotEmpty(resultJSONArray)) { + throw new BadRequestException("有正在运行的任务或已锁定未生成任务"); + } // 找出所有货位 JSONArray boxArr = attrTab.query("block_num = '" + block_num + "' and is_used = '1' and is_delete = '0' and IFNULL(storagevehicle_code,'') <> '' and lock_type = '1' and row_num = '7' order by out_order_seq DESC").getResultJSONArray(0); @@ -260,7 +264,9 @@ public class HandMoveStorServiceImpl implements HandMoveStorService { JSONObject jsonMove = rawAssistIStorService.autoDisMove(moveParam); - if (ObjectUtil.isEmpty(jsonMove)) throw new BadRequestException("没有可用暂存位"); + if (ObjectUtil.isEmpty(jsonMove)) { + throw new BadRequestException("没有可用暂存位"); + } // 组织明细 @@ -841,7 +847,9 @@ public class HandMoveStorServiceImpl implements HandMoveStorService { UserStorServiceImpl userStorService = new UserStorServiceImpl(); String in_stor_id = userStorService.getInStor(); - if (ObjectUtil.isNotEmpty(in_stor_id)) map.put("in_stor_id",in_stor_id); + if (ObjectUtil.isNotEmpty(in_stor_id)) { + map.put("in_stor_id",in_stor_id); + } JSONObject jo = WQL.getWO("QST_IVT_HANDMOVESTOR") .addParam("flag", "3") @@ -1221,13 +1229,17 @@ public class HandMoveStorServiceImpl implements HandMoveStorService { // 1.找出所有需要盘点的移库的木箱 JSONArray boxArr = attrTab.query("sect_id = '" + RegionTypeEnum.PD01.getId() + "' and IFNULL(storagevehicle_code,'') <> '' and is_used = '1' and is_delete = '0' order by block_num ASC,out_order_seq DESC").getResultJSONArray(0); - if (ObjectUtil.isEmpty(boxArr)) throw new BadRequestException("没有需要盘点回库的木箱!"); + if (ObjectUtil.isEmpty(boxArr)) { + throw new BadRequestException("没有需要盘点回库的木箱!"); + } // 2.判断是否有被锁定的木箱 boolean is_lock = boxArr.stream().map(row -> (JSONObject) row) .anyMatch(row -> !StrUtil.equals(row.getString("lock_type"), "1")); - if (is_lock) throw new BadRequestException("木箱存在被锁定，请检查!"); + if (is_lock) { + throw new BadRequestException("木箱存在被锁定，请检查!"); + } /* for (int i = 0; i < boxArr.size(); i++) { JSONObject json = boxArr.getJSONObject(i); @@ -1240,8 +1252,9 @@ public class HandMoveStorServiceImpl implements HandMoveStorService { // 3.判断木箱是否存在未完成的盘点单 boxArr.forEach(row -> { JSONObject json = WQL.getWO("QST_IVT_HANDMOVESTOR").addParam("flag", "8").addParam("storagevehicle_code", ((JSONObject) row).getString("storagevehicle_code")).process().uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)) + if (ObjectUtil.isNotEmpty(json)) { throw new BadRequestException("此木箱的盘点单据未完成:"+json.getString("storagevehicle_code")); + } }); // 4.生成移库单 @@ -1257,7 +1270,9 @@ public class HandMoveStorServiceImpl implements HandMoveStorService { moveParamIn.put("layer_num", json.getString("layer_num")); JSONObject jsonMoveIn = rawAssistIStorService.autoDisMove(moveParamIn); - if (ObjectUtil.isEmpty(jsonMoveIn)) throw new BadRequestException("没有可用暂存位"); + if (ObjectUtil.isEmpty(jsonMoveIn)) { + throw new BadRequestException("没有可用暂存位"); + } JSONObject jsonMst = new JSONObject(); // 主表 jsonMst.put("bill_type", "31"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/ProductScrapServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/ProductScrapServiceImpl.java index d9a037f21..7964ba87e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/ProductScrapServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/ProductScrapServiceImpl.java @@ -64,7 +64,9 @@ public class ProductScrapServiceImpl implements ProductScrapService { UserStorServiceImpl userStorService = new UserStorServiceImpl(); String in_stor_id = userStorService.getInStor(); - if (ObjectUtil.isNotEmpty(in_stor_id)) map.put("in_stor_id", in_stor_id); + if (ObjectUtil.isNotEmpty(in_stor_id)) { + map.put("in_stor_id", in_stor_id); + } JSONObject jo = WQL.getWO("QST_IVT_PRODUCTSCRAP").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "scrap_code desc"); return jo; @@ -217,13 +219,17 @@ public class ProductScrapServiceImpl implements ProductScrapService { List ivtList = ivt.query("pcsn in ('" + pcsnJoining + "') and canuse_qty > 0") .getResultJSONArray(0).toJavaList(JSONObject.class); - if (dtlArr.size() != ivtList.size()) throw new BadRequestException("库存异常请检查!"); + if (dtlArr.size() != ivtList.size()) { + throw new BadRequestException("库存异常请检查!"); + } // 校验库存 boolean is_pass = ivtList.stream() .allMatch(row -> pcsnJoining.contains(row.getString("pcsn"))); - if (!is_pass) throw new BadRequestException("库存异常请检查!"); + if (!is_pass) { + throw new BadRequestException("库存异常请检查!"); + } /* List collect = ivtList.stream() .filter(row -> !pcsnJoining.contains(row.getString("pcsn"))) @@ -353,7 +359,9 @@ public class ProductScrapServiceImpl implements ProductScrapService { .filter(row -> row.getString("container_name").equals(json.getString("pcsn"))) .collect(Collectors.toList()).get(0); - if (ObjectUtil.isEmpty(jsonBox)) throw new BadRequestException("子卷"+json.getString("pcsn")+"不存在，请检查！"); + if (ObjectUtil.isEmpty(jsonBox)) { + throw new BadRequestException("子卷"+json.getString("pcsn")+"不存在，请检查！"); + } // 产品名称 JSONObject jsonName = new JSONObject(); @@ -414,6 +422,8 @@ public class ProductScrapServiceImpl implements ProductScrapService { case "6" : jsonSource.put("value", "lohzzmz1-d0j15ri1jyg-5"); break; + default: + break; } dtlAtt.add(jsonSource); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java index 05bd39760..16e68dd88 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java @@ -115,7 +115,9 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { UserStorServiceImpl userStorService = new UserStorServiceImpl(); String in_stor_id = userStorService.getInStor(); - if (ObjectUtil.isNotEmpty(in_stor_id)) map.put("in_stor_id", in_stor_id); + if (ObjectUtil.isNotEmpty(in_stor_id)) { + map.put("in_stor_id", in_stor_id); + } JSONObject jo = WQL.getWO("QST_IVT_CHECKOUTBILL").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "iostorinv_id desc"); return jo; @@ -337,7 +339,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { JSONObject row = rows.getJSONObject(i); // 校验计划数量不能为零 double plan_qty = row.getDoubleValue("plan_qty"); - if (plan_qty == 0.0) { + if (Double.compare(plan_qty, 0.0) == 0) { throw new BadRequestException("数量不能为0"); } JSONObject jsonDtl = new JSONObject(); @@ -372,7 +374,9 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { } String struct_code = struct_jo.getString("struct_code"); JSONObject json = ivtTab.query("pcsn = '" + pcsn + "' AND struct_code = '" + struct_code + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(json)) continue; + if (ObjectUtil.isEmpty(json)) { + continue; + } JSONObject jsonMap = new JSONObject(); jsonMap.put("flag", "1"); @@ -400,7 +404,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { jsonDtl2.put("source_billdtl_id", jsonDtl.getString("iostorinvdtl_id")); // 校验计划数量不能为零 double plan_qty2 = jsonDtl2.getDoubleValue("plan_qty"); - if (plan_qty2 == 0.0) { + if (Double.compare(plan_qty2, 0.0) == 0) { throw new BadRequestException("数量不能为0"); } WQLObject.getWQLObject("ST_IVT_IOStorInvDtl").insert(jsonDtl2); @@ -476,7 +480,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { JSONObject row = rows.getJSONObject(i); // 校验计划数量不能为零 double plan_qty = row.getDoubleValue("plan_qty"); - if (plan_qty == 0.0) { + if (Double.compare(plan_qty, 0) == 0) { throw new BadRequestException("数量不能为0"); } @@ -513,7 +517,9 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { } String struct_code = struct_jo.getString("struct_code"); JSONObject json = ivtTab.query("pcsn = '" + pcsn + "' AND struct_code = '" + struct_code + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(json)) continue; + if (ObjectUtil.isEmpty(json)) { + continue; + } JSONObject jsonMap = new JSONObject(); jsonMap.put("flag", "1"); @@ -542,7 +548,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { jsonDtl2.put("source_billdtl_id", jsonDtl.getString("iostorinvdtl_id")); // 校验计划数量不能为零 double plan_qty2 = jsonDtl2.getDoubleValue("plan_qty"); - if (plan_qty2 == 0.0) { + if (Double.compare(plan_qty2, 0) == 0) { throw new BadRequestException("数量不能为0"); } WQLObject.getWQLObject("ST_IVT_IOStorInvDtl").insert(jsonDtl2); @@ -741,12 +747,24 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { mp.put("单据号", jsonObject.getString("bill_code")); mp.put("仓库", jsonObject.getString("stor_name")); - if (StrUtil.equals(jsonObject.getString("bill_type"), "1001")) mp.put("业务类型", "发货出库"); - if (StrUtil.equals(jsonObject.getString("bill_type"), "1002")) mp.put("业务类型", "报废出库"); - if (StrUtil.equals(jsonObject.getString("bill_type"), "1003")) mp.put("业务类型", "改切出库"); - if (StrUtil.equals(jsonObject.getString("bill_type"), "1004")) mp.put("业务类型", "调拨出库"); - if (StrUtil.equals(jsonObject.getString("bill_type"), "1005")) mp.put("业务类型", "拆箱出库"); - if (StrUtil.equals(jsonObject.getString("bill_type"), "1009")) mp.put("业务类型", "手工出库"); + if (StrUtil.equals(jsonObject.getString("bill_type"), "1001")) { + mp.put("业务类型", "发货出库"); + } + if (StrUtil.equals(jsonObject.getString("bill_type"), "1002")) { + mp.put("业务类型", "报废出库"); + } + if (StrUtil.equals(jsonObject.getString("bill_type"), "1003")) { + mp.put("业务类型", "改切出库"); + } + if (StrUtil.equals(jsonObject.getString("bill_type"), "1004")) { + mp.put("业务类型", "调拨出库"); + } + if (StrUtil.equals(jsonObject.getString("bill_type"), "1005")) { + mp.put("业务类型", "拆箱出库"); + } + if (StrUtil.equals(jsonObject.getString("bill_type"), "1009")) { + mp.put("业务类型", "手工出库"); + } mp.put("业务日期", jsonObject.getString("biz_date")); mp.put("总重量", jsonObject.getString("qty")); mp.put("客户编码", jsonObject.getString("cust_code")); @@ -809,7 +827,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { JSONObject row = rows.getJSONObject(i); // 校验计划数量不能为零 double plan_qty = row.getDoubleValue("plan_qty"); - if (plan_qty == 0.0) { + if (Double.compare(plan_qty, 0) == 0) { throw new BadRequestException("数量不能为0"); } @@ -845,7 +863,9 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { } String struct_code = struct_jo.getString("struct_code"); JSONObject json = ivtTab.query("pcsn = '" + pcsn + "' AND struct_code = '" + struct_code + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(json)) continue; + if (ObjectUtil.isEmpty(json)) { + continue; + } JSONObject jsonMap = new JSONObject(); jsonMap.put("flag", "1"); @@ -873,7 +893,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { jsonDtl2.put("source_billdtl_id", jsonDtl.getString("iostorinvdtl_id")); // 校验计划数量不能为零 double plan_qty2 = jsonDtl2.getDoubleValue("plan_qty"); - if (plan_qty2 == 0.0) { + if (Double.compare(plan_qty2, 0) == 0) { throw new BadRequestException("数量不能为0"); } WQLObject.getWQLObject("ST_IVT_IOStorInvDtl").insert(jsonDtl2); @@ -915,8 +935,12 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { String trans_code = jo_mst.getString("trans_code"); String estimated_freight = jo_mst.getString("estimated_freight"); - if (ObjectUtil.isEmpty(trans_code)) throw new BadRequestException("物流公司不能为空"); - if (ObjectUtil.isEmpty(estimated_freight)) throw new BadRequestException("预估运费不能为空"); + if (ObjectUtil.isEmpty(trans_code)) { + throw new BadRequestException("物流公司不能为空"); + } + if (ObjectUtil.isEmpty(estimated_freight)) { + throw new BadRequestException("预估运费不能为空"); + } } @@ -961,7 +985,9 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { jsonMap.put("stor_id", whereJson.getString("stor_id")); JSONObject jsonOneIvt = WQL.getWO("ST_OUTIVT01").addParamMap(jsonMap).process().uniqueResult(0); - if (ObjectUtil.isEmpty(jsonOneIvt)) throw new BadRequestException("库存不足"); + if (ObjectUtil.isEmpty(jsonOneIvt)) { + throw new BadRequestException("库存不足"); + } // 查询这一巷道所有此物料此库存此销售订单的库存 jsonMap.put("flag", "2"); @@ -1041,7 +1067,9 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { jsonMap.put("stor_id", whereJson.getString("stor_id")); JSONObject jsonIvt = WQL.getWO("ST_OUTIVT01").addParamMap(jsonMap).process().uniqueResult(0); - if (ObjectUtil.isEmpty(jsonIvt)) throw new BadRequestException("库存不足"); + if (ObjectUtil.isEmpty(jsonIvt)) { + throw new BadRequestException("库存不足"); + } double canuse_qty = jsonIvt.getDoubleValue("canuse_qty"); jsonIvt.put("change_qty", canuse_qty + ""); @@ -1149,8 +1177,12 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { String trans_code = jo_mst.getString("trans_code"); String estimated_freight = jo_mst.getString("estimated_freight"); - if (ObjectUtil.isEmpty(trans_code)) throw new BadRequestException("物流公司不能为空"); - if (ObjectUtil.isEmpty(estimated_freight)) throw new BadRequestException("预估运费不能为空"); + if (ObjectUtil.isEmpty(trans_code)) { + throw new BadRequestException("物流公司不能为空"); + } + if (ObjectUtil.isEmpty(estimated_freight)) { + throw new BadRequestException("预估运费不能为空"); + } } @@ -1194,7 +1226,9 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { jsonMap.put("stor_id", whereJson.getString("stor_id")); JSONObject jsonOneIvt = WQL.getWO("ST_OUTIVT01").addParamMap(jsonMap).process().uniqueResult(0); - if (ObjectUtil.isEmpty(jsonOneIvt)) throw new BadRequestException("库存不足"); + if (ObjectUtil.isEmpty(jsonOneIvt)) { + throw new BadRequestException("库存不足"); + } // 查询这一巷道所有此物料此库存此销售订单的库存 jsonMap.put("flag", "2"); @@ -1274,7 +1308,9 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { jsonMap.put("stor_id", whereJson.getString("stor_id")); JSONObject jsonIvt = WQL.getWO("ST_OUTIVT01").addParamMap(jsonMap).process().uniqueResult(0); - if (ObjectUtil.isEmpty(jsonIvt)) throw new BadRequestException("库存不足"); + if (ObjectUtil.isEmpty(jsonIvt)) { + throw new BadRequestException("库存不足"); + } double canuse_qty = jsonIvt.getDoubleValue("canuse_qty"); assign_qty = NumberUtil.add(assign_qty, canuse_qty); @@ -1726,7 +1762,9 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { * b.没挡住：正常生成 */ JSONObject jsonPoint1 = wo_Point.query("source_id = '" + dis.getString("struct_id") + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(jsonPoint1)) throw new BadRequestException("起点点位不存在"); + if (ObjectUtil.isEmpty(jsonPoint1)) { + throw new BadRequestException("起点点位不存在"); + } // 创建任务 JSONObject param = new JSONObject(); @@ -1793,8 +1831,12 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { for (int i = 0; i < jsonIsBlockAll.size(); i++) { JSONObject json = jsonIsBlockAll.getJSONObject(i); - if (i == 0) blockRigth = json.getIntValue("num"); - if (i == 1) blockRigth = json.getIntValue("num"); + if (i == 0) { + blockRigth = json.getIntValue("num"); + } + if (i == 1) { + blockRigth = json.getIntValue("num"); + } } // 更新第一个任务 任务组、任务顺序号 @@ -2089,7 +2131,9 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { * b.没挡住：正常生成 */ JSONObject jsonPoint1 = wo_Point.query("source_id = '" + dis.getString("struct_id") + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(jsonPoint1)) throw new BadRequestException("起点点位不存在"); + if (ObjectUtil.isEmpty(jsonPoint1)) { + throw new BadRequestException("起点点位不存在"); + } // 创建任务 JSONObject param = new JSONObject(); @@ -2236,8 +2280,12 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { for (int i = 0; i < jsonIsBlockAll.size(); i++) { JSONObject json = jsonIsBlockAll.getJSONObject(i); - if (i == 0) blockRigth = json.getIntValue("num"); - if (i == 1) blockRigth = json.getIntValue("num"); + if (i == 0) { + blockRigth = json.getIntValue("num"); + } + if (i == 1) { + blockRigth = json.getIntValue("num"); + } } // 更新第一个任务 任务组、任务顺序号 @@ -2693,7 +2741,9 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { .process() .getResultJSONArray(0); - if (ObjectUtil.isEmpty(allRowArr)) throw new BadRequestException("当前没有可设置的分配明细"); + if (ObjectUtil.isEmpty(allRowArr)) { + throw new BadRequestException("当前没有可设置的分配明细"); + } // 判断当前排是否有其他任务正在执行 for (int i = 0; i < allRowArr.size(); i++) { @@ -2733,6 +2783,8 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { case "3": out_point = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("out_point_3").getValue(); break; + default: + break; } // 将这一巷道的所有木箱进行移库 @@ -3068,7 +3120,9 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { // 判断是否是异常出库口 if (checked) { JSONObject jsonStartPoint = attr_tab.query("struct_code = '" + jsonObject.getString("struct_code") + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(jsonStartPoint)) throw new BadRequestException("起始点位异常!"); + if (ObjectUtil.isEmpty(jsonStartPoint)) { + throw new BadRequestException("起始点位异常!"); + } String layer_num = jsonStartPoint.getString("layer_num"); @@ -3504,7 +3558,9 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { // 判断是否是异常出库口 if (checked) { JSONObject jsonStartPoint = attrTab.query("struct_code = '" + jsonObject.getString("struct_code") + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(jsonStartPoint)) throw new BadRequestException("起始点位异常!"); + if (ObjectUtil.isEmpty(jsonStartPoint)) { + throw new BadRequestException("起始点位异常!"); + } String layer_num = jsonStartPoint.getString("layer_num"); @@ -3820,7 +3876,9 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { String struct_code = json.getString("struct_code"); String iostorinv_id = json.getString("iostorinv_id"); - if (ObjectUtil.isEmpty(struct_code)) throw new BadRequestException("校验仓位不能为空"); + if (ObjectUtil.isEmpty(struct_code)) { + throw new BadRequestException("校验仓位不能为空"); + } boolean param = false; @@ -3983,8 +4041,12 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { String trans_code = jo_mst.getString("trans_code"); String estimated_freight = jo_mst.getString("estimated_freight"); - if (ObjectUtil.isEmpty(trans_code)) throw new BadRequestException("物流公司不能为空"); - if (ObjectUtil.isEmpty(estimated_freight)) throw new BadRequestException("预估运费不能为空"); + if (ObjectUtil.isEmpty(trans_code)) { + throw new BadRequestException("物流公司不能为空"); + } + if (ObjectUtil.isEmpty(estimated_freight)) { + throw new BadRequestException("预估运费不能为空"); + } } @@ -4202,7 +4264,9 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { //判断分配明细中是否有未生成状态的分配明细 JSONArray disArr = wo_dis.query("iostorinv_id = '" + iostorinv_id + "' and work_status = '00'").getResultJSONArray(0); - if (ObjectUtil.isNotEmpty(disArr)) throw new BadRequestException("有未生成状态的分配明细，不允许强制确认"); + if (ObjectUtil.isNotEmpty(disArr)) { + throw new BadRequestException("有未生成状态的分配明细，不允许强制确认"); + } //查询生成和未分配完的明细 JSONArray dtls = WQL.getWO("QST_IVT_CHECKOUTBILL") @@ -4241,12 +4305,12 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { double real_qty = dis.getDoubleValue("real_qty"); //全出判断是否全出 if ("02".equals(dis.getString("task_type"))) { - if (plan_qty != real_qty) { + if (Double.compare(plan_qty, real_qty) != 0) { throw new BadRequestException(dis.getString("storagevehicle_code") + "全出载具未完成出库！"); } } //未出部分，按取消分配处理 - if (real_qty != plan_qty) { + if (Double.compare(real_qty, plan_qty) != 0) { dis.put("change_qty", plan_qty - real_qty); dis.put("bill_type_scode", jo_mst.getString("bill_type")); dis.put("inv_id", iostorinv_id); @@ -4275,8 +4339,10 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { // 更新子卷包装关系表 状态 - 3 JSONObject jsonSub = subTab.query("container_name = '" + dis.getString("pcsn") + "' and package_box_sn = '" + dis.getString("box_no") + "' and status = '2'").uniqueResult(0); if (ObjectUtil.isEmpty(jsonSub)) - //查询对应的包装关系出入库记录表 + //查询对应的包装关系出入库记录表 + { jsonSub = sub_record.query("container_name = '" + dis.getString("pcsn") + "' and package_box_sn = '" + dis.getString("box_no") + "' and status = '2' AND bill_code = '" + jo_mst.getString("bill_code") + "'").uniqueResult(0); + } if (ObjectUtil.isEmpty(jsonSub)) { throw new BadRequestException("此子卷不存在或不为入库状态：" + dis.getString("pcsn")); @@ -5053,7 +5119,9 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { oneMap.put("contractno", jsonMst.getString("contractno")); // 合同号 } else { - if (ObjectUtil.isEmpty(jsonCust)) throw new BadRequestException("客户不存在"); + if (ObjectUtil.isEmpty(jsonCust)) { + throw new BadRequestException("客户不存在"); + } shd_dtl_num = jsonCust.getIntValue("shd_dtl_num"); //1.根据出入库主表中 收货单位 查询客户表中的模板路径 code_template = jsonCust.getString("shd_print_no"); @@ -5122,7 +5190,9 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { JSONObject json = dtlArr.getJSONObject(i); JSONObject jsonSub = subTab.query("package_box_sn = '" + json.getString("box_no") + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(jsonSub)) throw new BadRequestException("没有查询到子卷包装"); + if (ObjectUtil.isEmpty(jsonSub)) { + throw new BadRequestException("没有查询到子卷包装"); + } order_no = jsonSub.getString("sale_order_name"); // 规格： 厚度*幅宽 @@ -5186,7 +5256,9 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { JSONObject json = dtlArr.getJSONObject(i); JSONObject jsonSub = subTab.query("package_box_sn = '" + json.getString("box_no") + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(jsonSub)) throw new BadRequestException("没有查询到子卷包装"); + if (ObjectUtil.isEmpty(jsonSub)) { + throw new BadRequestException("没有查询到子卷包装"); + } order_no = jsonSub.getString("sale_order_name"); // 规格： 厚度*幅宽 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/RegionioOutServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/RegionioOutServiceImpl.java index c674b2301..86f596be6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/RegionioOutServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/RegionioOutServiceImpl.java @@ -51,14 +51,30 @@ public class RegionioOutServiceImpl implements RegionioOutService { HashMap map = new HashMap<>(); map.put("flag", "1"); map.put("bill_status",MapUtil.getStr(whereJson, "bill_status")); - if (ObjectUtil.isNotEmpty(bill_code)) map.put("bill_code", bill_code + "%"); - if (ObjectUtil.isNotEmpty(vehicle_code)) map.put("vehicle_code", vehicle_code + "%"); - if (ObjectUtil.isNotEmpty(material_code)) map.put("material_code", material_code + "%"); - if (ObjectUtil.isNotEmpty(pcsn)) map.put("pcsn", pcsn + "%"); - if (ObjectUtil.isNotEmpty(start_point_code)) map.put("start_point_code", start_point_code + "%"); - if (ObjectUtil.isNotEmpty(end_point_code)) map.put("end_point_code", end_point_code + "%"); - if (ObjectUtil.isNotEmpty(start_region_code)) map.put("start_region_code", start_region_code + "%"); - if (ObjectUtil.isNotEmpty(end_region_code)) map.put("end_region_code", end_region_code + "%"); + if (ObjectUtil.isNotEmpty(bill_code)) { + map.put("bill_code", bill_code + "%"); + } + if (ObjectUtil.isNotEmpty(vehicle_code)) { + map.put("vehicle_code", vehicle_code + "%"); + } + if (ObjectUtil.isNotEmpty(material_code)) { + map.put("material_code", material_code + "%"); + } + if (ObjectUtil.isNotEmpty(pcsn)) { + map.put("pcsn", pcsn + "%"); + } + if (ObjectUtil.isNotEmpty(start_point_code)) { + map.put("start_point_code", start_point_code + "%"); + } + if (ObjectUtil.isNotEmpty(end_point_code)) { + map.put("end_point_code", end_point_code + "%"); + } + if (ObjectUtil.isNotEmpty(start_region_code)) { + map.put("start_region_code", start_region_code + "%"); + } + if (ObjectUtil.isNotEmpty(end_region_code)) { + map.put("end_region_code", end_region_code + "%"); + } JSONObject json = WQL.getWO("ST_REGION_OUT_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "ios.create_time DESC"); return json; @@ -68,7 +84,9 @@ public class RegionioOutServiceImpl implements RegionioOutService { public List queryAll(Map whereJson){ WQLObject wo = WQLObject.getWQLObject("st_ivt_regionio"); JSONArray arr = wo.query().getResultJSONArray(0); - if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(RegionioDto.class); + if (ObjectUtil.isNotEmpty(arr)) { + return arr.toJavaList(RegionioDto.class); + } return null; } @@ -133,7 +151,9 @@ public class RegionioOutServiceImpl implements RegionioOutService { @Transactional(rollbackFor = Exception.class) public void update(RegionioDto dto) { RegionioDto entity = this.findById(dto.getQty_unit_id()); - if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); + if (entity == null) { + throw new BadRequestException("被删除或无权限，操作失败!"); + } WQLObject materTab = WQLObject.getWQLObject("md_me_materialbase"); WQLObject vehicleTab = WQLObject.getWQLObject("MD_PB_StorageVehicleInfo"); @@ -216,7 +236,9 @@ public class RegionioOutServiceImpl implements RegionioOutService { HashMap map = new HashMap<>(); map.put("flag", "2"); map.put("region_id", MapUtil.getStr(whereJson, "region_id")); - if (ObjectUtil.isNotEmpty(material_code)) map.put("material_code",material_code); + if (ObjectUtil.isNotEmpty(material_code)) { + map.put("material_code",material_code); + } JSONObject json = WQL.getWO("ST_REGION_OUT_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "ivt.instorage_time DESC"); return json; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java index 27d143d0e..803ab2572 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java @@ -61,15 +61,23 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { map.put("sap_pcsn", MapUtil.getStr(whereJson, "sap_pcsn")); map.put("is_writeoff", MapUtil.getStr(whereJson, "is_writeoff")); map.put("vbeln", MapUtil.getStr(whereJson, "vbeln")); - if (!ObjectUtil.isEmpty(bill_code)) map.put("bill_code", "%" + bill_code + "%"); - if (!ObjectUtil.isEmpty(material_search)) map.put("material_search", "%" + material_search + "%"); - if (!ObjectUtil.isEmpty(box_no)) map.put("box_no", "%" + box_no + "%"); + if (!ObjectUtil.isEmpty(bill_code)) { + map.put("bill_code", "%" + bill_code + "%"); + } + if (!ObjectUtil.isEmpty(material_search)) { + map.put("material_search", "%" + material_search + "%"); + } + if (!ObjectUtil.isEmpty(box_no)) { + map.put("box_no", "%" + box_no + "%"); + } //获取人员对应的仓库 UserStorServiceImpl userStorService = new UserStorServiceImpl(); String in_stor_id = userStorService.getInStor(); - if (ObjectUtil.isNotEmpty(in_stor_id)) map.put("in_stor_id", in_stor_id); + if (ObjectUtil.isNotEmpty(in_stor_id)) { + map.put("in_stor_id", in_stor_id); + } JSONObject jo = WQL.getWO("QST_IVT_INANDOUTRETRUN").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mst.input_time desc"); return jo; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/impl/InEmptyvehiclerecordServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/impl/InEmptyvehiclerecordServiceImpl.java index ee03f6b41..5e0eb5a4f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/impl/InEmptyvehiclerecordServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/impl/InEmptyvehiclerecordServiceImpl.java @@ -46,7 +46,9 @@ public class InEmptyvehiclerecordServiceImpl implements InEmptyvehiclerecordServ HashMap map = new HashMap<>(); map.put("flag", "1"); - if (ObjectUtil.isNotEmpty(bill_code)) map.put("bill_code",bill_code + "%"); + if (ObjectUtil.isNotEmpty(bill_code)) { + map.put("bill_code",bill_code + "%"); + } JSONObject json = WQL.getWO("ST_VEHICLE_IN_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "st.create_time DESC"); return json; @@ -56,7 +58,9 @@ public class InEmptyvehiclerecordServiceImpl implements InEmptyvehiclerecordServ public List queryAll(Map whereJson) { WQLObject wo = WQLObject.getWQLObject("st_ivt_emptyvehiclerecord"); JSONArray arr = wo.query().getResultJSONArray(0); - if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(EmptyvehiclerecordDto.class); + if (ObjectUtil.isNotEmpty(arr)) { + return arr.toJavaList(EmptyvehiclerecordDto.class); + } return null; } @@ -92,7 +96,9 @@ public class InEmptyvehiclerecordServiceImpl implements InEmptyvehiclerecordServ String start_point_code = dto.getStart_point_code(); String next_point_code = dto.getNext_point_code(); // 判断起点是否为空！ 入库起点不能为空 - if (ObjectUtil.isEmpty(start_point_code)) throw new BadRequestException("起点不能为空"); + if (ObjectUtil.isEmpty(start_point_code)) { + throw new BadRequestException("起点不能为空"); + } // 根据点位编码找到对应的所属区域 Long start_region_id = pointTab.query("point_code = '" + start_point_code + "'").uniqueResult(0).getLongValue("region_id"); if (ObjectUtil.isNotEmpty(next_point_code)) { @@ -121,14 +127,18 @@ public class InEmptyvehiclerecordServiceImpl implements InEmptyvehiclerecordServ @Transactional(rollbackFor = Exception.class) public void update(EmptyvehiclerecordDto dto) { EmptyvehiclerecordDto entity = this.findById(dto.getRecord_uuid()); - if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); + if (entity == null) { + throw new BadRequestException("被删除或无权限，操作失败!"); + } WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); String start_point_code = dto.getStart_point_code(); String next_point_code = dto.getNext_point_code(); // 判断起点是否为空！ 入库起点不能为空 - if (ObjectUtil.isEmpty(start_point_code)) throw new BadRequestException("起点不能为空"); + if (ObjectUtil.isEmpty(start_point_code)) { + throw new BadRequestException("起点不能为空"); + } // 根据点位编码找到对应的所属区域 Long start_region_id = pointTab.query("point_code = '" + start_point_code + "'").uniqueResult(0).getLongValue("region_id"); if (ObjectUtil.isNotEmpty(next_point_code)) { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/impl/OutEmptyvehiclerecordServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/impl/OutEmptyvehiclerecordServiceImpl.java index 885478bec..2a902aea1 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/impl/OutEmptyvehiclerecordServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/impl/OutEmptyvehiclerecordServiceImpl.java @@ -46,7 +46,9 @@ public class OutEmptyvehiclerecordServiceImpl implements OutEmptyvehiclerecordSe HashMap map = new HashMap<>(); map.put("flag", "1"); - if (ObjectUtil.isNotEmpty(bill_code)) map.put("bill_code",bill_code + "%"); + if (ObjectUtil.isNotEmpty(bill_code)) { + map.put("bill_code",bill_code + "%"); + } JSONObject json = WQL.getWO("ST_VEHICLE_OUT_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "st.create_time DESC"); return json; @@ -56,7 +58,9 @@ public class OutEmptyvehiclerecordServiceImpl implements OutEmptyvehiclerecordSe public List queryAll(Map whereJson) { WQLObject wo = WQLObject.getWQLObject("st_ivt_emptyvehiclerecord"); JSONArray arr = wo.query().getResultJSONArray(0); - if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(EmptyvehiclerecordDto.class); + if (ObjectUtil.isNotEmpty(arr)) { + return arr.toJavaList(EmptyvehiclerecordDto.class); + } return null; } @@ -92,7 +96,9 @@ public class OutEmptyvehiclerecordServiceImpl implements OutEmptyvehiclerecordSe String start_point_code = dto.getStart_point_code(); String next_point_code = dto.getNext_point_code(); // 判断终点是否为空！ 出库终点不能为空 - if (ObjectUtil.isEmpty(next_point_code)) throw new BadRequestException("终点不能为空"); + if (ObjectUtil.isEmpty(next_point_code)) { + throw new BadRequestException("终点不能为空"); + } // 根据点位编码找到对应的所属区域 Long end_region_id = pointTab.query("point_code = '" + next_point_code + "'").uniqueResult(0).getLongValue("region_id"); if (ObjectUtil.isNotEmpty(start_point_code)) { @@ -121,14 +127,18 @@ public class OutEmptyvehiclerecordServiceImpl implements OutEmptyvehiclerecordSe @Transactional(rollbackFor = Exception.class) public void update(EmptyvehiclerecordDto dto) { EmptyvehiclerecordDto entity = this.findById(dto.getRecord_uuid()); - if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); + if (entity == null) { + throw new BadRequestException("被删除或无权限，操作失败!"); + } WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); String start_point_code = dto.getStart_point_code(); String next_point_code = dto.getNext_point_code(); // 判断起点是否为空！ 入库起点不能为空 - if (ObjectUtil.isEmpty(next_point_code)) throw new BadRequestException("终点不能为空"); + if (ObjectUtil.isEmpty(next_point_code)) { + throw new BadRequestException("终点不能为空"); + } // 根据点位编码找到对应的所属区域 Long end_region_id = pointTab.query("point_code = '" + next_point_code + "'").uniqueResult(0).getLongValue("region_id"); if (ObjectUtil.isNotEmpty(start_point_code)) { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java index 990ae4a11..b2e97bcf3 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java @@ -305,6 +305,7 @@ public class InBillQueryServiceImpl implements InBillQueryService { mp.put("小卷号", json.getString("pcsn")); mp.put("箱号", json.getString("box_no")); mp.put("销售订单及行号", json.getString("sale_order_name")); + mp.put("业务员", json.getString("sales_owner")); mp.put("母卷号", json.getString("parent_container_name")); mp.put("基重（g/m³）（面密度）", NumberUtil.round(StrUtil.isEmpty(json.getString("mass_per_unit_area")) ? "0" : json.getString("mass_per_unit_area"), 1)); mp.put("居中度（mm）", "±1"); @@ -432,6 +433,7 @@ public class InBillQueryServiceImpl implements InBillQueryService { mp.put("行号", ""); } mp.put("客户编码", json.getString("customer_name")); + mp.put("业务员", json.getString("sales_owner")); mp.put("规格", json.getString("thickness_request")); mp.put("尺寸（mm）（客户要求幅宽）", String.format("%.0f", json.getDoubleValue("width_standard"))); mp.put("实际尺寸（mm）（实际幅宽）", String.format("%.0f", json.getDoubleValue("width"))); @@ -476,6 +478,7 @@ public class InBillQueryServiceImpl implements InBillQueryService { mp.put("班次", json.getString("classes")); mp.put("库区", json.getString("sect_name")); mp.put("客户编码", json.getString("customer_name")); + mp.put("业务员", json.getString("sales_owner")); if (ObjectUtil.isEmpty(json.getString("sale_order_name"))) { throw new BadRequestException("箱号"+json.getString("box_no")+"销售订单为空!"); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java index 9002215f3..c1bf48879 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java @@ -61,7 +61,9 @@ public class OutBillQueryServiceImpl implements OutBillQueryService { map.put("begin_time",begin_time); map.put("pcsn",pcsn); map.put("end_time",end_time); - if (ObjectUtil.isNotEmpty(customer_name)) map.put("customer_name","%"+customer_name+"%"); + if (ObjectUtil.isNotEmpty(customer_name)) { + map.put("customer_name","%"+customer_name+"%"); + } JSONObject json = WQL.getWO("ST_IVT_OUTBILLQUERY").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mst.input_time DESC,dis.box_no"); return json; @@ -89,7 +91,9 @@ public class OutBillQueryServiceImpl implements OutBillQueryService { } map.put("with",with); map.put("pcsn",pcsn); - if (ObjectUtil.isNotEmpty(customer_name)) map.put("customer_name","%"+customer_name+"%"); + if (ObjectUtil.isNotEmpty(customer_name)) { + map.put("customer_name","%"+customer_name+"%"); + } // 处理时间 if (ObjectUtil.isNotEmpty(begin_time) && ObjectUtil.isNotEmpty(end_time)) { @@ -175,7 +179,9 @@ public class OutBillQueryServiceImpl implements OutBillQueryService { mapParam.put("begin_time",begin_time); mapParam.put("pcsn",pcsn); mapParam.put("end_time",end_time); - if (ObjectUtil.isNotEmpty(customer_name)) mapParam.put("customer_name","%"+customer_name+"%"); + if (ObjectUtil.isNotEmpty(customer_name)) { + mapParam.put("customer_name","%"+customer_name+"%"); + } JSONArray resultJSONArray = WQL.getWO("ST_IVT_OUTBILLQUERY").addParamMap(mapParam).process().getResultJSONArray(0); @@ -245,7 +251,9 @@ public class OutBillQueryServiceImpl implements OutBillQueryService { } mapParam.put("with",with); mapParam.put("pcsn",pcsn); - if (ObjectUtil.isNotEmpty(customer_name)) mapParam.put("customer_name","%"+customer_name+"%"); + if (ObjectUtil.isNotEmpty(customer_name)) { + mapParam.put("customer_name","%"+customer_name+"%"); + } // 处理时间 if (ObjectUtil.isNotEmpty(begin_time) && ObjectUtil.isNotEmpty(end_time)) { @@ -301,6 +309,7 @@ public class OutBillQueryServiceImpl implements OutBillQueryService { mp.put("销售订单", json.getString("sale_order_name")); mp.put("行号", ""); } + mp.put("业务员", json.getString("sales_owner")); mp.put("出库日期", json.getString("input_time")); mp.put("产品规格", String.format("%.0f", json.getDoubleValue("width"))); mp.put("产品厚度", json.getString("thickness")); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/PastIvtQueryServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/PastIvtQueryServiceImpl.java index e2d7677c0..d72f199f6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/PastIvtQueryServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/PastIvtQueryServiceImpl.java @@ -66,12 +66,24 @@ public class PastIvtQueryServiceImpl implements PastIvtQueryService { map.put("date_of_production",date_of_production); map.put("date_of_FG_inbound",date_of_FG_inbound); map.put("is_sid",is_sid); - if (ObjectUtil.isNotEmpty(material_code)) map.put("material_code","%"+material_code+"%"); - if (ObjectUtil.isNotEmpty(package_box_sn)) map.put("package_box_sn","%"+package_box_sn+"%"); - if (ObjectUtil.isNotEmpty(container_name)) map.put("container_name","%"+container_name+"%"); - if (ObjectUtil.isNotEmpty(sap_pcsn)) map.put("sap_pcsn","%"+sap_pcsn+"%"); - if (ObjectUtil.isNotEmpty(sale_order_name)) map.put("sale_order_name","%"+sale_order_name+"%"); - if (ObjectUtil.isNotEmpty(customer_name)) map.put("customer_name","%"+customer_name+"%"); + if (ObjectUtil.isNotEmpty(material_code)) { + map.put("material_code","%"+material_code+"%"); + } + if (ObjectUtil.isNotEmpty(package_box_sn)) { + map.put("package_box_sn","%"+package_box_sn+"%"); + } + if (ObjectUtil.isNotEmpty(container_name)) { + map.put("container_name","%"+container_name+"%"); + } + if (ObjectUtil.isNotEmpty(sap_pcsn)) { + map.put("sap_pcsn","%"+sap_pcsn+"%"); + } + if (ObjectUtil.isNotEmpty(sale_order_name)) { + map.put("sale_order_name","%"+sale_order_name+"%"); + } + if (ObjectUtil.isNotEmpty(customer_name)) { + map.put("customer_name","%"+customer_name+"%"); + } JSONObject json = WQL.getWO("ST_IVT_PASTIVTQUERY").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "sub.package_box_sn ASC"); return json; @@ -143,12 +155,24 @@ public class PastIvtQueryServiceImpl implements PastIvtQueryService { map.put("date_of_production",date_of_production); map.put("date_of_FG_inbound",date_of_FG_inbound); map.put("is_sid",is_sid); - if (ObjectUtil.isNotEmpty(material_code)) map.put("material_code","%"+material_code+"%"); - if (ObjectUtil.isNotEmpty(package_box_sn)) map.put("package_box_sn","%"+package_box_sn+"%"); - if (ObjectUtil.isNotEmpty(container_name)) map.put("container_name","%"+container_name+"%"); - if (ObjectUtil.isNotEmpty(sap_pcsn)) map.put("sap_pcsn","%"+sap_pcsn+"%"); - if (ObjectUtil.isNotEmpty(sale_order_name)) map.put("sale_order_name","%"+sale_order_name+"%"); - if (ObjectUtil.isNotEmpty(customer_name)) map.put("customer_name","%"+customer_name+"%"); + if (ObjectUtil.isNotEmpty(material_code)) { + map.put("material_code","%"+material_code+"%"); + } + if (ObjectUtil.isNotEmpty(package_box_sn)) { + map.put("package_box_sn","%"+package_box_sn+"%"); + } + if (ObjectUtil.isNotEmpty(container_name)) { + map.put("container_name","%"+container_name+"%"); + } + if (ObjectUtil.isNotEmpty(sap_pcsn)) { + map.put("sap_pcsn","%"+sap_pcsn+"%"); + } + if (ObjectUtil.isNotEmpty(sale_order_name)) { + map.put("sale_order_name","%"+sale_order_name+"%"); + } + if (ObjectUtil.isNotEmpty(customer_name)) { + map.put("customer_name","%"+customer_name+"%"); + } JSONArray resultJSONArray = WQL.getWO("ST_IVT_PASTIVTQUERY").addParamMap(map).process().getResultJSONArray(0); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/IostordailyServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/IostordailyServiceImpl.java index f1c70357e..0b8703028 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/IostordailyServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/IostordailyServiceImpl.java @@ -57,18 +57,28 @@ public class IostordailyServiceImpl implements IostordailyService { } if (!ObjectUtil.isEmpty(material_code)) { //处理转义字符 - if (material_code.contains("\\"))material_code=material_code.replace("\\","\\\\\\"); + if (material_code.contains("\\")) { + material_code=material_code.replace("\\","\\\\\\"); + } map.put("material_code", "%" + material_code + "%"); } - if (ObjectUtil.isNotEmpty(pcsn)) map.put("pcsn", "%" + pcsn + "%"); - if (ObjectUtil.isNotEmpty(sap_pcsn)) map.put("sap_pcsn", "%" + sap_pcsn + "%"); - if (ObjectUtil.isNotEmpty(package_box_sn)) map.put("package_box_sn", "%" + package_box_sn + "%"); + if (ObjectUtil.isNotEmpty(pcsn)) { + map.put("pcsn", "%" + pcsn + "%"); + } + if (ObjectUtil.isNotEmpty(sap_pcsn)) { + map.put("sap_pcsn", "%" + sap_pcsn + "%"); + } + if (ObjectUtil.isNotEmpty(package_box_sn)) { + map.put("package_box_sn", "%" + package_box_sn + "%"); + } //获取人员对应的仓库 UserStorServiceImpl userStorService = new UserStorServiceImpl(); String in_stor_id = userStorService.getInStor(); - if (ObjectUtil.isNotEmpty(in_stor_id)) map.put("in_stor_id",in_stor_id); + if (ObjectUtil.isNotEmpty(in_stor_id)) { + map.put("in_stor_id",in_stor_id); + } JSONObject json = WQL.getWO("SendReceiveQuery").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "da.sect_date desc"); diff --git a/lms/nladmin-ui/src/assets/images/noblelift.png b/lms/nladmin-ui/src/assets/images/noblelift.png new file mode 100644 index 000000000..a1ca19b2d Binary files /dev/null and b/lms/nladmin-ui/src/assets/images/noblelift.png differ diff --git a/lms/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue b/lms/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue index 099b86c14..c3b588b8e 100644 --- a/lms/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue +++ b/lms/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue @@ -289,6 +289,7 @@ export default { this.form.tableMater = [] this.form.dtl_row = null this.sectProp = null + this.sects = [] this.$emit('update:dialogShow', false) this.$emit('AddChanged') this.crud.refresh()