From 688413a4c7c63e0eb9a864045d8174270ce27689 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 05 九月 2023 12:33:52 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OrderController.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 8d6635a..d3390f0 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -30,6 +30,7 @@
import java.io.IOException;
import java.io.InputStream;
+import java.text.SimpleDateFormat;
import java.util.*;
@Slf4j
@@ -380,6 +381,22 @@
return R.ok();
}
+ @RequestMapping(value = "/order/exportOrder/auth")
+ @ManagerAuth(memo = "瀵煎嚭璁㈠崟")
+ @Transactional
+ public R exportOrder(@RequestParam Long orderId){
+ List<String> fields = new ArrayList<>();
+ fields.add("orderNo");
+ fields.add("matnr");
+ fields.add("maktx");
+ fields.add("specs");
+ fields.add("anfme");
+ fields.add("qty");
+ EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
+ List<OrderDetl> orderDetls = orderDetlService.selectList(wrapper.eq("order_id",orderId));
+ return R.ok(exportSupport(orderDetls, fields));
+ }
+
@RequestMapping(value = "/order/export/auth")
@ManagerAuth
public R export(@RequestBody JSONObject param){
@@ -462,6 +479,12 @@
Double anfme = Double.parseDouble(dataFormatter.formatCellValue(row.getCell(3)));
// 涓嬪崟鏃堕棿
String timeStr = dataFormatter.formatCellValue(row.getCell(4));
+
+ if (Cools.isEmpty(timeStr)) {
+ timeStr = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss").format(now);
+ }
+ // 鍗曟嵁绫诲瀷
+ Long orderType = Long.parseLong(dataFormatter.formatCellValue(row.getCell(5)));
Date time = null;
try {
time = DateUtils.convert(timeStr, DateUtils.yyyyMMddHHmmss_F);
@@ -484,7 +507,7 @@
String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
uuid, // 璁㈠崟缂栧彿
timeStr, // 鍗曟嵁鏃ユ湡
- 14L, // 鍗曟嵁绫诲瀷
+ orderType, // 鍗曟嵁绫诲瀷
null, // 椤圭洰缂栧彿
null, //
null, // 璋冩嫧椤圭洰缂栧彿
@@ -546,5 +569,4 @@
}
return R.ok("瀵煎叆鎴愬姛");
}
-
}
--
Gitblit v1.9.1