*

1

2 天以前 7cefeee8ebf28abf429c3654a0520da2469207f1

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

@@ -51,6 +51,7 @@

        // 规格
        private String specs = "";
        private String supp = "";

        // sku
        private String sku = "";
@@ -62,11 +63,12 @@
        }
        public CombMat(BasArmMast basArmMast) {
            this.orderNo = basArmMast.getOrderNo();
            this.matnr = basArmMast.getMatnr();
            this.matnr = basArmMast.getSku();
//            this.batch = basArmMast.getCreateTime().toString();
            this.anfme = basArmMast.getCtns().doubleValue();
            this.specs = basArmMast.getOrderNo();
            this.sku = basArmMast.getSku();
            this.standby1 = basArmMast.getPo();
            this.standby2 = basArmMast.getUpc();
            this.supp = basArmMast.getSupplier();
        }
    }

@@ -76,6 +78,7 @@
    public CombParam(List<BasArmMast> basArmMastList) {
        this.orderNo = basArmMastList.get(0).getOrderNo();
        this.combMats = new ArrayList<>();
        this.barcode = basArmMastList.get(0).getBarcode();
        List<BasArmMast> basArmMasts = new ArrayList<>();
        for (BasArmMast basArmMast : basArmMastList) {
            if (basArmMasts.isEmpty()){