#

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);
    }


 src/main/java/com/zy/asrs/mapper/MatMapper.java

@@ -21,6 +21,7 @@
    Mat selectLatest();

    List<Mat> selectByMatnrLink(@Param("matnr")String matnr);
    List<Mat> selectByMatnrLink10(@Param("matnr")String matnr);

    Mat selectNewUpdateTime();


 src/main/java/com/zy/asrs/service/MatService.java

@@ -13,6 +13,7 @@

    Mat selectByMatnr(String matnr);
    List<Mat> selectByMatnrLink(String matnr);
    List<Mat> selectByMatnrLink10(String matnr);
    Mat selectLatest();
    Page<Mat> getMatTurnPage(Page<Mat> page);


 src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java

@@ -38,6 +38,12 @@
        return this.baseMapper.selectByMatnrLink(matnr);
    }


    @Override
    public List<Mat> selectByMatnrLink10(String matnr) {
        return this.baseMapper.selectByMatnrLink10(matnr);
    }

    @Override
    public Mat selectNewUpdateTime() {
        return this.baseMapper.selectNewUpdateTime();

 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java

@@ -555,8 +555,8 @@
            throw new CoolException(param.getBarcode() + "数据正在进行入库");
        }

        if(param.getBarcode().length()!=6){
            throw new CoolException("条码长度不是6位===>>" + param.getBarcode());
        if(param.getBarcode().length()!=8){
            throw new CoolException("条码长度不是8位===>>" + param.getBarcode());
        }
//        if (param.getCombMats().size()>1){
//            throw new CoolException("不允许混料===>>" + param.getBarcode());

 src/main/resources/mapper/MatMapper.xml

@@ -117,6 +117,14 @@
        </if>
    </select>

    <select id="selectByMatnrLink10" resultMap="BaseResultMap">
        select TOP 20 * from man_mat
        where 1=1
        <if test="matnr != null and matnr != ''">
            and mm.matnr like concat('%',#{matnr},'%')
        </if>
    </select>

    <select id="selectNewUpdateTime" resultMap="BaseResultMap">
        select top 1 * from man_mat
        where 1=1