From bc1b16a708ca7bec89d2e1a435c023477f107a59 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期日, 25 十月 2026 12:42:04 +0800
Subject: [PATCH] feat(mes): 添加MES系统自动编码规则支持
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcServiceImpl.java | 3 -
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsServiceImpl.java | 19 ++++-----
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/outsourcetest/MesQcOutsourceTestServiceImpl.java | 14 ++++++-
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java | 3 -
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/md/autocode/MesMdAutoCodeRuleCodeEnum.java | 9 ++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ncr/MesQcNcrServiceImpl.java | 21 ++++++++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImpl.java | 3 -
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/maintenanceplan/MesProMaintenancePlanServiceImpl.java | 10 ++++-
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcServiceImpl.java | 3 -
9 files changed, 59 insertions(+), 26 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/md/autocode/MesMdAutoCodeRuleCodeEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/md/autocode/MesMdAutoCodeRuleCodeEnum.java
index c1c3626..195b2f1 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/md/autocode/MesMdAutoCodeRuleCodeEnum.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/md/autocode/MesMdAutoCodeRuleCodeEnum.java
@@ -19,6 +19,7 @@
MD_WORKSTATION_CODE("MD_WORKSTATION_CODE", "宸ヤ綔绔欑紪鐮�"),
MD_WORKSHOP_CODE("MD_WORKSHOP_CODE", "杞﹂棿缂栫爜"),
TM_TOOL_TYPE_CODE("TM_TOOL_TYPE_CODE", "宸ュ叿绫诲瀷缂栫爜"),
+ TM_TOOL_CODE("TM_TOOL_CODE", "宸ヨ澶瑰叿缂栫爜"),
WM_ARRIVAL_NOTICE_CODE("WM_ARRIVAL_NOTICE_CODE", "鍒拌揣閫氱煡鍗曠紪鐮�"),
WM_ITEM_RECEIPT_CODE("WM_ITEM_RECEIPT_CODE", "閲囪喘鍏ュ簱鍗曠紪鐮�"),
WM_RETURN_VENDOR_CODE("WM_RETURN_VENDOR_CODE", "閲囪喘閫�璐у崟缂栫爜"),
@@ -26,15 +27,23 @@
WM_SN_CODE("WM_SN_CODE", "SN 鐮�"),
WM_PACKAGE_CODE("WM_PACKAGE_CODE", "瑁呯鍗曠紪鐮�"),
WM_BATCH_CODE("WM_BATCH_CODE", "鎵规缂栫爜"),
+ PRO_MPS_CODE("PRO_MPS_CODE", "鐢熶骇璁″垝缂栫爜"),
+ PRO_MAINTENANCE_PLAN_CODE("PRO_MAINTENANCE_PLAN_CODE", "鐢靛姏浣滀笟璁″垝缂栫爜"),
PRO_TASK_CODE("PRO_TASK_CODE", "鐢熶骇浠诲姟缂栫爜"),
QC_IQC_CODE("QC_IQC_CODE", "鏉ユ枡妫�楠屽崟缂栫爜"),
QC_IPQC_CODE("QC_IPQC_CODE", "杩囩▼妫�楠屽崟缂栫爜"),
QC_OQC_CODE("QC_OQC_CODE", "鍑鸿揣妫�楠屽崟缂栫爜"),
QC_RQC_CODE("QC_RQC_CODE", "閫�璐ф楠屽崟缂栫爜"),
+ QC_INDICATOR_CODE("QC_INDICATOR_CODE", "璐ㄦ鎸囨爣缂栫爜"),
+ QC_TEMPLATE_CODE("QC_TEMPLATE_CODE", "璐ㄦ鏂规缂栫爜"),
+ QC_NCR_CODE("QC_NCR_CODE", "涓嶅悎鏍煎搧澶勭悊鍗曠紪鐮�"),
+ QC_OUTSOURCE_TEST_CODE("QC_OUTSOURCE_TEST_CODE", "濮斿妫�娴嬪崟缂栫爜"),
WM_WAREHOUSE_CODE("WM_WAREHOUSE_CODE", "浠撳簱缂栫爜"),
WM_LOCATION_CODE("WM_LOCATION_CODE", "搴撳尯缂栫爜"),
WM_AREA_CODE("WM_AREA_CODE", "搴撲綅缂栫爜"),
WM_PRODUCT_SALES_CODE("WM_PRODUCT_SALES_CODE", "閿�鍞嚭搴撳崟缂栫爜"),
+ WM_PRODUCT_ISSUE_CODE("WM_PRODUCT_ISSUE_CODE", "鐢熶骇棰嗘枡鍗曠紪鐮�"),
+ WM_PRODUCT_RECEIPT_CODE("WM_PRODUCT_RECEIPT_CODE", "浜у搧鍏ュ簱鍗曠紪鐮�"),
WM_MISC_RECEIPT_CODE("WM_MISC_RECEIPT_CODE", "鏉傞」鍏ュ簱鍗曠紪鐮�"),
WM_STOCK_TAKING_PLAN_CODE("WM_STOCK_TAKING_PLAN_CODE", "鐩樼偣鏂规缂栫爜"),
WM_STOCK_TAKING_CODE("WM_STOCK_TAKING_CODE", "鐩樼偣浠诲姟缂栫爜"),
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/maintenanceplan/MesProMaintenancePlanServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/maintenanceplan/MesProMaintenancePlanServiceImpl.java
index 700cd73..d0b58fb 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/maintenanceplan/MesProMaintenancePlanServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/maintenanceplan/MesProMaintenancePlanServiceImpl.java
@@ -340,8 +340,14 @@
}
private String generatePlanCode() {
- return "MP" + DateUtil.format(java.time.LocalDateTime.now(), "yyyyMMddHHmmss")
- + String.format("%03d", (int) (Math.random() * 1000));
+ try {
+ return autoCodeRecordService.generateAutoCode(
+ MesMdAutoCodeRuleCodeEnum.PRO_MAINTENANCE_PLAN_CODE.getCode());
+ } catch (Exception e) {
+ log.warn("[generatePlanCode] 缂栫爜瑙勫垯 {} 涓嶅瓨鍦紝浣跨敤鏃堕棿鎴崇敓鎴�",
+ MesMdAutoCodeRuleCodeEnum.PRO_MAINTENANCE_PLAN_CODE.getCode(), e);
+ return "MP" + DateUtil.format(java.time.LocalDateTime.now(), "yyyyMMddHHmmssSSS");
+ }
}
/**
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsServiceImpl.java
index f516574..81ce0e4 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsServiceImpl.java
@@ -23,6 +23,7 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemTypeDO;
import cn.iocoder.yudao.module.mes.enums.md.MesMdItemTypeEnum;
+import cn.iocoder.yudao.module.mes.enums.md.autocode.MesMdAutoCodeRuleCodeEnum;
import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemTypeService;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteProcessDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO;
@@ -69,11 +70,6 @@
@Validated
@Slf4j
public class MesProMpsServiceImpl implements MesProMpsService {
-
- /**
- * MPS 缂栫爜瑙勫垯
- */
- private static final String MPS_CODE_RULE = "MPS";
@Resource
private MesProMpsMapper mpsMapper;
@@ -534,10 +530,11 @@
*/
private String generateMpsCode() {
try {
- return autoCodeRecordService.generateAutoCode(MPS_CODE_RULE);
+ return autoCodeRecordService.generateAutoCode(MesMdAutoCodeRuleCodeEnum.PRO_MPS_CODE.getCode());
} catch (Exception e) {
// 濡傛灉缂栫爜瑙勫垯涓嶅瓨鍦紝浣跨敤鏃堕棿鎴崇敓鎴�
- log.warn("[generateMpsCode] 缂栫爜瑙勫垯 {} 涓嶅瓨鍦紝浣跨敤鏃堕棿鎴崇敓鎴�", MPS_CODE_RULE);
+ log.warn("[generateMpsCode] 缂栫爜瑙勫垯 {} 涓嶅瓨鍦紝浣跨敤鏃堕棿鎴崇敓鎴�",
+ MesMdAutoCodeRuleCodeEnum.PRO_MPS_CODE.getCode(), e);
return "MPS" + System.currentTimeMillis();
}
}
@@ -681,11 +678,13 @@
*/
private String generateWorkOrderCode() {
try {
- return autoCodeRecordService.generateAutoCode("WO");
+ return autoCodeRecordService.generateAutoCode(
+ MesMdAutoCodeRuleCodeEnum.PRO_WORK_ORDER_CODE.getCode());
} catch (Exception e) {
- log.warn("[generateWorkOrderCode] 缂栫爜瑙勫垯 WO 涓嶅瓨鍦紝浣跨敤鏃堕棿鎴崇敓鎴�");
+ log.warn("[generateWorkOrderCode] 缂栫爜瑙勫垯 {} 涓嶅瓨鍦紝浣跨敤鏃堕棿鎴崇敓鎴�",
+ MesMdAutoCodeRuleCodeEnum.PRO_WORK_ORDER_CODE.getCode(), e);
return "WO" + System.currentTimeMillis();
}
}
-}
\ No newline at end of file
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcServiceImpl.java
index 520c197..2f47fee 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcServiceImpl.java
@@ -253,10 +253,7 @@
if (unqualifiedQty == null || unqualifiedQty.compareTo(BigDecimal.ZERO) <= 0) {
return;
}
- String ncrCode = "NCR" + java.time.LocalDateTime.now()
- .format(java.time.format.DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS"));
MesQcNcrSaveReqVO saveReqVO = new MesQcNcrSaveReqVO();
- saveReqVO.setCode(ncrCode);
saveReqVO.setName("涓嶅悎鏍煎搧澶勭悊鍗�");
saveReqVO.setQcType(MesQcTypeEnum.IPQC.getType());
saveReqVO.setQcId(ipqc.getId());
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImpl.java
index 511bbe4..dab5ea9 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImpl.java
@@ -183,10 +183,7 @@
if (unqualifiedQty == null || unqualifiedQty.compareTo(BigDecimal.ZERO) <= 0) {
return;
}
- String ncrCode = "NCR" + java.time.LocalDateTime.now()
- .format(java.time.format.DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS"));
MesQcNcrSaveReqVO saveReqVO = new MesQcNcrSaveReqVO();
- saveReqVO.setCode(ncrCode);
saveReqVO.setName("涓嶅悎鏍煎搧澶勭悊鍗�");
saveReqVO.setQcType(MesQcTypeEnum.IQC.getType());
saveReqVO.setQcId(iqc.getId());
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ncr/MesQcNcrServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ncr/MesQcNcrServiceImpl.java
index a28e0a6..fbaf135 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ncr/MesQcNcrServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ncr/MesQcNcrServiceImpl.java
@@ -9,6 +9,8 @@
import cn.iocoder.yudao.module.mes.dal.mysql.qc.ncr.MesQcNcrMapper;
import cn.iocoder.yudao.module.mes.enums.qc.MesNcrStatusEnum;
import cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum;
+import cn.iocoder.yudao.module.mes.enums.md.autocode.MesMdAutoCodeRuleCodeEnum;
+import cn.iocoder.yudao.module.mes.service.md.autocode.MesMdAutoCodeRecordService;
import cn.iocoder.yudao.module.mes.service.qc.iqc.MesQcIqcService;
import cn.iocoder.yudao.module.mes.service.qc.ipqc.MesQcIpqcService;
import cn.iocoder.yudao.module.mes.service.qc.oqc.MesQcOqcService;
@@ -20,6 +22,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
+import lombok.extern.slf4j.Slf4j;
import java.time.LocalDateTime;
import java.util.Collection;
@@ -48,6 +51,7 @@
*/
@Service
@Validated
+@Slf4j
public class MesQcNcrServiceImpl implements MesQcNcrService {
@Resource
@@ -61,6 +65,9 @@
@Resource
private MesQcItemResolver qcItemResolver;
+
+ @Resource
+ private MesMdAutoCodeRecordService autoCodeRecordService;
@Resource
@Lazy
@@ -78,6 +85,9 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Long createNcr(MesQcNcrSaveReqVO createReqVO) {
+ if (StrUtil.isBlank(createReqVO.getCode())) {
+ createReqVO.setCode(generateNcrCode());
+ }
// 1. 鏍¢獙鏁版嵁
validateNcrCodeUnique(null, createReqVO.getCode());
validateItemExists(createReqVO.getItemId());
@@ -93,6 +103,17 @@
return ncr.getId();
}
+ private String generateNcrCode() {
+ try {
+ return autoCodeRecordService.generateAutoCode(MesMdAutoCodeRuleCodeEnum.QC_NCR_CODE.getCode());
+ } catch (Exception e) {
+ log.warn("NCR 缂栫爜瑙勫垯 {} 涓嶅彲鐢紝闄嶇骇浣跨敤鏃堕棿鎴崇紪鐮�",
+ MesMdAutoCodeRuleCodeEnum.QC_NCR_CODE.getCode(), e);
+ return "NCR" + LocalDateTime.now()
+ .format(java.time.format.DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS"));
+ }
+ }
+
@Override
@Transactional(rollbackFor = Exception.class)
public void updateNcr(MesQcNcrSaveReqVO updateReqVO) {
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java
index 23cf68f..9daa2ba 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java
@@ -179,10 +179,7 @@
if (unqualifiedQty == null || unqualifiedQty.compareTo(BigDecimal.ZERO) <= 0) {
return;
}
- String ncrCode = "NCR" + java.time.LocalDateTime.now()
- .format(java.time.format.DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS"));
MesQcNcrSaveReqVO saveReqVO = new MesQcNcrSaveReqVO();
- saveReqVO.setCode(ncrCode);
saveReqVO.setName("涓嶅悎鏍煎搧澶勭悊鍗�");
saveReqVO.setQcType(MesQcTypeEnum.OQC.getType());
saveReqVO.setQcId(oqc.getId());
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/outsourcetest/MesQcOutsourceTestServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/outsourcetest/MesQcOutsourceTestServiceImpl.java
index ad92efd..b4a2217 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/outsourcetest/MesQcOutsourceTestServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/outsourcetest/MesQcOutsourceTestServiceImpl.java
@@ -9,6 +9,8 @@
import cn.iocoder.yudao.module.mes.controller.admin.qc.outsourcetest.vo.MesQcOutsourceTestSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.outsourcetest.MesQcOutsourceTestDO;
import cn.iocoder.yudao.module.mes.dal.mysql.qc.outsourcetest.MesQcOutsourceTestMapper;
+import cn.iocoder.yudao.module.mes.enums.md.autocode.MesMdAutoCodeRuleCodeEnum;
+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.system.api.storage.StorageAttachmentApi;
import jakarta.annotation.Resource;
@@ -68,6 +70,8 @@
private MesMdItemService itemService;
@Resource
private StorageAttachmentApi storageAttachmentApi;
+ @Resource
+ private MesMdAutoCodeRecordService autoCodeRecordService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -155,8 +159,14 @@
}
private String generateCode() {
- return "WT" + DateUtil.format(java.time.LocalDateTime.now(), "yyyyMMddHHmmss")
- + String.format("%03d", (int) (Math.random() * 1000));
+ try {
+ return autoCodeRecordService.generateAutoCode(
+ MesMdAutoCodeRuleCodeEnum.QC_OUTSOURCE_TEST_CODE.getCode());
+ } catch (Exception e) {
+ log.warn("濮斿妫�娴嬬紪鐮佽鍒� {} 涓嶅彲鐢紝闄嶇骇浣跨敤鏃堕棿鎴崇紪鐮�",
+ MesMdAutoCodeRuleCodeEnum.QC_OUTSOURCE_TEST_CODE.getCode(), e);
+ return "WT" + DateUtil.format(java.time.LocalDateTime.now(), "yyyyMMddHHmmssSSS");
+ }
}
private MesQcOutsourceTestDO validateTestExists(Long id) {
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcServiceImpl.java
index e468b50..d20475f 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcServiceImpl.java
@@ -190,10 +190,7 @@
if (unqualifiedQty == null || unqualifiedQty.compareTo(BigDecimal.ZERO) <= 0) {
return;
}
- String ncrCode = "NCR" + java.time.LocalDateTime.now()
- .format(java.time.format.DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS"));
MesQcNcrSaveReqVO saveReqVO = new MesQcNcrSaveReqVO();
- saveReqVO.setCode(ncrCode);
saveReqVO.setName("涓嶅悎鏍煎搧澶勭悊鍗�");
saveReqVO.setQcType(MesQcTypeEnum.RQC.getType());
saveReqVO.setQcId(rqc.getId());
--
Gitblit v1.9.3