From 3ae364164cb9d85acce0b53a1ba5c70a80991308 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 03 七月 2024 22:21:49 +0800
Subject: [PATCH] 温度循环+报告英文换行+检验只有一项的设备查询+光纤配置报告换页+温度湿度
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java | 106 +++++++++++++++++++++++++++++++++++++---------------
1 files changed, 75 insertions(+), 31 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
index 7ad21ac..8f7c742 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
@@ -21,6 +21,7 @@
import com.yuanchu.mom.vo.SampleDefectsFatherVo;
import lombok.AllArgsConstructor;
import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -147,8 +148,35 @@
}
insSampleMapper.insert(a);
if (ObjectUtil.isNotEmpty(a.getInsProduct())) {
- //鏅�氭楠岄」鐩�(闄や簡鍏夌氦鎺ュご鎹熻��)鐨勬坊鍔�
- addInsProductMethod(a.getId(), a.getInsProduct(), null, 0);
+ addInsProductMethod(a.getId(), a.getInsProduct(), null, 0,false);
+ if (ObjectUtil.isNotEmpty(a.getBushing())){
+ for (BushingDto bushingDto : a.getBushing()) {
+ bushingDto.setInsSampleId(a.getId());
+ insBushingMapper.insert(bushingDto);
+ if (bushingDto.getFiber().size() != 0) {
+ for (FiberDto fiberDto : bushingDto.getFiber()) {
+ fiberDto.setInsBushingId(bushingDto.getId());
+ insFiberMapper.insert(fiberDto);
+ addInsProductMethod(a.getId(), a.getInsProduct(), fiberDto.getId(), 2,true);
+ addInsProductMethod(a.getId(), fiberDto.getProductList(), fiberDto.getId(), 2,false);
+ }
+ }else {
+ for (FibersDto fibersDto : bushingDto.getFibers()) {
+ fibersDto.setInsBushingId(bushingDto.getId());
+ fibersDto.setCode(this.giveCode.giveCode("", "ins_fibers", "", "yyMMdd"));
+ insFibersMapper.insert(fibersDto);
+ for (FiberDto fiberDto : fibersDto.getFiber()) {
+ fiberDto.setInsFibersId(fibersDto.getId());
+ insFiberMapper.insert(fiberDto);
+ addInsProductMethod(a.getId(), a.getInsProduct(), fiberDto.getId(), 2,true);
+ addInsProductMethod(a.getId(), fiberDto.getProductList(), fiberDto.getId(), 2,false);
+ }
+ //addInsProductMethod(a.getId(), a.getInsProduct(), fibersDto.getId(), 1);
+ addInsProductMethod(a.getId(), fibersDto.getProductList(), fibersDto.getId(), 1,false);
+ }
+ }
+ }
+ }
}
if (ObjectUtil.isNotEmpty(a.getInsulating())) {
List<InsProduct> ip2 = new ArrayList<>();
@@ -158,13 +186,13 @@
for (InsProduct product : ip2) {
product.setStandardMethodListId(a.getInsulating().getStandardMethodListId());
}
- addInsProductMethod(a.getId(), ip2, null, 0);
+ addInsProductMethod(a.getId(), ip2, null, 0,false);
}
if (ObjectUtil.isNotEmpty(a.getSheath())) {
for (InsProduct product : a.getSheath().getInsProduct()) {
product.setStandardMethodListId(a.getSheath().getStandardMethodListId());
}
- addInsProductMethod(a.getId(), a.getSheath().getInsProduct(), null, 0);
+ addInsProductMethod(a.getId(), a.getSheath().getInsProduct(), null, 0,false);
}
if (ObjectUtil.isNotEmpty(a.getChildSampleList())) {
for (SampleProductDto b : a.getChildSampleList()) {
@@ -177,12 +205,12 @@
}
insSampleMapper.insert(b);
if (ObjectUtil.isNotEmpty(b.getInsProduct())) {
- addInsProductMethod(b.getId(), b.getInsProduct(), null, 0);
+ addInsProductMethod(b.getId(), b.getInsProduct(), null, 0,false);
}
}
}
}
- if (ObjectUtil.isNotEmpty(a.getBushing())) {
+ if (ObjectUtil.isEmpty(a.getInsProduct()) && ObjectUtil.isNotEmpty(a.getBushing())) {
for (BushingDto bushingDto : a.getBushing()) {
bushingDto.setInsSampleId(a.getId());
insBushingMapper.insert(bushingDto);
@@ -190,7 +218,7 @@
for (FiberDto fiberDto : bushingDto.getFiber()) {
fiberDto.setInsBushingId(bushingDto.getId());
insFiberMapper.insert(fiberDto);
- addInsProductMethod(a.getId(), fiberDto.getProductList(), fiberDto.getId(), 2);
+ addInsProductMethod(a.getId(), fiberDto.getProductList(), fiberDto.getId(), 2,false);
}
} else {
for (FibersDto fibersDto : bushingDto.getFibers()) {
@@ -200,9 +228,9 @@
for (FiberDto fiberDto : fibersDto.getFiber()) {
fiberDto.setInsFibersId(fibersDto.getId());
insFiberMapper.insert(fiberDto);
- addInsProductMethod(a.getId(), fiberDto.getProductList(), fiberDto.getId(), 2);
+ addInsProductMethod(a.getId(), fiberDto.getProductList(), fiberDto.getId(), 2,false);
}
- addInsProductMethod(a.getId(), fibersDto.getProductList(), fibersDto.getId(), 1);
+ addInsProductMethod(a.getId(), fibersDto.getProductList(), fibersDto.getId(), 1,false);
}
}
}
@@ -226,7 +254,7 @@
return insOrder.getId();
}
- private void addInsProductMethod(Integer sampleId, List<InsProduct> productList, Integer id, Integer type) {
+ private void addInsProductMethod(Integer sampleId, List<InsProduct> productList, Integer id, Integer type,Boolean is) {
InsOrder insOrder = insOrderMapper.selectById(insSampleMapper.selectById(sampleId).getInsOrderId());
for (InsProduct product : productList) {
if (product.getState() == 1 && !product.getInspectionItem().equals("鍏夌氦鎺ュご鎹熻��")) {
@@ -247,11 +275,23 @@
break;
}
String[] split = strings[i].split(",");
- insProduct.setInspectionItem("1娆�");//妫�楠岄」--寰幆娆℃暟
+ insProduct.setInspectionItem("1");//妫�楠岄」--寰幆娆℃暟
insProduct.setInspectionItemSubclass(split[0]);//妫�楠岄」--娓╁害
insProduct.setInspectionItemClass(split[1]);//妫�楠岄」--鍏夌氦椤圭洰
insProduct.setAsk(split[2]);//妫�楠岃姹�
insProduct.setTell(strings[i]);//妫�楠屾弿杩�
+ insProduct.setInsSampleId(sampleId);
+ insProduct.setState(1);
+ insProduct.setFactory(product.getFactory());
+ insProduct.setLaboratory(product.getLaboratory());
+ insProduct.setSampleType(product.getSampleType());
+ insProduct.setSample(product.getSample());
+ insProduct.setModel(product.getModel());
+ insProduct.setSonLaboratory(product.getSonLaboratory());
+ insProduct.setUnit(product.getUnit());
+ insProduct.setManHourGroup(product.getManHourGroup());
+ insProduct.setInspectionItemType("0");
+ insProduct.setInspectionValueType("1");
insProducts.add(insProduct);
insProductes.add(insProduct);
} else {
@@ -262,8 +302,10 @@
for (int j = 2; j <= count; j++) {
for (InsProduct insProduct : insProducts) {
if (!insProduct.getInspectionItemSubclass().equals("20鈩�")) {
- insProduct.setInspectionItem(j + "娆�");
- insProductes.add(insProduct);
+ InsProduct insProduct1 = new InsProduct();
+ BeanUtils.copyProperties(insProduct,insProduct1);
+ insProduct1.setInspectionItem(j + "");
+ insProductes.add(insProduct1);
}
}
}
@@ -271,25 +313,27 @@
}
}
insProductService.saveBatch(insProductes);
- } else {
- switch (type) {
- case 1:
- product.setInsFibersId(id);
- break;
- case 2:
- product.setInsFiberId(id);
- break;
+ } else {
+ if (!is) {
+ switch (type) {
+ case 1:
+ product.setInsFibersId(id);
+ break;
+ case 2:
+ product.setInsFiberId(id);
+ break;
+ }
+ product.setId(null);
+ product.setCreateTime(null);
+ product.setUpdateTime(null);
+ product.setUpdateTime(null);
+ product.setUpdateUser(null);
+ product.setInsSampleId(sampleId);
+ if (product.getInspectionItemSubclass() == null) {
+ product.setInspectionItemSubclass("");
+ }
+ insProductMapper.insert(product);
}
- product.setId(null);
- product.setCreateTime(null);
- product.setUpdateTime(null);
- product.setUpdateTime(null);
- product.setUpdateUser(null);
- product.setInsSampleId(sampleId);
- if (product.getInspectionItemSubclass() == null) {
- product.setInspectionItemSubclass("");
- }
- insProductMapper.insert(product);
}
}
}
--
Gitblit v1.9.3