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

Junjie

2023-05-26 ea5e88b0c6f5be4d0c6637b5e7bba94ee85f9673

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

@@ -16,19 +16,27 @@
    // 托盘条码
    private String barcode;

    // 是否冻结
    private Integer frozen;

    private List<CombMat> combMats;

    @Data
    public static class CombMat {

        // 物料编号
        private String matNo;
        private String matnr;

        // 批号
        // 序列码
        private String batch;

        // 物料数量
        private Double count;
        private Double anfme;

        // 备注
        private String memo;

        private String cstmr;

    }