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/sales/AccountSalesCollectionController.java | 79 +++++++++++++++++++++++++++++++++++++++
1 files changed, 79 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/account/controller/sales/AccountSalesCollectionController.java b/src/main/java/com/ruoyi/account/controller/sales/AccountSalesCollectionController.java
new file mode 100644
index 0000000..6ab1f2a
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/controller/sales/AccountSalesCollectionController.java
@@ -0,0 +1,79 @@
+package com.ruoyi.account.controller.sales;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.bean.dto.sales.AccountSalesCollectionDto;
+import com.ruoyi.account.bean.vo.sales.AccountSalesCollectionVo;
+import com.ruoyi.account.pojo.sales.AccountSalesCollection;
+import com.ruoyi.account.service.sales.AccountSalesCollectionService;
+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-18 03:49:56
+ */
+@RestController
+@RequestMapping("/accountSalesCollection")
+@Tag(name = "璐㈠姟绠＄悊--鏀舵鍗�")
+@RequiredArgsConstructor
+public class AccountSalesCollectionController {
+
+ private final AccountSalesCollectionService accountSalesCollectionService;
+
+ @GetMapping("/listPageAccountSalesCollection")
+ @Log(title = "鏀舵鍗曞彴璐�", businessType = BusinessType.OTHER)
+ @Operation(summary = "璐㈠姟绠＄悊--鏀舵鍗曞彴璐�")
+ public R<IPage<AccountSalesCollectionVo>> listPageAccountSalesCollection(Page page, AccountSalesCollectionDto accountSalesCollectionDto) {
+ IPage<AccountSalesCollectionVo> listPage = accountSalesCollectionService.listPageAccountSalesCollection(page,accountSalesCollectionDto);
+ return R.ok(listPage);
+ }
+
+ @GetMapping("/getOutboundBatchesByCustomer")
+ @Log(title = "鏍规嵁瀹㈡埛鏌ヨ鍑哄簱鍗曞彿(鏀舵鍗�)", businessType = BusinessType.OTHER)
+ @Operation(summary = "璐㈠姟绠＄悊--鏍规嵁瀹㈡埛鏌ヨ鍑哄簱鍗曞彿(鏀舵鍗�)")
+ public R getOutboundBatchesByCustomer(Integer customerId) {
+ return R.ok(accountSalesCollectionService.getOutboundBatchesByCustomer(customerId));
+ }
+
+ @PostMapping("/addAccountSalesCollection")
+ @Log(title = "鏂板鏀舵鍗�", businessType = BusinessType.INSERT)
+ @Operation(summary = "璐㈠姟绠＄悊--鏂板鏀舵鍗�")
+ public R addAccountSalesCollection(@RequestBody AccountSalesCollection accountSalesCollection) {
+ return R.ok(accountSalesCollectionService.addAccountSalesCollection(accountSalesCollection));
+ }
+
+ @PutMapping("/updateAccountSalesCollection")
+ @Log(title = "缂栬緫鏀舵鍗�", businessType = BusinessType.UPDATE)
+ @Operation(summary = "璐㈠姟绠＄悊--缂栬緫鏀舵鍗�")
+ public R updateAccountSalesCollection(@RequestBody AccountSalesCollection accountSalesCollection) {
+ return R.ok(accountSalesCollectionService.updateById(accountSalesCollection));
+ }
+
+ @DeleteMapping("/deleteAccountSalesCollection")
+ @Log(title = "鍒犻櫎鏀舵鍗�", businessType = BusinessType.DELETE)
+ @Operation(summary = "璐㈠姟绠＄悊--鍒犻櫎鏀舵鍗�")
+ public R deleteAccountSalesCollection(@RequestParam("ids") Long[] ids) {
+ return R.ok(accountSalesCollectionService.deleteAccountSalesCollection(Arrays.asList(ids)));
+ }
+
+ @PostMapping("/exportAccountSalesCollection")
+ @Operation(summary = "瀵煎嚭鏀舵鍗曟枃浠�")
+ @Log(title = "瀵煎嚭鏀舵鍗曟枃浠�", businessType = BusinessType.EXPORT)
+ public void exportAccountSalesCollection(HttpServletResponse response, AccountSalesCollectionDto accountSalesCollectionDto) {
+ accountSalesCollectionService.exportAccountSalesCollection(response,accountSalesCollectionDto);
+ }
+
+}
--
Gitblit v1.9.3