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
28b62171
Commit
28b62171
authored
Jul 03, 2025
by
1650842865
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
领料申请增加物料组
parent
ca2b3d05
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
38 additions
and
0 deletions
+38
-0
nonProducePickDetail.js
...app/biz/topsun/sap/nonProducePick/nonProducePickDetail.js
+21
-0
nonProducePickList.js
...ebapp/biz/topsun/sap/nonProducePick/nonProducePickList.js
+2
-0
ResourceSearchController.java
...om/huigou/topsun/controller/ResourceSearchController.java
+2
-0
NonProducePickItem.java
.../topsun/sap/nonProducePick/domain/NonProducePickItem.java
+11
-0
nonProducePick.xml
...urces/config/topsun/sap/nonProducePick/nonProducePick.xml
+2
-0
No files found.
topsun-xt/src/main/webapp/biz/topsun/sap/nonProducePick/nonProducePickDetail.js
View file @
28b62171
...
@@ -98,6 +98,26 @@ function loadGrid() {
...
@@ -98,6 +98,26 @@ function loadGrid() {
{
{
display
:
"序号"
,
name
:
"rspos"
,
width
:
70
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
,
display
:
"序号"
,
name
:
"rspos"
,
width
:
70
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
,
},
},
{
display
:
"物料组"
,
name
:
"wgbez"
,
width
:
160
,
align
:
"left"
,
type
:
"string"
,
editor
:
{
required
:
true
,
type
:
"select"
,
data
:
{
type
:
'system'
,
name
:
"dictionary"
,
getParam
:
function
(
item
)
{
return
{
fieldName
:
"MATKL"
,
//filterValue: $("#werks").val()
}
},
back
:
{
MATKL
:
"matkl"
,
WGBEZ
:
"wgbez"
,
}
},
}
},
{
{
display
:
"物料"
,
name
:
"matnr"
,
width
:
160
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
,
display
:
"物料"
,
name
:
"matnr"
,
width
:
160
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
,
editor
:
{
editor
:
{
...
@@ -108,6 +128,7 @@ function loadGrid() {
...
@@ -108,6 +128,7 @@ function loadGrid() {
getParam
:
function
(
item
)
{
getParam
:
function
(
item
)
{
return
{
return
{
filterValue
:
$
(
"#werks"
).
val
(),
filterValue
:
$
(
"#werks"
).
val
(),
matkl
:
item
.
matkl
,
mtart
:
"ZGMB"
mtart
:
"ZGMB"
}
}
},
},
...
...
topsun-xt/src/main/webapp/biz/topsun/sap/nonProducePick/nonProducePickList.js
View file @
28b62171
...
@@ -34,6 +34,8 @@ function loadGrid() {
...
@@ -34,6 +34,8 @@ function loadGrid() {
{
display
:
"内部订单编号"
,
name
:
"aufnr"
,
width
:
100
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
},
{
display
:
"内部订单编号"
,
name
:
"aufnr"
,
width
:
100
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
},
{
display
:
"内部订单描述"
,
name
:
"aufnrName"
,
width
:
200
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
},
{
display
:
"内部订单描述"
,
name
:
"aufnrName"
,
width
:
200
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
},
{
display
:
"序号"
,
name
:
"rspos"
,
width
:
70
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
,},
{
display
:
"序号"
,
name
:
"rspos"
,
width
:
70
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
,},
{
display
:
"物料组编码"
,
name
:
"matkl"
,
width
:
100
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
},
{
display
:
"物料组描述"
,
name
:
"wgbez"
,
width
:
160
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
},
{
display
:
"物料"
,
name
:
"matnr"
,
width
:
160
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
},
{
display
:
"物料"
,
name
:
"matnr"
,
width
:
160
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
},
{
display
:
"SAP物料名称"
,
name
:
"maktx"
,
width
:
300
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
,},
{
display
:
"SAP物料名称"
,
name
:
"maktx"
,
width
:
300
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
,},
{
display
:
"物料要求描述"
,
name
:
"matxt"
,
width
:
300
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
,},
{
display
:
"物料要求描述"
,
name
:
"matxt"
,
width
:
300
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
,},
...
...
topsun/src/main/java/com/huigou/topsun/controller/ResourceSearchController.java
View file @
28b62171
...
@@ -133,8 +133,10 @@ public class ResourceSearchController {
...
@@ -133,8 +133,10 @@ public class ResourceSearchController {
String
param
=
sdo
.
getString
(
"paramValue"
);
String
param
=
sdo
.
getString
(
"paramValue"
);
String
filterValue
=
sdo
.
getString
(
"filterValue"
);
String
filterValue
=
sdo
.
getString
(
"filterValue"
);
String
mtart
=
sdo
.
getString
(
"mtart"
);
//如果传了刀模板具,就排除掉
String
mtart
=
sdo
.
getString
(
"mtart"
);
//如果传了刀模板具,就排除掉
String
matkl
=
sdo
.
getString
(
"matkl"
);
//物料组
SapDialogQuery
queryRequest
=
sdo
.
toObject
(
SapDialogQuery
.
class
);
SapDialogQuery
queryRequest
=
sdo
.
toObject
(
SapDialogQuery
.
class
);
queryRequest
.
setWerks
(
filterValue
);
queryRequest
.
setWerks
(
filterValue
);
queryRequest
.
setMatkl
(
matkl
);
List
<
Map
<
String
,
String
>>
mapList
=
sapMaterialApplication
.
getSapMaterial
(
queryRequest
);
List
<
Map
<
String
,
String
>>
mapList
=
sapMaterialApplication
.
getSapMaterial
(
queryRequest
);
// if (CollectionUtil.isNotEmpty(mapList)){
// if (CollectionUtil.isNotEmpty(mapList)){
// mapList = mapList
// mapList = mapList
...
...
topsun/src/main/java/com/huigou/topsun/sap/nonProducePick/domain/NonProducePickItem.java
View file @
28b62171
...
@@ -30,6 +30,17 @@ public class NonProducePickItem extends AbstractEntity {
...
@@ -30,6 +30,17 @@ public class NonProducePickItem extends AbstractEntity {
*/
*/
@Column
(
name
=
"RSPOS"
)
@Column
(
name
=
"RSPOS"
)
private
String
rspos
;
private
String
rspos
;
/**
* 物料组
*/
@Column
(
name
=
"MATKL"
)
private
String
matkl
;
/**
* 物料组描述
*/
@Column
(
name
=
"WGBEZ"
)
private
String
wgbez
;
/**
/**
*物料
*物料
...
...
topsun/src/main/resources/config/topsun/sap/nonProducePick/nonProducePick.xml
View file @
28b62171
...
@@ -26,6 +26,8 @@
...
@@ -26,6 +26,8 @@
t.message,
t.message,
pi.id as item_id,
pi.id as item_id,
pi.rspos,
pi.rspos,
pi.matkl,
pi.wgbez,
pi.matnr,
pi.matnr,
pi.maktx,
pi.maktx,
pi.lgort,
pi.lgort,
...
...
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