#

lty

2026-01-12 49ac73e622fa786e47fbf1b2a9767357edb85943

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

@@ -134,18 +134,18 @@
        if (Cools.isEmpty(param.getCargoHeight())) {
            return Re.error("高低检测信号不能为空");
        }
        if (!param.getBarCode().startsWith("7")&&!param.getBarCode().startsWith("8")){
            return Re.error("未定义的托盘码规则");
        }
//        if (!param.getBarCode().startsWith("7")&&!param.getBarCode().startsWith("8")){
//            return Re.error("未定义的托盘码规则");
//        }

        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(Integer.valueOf(param.getFromPort()), true);
        sourceStaNo.setLocType1(param.getCargoHeight().shortValue()); // 高低库位
        if (param.getBarCode().startsWith("7")){
            sourceStaNo.setLocType2((short) 1); // 宽窄库位 1.窄库位1200*1000*990  1期库位
        }else if (param.getBarCode().startsWith("8")){
            sourceStaNo.setLocType2((short) 2); // 宽窄库位 2.宽库位1200*1000*1270  2期库位
        }
//        if (param.getBarCode().startsWith("7")){
//            sourceStaNo.setLocType2((short) 1); // 宽窄库位 1.窄库位1200*1000*990
//        }else if (param.getBarCode().startsWith("8")){
//            sourceStaNo.setLocType2((short) 2); // 宽窄库位 2.宽库位1200*1000*1270
//        }
        LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);

        StartupDto dto = null;
@@ -548,7 +548,7 @@
        for (LocMast locMast : locMasts) {
            if (locMast.getLocSts() != "X" && locMast.getLocSts() != "G" ) {
                HashMap<String, Object> map = new HashMap<>();
                map.put("warehouse", "ddth");
                map.put("warehouse", "aryd");
                map.put("posiX", locMast.getRow1());
                map.put("posiY", locMast.getBay1());
                map.put("posiZ", locMast.getLev1());
@@ -562,7 +562,7 @@
            }
            if(locMast.getLocSts() == "G"){
                HashMap<String, Object> map = new HashMap<>();
                map.put("warehouse", "ddth");
                map.put("warehouse", "aryd");
                map.put("posiX", locMast.getRow1());
                map.put("posiY", locMast.getBay1());
                map.put("posiZ", locMast.getLev1());
@@ -572,7 +572,7 @@
            }
            if(locMast.getLocSts() == "X"){
                HashMap<String, Object> map = new HashMap<>();
                map.put("warehouse", "ddth");
                map.put("warehouse", "aryd");
                map.put("posiX", locMast.getRow1());
                map.put("posiY", locMast.getBay1());
                map.put("posiZ", locMast.getLev1());