From 788b1abbdc75d6bc727be65fc107fb10eaa484b6 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 30 七月 2024 20:04:10 +0800
Subject: [PATCH] 模版变更,下单的界面设置区间,如果填写0.48*0.5的时候筛选条件用0.48,下单的模版查看根据委托单位进行筛选,如果委托单位为空就可以查看所有
---
cnas-server/src/main/resources/mapper/PkSlaveMapper.xml | 3 +
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java | 1
inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderTemplateService.java | 2
cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java | 7 ++
cnas-server/src/main/java/com/yuanchu/mom/service/impl/PkMasterServiceImpl.java | 117 ++++++++++++++++++++++++++------------
inspect-server/src/main/resources/static/report-template.docx | 0
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderTemplateServiceImpl.java | 22 +++++--
cnas-server/src/main/java/com/yuanchu/mom/service/PkMasterService.java | 3 +
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java | 4
cnas-server/src/main/java/com/yuanchu/mom/mapper/PkSlaveMapper.java | 4 +
10 files changed, 116 insertions(+), 47 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
index 96dd926..af19300 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
@@ -279,5 +279,12 @@
public Result treeDevice(String deviceName) {
return Result.success(deviceService.treeDevice(deviceName));
}
+
+
+ @ApiOperation(value = "娓╁害寰幆鏁伴噰鎬讳綋")
+ @PostMapping("/temDataAcquisition2")
+ public Result<?> temDataAcquisition2(@RequestBody PkMaster pkMaster) {
+ return Result.success(pkMasterService.temDataAcquisition2(pkMaster));
+ }
}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/mapper/PkSlaveMapper.java b/cnas-server/src/main/java/com/yuanchu/mom/mapper/PkSlaveMapper.java
index 169ecd6..0d74e51 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/mapper/PkSlaveMapper.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/mapper/PkSlaveMapper.java
@@ -2,6 +2,9 @@
import com.yuanchu.mom.pojo.PkSlave;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* <p>
@@ -13,4 +16,5 @@
*/
public interface PkSlaveMapper extends BaseMapper<PkSlave> {
+ List<PkSlave> selectList1(@Param("isid") String isid);
}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/PkMasterService.java b/cnas-server/src/main/java/com/yuanchu/mom/service/PkMasterService.java
index cca8175..346adf8 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/PkMasterService.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/PkMasterService.java
@@ -15,4 +15,7 @@
//娓╁害寰幆鏁伴噰
int temDataAcquisition(PkMaster pkMaster);
+
+ //娓╁害寰幆鏁伴噰鎬讳綋
+ int temDataAcquisition2(PkMaster pkMaster);
}
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;
}
}
diff --git a/cnas-server/src/main/resources/mapper/PkSlaveMapper.xml b/cnas-server/src/main/resources/mapper/PkSlaveMapper.xml
index 7263295..adccb35 100644
--- a/cnas-server/src/main/resources/mapper/PkSlaveMapper.xml
+++ b/cnas-server/src/main/resources/mapper/PkSlaveMapper.xml
@@ -22,4 +22,7 @@
<result column="create_time" property="createTime" />
</resultMap>
+ <select id="selectList1" resultMap="BaseResultMap">
+ select * from device_pk_slave where shift_id=#{isid}
+ </select>
</mapper>
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
index 89582d8..d5668e2 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
@@ -111,8 +111,8 @@
@ApiOperation(value = "鏌ヨ妫�楠屽崟妯℃澘")
@GetMapping("/selectInsOrderTemplate")
@ValueAuth
- public Result<?> selectInsOrderTemplate() {
- return Result.success(insOrderTemplateService.selectInsOrderTemplate());
+ public Result<?> selectInsOrderTemplate(String company) {
+ return Result.success(insOrderTemplateService.selectInsOrderTemplate(company));
}
@ApiOperation(value = "閫氳繃妫�楠屽崟妯℃澘id鑾峰彇妫�楠屽崟妯℃澘鍐呭")
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderTemplateService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderTemplateService.java
index 7025d61..cd92f09 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderTemplateService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderTemplateService.java
@@ -14,7 +14,7 @@
int addInsOrderTemplate(InsOrderTemplate insOrderTemplate);
- List<InsOrderTemplate> selectInsOrderTemplate();
+ List<InsOrderTemplate> selectInsOrderTemplate(String company);
String selectInsOrderTemplateById(Integer id);
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderTemplateServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderTemplateServiceImpl.java
index eb89ae5..0f1fc4a 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderTemplateServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderTemplateServiceImpl.java
@@ -12,14 +12,14 @@
import java.util.List;
/**
-* @author Administrator
-* @description 閽堝琛ㄣ�恑ns_order_template銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
-* @createDate 2024-03-18 14:14:54
-*/
+ * @author Administrator
+ * @description 閽堝琛ㄣ�恑ns_order_template銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
+ * @createDate 2024-03-18 14:14:54
+ */
@Service
@AllArgsConstructor
public class InsOrderTemplateServiceImpl extends ServiceImpl<InsOrderTemplateMapper, InsOrderTemplate>
- implements InsOrderTemplateService{
+ implements InsOrderTemplateService {
private InsOrderTemplateMapper insOrderTemplateMapper;
@@ -31,8 +31,16 @@
}
@Override
- public List<InsOrderTemplate> selectInsOrderTemplate() {
- return insOrderTemplateMapper.selectList(Wrappers.<InsOrderTemplate>lambdaQuery().eq(InsOrderTemplate::getCreateUser, getLook.selectPowerByMethodAndUserId(null).get("userId")).select(InsOrderTemplate.class, info->!info.getColumn().equals("thing")));
+ public List<InsOrderTemplate> selectInsOrderTemplate(String company) {
+ if (company == null) {
+ return insOrderTemplateMapper.selectList(Wrappers.<InsOrderTemplate>lambdaQuery()
+ .select(InsOrderTemplate.class, info -> !info.getColumn().equals("thing")));
+ } else {
+ //鏍规嵁濮旀墭鍗曚綅杩涜绛涢��
+ return insOrderTemplateMapper.selectList(Wrappers.<InsOrderTemplate>lambdaQuery()
+ .like(InsOrderTemplate::getThing,"\"company\":\""+ company+"\"")
+ .select(InsOrderTemplate.class, info -> !info.getColumn().equals("thing")));
+ }
}
@Override
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java
index f9416d7..92214b4 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java
@@ -116,6 +116,7 @@
String model2 = "";
while (matcher.find()) {
model2 += matcher.group();
+ break;
}
if (str.contains("鈮�") || str.contains(">=")) {
String param = str.replace("鈮�", "").replace(">=", "");
diff --git a/inspect-server/src/main/resources/static/report-template.docx b/inspect-server/src/main/resources/static/report-template.docx
index bea7bf2..aeb7d58 100644
--- a/inspect-server/src/main/resources/static/report-template.docx
+++ b/inspect-server/src/main/resources/static/report-template.docx
Binary files differ
--
Gitblit v1.9.3