From ba4af275c3b8d073f863be7b12e43974b3ef14a2 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 12 七月 2025 10:27:06 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/product-inventory-management-after into pim_ly
---
src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java | 49 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 45 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java
index b522be4..a106fb2 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java
@@ -7,16 +7,16 @@
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.procurementrecord.dto.ProcurementAddDto;
-import com.ruoyi.procurementrecord.dto.ProcurementDto;
-import com.ruoyi.procurementrecord.dto.ProcurementPageDto;
-import com.ruoyi.procurementrecord.dto.ProcurementUpdateDto;
+import com.ruoyi.procurementrecord.dto.*;
import com.ruoyi.procurementrecord.service.ProcurementRecordService;
import com.ruoyi.purchase.dto.InvoicePurchaseReportDto;
+import com.ruoyi.quality.pojo.QualityInspect;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
@@ -41,14 +41,30 @@
@PostMapping("/add")
@Log(title = "閲囪喘鍏ュ簱-鍏ュ簱绠＄悊-鏂板鍏ュ簱", businessType = BusinessType.INSERT)
+ @Transactional
public AjaxResult add(@RequestBody ProcurementAddDto procurementDto) {
return AjaxResult.success(procurementRecordService.add(procurementDto));
}
@PostMapping("/update")
@Log(title = "閲囪喘鍏ュ簱-鍏ュ簱绠＄悊-淇敼鍏ュ簱", businessType = BusinessType.UPDATE)
+ @Transactional
public AjaxResult updatePro(@RequestBody ProcurementUpdateDto procurementDto) {
return AjaxResult.success(procurementRecordService.updatePro(procurementDto));
+ }
+
+ @PostMapping("/updateManagement")
+ @Log(title = "閲囪喘鍏ュ簱-搴撳瓨鍙拌处-淇敼", businessType = BusinessType.UPDATE)
+ @Transactional
+ public AjaxResult updateManagement(@RequestBody ProcurementManagementUpdateDto procurementDto) {
+ return AjaxResult.success(procurementRecordService.updateManagement(procurementDto));
+ }
+
+ @PostMapping("/del")
+ @Log(title = "閲囪喘鍏ュ簱-鍏ュ簱绠＄悊-鍒犻櫎鍏ュ簱", businessType = BusinessType.DELETE)
+ @Transactional
+ public AjaxResult deletePro(@RequestBody ProcurementUpdateDto procurementDto) {
+ return AjaxResult.success(procurementRecordService.deletePro(procurementDto));
}
@GetMapping("/listPage")
@@ -58,5 +74,30 @@
return AjaxResult.success(result);
}
+ @GetMapping("/listPageCopy")
+ @Log(title = "閲囪喘鍏ュ簱-鍏ュ簱绠＄悊-鍏ュ簱鏌ヨ", businessType = BusinessType.OTHER)
+ public AjaxResult listPageCopy(Page page, ProcurementPageDto procurementDto) {
+ IPage<ProcurementPageDtoCopy> result =procurementRecordService.listPageCopy(page, procurementDto);
+ return AjaxResult.success(result);
+ }
+
+ /**
+ * 瀵煎嚭
+ * @param response
+ */
+ @PostMapping("/exportCopy")
+ public void exportCopy(HttpServletResponse response) {
+ procurementRecordService.exportCopy(response);
+ }
+
+ /**
+ * 瀵煎嚭
+ * @param response
+ */
+ @PostMapping("/export")
+ public void export(HttpServletResponse response) {
+ procurementRecordService.export(response);
+ }
+
}
--
Gitblit v1.9.3