From 44a9b4729e058e75dfba2892803038ee91963d77 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 25 九月 2023 15:28:50 +0800
Subject: [PATCH] 修改4.0 9.25
---
system-run/src/test/java/com/yuanchu/mom/SystemRunApplicationTest.java | 1
inspect-server/src/main/java/com/yuanchu/mom/service/impl/ProcessInspectServiceImpl.java | 6 +-
inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java | 42 +++++++++++----------
inspect-server/src/main/java/com/yuanchu/mom/service/impl/FinishedInspectServiceImpl.java | 4 +-
inspect-server/src/main/java/com/yuanchu/mom/controller/InspectUnacceptedController.java | 2 +
inspect-server/src/main/java/com/yuanchu/mom/service/RawInspectService.java | 2
inventory-server/src/main/java/com/yuanchu/mom/Task/SyncOrder.java | 16 --------
7 files changed, 30 insertions(+), 43 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InspectUnacceptedController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InspectUnacceptedController.java
index 1f1a17f..3cfe73b 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InspectUnacceptedController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InspectUnacceptedController.java
@@ -6,6 +6,7 @@
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.utils.Jwt;
import com.yuanchu.mom.vo.Result;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@@ -24,6 +25,7 @@
* @since 2023-08-07 10:04:01
*/
@RestController
+@Api(tags = "QMS绠＄悊-->涓嶅悎鏍煎搧澶勭疆")
@RequestMapping("/inspectUnaccepted")
public class InspectUnacceptedController {
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/RawInspectService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/RawInspectService.java
index e4132d4..3aa884d 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/RawInspectService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/RawInspectService.java
@@ -22,7 +22,7 @@
* @param code
* @return
*/
- RawInspectVo chooseIFS(String code);
+ List<RawInspectVo> chooseIFS(String code);
/**
* 鏂板鍘熸潗鏂欐楠屽崟
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/FinishedInspectServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/FinishedInspectServiceImpl.java
index 82186ab..116f886 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/FinishedInspectServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/FinishedInspectServiceImpl.java
@@ -129,9 +129,9 @@
.eq("inspect_id", id)
.eq("result", 0)
.eq("type", 2));
- String msg = null;
+ String msg = "";
for (InspectionItem inspectionItem : inspectionItemList) {
- msg += inspectionItem.getName();
+ msg =msg+ inspectionItem.getName()+"-";
}
InspectUnaccepted finishUnaccepted = InspectUnaccepted.builder()
.reason(msg + "涓嶅悎鏍�") //鏆備笖瀹氫箟涓洪」鐩�+涓嶅悎鏍�
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/ProcessInspectServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/ProcessInspectServiceImpl.java
index 2d88f58..298110a 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/ProcessInspectServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/ProcessInspectServiceImpl.java
@@ -103,12 +103,12 @@
.eq("inspect_id", id)
.eq("result", 0)
.eq("type", 1));
- String msg = null;
+ String msg = "";
for (InspectionItem inspectionItem : inspectionItemList) {
- msg += inspectionItem.getName();
+ msg = msg + inspectionItem.getName() + "-";
}
InspectUnaccepted processUnaccepted = InspectUnaccepted.builder()
- .reason(processInspect.getTechname() + msg + "涓嶅悎鏍�") //瀹氫箟涓哄伐鑹�+椤圭洰涓嶅悎鏍�
+ .reason(processInspect.getTechname() + "-" + msg + "涓嶅悎鏍�") //瀹氫箟涓哄伐鑹�+椤圭洰涓嶅悎鏍�
.number(number)
.rawInspectId(id)
.type(2) //绫诲瀷涓鸿繃绋嬫楠�
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java
index fa413d5..5fac56c 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java
@@ -16,7 +16,6 @@
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-
import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;
@@ -46,13 +45,14 @@
//鏂板鍘熸潗鏂欐楠屽崟-->鏍规嵁鍘熸潗鏂欑紪鐮佸緱鍒癷fs涓殑鎶ユ鏁版嵁
@Override
- public RawInspectVo chooseIFS(String code) {
- RawInspectVo rawInspectVo = new RawInspectVo();
+ public List<RawInspectVo> chooseIFS(String code) {
+ List<RawInspectVo> rawInspectVos = new ArrayList<>();
List<Map<String, Object>> mapList = SyncOrder.ifsInterfaces();
for (Map<String, Object> map : mapList) {
// todo: 鍚庣画闇�瑕佸皢鐘舵�佹敼鎴愬緟妫�楠�
if (map.get("STATE").equals("宸叉帴鏀�")) {
if (map.get("PART_NO").toString().equals(code)) {
+ RawInspectVo rawInspectVo = new RawInspectVo();
rawInspectVo.setCode(map.get("PART_NO").toString()); //鍘熸潗鏂欑紪鐮�
String[] split = map.get("PART_DESC").toString().split("锛�");
rawInspectVo.setName(split[0]); //鍘熸潗鏂欏悕绉�
@@ -67,24 +67,26 @@
String lotBatchNo = map.get("LOT_BATCH_NO").toString();//鎵瑰彿
String locationNo = map.get("LOCATION_NO").toString();//搴撲綅鍙�
rawInspectVo.setMessage(orderNo+","+releaseNo+","+lineNo+","+lotBatchNo+","+locationNo);
+ rawInspectVos.add(rawInspectVo);
+
+ //鏌ヨ璇ュ師鏉愭枡鏄惁鏈夋楠岄」鐩褰�
+ RawInspect rawInspect = rawInspectMapper.selOneByCode(code);
+ if (ObjectUtils.isNotEmpty(rawInspect)) {
+ List<RawInsProduct> rawInsProductList = rawInsProductMapper.selectList(Wrappers.<RawInsProduct>query().eq("raw_inspect_id", rawInspect.getId()));
+ List<RawInsProductVo> rawInsProductVos = rawInsProductList.stream().map(rawInsProduct -> {
+ RawInsProductVo rawInsProductVo = new RawInsProductVo();
+ rawInsProductVo.setName(rawInsProduct.getName());
+ rawInsProductVo.setUnit(rawInsProduct.getUnit());
+ rawInsProductVo.setRequired(rawInsProduct.getRequired());
+ rawInsProductVo.setInternal(rawInsProduct.getInternal());
+ return rawInsProductVo;
+ }).collect(Collectors.toList());
+ rawInspectVo.setRawInsProducts(rawInsProductVos);
+ }
}
}
}
- //鏌ヨ璇ュ師鏉愭枡鏄惁鏈夋楠岄」鐩褰�
- RawInspect rawInspect = rawInspectMapper.selOneByCode(code);
- if (ObjectUtils.isNotEmpty(rawInspect)) {
- List<RawInsProduct> rawInsProductList = rawInsProductMapper.selectList(Wrappers.<RawInsProduct>query().eq("raw_inspect_id", rawInspect.getId()));
- List<RawInsProductVo> rawInsProductVos = rawInsProductList.stream().map(rawInsProduct -> {
- RawInsProductVo rawInsProductVo = new RawInsProductVo();
- rawInsProductVo.setName(rawInsProduct.getName());
- rawInsProductVo.setUnit(rawInsProduct.getUnit());
- rawInsProductVo.setRequired(rawInsProduct.getRequired());
- rawInsProductVo.setInternal(rawInsProduct.getInternal());
- return rawInsProductVo;
- }).collect(Collectors.toList());
- rawInspectVo.setRawInsProducts(rawInsProductVos);
- }
- return rawInspectVo;
+ return rawInspectVos;
}
//鏂板鍘熸潗鏂欐楠屽崟
@@ -185,9 +187,9 @@
List<RawInsProduct> rawInsProductList = rawInsProductMapper.selectList(Wrappers.<RawInsProduct>query()
.eq("raw_inspect_id", id)
.eq("test_state", 0));
- String msg = null;
+ String msg ="";
for (RawInsProduct rawInsProduct : rawInsProductList) {
- msg+=rawInsProduct.getName();
+ msg=msg+rawInsProduct.getName()+"-";
}
InspectUnaccepted rawUnaccepted = InspectUnaccepted.builder()
.reason(msg + "涓嶅悎鏍�") //瀹氫箟涓轰笉鍚堟牸鐨勯」鐩�+涓嶅悎鏍�
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/Task/SyncOrder.java b/inventory-server/src/main/java/com/yuanchu/mom/Task/SyncOrder.java
index c4d5ba1..033e958 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/Task/SyncOrder.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/Task/SyncOrder.java
@@ -114,20 +114,4 @@
.header("content-type", "application/json")
.execute().body();
}
-
- public static void main(String[] args) {
- BatchInfo batchInfo = new BatchInfo();
- batchInfo.setOrderNo("260984");
- batchInfo.setReleaseNo("1");
- batchInfo.setLineNo("1");
- batchInfo.setPartNo("A0190008000400");
- batchInfo.setLotBatchNo("*");
- batchInfo.setLocationNo("QC01");
- batchInfo.setQtyToReceive(1);
- batchInfo.setQtyToInspect(0);
- batchInfo.setReceiveCase("鎺ユ敹鍒版潵鏂欏尯");
- List<BatchInfo> batchInfos = Arrays.asList(batchInfo);
- System.out.println(importPolReceive(batchInfos));
- }
-
}
diff --git a/system-run/src/test/java/com/yuanchu/mom/SystemRunApplicationTest.java b/system-run/src/test/java/com/yuanchu/mom/SystemRunApplicationTest.java
index f271419..b9fa577 100644
--- a/system-run/src/test/java/com/yuanchu/mom/SystemRunApplicationTest.java
+++ b/system-run/src/test/java/com/yuanchu/mom/SystemRunApplicationTest.java
@@ -17,7 +17,6 @@
@Test
void contextLoads() {
-
}
}
--
Gitblit v1.9.3