From c9cc74fad46adaa4bc448cba673e830baf705fce Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期二, 24 六月 2025 17:40:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/GuideCardBatchServiceImpl.java | 17 +++++++----------
1 files changed, 7 insertions(+), 10 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..836f70c 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
@@ -83,7 +80,7 @@
}
// 鎷兼帴瀹屾暣缂栧彿
- return yearSuffix + code + user.getUsername() + serialSuffix;
+ return yearSuffix+"-"+ code+"-"+ user.getUsername()+"-"+ serialSuffix;
}
/**
@@ -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.getMaterielDesp());
+ }
+ guideCardBatch.setFlowStatus("0");
guideCardBatch.setCompiler(user.getUsername());
guideCardBatch.setCreateTime(new Date());
return this.save(guideCardBatch);
--
Gitblit v1.9.3