From 208bb2f289ce8a7b59f587a9f57e24c0fc8a0ba6 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期日, 24 九月 2023 21:48:40 +0800
Subject: [PATCH] MOM系统-9-24 加班
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java | 65 +++++++++++++++++++++++++++++---
1 files changed, 58 insertions(+), 7 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 d9c00ba..62abb6b 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
@@ -7,8 +7,12 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.mapper.InspectUnacceptedMapper;
import com.yuanchu.mom.pojo.InspectUnaccepted;
-import com.yuanchu.mom.service.InspectUnacceptedService;
-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;
@@ -26,10 +30,26 @@
@Resource
InspectUnacceptedMapper inspectUnacceptedMapper;
+ // 鍘熸潗鏂欐楠�
+ @Autowired
+ private RawInspectService rawInspectService;
+
+ // // 鍘熸潗鏂欐楠屽瓙鏁版嵁
+ @Autowired
+ private RawInsProductService rawInsProductService;
+
+ // 鍗婃垚鍝佹楠�
+ @Autowired
+ private FinishedInspectService finishedInspectService;
+
+ // 鍦ㄥ埗鍝佹楠�
+ @Autowired
+ private ProcessInspectService processInspectService;
+
//鏌ヨ鎴愬搧涓嶅悎鏍煎搧妫�楠屽崟鍒楄〃
@Override
- public IPage<Map<String, Object>> selectUnRawInspectsList(Page<Object> page, String formTime, Integer dealState) {
- return inspectUnacceptedMapper.selectInsList(page, formTime, dealState);
+ public IPage<Map<String, Object>> selectUnRawInspectsList(Page<Object> page, String formTime, Integer dealState, Integer productCategories) {
+ return inspectUnacceptedMapper.selectInsList(page, formTime, dealState, productCategories);
}
@Override
@@ -50,13 +70,44 @@
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)
- .set(InspectUnaccepted::getDealState, 1);
+ .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());
+ }
+ // 绛変簬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