#

whycq

2023-01-10 03210aeb31d8e9dfa3c1f9f065587d7208d80dd8

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

@@ -12,7 +12,10 @@
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.dto.OrderDetlWithSum;
import com.zy.asrs.entity.result.KeyValueVo;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.MatService;
import com.zy.asrs.utils.MatExcelListener;
import com.zy.common.CodeRes;
@@ -41,6 +44,9 @@
    @Autowired
    private SnowflakeIdWorker snowflakeIdWorker;

    @Autowired
    private LocDetlService locDetlService;

    @RequestMapping(value = "/mat/auto/matnr/auth")
    public R autoMatnr(){
        return R.ok().add("YJ" + DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmsssss).substring(0, 16));
@@ -56,12 +62,23 @@
        return R.ok().add(mats);
    }

    @RequestMapping(value = "/mat/list/pda/page/auth")
    @ManagerAuth
    public R pdaPageList(@RequestParam(required = true)Long tagId,
                         @RequestParam(defaultValue = "1")Integer curr,
                         @RequestParam(defaultValue = "10")Integer limit){
        EntityWrapper<Mat> wrapper = new EntityWrapper<>();
        wrapper.eq("tag_id", tagId);
        wrapper.orderBy("create_time", false);
        return R.ok().add(matService.selectPage(new Page<>(curr, limit), wrapper));
    }

    @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("maktx", condition).or().like("specs", condition);
        }
        wrapper.orderBy("create_time", false);
        List<Mat> mats = matService.selectList(wrapper);
@@ -74,10 +91,14 @@
        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)));
        Mat mat = matService.selectOne(new EntityWrapper<Mat>().eq("matnr", matnr));
        if(Cools.isEmpty(mat)){
            return R.error("物料数据不存在，请检查物料档案");
        }
        return R.ok(mat);
    }

    @RequestMapping(value = "/mat/list/auth")
@@ -94,7 +115,9 @@
        return R.ok(matService.getPage(new Page<>(curr, limit)
                , String.valueOf(tagId)
                , param.get("matnr")
                , param.get("maktx"))
                , param.get("maktx")
                , param.get("specs")
                )
        );

    }
@@ -194,6 +217,21 @@
        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();
        }
//        OrderDetlWithSum orderDetl = new OrderDetlWithSum();
        OrderDetl orderDetl = new OrderDetl();
        orderDetl.sync(mat);
        orderDetl.setAnfme(0.0D);
//        orderDetl.setSum(locDetlService.selectSumByMatnr(mat.getMatnr()));
        return R.ok().add(orderDetl);
    }

    /*************************************** 打印相关 ***********************************************/

    @RequestMapping(value = "/mac/code/auth")
@@ -274,18 +312,18 @@
    /*************************************** 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>()
                .andNew().like("matnr", condition).or().like("maktx", condition)
                .andNew().like("matnr", condition).or().like("maktx", condition).or().like("specs", condition)
                .orderBy("create_time", false);
        List<Mat> mats = matService.selectPage(new Page<>(1, 30), wrapper).getRecords();
        List<KeyValueVo> valueVos = new ArrayList<>();
        for (Mat mat : mats) {
            KeyValueVo vo = new KeyValueVo();
            vo.setName(mat.getMatnr() + " - " + mat.getMaktx());
            vo.setValue(mat.getId());
            vo.setName(mat.getSpecs() + "-" + mat.getMaktx() + " - " + mat.getMatnr());
            vo.setValue(mat.getMatnr());
            valueVos.add(vo);
        }
        return R.ok().add(valueVos);