#

18516761980

2022-01-26 4ec829bcbe9d8370476b71c9692eb7b3ef6e5e6f

#

 src/main/java/com/zy/asrs/entity/PltBarcode.java

@@ -113,6 +113,9 @@
    @ApiModelProperty(value= "备注")
    private String memo;

    @ApiModelProperty(value= "批号")
    private String supplier;

    /**
     * ERP连线 0: 非连线  1: ERP连线  
     */
@@ -337,6 +340,14 @@
        this.weight = weight;
    }

    public String getSupplier() {
        return supplier;
    }

    public void setSupplier(String supplier) {
        this.supplier = supplier;
    }

    public String getMemo() {
        return memo;
    }

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

@@ -14,26 +14,6 @@

    private String billNo;
    
    private String supplier;
    
    private String memo;

    public String getSupplier() {
        return supplier;
    }

    public void setSupplier(String supplier) {
        this.supplier = supplier;
    }

    public String getMemo() {
        return memo;
    }

    public void setMemo(String memo) {
        this.memo = memo;
    }

    public static class CombMat {

        private String seqNo;
@@ -43,6 +23,10 @@

        // 产品数量
        private Double count;

        private String supplier;

        private String memo;

        public String getSeqNo() {
            return seqNo;
@@ -68,6 +52,22 @@
            this.count = count;
        }

        public String getSupplier() {
            return supplier;
        }

        public void setSupplier(String supplier) {
            this.supplier = supplier;
        }

        public String getMemo() {
            return memo;
        }

        public void setMemo(String memo) {
            this.memo = memo;
        }

    }

    public String getBillNo() { return billNo; }

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

@@ -77,6 +77,8 @@
                pltBarcode.setUnit(matCode.getUnit());
                pltBarcode.setSpecs(matCode.getSpecs());
                pltBarcode.setSize(matCode.getSize());
                pltBarcode.setSupplier(combMat.getSupplier());
                pltBarcode.setMemo(combMat.getMemo());
                pltBarcode.setColor(matCode.getColor());
                pltBarcode.setLinkErp(0);
                pltBarcode.setModiUser(userId);

 src/main/java/erpreqLog.sql

File was deleted

 src/main/java/ioComplete.sql

File was deleted

 src/main/java/ioCompleteLog.sql

File was deleted

 src/main/java/pltBarcode.sql

File was deleted

 src/main/java/stockSync.sql

File was deleted

 src/main/java/waitMatchk.sql

File was deleted

 src/main/java/waitMatchkLog.sql

File was deleted

 src/main/java/waitMatin.sql

File was deleted

 src/main/java/waitMatinLog.sql

File was deleted

 src/main/java/waitMatout.sql

File was deleted

 src/main/java/waitMatoutLog.sql

File was deleted