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
a6556a91
Commit
a6556a91
authored
Nov 18, 2024
by
1650842865
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
采购信息记录增加包装费字段
parent
c4e69eea
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
23 additions
and
19 deletions
+23
-19
addPurchaseInfoRecordDetail.js
...sun/sap/purchaseInfoRecord/addPurchaseInfoRecordDetail.js
+0
-18
addPurchaseInfoRecordDetail.jsp
...un/sap/purchaseInfoRecord/addPurchaseInfoRecordDetail.jsp
+1
-0
purchaseInfoRecordDetail.js
...topsun/sap/purchaseInfoRecord/purchaseInfoRecordDetail.js
+9
-1
purchaseInfoRecordList.js
...z/topsun/sap/purchaseInfoRecord/purchaseInfoRecordList.js
+1
-0
SapPurchaseInfoRecordItem.java
.../purchaseInfoRecord/domain/SapPurchaseInfoRecordItem.java
+6
-0
SapPurchaseInfoRecordItemVo.java
...haseInfoRecord/domain/vo/SapPurchaseInfoRecordItemVo.java
+6
-0
No files found.
topsun-xt/src/main/webapp/biz/topsun/sap/purchaseInfoRecord/addPurchaseInfoRecordDetail.js
View file @
a6556a91
...
@@ -31,24 +31,6 @@ function initialize(){
...
@@ -31,24 +31,6 @@ function initialize(){
}
}
/**
* 流程引擎回调设置打样的id
* @param value 打样申请的id
*/
function
setId
(
id
)
{
// $("#id").val(id);
}
/**
* 流程引擎获取打样申请id的回掉方法。
* @return 打样申请的id
*/
function
getId
()
{
var
id
=
$
(
"#id"
).
val
()
||
""
;
return
id
;
}
function
disableForm
(
formId
,
isDisabled
)
{
function
disableForm
(
formId
,
isDisabled
)
{
...
...
topsun-xt/src/main/webapp/biz/topsun/sap/purchaseInfoRecord/addPurchaseInfoRecordDetail.jsp
View file @
a6556a91
...
@@ -38,6 +38,7 @@
...
@@ -38,6 +38,7 @@
<x:inputC
name=
"netpr"
label=
"净价"
labelCol=
"1"
fieldCol=
"2"
required=
"true"
mask=
"99999999.99"
/>
<x:inputC
name=
"netpr"
label=
"净价"
labelCol=
"1"
fieldCol=
"2"
required=
"true"
mask=
"99999999.99"
/>
<x:inputC
name=
"freight"
label=
"运输费"
labelCol=
"1"
fieldCol=
"2"
required=
"false"
mask=
"99999999.99"
/>
<x:inputC
name=
"freight"
label=
"运输费"
labelCol=
"1"
fieldCol=
"2"
required=
"false"
mask=
"99999999.99"
/>
<x:inputC
name=
"kbetr6"
label=
"包装费"
labelCol=
"1"
fieldCol=
"2"
required=
"false"
mask=
"99999999.99"
/>
<x:hidden
name=
"matkl"
/>
<x:hidden
name=
"matkl"
/>
<x:inputC
name=
"matklName"
label=
"物料组"
labelCol=
"1"
fieldCol=
"2"
wrapper=
"select"
/>
<x:inputC
name=
"matklName"
label=
"物料组"
labelCol=
"1"
fieldCol=
"2"
wrapper=
"select"
/>
...
...
topsun-xt/src/main/webapp/biz/topsun/sap/purchaseInfoRecord/purchaseInfoRecordDetail.js
View file @
a6556a91
var
itemGridManager
=
null
,
fillinDate
=
""
;
var
itemGridManager
=
null
,
fillinDate
=
""
;
$
(
function
()
{
$
(
document
).
ready
(
function
()
{
initialize
();
initItemGrid
();
initItemGrid
();
bindEvent
();
bindEvent
();
});
});
function
initialize
()
{
UICtrl
.
layout
(
"#layout"
,
{
leftWidth
:
3
});
}
function
bindEvent
()
{
function
bindEvent
()
{
fillinDate
=
$
(
"#fillinDate"
).
val
();
fillinDate
=
$
(
"#fillinDate"
).
val
();
...
@@ -247,6 +251,9 @@ function getGridColumns() {
...
@@ -247,6 +251,9 @@ function getGridColumns() {
{
display
:
"运输费"
,
name
:
"freight"
,
width
:
"100"
,
align
:
"left"
,
type
:
"string"
{
display
:
"运输费"
,
name
:
"freight"
,
width
:
"100"
,
align
:
"left"
,
type
:
"string"
//,editor: {required: true,type: 'text', mask: '9999999.99'}
//,editor: {required: true,type: 'text', mask: '9999999.99'}
},
},
{
display
:
"包装费"
,
name
:
"kbetr6"
,
width
:
"100"
,
align
:
"left"
,
type
:
"string"
//,editor: {required: true,type: 'text', mask: '9999999.99'}
},
{
display
:
"货币码编号"
,
name
:
"waers"
,
width
:
"20"
,
align
:
"left"
,
type
:
"string"
,
hide
:
true
},
{
display
:
"货币码编号"
,
name
:
"waers"
,
width
:
"20"
,
align
:
"left"
,
type
:
"string"
,
hide
:
true
},
{
display
:
"货币码"
,
name
:
"waersTextView"
,
width
:
"100"
,
align
:
"left"
,
type
:
"string"
{
display
:
"货币码"
,
name
:
"waersTextView"
,
width
:
"100"
,
align
:
"left"
,
type
:
"string"
/*,editor: {
/*,editor: {
...
@@ -592,6 +599,7 @@ function doSaveDefine() {
...
@@ -592,6 +599,7 @@ function doSaveDefine() {
ekgrpName
:
$
(
"#ekgrpName"
).
val
(),
ekgrpName
:
$
(
"#ekgrpName"
).
val
(),
netpr
:
$
(
"#netpr"
).
val
(),
netpr
:
$
(
"#netpr"
).
val
(),
freight
:
$
(
"#freight"
).
val
(),
freight
:
$
(
"#freight"
).
val
(),
kbetr6
:
$
(
"#kbetr6"
).
val
(),
waers
:
$
(
"#waers"
).
val
(),
waers
:
$
(
"#waers"
).
val
(),
waersTextView
:
$
(
"#waers"
).
find
(
"option:selected"
).
text
(),
waersTextView
:
$
(
"#waers"
).
find
(
"option:selected"
).
text
(),
peinh
:
$
(
"#peinh"
).
val
(),
peinh
:
$
(
"#peinh"
).
val
(),
...
...
topsun-xt/src/main/webapp/biz/topsun/sap/purchaseInfoRecord/purchaseInfoRecordList.js
View file @
a6556a91
...
@@ -63,6 +63,7 @@ function initPurchaseListGrid() {
...
@@ -63,6 +63,7 @@ function initPurchaseListGrid() {
{
display
:
"采购组"
,
name
:
"ekgrpName"
,
width
:
"200"
,
align
:
"left"
,
type
:
"string"
},
{
display
:
"采购组"
,
name
:
"ekgrpName"
,
width
:
"200"
,
align
:
"left"
,
type
:
"string"
},
{
display
:
"净价"
,
name
:
"netpr"
,
width
:
"100"
,
align
:
"left"
,
type
:
"string"
},
{
display
:
"净价"
,
name
:
"netpr"
,
width
:
"100"
,
align
:
"left"
,
type
:
"string"
},
{
display
:
"运输费"
,
name
:
"freight"
,
width
:
"100"
,
align
:
"left"
,
type
:
"string"
},
{
display
:
"运输费"
,
name
:
"freight"
,
width
:
"100"
,
align
:
"left"
,
type
:
"string"
},
{
display
:
"包装费"
,
name
:
"kbetr6"
,
width
:
"100"
,
align
:
"left"
,
type
:
"string"
},
{
display
:
"货币码"
,
name
:
"waersTextView"
,
width
:
"100"
,
align
:
"left"
,
type
:
"string"
,},
{
display
:
"货币码"
,
name
:
"waersTextView"
,
width
:
"100"
,
align
:
"left"
,
type
:
"string"
,},
{
display
:
"价格单位"
,
name
:
"peinh"
,
width
:
"100"
,
align
:
"left"
,
type
:
"string"
},
{
display
:
"价格单位"
,
name
:
"peinh"
,
width
:
"100"
,
align
:
"left"
,
type
:
"string"
},
{
display
:
"订单价格单位(采购)"
,
name
:
"bprmeName"
,
width
:
"90"
,
align
:
"left"
,
type
:
"string"
},
{
display
:
"订单价格单位(采购)"
,
name
:
"bprmeName"
,
width
:
"90"
,
align
:
"left"
,
type
:
"string"
},
...
...
topsun/src/main/java/com/huigou/topsun/sap/purchaseInfoRecord/domain/SapPurchaseInfoRecordItem.java
View file @
a6556a91
...
@@ -348,6 +348,12 @@ public class SapPurchaseInfoRecordItem extends AbstractEntity {
...
@@ -348,6 +348,12 @@ public class SapPurchaseInfoRecordItem extends AbstractEntity {
@Column
(
name
=
"FREIGHT"
)
@Column
(
name
=
"FREIGHT"
)
private
BigDecimal
freight
;
private
BigDecimal
freight
;
/**
* 包装费
*/
@Column
(
name
=
"KBETR6"
)
private
BigDecimal
kbetr6
;
/**
/**
* 消息类型
* 消息类型
*/
*/
...
...
topsun/src/main/java/com/huigou/topsun/sap/purchaseInfoRecord/domain/vo/SapPurchaseInfoRecordItemVo.java
View file @
a6556a91
...
@@ -242,4 +242,10 @@ public class SapPurchaseInfoRecordItemVo implements Serializable {
...
@@ -242,4 +242,10 @@ public class SapPurchaseInfoRecordItemVo implements Serializable {
@JsonProperty
(
"KBETR"
)
@JsonProperty
(
"KBETR"
)
private
BigDecimal
freight
;
private
BigDecimal
freight
;
/**
* 包装费
*/
@JsonProperty
(
"KBETR6"
)
private
BigDecimal
kbetr6
;
}
}
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