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
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/ProcessInspectServiceImpl.java | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 deletions(-)
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 7469a36..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
@@ -32,7 +32,7 @@
ProcessInspectMapper processInspectMapper;
@Resource
- ProductService productService;
+ ManualProductService manualProductService;
@Resource
InspectionItemMapper inspectionItemMapper;
@@ -59,14 +59,10 @@
BeanUtils.copyProperties(processInspectVo, processInspect);
processInspectMapper.insert(processInspect);
/*鎵归噺鏂板杩囩▼妫�楠岄」鐩〃*/
- /*//鑾峰彇鍨嬪彿id
- Integer specificationId = getSpecificationId(processInspectVo.getMaterial(), processInspectVo.getMaterialCode(), processInspectVo.getSpecificationsModel());
- //鏌ヨ鏍囧噯BOM鎶�鏈寚鏍囦腑璇ュ瀷鍙峰伐鑹轰笅鏈�鏂扮増鏈殑妫�楠岄」鐩�
- Integer ver = productService.selectVerByPro(specificationId).get(0);//璇ュ瀷鍙蜂笅鎶�鏈寚鏍囨渶鏂扮増鏈�*/
- List<Product> productList = productService.selProByVerSpe(processInspectVo.getTechId());
- List<InspectionItem> inspectionItemList = productList.stream().map(product -> {
+ List<ManualProduct> manualProductList = manualProductService.selByMtid(processInspectVo.getMtId());
+ List<InspectionItem> inspectionItemList = manualProductList.stream().map(manualProduct -> {
InspectionItem inspectionItem = new InspectionItem();
- BeanUtils.copyProperties(product, inspectionItem);
+ BeanUtils.copyProperties(manualProduct, inspectionItem);
inspectionItem.setCreateTime(new Date());
inspectionItem.setUpdateTime(new Date());
inspectionItem.setInspectId(processInspect.getId());
@@ -80,10 +76,10 @@
//涓婃姤(鏇存柊妫�楠岀姸鎬�)
@Override
@Transactional(rollbackFor = Exception.class)
- public String updateProcessInspectsById(Integer id) {
+ public String updateProcessInspectsById(Integer id, Integer number) {
/*鏇存柊妫�楠屽崟閲岄潰鐨勬楠岀粨璁�*/
//鍏堝垽鏂楠岀粨鏋�
- List<Integer> results = inspectionItemMapper.getResult(id,1);
+ List<Integer> results = inspectionItemMapper.getResult(id, 1);
int count = 0;
for (Integer result : results) {
if (result != null && result == 1) {
@@ -102,8 +98,18 @@
} else return "椤圭洰鏈楠屽畬!";
/*濡傛灉妫�楠岀粨璁轰负涓嶅悎鏍�,鍒欓渶瑕佹柊澧炰笉鍚堟牸妫�楠屽崟*/
if (processInspect.getResult() == 0) {
+ //鏌ヨ璇ユ楠屽崟鍝簺妫�楠岄」鐩笉鍚堟牸
+ List<InspectionItem> inspectionItemList = inspectionItemMapper.selectList(Wrappers.<InspectionItem>query()
+ .eq("inspect_id", id)
+ .eq("result", 0)
+ .eq("type", 1));
+ String msg = "";
+ for (InspectionItem inspectionItem : inspectionItemList) {
+ msg = msg + inspectionItem.getName() + "-";
+ }
InspectUnaccepted processUnaccepted = InspectUnaccepted.builder()
- .reason(processInspect.getMaterial() +processInspect.getTechname()+ "涓嶅悎鏍�") //鏆備笖瀹氫箟涓轰骇鍝佸悕绉�+宸ヨ壓涓嶅悎鏍�
+ .reason(processInspect.getTechname() + "-" + msg + "涓嶅悎鏍�") //瀹氫箟涓哄伐鑹�+椤圭洰涓嶅悎鏍�
+ .number(number)
.rawInspectId(id)
.type(2) //绫诲瀷涓鸿繃绋嬫楠�
.build();
@@ -121,7 +127,7 @@
//鍒嗛〉鏌ヨ杩囩▼妫�楠屽崟鍒楄〃
@Override
public IPage<Map<String, Object>> selectProcessInspectsList(Page<Object> page, String techfather, Integer result, String name) {
- return processInspectMapper.selectProcessInspectsList(page,techfather,result,name);
+ return processInspectMapper.selectProcessInspectsList(page, techfather, result, name);
}
}
--
Gitblit v1.9.3