Merge remote-tracking branch 'origin/tzskwcs_3' into tzskwcs_3

Junjie

2023-12-08 90837a296624c52e9d6cc1133183ea983f333a18

 src/main/java/com/zy/common/model/MatDto.java

@@ -27,6 +27,9 @@
    // 物料名称
    private String model;

    // 箱码
    private String containerCode;

    // 条码
    private String batch;

@@ -62,4 +65,21 @@
        this.count = count;
        this.total = total;
    }
    public MatDto(String matNo, String maknx, Double count,Double total,String specs,String containerCode) {
        this.containerCode = containerCode;
        this.specs = specs;
        this.matNo = matNo;
        this.maknx = maknx;
        this.count = count;
        this.total = total;
    }
    public MatDto(String matNo, String maknx, Double count,Double total,String specs,String containerCode,String orderNo) {
        this.containerCode = containerCode;
        this.specs = specs;
        this.matNo = matNo;
        this.maknx = maknx;
        this.count = count;
        this.total = total;
        this.orderNo = orderNo;
    }
}