From 10b88a7ff17caf92f3d4e8a550c1085a70c2517a Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 28 五月 2026 17:43:26 +0800
Subject: [PATCH] Merge dev_New_pro into dev_山西_晋和园_pro

---
 src/main/java/com/ruoyi/account/controller/purchase/AccountPaymentApplicationController.java |   86 +++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 86 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/account/controller/purchase/AccountPaymentApplicationController.java b/src/main/java/com/ruoyi/account/controller/purchase/AccountPaymentApplicationController.java
new file mode 100644
index 0000000..423d0ef
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/controller/purchase/AccountPaymentApplicationController.java
@@ -0,0 +1,86 @@
+package com.ruoyi.account.controller.purchase;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.bean.dto.purchase.AccountPaymentApplicationDto;
+import com.ruoyi.account.bean.vo.purchase.AccountPaymentApplicationVo;
+import com.ruoyi.account.pojo.purchase.AccountPaymentApplication;
+import com.ruoyi.account.service.purchase.AccountPaymentApplicationService;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.domain.R;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+
+/**
+ * <p>
+ * 璐㈠姟绠＄悊--浠樻鐢宠 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-05-19 03:44:22
+ */
+@RestController
+@RequestMapping("/accountPaymentApplication")
+@Tag(name = "璐㈠姟绠＄悊--浠樻鐢宠")
+@RequiredArgsConstructor
+public class AccountPaymentApplicationController {
+
+    private final AccountPaymentApplicationService accountPaymentApplicationService;
+
+    @GetMapping("/listPageAccountPaymentApplication")
+    @Log(title = "浠樻鐢宠鍙拌处", businessType = BusinessType.OTHER)
+    @Operation(summary = "璐㈠姟绠＄悊--浠樻鐢宠鍙拌处")
+    public R<IPage<AccountPaymentApplicationVo>> listPageAccountPaymentApplication(Page page, AccountPaymentApplicationDto accountPaymentApplicationDto) {
+        IPage<AccountPaymentApplicationVo> listPage = accountPaymentApplicationService.listPageAccountPaymentApplication(page,accountPaymentApplicationDto);
+        return R.ok(listPage);
+    }
+
+    @GetMapping("/getInboundBatchesBySupplier")
+    @Log(title = "鏍规嵁渚涘簲鍟嗘煡璇㈠叆搴撳崟鍙�(浠樻鐢宠)", businessType = BusinessType.OTHER)
+    @Operation(summary = "璐㈠姟绠＄悊--鏍规嵁渚涘簲鍟嗘煡璇㈠叆搴撳崟鍙�(浠樻鐢宠)")
+    public R getInboundBatchesBySupplier(Integer supplierId) {
+        return R.ok(accountPaymentApplicationService.getInboundBatchesBySupplier(supplierId));
+    }
+
+    @PostMapping("/addAccountPaymentApplication")
+    @Log(title = "鏂板浠樻鐢宠", businessType = BusinessType.INSERT)
+    @Operation(summary = "璐㈠姟绠＄悊--鏂板浠樻鐢宠")
+    public R addAccountPaymentApplication(@RequestBody AccountPaymentApplication accountPaymentApplication) {
+        return R.ok(accountPaymentApplicationService.addAccountPaymentApplication(accountPaymentApplication));
+    }
+
+    @PutMapping("/updateAccountPaymentApplication")
+    @Log(title = "淇敼浠樻鐢宠", businessType = BusinessType.UPDATE)
+    @Operation(summary = "璐㈠姟绠＄悊--淇敼浠樻鐢宠")
+    public R updateAccountPaymentApplication(@RequestBody AccountPaymentApplication accountPaymentApplication) {
+        return R.ok(accountPaymentApplicationService.updateById(accountPaymentApplication));
+    }
+
+    @PutMapping("/auditAccountPaymentApplication")
+    @Log(title = "瀹℃牳浠樻鐢宠", businessType = BusinessType.UPDATE)
+    @Operation(summary = "璐㈠姟绠＄悊--瀹℃牳浠樻鐢宠")
+    public R auditAccountPaymentApplication(@RequestBody AccountPaymentApplication accountPaymentApplication) {
+        return R.ok(accountPaymentApplicationService.updateById(accountPaymentApplication));
+    }
+
+    @DeleteMapping("/deleteAccountPaymentApplication")
+    @Log(title = "鍒犻櫎浠樻鐢宠", businessType = BusinessType.DELETE)
+    @Operation(summary = "璐㈠姟绠＄悊--鍒犻櫎浠樻鐢宠")
+    public R deleteAccountPaymentApplication(@RequestParam("ids") Long[] ids) {
+        return R.ok(accountPaymentApplicationService.deleteAccountPaymentApplication(Arrays.asList(ids)));
+    }
+
+    @PostMapping("/exportAccountPaymentApplication")
+    @Operation(summary = "瀵煎嚭浠樻鐢宠鏂囦欢")
+    @Log(title = "瀵煎嚭浠樻鐢宠鏂囦欢", businessType = BusinessType.EXPORT)
+    public void exportAccountPaymentApplication(HttpServletResponse response, AccountPaymentApplicationDto accountPaymentApplicationDto) {
+        accountPaymentApplicationService.exportAccountPaymentApplication(response,accountPaymentApplicationDto);
+    }
+
+}

--
Gitblit v1.9.3