From be5783c8a7e13bbc76d33c95643d75779cce21db Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 18 七月 2026 15:39:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/sn/MesWmSnServiceImpl.java | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/sn/MesWmSnServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/sn/MesWmSnServiceImpl.java
index 0f9ebed..2cf874d 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/sn/MesWmSnServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/sn/MesWmSnServiceImpl.java
@@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.mes.service.wm.sn;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.IdUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.mes.controller.admin.wm.sn.vo.MesWmSnGenerateReqVO;
@@ -8,9 +9,11 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.sn.MesWmSnDO;
import cn.iocoder.yudao.module.mes.dal.mysql.wm.sn.MesWmSnMapper;
import cn.iocoder.yudao.module.mes.enums.md.autocode.MesMdAutoCodeRuleCodeEnum;
+import cn.iocoder.yudao.module.mes.enums.wm.BarcodeBizTypeEnum;
import cn.iocoder.yudao.module.mes.service.md.autocode.MesMdAutoCodeRecordService;
-import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
+import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService;
+import cn.iocoder.yudao.module.mes.service.wm.barcode.MesWmBarcodeService;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -19,6 +22,8 @@
import java.util.ArrayList;
import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
/**
* MES SN 鐮� Service 瀹炵幇绫�
@@ -36,15 +41,17 @@
@Resource
private MesMdAutoCodeRecordService autoCodeRecordService;
@Resource
- private MesMdItemService itemService;
+ private MesMdmItemService mdmItemService;
@Resource
private MesProWorkOrderService workOrderService;
+ @Resource
+ private MesWmBarcodeService barcodeService;
@Override
@Transactional(rollbackFor = Exception.class)
public void generateSnCodes(MesWmSnGenerateReqVO reqVO) {
// 鏍￠獙鐗╂枡鏄惁瀛樺湪
- itemService.validateItemExists(reqVO.getItemId());
+ mdmItemService.validateItemExists(reqVO.getItemId());
// 鏍￠獙宸ュ崟鏄惁瀛樺湪
if (reqVO.getWorkOrderId() != null) {
workOrderService.validateWorkOrderExists(reqVO.getWorkOrderId());
@@ -62,6 +69,9 @@
}
// 鎵归噺鎻掑叆
snMapper.insertBatch(sns);
+ // 鑷姩鐢熸垚鏉＄爜
+ sns.forEach(sn -> barcodeService.autoGenerateBarcode(BarcodeBizTypeEnum.SN.getValue(),
+ sn.getId(), sn.getCode(), sn.getCode()));
}
@Override
@@ -77,7 +87,16 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void deleteSnByUuid(String uuid) {
+ List<MesWmSnDO> sns = snMapper.selectListByUuid(uuid);
+ if (CollUtil.isEmpty(sns)) {
+ return;
+ }
+
+ // 鍒犻櫎 SN 鐮佸叧鑱旂殑鏉＄爜璁板綍
+ barcodeService.deleteBarcodeByBizTypeAndBizIds(BarcodeBizTypeEnum.SN.getValue(),
+ convertList(sns, MesWmSnDO::getId));
+ // 鍒犻櫎 SN 鐮�
snMapper.deleteByUuid(uuid);
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3