From 0d7d874912d0147376826b55667a1deb6547ed91 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 21 五月 2026 15:25:27 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈
---
src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java | 135 ++++++++++++++++++++++++++++----------------
1 files changed, 86 insertions(+), 49 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java
index ec20ef3..6f16f19 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java
@@ -2,23 +2,25 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.basic.pojo.ProductModel;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.procurementrecord.dto.*;
+import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.procurementrecord.bean.dto.*;
import com.ruoyi.procurementrecord.mapper.CustomStorageMapper;
import com.ruoyi.procurementrecord.pojo.CustomStorage;
import com.ruoyi.procurementrecord.service.ProcurementRecordService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.AllArgsConstructor;
import org.apache.ibatis.annotations.Delete;
-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 jakarta.servlet.http.HttpServletResponse;
+
import java.util.List;
/**
@@ -26,181 +28,211 @@
* @date : 2025/7/7 14:32
*/
@RestController
-@Api(tags = "閲囪喘鍏ュ簱")
+@Tag(name = "閲囪喘鍏ュ簱")
@RequestMapping("/stockin")
+@AllArgsConstructor
public class ProcurementRecordController extends BaseController {
-
- @Autowired
private ProcurementRecordService procurementRecordService;
+ private CustomStorageMapper customStorageMapper;
+
+ /**
+ * 閫氳繃閿�鍞骇鍝乮d鑾峰彇鍏ュ簱鏁伴噺
+ *
+ * @param salesProductId
+ * @return
+ */
+ @GetMapping("/getProcurementAmount")
+ @Operation(summary = "閫氳繃閿�鍞骇鍝乮d鑾峰彇鍏ュ簱鏁伴噺")
+ public R<?> getProcurementAmount(@RequestParam("salesProductId") Long salesProductId) {
+ return R.ok(procurementRecordService.getProcurementAmount(salesProductId));
+ }
@GetMapping("/productlist")
@Log(title = "閲囪喘鍏ュ簱-鍏ュ簱绠＄悊-鏂板鍏ュ簱鏌ヨ", businessType = BusinessType.OTHER)
- public AjaxResult list(ProcurementDto procurementDto) {
+ public R<?> list(ProcurementDto procurementDto) {
List<ProcurementDto> result = procurementRecordService.listProcurementBySalesLedgerId(procurementDto);
- return AjaxResult.success(result);
+ return R.ok(result);
}
@PostMapping("/add")
@Log(title = "閲囪喘鍏ュ簱-鍏ュ簱绠＄悊-鏂板鍏ュ簱", businessType = BusinessType.INSERT)
@Transactional
- public AjaxResult add(@RequestBody ProcurementAddDto procurementDto) {
+ public R<?> add(@RequestBody ProcurementAddDto procurementDto) {
procurementDto.setType(1);
procurementDto.setTypeName("閲囪喘鍏ュ簱");
- return AjaxResult.success(procurementRecordService.add(procurementDto));
+ return R.ok(procurementRecordService.add(procurementDto));
}
@PostMapping("/addCustom")
@Log(title = "鑷畾涔夊叆搴�-鍏ュ簱绠＄悊-鏂板鍏ュ簱", businessType = BusinessType.INSERT)
@Transactional
- public AjaxResult addCustom(@RequestBody List<CustomStorage> customStorage) {
+ public R<?> addCustom(@RequestBody List<CustomStorage> customStorage) {
return procurementRecordService.addCustom(customStorage);
}
@PostMapping("/updateCustom")
@Log(title = "鑷畾涔夊叆搴�-鍏ュ簱绠＄悊-淇敼鍏ュ簱", businessType = BusinessType.UPDATE)
@Transactional
- public AjaxResult updateCustom(@RequestBody CustomStorage customStorage) {
+ public R<?> updateCustom(@RequestBody CustomStorage customStorage) {
return procurementRecordService.updateCustom(customStorage);
}
@Delete("/delteCustom")
@Log(title = "鑷畾涔夊叆搴�-鍏ュ簱绠＄悊-鍒犻櫎鍏ュ簱", businessType = BusinessType.DELETE)
@Transactional
- public AjaxResult deleteCustom(@RequestBody List<Long> ids) {
+ public R<?> deleteCustom(@RequestBody List<Long> ids) {
return procurementRecordService.deleteCustom(ids);
}
@PostMapping("/update")
@Log(title = "閲囪喘鍏ュ簱-鍏ュ簱绠＄悊-淇敼鍏ュ簱", businessType = BusinessType.UPDATE)
@Transactional
- public AjaxResult updatePro(@RequestBody ProcurementUpdateDto procurementDto) {
- return AjaxResult.success(procurementRecordService.updatePro(procurementDto));
+ public R<?> updatePro(@RequestBody ProcurementUpdateDto procurementDto) {
+ return R.ok(procurementRecordService.updatePro(procurementDto));
}
@PostMapping("/updateManagement")
@Log(title = "鎴愬搧鍏ュ簱-搴撳瓨鍙拌处-淇敼", businessType = BusinessType.UPDATE)
@Transactional
- public AjaxResult updateManagement(@RequestBody ProcurementManagementUpdateDto procurementDto) {
- return AjaxResult.success(procurementRecordService.updateManagement(procurementDto));
+ public R<?> updateManagement(@RequestBody ProcurementManagementUpdateDto procurementDto) {
+ return R.ok(procurementRecordService.updateManagement(procurementDto));
}
@PostMapping("/updateManagementByCustom")
@Log(title = "鑷畾涔夊叆搴�-搴撳瓨鍙拌处-淇敼", businessType = BusinessType.UPDATE)
@Transactional
- public AjaxResult updateManagementByCustom(@RequestBody ProcurementManagementUpdateDto procurementDto) {
- return AjaxResult.success(procurementRecordService.updateManagementByCustom(procurementDto));
+ public R<?> updateManagementByCustom(@RequestBody ProcurementManagementUpdateDto procurementDto) {
+ return R.ok(procurementRecordService.updateManagementByCustom(procurementDto));
}
@PostMapping("/del")
@Log(title = "閲囪喘鍏ュ簱-鍏ュ簱绠＄悊-鍒犻櫎鍏ュ簱", businessType = BusinessType.DELETE)
@Transactional
- public AjaxResult deletePro(@RequestBody ProcurementUpdateDto procurementDto) {
- return AjaxResult.success(procurementRecordService.deletePro(procurementDto));
+ public R<?> deletePro(@RequestBody ProcurementUpdateDto procurementDto) {
+ return R.ok(procurementRecordService.deletePro(procurementDto));
}
@GetMapping("/listPage")
@Log(title = "閲囪喘鍏ュ簱-鍏ュ簱绠＄悊-鍏ュ簱鏌ヨ", businessType = BusinessType.OTHER)
- @ApiOperation(value = "鍏ュ簱鏌ヨ")
- public AjaxResult listPage(Page page, ProcurementPageDto procurementDto) {
+ @Operation(summary = "鍏ュ簱鏌ヨ")
+ public R<?> listPage(Page page, ProcurementPageDto procurementDto) {
IPage<ProcurementPageDto> result = procurementRecordService.listPage(page, procurementDto);
- return AjaxResult.success(result);
+ return R.ok(result);
+ }
+
+ @GetMapping("/listReport")
+ @Operation(summary = "鏌ヨ搴撳瓨鍥捐〃鏁版嵁")
+ public R<?> listReport() {
+ return R.ok(procurementRecordService.getReportList());
}
@GetMapping("/listPageByProduction")
@Log(title = "鐢熶骇鍏ュ簱-鍏ュ簱绠＄悊-鍏ュ簱鏌ヨ", businessType = BusinessType.OTHER)
- @ApiOperation(value = "鍏ュ簱鏌ヨ")
- public AjaxResult listPageByProduction(Page page, ProcurementPageDto procurementDto) {
+ @Operation(summary = "鍏ュ簱鏌ヨ")
+ public R<?> listPageByProduction(Page page, ProcurementPageDto procurementDto) {
IPage<ProcurementPageDto> result = procurementRecordService.listPageByProduction(page, procurementDto);
- return AjaxResult.success(result);
+ return R.ok(result);
+ }
+
+ @GetMapping("/listPageByProductProduction")
+ @Log(title = "鐢熶骇鍏ュ簱-鍏ュ簱绠＄悊-鐢熶骇鍏ュ簱鏌ヨ", businessType = BusinessType.OTHER)
+ @Operation(summary = "鍏ュ簱鏌ヨ")
+ public R<?> listPageByProductProduction(Page page, ProcurementPageDto procurementDto) {
+ IPage<ProcurementPageDto> result = procurementRecordService.listPageByProductProduction(page, procurementDto);
+ return R.ok(result);
}
@GetMapping("/listPageByCustom")
@Log(title = "鑷畾涔夊叆搴�-鍏ュ簱绠＄悊-鍏ュ簱鏌ヨ", businessType = BusinessType.OTHER)
- @ApiOperation(value = "鍏ュ簱鏌ヨ")
- public AjaxResult listPageByCustom(Page page, CustomStorage customStorage) {
+ @Operation(summary = "鍏ュ簱鏌ヨ")
+ public R<?> listPageByCustom(Page page, CustomStorage customStorage) {
IPage<CustomStorage> result = procurementRecordService.listPageByCustom(page, customStorage);
- return AjaxResult.success(result);
+ return R.ok(result);
}
@GetMapping("/listPageCopy")
@Log(title = "閲囪喘鍏ュ簱-搴撳瓨绠＄悊-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
- public AjaxResult listPageCopy(Page page, ProcurementPageDto procurementDto) {
+ public R<?> listPageCopy(Page page, ProcurementPageDto procurementDto) {
IPage<ProcurementPageDtoCopy> result = procurementRecordService.listPageCopy(page, procurementDto);
- return AjaxResult.success(result);
+ return R.ok(result);
}
@GetMapping("/listPageCopyByProduction")
@Log(title = "鐢熶骇鍏ュ簱-搴撳瓨绠＄悊-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
- public AjaxResult listPageCopyByProduction(Page page, ProcurementPageDto procurementDto) {
+ public R<?> listPageCopyByProduction(Page page, ProcurementPageDto procurementDto) {
IPage<ProcurementPageDtoCopy> result = procurementRecordService.listPageCopyByProduction(page, procurementDto);
- return AjaxResult.success(result);
+ return R.ok(result);
}
@GetMapping("/listPageCopyByCustom")
@Log(title = "鑷畾涔夊叆搴�-搴撳瓨绠＄悊-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
- public AjaxResult listPageCopyByCustom(Page page, CustomStorage customStorage) {
+ public R<?> listPageCopyByCustom(Page page, CustomStorage customStorage) {
IPage<CustomStorage> result = procurementRecordService.listPageCopyByCustom(page, customStorage);
- return AjaxResult.success(result);
+ return R.ok(result);
}
@GetMapping("/getReportList")
@Log(title = "搴撳瓨鎶ヨ〃鏌ヨ", businessType = BusinessType.OTHER)
- public AjaxResult getReportList(Page page, ProcurementPageDto procurementDto) {
- return AjaxResult.success(procurementRecordService.getReportList(page, procurementDto));
+ public R<?> getReportList(Page page, ProcurementPageDto procurementDto) {
+ return R.ok(procurementRecordService.getReportList(page, procurementDto));
}
/**
* 搴撳瓨绠＄悊閲囪喘瀵煎嚭
+ *
* @param response
*/
@PostMapping("/exportCopy")
public void exportCopy(HttpServletResponse response) {
- procurementRecordService.exportCopy(response,1);
+ procurementRecordService.exportCopy(response, 1);
}
/**
* 搴撳瓨绠＄悊鐢熶骇瀵煎嚭
+ *
* @param response
*/
@PostMapping("/exportCopyOne")
public void exportCopyOne(HttpServletResponse response) {
- procurementRecordService.exportCopy(response,2);
+ procurementRecordService.exportCopy(response, 2);
}
/**
* 搴撳瓨绠＄悊鑷畾涔夊鍑�
+ *
* @param response
*/
@PostMapping("/exportCopyTwo")
public void exportCopyTwo(HttpServletResponse response) {
- procurementRecordService.exportCopyTwo(response,3);
+ procurementRecordService.exportCopyTwo(response, 3);
}
/**
* 鍏ュ簱锛屽嚭搴撶鐞嗛噰璐鍑�
+ *
* @param response
*/
@PostMapping("/export")
public void export(HttpServletResponse response) {
- procurementRecordService.export(response,1);
+ procurementRecordService.export(response, 1);
}
/**
* 鍏ュ簱锛屽嚭搴撶鐞嗙敓浜у鍑�
+ *
* @param response
*/
@PostMapping("/exportOne")
public void exportOne(HttpServletResponse response) {
- procurementRecordService.export(response,2);
+ procurementRecordService.export(response, 2);
}
- @Autowired
- private CustomStorageMapper customStorageMapper;
/**
* 鍏ュ簱锛屽嚭搴撶鐞嗚嚜瀹氫箟瀵煎嚭
+ *
* @param response
*/
@PostMapping("/exportTwo")
@@ -210,5 +242,10 @@
util.exportExcel(response, customStorages, "鍏ュ簱鍙拌处");
}
-
+ @GetMapping("/listPageProductionStock")
+ @Log(title = "搴撳瓨绠＄悊-鎴愬搧搴撳瓨", businessType = BusinessType.OTHER)
+ public R<?> listPageProductionStock(Page page, ProcurementPageDto procurementDto) {
+ IPage<ProductModel> result = procurementRecordService.listPageProductionStock(page, procurementDto);
+ return R.ok(result);
+ }
}
--
Gitblit v1.9.3