From b939331cf60d3bb36ee8aa208cf05c3a5a04415f Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 06 八月 2024 12:46:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
framework/src/main/java/com/yuanchu/mom/annotation/ValueTableShow.java | 2 +-
framework/src/main/java/com/yuanchu/mom/config/OpenFifer.java | 6 +++---
inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java | 2 +-
framework/src/main/java/com/yuanchu/mom/common/PrintChina.java | 6 ++++--
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java | 19 +++++++++++++++++--
5 files changed, 26 insertions(+), 9 deletions(-)
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/framework/src/main/java/com/yuanchu/mom/config/OpenFifer.java b/framework/src/main/java/com/yuanchu/mom/config/OpenFifer.java
index 413915b..8c4d5b8 100644
--- a/framework/src/main/java/com/yuanchu/mom/config/OpenFifer.java
+++ b/framework/src/main/java/com/yuanchu/mom/config/OpenFifer.java
@@ -60,9 +60,9 @@
@Override
protected void addInterceptors(InterceptorRegistry registry) {
// TODO: 2024/6/4 璁块棶swagger闇�鍏充笅闈㈡嫤鎴櫒
-// registry.addInterceptor(fiferConfig).addPathPatterns("/**");
-// registry.addInterceptor(powerConfig).addPathPatterns("/**");
-// registry.addInterceptor(logConfig).addPathPatterns("/**");
+ registry.addInterceptor(fiferConfig).addPathPatterns("/**");
+ registry.addInterceptor(powerConfig).addPathPatterns("/**");
+ registry.addInterceptor(logConfig).addPathPatterns("/**");
super.addInterceptors(registry);
}
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 235cf3f..395f32c 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
@@ -205,6 +205,7 @@
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());
@@ -212,7 +213,9 @@
addInsProductMethod(a.getId(), a.getInsProduct(), fiberDto.getId(), 2, true);
addInsProductMethod(a.getId(), fiberDto.getProductList(), fiberDto.getId(), 2, false);
}
- } else {
+ }
+ //鍏夌氦甯︿笉涓虹┖
+ else if ( bushingDto.getFibers().size()!=0){
for (FibersDto fibersDto : bushingDto.getFibers()) {
fibersDto.setInsBushingId(bushingDto.getId());
fibersDto.setCode(this.giveCode.giveCode("", "ins_fibers", "", "yyMMdd"));
@@ -227,6 +230,17 @@
addInsProductMethod(a.getId(), fibersDto.getProductList(), fibersDto.getId(), 1, false);
}
}
+ //閮戒负绌� 鍙厤缃簡濂楃 杩欑鎯呭喌鍙檺浜庨」鐩槸鍚湁鏉惧绠＄殑
+// else {
+// String collect = a.getInsProduct().stream().map(InsProduct::getInspectionItem).distinct().collect(Collectors.joining(","));
+// if (collect.contains("鏉惧绠�")){
+// //鑾峰彇妫�楠岄」鐩腑鍖呭惈鏉惧绠＄殑妫�楠岄」鐩�
+// List<InsProduct> products = a.getInsProduct().stream().filter(insProduct -> insProduct.getInspectionItem().contains("鏉惧绠�")).collect(Collectors.toList());
+//
+// }else {
+// throw new ErrorException("鏍峰搧鐨勫厜绾ら厤缃俊鎭噷闈㈡病鏈夐厤缃厜绾ゅ甫淇℃伅涔熸病鏈夊厜绾や俊鎭�,璇烽噸鏂伴厤缃繚瀛樺啀鎻愪氦涓嬪崟!!!");
+// }
+// }
}
}
}
@@ -422,7 +436,8 @@
}
}
insProductService.saveBatch(insProductess);
- } else {
+ }
+ else {
if (!is) {
switch (type) {
case 1:
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