From f6513ffa7e2efe2a4dc81626c7aab9cf643f8f41 Mon Sep 17 00:00:00 2001 From: zyx <zyx123456> Date: 星期四, 14 三月 2024 10:14:28 +0800 Subject: [PATCH] 1.增加牌号作为唯一物料条件 (当前牌号 批号 包号可以筛选出唯一物料) 2.增加移库接口 3.订单出库可替换物料 4.页面ui完善 --- src/main/java/com/zy/asrs/controller/OrderLogController.java | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OrderLogController.java b/src/main/java/com/zy/asrs/controller/OrderLogController.java index 746b2c6..ce972cf 100644 --- a/src/main/java/com/zy/asrs/controller/OrderLogController.java +++ b/src/main/java/com/zy/asrs/controller/OrderLogController.java @@ -1,5 +1,7 @@ package com.zy.asrs.controller; +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.Wrapper; @@ -16,6 +18,9 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.net.URLEncoder; import java.util.*; @RestController @@ -347,4 +352,34 @@ return R.ok(); } + @RequestMapping(value = "/orderLog/printExport/auth") + // @ManagerAuth(memo = "鐩樼偣鍗曞鍑�") + public void export(HttpServletResponse response, @RequestParam String orderNo) throws IOException { + //浠庢暟鎹簱鏌ヨ鏁版嵁 + EntityWrapper<OrderDetlLog> locCheckEntityWrapper = new EntityWrapper<>(); + locCheckEntityWrapper.eq("order_no",orderNo); + List<OrderDetlLog> list = orderDetlLogService.selectList(locCheckEntityWrapper); + + response.setContentType("application/vnd.ms-excel"); + response.setCharacterEncoding("utf-8"); + String fileName = URLEncoder.encode("鍗曟嵁", "UTF-8"); + response.setHeader("Content-disposition", "attachment;filename=" + fileName+ orderNo + ".xlsx"); + Set<String> includeColumnFiledNames = new HashSet<String>(); + includeColumnFiledNames.add("orderNo"); + includeColumnFiledNames.add("matnr"); + includeColumnFiledNames.add("maktx"); + includeColumnFiledNames.add("specs"); + includeColumnFiledNames.add("owner"); + includeColumnFiledNames.add("payment"); + includeColumnFiledNames.add("anfme"); + includeColumnFiledNames.add("qty"); + includeColumnFiledNames.add("workQty"); + includeColumnFiledNames.add("weight"); + EasyExcel.write(response.getOutputStream(), OrderDetl.class) + .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) + .includeColumnFiledNames(includeColumnFiledNames) + .sheet("琛�1") + .doWrite(list); + } + } -- Gitblit v1.9.1