#新增空箱入库功能，界面等修改

lty

3 天以前 419c6a9b87b37be567a581d6a80d7e3f505d84e9

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

@@ -17,9 +17,11 @@
import com.zy.asrs.entity.result.KeyValueVo;
import com.zy.asrs.service.MatService;
import com.zy.asrs.utils.MatExcelListener;
import com.zy.asrs.utils.OutLocBoxExcelListener;
import com.zy.common.CodeRes;
import com.zy.common.config.AdminInterceptor;
import com.zy.common.entity.MatExcel;
import com.zy.common.entity.OutLocBoxExcel;
import com.zy.common.utils.BarcodeUtils;
import com.zy.common.utils.QrCode;
import com.zy.common.web.BaseController;
@@ -102,6 +104,33 @@
        );

    }

    @RequestMapping(value = "/boxMat/list/auth")
    @ManagerAuth
    public R listBox(@RequestParam(defaultValue = "1") Integer curr,
                     @RequestParam(defaultValue = "10") Integer limit,
                     @RequestParam(required = false) String orderByField,
                     @RequestParam(required = false) String orderByType,
                     @RequestParam Map<String, Object> param) {

        Object tagIdObj = param.get("tag_id");
        if (Cools.isEmpty(tagIdObj)) {
            tagIdObj = getOriginTag().getId();
        }

        String tagId = String.valueOf(tagIdObj);



        return R.ok(matService.getPage(
                new Page<>(curr, limit),
                tagId,
                param.get("matnr"),
                param.get("memo")
        ));
    }



    private void convert(Map<String, Object> map, EntityWrapper wrapper){
        for (Map.Entry<String, Object> entry : map.entrySet()){
@@ -331,4 +360,35 @@
    }


    /*************************************** 数据相关 ***********************************************/

    /**
     * excel导入模板下载
     */
    @RequestMapping(value = "/out/loc/box/excel/import/mould")
    public void outLocBoxExcelImportMould(HttpServletResponse response) throws IOException {
        List<OutLocBoxExcel> excels = new ArrayList<>();
        response.setContentType("application/vnd.ms-excel");
        response.setCharacterEncoding("utf-8");
        String fileName = URLEncoder.encode("导入箱号出库模板", "UTF-8");
        response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
        EasyExcel.write(response.getOutputStream(), OutLocBoxExcel.class)
                .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                .sheet("出库模板")
                .doWrite(excels);
    }

    // excel导入
    @PostMapping(value = "/out/loc/box/excel/import/auth")
    @ManagerAuth(memo = "导入箱号出库")
    @Transactional
    public R outLocBoxExcelImport(MultipartFile file) throws IOException {
        OutLocBoxExcelListener listener = new OutLocBoxExcelListener(getUserId());
        EasyExcel.read(file.getInputStream(), OutLocBoxExcel.class, listener).sheet().doRead();
        return R.ok("成功出库"+listener.getTotal()+"条商品数据");
    }

    /*************************************** xm-select ***********************************************/


}