From 4d9364da736f322cfeeec2815e83f2a3f6534223 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 30 七月 2024 20:04:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-server/src/main/java/com/yuanchu/mom/service/impl/PkMasterServiceImpl.java | 117 ++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 80 insertions(+), 37 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/PkMasterServiceImpl.java b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/PkMasterServiceImpl.java
index 527c212..abd6f47 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/PkMasterServiceImpl.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/PkMasterServiceImpl.java
@@ -19,6 +19,8 @@
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.time.LocalDateTime;
import java.util.*;
@@ -77,7 +79,7 @@
if (ObjectUtils.isEmpty(master)) {
throw new ErrorException("娌℃湁鎵惧埌瀵瑰簲濮旀墭鍗�" + pkMaster.getEntrustCode() + "鐨勬暟閲囨暟鎹�");
}
- List<PkSlave> pkSlaves = pkSlaveMapper.selectList(Wrappers.<PkSlave>lambdaQuery().eq(PkSlave::getShiftId, master.getIsid()));
+ List<PkSlave> pkSlaves = pkSlaveMapper.selectList1(master.getIsid());
if (CollectionUtils.isEmpty(pkSlaves)) {
throw new ErrorException("娌℃湁鎵惧埌瀵瑰簲濮旀墭鍗�" + pkMaster.getEntrustCode() + "鐨勬暟閲囧瓙鏁版嵁");
}
@@ -122,89 +124,92 @@
//1310nm澶栫
Map<String, Object> map1 = new HashMap<>();
map1.put("u", userId + "");
- map1.put("v", pkSlave.getWeaken1310A());
+ map1.put("v", pkSlave.getWeaken1310A().toString());
iv.add(map1);
//1310nm鍐呯
Map<String, Object> map2 = new HashMap<>();
map2.put("u", userId + "");
- map2.put("v", pkSlave.getWeaken1310B());
+ map2.put("v", pkSlave.getWeaken1310B().toString());
iv.add(map2);
//1310nm琛板噺绯绘暟
Map<String, Object> map3 = new HashMap<>();
- map3.put("v", (pkSlave.getWeaken1310A() + pkSlave.getWeaken1310B()) / 2);
+ double v = (pkSlave.getWeaken1310A() + pkSlave.getWeaken1310B()) / 2;
+ BigDecimal decimal = BigDecimal.valueOf(v).setScale(3, RoundingMode.HALF_UP);
+ map3.put("v", String.valueOf(decimal));
cv.add(map3);
- }
- else if (productVo.getInsProduct().getInspectionItemClass().equals("1550nm")) {
+ } else if (productVo.getInsProduct().getInspectionItemClass().equals("1550nm")) {
//1550nm澶栫
Map<String, Object> map1 = new HashMap<>();
map1.put("u", userId + "");
- map1.put("v", pkSlave.getWeaken1550A());
+ map1.put("v", pkSlave.getWeaken1550A().toString());
iv.add(map1);
//1550nm鍐呯
Map<String, Object> map2 = new HashMap<>();
map2.put("u", userId + "");
- map2.put("v", pkSlave.getWeaken1550B());
+ map2.put("v", pkSlave.getWeaken1550B().toString());
iv.add(map2);
//1550nm琛板噺绯绘暟
Map<String, Object> map3 = new HashMap<>();
- map3.put("v", (pkSlave.getWeaken1550A() + pkSlave.getWeaken1550B()) / 2);
+ double v = (pkSlave.getWeaken1550A() + pkSlave.getWeaken1550B()) / 2;
+ BigDecimal decimal = BigDecimal.valueOf(v).setScale(3, RoundingMode.HALF_UP);
+ map3.put("v", String.valueOf(decimal));
cv.add(map3);
- }
- else if (productVo.getInsProduct().getInspectionItemClass().equals("1625nm")) {
+ } else if (productVo.getInsProduct().getInspectionItemClass().equals("1625nm")) {
//1625nm澶栫
Map<String, Object> map1 = new HashMap<>();
map1.put("u", userId + "");
- map1.put("v", pkSlave.getWeaken1625A());
+ map1.put("v", pkSlave.getWeaken1625A().toString());
iv.add(map1);
//1625nm鍐呯
Map<String, Object> map2 = new HashMap<>();
map2.put("u", userId + "");
- map2.put("v", pkSlave.getWeaken1625B());
+ map2.put("v", pkSlave.getWeaken1625B().toString());
iv.add(map2);
//1625nm琛板噺绯绘暟
Map<String, Object> map3 = new HashMap<>();
- map3.put("v", (pkSlave.getWeaken1625A() + pkSlave.getWeaken1625B()) / 2);
+ double v = (pkSlave.getWeaken1625A() + pkSlave.getWeaken1625B()) / 2;
+ BigDecimal decimal = BigDecimal.valueOf(v).setScale(3, RoundingMode.HALF_UP);
+ map3.put("v", String.valueOf(decimal));
cv.add(map3);
- }
- else if (productVo.getInsProduct().getInspectionItemClass().equals("1383nm")) {
+ } else if (productVo.getInsProduct().getInspectionItemClass().equals("1383nm")) {
//1383nm澶栫
Map<String, Object> map1 = new HashMap<>();
map1.put("u", userId + "");
- map1.put("v", pkSlave.getWeaken1383A());
+ map1.put("v", pkSlave.getWeaken1383A().toString());
iv.add(map1);
//1383nm鍐呯
Map<String, Object> map2 = new HashMap<>();
map2.put("u", userId + "");
- map2.put("v", pkSlave.getWeaken1383B());
+ map2.put("v", pkSlave.getWeaken1383B().toString());
iv.add(map2);
//1383nm琛板噺绯绘暟
Map<String, Object> map3 = new HashMap<>();
- map3.put("v", (pkSlave.getWeaken1383A() + pkSlave.getWeaken1383B()) / 2);
+ double v = (pkSlave.getWeaken1383A() + pkSlave.getWeaken1383B()) / 2;
+ BigDecimal decimal = BigDecimal.valueOf(v).setScale(3, RoundingMode.HALF_UP);
+ map3.put("v", String.valueOf(decimal));
cv.add(map3);
- }
- else if (productVo.getInsProduct().getInspectionItemClass().equals("1490nm")) {
+ } else if (productVo.getInsProduct().getInspectionItemClass().equals("1490nm")) {
//1490nm澶栫
Map<String, Object> map1 = new HashMap<>();
map1.put("u", userId + "");
- map1.put("v", pkSlave.getWeaken1490A());
+ map1.put("v", pkSlave.getWeaken1490A().toString());
iv.add(map1);
//1490nm鍐呯
Map<String, Object> map2 = new HashMap<>();
map2.put("u", userId + "");
- map2.put("v", pkSlave.getWeaken1490B());
+ map2.put("v", pkSlave.getWeaken1490B().toString());
iv.add(map2);
//1490nm琛板噺绯绘暟
Map<String, Object> map3 = new HashMap<>();
- map3.put("v", (pkSlave.getWeaken1490A() + pkSlave.getWeaken1490B()) / 2);
+ double v = (pkSlave.getWeaken1490A() + pkSlave.getWeaken1490B()) / 2;
+ BigDecimal decimal = BigDecimal.valueOf(v).setScale(3, RoundingMode.HALF_UP);
+ map3.put("v", String.valueOf(decimal));
cv.add(map3);
- }
- else {
+ } else {
throw new ErrorException("娌℃湁鎵惧埌璇ユ俯搴︾殑妫�楠岄」鐩�" + productVo.getInsProduct().getInspectionItemClass());
}
result.setInsValue(JSON.toJSONString(iv));//妫�楠屽��
result.setComValue(JSON.toJSONString(cv));//璁＄畻鍊�
- result.setEquipValue(null);//璁惧缂栧彿
- result.setEquipName(null);//璁惧鍚嶇О
if (BeanUtil.isEmpty(result.getId())) {
result.setCreateUser(userId);
result.setUpdateUser(userId);
@@ -216,7 +221,8 @@
}
InsProduct insProduct = productVo.getInsProduct();
- String comple = insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, insProduct.getId())).getComValue().split(":")[1].split("\"")[1];
+ InsProductResult insProductResult = insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, insProduct.getId()));
+ String comple = insProductResult.getComValue().split(":")[1].split("\"")[1];
//棣栧厛鏌ョ湅娓╁害鏄惁鏄�20搴﹀父娓�
if (!pkMaster.getTemperature().equals("20鈩�(甯告俯)")) {
//濡傛灉涓嶆槸鍏堟煡璇㈡槸鍚︽湁鍊�
@@ -297,9 +303,11 @@
break;
}
InsProductResult insProductRes = insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, insPro.getId()));
- insProduct.setLastValue(String.valueOf(Math.abs(Double.parseDouble(insProductRes.getComValue().split(":")[1].split("\"")[1]) - Double.parseDouble(comple))));
+ double abs = Math.abs(Double.parseDouble(insProductRes.getComValue().split(":")[1].split("\"")[1]) - Double.parseDouble(comple));
+ BigDecimal scale = BigDecimal.valueOf(abs).setScale(3, RoundingMode.HALF_UP);
+ insProduct.setLastValue(String.valueOf(scale));
String ask = insProduct.getAsk();
- int insResult=1;
+ int insResult = 1;
switch (ask.charAt(0)) {
case '<':
insResult = Double.parseDouble(insProduct.getLastValue()) < Double.parseDouble(ask.substring(1)) ? 1 : 0;
@@ -319,21 +327,56 @@
}
insProduct.setInsResult(insResult);
}
- }
- else {
+ } else {
//濡傛灉鏄�20搴﹀父娓�,闇�瑕佺粰鍑哄悎鏍肩殑缁撹
insProduct.setInsResult(1);//20搴﹀父娓╃殑妫�楠岄」榛樿涓哄悎鏍�
}
insProduct.setUpdateUser(userId);
insProductMapper.updateById(insProduct);
- User user = userMapper.selectOne(Wrappers.<User>lambdaQuery().eq(User::getAccount, pkMaster.getDetectionPeople()));
- if (ObjectUtils.isNotEmpty(user)){
- throw new ErrorException("lims绯荤粺娌℃湁鎵惧埌璇ョ敤鎴�"+ pkMaster.getDetectionPeople());
+ User user = userMapper.selectOne(Wrappers.<User>lambdaQuery().eq(User::getAccount, master.getDetectionPeople()));
+ if (ObjectUtils.isEmpty(user)) {
+ throw new ErrorException("lims绯荤粺娌℃湁鎵惧埌璇ョ敤鎴�" + master.getDetectionPeople());
}
- insProductUserMapper.insert(new InsProductUser(null, user.getId(), pkMaster.getDetectionDate(), insProduct.getId()));
+ insProductUserMapper.insert(new InsProductUser(null, user.getId(), master.getDetectionDate(), insProduct.getId()));
}
}
}
+
+ //缁欐俯搴﹀惊鐜殑妫�楠岄」鐩粦瀹氳澶�
+ InsProduct product = insProductMapper.selectOne(Wrappers.<InsProduct>lambdaQuery()
+ .eq(InsProduct::getState, 1)
+ .eq(InsProduct::getInsSampleId, insSample.getId())
+ .eq(InsProduct::getInspectionItem, "娓╁害寰幆"));
+ if (ObjectUtils.isEmpty(map)) {
+ throw new ErrorException("娌℃湁鎵惧埌瀵瑰簲濮旀墭鍗曚笅璇ユ牱鍝佺殑鐩稿叧娓╁害寰幆妫�楠岄」鐩�");
+ }
+ InsProductResult insProductResult = insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, product.getId()));
+ if(ObjectUtils.isEmpty(insProductResult.getEquipValue())) {
+ List<Map<String, Object>> dv = new ArrayList<>();
+ Map<String, Object> map4 = new HashMap<>();
+ map4.put("v", "JCZX-TX-TT02006");
+ dv.add(map4);
+ Map<String, Object> map5 = new HashMap<>();
+ map5.put("v", "JCZX-TX-TT02001");
+ dv.add(map5);
+ insProductResult.setEquipValue(JSON.toJSONString(dv));
+ List<Map<String, Object>> dn = new ArrayList<>();
+ Map<String, Object> map6 = new HashMap<>();
+ map6.put("v", "姝ュ叆寮忛珮浣庢俯婀跨儹璇曢獙绠�");
+ dn.add(map6);
+ Map<String, Object> map7 = new HashMap<>();
+ map7.put("v", "姝ュ叆寮忛珮浣庢俯璇曢獙绠�");
+ dn.add(map7);
+ insProductResult.setEquipName(JSON.toJSONString(dn));
+ insProductResultMapper.updateById(insProductResult);
+ }
+ return 0;
+ }
+
+ //娓╁害寰幆鏁伴噰鎬讳綋
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public int temDataAcquisition2(PkMaster pkMaster) {
return 0;
}
}
--
Gitblit v1.9.3