From b5e1bceabb36fe1d1e5e88397280d12e7044c6dd Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期五, 06 十一月 2026 15:32:31 +0800
Subject: [PATCH] 完善设备采集、安全管理及采购业务
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesServiceImpl.java | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesServiceImpl.java
index a110f3e..0675c27 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesServiceImpl.java
@@ -9,7 +9,7 @@
import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
import cn.iocoder.yudao.module.mes.controller.admin.wm.returnsales.vo.MesWmReturnSalesPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.returnsales.vo.MesWmReturnSalesSaveReqVO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.mdm.MesMdmItemDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnsales.MesWmReturnSalesDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnsales.MesWmReturnSalesDetailDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnsales.MesWmReturnSalesLineDO;
@@ -18,13 +18,15 @@
import cn.iocoder.yudao.module.mes.enums.wm.MesWmQualityStatusEnum;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmReturnSalesStatusEnum;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmTransactionTypeEnum;
-import cn.iocoder.yudao.module.mes.service.md.client.MesMdClientService;
-import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
+import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
+import cn.iocoder.yudao.module.aftersales.api.AfterSaleTicketApi;
+import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
import cn.iocoder.yudao.module.mes.service.wm.transaction.MesWmTransactionService;
import cn.iocoder.yudao.module.mes.service.wm.transaction.dto.MesWmTransactionSaveReqDTO;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.beans.factory.ObjectProvider;
import org.springframework.validation.annotation.Validated;
import java.math.BigDecimal;
@@ -33,13 +35,14 @@
import java.util.Map;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.invalidParamException;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
/**
* MES 閿�鍞��璐у崟 Service 瀹炵幇绫�
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Service
@Validated
@@ -53,11 +56,13 @@
@Resource
private MesWmReturnSalesDetailService returnSalesDetailService;
@Resource
- private MesMdClientService clientService;
+ private CrmCustomerApi customerApi;
@Resource
- private MesMdItemService itemService;
+ private MesMdmItemService mdmItemService;
@Resource
private MesWmTransactionService wmTransactionService;
+ @Resource
+ private ObjectProvider<AfterSaleTicketApi> afterSaleTicketApiProvider;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -106,7 +111,7 @@
@Override
public PageResult<MesWmReturnSalesDO> getReturnSalesPage(MesWmReturnSalesPageReqVO pageReqVO) {
- return returnSalesMapper.selectPage(pageReqVO);
+ return returnSalesMapper.selectPage(pageReqVO, (List<Long>) null);
}
@Override
@@ -170,7 +175,7 @@
MesWmReturnSalesDetailDO::getQuantity, BigDecimal::add, BigDecimal.ZERO);
// 瀵规瘮琛屾暟閲忎笌鏄庣粏鎬绘暟閲忥紝涓嶆弧瓒崇洿鎺ユ姏鍑�
if (line.getQuantity().compareTo(totalDetailQuantity) > 0) {
- MesMdItemDO item = itemService.validateItemExistsAndEnable(line.getItemId());
+ MesMdmItemDO item = mdmItemService.validateItemExistsAndEnable(line.getItemId());
throw exception(WM_RETURN_SALES_DETAIL_QUANTITY_MISMATCH,
item.getCode() + " " + item.getName() + " 鏈畬鎴愪笂鏋�");
}
@@ -183,6 +188,13 @@
// 3. 鏇存柊閫�璐у崟鐘舵��
returnSalesMapper.updateById(new MesWmReturnSalesDO()
.setId(id).setStatus(MesWmReturnSalesStatusEnum.FINISHED.getStatus()));
+ if (returnSales.getAfterSaleReturnId() != null) {
+ AfterSaleTicketApi api = afterSaleTicketApiProvider.getIfAvailable();
+ if (api == null) throw invalidParamException("鍞悗鏈嶅姟涓嶅彲鐢紝鏃犳硶鍚屾閫�璐у叆搴撶姸鎬�");
+ var response = api.onReturnInboundFinished(returnSales.getAfterSaleReturnId());
+ if (response == null || !Boolean.TRUE.equals(response.getCheckedData()))
+ throw invalidParamException("鍞悗閫�璐у叆搴撶姸鎬佸悓姝ュけ璐�");
+ }
}
private void createTransactionList(MesWmReturnSalesDO returnSales) {
@@ -272,7 +284,7 @@
*/
private void validateSaveData(MesWmReturnSalesSaveReqVO reqVO) {
validateCodeUnique(reqVO.getId(), reqVO.getCode());
- clientService.validateClientExistsAndEnable(reqVO.getClientId());
+ customerApi.validateCustomer(reqVO.getClientId());
}
}
--
Gitblit v1.9.3