Skip to content

A
amos-boot-biz
Commit 673d32be authored by wanglong's avatar wanglong
Browse files
Options

对管材效验接口，添加敷设监检接口，焊口敷设位置标定管理进行修改，添加效验公共接口

parent 3a0b685f
Show whitespace changes
Inline Side-by-side
Showing with 316 additions and 199 deletions
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/Enum/StageEnum.java
View file @ 673d32be
...@@ -32,12 +32,12 @@ public enum StageEnum { ...@@ -32,12 +32,12 @@ public enum StageEnum {
public static Map<String,String> getNameByStatusMap = new HashMap<>(); public static Map<String,String> getNameByNameMap = new HashMap<>();
public static Map<String,String> getStatusByNameMap = new HashMap<>(); public static Map<String,String> getStatusByVerifyNameMap = new HashMap<>();
static { static {
for(StageEnum enums:StageEnum.values()){ for(StageEnum enums:StageEnum.values()){
getNameByStatusMap.put(enums.stage,enums.name); getNameByNameMap.put(enums.stage,enums.name);
getStatusByNameMap.put(enums.name, enums.stage); getStatusByVerifyNameMap.put(enums.stage, enums.verifyName);
} }
} }
......
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/Enum/VerifyEnum.java
View file @ 673d32be
...@@ -10,16 +10,20 @@ import java.util.Map; ...@@ -10,16 +10,20 @@ import java.util.Map;
@AllArgsConstructor @AllArgsConstructor
public enum VerifyEnum { public enum VerifyEnum {
未通过("0","未通过"), 未通过("0","未通过","智能检验"),
已通过("1","已通过"); 已通过("1","已通过","人工检验");
private String status; private String status;
private String name; private String name;
public static Map<String,String> getTaskStatus=new HashMap<>(); private String type;
public static Map<String,String> getTaskName=new HashMap<>();
public static Map<String,String> getTaskType=new HashMap<>();
static { static {
for (VerifyEnum verifyEnum : VerifyEnum.values()){ for (VerifyEnum verifyEnum : VerifyEnum.values()){
getTaskStatus.put(verifyEnum.status, verifyEnum.name); getTaskName.put(verifyEnum.status, verifyEnum.name);
getTaskType.put(verifyEnum.status, verifyEnum.type);
} }
} }
......
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/Enum/VerifyTypeEnum.java 0 → 100644
View file @ 673d32be
package com.yeejoin.amos.boot.module.ugp.api.Enum;
import lombok.AllArgsConstructor;
import lombok.Getter;
import java.util.HashMap;
import java.util.Map;
@Getter
@AllArgsConstructor
public enum VerifyTypeEnum {
智能检验("0","智能检验"),
人工检验("1","人工检验");
private String status;
private String name;
public static Map<String,String> getVerifyname=new HashMap<>();
static {
for (VerifyTypeEnum verifyTypeEnum:VerifyTypeEnum.values() ){
getVerifyname.put(verifyTypeEnum.status, verifyTypeEnum.name);
}
}
}
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/VerifyServiceImpl.java
View file @ 673d32be
...@@ -3,6 +3,7 @@ import com.alibaba.fastjson.JSONObject; ...@@ -3,6 +3,7 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.yeejoin.amos.boot.module.ugp.api.Enum.StageEnum; import com.yeejoin.amos.boot.module.ugp.api.Enum.StageEnum;
import com.yeejoin.amos.boot.module.ugp.api.Enum.VerifyEnum; import com.yeejoin.amos.boot.module.ugp.api.Enum.VerifyEnum;
import com.yeejoin.amos.boot.module.ugp.api.Enum.VerifyTypeEnum;
import com.yeejoin.amos.boot.module.ugp.api.Enum.WeldCodeEnum; import com.yeejoin.amos.boot.module.ugp.api.Enum.WeldCodeEnum;
import com.yeejoin.amos.boot.module.ugp.api.dto.*; import com.yeejoin.amos.boot.module.ugp.api.dto.*;
import com.yeejoin.amos.boot.module.ugp.api.entity.QualityProblem; import com.yeejoin.amos.boot.module.ugp.api.entity.QualityProblem;
...@@ -189,45 +190,50 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper ...@@ -189,45 +190,50 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
} }
/**
* 焊接工艺效验
*/
private String 效验状态 = "复审中"; private String 效验状态 = "复审中";
private final String 问题编码="-WT"; private final String 问题编码="-WT";
private final Integer 焊前效验数量 = 3;
public String weldEffect(JSONObject jsonObject) { /**
* 公共效验接口
*/
public String effect(JSONObject jsonObject,Integer 效验数量,Boolean i) {
Verify verify = new Verify(); Verify verify = new Verify();
//添加筛选条件 //添加筛选条件
LambdaQueryWrapper<Verify> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<Verify> wrapper = new LambdaQueryWrapper<>();
//获取target_info
JSONObject targetInfo = jsonObject.getJSONObject("target_info");
String code = targetInfo.getString("code");
//筛选出本焊口监检数 //筛选出本焊口监检数
wrapper.eq(Verify::getCode, jsonObject.getString("code")); wrapper.eq(Verify::getCode, code);
//改焊口焊前数据 //改焊口焊前数据
Integer verifyCount = verifyMapper.selectCount(wrapper); Integer verifyCount = verifyMapper.selectCount(wrapper);
if (verifyCount == 焊前效验数量) { if (verifyCount == 效验数量) {
wrapper.eq(Verify::getStatus, VerifyEnum.已通过.getStatus()); wrapper.eq(Verify::getStatus, VerifyEnum.已通过.getStatus());
//该焊口焊前效验通过数据 //该焊口焊前效验通过数据
Integer integer = verifyMapper.selectCount(wrapper); Integer integer = verifyMapper.selectCount(wrapper);
//判断前三次已经入库 //判断入库数量
if (integer == 焊前效验数量) { if (integer == 效验数量) {
//获取效验接口
Boolean i = false;
verify.setProjectId(jsonObject.getLong("projectId")); verify.setProjectId(jsonObject.getLong("projectId"));
verify.setCode(jsonObject.getString("code")); verify.setCode(jsonObject.getString("code"));
verify.setTargetInfo(jsonObject.getString("target_info")); verify.setTargetInfo(jsonObject.getString("target_info"));
verify.setSubmitTime(new Date()); verify.setSubmitTime(new Date());
verify.setStage(StageEnum.焊接工艺.getStage()); verify.setVerifyTime(new Date());
verify.setType(VerifyTypeEnum.智能检验.getStatus());
//获取操作阶段
String stage = targetInfo.getString("stage");
verify.setStage(stage);
//获取效验接口
if (i) { if (i) {
verify.setStatus(VerifyEnum.已通过.getStatus()); verify.setStatus(VerifyEnum.已通过.getStatus());
//添加筛选条件 //添加筛选条件
LambdaQueryWrapper<Weld> wrapperWeld = new LambdaQueryWrapper<>(); LambdaQueryWrapper<Weld> wrapperWeld = new LambdaQueryWrapper<>();
wrapperWeld.eq(Weld::getCode, jsonObject.getString("code")); wrapperWeld.eq(Weld::getCode, jsonObject.getString("code"));
Weld weld = weldMapper.selectOne(wrapperWeld); Weld weld = weldMapper.selectOne(wrapperWeld);
weld.setSuperInspecStatus(StageEnum.焊接工艺.getStage()); weld.setSuperInspecStatus(stage);
weldService.updateById(weld); weldService.updateById(weld);
...@@ -239,14 +245,14 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper ...@@ -239,14 +245,14 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
this.save(verify); this.save(verify);
LambdaQueryWrapper<Verify> wrapperVerify=new LambdaQueryWrapper<>(); LambdaQueryWrapper<Verify> wrapperVerify=new LambdaQueryWrapper<>();
wrapperVerify.eq(Verify::getCode,jsonObject.getString("code")); wrapperVerify.eq(Verify::getCode,jsonObject.getString("code"));
wrapperVerify.eq(Verify::getStage,StageEnum.焊接工艺.getStage()); wrapperVerify.eq(Verify::getStage,stage);
Verify verifyId = verifyMapper.selectOne(wrapperVerify); Verify verifyId = verifyMapper.selectOne(wrapperVerify);
QualityProblem qualityProblem = new QualityProblem(); QualityProblem qualityProblem = new QualityProblem();
//生成问题编码 //生成问题编码
qualityProblem.setStageVerifyId(verifyId.getSequenceNbr()); qualityProblem.setStageVerifyId(verifyId.getSequenceNbr());
qualityProblem.setCode(jsonObject.getString("code")+问题编码+math); qualityProblem.setCode(jsonObject.getString("code")+问题编码+math);
qualityProblem.setProjectId(jsonObject.getLong("projectId")); qualityProblem.setProjectId(jsonObject.getLong("projectId"));
qualityProblem.setGenerateStage(StageEnum.焊接工艺.getStage()); qualityProblem.setGenerateStage(stage);
qualityProblem.setSubmitDate(new Date()); qualityProblem.setSubmitDate(new Date());
qualityProblemService.save(qualityProblem); qualityProblemService.save(qualityProblem);
效验状态 = "未通过"; 效验状态 = "未通过";
...@@ -262,71 +268,148 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper ...@@ -262,71 +268,148 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
return 效验状态; return 效验状态;
} }
/** /**
* 管道耐压效验 * 焊接工艺效验
*/ */
private final Integer 管道耐压前效验数量 = 4;
public String materialEffect(JSONObject jsonObject){
Verify verify = new Verify();
//添加筛选条件
LambdaQueryWrapper<Verify> wrapper = new LambdaQueryWrapper<>();
//筛选出本焊口监检数
wrapper.eq(Verify::getCode, jsonObject.getString("code"));
//该焊口焊前数据
Integer verifyCount = verifyMapper.selectCount(wrapper);
if (verifyCount == 管道耐压前效验数量) {
wrapper.eq(Verify::getStatus, VerifyEnum.已通过.getStatus());
//该焊口焊前效验通过数据
Integer integer = verifyMapper.selectCount(wrapper);
//判断前四次已经入库
if (integer == 管道耐压前效验数量) {
//获取效验接口
Boolean i = true;
verify.setProjectId(jsonObject.getLong("projectId"));
verify.setCode(jsonObject.getString("code"));
verify.setTargetInfo(jsonObject.getString("target_info"));
verify.setSubmitTime(new Date());
verify.setStage(StageEnum.焊前管材质量.getStage());
if (i) {
verify.setStatus(VerifyEnum.已通过.getStatus());
//添加筛选条件
LambdaQueryWrapper<Weld> wrapperWeld = new LambdaQueryWrapper<>();
wrapperWeld.eq(Weld::getCode, jsonObject.getString("code"));
Weld weld = weldMapper.selectOne(wrapperWeld);
weld.setSuperInspecStatus(StageEnum.焊前管材质量.getStage());
weldService.updateById(weld);
效验状态 = "已通过";
} else {
int math= (int) (Math.random()*10000);
verify.setStatus(VerifyEnum.未通过.getStatus());
this.save(verify);
LambdaQueryWrapper<Verify> wrapperVerify=new LambdaQueryWrapper<>();
wrapperVerify.eq(Verify::getCode,jsonObject.getString("code"));
wrapperVerify.eq(Verify::getStage,StageEnum.焊前管材质量.getStage());
Verify verifyId = verifyMapper.selectOne(wrapperVerify);
QualityProblem qualityProblem = new QualityProblem();
//生成问题编码
qualityProblem.setStageVerifyId(verifyId.getSequenceNbr());
qualityProblem.setCode(jsonObject.getString("code")+问题编码+math);
qualityProblem.setProjectId(jsonObject.getLong("projectId"));
qualityProblem.setGenerateStage(StageEnum.焊前管材质量.getStage());
qualityProblem.setSubmitDate(new Date());
qualityProblemService.save(qualityProblem);
效验状态 = "未通过";
} private final Integer 焊前效验数量 = 3;
} public String weldEffect(JSONObject jsonObject) {
save(verify); effect(jsonObject,焊前效验数量,true);
// Verify verify = new Verify();
// //添加筛选条件
// LambdaQueryWrapper<Verify> wrapper = new LambdaQueryWrapper<>();
// JSONObject targetInfo = jsonObject.getJSONObject("target_info");
// String code = targetInfo.getString("code");
// //筛选出本焊口监检数
// wrapper.eq(Verify::getCode, code);
// //改焊口焊前数据
// Integer verifyCount = verifyMapper.selectCount(wrapper);
// if (verifyCount == 焊前效验数量) {
// wrapper.eq(Verify::getStatus, VerifyEnum.已通过.getStatus());
// //该焊口焊前效验通过数据
// Integer integer = verifyMapper.selectCount(wrapper);
// //判断前三次已经入库
// if (integer == 焊前效验数量) {
// //获取效验接口
// Boolean i = false;
//
//
// verify.setProjectId(jsonObject.getLong("projectId"));
// verify.setCode(jsonObject.getString("code"));
// verify.setTargetInfo(jsonObject.getString("target_info"));
// verify.setSubmitTime(new Date());
// verify.setStage(StageEnum.焊接工艺.getStage());
// if (i) {
// verify.setStatus(VerifyEnum.已通过.getStatus());
// //添加筛选条件
// LambdaQueryWrapper<Weld> wrapperWeld = new LambdaQueryWrapper<>();
// wrapperWeld.eq(Weld::getCode, jsonObject.getString("code"));
// Weld weld = weldMapper.selectOne(wrapperWeld);
// weld.setSuperInspecStatus(StageEnum.焊接工艺.getStage());
//
// weldService.updateById(weld);
//
// 效验状态 = "已通过";
// this.save(verify);
// } else {
// int math= (int) (Math.random()*10000);
// verify.setStatus(VerifyEnum.未通过.getStatus());
// this.save(verify);
// LambdaQueryWrapper<Verify> wrapperVerify=new LambdaQueryWrapper<>();
// wrapperVerify.eq(Verify::getCode,jsonObject.getString("code"));
// wrapperVerify.eq(Verify::getStage,StageEnum.焊接工艺.getStage());
// Verify verifyId = verifyMapper.selectOne(wrapperVerify);
// QualityProblem qualityProblem = new QualityProblem();
// //生成问题编码
// qualityProblem.setStageVerifyId(verifyId.getSequenceNbr());
// qualityProblem.setCode(jsonObject.getString("code")+问题编码+math);
// qualityProblem.setProjectId(jsonObject.getLong("projectId"));
// qualityProblem.setGenerateStage(StageEnum.焊接工艺.getStage());
// qualityProblem.setSubmitDate(new Date());
// qualityProblemService.save(qualityProblem);
// 效验状态 = "未通过";
//
// }
//
// }
//
//
//
// }
//
return 效验状态;
} }
/**
* 管道耐压效验
*/
private final Integer 管道耐压前效验数量 = 4;
public String materialEffect(JSONObject jsonObject){
effect(jsonObject,管道耐压前效验数量,true);
// Verify verify = new Verify();
// //添加筛选条件
// LambdaQueryWrapper<Verify> wrapper = new LambdaQueryWrapper<>();
// //筛选出本焊口监检数
// wrapper.eq(Verify::getCode, jsonObject.getString("code"));
// //该焊口焊前数据
// Integer verifyCount = verifyMapper.selectCount(wrapper);
// if (verifyCount == 管道耐压前效验数量) {
// wrapper.eq(Verify::getStatus, VerifyEnum.已通过.getStatus());
// //该焊口焊前效验通过数据
// Integer integer = verifyMapper.selectCount(wrapper);
// //判断前四次已经入库
// if (integer == 管道耐压前效验数量) {
// //获取效验接口
// Boolean i = true;
//
//
// verify.setProjectId(jsonObject.getLong("projectId"));
// verify.setCode(jsonObject.getString("code"));
// verify.setTargetInfo(jsonObject.getString("target_info"));
// verify.setSubmitTime(new Date());
// verify.setStage(StageEnum.焊前管材质量.getStage());
// if (i) {
// verify.setStatus(VerifyEnum.已通过.getStatus());
// //添加筛选条件
// LambdaQueryWrapper<Weld> wrapperWeld = new LambdaQueryWrapper<>();
// wrapperWeld.eq(Weld::getCode, jsonObject.getString("code"));
// Weld weld = weldMapper.selectOne(wrapperWeld);
// weld.setSuperInspecStatus(StageEnum.焊前管材质量.getStage());
//
// weldService.updateById(weld);
//
// 效验状态 = "已通过";
// } else {
// int math= (int) (Math.random()*10000);
// verify.setStatus(VerifyEnum.未通过.getStatus());
// this.save(verify);
// LambdaQueryWrapper<Verify> wrapperVerify=new LambdaQueryWrapper<>();
// wrapperVerify.eq(Verify::getCode,jsonObject.getString("code"));
// wrapperVerify.eq(Verify::getStage,StageEnum.焊前管材质量.getStage());
// Verify verifyId = verifyMapper.selectOne(wrapperVerify);
// QualityProblem qualityProblem = new QualityProblem();
// //生成问题编码
// qualityProblem.setStageVerifyId(verifyId.getSequenceNbr());
// qualityProblem.setCode(jsonObject.getString("code")+问题编码+math);
// qualityProblem.setProjectId(jsonObject.getLong("projectId"));
// qualityProblem.setGenerateStage(StageEnum.焊前管材质量.getStage());
// qualityProblem.setSubmitDate(new Date());
// qualityProblemService.save(qualityProblem);
// 效验状态 = "未通过";
//
// }
//
// }
//
// save(verify);
//
// }
//
return 效验状态; return 效验状态;
} }
/** /**
...@@ -335,64 +418,66 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper ...@@ -335,64 +418,66 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
private final Integer 敷设效验数量 = 5; private final Integer 敷设效验数量 = 5;
public String layEffect(JSONObject jsonObject){ public String layEffect(JSONObject jsonObject){
Verify verify = new Verify(); effect(jsonObject,敷设效验数量,true);
//添加筛选条件 //
LambdaQueryWrapper<Verify> wrapper = new LambdaQueryWrapper<>(); // Verify verify = new Verify();
//筛选出本焊口监检数 // //添加筛选条件
wrapper.eq(Verify::getCode, jsonObject.getString("code")); // LambdaQueryWrapper<Verify> wrapper = new LambdaQueryWrapper<>();
//该焊口焊前数据 // //筛选出本焊口监检数
Integer verifyCount = verifyMapper.selectCount(wrapper); // wrapper.eq(Verify::getCode, jsonObject.getString("code"));
if (verifyCount == 管道耐压前效验数量) { // //该焊口焊前数据
wrapper.eq(Verify::getStatus, VerifyEnum.已通过.getStatus()); // Integer verifyCount = verifyMapper.selectCount(wrapper);
//该焊口焊前效验通过数据 // if (verifyCount == 管道耐压前效验数量) {
Integer integer = verifyMapper.selectCount(wrapper); // wrapper.eq(Verify::getStatus, VerifyEnum.已通过.getStatus());
//判断前四次已经入库 // //该焊口焊前效验通过数据
if (integer == 管道耐压前效验数量) { // Integer integer = verifyMapper.selectCount(wrapper);
//获取效验接口 // //判断前四次已经入库
Boolean i = true; // if (integer == 管道耐压前效验数量) {
// //获取效验接口
// Boolean i = true;
verify.setProjectId(jsonObject.getLong("projectId")); //
verify.setCode(jsonObject.getString("code")); //
verify.setTargetInfo(jsonObject.getString("target_info")); // verify.setProjectId(jsonObject.getLong("projectId"));
verify.setSubmitTime(new Date()); // verify.setCode(jsonObject.getString("code"));
verify.setStage(StageEnum.敷设质量.getStage()); // verify.setTargetInfo(jsonObject.getString("target_info"));
if (i) { // verify.setSubmitTime(new Date());
verify.setStatus(VerifyEnum.已通过.getStatus()); // verify.setStage(StageEnum.敷设质量.getStage());
//添加筛选条件 // if (i) {
LambdaQueryWrapper<Weld> wrapperWeld = new LambdaQueryWrapper<>(); // verify.setStatus(VerifyEnum.已通过.getStatus());
wrapperWeld.eq(Weld::getCode, jsonObject.getString("code")); // //添加筛选条件
Weld weld = weldMapper.selectOne(wrapperWeld); // LambdaQueryWrapper<Weld> wrapperWeld = new LambdaQueryWrapper<>();
weld.setSuperInspecStatus(StageEnum.敷设质量.getStage()); // wrapperWeld.eq(Weld::getCode, jsonObject.getString("code"));
// Weld weld = weldMapper.selectOne(wrapperWeld);
weldService.updateById(weld); // weld.setSuperInspecStatus(StageEnum.敷设质量.getStage());
//
效验状态 = "已通过"; // weldService.updateById(weld);
} else { //
int math= (int) (Math.random()*10000); // 效验状态 = "已通过";
verify.setStatus(VerifyEnum.未通过.getStatus()); // } else {
this.save(verify); // int math= (int) (Math.random()*10000);
LambdaQueryWrapper<Verify> wrapperVerify=new LambdaQueryWrapper<>(); // verify.setStatus(VerifyEnum.未通过.getStatus());
wrapperVerify.eq(Verify::getCode,jsonObject.getString("code")); // this.save(verify);
wrapperVerify.eq(Verify::getStage,StageEnum.敷设质量.getStage()); // LambdaQueryWrapper<Verify> wrapperVerify=new LambdaQueryWrapper<>();
Verify verifyId = verifyMapper.selectOne(wrapperVerify); // wrapperVerify.eq(Verify::getCode,jsonObject.getString("code"));
QualityProblem qualityProblem = new QualityProblem(); // wrapperVerify.eq(Verify::getStage,StageEnum.敷设质量.getStage());
//生成问题编码 // Verify verifyId = verifyMapper.selectOne(wrapperVerify);
qualityProblem.setStageVerifyId(verifyId.getSequenceNbr()); // QualityProblem qualityProblem = new QualityProblem();
qualityProblem.setCode(jsonObject.getString("code")+问题编码+math); // //生成问题编码
qualityProblem.setProjectId(jsonObject.getLong("projectId")); // qualityProblem.setStageVerifyId(verifyId.getSequenceNbr());
qualityProblem.setGenerateStage(StageEnum.敷设质量.getStage()); // qualityProblem.setCode(jsonObject.getString("code")+问题编码+math);
qualityProblem.setSubmitDate(new Date()); // qualityProblem.setProjectId(jsonObject.getLong("projectId"));
qualityProblemService.save(qualityProblem); // qualityProblem.setGenerateStage(StageEnum.敷设质量.getStage());
效验状态 = "未通过"; // qualityProblem.setSubmitDate(new Date());
// qualityProblemService.save(qualityProblem);
} // 效验状态 = "未通过";
//
} // }
//
save(verify); // }
//
} // save(verify);
//
// }
return 效验状态; return 效验状态;
} }
...@@ -403,65 +488,67 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper ...@@ -403,65 +488,67 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
private final Integer 定位效验数量 = 6; private final Integer 定位效验数量 = 6;
public String positionEffect(JSONObject jsonObject){ public String positionEffect(JSONObject jsonObject){
Verify verify = new Verify(); effect(jsonObject,定位效验数量,true);
//添加筛选条件
LambdaQueryWrapper<Verify> wrapper = new LambdaQueryWrapper<>(); // Verify verify = new Verify();
//筛选出本焊口监检数 // //添加筛选条件
wrapper.eq(Verify::getCode, jsonObject.getString("code")); // LambdaQueryWrapper<Verify> wrapper = new LambdaQueryWrapper<>();
//该焊口焊前数据 // //筛选出本焊口监检数
Integer verifyCount = verifyMapper.selectCount(wrapper); // wrapper.eq(Verify::getCode, jsonObject.getString("code"));
if (verifyCount == 管道耐压前效验数量) { // //该焊口焊前数据
wrapper.eq(Verify::getStatus, VerifyEnum.已通过.getStatus()); // Integer verifyCount = verifyMapper.selectCount(wrapper);
//该焊口焊前效验通过数据 // if (verifyCount == 管道耐压前效验数量) {
Integer integer = verifyMapper.selectCount(wrapper); // wrapper.eq(Verify::getStatus, VerifyEnum.已通过.getStatus());
//判断前四次已经入库 // //该焊口焊前效验通过数据
if (integer == 管道耐压前效验数量) { // Integer integer = verifyMapper.selectCount(wrapper);
//获取效验接口 // //判断前四次已经入库
Boolean i = true; // if (integer == 管道耐压前效验数量) {
// //获取效验接口
// Boolean i = true;
verify.setProjectId(jsonObject.getLong("projectId")); //
verify.setCode(jsonObject.getString("code")); //
verify.setTargetInfo(jsonObject.getString("target_info")); // verify.setProjectId(jsonObject.getLong("projectId"));
verify.setSubmitTime(new Date()); // verify.setCode(jsonObject.getString("code"));
verify.setStage(StageEnum.定位.getStage()); // verify.setTargetInfo(jsonObject.getString("target_info"));
if (i) { // verify.setSubmitTime(new Date());
verify.setStatus(VerifyEnum.已通过.getStatus()); // verify.setStage(StageEnum.定位.getStage());
//添加筛选条件 // if (i) {
LambdaQueryWrapper<Weld> wrapperWeld = new LambdaQueryWrapper<>(); // verify.setStatus(VerifyEnum.已通过.getStatus());
wrapperWeld.eq(Weld::getCode, jsonObject.getString("code")); // //添加筛选条件
// LambdaQueryWrapper<Weld> wrapperWeld = new LambdaQueryWrapper<>();
Weld weld = weldMapper.selectOne(wrapperWeld); // wrapperWeld.eq(Weld::getCode, jsonObject.getString("code"));
weld.setSuperInspecStatus(StageEnum.定位.getStage()); //
// Weld weld = weldMapper.selectOne(wrapperWeld);
weldService.updateById(weld); // weld.setSuperInspecStatus(StageEnum.定位.getStage());
//
效验状态 = "已通过"; // weldService.updateById(weld);
} else { //
int math= (int) (Math.random()*10000); // 效验状态 = "已通过";
verify.setStatus(VerifyEnum.未通过.getStatus()); // } else {
this.save(verify); // int math= (int) (Math.random()*10000);
LambdaQueryWrapper<Verify> wrapperVerify=new LambdaQueryWrapper<>(); // verify.setStatus(VerifyEnum.未通过.getStatus());
wrapperVerify.eq(Verify::getCode,jsonObject.getString("code")); // this.save(verify);
wrapperVerify.eq(Verify::getStage,StageEnum.定位.getStage()); // LambdaQueryWrapper<Verify> wrapperVerify=new LambdaQueryWrapper<>();
Verify verifyId = verifyMapper.selectOne(wrapperVerify); // wrapperVerify.eq(Verify::getCode,jsonObject.getString("code"));
QualityProblem qualityProblem = new QualityProblem(); // wrapperVerify.eq(Verify::getStage,StageEnum.定位.getStage());
//生成问题编码 // Verify verifyId = verifyMapper.selectOne(wrapperVerify);
qualityProblem.setStageVerifyId(verifyId.getSequenceNbr()); // QualityProblem qualityProblem = new QualityProblem();
qualityProblem.setCode(jsonObject.getString("code")+问题编码+math); // //生成问题编码
qualityProblem.setProjectId(jsonObject.getLong("projectId")); // qualityProblem.setStageVerifyId(verifyId.getSequenceNbr());
qualityProblem.setGenerateStage(StageEnum.定位.getStage()); // qualityProblem.setCode(jsonObject.getString("code")+问题编码+math);
qualityProblem.setSubmitDate(new Date()); // qualityProblem.setProjectId(jsonObject.getLong("projectId"));
qualityProblemService.save(qualityProblem); // qualityProblem.setGenerateStage(StageEnum.定位.getStage());
效验状态 = "未通过"; // qualityProblem.setSubmitDate(new Date());
// qualityProblemService.save(qualityProblem);
} // 效验状态 = "未通过";
//
} // }
//
save(verify); // }
//
} // save(verify);
//
// }
return 效验状态; return 效验状态;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment