From ec1d61de19f0fe6c3efc781e5d7a6af2ed65ae5d Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 10 六月 2025 10:51:49 +0800
Subject: [PATCH] DNC 文档导入、回传文档、解析文档、取消原有设备
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/CutterServiceImpl.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/CutterServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/CutterServiceImpl.java
index 07d23d7..2d1c271 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/CutterServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/CutterServiceImpl.java
@@ -182,7 +182,18 @@
List<Cutter> cutterList = extractToolAfterM6(docInfo,list);
// 淇濆瓨鍒�鍏�
if (!cutterList.isEmpty()) {
- this.saveBatch(cutterList);
+ List<Cutter> newCutterList = new ArrayList<>();
+ //楠岃瘉鍒�鍏锋槸鍚﹀凡缁忓瓨鍦�
+ cutterList.forEach(item -> {
+ List<Cutter> otherCuttersWithSameNo = checkCutterNo(item);
+ if (otherCuttersWithSameNo == null || otherCuttersWithSameNo.isEmpty()) {
+ newCutterList.add(item);
+ }
+ });
+ if (newCutterList.isEmpty()) {
+ return Result.error("鏈彂鐜板垁鍏风殑鍙傛暟淇℃伅娉ㄩ噴锛屾棤娉曟彁鍙栧垁鍏蜂俊鎭�");
+ }
+ this.saveBatch(newCutterList);
//TODO鍙戦�佸垁鍏风鐞嗘暟鎹�
return Result.OK("鎻愬彇鍒�鍏蜂俊鎭垚鍔�");
}else {
--
Gitblit v1.9.3