From b7c4edd36912d26aa2e8e6fa5605c370bb2e478a Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期四, 13 三月 2025 09:43:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java | 36 ++++++++++++------------------------
1 files changed, 12 insertions(+), 24 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
index efc2876..ae37bf8 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
@@ -93,6 +93,10 @@
private NumberGenerator<InsOrder> numberGenerator;
+ private NumberGenerator<InsSample> sampleCodeGenerator;
+
+ private NumberGenerator<InsFibers> fibersCodeGenerator;
+
private InsSampleUserMapper insSampleUserMapper;
private InsOrderStateMapper insOrderStateMapper;
@@ -255,11 +259,10 @@
String outEntrustCodePrefix = getOutEntrustCodePrefix(customCode, laboratoryCode);
String outEntrustCode = numberGenerator.generateNumberWithPrefix(5, outEntrustCodePrefix, InsOrder::getOutEntrustCode);
insOrder.setOutEntrustCode(outEntrustCode);
-// String giveCode = this.giveCode.giveCode("JCZX-" + customCode + "-", "ins_sample", "", "yyMMdd");
- String giveCode = "";
-// insOrder.setOutEntrustCode(giveCode.giveCode3("ZT/" + code2 + "-" + code + "-", insOrder.getCompanyId(), insOrder.getLaboratory(), "ins_order", "", "yyMM"));
-// String giveCode = this.giveCode.giveCode("JCZX-" + code + "-", "ins_sample", "", "yyMMdd");
insOrderMapper.insert(insOrder);
+ //鐢熸垚鏍峰搧缂栧彿
+ String currentDay = LocalDate.now().format(DateTimeFormatter.ofPattern("yyMMdd"));
+ String generatedSampleCode = sampleCodeGenerator.generateNumberWithPrefix(3, currentDay, InsSample::getSampleCode);
AtomicInteger count = new AtomicInteger();
List<FiberDto> fiberList = new ArrayList<>();
list.forEach(a -> {
@@ -267,7 +270,7 @@
a.setId(null);
a.setInsOrderId(insOrder.getId());
if (StrUtil.isEmpty(a.getSampleCode())) {
- a.setSampleCode(giveCode.split("-")[2] + "-" + count.get());
+ a.setSampleCode(generatedSampleCode + "-" + count.get());
} else {
//鍘婚櫎鎵嬭緭鐨勬牱鍝佺紪鍙蜂腑棣栧熬鍙兘鍖呭惈鐨勭┖鏍�
a.setSampleCode(a.getSampleCode().trim());
@@ -294,8 +297,7 @@
for (FibersDto fibersDto : bushingDto.getFibers()) {
fibersDto.setInsBushingId(bushingDto.getId());
if (StringUtils.isBlank(fibersDto.getCode())) {
-// fibersDto.setCode(this.giveCode.giveCode("", "ins_fibers", "", "yyMMdd"));
- fibersDto.setCode("");
+ fibersDto.setCode(fibersCodeGenerator.generateNumberWithPrefix(3, currentDay, InsFibers::getCode));
}
insFibersMapper.insert(fibersDto);
for (FiberDto fiberDto : fibersDto.getFiber()) {
@@ -334,16 +336,13 @@
insProductMapper.insert(product);
}
}
-// else {
-// throw new ErrorException("鏍峰搧鐨勫厜绾ら厤缃俊鎭噷闈㈡病鏈夐厤缃厜绾ゅ甫淇℃伅涔熸病鏈夊厜绾や俊鎭�,璇烽噸鏂伴厤缃繚瀛樺啀鎻愪氦涓嬪崟!!!");
-// }
}
}
}
}
if (ObjectUtil.isNotEmpty(a.getInsulating())) {
List<InsProduct> ip2 = new ArrayList<>();
- for (Integer i = 0; i < a.getInsulating().getNum(); i++) {
+ for (int i = 0; i < a.getInsulating().getNum(); i++) {
ip2.addAll(a.getInsulating().getInsProduct());
}
for (InsProduct product : ip2) {
@@ -364,8 +363,7 @@
b.setInsOrderId(insOrder.getId());
b.setParentId(a.getId());
if (StrUtil.isEmpty(b.getSampleCode())) {
-// b.setSampleCode(this.giveCode.giveCode("", "ins_sample", "", "yyMMdd"));
- b.setSampleCode("");
+ b.setSampleCode(sampleCodeGenerator.generateNumberWithPrefix(3, currentDay, InsSample::getSampleCode));
}
insSampleMapper.insert(b);
if (ObjectUtil.isNotEmpty(b.getInsProduct())) {
@@ -388,7 +386,7 @@
} else {
for (FibersDto fibersDto : bushingDto.getFibers()) {
fibersDto.setInsBushingId(bushingDto.getId());
- fibersDto.setCode("");
+ fibersDto.setCode(fibersCodeGenerator.generateNumberWithPrefix(3, currentDay, InsFibers::getCode));
insFibersMapper.insert(fibersDto);
for (FiberDto fiberDto : fibersDto.getFiber()) {
fiberDto.setInsFibersId(fibersDto.getId());
@@ -508,16 +506,6 @@
}
}
}
-
- // 娌℃湁杩涜鍏夌氦閰嶇疆鐨勭啍鎺ラ厤瀵癸紝鐩存帴娣诲姞鏍峰搧
-// try {
-// for (InsProduct insProduct : insProducts) {
-// insProduct.setId(null);
-// insProduct.setInsSampleId(insSample.getId());
-// insProductMapper.insert(insProduct);
-// }
-// } catch (Exception e) {
-// }
}
}
return insOrder.getId();
--
Gitblit v1.9.3