From cccbfadcb6e96c23a33c40c0687a27c2f6efa1db Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 09 十一月 2026 13:16:42 +0800
Subject: [PATCH] feat(seal): 添加印章详情及图片预览功能
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesServiceImpl.java | 38 ++++++++++++++++++++++++++++++++------
1 files changed, 32 insertions(+), 6 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 82abbb2..41bd4b3 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
@@ -4,6 +4,9 @@
import cn.hutool.core.util.ObjUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.aftersales.api.AfterSaleTicketApi;
+import cn.iocoder.yudao.module.aftersales.api.dto.AfterSaleWarehouseReturnStageReqDTO;
+import cn.iocoder.yudao.module.aftersales.api.dto.AfterSaleWarehouseReturnCreateReqDTO;
import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
@@ -18,7 +21,7 @@
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.crm.api.customer.CrmCustomerApi;
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;
@@ -39,7 +42,7 @@
/**
* MES 閿�鍞��璐у崟 Service 瀹炵幇绫�
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Service
@Validated
@@ -53,11 +56,13 @@
@Resource
private MesWmReturnSalesDetailService returnSalesDetailService;
@Resource
- private MesMdClientService clientService;
+ private CrmCustomerApi customerApi;
@Resource
private MesMdmItemService mdmItemService;
@Resource
private MesWmTransactionService wmTransactionService;
+ @Resource
+ private AfterSaleTicketApi afterSaleTicketApi;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -69,6 +74,15 @@
MesWmReturnSalesDO returnSales = BeanUtils.toBean(createReqVO, MesWmReturnSalesDO.class);
returnSales.setStatus(MesWmReturnSalesStatusEnum.PREPARE.getStatus());
returnSalesMapper.insert(returnSales);
+
+ // 3. 鍚屾鍏宠仈鍞悗宸ュ崟锛氫粨鍌ㄩ��璐х暀鐥� + 宸ュ崟杩涘叆寰呴��璐�
+ AfterSaleWarehouseReturnCreateReqDTO returnReqDTO = new AfterSaleWarehouseReturnCreateReqDTO();
+ returnReqDTO.setSaleOrderId(createReqVO.getSaleOrderId());
+ returnReqDTO.setReturnSalesId(returnSales.getId());
+ returnReqDTO.setReturnSalesCode(createReqVO.getCode());
+ returnReqDTO.setReturnReason(createReqVO.getReturnReason());
+ afterSaleTicketApi.onWarehouseReturnCreated(returnReqDTO);
+
return returnSales.getId();
}
@@ -106,7 +120,7 @@
@Override
public PageResult<MesWmReturnSalesDO> getReturnSalesPage(MesWmReturnSalesPageReqVO pageReqVO) {
- return returnSalesMapper.selectPage(pageReqVO);
+ return returnSalesMapper.selectPage(pageReqVO, (List<Long>) null);
}
@Override
@@ -158,6 +172,9 @@
}
// 1.2 妫�鏌ユ瘡涓鐨勬槑缁嗘暟閲忔槸鍚﹀畬鎴愪笂鏋�
List<MesWmReturnSalesLineDO> lines = returnSalesLineService.getReturnSalesLineListByReturnId(id);
+ if (CollUtil.isEmpty(lines)) {
+ throw exception(WM_RETURN_SALES_NO_LINE);
+ }
if (CollUtil.isNotEmpty(lines)) {
// 鎵归噺鏌ヨ鎵�鏈夋槑缁�
List<MesWmReturnSalesDetailDO> allDetails = returnSalesDetailService.getReturnSalesDetailListByReturnId(id);
@@ -165,11 +182,14 @@
allDetails, MesWmReturnSalesDetailDO::getLineId);
// 妫�鏌ユ瘡琛岀殑鏄庣粏鏁伴噺
for (MesWmReturnSalesLineDO line : lines) {
+ if (ObjUtil.notEqual(line.getQualityStatus(), MesWmQualityStatusEnum.PASS.getStatus())) {
+ throw exception(WM_RETURN_SALES_LINE_NOT_QUALIFIED);
+ }
List<MesWmReturnSalesDetailDO> details = detailMap.getOrDefault(line.getId(), Collections.emptyList());
BigDecimal totalDetailQuantity = CollectionUtils.getSumValue(details,
MesWmReturnSalesDetailDO::getQuantity, BigDecimal::add, BigDecimal.ZERO);
// 瀵规瘮琛屾暟閲忎笌鏄庣粏鎬绘暟閲忥紝涓嶆弧瓒崇洿鎺ユ姏鍑�
- if (line.getQuantity().compareTo(totalDetailQuantity) > 0) {
+ if (line.getQuantity() == null || line.getQuantity().compareTo(totalDetailQuantity) != 0) {
MesMdmItemDO item = mdmItemService.validateItemExistsAndEnable(line.getItemId());
throw exception(WM_RETURN_SALES_DETAIL_QUANTITY_MISMATCH,
item.getCode() + " " + item.getName() + " 鏈畬鎴愪笂鏋�");
@@ -183,6 +203,12 @@
// 3. 鏇存柊閫�璐у崟鐘舵��
returnSalesMapper.updateById(new MesWmReturnSalesDO()
.setId(id).setStatus(MesWmReturnSalesStatusEnum.FINISHED.getStatus()));
+ if (returnSales.getSaleOrderId() != null) {
+ afterSaleTicketApi.onWarehouseReturnInboundFinished(new AfterSaleWarehouseReturnStageReqDTO()
+ .setSaleOrderId(returnSales.getSaleOrderId())
+ .setReturnSalesId(returnSales.getId())
+ .setReturnSalesCode(returnSales.getCode()));
+ }
}
private void createTransactionList(MesWmReturnSalesDO returnSales) {
@@ -272,7 +298,7 @@
*/
private void validateSaveData(MesWmReturnSalesSaveReqVO reqVO) {
validateCodeUnique(reqVO.getId(), reqVO.getCode());
- clientService.validateClientExistsAndEnable(reqVO.getClientId());
+ customerApi.validateCustomer(reqVO.getClientId());
}
}
--
Gitblit v1.9.3