#

luxiaotao1123

2020-07-17 a1517b36ef4efc43dabe9cb0e6c659d74eeec8e9

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

@@ -15,7 +15,9 @@
import com.zy.asrs.entity.MatCode;
import com.zy.asrs.entity.MatCodePrint;
import com.zy.asrs.service.MatCodeService;
import com.zy.asrs.utils.VersionUtils;
import com.zy.common.CodeRes;
import com.zy.common.config.AdminInterceptor;
import com.zy.common.utils.BarcodeUtils;
import com.zy.common.utils.QrCode;
import com.zy.common.utils.excel.matcode.MatCodeExcel;
@@ -127,11 +129,7 @@
        List<MatCode> list = matCodeService.selectList(new EntityWrapper<>());
        List<MatCodeExcel> excels = new ArrayList<>();
        for (MatCode matCode : list) {
            MatCodeExcel excel = new MatCodeExcel();
            excel.setMatNo(matCode.getMatNo());
            excel.setBarcode(matCode.getBarcode());
            excel.setMatName(matCode.getMatName());
            excel.setStr1(matCode.getStr1());
            MatCodeExcel excel = VersionUtils.getExcel(matCode);
            excels.add(excel);
            if (rowCount != null && excels.size() >= rowCount){
                break;
@@ -183,6 +181,7 @@
    public R matCodeBarcode(@RequestParam(defaultValue = "1") Integer type
                        , @RequestParam String param
                        , HttpServletResponse response) throws Exception {
        AdminInterceptor.cors(response);
        if (Cools.isEmpty(param)){
            return R.parse(BaseRes.EMPTY);
        }