From 251be431ad12399fe4ebce599c353d05dcec7888 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 29 十月 2026 12:28:34 +0800
Subject: [PATCH] feat(mes): 支持追溯二维码解析功能
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/MesWmReturnSalesController.java | 54 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 42 insertions(+), 12 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/MesWmReturnSalesController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/MesWmReturnSalesController.java
index d765f69..ae596ba 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/MesWmReturnSalesController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/MesWmReturnSalesController.java
@@ -8,12 +8,16 @@
import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
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.productsales.vo.MesWmProductSalesPageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.returnsales.vo.MesWmReturnableProductSalesLineRespVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.returnsales.vo.MesWmReturnableProductSalesRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.returnsales.vo.MesWmReturnSalesPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.returnsales.vo.MesWmReturnSalesRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.returnsales.vo.MesWmReturnSalesSaveReqVO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.md.client.MesMdClientDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnsales.MesWmReturnSalesDO;
-import cn.iocoder.yudao.module.mes.service.md.client.MesMdClientService;
import cn.iocoder.yudao.module.mes.service.wm.returnsales.MesWmReturnSalesService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
@@ -34,11 +38,6 @@
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
-/**
- * 绠＄悊鍚庡彴 - MES 閿�鍞��璐у崟 Controller
- *
- * @author 鑺嬮亾婧愮爜
- */
@Tag(name = "绠＄悊鍚庡彴 - MES 閿�鍞��璐у崟")
@RestController
@RequestMapping("/mes/wm/return-sales")
@@ -48,7 +47,7 @@
@Resource
private MesWmReturnSalesService returnSalesService;
@Resource
- private MesMdClientService clientService;
+ private CrmCustomerApi crmCustomerApi;
@PostMapping("/create")
@Operation(summary = "鍒涘缓閿�鍞��璐у崟")
@@ -143,6 +142,25 @@
return success(true);
}
+ @GetMapping("/returnable-product-sales-page")
+ @Operation(summary = "鑾峰緱鍙��閿�鍞嚭搴撳崟鍒嗛〉", description = "浠呭凡瀹屾垚鐘舵�侊紝涓斿瓨鍦ㄥ彲閫�鏁伴噺澶т簬 0 鐨勮")
+ @PreAuthorize("@ss.hasPermission('mes:wm-return-sales:query')")
+ public CommonResult<PageResult<MesWmReturnableProductSalesRespVO>> getReturnableProductSalesPage(
+ @Valid MesWmProductSalesPageReqVO pageReqVO) {
+ PageResult<MesWmProductSalesDO> pageResult = returnSalesService.getReturnableProductSalesPage(pageReqVO);
+ List<MesWmReturnableProductSalesRespVO> list = buildReturnableProductSalesRespVOList(pageResult.getList());
+ return success(new PageResult<>(list, pageResult.getTotal()));
+ }
+
+ @GetMapping("/returnable-product-sales-line-list")
+ @Operation(summary = "鑾峰緱閿�鍞嚭搴撳崟鍙��琛屽垪琛�")
+ @Parameter(name = "productSalesId", description = "閿�鍞嚭搴撳崟缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('mes:wm-return-sales:query')")
+ public CommonResult<List<MesWmReturnableProductSalesLineRespVO>> getReturnableProductSalesLineList(
+ @RequestParam("productSalesId") Long productSalesId) {
+ return success(returnSalesService.getReturnableProductSalesLineList(productSalesId));
+ }
+
@GetMapping("/check-quantity")
@Operation(summary = "鏍￠獙閿�鍞��璐у崟鏁伴噺", description = "鏍￠獙姣忚鏄庣粏鏁伴噺涔嬪拰鏄惁绛変簬琛岄��璐ф暟閲�")
@Parameter(name = "id", description = "缂栧彿", required = true)
@@ -158,12 +176,24 @@
return Collections.emptyList();
}
// 1. 鑾峰緱鍏宠仈鏁版嵁
- Map<Long, MesMdClientDO> clientMap = clientService.getClientMap(
+ Map<Long, CrmCustomerRespDTO> customerMap = crmCustomerApi.getCustomerMap(
convertSet(list, MesWmReturnSalesDO::getClientId));
// 2. 鏋勫缓缁撴灉
return BeanUtils.toBean(list, MesWmReturnSalesRespVO.class, vo ->
- MapUtils.findAndThen(clientMap, vo.getClientId(), client ->
- vo.setClientCode(client.getCode()).setClientName(client.getName()).setClientNickname(client.getNickname())));
+ MapUtils.findAndThen(customerMap, vo.getClientId(), customer ->
+ vo.setClientName(customer.getName())));
}
-}
+ private List<MesWmReturnableProductSalesRespVO> buildReturnableProductSalesRespVOList(
+ List<MesWmProductSalesDO> list) {
+ if (CollUtil.isEmpty(list)) {
+ return Collections.emptyList();
+ }
+ Map<Long, CrmCustomerRespDTO> customerMap = crmCustomerApi.getCustomerMap(
+ convertSet(list, MesWmProductSalesDO::getClientId));
+ return BeanUtils.toBean(list, MesWmReturnableProductSalesRespVO.class, vo ->
+ MapUtils.findAndThen(customerMap, vo.getClientId(), customer ->
+ vo.setClientName(customer.getName())));
+ }
+
+}
\ No newline at end of file
--
Gitblit v1.9.3