Skip to content

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

添加管材效验接口，敷设监检接口，焊口敷设位置标定检验接口

parent 1eba123e
Hide whitespace changes
Inline Side-by-side
Showing with 302 additions and 45 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 @ cf748436
...@@ -15,17 +15,19 @@ import java.util.Map; ...@@ -15,17 +15,19 @@ import java.util.Map;
@AllArgsConstructor @AllArgsConstructor
public enum StageEnum { public enum StageEnum {
焊前人员("人员确定","STAFF"), 焊前人员("人员确定","STAFF","人员"),
焊前设备("设备确定","EQUIPMENT"), 焊前设备("设备确定","EQUIPMENT","设备"),
焊前管材质量("管材确定","BEFORE-WELDING"), 焊前管材质量("管材确定","BEFORE-WELDING","管材"),
焊接工艺("工艺确定","CRAFT"), 焊接工艺("工艺确定","CRAFT","工艺"),
管道耐压("耐压确定","VOLTAGE"), 管道耐压("耐压确定","VOLTAGE","耐压"),
敷设质量("敷设确定","LAY"), 敷设质量("敷设确定","LAY","敷设"),
定位("定位确定","LOTCATION"); 定位("定位确定","LOTCATION","定位");
private String name; private String name;
private String stage; private String stage;
private String verifyName;
......
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/VerifyController.java
View file @ cf748436
...@@ -212,12 +212,41 @@ public class VerifyController extends BaseController { ...@@ -212,12 +212,41 @@ public class VerifyController extends BaseController {
* 焊接工艺效验 * 焊接工艺效验
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@ApiOperation(httpMethod = "GET", value = "焊接工艺效验", notes = "焊接工艺效验") @ApiOperation(httpMethod = "POST", value = "焊接工艺效验", notes = "焊接工艺效验")
@PostMapping(value = "/weldeffect") @PostMapping(value = "/weldeEffect")
public ResponseModel<String> weldEffect(@RequestBody JSONObject jsonObject) { public ResponseModel<String> weldEffect(@RequestBody JSONObject jsonObject) {
return ResponseHelper.buildResponse(verifyServiceImpl.weldEffect(jsonObject)); return ResponseHelper.buildResponse(verifyServiceImpl.weldEffect(jsonObject));
} }
/**
* 管材耐压效验
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@ApiOperation(httpMethod = "POST", value = "管材耐压效验", notes = "管材耐压效验")
@PostMapping(value = "/materialEffect")
public ResponseModel<String> materialEffect(@RequestBody JSONObject jsonObject) {
return ResponseHelper.buildResponse(verifyServiceImpl.materialEffect(jsonObject));
}
/**
* 敷设质量检验
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@ApiOperation(httpMethod = "POST", value = "敷设质量检验", notes = "敷设质量检验")
@PostMapping(value = "/layEffect")
public ResponseModel<String> layEffect(@RequestBody JSONObject jsonObject) {
return ResponseHelper.buildResponse(verifyServiceImpl.layEffect(jsonObject));
}
/**
*焊口敷设位置标定检验
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@ApiOperation(httpMethod = "POST", value = "焊口敷设位置标定检验", notes = "焊口敷设位置标定检验")
@PostMapping(value = "/positionEffect")
public ResponseModel<String> positionEffect(@RequestBody JSONObject jsonObject) {
return ResponseHelper.buildResponse(verifyServiceImpl.positionEffect(jsonObject));
}
} }
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/WelderController.java
View file @ cf748436
...@@ -64,7 +64,7 @@ public class WelderController extends BaseController { ...@@ -64,7 +64,7 @@ public class WelderController extends BaseController {
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@GetMapping(value = "/selectWelder") @GetMapping(value = "/selectWelder")
@ApiOperation(httpMethod = "GET", value = "新增焊工信息", notes = "新增焊工信息") @ApiOperation(httpMethod = "GET", value = "获取焊工信息", notes = "获取焊工信息")
public ResponseModel<List<JSONObject>> selectWelder(@RequestParam("code") String code) { public ResponseModel<List<JSONObject>> selectWelder(@RequestParam("code") String code) {
List<JSONObject> jsonObjectList=new ArrayList<>(); List<JSONObject> jsonObjectList=new ArrayList<>();
LambdaQueryWrapper<Project> wrapper=new LambdaQueryWrapper<>(); LambdaQueryWrapper<Project> wrapper=new LambdaQueryWrapper<>();
......
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 @ cf748436
...@@ -192,53 +192,278 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper ...@@ -192,53 +192,278 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
/** /**
* 焊接工艺效验 * 焊接工艺效验
*/ */
private String 效验状态 = "null"; private String 效验状态 = "复审中";
private final String 问题编码="-WT";
private final Integer 焊前效验数量 = 3;
public String weldEffect(JSONObject jsonObject) { public String weldEffect(JSONObject jsonObject) {
Verify verify = new Verify(); 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 = 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){
Verify verify = new Verify();
//添加筛选条件
LambdaQueryWrapper<Verify> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<Verify> wrapper = new LambdaQueryWrapper<>();
//筛选出本次任务 //筛选出本焊口监检数
wrapper.eq(Verify::getCode, jsonObject.getString("code")); wrapper.eq(Verify::getCode, jsonObject.getString("code"));
wrapper.eq(Verify::getStatus, VerifyEnum.已通过.getStatus()); //该焊口焊前数据
List<Verify> verifies = verifyMapper.selectList(wrapper); Integer verifyCount = verifyMapper.selectCount(wrapper);
//判断前三次已经入库 if (verifyCount == 管道耐压前效验数量) {
if (verifies.stream().count() == 3) { wrapper.eq(Verify::getStatus, VerifyEnum.已通过.getStatus());
//获取效验接口 //该焊口焊前效验通过数据
Boolean i = true; Integer integer = verifyMapper.selectCount(wrapper);
//判断前四次已经入库
if (integer == 管道耐压前效验数量) {
verify.setProjectId(jsonObject.getLong("projectId")); //获取效验接口
verify.setCode(jsonObject.getString("code")); Boolean i = true;
verify.setTargetInfo(jsonObject.getString("target_info"));
verify.setStage(StageEnum.焊接工艺.getStage());
if (i) { verify.setProjectId(jsonObject.getLong("projectId"));
verify.setStatus(VerifyEnum.已通过.getStatus()); verify.setCode(jsonObject.getString("code"));
verify.setTargetInfo(jsonObject.getString("target_info"));
LambdaQueryWrapper<Weld> wrapperWeld = new LambdaQueryWrapper<>(); verify.setSubmitTime(new Date());
wrapperWeld.eq(Weld::getCode,jsonObject.getString("code")); verify.setStage(StageEnum.焊前管材质量.getStage());
Weld weld = weldMapper.selectOne(wrapperWeld); if (i) {
weld.setSuperInspecStatus(StageEnum.焊接工艺.getStage()); verify.setStatus(VerifyEnum.已通过.getStatus());
//添加筛选条件
weldService.updateById(weld); LambdaQueryWrapper<Weld> wrapperWeld = new LambdaQueryWrapper<>();
wrapperWeld.eq(Weld::getCode, jsonObject.getString("code"));
效验状态 = "已通过"; Weld weld = weldMapper.selectOne(wrapperWeld);
} else { weld.setSuperInspecStatus(StageEnum.焊前管材质量.getStage());
verify.setStatus(VerifyEnum.未通过.getStatus());
QualityProblem qualityProblem = new QualityProblem(); weldService.updateById(weld);
qualityProblem.setCode("WT" + jsonObject.getString("code"));
qualityProblem.setProjectId(jsonObject.getLong("projectId")); 效验状态 = "已通过";
qualityProblem.setGenerateStage(StageEnum.焊接工艺.getName()); } else {
qualityProblem.setSubmitDate(new Date()); int math= (int) (Math.random()*10000);
qualityProblemService.save(qualityProblem); 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);
} }
save(verify);
return 效验状态; return 效验状态;
}
/**
* 敷设效验
*/
private final Integer 敷设效验数量 = 5;
public String layEffect(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);
效验状态 = "未通过";
}
}
save(verify);
}
return 效验状态;
} }
/**
* 定位效验
*/
private final Integer 定位效验数量 = 6;
public String positionEffect(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);
效验状态 = "未通过";
}
}
save(verify);
}
return 效验状态;
}
} }
\ No newline at end of file
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