qw

zc

2025-04-19 956f99c17ceef2b08f284e566a6a08b7b007286a

qw

 src/main/java/com/zy/asrs/controller/BasDevpController.java

@@ -134,7 +134,7 @@
    public R query(String condition) {
        EntityWrapper<BasDevp> wrapper = new EntityWrapper<>();
        wrapper.like("dev_no", condition);
        Page<BasDevp> page = basDevpService.selectPage(new Page<>(0, 10), wrapper);
        Page<BasDevp> page = basDevpService.selectPage(new Page<>(0, 1000), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (BasDevp basDevp : page.getRecords()){
            Map<String, Object> map = new HashMap<>();

 src/main/java/com/zy/asrs/controller/WorkController.java

@@ -67,7 +67,7 @@
    @RequestMapping("/available/take/site")
    @ManagerAuth()
    public R availableTakeSite() {
        Set<Map<String, Object>> result = new TreeSet<>();
        Set<Map<String, Object>> result = new HashSet<>();
        EntityWrapper<StaDesc> wrapper = new EntityWrapper<>();
        // 不同继承角色显示不同库信息
        //RoleUtils.addRoleWrapperByCrn(getUserId(),wrapper);

 src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java

@@ -79,18 +79,24 @@
            throw new CoolException(devpNo+"站点不存在");
        }
        if (pakin) {
            if(station.getAutoing()==null || !station.getAutoing().equals("Y")) {
                throw new CoolException(devpNo+"站点不是自动状态");
            }
            if(station.getLoading()==null || !station.getLoading().equals("Y")) {
                throw new CoolException(devpNo+"站点无物");
            }
            if (devpNo < 1100) {
//            if(station.getWrkNo()!=null && station.getWrkNo()>0 && station.getWrkNo() < 9990) {
//                throw new CoolException(devpNo+"站点已有工作号");
//            }
//            if(!station.getInEnable().equals("Y")) {
//                throw new CoolException(devpNo+"站点不是可入状态");
//            }
                if (!station.getCanining().equals("Y")) {
                    throw new CoolException(devpNo + "站点不是能入状态");
                }
            } else {
                if (station.getAutoing() == null || !station.getAutoing().equals("Y")) {
                    throw new CoolException(devpNo + "站点不是自动状态");
                }
                if (station.getLoading() == null || !station.getLoading().equals("Y")) {
                    throw new CoolException(devpNo + "站点无物");
                }
            }
            if(wrkMastService.getWorkingMast(devpNo)>0){
                throw new CoolException(devpNo+"站点不能同时生成两笔入库工作档");
            }

 src/main/java/com/zy/common/service/CommonService.java

@@ -150,6 +150,7 @@
            }

        }catch (Exception e){
            e.printStackTrace();
            log.error("站点={} 未查询到对应的规则",sourceStaNo);
        }
        return null;