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

zhang

2025-07-15 641f7bb8b2d2e23f1f5192fecf030a567151c7b5

 src/main/java/com/zy/asrs/entity/WrkDetl.java

@@ -51,7 +51,7 @@
    /**
     * 物料
     */
    @ApiModelProperty(value= "商品编号")
    @ApiModelProperty(value= "规格")
    private String matnr;

    /**
@@ -394,7 +394,7 @@
        if (!Cools.isEmpty(basBoxType)){
            return String.valueOf(basBoxType.getBoxSpecs());
        }
        return null;
        return this.brand;
    }

    public void sync(Object source) {