From aa7bcbc678a671a51a87c7ba6bbfaa107399a96d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 08 四月 2025 14:28:16 +0800
Subject: [PATCH] 添加优化原片出库报表，除去时间相关筛选
---
north-glass-erp/src/main/java/com/example/erp/controller/sd/CustomerController.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/sd/CustomerController.java b/north-glass-erp/src/main/java/com/example/erp/controller/sd/CustomerController.java
index 0a34bcd..7cd99ce 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/sd/CustomerController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/sd/CustomerController.java
@@ -4,6 +4,9 @@
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Constants;
import com.example.erp.common.Result;
+import com.example.erp.dto.sd.CustomerDTO;
+import com.example.erp.dto.sd.DeliveryDetailDTO;
+import com.example.erp.dto.sd.DeliveryDetailProductDTO;
import com.example.erp.entity.sd.Customer;
import com.example.erp.entity.sd.Delivery;
import com.example.erp.entity.sd.Order;
@@ -11,11 +14,15 @@
import com.example.erp.exception.ServiceException;
import com.example.erp.service.sd.CustomerService;
import com.example.erp.service.sd.DeliveryService;
+import com.example.erp.tools.DownExcel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.time.LocalDate;
import java.util.List;
import java.util.Map;
@@ -36,7 +43,7 @@
}
@ApiOperation("瀹㈡埛鏂板淇敼鎺ュ彛")
- @SaCheckPermission("CreateCustomer.add")
+ @SaCheckPermission("createCustomer.add")
@PostMapping("/insertCustomer")
public Result insertCustomer( @RequestBody Map<String,Object> object){
return Result.seccess(customerService.insertCustomer(object));
@@ -56,6 +63,18 @@
return Result.seccess(customerService.getSelectCustomerOderDate(pageNum,pageSize,selectDate,orderDetail));
}
+ @ApiOperation("瀹㈡埛璁㈠崟鎶ヨ〃")
+ @PostMapping("/exportSelectCustomerOderDate/{selectDate}")
+ public void exportSelectCustomerOderDate(HttpServletResponse response, @PathVariable List<String> selectDate, @RequestBody OrderDetail orderDetail) throws IOException, IllegalAccessException, InstantiationException {
+ DownExcel.download(response, CustomerDTO.class, customerService.exportSelectCustomerOderDate(selectDate,orderDetail),"orderReport");
+ }
+
+ @ApiOperation("瀹㈡埛鍙戣揣鎶ヨ〃")
+ @PostMapping("/exportSelectCustomerDeliveryDate/{selectDate}")
+ public void exportSelectCustomerDeliveryDate(HttpServletResponse response, @PathVariable List<String> selectDate, @RequestBody OrderDetail orderDetail) throws IOException, IllegalAccessException, InstantiationException {
+ DownExcel.download(response, CustomerDTO.class, customerService.exportSelectCustomerDeliveryDate(selectDate,orderDetail),"deliveryReport");
+ }
+
--
Gitblit v1.8.0