#

lsh

2023-12-13 7d9150b95d7db9833de2e57948f5985dfa2a1914

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

@@ -13,8 +13,10 @@
import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.MatPrint;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.Pakout;
import com.zy.asrs.entity.result.KeyValueVo;
import com.zy.asrs.service.MatService;
import com.zy.asrs.service.PakoutService;
import com.zy.asrs.utils.MatExcelListener;
import com.zy.common.CodeRes;
import com.zy.common.config.AdminInterceptor;
@@ -41,6 +43,8 @@
    private MatService matService;
    @Autowired
    private SnowflakeIdWorker snowflakeIdWorker;
    @Autowired
    private PakoutService pakoutService;

    @RequestMapping(value = "/mat/auto/matnr/auth")
    public R autoMatnr(){
@@ -49,12 +53,17 @@

    @RequestMapping(value = "/mat/list/pda/auth")
    @ManagerAuth
    public R pdaList(@RequestParam(required = true)Long tagId){
    public R pdaList(@RequestParam(defaultValue = "1")Integer curr,
                     @RequestParam(defaultValue = "20")Integer limit,
                     @RequestParam Map<String, Object> param,
                     @RequestParam(required = true) Long tagId){
        EntityWrapper<Mat> wrapper = new EntityWrapper<>();
        wrapper.eq("tag_id", tagId);
        wrapper.orderBy("create_time", false);
        List<Mat> mats = matService.selectList(wrapper);
        return R.ok().add(mats);
//        wrapper.eq("tag_id", tagId);
//        wrapper.orderBy("create_time", false);
        Page<Mat> matPage = toPage(curr, limit, param, Mat.class);
        Page<Mat> page = matService.selectAllPage(matPage);
       // List<Mat> mats = matService.selectList(wrapper);
        return R.ok().add(page);
    }

    @RequestMapping(value = "/mat/search/pda/auth")
@@ -208,6 +217,13 @@
        return R.ok().add(orderDetl);
    }

    @RequestMapping(value = "/pakOut/show")
    public R showQR(){
        List<Pakout> manPakOuts = pakoutService.selectList(null);
        return R.ok(manPakOuts);
    }


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

    @RequestMapping(value = "/mac/code/auth")