From d0a20f29f07dc24c1fc0b27b8572b24a083d8c0d Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 08 四月 2026 09:40:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印
---
src/main/java/com/ruoyi/production/service/impl/ProductProcessServiceImpl.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
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