pda组托逻辑调整

王佳豪

2021-04-28 de1a08656cf1b5e10dfe3ba31b497ce246daba62

pda组托逻辑调整

 src/main/java/com/zy/asrs/entity/param/CombParam.java

@@ -15,8 +15,11 @@
    // 成品码
    private String productCode;

    // 生产单号
    //
    private String warehouse;

    // 生产单号
    private String mnemonic;

    private String billNo;

@@ -28,6 +31,14 @@
        this.warehouse = warehouse;
    }

    public String getMnemonic() {
        return mnemonic;
    }

    public void setMnemonic(String mnemonic) {
        this.mnemonic = mnemonic;
    }

    public static class CombMat {

        // 物料编号

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

@@ -123,18 +123,18 @@
                    waitPakinService.delete(new EntityWrapper<WaitPakin>()
                            .eq("supplier", param.getBillNo())
                            .eq("matnr", combMat.getMatNo())
                            .eq("warehouse", param.getWarehouse())
                            .eq("mnemonic", param.getMnemonic())
                            .isNull("zpallet"));
                } else {
                    Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>();
                    if ("".equals(param.getWarehouse())) {
                    if ("".equals(param.getMnemonic())) {
                        wrapper.eq("supplier", param.getBillNo())
                                .eq("matnr", combMat.getMatNo())
                                .isNull("zpallet");
                    } else {
                        wrapper.eq("supplier", param.getBillNo())
                                .eq("matnr", combMat.getMatNo())
                                .eq("warehouse", param.getWarehouse())
                                .eq("mnemonic", param.getMnemonic())
                                .isNull("zpallet");
                    }
                    WaitPakin pakin = new WaitPakin();