#

lty

3 天以前 6494d25e5677f2e81c898006b3aada6260511f33

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

@@ -64,7 +64,7 @@
        EntityWrapper<Mat> wrapper = new EntityWrapper<>();
        if (!Cools.isEmpty(condition)) {
//            wrapper.like("matnr", condition).or().like("maktx", condition);
            wrapper.like("matnr", condition).or().like("specs", condition);
            wrapper.like("matnr", condition).or().like("maktx", condition).or().like("model", condition);
        }
        wrapper.orderBy("create_time", false);
        List<Mat> mats = matService.selectList(wrapper);
@@ -98,7 +98,9 @@
                , String.valueOf(tagId)
                , param.get("matnr")
                , param.get("maktx")
                , param.get("specs"))
                , param.get("specs")
                , param.get("model"))

        );

    }
@@ -167,13 +169,6 @@
                          @RequestParam(defaultValue = "10")Integer limit,
                          @RequestParam Map<String, Object> param){
        return R.ok(matService.getMatTurnPage(toPage(curr, limit, param, Mat.class)));
    }

    @RequestMapping("/mat/turn/over/out/start")
    @ManagerAuth(memo = "品号移交")
    public R turnOverOutStart(@RequestBody EmptyPlateOutParam param) {

        return R.ok("品号移交成功");
    }

    @RequestMapping("/mat/turn/over/take/site")
@@ -324,7 +319,7 @@
    @ManagerAuth
    public R getMatDataKV(@RequestParam(required = false) String condition) {
        Wrapper<Mat> wrapper = new EntityWrapper<Mat>()
                .andNew().like("matnr", condition).or().like("maktx", condition)
                .andNew().like("matnr", condition).or().like("maktx", condition).or().like("model",condition)
                .orderBy("create_time", false);
        List<Mat> mats = matService.selectPage(new Page<>(1, 30), wrapper).getRecords();
        List<KeyValueVo> valueVos = new ArrayList<>();