#

LSH

2023-12-07 ce3608a2f7427650d4aae51e644412b4b5106dde

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

@@ -13,12 +13,15 @@
import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.MatPrint;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.param.EmptyPlateOutParam;
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;
@@ -93,10 +96,11 @@
        if (Cools.isEmpty(tagId)) {
            tagId = getOriginTag().getId();
        }
        return R.ok(matService.getPage(new Page<>(curr, limit)
        return R.ok(matService.getPage2(new Page<>(curr, limit)
                , String.valueOf(tagId)
                , param.get("matnr")
                , param.get("maktx"))
                , param.get("maktx")
                , param.get("specs"))
        );

    }
@@ -157,6 +161,28 @@
            }
        }
        return R.ok();
    }

    @RequestMapping(value = "/mat/turn/over/list/auth")
    @ManagerAuth
    public R turnOverList(@RequestParam(defaultValue = "1")Integer curr,
                          @RequestParam(defaultValue = "10")Integer limit,
                          @RequestParam Map<String, Object> param){
        return R.ok(matService.getMatTurnPage(toPage(curr, limit, param, Mat.class)));
    }

    @RequestMapping("/mat/turn/over/take/site")
    @ManagerAuth()
    public R availableTakeSite(@RequestParam(required = false) String matnr){
        List<Map<String, Object>> result = new ArrayList<>();
        List<Mat> mats = matService.selectByMatnrLink(matnr);
        for (Mat mat : mats) {
            Map<String, Object> map = new HashMap<>();
            map.put("siteId", mat.getId());
            map.put("desc", mat.getMatnr());
            result.add(map);
        }
        return R.ok().add(result);
    }

    @RequestMapping(value = "/mat/export/auth")
@@ -307,4 +333,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 ***********************************************/


}