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
62f8bba5
Commit
62f8bba5
authored
Apr 11, 2024
by
鲁鑫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
废品销售单增加“出售物品”“车辆皮重”、“毛重”、“特殊情况扣减重量”、“净重”、“备注”,另外需要增加对应装车的“车牌号码”。字段
parent
b0b4f220
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
91 additions
and
0 deletions
+91
-0
wasteSaleDetail.js
...c/main/webapp/biz/topsun/sap/wasteSale/wasteSaleDetail.js
+38
-0
wasteSaleDetail.jsp
.../main/webapp/biz/topsun/sap/wasteSale/wasteSaleDetail.jsp
+4
-0
wasteSaleList.js
...src/main/webapp/biz/topsun/sap/wasteSale/wasteSaleList.js
+2
-0
WasteSale.java
...ava/com/huigou/topsun/sap/wasteSale/domain/WasteSale.java
+12
-0
WasteSaleItem.java
...com/huigou/topsun/sap/wasteSale/domain/WasteSaleItem.java
+35
-0
No files found.
topsun-xt/src/main/webapp/biz/topsun/sap/wasteSale/wasteSaleDetail.js
View file @
62f8bba5
...
@@ -13,6 +13,7 @@ function initialize(){
...
@@ -13,6 +13,7 @@ function initialize(){
UICtrl
.
setElHideOrShow
(
"#budat"
,
true
)
UICtrl
.
setElHideOrShow
(
"#budat"
,
true
)
UICtrl
.
setElHideOrShow
(
"#paymentMethod"
,
true
)
UICtrl
.
setElHideOrShow
(
"#paymentMethod"
,
true
)
UICtrl
.
setElHideOrShow
(
"#totalMoney"
,
true
)
UICtrl
.
setElHideOrShow
(
"#totalMoney"
,
true
)
UICtrl
.
setElHideOrShow
(
"#carNo"
,
true
)
}
}
}
}
...
@@ -75,6 +76,12 @@ function getGridColumns(){
...
@@ -75,6 +76,12 @@ function getGridColumns(){
}
}
},
},
},)
},)
columns
.
push
({
display
:
"出售物品"
,
name
:
"saleGoods"
,
width
:
300
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
,
editor
:
{
required
:
true
,
type
:
"text"
,
}
},)
columns
.
push
({
columns
.
push
({
display
:
"数量"
,
name
:
"quantity"
,
width
:
200
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
,
display
:
"数量"
,
name
:
"quantity"
,
width
:
200
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
,
editor
:
{
editor
:
{
...
@@ -118,6 +125,36 @@ function getGridColumns(){
...
@@ -118,6 +125,36 @@ function getGridColumns(){
}
}
}
}
},)
},)
columns
.
push
({
display
:
"车辆皮重"
,
name
:
"carWeight"
,
width
:
150
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
,
editor
:
{
required
:
false
,
type
:
"text"
,
mask
:
'9999999.99'
}
},)
columns
.
push
({
display
:
"毛重"
,
name
:
"grossWeight"
,
width
:
150
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
,
editor
:
{
required
:
false
,
type
:
"text"
,
mask
:
'9999999.99'
}
},)
columns
.
push
({
display
:
"扣减重量"
,
name
:
"deductWeight"
,
width
:
150
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
,
editor
:
{
required
:
false
,
type
:
"text"
,
mask
:
'9999999.99'
}
},)
columns
.
push
({
display
:
"净重"
,
name
:
"netWeight"
,
width
:
150
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
,
editor
:
{
required
:
false
,
type
:
"text"
,
mask
:
'9999999.99'
}
},)
columns
.
push
({
display
:
"备注"
,
name
:
"remark"
,
width
:
200
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
,
editor
:
{
required
:
false
,
type
:
"text"
}
},)
}
}
return
columns
;
return
columns
;
}
}
...
@@ -184,6 +221,7 @@ function businessJudgmentUnit() {
...
@@ -184,6 +221,7 @@ function businessJudgmentUnit() {
UICtrl
.
setElRequiredFlag
(
'#bktxt'
,
true
);
UICtrl
.
setElRequiredFlag
(
'#bktxt'
,
true
);
UICtrl
.
setElRequiredFlag
(
'#budat'
,
true
);
UICtrl
.
setElRequiredFlag
(
'#budat'
,
true
);
UICtrl
.
setElRequiredFlag
(
'#paymentMethod'
,
true
);
UICtrl
.
setElRequiredFlag
(
'#paymentMethod'
,
true
);
UICtrl
.
setElRequiredFlag
(
'#carNo'
,
true
);
UICtrl
.
disable
(
$
(
"#totalMoney"
))
UICtrl
.
disable
(
$
(
"#totalMoney"
))
return
true
return
true
}
}
...
...
topsun-xt/src/main/webapp/biz/topsun/sap/wasteSale/wasteSaleDetail.jsp
View file @
62f8bba5
...
@@ -27,6 +27,10 @@
...
@@ -27,6 +27,10 @@
<x:hidden
name=
"burks"
/>
<x:hidden
name=
"burks"
/>
<x:inputC
name=
"bktxt"
required=
"false"
label=
"回收商"
labelCol=
"2"
fieldCol=
"2"
/>
<x:inputC
name=
"bktxt"
required=
"false"
label=
"回收商"
labelCol=
"2"
fieldCol=
"2"
/>
<x:inputC
name=
"budat"
required=
"false"
label=
"回收日期"
labelCol=
"2"
fieldCol=
"2"
wrapper=
"date"
/>
<x:inputC
name=
"budat"
required=
"false"
label=
"回收日期"
labelCol=
"2"
fieldCol=
"2"
wrapper=
"date"
/>
<x:inputC
name=
"carNo"
required=
"false"
label=
"车牌号"
labelCol=
"2"
fieldCol=
"2"
/>
</div>
<div
class=
"hg-form-row"
>
<x:textareaC
name=
"remark"
required=
"false"
label=
"备注"
labelCol=
"2"
fieldCol=
"10"
rows=
"2"
/>
</div>
</div>
</div>
</div>
<div
class=
"blank_div clearfix"
></div>
<div
class=
"blank_div clearfix"
></div>
...
...
topsun-xt/src/main/webapp/biz/topsun/sap/wasteSale/wasteSaleList.js
View file @
62f8bba5
...
@@ -23,6 +23,8 @@ function loadGrid() {
...
@@ -23,6 +23,8 @@ function loadGrid() {
{
display
:
"回收日期"
,
name
:
"budat"
,
width
:
200
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
},
{
display
:
"回收日期"
,
name
:
"budat"
,
width
:
200
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
},
{
display
:
"收款方式"
,
name
:
"paymentMethodTextView"
,
width
:
200
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
},
{
display
:
"收款方式"
,
name
:
"paymentMethodTextView"
,
width
:
200
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
},
{
display
:
"合计"
,
name
:
"totalMoney"
,
width
:
200
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
},
{
display
:
"合计"
,
name
:
"totalMoney"
,
width
:
200
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
},
{
display
:
"车牌号"
,
name
:
"carNo"
,
width
:
200
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
},
{
display
:
"备注"
,
name
:
"remark"
,
width
:
300
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
},
{
display
:
"消息类型"
,
name
:
"type"
,
width
:
100
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
},
{
display
:
"消息类型"
,
name
:
"type"
,
width
:
100
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
},
{
display
:
"会计凭证编号"
,
name
:
"messageV1"
,
width
:
200
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
},
{
display
:
"会计凭证编号"
,
name
:
"messageV1"
,
width
:
200
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
},
],
],
...
...
topsun/src/main/java/com/huigou/topsun/sap/wasteSale/domain/WasteSale.java
View file @
62f8bba5
...
@@ -60,6 +60,18 @@ public class WasteSale extends FlowBillAbstractEntity {
...
@@ -60,6 +60,18 @@ public class WasteSale extends FlowBillAbstractEntity {
@Column
(
name
=
"message_v1"
)
@Column
(
name
=
"message_v1"
)
private
String
messageV1
;
private
String
messageV1
;
/**
* 车牌号
*/
@Column
(
name
=
"car_no"
)
private
String
carNo
;
/**
* 备注
*/
@Column
(
name
=
"remark"
)
private
String
remark
;
@Override
@Override
protected
String
getCodeRuleId
()
{
protected
String
getCodeRuleId
()
{
...
...
topsun/src/main/java/com/huigou/topsun/sap/wasteSale/domain/WasteSaleItem.java
View file @
62f8bba5
...
@@ -60,4 +60,39 @@ public class WasteSaleItem extends AbstractEntity {
...
@@ -60,4 +60,39 @@ public class WasteSaleItem extends AbstractEntity {
@Column
(
name
=
"amount"
)
@Column
(
name
=
"amount"
)
private
BigDecimal
amount
;
private
BigDecimal
amount
;
/**
* 车辆皮重
*/
@Column
(
name
=
"car_weight"
)
private
BigDecimal
carWeight
;
/**
* 毛重
*/
@Column
(
name
=
"gross_weight"
)
private
BigDecimal
grossWeight
;
/**
* 扣减重量
*/
@Column
(
name
=
"deduct_weight"
)
private
BigDecimal
deductWeight
;
/**
* 净重
*/
@Column
(
name
=
"net_weight"
)
private
BigDecimal
netWeight
;
/**
* 备注
*/
@Column
(
name
=
"remark"
)
private
String
remark
;
/**
* 出售物品
*/
@Column
(
name
=
"sale_goods"
)
private
String
saleGoods
;
}
}
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