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 | 107 +++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 86 insertions(+), 21 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 7e5787a..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
@@ -1,16 +1,21 @@
package com.yuanchu.mom.service.impl;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
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.service.InspectUnacceptedService;
+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.HashMap;
import java.util.Map;
/**
@@ -25,25 +30,85 @@
@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, Integer type) {
- if (type==null){
- type=2;//涓虹┖鏄師鏉愭枡2
+ public IPage<Map<String, Object>> selectUnRawInspectsList(Page<Object> page, String formTime, Integer dealState, Integer productCategories) {
+ return inspectUnacceptedMapper.selectInsList(page, formTime, dealState, productCategories);
+ }
+
+ @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);
+ }
+
+ @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()
+ .eq(InspectUnaccepted::getId, rawUnacceptedId)
+ .set(InspectUnaccepted::getTell, tell);
+ 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) {
+ 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);
}
- switch (type) {
- case 2:
- //2鏄煡璇㈠師鏉愭枡涓嶅悎鏍煎搧
- return inspectUnacceptedMapper.selectUnRawInspectsList(page,formTime,dealState,2);
- case 1:
- //1鏄煡璇㈣繃绋嬩笉鍚堟牸鍝�
- return inspectUnacceptedMapper.selectInsList(page,formTime,dealState,1);
- case 0:
- //0鏄煡璇㈡垚鍝佷笉鍚堟牸鍝�
- return inspectUnacceptedMapper.selectInsList(page,formTime,dealState,0);
- default:
- return null;
- }
+ return inspectUnacceptedMapper.update(new InspectUnaccepted(), updateWrapper);
}
}
-
--
Gitblit v1.9.3