wukai 5 miesięcy temu
rodzic
commit
83e23029dc

+ 7 - 7
ruoyi-admin/src/main/java/com/ruoyi/order/controller/OrderApiController.java

@@ -78,7 +78,7 @@ public class OrderApiController extends BaseController {
         return map;
     }
 
-    @ApiOperation("导出白预测")
+    @ApiOperation("导出白预测")
     @GetMapping("/api/export/order")
     @CrossOrigin(origins = "*")
     public void orderExport(String start, String end, HttpServletResponse response) {
@@ -106,7 +106,7 @@ public class OrderApiController extends BaseController {
         List<SkuVO> skuList = new ArrayList<>();
         for (String spec : allMap.keySet()) {
             List<TwinOrderDetail> todList = allMap.get(spec);
-            //匹配白布库存
+            //匹配白布库存
             Float kc = 0f;
             VmsStock stock = matchStock(spec, stocks);
             if (stock != null) {
@@ -193,7 +193,7 @@ public class OrderApiController extends BaseController {
             bk.setFillPattern(FillPatternType.SOLID_FOREGROUND);
             XSSFSheet sheet0 = wb.getSheetAt(0);
             Cell title = sheet0.getRow(0).getCell(0);
-            title.setCellValue("白布靶向生产测算-10天(" + start + " 至 " + end + ")");
+            title.setCellValue("白布靶向生产测算-10天(" + start + " 至 " + end + ")");
 
             sheet0(sheet0, bomList);
             sheet1(wb.getSheetAt(1), stocks);
@@ -206,7 +206,7 @@ public class OrderApiController extends BaseController {
             //Content-Disposition的作用:告知浏览器以何种方式显示响应返回的文件,用浏览器打开还是以附件的形式下载到本地保存
             //attachment表示以附件方式下载 inline表示在线打开 "Content-Disposition: inline; filename=文件名.mp3"
             // filename表示文件的默认名称,因为网络传输只支持URL编码的相关支付,因此需要将文件名URL编码后进行传输,前端收到后需要反编码才能获取到真正的名称
-            response.addHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode("白布靶向预测" + start + "至" + end + ".xlsx", "UTF-8"));
+            response.addHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode("白布靶向预测" + start + "至" + end + ".xlsx", "UTF-8"));
             response.setContentType("application/octet-stream");
             wb.write(outputStream);
             outputStream.flush();
@@ -314,7 +314,7 @@ public class OrderApiController extends BaseController {
     }
 
     /**
-     * 白布全量
+     * 白布全量
      *
      * @param sheet  sheet
      * @param stocks 库存
@@ -338,7 +338,7 @@ public class OrderApiController extends BaseController {
     }
 
     /**
-     * 白库存匹配
+     * 白库存匹配
      *
      * @param sheet   sheet
      * @param skuList 库存
@@ -480,7 +480,7 @@ public class OrderApiController extends BaseController {
 
 
     /**
-     * 白布库存--全量
+     * 白布库存--全量
      *
      * @param sheet sheet
      * @param infos 库存

BIN
ruoyi-admin/src/main/resources/tpl/order.xlsx