From a3f47b5e065878e5f41699ac1c597fd9ac9c4a21 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 25 九月 2023 14:56:24 +0800
Subject: [PATCH] 修改3.0 9.25
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java | 118 +++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 86 insertions(+), 32 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java
index 54b3d17..314bdee 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java
@@ -6,8 +6,10 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.mapper.InspectUnacceptedMapper;
-import com.yuanchu.mom.pojo.InspectUnaccepted;
-import com.yuanchu.mom.pojo.RawInspect;
+import com.yuanchu.mom.mapper.InspectionItemMapper;
+import com.yuanchu.mom.mapper.RawInsProductMapper;
+import com.yuanchu.mom.pojo.*;
+import com.yuanchu.mom.pojo.dto.InspectionItemDto;
import com.yuanchu.mom.pojo.vo.RawInspectVo;
import com.yuanchu.mom.service.*;
import com.yuanchu.mom.utils.MyUtil;
@@ -16,7 +18,11 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import javax.xml.crypto.Data;
+import java.util.Date;
+import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
* 涓嶅悎鏍煎搧妫�楠岃〃(InspectUnaccepted)琛ㄦ湇鍔″疄鐜扮被
@@ -38,6 +44,9 @@
@Autowired
private RawInsProductService rawInsProductService;
+ @Resource
+ RawInsProductMapper rawInsProductMapper;
+
//浜у搧妫�楠�
@Autowired
private FinishedInspectService finishedInspectService;
@@ -46,22 +55,19 @@
@Autowired
private ProcessInspectService processInspectService;
- //鏌ヨ鎴愬搧涓嶅悎鏍煎搧妫�楠屽崟鍒楄〃
- @Override
- public IPage<Map<String, Object>> selectUnRawInspectsList(Page<Object> page, String formTime, Integer dealState, Integer productCategories) {
- return inspectUnacceptedMapper.selectInsList(page, formTime, dealState, productCategories);
- }
+ @Resource
+ InspectionItemMapper inspectionItemMapper;
- @Override
- public IPage<Map<String, Object>> selectUnqualifiedRawMaterials(Page<Object> page, String formTime, String productName, String supplier, Integer processingStatus) {
- return inspectUnacceptedMapper.selectUnqualifiedRawMaterials(page, formTime, productName, supplier, processingStatus);
- }
+ @Resource
+ InspectionItemService inspectionItemService;
+ //涓嶅悎鏍煎缃垪琛�
@Override
public IPage<Map<String, Object>> selectDisposal(Page<Object> page, String specificationModel, String productName, Integer productCategories, Integer state) {
return inspectUnacceptedMapper.selectDisposal(page, specificationModel, productName, productCategories, state);
}
+ //鐜拌薄鎻忚堪澶辩劍淇濆瓨
@Override
public Integer descriptionUpdate(Integer rawUnacceptedId, String tell) {
LambdaUpdateWrapper<InspectUnaccepted> updateWrapper = Wrappers.<InspectUnaccepted>lambdaUpdate()
@@ -70,43 +76,91 @@
return inspectUnacceptedMapper.update(new InspectUnaccepted(), updateWrapper);
}
- //璇勫
- @Override
- public Integer rawEvaluate(Integer rawId, Integer passOrNo) {
- LambdaUpdateWrapper<InspectUnaccepted> updateWrapper = Wrappers.<InspectUnaccepted>lambdaUpdate()
- .eq(InspectUnaccepted::getId, rawId)
- .set(InspectUnaccepted::getDealReasult, passOrNo);
- return inspectUnacceptedMapper.update(new InspectUnaccepted(), updateWrapper);
- }
-
//缂栬緫澶勭疆鎰忚纭畾鎸夐挳
@Override
public Integer editDisposalOpinionConfirmation(Integer rawUnacceptedId, String opinionTell, Integer way, Integer type) {
+ //鏍规嵁涓嶅悎鏍煎搧id鏌ヨ涓嶅悎鏍煎搧淇℃伅
+ InspectUnaccepted inspectUnaccepted = inspectUnacceptedMapper.selectById(rawUnacceptedId);
LambdaUpdateWrapper<InspectUnaccepted> updateWrapper = Wrappers.<InspectUnaccepted>lambdaUpdate()
.eq(InspectUnaccepted::getId, rawUnacceptedId)
.set(InspectUnaccepted::getWay, way)
+ .set(InspectUnaccepted::getDealState, 1)
+ .set(InspectUnaccepted::getDealTime, new Date())
.set(InspectUnaccepted::getOpinionTell, opinionTell);
- if (way == 1){
+ if (way == 1) {
// 绛変簬0锛氬師鏉愭枡
- if (type == 0){
- // 鏍规嵁Id鏌ヨ鍘熸潗鏂欐楠屼俊鎭俊鎭�
- RawInspectVo map = inspectUnacceptedMapper.editDisposalOpinionConfirmation(rawUnacceptedId);
- RawInspect rawInspect = new RawInspect();
- BeanUtils.copyProperties(map, rawInspect);
+ if (type == 0) {
+ // 鏍规嵁Id鏌ヨ鍘熸潗鏂欐楠屼俊鎭�
+ RawInspect rawInspect = rawInspectService.getById(inspectUnaccepted.getRawInspectId());
+ List<RawInsProduct> rawInsProductList = rawInsProductMapper.selectList(Wrappers.<RawInsProduct>query()
+ .eq("raw_inspect_id", rawInspect.getId()));
// 淇濆瓨鐖剁骇
+ rawInspect.setId(null);
+ rawInspect.setInsState(0);
+ rawInspect.setJudgeState(null);
+ rawInspect.setInsTime(null);
rawInspectService.save(rawInspect);
// 鎵归噺淇濆瓨瀛愮骇
- rawInsProductService.batchAddInsProduct(rawInspect.getId(), map.getRawInsProducts());
+ List<RawInsProduct> rawInsProducts = rawInsProductList.stream().map(rawInsProduct -> {
+ rawInsProduct.setId(null);
+ rawInsProduct.setTestValue(null);
+ rawInsProduct.setTestState(null);
+ rawInsProduct.setDeviceId(null);
+ rawInsProduct.setRawInspectId(rawInspect.getId());
+ rawInsProduct.setUserId(null);
+ return rawInsProduct;
+ }).collect(Collectors.toList());
+ rawInsProductService.saveBatch(rawInsProducts);
}
- // 绛変簬1锛氫骇鍝�
+ // 绛変簬1锛氫骇鍝佹楠�(鍗婃垚鍝�)
else if (type == 1) {
- // TODO 璇ユ帴鍙ｅ彧鍓╀綑杩欎袱澶�
+ //鏍规嵁id鏌ヨ浜у搧妫�楠屼俊鎭�
+ FinishedInspect finishedInspect = finishedInspectService.getById(inspectUnaccepted.getRawInspectId());
+ //鏍规嵁浜у搧妫�楠屽崟id鏌ヨ妫�楠岄」鐩�
+ List<InspectionItem> inspectionItems = inspectionItemMapper.selectList(Wrappers.<InspectionItem>query()
+ .eq("inspect_id", finishedInspect.getId())
+ .eq("type", 2));
+ //淇濆瓨浜у搧鍗�
+ finishedInspect.setId(null);
+ finishedInspect.setResult(null);
+ finishedInspectService.save(finishedInspect);
+ //淇濆瓨浜у搧椤圭洰
+ List<InspectionItem> inspectionItemList = inspectionItems.stream().map(inspectionItem -> {
+ inspectionItem.setId(null);
+ inspectionItem.setInspectionValue(null);
+ inspectionItem.setDeviceId(null);
+ inspectionItem.setResult(null);
+ inspectionItem.setInspectId(finishedInspect.getId());
+ inspectionItem.setUsername(null);
+ return inspectionItem;
+ }).collect(Collectors.toList());
+ inspectionItemService.saveBatch(inspectionItemList);
}
- // 绛変簬2锛氳繃绋�
+ // 绛変簬2锛氳繃绋嬫楠�(鍦ㄥ埗鍝�)
else if (type == 2) {
- // TODO 璇ユ帴鍙ｅ彧鍓╀綑杩欎袱澶�
+ //鏍规嵁id鏌ヨ浜у搧妫�楠屼俊鎭�
+ ProcessInspect processInspect = processInspectService.getById(inspectUnaccepted.getRawInspectId());
+ //鏍规嵁浜у搧妫�楠屽崟id鏌ヨ妫�楠岄」鐩�
+ List<InspectionItem> inspectionItems = inspectionItemMapper.selectList(Wrappers.<InspectionItem>query()
+ .eq("inspect_id", processInspect.getId())
+ .eq("type", 1));
+ //淇濆瓨浜у搧鍗�
+ processInspect.setId(null);
+ processInspect.setResult(null);
+ processInspectService.save(processInspect);
+ //淇濆瓨浜у搧椤圭洰
+ List<InspectionItem> inspectionItemList = inspectionItems.stream().map(inspectionItem -> {
+ inspectionItem.setId(null);
+ inspectionItem.setInspectionValue(null);
+ inspectionItem.setDeviceId(null);
+ inspectionItem.setResult(null);
+ inspectionItem.setInspectId(processInspect.getId());
+ inspectionItem.setUsername(null);
+ return inspectionItem;
+ }).collect(Collectors.toList());
+ inspectionItemService.saveBatch(inspectionItemList);
}
- } else if (way == 2 || way == 3 || way == 4){
+ } else if (way == 2 || way == 3 || way == 4) {
updateWrapper.set(InspectUnaccepted::getFaultyMaterials, 1);
}
return inspectUnacceptedMapper.update(new InspectUnaccepted(), updateWrapper);
--
Gitblit v1.9.3