From 42ced7220d64b42c0bf2b1a779c0f20d3da2a952 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 12 六月 2025 14:46:55 +0800
Subject: [PATCH] 分架新增界面玻璃总数量和查询界面玻璃总数量不一致
---
north-glass-erp/src/main/java/com/example/erp/controller/sd/CustomerController.java | 42 +++++++++++++++++++++++++++++-------------
1 files changed, 29 insertions(+), 13 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 dd6c85d..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
@@ -1,8 +1,12 @@
package com.example.erp.controller.sd;
+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;
@@ -10,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;
@@ -28,35 +36,43 @@
/*鍙戣揣璁㈠崟鏌ヨ*/
@ApiOperation("瀹㈡埛鏌ヨ鎺ュ彛")
+ @SaCheckPermission("selectCustomer.search")
@PostMapping("/getSelectCustomer/{pageNum}/{pageSize}")
public Result getSelectShippingOrder(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody Customer customer){
return Result.seccess(customerService.getSelectCustomer(pageNum,pageSize,customer));
}
@ApiOperation("瀹㈡埛鏂板淇敼鎺ュ彛")
+ @SaCheckPermission("createCustomer.add")
@PostMapping("/insertCustomer")
public Result insertCustomer( @RequestBody Map<String,Object> object){
- if(customerService.insertCustomer(object)){
-
- return Result.seccess();
-
- }else {
- throw new ServiceException(Constants.Code_500,"瀹㈡埛鏂板/淇敼澶辫触");
-
- }
+ return Result.seccess(customerService.insertCustomer(object));
}
@ApiOperation("瀹㈡埛鍒犻櫎鎺ュ彛")
+ @SaCheckPermission("selectCustomer.delete")
@PostMapping("/deleteCustomer")
public Result deleteCustomer( @RequestBody Map<String,Object> object){
- if(customerService.deleteCustomer(object)){
+ return Result.seccess(customerService.deleteCustomer(object));
+ }
- return Result.seccess();
+ @ApiOperation("瀹㈡埛璁㈠崟鏌ヨ鎺ュ彛")
+ @SaCheckPermission("selectCustomerOrder.search")
+ @PostMapping("/getSelectCustomerOderDate/{pageNum}/{pageSize}/{selectDate}")
+ public Result getSelectCustomerOderDate(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody OrderDetail orderDetail){
+ return Result.seccess(customerService.getSelectCustomerOderDate(pageNum,pageSize,selectDate,orderDetail));
+ }
- }else {
- throw new ServiceException(Constants.Code_500,"瀹㈡埛鍒犻櫎澶辫触");
+ @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