Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
项目统一框架
amos-boot-biz
Commits
673d32be
Commit
673d32be
authored
Oct 21, 2022
by
wanglong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
对管材效验接口,添加敷设监检接口,焊口敷设位置标定管理进行修改,添加效验公共接口
parent
3a0b685f
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
317 additions
and
200 deletions
+317
-200
StageEnum.java
.../com/yeejoin/amos/boot/module/ugp/api/Enum/StageEnum.java
+4
-4
VerifyEnum.java
...com/yeejoin/amos/boot/module/ugp/api/Enum/VerifyEnum.java
+8
-4
VerifyTypeEnum.java
...yeejoin/amos/boot/module/ugp/api/Enum/VerifyTypeEnum.java
+26
-0
VerifyServiceImpl.java
...s/boot/module/ugp/biz/service/impl/VerifyServiceImpl.java
+279
-192
No files found.
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 {
public
static
Map
<
String
,
String
>
getNameBy
Status
Map
=
new
HashMap
<>();
public
static
Map
<
String
,
String
>
getStatusByNameMap
=
new
HashMap
<>();
public
static
Map
<
String
,
String
>
getNameBy
Name
Map
=
new
HashMap
<>();
public
static
Map
<
String
,
String
>
getStatusBy
Verify
NameMap
=
new
HashMap
<>();
static
{
for
(
StageEnum
enums:
StageEnum
.
values
()){
getNameBy
Status
Map
.
put
(
enums
.
stage
,
enums
.
name
);
getStatusBy
NameMap
.
put
(
enums
.
name
,
enums
.
stag
e
);
getNameBy
Name
Map
.
put
(
enums
.
stage
,
enums
.
name
);
getStatusBy
VerifyNameMap
.
put
(
enums
.
stage
,
enums
.
verifyNam
e
);
}
}
...
...
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;
@AllArgsConstructor
public
enum
VerifyEnum
{
未通过
(
"0"
,
"未通过"
),
已通过
(
"1"
,
"已通过"
);
未通过
(
"0"
,
"未通过"
,
"智能检验"
),
已通过
(
"1"
,
"已通过"
,
"人工检验"
);
private
String
status
;
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
{
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;
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.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.dto.*
;
import
com.yeejoin.amos.boot.module.ugp.api.entity.QualityProblem
;
...
...
@@ -189,45 +190,50 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
}
/**
* 焊接工艺效验
*/
private
String
效验状态
=
"复审中"
;
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
();
//添加筛选条件
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
);
if
(
verifyCount
==
焊前
效验数量
)
{
if
(
verifyCount
==
效验数量
)
{
wrapper
.
eq
(
Verify:
:
getStatus
,
VerifyEnum
.
已通过
.
getStatus
());
//该焊口焊前效验通过数据
Integer
integer
=
verifyMapper
.
selectCount
(
wrapper
);
//判断前三次已经入库
if
(
integer
==
焊前效验数量
)
{
//获取效验接口
Boolean
i
=
false
;
//判断入库数量
if
(
integer
==
效验数量
)
{
verify
.
setProjectId
(
jsonObject
.
getLong
(
"projectId"
));
verify
.
setCode
(
jsonObject
.
getString
(
"code"
));
verify
.
setTargetInfo
(
jsonObject
.
getString
(
"target_info"
));
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
)
{
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
()
);
weld
.
setSuperInspecStatus
(
stage
);
weldService
.
updateById
(
weld
);
...
...
@@ -239,14 +245,14 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
this
.
save
(
verify
);
LambdaQueryWrapper
<
Verify
>
wrapperVerify
=
new
LambdaQueryWrapper
<>();
wrapperVerify
.
eq
(
Verify:
:
getCode
,
jsonObject
.
getString
(
"code"
));
wrapperVerify
.
eq
(
Verify:
:
getStage
,
StageEnum
.
焊接工艺
.
getStage
()
);
wrapperVerify
.
eq
(
Verify:
:
getStage
,
stage
);
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
.
setGenerateStage
(
stage
);
qualityProblem
.
setSubmitDate
(
new
Date
());
qualityProblemService
.
save
(
qualityProblem
);
效验状态
=
"未通过"
;
...
...
@@ -262,71 +268,148 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
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
;
save
(
verify
);
public
String
weldEffect
(
JSONObject
jsonObject
)
{
}
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
效验状态
;
}
/**
...
...
@@ -335,64 +418,66 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
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
);
}
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
效验状态
;
}
...
...
@@ -403,65 +488,67 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
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
);
}
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
效验状态
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment