#

1

2 天以前 cb67fb9d5f84c03bfe9b0e6a250553520729a317

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

@@ -51,23 +51,28 @@

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

        // sku
        private String sku = "";
        //备注
        private String memo = "";

        private String supplier = "";

        public CombMat() {

        }
        public CombMat(BasArmMast basArmMast) {
            this.orderNo = basArmMast.getOrderNo();
            this.matnr = basArmMast.getSku();
            this.matnr = basArmMast.getMatnr();
//            this.batch = basArmMast.getCreateTime().toString();
            this.anfme = basArmMast.getCtns().doubleValue();
            this.specs = basArmMast.getPo();
            this.brand = basArmMast.getUpc();
            this.standby1 = basArmMast.getSupplier();
            this.standby1 = basArmMast.getPo();
            this.standby2 = basArmMast.getUpc();
            this.standby3 = basArmMast.getSku();
            this.supplier = basArmMast.getSupplier();
//            this.supp = basArmMast.getSupplier();
        }
    }

@@ -77,6 +82,11 @@
    public CombParam(List<BasArmMast> basArmMastList) {
        this.orderNo = basArmMastList.get(0).getOrderNo();
        this.combMats = new ArrayList<>();
        if (basArmMastList.size()>1){
            this.barcode = basArmMastList.get(1).getBarcode();
        } else {
            this.barcode = basArmMastList.get(0).getBarcode();
        }
        List<BasArmMast> basArmMasts = new ArrayList<>();
        for (BasArmMast basArmMast : basArmMastList) {
            if (basArmMasts.isEmpty()){