Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
yanxuan-qc-change-system
Overview
Overview
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
胡园园
yanxuan-qc-change-system
Commits
5e470a26
Commit
5e470a26
authored
Dec 15, 2022
by
“zcwang”
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
modify:引用工单
parent
9630fd51
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
4 deletions
+9
-4
ChangeFlowBiz.java
...om/netease/mail/yanxuan/change/biz/biz/ChangeFlowBiz.java
+5
-1
ChangeFlowController.java
...l/yanxuan/change/web/controller/ChangeFlowController.java
+4
-3
No files found.
yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/biz/ChangeFlowBiz.java
View file @
5e470a26
...
@@ -870,9 +870,13 @@ public class ChangeFlowBiz {
...
@@ -870,9 +870,13 @@ public class ChangeFlowBiz {
return
changeFlowService
.
updateRecord
(
changeRecord
);
return
changeFlowService
.
updateRecord
(
changeRecord
);
}
}
public
BasicChangeFlowVO
quote
(
Long
flowId
)
{
public
BasicChangeFlowVO
quote
(
Long
flowId
,
String
supplier
,
Integer
createSource
)
{
// 获取工单详情
// 获取工单详情
ChangeRecord
changeRecord
=
this
.
getFlowInfo
(
flowId
);
ChangeRecord
changeRecord
=
this
.
getFlowInfo
(
flowId
);
// 同舟端需校验只能引用同一供应商下的工单
if
(
CreateSourceEnum
.
TONG_ZHOU
.
getType
().
equals
(
createSource
))
{
Assert
.
isTrue
(
changeRecord
.
getCreateSupplier
().
equals
(
supplier
),
"不能引用非本供应商工单"
);
}
// 获取附件
// 获取附件
List
<
ChangeFlowFile
>
changeFileList
=
changeFileService
.
getChangeFileList
(
changeRecord
.
getId
());
List
<
ChangeFlowFile
>
changeFileList
=
changeFileService
.
getChangeFileList
(
changeRecord
.
getId
());
return
BasicChangeFlowVO
.
builder
().
parentChangeClassId
(
changeRecord
.
getParentChangeClassId
())
return
BasicChangeFlowVO
.
builder
().
parentChangeClassId
(
changeRecord
.
getParentChangeClassId
())
...
...
yanxuan-qc-change-system-web/src/main/java/com/netease/mail/yanxuan/change/web/controller/ChangeFlowController.java
View file @
5e470a26
...
@@ -20,7 +20,6 @@ import org.springframework.web.bind.annotation.RestController;
...
@@ -20,7 +20,6 @@ import org.springframework.web.bind.annotation.RestController;
import
com.netease.mail.yanxuan.change.biz.biz.ChangeFlowBiz
;
import
com.netease.mail.yanxuan.change.biz.biz.ChangeFlowBiz
;
import
com.netease.mail.yanxuan.change.biz.config.TitleConfig
;
import
com.netease.mail.yanxuan.change.biz.config.TitleConfig
;
import
com.netease.mail.yanxuan.change.biz.service.ChangeFlowExportQuery
;
import
com.netease.mail.yanxuan.change.biz.service.ChangeFlowService
;
import
com.netease.mail.yanxuan.change.biz.service.ChangeFlowService
;
import
com.netease.mail.yanxuan.change.biz.service.DESExportService
;
import
com.netease.mail.yanxuan.change.biz.service.DESExportService
;
import
com.netease.mail.yanxuan.change.biz.service.InteriorChangeConfigService
;
import
com.netease.mail.yanxuan.change.biz.service.InteriorChangeConfigService
;
...
@@ -174,8 +173,10 @@ public class ChangeFlowController {
...
@@ -174,8 +173,10 @@ public class ChangeFlowController {
* @return
* @return
*/
*/
@GetMapping
(
"/quote"
)
@GetMapping
(
"/quote"
)
public
AjaxResult
<
BasicChangeFlowVO
>
quote
(
@RequestParam
Long
flowId
)
{
public
AjaxResult
<
BasicChangeFlowVO
>
quote
(
@RequestParam
Long
flowId
,
return
AjaxResult
.
success
(
changeFlowBiz
.
quote
(
flowId
));
@RequestParam
(
name
=
"supplier"
,
required
=
false
)
String
supplier
,
@RequestParam
(
name
=
"createSource"
,
required
=
false
,
defaultValue
=
"1"
)
Integer
createSource
)
{
return
AjaxResult
.
success
(
changeFlowBiz
.
quote
(
flowId
,
supplier
,
createSource
));
}
}
/**
/**
...
...
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