From bd63dcea170b3ceb86851f56a7a53b85b77027c2 Mon Sep 17 00:00:00 2001
From: yinrw <2030349650@qq.com>
Date: 星期四, 23 七月 2026 15:03:25 +0800
Subject: [PATCH] 修改销售台账和生产订单绑定逻辑，修复销售台账和生产订单页面展示数据bug
---
src/main/java/com/ruoyi/sales/controller/SalesQuotationController.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesQuotationController.java b/src/main/java/com/ruoyi/sales/controller/SalesQuotationController.java
index d29730f..40a490e 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesQuotationController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesQuotationController.java
@@ -19,6 +19,7 @@
public class SalesQuotationController {
@Autowired
private SalesQuotationService salesQuotationService;
+
@GetMapping("/list")
public AjaxResult getList(Page page, SalesQuotationDto salesQuotationDto) {
return AjaxResult.success(salesQuotationService.listPage(page, salesQuotationDto));
@@ -27,11 +28,11 @@
@PostMapping("/export")
public void export(HttpServletResponse response) {
- Page page = new Page(-1,-1);
+ Page page = new Page(-1, -1);
SalesQuotationDto afterSalesService = new SalesQuotationDto();
IPage<SalesQuotationDto> listPage = salesQuotationService.listPage(page, afterSalesService);
ExcelUtil<SalesQuotationDto> util = new ExcelUtil<SalesQuotationDto>(SalesQuotationDto.class);
- util.exportExcel(response, listPage.getRecords() , "鍙嶉鐧昏");
+ util.exportExcel(response, listPage.getRecords(), "鍙嶉鐧昏");
}
@@ -39,6 +40,7 @@
public AjaxResult add(@RequestBody SalesQuotationDto salesQuotationDto) {
return AjaxResult.success(salesQuotationService.add(salesQuotationDto));
}
+
@PostMapping("/update")
public AjaxResult update(@RequestBody SalesQuotationDto salesQuotationDto) {
return AjaxResult.success(salesQuotationService.edit(salesQuotationDto));
@@ -46,18 +48,20 @@
/**
* 璇︽儏 鏍规嵁瀹㈡埛绫诲瀷鍜屼骇鍝佽繑鍥炴姤浠峰崟浠�
- * @param type 瀹㈡埛绫诲瀷
- * @param productName 浜у搧鍚嶇О
- * @param specification 瑙勬牸
+ *
+ * @param type 瀹㈡埛绫诲瀷
+ * @param productName 浜у搧鍚嶇О
+ * @param specification 瑙勬牸
* @return
*/
@ApiOperation("璇︽儏")
@GetMapping("/detail")
- public AjaxResult detail(@RequestParam("type") String type,
- @RequestParam("productName")String productName,
- @RequestParam("specification")String specification) {
+ public AjaxResult detail(@RequestParam(value = "type", required = false) String type,
+ @RequestParam("productName") String productName,
+ @RequestParam("specification") String specification) {
return AjaxResult.success(salesQuotationService.detail(type, productName, specification));
}
+
@DeleteMapping("/delete")
public AjaxResult delete(@RequestBody Long id) {
return AjaxResult.success(salesQuotationService.delete(id));
--
Gitblit v1.9.3