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

cp

2024-05-28 50f77573733a37a26af10718d1c33f353dabbe96

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

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java

@@ -1,5 +1,6 @@
package com.zy.asrs.wms.controller;

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.common.domain.entity.Parameter;
@@ -193,11 +194,17 @@
            return R.error();
        }

        String pic = locMast.getPic();
        ArrayList<String> list = new ArrayList<>();
        String picStr = locMast.getPic();
        if (Cools.isEmpty(picStr)) {
            return R.ok().add(list);
        }
        List<String> pics = JSON.parseArray(picStr, String.class);
        for (String pic : pics) {
        list.add("http://" + WCS_URL + "/image/" + pic + "-1.jpg");
        list.add("http://" + WCS_URL + "/image/" + pic + "-2.jpg");
        return R.ok().add(list);
        }
        return R.ok().add(pics);
    }

}

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

@@ -33,6 +33,14 @@
        return R.ok(matService.getById(id));
    }

    @RequestMapping(value = "/mat/auth")
    @ManagerAuth
    public R find(@RequestParam("matnr") String matnr) {
        return R.ok(matService.getOne(new LambdaQueryWrapper<Mat>()
                .eq(Mat::getMatnr, matnr)
                .eq(Mat::getHostId, getHostId())));
    }

    @RequestMapping(value = "/mat/page/auth")
    @ManagerAuth
    public R page(@RequestParam(defaultValue = "1") Integer curr,