From e3b3fd13ae3afcfbe5c03ef7249a92a093bd1831 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 27 五月 2026 15:34:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印
---
src/main/java/com/ruoyi/quality/controller/QualityInspectController.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java b/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
index dec3d1c..8be22da 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
@@ -8,6 +8,7 @@
import com.ruoyi.procurementrecord.service.ProcurementRecordService;
import com.ruoyi.procurementrecord.utils.StockUtils;
import com.ruoyi.quality.dto.QualityInspectDto;
+import com.ruoyi.quality.dto.QualityInspectExportDTO;
import com.ruoyi.quality.pojo.QualityInspect;
import com.ruoyi.quality.pojo.QualityInspectFile;
import com.ruoyi.quality.pojo.QualityInspectParam;
@@ -112,16 +113,26 @@
}
/**
- * 瀵煎嚭
+ * 瀵煎嚭锛堟棫鎺ュ彛锛屼繚鐣欏吋瀹癸級
* @param response
* @param qualityInspect
*/
@PostMapping("/export")
- public void qualityInspectExport(HttpServletResponse response,QualityInspect qualityInspect) {
+ public void qualityInspectExport(HttpServletResponse response, QualityInspect qualityInspect) {
qualityInspectService.qualityInspectExport(response, qualityInspect);
}
/**
+ * 瀵煎嚭锛堟柊鎺ュ彛锛屾敮鎸侀�変腑瀵煎嚭鍜屾楠屽弬鏁帮級
+ * @param response
+ * @param exportDTO
+ */
+ @PostMapping("/exportNew")
+ public void qualityInspectExportNew(HttpServletResponse response, @RequestBody QualityInspectExportDTO exportDTO) {
+ qualityInspectService.qualityInspectExportNew(response, exportDTO);
+ }
+
+ /**
* 鎻愪氦
* @param qualityInspect
* @return
--
Gitblit v1.9.3