From 25b0112f14f27e7358b19aabf552b6453eb61c73 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期一, 24 八月 2026 16:32:19 +0800
Subject: [PATCH] feat 功能修正
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/packages/MesWmPackageServiceImpl.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/packages/MesWmPackageServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/packages/MesWmPackageServiceImpl.java
index b5b9b22..64a29ac 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/packages/MesWmPackageServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/packages/MesWmPackageServiceImpl.java
@@ -4,6 +4,7 @@
import cn.hutool.core.util.ObjUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
import cn.iocoder.yudao.module.mes.controller.admin.wm.packages.vo.MesWmPackagePageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.packages.vo.MesWmPackageSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.packages.MesWmPackageDO;
@@ -26,7 +27,7 @@
/**
* MES 瑁呯鍗� Service 瀹炵幇绫�
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Service
@Validated
@@ -39,8 +40,11 @@
private MesWmPackageLineService packageLineService;
@Resource
private MesWmBarcodeService barcodeService;
+ @Resource
+ private CrmCustomerApi customerApi;
@Override
+ @Transactional(rollbackFor = Exception.class)
public Long createPackage(MesWmPackageSaveReqVO createReqVO) {
// 鏍￠獙缂栫爜鍞竴鎬�
validateCodeUnique(null, createReqVO.getCode());
@@ -58,6 +62,7 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public void updatePackage(MesWmPackageSaveReqVO updateReqVO) {
// 鏍￠獙瀛樺湪涓斾负鑽夌
validatePackageExistsAndDraft(updateReqVO.getId());
@@ -93,13 +98,20 @@
@Override
public PageResult<MesWmPackageDO> getPackagePage(MesWmPackagePageReqVO pageReqVO) {
- return packageMapper.selectPage(pageReqVO);
+ List<Long> permittedClientIds = customerApi.getPermittedCustomerIds();
+ return packageMapper.selectPage(pageReqVO, permittedClientIds);
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public void finishPackage(Long id) {
// 鏍￠獙瀛樺湪涓斾负鑽夌
validatePackageExistsAndDraft(id);
+
+ // 瑁呯鍗曞繀椤诲瓨鍦ㄨ绠辨槑缁�
+ if (packageLineService.getPackageLineCountByPackageId(id) == 0) {
+ throw exception(WM_PACKAGE_LINE_NOT_EXISTS);
+ }
// 鏇存柊鐘舵�佷负宸插畬鎴�
packageMapper.updateById(new MesWmPackageDO()
@@ -112,6 +124,7 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public void addChildPackage(Long parentId, Long childId) {
// 鏍￠獙鐖剁瀛樺湪涓斾负鑽夌
validatePackageExistsAndDraft(parentId);
@@ -125,6 +138,7 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public void removeChildPackage(Long childId) {
// 鏍￠獙瀛愮瀛樺湪
MesWmPackageDO child = validatePackageExists(childId);
--
Gitblit v1.9.3