From b03b37e1d649631e31f33704a49a46f05aa7dc9f Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期三, 03 七月 2024 16:14:21 +0800
Subject: [PATCH] 2024-7-3 标准库的导入
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java | 115 +++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 83 insertions(+), 32 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 6e42544..7ad21ac 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
@@ -15,6 +15,7 @@
import com.yuanchu.mom.mapper.*;
import com.yuanchu.mom.pojo.*;
import com.yuanchu.mom.service.InsOrderService;
+import com.yuanchu.mom.service.InsProductService;
import com.yuanchu.mom.utils.GiveCode;
import com.yuanchu.mom.utils.QueryWrappers;
import com.yuanchu.mom.vo.SampleDefectsFatherVo;
@@ -47,6 +48,7 @@
private InsSampleMapper insSampleMapper;
private InsProductMapper insProductMapper;
+ private InsProductService insProductService;
private GiveCode giveCode;
@@ -145,6 +147,7 @@
}
insSampleMapper.insert(a);
if (ObjectUtil.isNotEmpty(a.getInsProduct())) {
+ //鏅�氭楠岄」鐩�(闄や簡鍏夌氦鎺ュご鎹熻��)鐨勬坊鍔�
addInsProductMethod(a.getId(), a.getInsProduct(), null, 0);
}
if (ObjectUtil.isNotEmpty(a.getInsulating())) {
@@ -211,10 +214,12 @@
sample.setId(null);
insSampleMapper.insert(sample);
try {
- InsProduct insProduct = sample.getInsProduct().stream().filter(a -> Objects.equals(a.getInspectionItem(), "鐔旀帴鎹熻��")).findFirst().get();
- insProduct.setId(null);
- insProduct.setInsSampleId(sample.getId());
- insProductMapper.insert(insProduct);
+ List<InsProduct> insProducts = sample.getInsProduct().stream().filter(a -> Objects.equals(a.getInspectionItem(), "鍏夌氦鎺ュご鎹熻��")).collect(Collectors.toList());
+ for (InsProduct insProduct : insProducts) {
+ insProduct.setId(null);
+ insProduct.setInsSampleId(sample.getId());
+ insProductMapper.insert(insProduct);
+ }
} catch (Exception e) {
}
}
@@ -222,30 +227,70 @@
}
private void addInsProductMethod(Integer sampleId, List<InsProduct> productList, Integer id, Integer type) {
+ InsOrder insOrder = insOrderMapper.selectById(insSampleMapper.selectById(sampleId).getInsOrderId());
for (InsProduct product : productList) {
- /*if(product.getState()==1 && (product.getAsk().indexOf("D")>-1||product.getAsk().indexOf("W")>-1||product.getAsk().indexOf("X")>-1
- ||product.getAsk().indexOf("RTS")>-1||product.getAsk().indexOf("H")>-1||product.getAsk().indexOf("L")>-1)){
- throw new ErrorException("鎻愪氦澶辫触锛屽瓨鍦ㄦ湭濉啓鐨勫彉閲忥細"+product.getInspectionItem()+" "+product.getInspectionItemSubclass());
- }*/
- if (product.getState() == 1 && !product.getInspectionItem().equals("鐔旀帴鎹熻��")) {
- switch (type) {
- case 1:
- product.setInsFibersId(id);
- break;
- case 2:
- product.setInsFiberId(id);
- break;
+ if (product.getState() == 1 && !product.getInspectionItem().equals("鍏夌氦鎺ュご鎹熻��")) {
+ //鍒ゆ柇鍏夌紗鐨勬俯搴﹀惊鐜」鐩坊鍔�
+ if (insOrder.getSampleType().equals("鍏夌紗") && product.getInspectionItem().equals("娓╁害寰幆") && type != 0) {
+ List<InsProduct> insProductes = new ArrayList<>();
+ List<InsProduct> insProducts = new ArrayList<>();
+ String[] strings = product.getAsk().split(";");
+ for (int i = 0; i < strings.length; i++) {
+ if (i != strings.length - 1) {
+ InsProduct insProduct = new InsProduct();
+ switch (type) {
+ case 1:
+ insProduct.setInsFibersId(id);
+ break;
+ case 2:
+ insProduct.setInsFiberId(id);
+ break;
+ }
+ String[] split = strings[i].split(",");
+ insProduct.setInspectionItem("1娆�");//妫�楠岄」--寰幆娆℃暟
+ insProduct.setInspectionItemSubclass(split[0]);//妫�楠岄」--娓╁害
+ insProduct.setInspectionItemClass(split[1]);//妫�楠岄」--鍏夌氦椤圭洰
+ insProduct.setAsk(split[2]);//妫�楠岃姹�
+ insProduct.setTell(strings[i]);//妫�楠屾弿杩�
+ insProducts.add(insProduct);
+ insProductes.add(insProduct);
+ } else {
+ //鏈�鍚庝竴涓暟鎹槸璇存槑浼氬惊鐜灏戞
+ int count = Integer.parseInt(strings[i]);
+ if (count > 1) {
+ //寰幆瓒呰繃1娆�
+ for (int j = 2; j <= count; j++) {
+ for (InsProduct insProduct : insProducts) {
+ if (!insProduct.getInspectionItemSubclass().equals("20鈩�")) {
+ insProduct.setInspectionItem(j + "娆�");
+ insProductes.add(insProduct);
+ }
+ }
+ }
+ }
+ }
+ }
+ insProductService.saveBatch(insProductes);
+ } else {
+ 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);
}
}
}
@@ -263,12 +308,15 @@
@Override
public int upInsOrderOfState(InsOrder insOrder) {
insOrder.setExamineTime(LocalDateTime.now());
- String code = baseMapper.selLaboratoryCode(insOrder.getLaboratory());
- if (StringUtils.isEmpty(code)) {
- code = "";
+ if (insOrder.getState() == 1) {
+ //瀹℃牳閫氳繃鎵嶄細鐢熸垚濮旀墭缂栧彿
+ String code = baseMapper.selLaboratoryCode(insOrder.getLaboratory());
+ if (StringUtils.isEmpty(code)) {
+ code = "";
+ }
+ String code2 = customMapper.selectById(insOrder.getCompanyId()).getCode2();
+ insOrder.setEntrustCode(giveCode.giveCode2("JCZX/" + code + "-" + code2 + "-", insOrder.getCompanyId(), insOrder.getLaboratory(), "ins_order", "", "yyMM"));
}
- String code2 = customMapper.selectById(insOrder.getCompanyId()).getCode2();
- insOrder.setEntrustCode(giveCode.giveCode("JC/ZX" + code + "-" + code2 + "-", "ins_order", "", "yyMM"));
return insOrderMapper.updateById(insOrder);
}
@@ -279,6 +327,9 @@
List<SampleProductDto> list = insSampleMapper.getInsOrderAndSample(id, laboratory);
map.put("insOrder", insOrder);
map.put("sampleProduct", list);
+ //鏌ヨ鎵�鏈夎褰曟ā鐗堝幓閲�
+ List<Map<Integer, Object>> list2 = insOrderMapper.selectReportModelByOrderId(id, laboratory);
+ map.put("reportModel", list2);
return map;
}
@@ -320,7 +371,7 @@
//鏍囩鎵撳嵃
@Override
- public List<SampleProductDto3> labelPrinting(String ids) {
+ public List<SampleProductDto3> labelPrinting(String ids) {
List<Integer> list = Arrays.stream(ids.split(",")).map(Integer::parseInt).collect(Collectors.toList());
List<SampleProductDto3> sampleProductDtos = insSampleMapper.selectSampleProductListByOrderId3(list);
Set<String> processedCodes = new HashSet<>();
--
Gitblit v1.9.3