From c3ee76c79cc5c5db479b548e1b4eca67327e7396 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 06 八月 2024 11:28:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
framework/src/main/java/com/yuanchu/mom/annotation/ValueTableShow.java | 2 +-
inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java | 2 +-
cnas-server/src/main/java/com/yuanchu/mom/utils/DataAcquisition.java | 6 ------
framework/src/main/java/com/yuanchu/mom/common/PrintChina.java | 6 ++++--
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 3 ++-
5 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/utils/DataAcquisition.java b/cnas-server/src/main/java/com/yuanchu/mom/utils/DataAcquisition.java
index d11726e..15d8019 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/utils/DataAcquisition.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/utils/DataAcquisition.java
@@ -630,7 +630,6 @@
.map(obj -> {
return new BigDecimal((obj).toString());
}).collect(Collectors.toList());
- System.out.println(bigDecimalList);
//灏嗕腑鏂囩殑(杞崲鑻辨枃鐨�())
formula = formula.replace("锛�", "(")
@@ -642,7 +641,6 @@
if (upperStr.matches(".*\\d.*")) {
upperStr = "";
}
- System.out.println(upperStr);
//鐒跺悗鑾峰彇鏈�澶栭潰鎷彿閲岄潰鐨勫��,鍐嶆牴鎹�","鍒嗗壊
int start = formula.indexOf("(");
int end = -1;
@@ -680,7 +678,6 @@
String[] bracketStrs = arguments.toArray(new String[0]);
List<BigDecimal> results = new ArrayList<>();
for (String expr : bracketStrs) {
- System.out.println("鏇挎崲鍓�" + expr);
Pattern pattern = Pattern.compile("([A-Z])(\\d+)");
Matcher matcher = pattern.matcher(expr);
StringBuffer sb = new StringBuffer();
@@ -694,7 +691,6 @@
}
}
matcher.appendTail(sb);
- System.out.println("鏇挎崲鍚�" + sb.toString());
// 璁＄畻琛ㄨ揪寮�
ScriptEngine engine = new ScriptEngineManager().getEngineByName("JavaScript");
@@ -742,8 +738,6 @@
throw new UnsupportedOperationException("鏆備笉鏀寔鍑芥暟: " + upperStr);
}
}
- System.out.println(results);
- System.out.println("璁＄畻缁撴灉: " + finalResult);
return finalResult.toString();
// 鍚﹀垯锛氭病鏈夊叕寮忎唬琛ㄤ笉闇�瑕佽绠楋紝鐩存帴鎻愬彇List閲岄潰鐨勬暟鎹�
diff --git a/framework/src/main/java/com/yuanchu/mom/annotation/ValueTableShow.java b/framework/src/main/java/com/yuanchu/mom/annotation/ValueTableShow.java
index a70b7b5..913b9bd 100644
--- a/framework/src/main/java/com/yuanchu/mom/annotation/ValueTableShow.java
+++ b/framework/src/main/java/com/yuanchu/mom/annotation/ValueTableShow.java
@@ -10,6 +10,6 @@
String name() default "";
- int width() default 100;
+ int width() default 0;
}
diff --git a/framework/src/main/java/com/yuanchu/mom/common/PrintChina.java b/framework/src/main/java/com/yuanchu/mom/common/PrintChina.java
index f6ded2f..8bcc710 100644
--- a/framework/src/main/java/com/yuanchu/mom/common/PrintChina.java
+++ b/framework/src/main/java/com/yuanchu/mom/common/PrintChina.java
@@ -35,9 +35,11 @@
}
soundVo.put("label", field.getName());
soundVo.put("value", value);
- soundVo.put("width", width);
+ if(width>0){
+ soundVo.put("width", width);
+ }
soundVo.put("order", order + "");
- if(list.size() == 0){
+ if(list.isEmpty()){
list.add(soundVo);
}else{
boolean isAdd = false;
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
index 95140ae..dc57054 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
@@ -581,9 +581,10 @@
/*濡傛灉鏄涓�娆￠�夋嫨璁惧淇℃伅,涓旇繕鏈夊叾浣欐牱鍝佷篃鏈夊悓涓�涓粡楠岄」鐩�,閭ｄ箞鎵�鏈夋牱鍝佺殑璇ラ」鐩兘鐢ㄨ繖涓澶囦俊鎭�*/
//鍏堟煡璇㈡槸鍚﹁繕鏈夊叾浣欐牱鍝�
InsProduct product = insProductMapper.selectById(insProduct.getId());
+
Integer insSampleId = product.getInsSampleId();
List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, insSampleMapper.selectById(insSampleId).getInsOrderId()));
- if (insSamples.size() > 1) {
+ if (insSamples.size() > 1 && !product.getInspectionItemType().equals("1")) {
//瀛樺湪鍏朵綑鏍峰搧,鏌ヨ鏄惁鏈夊悓涓�绉嶆楠岄」鐩�
for (InsSample sample : insSamples.stream().filter(insSample -> !insSample.getId().equals(insSampleId)).collect(Collectors.toList())) {
InsProduct product1 = insProductMapper.selectOne(Wrappers.<InsProduct>lambdaQuery()
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java b/inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java
index 7a65f08..430d9e1 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java
@@ -10,7 +10,7 @@
private String id;
- @ValueTableShow(value = 1,name = "濮旀墭缂栧彿",width = 190)
+ @ValueTableShow(value = 1,name = "濮旀墭缂栧彿",width = 180)
private String entrustCode;
@ValueTableShow(value = 2,name = "鏍峰搧鍚嶇О")
--
Gitblit v1.9.3