#

Junjie

2025-06-08 33cb25f6fb87e7781bf5f62c7fa879db52d0715a

#

 src/main/java/com/zy/asrs/utils/VersionUtils.java

@@ -28,7 +28,11 @@
     **/
    public static boolean locMoveCheckLocTypeComplete(LocMast loc, LocTypeDto dto) {
        // 如果源库位是高库位，目标库位是低库位
        return dto.getLocType1().equals(loc.getLocType1());
        boolean flag = dto.getLocType1().equals(loc.getLocType1());
        if (flag) {
            flag = dto.getLocType2().equals(loc.getLocType2());
        }
        return flag;
    }

}

 src/main/java/com/zy/common/web/WcsController.java

@@ -87,6 +87,15 @@
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), true);
        sourceStaNo.setLocType1(param.getLocType1());
        LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
        if (param.getBarcode().startsWith("11")) {
            locTypeDto.setLocType2((short) 1);
        }else if (param.getBarcode().startsWith("13")) {
            locTypeDto.setLocType2((short) 2);
        }else if (param.getBarcode().startsWith("16")) {
            locTypeDto.setLocType2((short) 3);
        }else {
            return R.error("未知托盘码规则");
        }

        StartupDto dto = null;
        switch (param.getIoType()) {
@@ -179,6 +188,9 @@
//        dto.setWorkNo(Integer.parseInt(Math.random() * 1000 + ""));

        StartupDto dto = commonService.getLocNo( 1, devpNo,findLocNoAttributeVo, locTypeDto);
        if (dto == null) {
            throw new CoolException("找不到空库位");
        }
        int workNo = dto.getWorkNo();
        Date now = new Date();
        // 生成工作档