Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
T
topsun-bpm
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
鲁鑫
topsun-bpm
Commits
54862c3b
Commit
54862c3b
authored
Sep 11, 2024
by
鲁鑫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MES异常单不通过提交时带上处理意见
parent
1ae68c0e
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
job.js
huigou-xt/src/main/webapp/system/bpm/job.js
+1
-1
ProduceExceptionApplicationImpl.java
...ion/application/impl/ProduceExceptionApplicationImpl.java
+4
-0
No files found.
huigou-xt/src/main/webapp/system/bpm/job.js
View file @
54862c3b
...
...
@@ -565,7 +565,7 @@ function doAdvance() {
var
params
=
$
.
extend
({},
getApprovalParams
(),
extendedData
);
if
(
getApprovalParams
().
processDefinitionKey
==
"produceExceptionProc"
&&
getApprovalParams
().
handleResult
==
"2"
){
var
params
=
$
.
extend
({},
{
procInstId
:
procInstId
});
var
params
=
$
.
extend
({},
{
procInstId
:
procInstId
,
handleOpinion
:
getApprovalParams
().
handleOpinion
});
$
(
'#submitForm'
).
ajaxSubmit
({
url
:
web_app
.
name
+
'/workflow/abortProcessInstance.ajax'
,
param
:
params
,
...
...
topsun/src/main/java/com/huigou/topsun/mes/produceException/application/impl/ProduceExceptionApplicationImpl.java
View file @
54862c3b
...
...
@@ -21,6 +21,7 @@ import com.huigou.topsun.sap.common.application.SapMutualEpLogApplication;
import
com.huigou.topsun.sap.common.domain.MesResult
;
import
com.huigou.uasp.bmp.common.BizBillStatus
;
import
com.huigou.uasp.bmp.operator.OperatorApplication
;
import
com.huigou.uasp.bpm.ApprovalParameter
;
import
com.huigou.uasp.bpm.FlowBroker
;
import
com.huigou.uasp.bpm.ProcessAction
;
import
com.huigou.uasp.bpm.ProcessStartModel
;
...
...
@@ -182,6 +183,9 @@ public class ProduceExceptionApplicationImpl extends FlowBroker implements Produ
String
bizId
=
delegateExecution
.
getProcessBusinessKey
();
ProduceException
produceException
=
produceExceptionRepository
.
findOne
(
bizId
);
produceException
.
setStatusId
(
BizBillStatus
.
ABORTED
.
getId
());
ApprovalParameter
approvalParameter
=
this
.
getApprovalParameter
();
String
handleOpinion
=
approvalParameter
.
getHandleOpinion
();
produceException
.
setResult
(
handleOpinion
);
produceExceptionRepository
.
save
(
produceException
);
this
.
feedBackSaleOrder
(
produceException
,
"N"
);
}
...
...
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