From bb091407c5920e4071b476e72fbb14638fac3865 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期一, 23 三月 2026 17:26:42 +0800
Subject: [PATCH] feat(product-process): 新增工序编号字段并优化编号生成逻辑
---
src/main/java/com/ruoyi/production/service/impl/ProductProcessServiceImpl.java | 12 ++++++++----
src/main/java/com/ruoyi/production/pojo/ProductProcess.java | 12 +++++++-----
2 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductProcess.java b/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
index 249e039..18fe087 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
@@ -31,6 +31,12 @@
private Long deviceLeaderId;
/**
+ * 宸ュ簭缂栧彿
+ */
+ @Excel(name = "宸ュ簭缂栧彿")
+ private String no;
+
+ /**
* 宸ュ簭鍚嶇О
*/
@Excel(name = "宸ュ簭鍚嶇О")
@@ -41,11 +47,7 @@
@Excel(name = "宸ュ簭鏈哄彴")
private String deviceName;
- /**
- * 宸ュ簭缂栧彿
- */
-// @Excel(name = "宸ュ簭缂栧彿")
- private String no;
+
/**
* 澶囨敞
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductProcessServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductProcessServiceImpl.java
index fd44a9c..b6c7548 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductProcessServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductProcessServiceImpl.java
@@ -1,5 +1,6 @@
package com.ruoyi.production.service.impl;
+import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -83,16 +84,19 @@
List<String> deviceNames = productProcessList.stream().map(ProductProcess::getDeviceName).collect(Collectors.toList());
List<DeviceLedger> deviceLedgerList = deviceLedgerMapper.selectList(Wrappers.<DeviceLedger>lambdaQuery().in(DeviceLedger::getDeviceName, deviceNames));
if(CollectionUtils.isEmpty(deviceLedgerList)){
- throw new RuntimeException("宸ュ簭鏈哄彴涓嶈兘涓虹┖");
+ throw new RuntimeException("鏈兘鏌ヨ鍒拌鏈哄彴淇℃伅锛岃妫�鏌ユ満鍙板悕绉版槸鍚︽纭�");
}
Map<String, DeviceLedger> deviceNameMap = deviceLedgerList.stream().collect(Collectors.toMap(DeviceLedger::getDeviceName, deviceLedger -> deviceLedger));
productProcessList.forEach(productProcess -> {
DeviceLedger deviceLedger = deviceNameMap.get(productProcess.getDeviceName());
productProcess.setDeviceLeaderId(deviceLedger.getId());
this.save(productProcess);
- String no = "GX" + String.format("%08d", productProcess.getId());
- productProcess.setNo(no);
- productProcessMapper.updateById(productProcess);
+ if(StrUtil.isEmpty(productProcess.getNo())){
+ String no = "GX" + String.format("%08d", productProcess.getId());
+ productProcess.setNo(no);
+ productProcessMapper.updateById(productProcess);
+ }
+
});
return AjaxResult.success(true);
--
Gitblit v1.9.3