#

lty

昨天 d186278175dd4f1c38ce39491031a79fcca06a88

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

@@ -95,12 +95,12 @@
            return Re.error("仓库编号不匹配");
        }
        List<WaitPakin> waitPakins = null;
        if (param.getFromPort().equals("101")) {
        if (param.getFromPort().equals("1001")) {

            //有空板出库时禁止入库
            int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 110).eq("sta_no", 100).notIn("wrk_sts", 7));
            if(wrkCount > 0){
                return Re.error("有空板出库到100站时时禁止入库");
                return Re.error("有空板出库到1001站时时禁止入库");
            }

            if (Cools.isEmpty(param.getBarCode())) {
@@ -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;
@@ -179,9 +179,10 @@
            return Re.error("仓库编号不匹配");
        }

        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(Integer.valueOf(param.getFromPort()), true);
        LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
//        // 源站点状态检测
//        BasDevp sourceStaNo = basDevpService.checkSiteStatus(Integer.valueOf(param.getFromPort()), true);
        LocTypeDto locTypeDto = new LocTypeDto();
        locTypeDto.setLocType1((short) 2);

        StartupDto dto = null;