From d39e4f7d839167c16425086dfa2f8747bccfdff9 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 05 十一月 2026 17:39:01 +0800
Subject: [PATCH] feat: 打通销售采购财务闭环并完成累计业务优化
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/MesWmReturnVendorController.java | 103 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 92 insertions(+), 11 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/MesWmReturnVendorController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/MesWmReturnVendorController.java
index 38c39e4..560f754 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/MesWmReturnVendorController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/MesWmReturnVendorController.java
@@ -11,10 +11,18 @@
import cn.iocoder.yudao.module.mes.controller.admin.wm.returnvendor.vo.MesWmReturnVendorPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.returnvendor.vo.MesWmReturnVendorRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.returnvendor.vo.MesWmReturnVendorSaveReqVO;
-import cn.iocoder.yudao.module.erp.api.purchase.ErpSupplierApi;
-import cn.iocoder.yudao.module.erp.api.purchase.dto.ErpSupplierRespDTO;
+import cn.iocoder.yudao.module.srm.api.supplier.SrmSupplierApi;
+import cn.iocoder.yudao.module.srm.api.supplier.dto.SrmSupplierRespDTO;
+import cn.iocoder.yudao.module.erp.api.finance.ErpFinancePaymentApi;
+import cn.iocoder.yudao.module.erp.api.finance.dto.ErpFinancePaymentRespDTO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.arrivalnotice.MesWmArrivalNoticeDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnvendor.MesWmReturnVendorDO;
+import cn.iocoder.yudao.module.mes.enums.wm.MesWmReturnVendorStatusEnum;
+import cn.iocoder.yudao.module.mes.service.wm.arrivalnotice.MesWmArrivalNoticeService;
import cn.iocoder.yudao.module.mes.service.wm.returnvendor.MesWmReturnVendorService;
+import cn.iocoder.yudao.module.mes.service.wm.returnvendor.MesWmReturnVendorServiceImpl;
+import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
+import cn.iocoder.yudao.module.system.api.storage.dto.StorageBlobRespDTO;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -26,6 +34,7 @@
import org.springframework.web.bind.annotation.*;
import java.io.IOException;
+import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -43,7 +52,13 @@
@Resource
private MesWmReturnVendorService returnVendorService;
@Resource
- private ErpSupplierApi supplierApi;
+ private SrmSupplierApi srmSupplierApi;
+ @Resource
+ private StorageAttachmentApi storageAttachmentApi;
+ @Resource
+ private ErpFinancePaymentApi financePaymentApi;
+ @Resource
+ private MesWmArrivalNoticeService arrivalNoticeService;
@PostMapping("/create")
@Operation(summary = "鍒涘缓渚涘簲鍟嗛��璐у崟")
@@ -72,7 +87,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱渚涘簲鍟嗛��璐у崟")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:wm-return-vendor:query')")
public CommonResult<MesWmReturnVendorRespVO> getReturnVendor(@RequestParam("id") Long id) {
MesWmReturnVendorDO returnVendor = returnVendorService.getReturnVendor(id);
if (returnVendor == null) {
@@ -83,7 +97,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱渚涘簲鍟嗛��璐у崟鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('mes:wm-return-vendor:query')")
public CommonResult<PageResult<MesWmReturnVendorRespVO>> getReturnVendorPage(
@Valid MesWmReturnVendorPageReqVO pageReqVO) {
PageResult<MesWmReturnVendorDO> pageResult = returnVendorService.getReturnVendorPage(pageReqVO);
@@ -109,6 +122,41 @@
public CommonResult<Boolean> submitReturnVendor(@RequestParam("id") Long id) {
returnVendorService.submitReturnVendor(id);
return success(true);
+ }
+
+ @PutMapping("/submit-approval")
+ @Operation(summary = "鎻愪氦渚涘簲鍟嗛��璐у崟瀹℃壒", description = "璧� BPM 娴佺▼锛氶噰璐� -> 璐ㄩ噺 -> 浠撳簱")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @Parameter(name = "processDefinitionKey", description = "娴佺▼瀹氫箟 Key", required = true, example = "purchase_return_vendor_approve")
+ @PreAuthorize("@ss.hasPermission('mes:wm-return-vendor:submit-approval')")
+ public CommonResult<Boolean> submitReturnVendorApproval(@RequestParam("id") Long id,
+ @RequestParam("processDefinitionKey") String processDefinitionKey) {
+ returnVendorService.submitReturnVendorApproval(id, processDefinitionKey);
+ return success(true);
+ }
+
+ @GetMapping("/attachments")
+ @Operation(summary = "鑾峰緱渚涘簲鍟嗛��璐у崟闄勪欢鍒楄〃")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ public CommonResult<List<StorageBlobRespDTO>> getReturnVendorAttachments(@RequestParam("id") Long id) {
+ return success(storageAttachmentApi.listAttachments(
+ MesWmReturnVendorServiceImpl.RETURN_VENDOR_RECORD_TYPE, id));
+ }
+
+ @PostMapping("/red-flush")
+ @Operation(summary = "鐢熸垚閲囪喘閫�璐ц礋鏁板啿绾粯娆惧崟", description = "骞傜瓑锛氬凡鐢熸垚鍒欑洿鎺ヨ繑鍥炲凡鏈夊啿绾㈠崟缂栧彿")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('mes:wm-return-vendor:finish')")
+ public CommonResult<Long> createRedFlushPayment(@RequestParam("id") Long id) {
+ return success(returnVendorService.createRedFlushPayment(id));
+ }
+
+ @PostMapping("/replacement-notice")
+ @Operation(summary = "鐢熸垚鎹㈣揣鍒拌揣閫氱煡鍗�", description = "骞傜瓑锛氬凡鐢熸垚鍒欑洿鎺ヨ繑鍥炲凡鏈夊埌璐ч�氱煡鍗曠紪鍙�")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('mes:wm-return-vendor:finish')")
+ public CommonResult<Long> createReplacementNotice(@RequestParam("id") Long id) {
+ return success(returnVendorService.createReplacementNotice(id));
}
@PutMapping("/stock")
@@ -141,9 +189,16 @@
@GetMapping("/check-quantity")
@Operation(summary = "鏍￠獙渚涘簲鍟嗛��璐у崟鏁伴噺", description = "鏍￠獙姣忚鏄庣粏鏁伴噺涔嬪拰鏄惁绛変簬琛岄��璐ф暟閲�")
@Parameter(name = "id", description = "缂栧彿", required = true)
- @PreAuthorize("@ss.hasPermission('mes:wm-return-vendor:query')")
public CommonResult<Boolean> checkReturnVendorQuantity(@RequestParam("id") Long id) {
return success(returnVendorService.checkReturnVendorQuantity(id));
+ }
+
+ @PostMapping("/import-purchase-order-items")
+ @Operation(summary = "鏍规嵁鍏宠仈閲囪喘璁㈠崟甯﹀叆鐗╂枡鏄庣粏")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('mes:wm-return-vendor:update')")
+ public CommonResult<Integer> importPurchaseOrderItems(@RequestParam("id") Long id) {
+ return success(returnVendorService.importPurchaseOrderItems(id));
}
// ==================== 鎷兼帴 VO ====================
@@ -153,13 +208,39 @@
return Collections.emptyList();
}
// 1. 鑾峰緱鍏宠仈鏁版嵁
- Map<Long, ErpSupplierRespDTO> vendorMap = supplierApi.getSupplierList(
+ Map<Long, SrmSupplierRespDTO> vendorMap = srmSupplierApi.getSupplierList(
convertSet(list, MesWmReturnVendorDO::getVendorId)).getCheckedData().stream()
- .collect(java.util.stream.Collectors.toMap(ErpSupplierRespDTO::getId, s -> s));
+ .collect(java.util.stream.Collectors.toMap(SrmSupplierRespDTO::getId, s -> s));
// 2. 鏋勫缓缁撴灉
- return BeanUtils.toBean(list, MesWmReturnVendorRespVO.class, vo ->
- MapUtils.findAndThen(vendorMap, vo.getVendorId(), vendor ->
- vo.setVendorName(vendor.getName())));
+ return BeanUtils.toBean(list, MesWmReturnVendorRespVO.class, vo -> {
+ MapUtils.findAndThen(vendorMap, vo.getVendorId(), vendor -> {
+ vo.setVendorName(vendor.getName());
+ vo.setVendorCode(vendor.getCode());
+ });
+ vo.setStatusName(resolveStatusName(vo.getStatus()));
+ vo.setAttachmentList(storageAttachmentApi.listAttachments(
+ MesWmReturnVendorServiceImpl.RETURN_VENDOR_RECORD_TYPE, vo.getId()));
+ // 鍐茬孩鍗曞彿 / 鎹㈣揣鍒拌揣鍗曞彿锛堜粎鍦ㄥ凡鐢熸垚鏃舵煡璇級
+ if (vo.getRedFlushPaymentId() != null) {
+ ErpFinancePaymentRespDTO payment = financePaymentApi
+ .getFinancePayment(vo.getRedFlushPaymentId()).getCheckedData();
+ if (payment != null) {
+ vo.setRedFlushPaymentNo(payment.getNo());
+ }
+ }
+ if (vo.getReplacementNoticeId() != null) {
+ MesWmArrivalNoticeDO notice = arrivalNoticeService.getArrivalNotice(vo.getReplacementNoticeId());
+ if (notice != null) {
+ vo.setReplacementNoticeCode(notice.getCode());
+ }
+ }
+ });
+ }
+
+ private String resolveStatusName(Integer status) {
+ MesWmReturnVendorStatusEnum statusEnum = Arrays.stream(MesWmReturnVendorStatusEnum.values())
+ .filter(item -> item.getStatus().equals(status)).findFirst().orElse(null);
+ return statusEnum != null ? statusEnum.getName() : null;
}
}
--
Gitblit v1.9.3