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

zhang

2025-07-15 641f7bb8b2d2e23f1f5192fecf030a567151c7b5

 src/main/java/com/zy/asrs/controller/MatController.java

@@ -105,6 +105,33 @@

    }

    @RequestMapping(value = "/boxMat/list/auth")
    @ManagerAuth
    public R listBox(@RequestParam(defaultValue = "1") Integer curr,
                     @RequestParam(defaultValue = "10") Integer limit,
                     @RequestParam(required = false) String orderByField,
                     @RequestParam(required = false) String orderByType,
                     @RequestParam Map<String, Object> param) {

        Object tagIdObj = param.get("tag_id");
        if (Cools.isEmpty(tagIdObj)) {
            tagIdObj = getOriginTag().getId();
        }

        String tagId = String.valueOf(tagIdObj);



        return R.ok(matService.getPage(
                new Page<>(curr, limit),
                tagId,
                param.get("matnr"),
                param.get("memo")
        ));
    }



    private void convert(Map<String, Object> map, EntityWrapper wrapper){
        for (Map.Entry<String, Object> entry : map.entrySet()){
            String val = String.valueOf(entry.getValue());