#

1

4 天以前 4c938d05b234e6142e94869eaec5e6d86efee382

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

@@ -12,6 +12,8 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.MatPrint;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.param.EmptyPlateOutParam;
import com.zy.asrs.entity.result.KeyValueVo;
import com.zy.asrs.service.MatService;
import com.zy.asrs.utils.MatExcelListener;
@@ -61,7 +63,8 @@
    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("maktx", condition);
            wrapper.like("matnr", condition).or().like("specs", condition);
        }
        wrapper.orderBy("create_time", false);
        List<Mat> mats = matService.selectList(wrapper);
@@ -74,7 +77,7 @@
        return R.ok(matService.selectById(String.valueOf(id)));
    }

    @RequestMapping(value = "/matCode/auth0")
    @RequestMapping(value = "/mat/auth")
    @ManagerAuth
    public R find(@RequestParam("matnr") String matnr) {
        return R.ok(matService.selectOne(new EntityWrapper<Mat>().eq("matnr", matnr)));
@@ -91,10 +94,11 @@
        if (Cools.isEmpty(tagId)) {
            tagId = getOriginTag().getId();
        }
        return R.ok(matService.getPage(new Page<>(curr, limit)
        return R.ok(matService.getPage2(new Page<>(curr, limit)
                , String.valueOf(tagId)
                , param.get("matnr")
                , param.get("maktx"))
                , param.get("maktx")
                , param.get("specs"))
        );

    }
@@ -136,9 +140,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();
    }

@@ -155,6 +161,28 @@
            }
        }
        return R.ok();
    }

    @RequestMapping(value = "/mat/turn/over/list/auth")
    @ManagerAuth
    public R turnOverList(@RequestParam(defaultValue = "1")Integer curr,
                          @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/take/site")
    @ManagerAuth()
    public R availableTakeSite(@RequestParam(required = false) String matnr){
        List<Map<String, Object>> result = new ArrayList<>();
        List<Mat> mats = matService.selectByMatnrLink(matnr);
        for (Mat mat : mats) {
            Map<String, Object> map = new HashMap<>();
            map.put("siteId", mat.getId());
            map.put("desc", mat.getMatnr());
            result.add(map);
        }
        return R.ok().add(result);
    }

    @RequestMapping(value = "/mat/export/auth")
@@ -192,6 +220,21 @@
            return R.parse(BaseRes.REPEAT).add(getComment(Mat.class, String.valueOf(param.get("key"))));
        }
        return R.ok();
    }

    @RequestMapping(value = "/mat/covert/{id}/auth")
    @ManagerAuth
    public R covert(@PathVariable("id") String id) {
        Mat mat = matService.selectByMatnr(String.valueOf(id));
        if (mat == null) {
            return R.ok();
        }
        OrderDetl orderDetl = new OrderDetl();
        orderDetl.sync(mat);
        orderDetl.setStandby1(mat.getSupp());
        orderDetl.setStandby2(mat.getSku());
        orderDetl.setAnfme(0.0D);
        return R.ok().add(orderDetl);
    }

    /*************************************** 打印相关 ***********************************************/
@@ -235,6 +278,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);
@@ -274,7 +319,7 @@
    /*************************************** xm-select ***********************************************/

    // xm-select 搜索商品列表
    @RequestMapping("/mat/all/get/kv0") // todo:luxiaotao
    @RequestMapping("/mat/all/get/kv")
    @ManagerAuth
    public R getMatDataKV(@RequestParam(required = false) String condition) {
        Wrapper<Mat> wrapper = new EntityWrapper<Mat>()
@@ -285,7 +330,7 @@
        for (Mat mat : mats) {
            KeyValueVo vo = new KeyValueVo();
            vo.setName(mat.getMatnr() + " - " + mat.getMaktx());
            vo.setValue(mat.getId());
            vo.setValue(mat.getMatnr());
            valueVos.add(vo);
        }
        return R.ok().add(valueVos);