#1

czkh

2025-12-21 13887c2ec44d483eadedd98c3c1aa06efeb786d4

#1

 src/main/java/com/zy/asrs/mapper/WaitPakinMapper.java

@@ -13,6 +13,6 @@
    @Select("select count(*) from cust_wait_pakin where matnr = #{matnr};")
    Integer selectCountByMatNr(String matnr);

    @Select("select count(*) from cust_wait_pakin where matnr = #{matnr} and zpallet = #{zpallet};")
    Integer selectByBarcodeAndMatnr(String matnr, String zpallet);
    @Select("select count(*) from cust_wait_pakin where matnr = #{matnr};")
    Integer selectByBarcodeAndMatnr(String matnr);
}

 src/main/java/com/zy/asrs/service/WaitPakinService.java

@@ -12,5 +12,5 @@

    Integer selectCountByMatNr(String matnr);

    Integer selectByBarcodeAndMatnr(String matnr, String zpallet);
    Integer selectByBarcodeAndMatnr(String matnr);
}

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

@@ -50,9 +50,9 @@
            }

            //对于已经组托过的 模具+托盘 不允许再次组托
            Integer waitPakinCount = waitPakinService.selectByBarcodeAndMatnr(matBarcode.getMatnr(), matBarcode.getZpallet());
            Integer waitPakinCount = waitPakinService.selectByBarcodeAndMatnr(matBarcode.getMatnr());
            if (waitPakinCount >= 1){
                throw new CoolException("该模具已经组托,商品模具名称:" + matBarcode.getMatnr() + "托盘码:" + matBarcode.getZpallet());
                throw new CoolException("该模具已经组托,商品模具名称:" + matBarcode.getMatnr());
            }
            WaitPakin waitPakin1 = new WaitPakin();
            waitPakin1.sync(mat);
@@ -82,7 +82,7 @@
    }

    @Override
    public Integer selectByBarcodeAndMatnr(String matnr, String zpallet) {
        return this.baseMapper.selectByBarcodeAndMatnr(matnr, zpallet);
    public Integer selectByBarcodeAndMatnr(String matnr) {
        return this.baseMapper.selectByBarcodeAndMatnr(matnr);
    }
}

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

@@ -332,7 +332,7 @@

                }
            }
            if (locMasts.size() <= 5){
            if (locMasts.size() < 2){
                throw new CoolException("无空库位可用");
            }
            List<LocMast> locMastList = new ArrayList<>();