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
def2decc
Commit
def2decc
authored
Aug 24, 2024
by
鲁鑫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
工序外协节点字段控制
parent
59c9b4d4
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
183 additions
and
111 deletions
+183
-111
processOutsourceDetail.js
...biz/topsun/sap/processOutsource/processOutsourceDetail.js
+164
-110
ProcessOutsourceApplicationImpl.java
...rce/application/impl/ProcessOutsourceApplicationImpl.java
+7
-1
ProcessOutsourceOrderItem.java
...ap/processOutsource/domain/ProcessOutsourceOrderItem.java
+12
-0
No files found.
topsun-xt/src/main/webapp/biz/topsun/sap/processOutsource/processOutsourceDetail.js
View file @
def2decc
...
...
@@ -69,11 +69,31 @@ function loadOrderItemGrid() {
});
// 表格
orderItemGridManager
=
UICtrl
.
grid
(
"#orderItemGrid"
,
{
columns
:
[
{
display
:
"采购订单"
,
name
:
"ebeln"
,
width
:
120
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
},
{
display
:
"订单行项目号"
,
name
:
"ebelp"
,
width
:
120
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
},
{
display
:
"序号"
,
name
:
"sequence"
,
width
:
140
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
},
{
display
:
"原工单"
,
name
:
"aufnr"
,
width
:
200
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
,
columns
:
getOrderColumns
(),
dataAction
:
"server"
,
url
:
web_app
.
name
+
'/processOutsource/queryProcessOutsourceOrderItems.ajax'
,
parms
:
{
processOutsourceId
:
getId
()},
pageSize
:
20
,
usePager
:
true
,
toolbar
:
toolbarOptions
,
enabledEdit
:
true
,
width
:
"98%"
,
height
:
"300px"
,
heightDiff
:
-
8
,
checkbox
:
true
,
fixedCellHeight
:
true
,
selectRowButtonOnly
:
true
,
});
UICtrl
.
setSearchAreaToggle
(
orderItemGridManager
);
}
function
getOrderColumns
(){
var
columns
=
[];
columns
.
push
({
display
:
"采购订单"
,
name
:
"ebeln"
,
width
:
120
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
});
columns
.
push
({
display
:
"订单行项目号"
,
name
:
"ebelp"
,
width
:
120
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
});
columns
.
push
({
display
:
"序号"
,
name
:
"sequence"
,
width
:
140
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
},);
columns
.
push
({
display
:
"原工单"
,
name
:
"aufnr"
,
width
:
200
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
,
editor
:
{
required
:
true
,
type
:
"select"
,
data
:
{
...
...
@@ -87,74 +107,105 @@ function loadOrderItemGrid() {
}
}
}
},
{
display
:
"工序号"
,
name
:
"wempf"
,
width
:
140
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
,
editor
:{
type
:
"text"
,
required
:
true
});
columns
.
push
({
display
:
"工序号"
,
name
:
"wempf"
,
width
:
140
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
,
editor
:
{
type
:
"text"
,
required
:
true
}
},
{
display
:
"工序描述"
,
name
:
"txz01"
,
width
:
140
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
,
editor
:{
type
:
"text"
,
required
:
true
},);
columns
.
push
({
display
:
"工序描述"
,
name
:
"txz01"
,
width
:
140
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
,
editor
:
{
type
:
"text"
,
required
:
true
}
},
{
display
:
"补数工单"
,
name
:
"ablad"
,
width
:
140
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
,
editor
:{
type
:
"text"
,
required
:
false
},);
columns
.
push
({
display
:
"补数工单"
,
name
:
"ablad"
,
width
:
140
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
,
editor
:
{
type
:
"text"
,
required
:
false
}
},
{
display
:
"数量"
,
name
:
"menge"
,
width
:
140
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
,
editor
:{
type
:
"text"
,
mask
:
'9999999.999'
,
required
:
true
},);
columns
.
push
({
display
:
"数量"
,
name
:
"menge"
,
width
:
140
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
,
editor
:
{
type
:
"text"
,
mask
:
'9999999.999'
,
required
:
true
}
},);
columns
.
push
({
display
:
"单位"
,
name
:
"meinsName"
,
width
:
140
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
,
editor
:
{
required
:
true
,
type
:
"select"
,
data
:
{
type
:
'system'
,
name
:
"dictionary"
,
getParam
:
function
(
item
)
{
return
{
fieldName
:
"MEINS"
}
},
{
display
:
"单价"
,
name
:
"kbetr"
,
width
:
140
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
,
editor
:{
type
:
"text"
,
mask
:
'9999999.999'
,
required
:
true
back
:
{
MSEHI
:
"meins"
,
MSEHL
:
"meinsName"
,
}
},
{
display
:
"定价基数"
,
name
:
"kpein"
,
width
:
140
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
,
editor
:{
type
:
"text"
,
mask
:
'9999999.999'
,
required
:
true
}
},
{
display
:
"需求日期"
,
name
:
"eeind"
,
width
:
140
,
minWidth
:
60
,
type
:
"date"
,
align
:
"left"
,
editor
:{
type
:
"date"
,
required
:
true
}
},
{
display
:
"供应商"
,
name
:
"lifnrName"
,
width
:
200
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
,
},);
columns
.
push
({
display
:
"需求日期"
,
name
:
"eeind"
,
width
:
140
,
minWidth
:
60
,
type
:
"date"
,
align
:
"left"
,
editor
:
{
required
:
true
,
type
:
"select"
,
type
:
"date"
,
required
:
true
}
},);
columns
.
push
({
display
:
"存储地点"
,
name
:
"lgortName"
,
width
:
200
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
,
editor
:
{
required
:
false
,
type
:
"select"
,
data
:
{
type
:
'suppliers
'
,
name
:
"selectSuppliers
"
,
type
:
'system
'
,
name
:
"dictionary
"
,
getParam
:
function
(
item
)
{
return
{
fieldName
:
"LGORT"
,
filterValue
:
$
(
"#werks"
).
val
()
}
},
back
:
{
partner
:
"lifnr
"
,
nameOrg1
:
"lifnrName"
,
LGORT
:
"lgort
"
,
LGOBE
:
"lgortName"
}
},
}
},);
if
(
typeof
(
getSubProcUnitId
)
==
'function'
&&
"outer"
==
getSubProcUnitId
()){
columns
.
push
({
display
:
"单价"
,
name
:
"kbetr"
,
width
:
140
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
,
editor
:
{
type
:
"text"
,
mask
:
'9999999.999'
,
required
:
true
}
},
{
display
:
"单位"
,
name
:
"meinsName"
,
width
:
140
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
,
},);
columns
.
push
({
display
:
"定价基数"
,
name
:
"kpein"
,
width
:
140
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
,
editor
:
{
type
:
"text"
,
mask
:
'9999999.999'
,
required
:
true
}
},);
columns
.
push
({
display
:
"供应商"
,
name
:
"lifnrName"
,
width
:
200
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
,
editor
:
{
required
:
true
,
type
:
"select"
,
data
:
{
type
:
'system
'
,
name
:
"dictionary
"
,
type
:
'suppliers
'
,
name
:
"selectSuppliers
"
,
getParam
:
function
(
item
)
{
return
{
fieldName
:
"MEINS"
}
},
back
:
{
MSEHI
:
"meins
"
,
MSEHL
:
"meins
Name"
,
partner
:
"lifnr
"
,
nameOrg1
:
"lifnr
Name"
,
}
}
}
},
{
display
:
"币别"
,
name
:
"waersTextView"
,
width
:
140
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
,
},);
columns
.
push
({
display
:
"币别"
,
name
:
"waersTextView"
,
width
:
140
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
,
editor
:
{
type
:
'dictionary'
,
data
:
{
name
:
'waers'
},
...
...
@@ -165,8 +216,9 @@ function loadOrderItemGrid() {
return
item
.
waersTextView
;
}
},
},
{
display
:
"税码"
,
name
:
"purchaseMwskzTextView"
,
width
:
140
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
,
},);
columns
.
push
({
display
:
"税码"
,
name
:
"purchaseMwskzTextView"
,
width
:
140
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
,
editor
:
{
type
:
'dictionary'
,
data
:
{
name
:
'purchaseMwskz'
},
...
...
@@ -177,23 +229,25 @@ function loadOrderItemGrid() {
return
item
.
purchaseMwskzTextView
;
}
},
}
],
dataAction
:
"server"
,
url
:
web_app
.
name
+
'/processOutsource/queryProcessOutsourceOrderItems.ajax'
,
parms
:
{
processOutsourceId
:
getId
()},
pageSize
:
20
,
usePager
:
true
,
toolbar
:
toolbarOptions
,
enabledEdit
:
true
,
width
:
"98%"
,
height
:
"300px"
,
heightDiff
:
-
8
,
checkbox
:
true
,
fixedCellHeight
:
true
,
selectRowButtonOnly
:
true
,
});
UICtrl
.
setSearchAreaToggle
(
orderItemGridManager
);
}
else
{
columns
.
push
({
display
:
"单价"
,
name
:
"kbetr"
,
width
:
140
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
,
},);
columns
.
push
({
display
:
"定价基数"
,
name
:
"kpein"
,
width
:
140
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
,
},);
columns
.
push
({
display
:
"供应商"
,
name
:
"lifnrName"
,
width
:
200
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
,
},);
columns
.
push
({
display
:
"币别"
,
name
:
"waersTextView"
,
width
:
140
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
,
},);
columns
.
push
({
display
:
"税码"
,
name
:
"purchaseMwskzTextView"
,
width
:
140
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
,
});
}
return
columns
;
}
// 加载组件信息表格
...
...
topsun/src/main/java/com/huigou/topsun/sap/processOutsource/application/impl/ProcessOutsourceApplicationImpl.java
View file @
def2decc
...
...
@@ -34,6 +34,7 @@ import com.huigou.util.StringUtil;
import
org.activiti.engine.delegate.DelegateExecution
;
import
org.activiti.engine.delegate.DelegateTask
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.core.task.TaskExecutor
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.util.Assert
;
...
...
@@ -64,6 +65,8 @@ public class ProcessOutsourceApplicationImpl extends FlowBroker implements Proce
private
ProcessOutsourceOrderItemRepository
processOutsourceOrderItemRepository
;
@Autowired
private
SapPermitApplication
sapPermitApplication
;
@Autowired
private
TaskExecutor
asyncWriteExecutor
;
@Override
protected
String
saveBizAndApprovalData
()
{
...
...
@@ -166,7 +169,10 @@ public class ProcessOutsourceApplicationImpl extends FlowBroker implements Proce
//推送到SAP
this
.
sendData
(
processOutsource
);
//创建放行条
this
.
startSapPermit
(
processOutsource
);
asyncWriteExecutor
.
execute
(()->
//创建放行条
this
.
startSapPermit
(
processOutsource
)
);
processOutsourceRepository
.
save
(
processOutsource
);
}
...
...
topsun/src/main/java/com/huigou/topsun/sap/processOutsource/domain/ProcessOutsourceOrderItem.java
View file @
def2decc
...
...
@@ -83,6 +83,18 @@ public class ProcessOutsourceOrderItem extends AbstractEntity {
@Column
(
name
=
"MEINS_NAME"
)
private
String
meinsName
;
/**
* 存储地点
*/
@Column
(
name
=
"LGORT"
)
private
String
lgort
;
/**
* 存储地点
*/
@Column
(
name
=
"LGORT_NAME"
)
private
String
lgortName
;
/**
* 需求到货日期
*/
...
...
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