From d54fbc9d4f8981fa0f7f613b33a28a8cd4f764ea Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期日, 25 十月 2026 16:29:53 +0800
Subject: [PATCH] feat(system): 优化用户搜索功能并完善ERP和MES模块验证逻辑
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/MesWmSalesNoticeController.java | 44 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/MesWmSalesNoticeController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/MesWmSalesNoticeController.java
index 53d0b5a..7686a8a 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/MesWmSalesNoticeController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/MesWmSalesNoticeController.java
@@ -10,6 +10,8 @@
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
import cn.iocoder.yudao.module.crm.api.customer.dto.CrmCustomerRespDTO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.salesnotice.vo.MesWmSalesNoticeImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.salesnotice.vo.MesWmSalesNoticeImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.salesnotice.vo.MesWmSalesNoticePageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.salesnotice.vo.MesWmSalesNoticeRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.salesnotice.vo.MesWmSalesNoticeSaveReqVO;
@@ -17,6 +19,7 @@
import cn.iocoder.yudao.module.mes.service.wm.salesnotice.MesWmSalesNoticeService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
@@ -24,6 +27,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.util.Collections;
@@ -113,12 +117,48 @@
@PostMapping("/generate-from-sale-order")
@Operation(summary = "浠庨攢鍞鍗曠敓鎴愬彂璐ч�氱煡鍗�")
- @Parameter(name = "saleOrderId", description = "閿�鍞鍗旾D", required = true)
@PreAuthorize("@ss.hasPermission('mes:wm-sales-notice:create')")
- public CommonResult<Long> generateFromSaleOrder(@RequestParam("saleOrderId") Long saleOrderId) {
+ public CommonResult<Long> generateFromSaleOrder(@RequestBody Map<String, Long> params) {
+ Long saleOrderId = params.get("saleOrderId");
return success(salesNoticeService.generateSalesNoticeFromSaleOrder(saleOrderId));
}
+ @PostMapping("/generate-product-sales")
+ @Operation(summary = "浠庡彂璐ч�氱煡鍗曠敓鎴愰攢鍞嚭搴撳崟")
+ @Parameter(name = "id", description = "鍙戣揣閫氱煡鍗曠紪鍙�", required = true)
+ @PreAuthorize("@ss.hasPermission('mes:wm-product-sales:create')")
+ public CommonResult<Long> generateProductSales(@RequestParam("id") Long id) {
+ return success(salesNoticeService.generateProductSalesFromNotice(id));
+ }
+
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱鍙戣揣閫氱煡鍗曞鍏ユā鏉�")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ List<MesWmSalesNoticeImportExcelVO> list = Collections.singletonList(
+ MesWmSalesNoticeImportExcelVO.builder()
+ .code("SN001").name("绀轰緥鍙戣揣閫氱煡鍗�").saleOrderCode("SO001")
+ .salesDate(java.time.LocalDateTime.now()).recipientName("")
+ .remark("").build()
+ );
+ // 杈撳嚭
+ ExcelUtils.write(response, "鍙戣揣閫氱煡鍗曞鍏ユā鏉�.xls", "鍙戣揣閫氱煡鍗曞垪琛�", MesWmSalesNoticeImportExcelVO.class, list);
+ }
+
+ @PostMapping("/import")
+ @Operation(summary = "瀵煎叆鍙戣揣閫氱煡鍗�")
+ @Parameters({
+ @Parameter(name = "file", description = "Excel 鏂囦欢", required = true),
+ @Parameter(name = "updateSupport", description = "鏄惁鏀寔鏇存柊锛岄粯璁や负 false", example = "true")
+ })
+ @PreAuthorize("@ss.hasPermission('mes:wm-sales-notice:import')")
+ public CommonResult<MesWmSalesNoticeImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
+ @RequestParam(value = "updateSupport", required = false,
+ defaultValue = "false") Boolean updateSupport) throws Exception {
+ List<MesWmSalesNoticeImportExcelVO> list = ExcelUtils.read(file, MesWmSalesNoticeImportExcelVO.class);
+ return success(salesNoticeService.importSalesNoticeList(list, updateSupport));
+ }
+
// ==================== 鎷兼帴 VO ====================
private List<MesWmSalesNoticeRespVO> buildRespVOList(List<MesWmSalesNoticeDO> list) {
--
Gitblit v1.9.3