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

lty

2025-09-23 766b76e287b7be3a51a9448d5045c39ec6c245f8

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

@@ -62,11 +62,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.specs = basArmMast.getPo();
            this.brand = basArmMast.getUpc();
            this.standby1 = basArmMast.getSupplier();
        }
    }