#

zzgtfwq

1 天以前 f5c89a9b01b0cae70a7e0ccd878fb75121743929

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

@@ -58,16 +58,23 @@
        return R.ok().add(mats);
    }

//    @RequestMapping(value = "/mat/search/pda/auth")
//    @ManagerAuth
//    public R pdaSearch(@RequestParam(required = false)String condition){
//        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.orderBy("create_time", false);
//        List<Mat> mats = matService.selectList(wrapper);
//        return R.ok().add(mats);
//    }

    @RequestMapping(value = "/mat/search/pda/auth")
    @ManagerAuth
    public R pdaSearch(@RequestParam(required = false)String condition){
        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.orderBy("create_time", false);
        List<Mat> mats = matService.selectList(wrapper);
        List<Mat> mats = matService.selectByMatnrLink10(condition);
        return R.ok().add(mats);
    }

@@ -140,9 +147,11 @@
        if (Cools.isEmpty(mat) || null==mat.getId()){
            return R.error();
        }
        String oldMatnr = matService.getOldMatnr(mat.getId());
        mat.setUpdateBy(getUserId());
        mat.setUpdateTime(new Date());
        matService.updateById(mat);

        return R.ok();
    }

@@ -167,13 +176,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")
@@ -281,6 +283,8 @@
            print.setBarcode(mat.getBarcode());
            print.setMaktx(mat.getMaktx());
            print.setSpecs(mat.getSpecs());
            print.setSupp(mat.getSupp());
            print.setSku(mat.getSku());
            print.setUnit(mat.getUnit());
            print.setMemo(mat.getMemo());
            res.add(print);