From 384a1fd5039fe57c51ae5254aa56493c50492b55 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 25 九月 2023 11:07:22 +0800
Subject: [PATCH] 修改1.0 9.25
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java | 73 ++++++++++++++++++++++++++----------
1 files changed, 53 insertions(+), 20 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 3953455..54b3d17 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,17 +6,16 @@
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.mapper.OpinionMapper;
import com.yuanchu.mom.pojo.InspectUnaccepted;
-import com.yuanchu.mom.pojo.Opinion;
-import com.yuanchu.mom.service.InspectUnacceptedService;
-import com.yuanchu.mom.service.OpinionService;
-import com.yuanchu.mom.vo.Result;
+import com.yuanchu.mom.pojo.RawInspect;
+import com.yuanchu.mom.pojo.vo.RawInspectVo;
+import com.yuanchu.mom.service.*;
+import com.yuanchu.mom.utils.MyUtil;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
import java.util.Map;
/**
@@ -31,8 +30,21 @@
@Resource
InspectUnacceptedMapper inspectUnacceptedMapper;
- @Resource
- OpinionService opinionService;
+ // 鍘熸潗鏂欐楠�
+ @Autowired
+ private RawInspectService rawInspectService;
+
+ //鍘熸潗鏂欐楠屽瓙鏁版嵁
+ @Autowired
+ private RawInsProductService rawInsProductService;
+
+ //浜у搧妫�楠�
+ @Autowired
+ private FinishedInspectService finishedInspectService;
+
+ //杩囩▼妫�楠�
+ @Autowired
+ private ProcessInspectService processInspectService;
//鏌ヨ鎴愬搧涓嶅悎鏍煎搧妫�楠屽崟鍒楄〃
@Override
@@ -63,18 +75,39 @@
public Integer rawEvaluate(Integer rawId, Integer passOrNo) {
LambdaUpdateWrapper<InspectUnaccepted> updateWrapper = Wrappers.<InspectUnaccepted>lambdaUpdate()
.eq(InspectUnaccepted::getId, rawId)
- .set(InspectUnaccepted::getDealReasult, passOrNo)
- .set(InspectUnaccepted::getDealState, 1);
- //濡傛灉鏄瘎瀹′笉閫氳繃鍒欐柊澧炰笉鍚堟牸澶勭悊鎰忚琛�
- if (passOrNo==0) {
- List<Opinion> opinions = new ArrayList<>();
- for (int i = 0; i <= 3; i++) {
- Opinion opinion = new Opinion();
- opinion.setType(i);
- opinion.setRawUnacceptedId(rawId);
- opinions.add(opinion);
+ .set(InspectUnaccepted::getDealReasult, passOrNo);
+ return inspectUnacceptedMapper.update(new InspectUnaccepted(), updateWrapper);
+ }
+
+ //缂栬緫澶勭疆鎰忚纭畾鎸夐挳
+ @Override
+ public Integer editDisposalOpinionConfirmation(Integer rawUnacceptedId, String opinionTell, Integer way, Integer type) {
+ LambdaUpdateWrapper<InspectUnaccepted> updateWrapper = Wrappers.<InspectUnaccepted>lambdaUpdate()
+ .eq(InspectUnaccepted::getId, rawUnacceptedId)
+ .set(InspectUnaccepted::getWay, way)
+ .set(InspectUnaccepted::getOpinionTell, opinionTell);
+ if (way == 1){
+ // 绛変簬0锛氬師鏉愭枡
+ if (type == 0){
+ // 鏍规嵁Id鏌ヨ鍘熸潗鏂欐楠屼俊鎭俊鎭�
+ RawInspectVo map = inspectUnacceptedMapper.editDisposalOpinionConfirmation(rawUnacceptedId);
+ RawInspect rawInspect = new RawInspect();
+ BeanUtils.copyProperties(map, rawInspect);
+ // 淇濆瓨鐖剁骇
+ rawInspectService.save(rawInspect);
+ // 鎵归噺淇濆瓨瀛愮骇
+ rawInsProductService.batchAddInsProduct(rawInspect.getId(), map.getRawInsProducts());
}
- opinionService.saveBatch(opinions);
+ // 绛変簬1锛氫骇鍝�
+ else if (type == 1) {
+ // TODO 璇ユ帴鍙ｅ彧鍓╀綑杩欎袱澶�
+ }
+ // 绛変簬2锛氳繃绋�
+ else if (type == 2) {
+ // TODO 璇ユ帴鍙ｅ彧鍓╀綑杩欎袱澶�
+ }
+ } else if (way == 2 || way == 3 || way == 4){
+ updateWrapper.set(InspectUnaccepted::getFaultyMaterials, 1);
}
return inspectUnacceptedMapper.update(new InspectUnaccepted(), updateWrapper);
}
--
Gitblit v1.9.3