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/api/returnsales/MesWmReturnSalesApiImpl.java | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/returnsales/MesWmReturnSalesApiImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/returnsales/MesWmReturnSalesApiImpl.java
index 67c278c..40faa67 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/returnsales/MesWmReturnSalesApiImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/returnsales/MesWmReturnSalesApiImpl.java
@@ -2,26 +2,58 @@
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.mes.api.returnsales.dto.MesWmReturnSalesCreateReqDTO;
+import cn.iocoder.yudao.module.mes.api.returnsales.dto.MesWmReturnSalesLineRespDTO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.returnsales.vo.MesWmReturnSalesSaveReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.returnsales.vo.line.MesWmReturnSalesLineSaveReqVO;
import cn.iocoder.yudao.module.mes.service.wm.returnsales.MesWmReturnSalesService;
+import cn.iocoder.yudao.module.mes.service.wm.returnsales.MesWmReturnSalesLineService;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
/**
* MES 閿�鍞��璐у崟 API 瀹炵幇绫�
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Service
public class MesWmReturnSalesApiImpl implements MesWmReturnSalesApi {
@Resource
private MesWmReturnSalesService returnSalesService;
+ @Resource
+ private MesWmReturnSalesLineService returnSalesLineService;
@Override
+ @Transactional(rollbackFor = Exception.class)
public Long createReturnSales(MesWmReturnSalesCreateReqDTO reqDTO) {
MesWmReturnSalesSaveReqVO createReqVO = BeanUtils.toBean(reqDTO, MesWmReturnSalesSaveReqVO.class);
- return returnSalesService.createReturnSales(createReqVO);
+ createReqVO.setAfterSaleReturnId(reqDTO.getAfterSaleReturnId());
+ Long returnId = returnSalesService.createReturnSales(createReqVO);
+ List<MesWmReturnSalesCreateReqDTO.Item> items = reqDTO.getItems();
+ if (items != null) {
+ for (MesWmReturnSalesCreateReqDTO.Item item : items) {
+ MesWmReturnSalesLineSaveReqVO line = new MesWmReturnSalesLineSaveReqVO()
+ .setReturnId(returnId).setItemId(item.getItemId()).setQuantity(item.getQuantity())
+ .setBatchId(item.getBatchId()).setBatchCode(item.getBatchCode())
+ .setRqcCheckFlag(true).setRemark(item.getRemark());
+ returnSalesLineService.createReturnSalesLine(line);
+ }
+ }
+ return returnId;
+ }
+
+ @Override
+ public void cancelReturnSales(Long id) {
+ returnSalesService.cancelReturnSales(id);
+ }
+
+ @Override
+ public List<MesWmReturnSalesLineRespDTO> getReturnSalesLineList(Long returnSalesId) {
+ return BeanUtils.toBean(returnSalesLineService.getReturnSalesLineListByReturnId(returnSalesId),
+ MesWmReturnSalesLineRespDTO.class);
}
}
--
Gitblit v1.9.3