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

pjb

2024-12-31 c4e8e814d2c9e0d03f6449860b70e58657fd7dc2

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

@@ -19,13 +19,16 @@
    // 库位编号
    private String locno;

    // 货主
    private int owner;
//    // 货主
//    private int owner;

    private List<CombMat> combMats;

    @Data
    public static class CombMat {

        // 单据编号
        private String orderNo;

        // 物料编号
        private String matnr;
@@ -36,6 +39,8 @@
        // 物料数量
        private Double anfme;

        private Double weight;

    }

}