From 2fb6c67b2c0c72195eef6fe5f7904d739b46e2c0 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 25 六月 2025 11:57:28 +0800
Subject: [PATCH] Merge branch 'mdc_hyjs_master'
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/GuideCardBatchServiceImpl.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 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 183133e..9ccebff 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
@@ -33,9 +33,6 @@
private IDocInfoService docInfoService;
@Autowired
- private IDocRelativeService docRelativeService;
-
- @Autowired
private IPartsInfoService partsInfoService;
@Autowired
@@ -129,16 +126,16 @@
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.getStructureType());
+ }
+ guideCardBatch.setFlowStatus("0");
guideCardBatch.setCompiler(user.getUsername());
guideCardBatch.setCreateTime(new Date());
return this.save(guideCardBatch);
--
Gitblit v1.9.3