From 511d8bd98ee50ecf9377c0ac4df25be5d277a03e Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 17 六月 2025 13:34:57 +0800
Subject: [PATCH] 修改检索nc文件bug

---
 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/GuideCardBatchServiceImpl.java |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/GuideCardBatchServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/GuideCardBatchServiceImpl.java
index 1061927..45a9c0a 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/GuideCardBatchServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/GuideCardBatchServiceImpl.java
@@ -83,7 +83,7 @@
         }
 
         // 鎷兼帴瀹屾暣缂栧彿
-        return yearSuffix + code + user.getUsername() + serialSuffix;
+        return yearSuffix+"-"+ code+"-"+ user.getUsername()+"-"+ serialSuffix;
     }
 
     /**
@@ -129,16 +129,15 @@
             guideCardBatch.setProcessWorkCode(workStep.getStepCode());
             partsInfo=partsInfoService.getById(workStep.getPartsId());
         }
-        if (partsInfo==null){
-            return false;
-        }
         guideCardBatch.setDocId(docId);
         guideCardBatch.setSerialNumber(getSerialNumber("C140"));
         guideCardBatch.setUnit(sysDictService.queryDictTextByKey("unit_code", "C140"));
         guideCardBatch.setDocName(docInfo.getDocName());
-        guideCardBatch.setPartsCode(partsInfo.getPartsCode());
-        guideCardBatch.setPartsName(partsInfo.getPartsName());
-        guideCardBatch.setMaterielDesp(partsInfo.getMaterielDesp());
+        if (partsInfo!=null){
+            guideCardBatch.setPartsCode(partsInfo.getPartsCode());
+            guideCardBatch.setPartsName(partsInfo.getPartsName());
+            guideCardBatch.setMaterielDesp(partsInfo.getMaterielDesp());
+        }
         guideCardBatch.setCompiler(user.getUsername());
         guideCardBatch.setCreateTime(new Date());
         return this.save(guideCardBatch);

--
Gitblit v1.9.3