From 27879ae8c1df7ff014858456b17996cf62d34f9b Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 15 十一月 2023 15:34:11 +0800
Subject: [PATCH] 销售订单-修改3
---
mes-plan/src/main/java/com/chinaztt/mes/plan/controller/CustomerOrderController.java | 2 +-
mes-plan/src/main/java/com/chinaztt/mes/plan/service/impl/CustomerOrderServiceImpl.java | 1 -
mes-plan/src/main/java/com/chinaztt/mes/plan/dto/CustomerOrderDTO.java | 6 +++++-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/mes-plan/src/main/java/com/chinaztt/mes/plan/controller/CustomerOrderController.java b/mes-plan/src/main/java/com/chinaztt/mes/plan/controller/CustomerOrderController.java
index 1d2500b..cdca62a 100644
--- a/mes-plan/src/main/java/com/chinaztt/mes/plan/controller/CustomerOrderController.java
+++ b/mes-plan/src/main/java/com/chinaztt/mes/plan/controller/CustomerOrderController.java
@@ -503,7 +503,7 @@
* @param fileName
* @param response
*/
- @GetMapping("/processConfig/{bucket}/{fileName}")
+ @PostMapping("/processConfig/{bucket}/{fileName}")
@Inner(false)
public void file(@PathVariable String bucket, @PathVariable String fileName, HttpServletResponse response) {
customerOrderService.getFile(bucket, fileName, response);
diff --git a/mes-plan/src/main/java/com/chinaztt/mes/plan/dto/CustomerOrderDTO.java b/mes-plan/src/main/java/com/chinaztt/mes/plan/dto/CustomerOrderDTO.java
index 64ba691..cdf900c 100644
--- a/mes-plan/src/main/java/com/chinaztt/mes/plan/dto/CustomerOrderDTO.java
+++ b/mes-plan/src/main/java/com/chinaztt/mes/plan/dto/CustomerOrderDTO.java
@@ -23,6 +23,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;
@@ -34,7 +35,7 @@
* @date 2020-09-14 16:35:26
*/
@Data
-public class CustomerOrderDTO extends CustomerOrder {
+public class CustomerOrderDTO extends CustomerOrder implements Serializable {
@ApiModelProperty(value = "涓嬪彂闇�姹傛暟閲�")
private BigDecimal requireNumber;
@@ -137,4 +138,7 @@
@ApiModelProperty(value = "缁堟鏃ユ湡")
private LocalDateTime endTime;
+ @ApiModelProperty(value = "闇�姹傛棩鏈�")
+ private LocalDateTime deliveryDate;
+
}
diff --git a/mes-plan/src/main/java/com/chinaztt/mes/plan/service/impl/CustomerOrderServiceImpl.java b/mes-plan/src/main/java/com/chinaztt/mes/plan/service/impl/CustomerOrderServiceImpl.java
index 4fda2b9..085c240 100644
--- a/mes-plan/src/main/java/com/chinaztt/mes/plan/service/impl/CustomerOrderServiceImpl.java
+++ b/mes-plan/src/main/java/com/chinaztt/mes/plan/service/impl/CustomerOrderServiceImpl.java
@@ -1913,7 +1913,6 @@
try {
String path = FileSaveUtil.FILE_PATH + bucket;
InputStream inputStream = new FileInputStream(path);
-// EasyExcel.write(path).sheet().doWrite(null);
response.setContentType("application/octet-stream; charset=UTF-8");
IoUtil.copy(inputStream, response.getOutputStream());
} catch (Exception e) {
--
Gitblit v1.9.3