Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
hg-smart
Overview
Overview
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
platform
hg-smart
Commits
1427b410
Commit
1427b410
authored
May 31, 2024
by
liuyang
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
http://git.pseer.com:8800/platform/hg-smart
into dev-ly
parents
ee227f8b
bea43b91
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
23 additions
and
18 deletions
+23
-18
ServiceHGCW016.java
.../java/com/baosight/hggp/hg/cw/service/ServiceHGCW016.java
+2
-2
HGCW012.xml
src/main/java/com/baosight/hggp/hg/cw/sql/HGCW012.xml
+10
-1
HGCW014.xml
src/main/java/com/baosight/hggp/hg/cw/sql/HGCW014.xml
+1
-1
HGCW016.xml
src/main/java/com/baosight/hggp/hg/cw/sql/HGCW016.xml
+2
-2
HGCWTools.java
src/main/java/com/baosight/hggp/hg/cw/tools/HGCWTools.java
+1
-1
HGCW016A.jsp
src/main/webapp/HG/CW/HGCW016A.jsp
+5
-7
HGCW016B.jsp
src/main/webapp/HG/CW/HGCW016B.jsp
+1
-2
HGCW016C.jsp
src/main/webapp/HG/CW/HGCW016C.jsp
+1
-2
No files found.
src/main/java/com/baosight/hggp/hg/cw/service/ServiceHGCW016.java
View file @
1427b410
...
...
@@ -202,8 +202,8 @@ public class ServiceHGCW016 extends ServiceBase {
for
(
HGCW017
hgcw017
:
hgcw017List
)
{
hgcw017
.
setMainId
(
HGCW016
.
getId
());
// 反写金额
HGCWTools
.
HgCw01
0
.
cutAmount
(
hgcw017
.
getContractNumber
(),
rowMap
.
get
(
hgcw017
.
getContractNumber
()));
DaoUtils
.
insert
(
HGCW01
5
.
INSERT
,
hgcw017
);
HGCWTools
.
HgCw01
2
.
cutAmount
(
hgcw017
.
getContractNumber
(),
rowMap
.
get
(
hgcw017
.
getContractNumber
()));
DaoUtils
.
insert
(
HGCW01
7
.
INSERT
,
hgcw017
);
}
}
else
{
HGCW016
HGCW016
=
HGCWTools
.
HgCw016
.
getId
(
mainId
);
...
...
src/main/java/com/baosight/hggp/hg/cw/sql/HGCW012.xml
View file @
1427b410
...
...
@@ -279,5 +279,14 @@
WHERE
ID = #id#
</update>
<update
id=
"updateDeductionAmount"
>
UPDATE ${hggpSchema}.HGCW012
SET
REMAINING_AMOUNT = #remainingAmount#,
<!-- 审核状态 -->
UPDATED_BY = #updatedBy#,
<!-- 记录修改者 -->
UPDATED_NAME = #updatedName#,
<!-- 记录修改名称 -->
UPDATED_TIME = #updatedTime#
<!-- 记录修改时间 -->
WHERE
ID = #id#
</update>
</sqlMap>
src/main/java/com/baosight/hggp/hg/cw/sql/HGCW014.xml
View file @
1427b410
...
...
@@ -63,7 +63,7 @@
SIGNING_DATE
<
= REPLACE(#signingDateTo#, '-', '')
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"partyA"
>
PARTY_A
=
like ('%$partyA$%')
PARTY_A like ('%$partyA$%')
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"cancelStatus"
>
CANCEL_STATUS = #cancelStatus#
...
...
src/main/java/com/baosight/hggp/hg/cw/sql/HGCW016.xml
View file @
1427b410
...
...
@@ -52,7 +52,7 @@
SIGNING_DATE
<
= REPLACE(#signingDateTo#, '-', '')
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"partyA"
>
PARTY_A
=
like ('%$partyA$%')
PARTY_A like ('%$partyA$%')
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"cancelStatus"
>
CANCEL_STATUS = #cancelStatus#
...
...
@@ -225,7 +225,7 @@
TOTAL_CONTRACT_PRICE_INCLUDING = #totalContractPriceIncluding#,
<!-- 付款总额 -->
UPDATED_BY = #updatedBy#,
<!-- 记录修改者 -->
UPDATED_NAME = #updatedName#,
<!-- 记录修改名称 -->
UPDATED_TIME = #updatedTime#
,
<!-- 记录修改时间 -->
UPDATED_TIME = #updatedTime#
<!-- 记录修改时间 -->
WHERE
ID = #id#
</update>
...
...
src/main/java/com/baosight/hggp/hg/cw/tools/HGCWTools.java
View file @
1427b410
...
...
@@ -373,7 +373,7 @@ public class HGCWTools {
throw
new
PlatException
(
"扣款金额不能大于采购收票剩余金额!"
);
}
HGCW012
.
setRemainingAmount
(
remainingAmount
);
DaoUtils
.
update
(
"HGCW01
0
.updateDeductionAmount"
,
HGCW012
);
DaoUtils
.
update
(
"HGCW01
2
.updateDeductionAmount"
,
HGCW012
);
}
}
...
...
src/main/webapp/HG/CW/HGCW016A.jsp
View file @
1427b410
...
...
@@ -13,7 +13,7 @@
<EF:EFInput
cname=
"隐藏条件"
ename=
"partyA"
blockId=
"inqu_status"
row=
"0"
type=
"hidden"
/>
<EF:EFInput
cname=
"隐藏条件"
ename=
"mainId"
blockId=
"inqu_status"
row=
"0"
type=
"hidden"
/>
<EF:EFDateSpan
startCname=
"
开票
日期(从)"
endCname=
"至"
blockId=
"inqu_status"
<EF:EFDateSpan
startCname=
"
付款
日期(从)"
endCname=
"至"
blockId=
"inqu_status"
startName=
"signingDateFrom"
endName=
"signingDateTo"
row=
"0"
role=
"date"
format=
"yyyy-MM-dd"
ratio=
"3:3"
satrtRatio=
"4:8"
endRatio=
"4:8"
readonly=
"true"
>
</EF:EFDateSpan>
...
...
@@ -29,22 +29,20 @@
<EF:EFRegion
id=
"result"
title=
"记录集"
>
<EF:EFGrid
blockId=
"result"
autoDraw=
"no"
isFloat=
"true"
autoBind=
"false"
checkMode=
"row"
>
<EF:EFColumn
ename=
"id"
cname=
"主键"
hidden=
"true"
/>
<EF:EFColumn
ename=
"thisAmount"
cname=
"本次
收
款金额"
width=
"120"
align=
"center"
/>
<EF:EFColumn
ename=
"remainingAmount"
cname=
"剩余
开票
金额"
width=
"120"
enable=
"false"
readonly=
"true"
align=
"center"
/>
<EF:EFColumn
ename=
"thisAmount"
cname=
"本次
付
款金额"
width=
"120"
align=
"center"
/>
<EF:EFColumn
ename=
"remainingAmount"
cname=
"剩余
付款
金额"
width=
"120"
enable=
"false"
readonly=
"true"
align=
"center"
/>
<EF:EFColumn
ename=
"partyA"
cname=
"客户名称"
width=
"120"
enable=
"false"
readonly=
"true"
align=
"center"
/>
<EF:EFColumn
ename=
"projCode"
cname=
"项目编码"
hidden=
"true"
/>
<EF:EFColumn
ename=
"projName"
cname=
"项目名称"
width=
"120"
enable=
"false"
readonly=
"true"
align=
"center"
/>
<EF:EFColumn
ename=
"settlementNumber"
cname=
"来源单号"
width=
"120"
enable=
"false"
readonly=
"true"
align=
"center"
/>
<EF:EFComboColumn
ename=
"billTybe"
cname=
"票据类型"
width=
"100"
align=
"center"
columnTemplate=
"#=textField#"
itemTemplate=
"#=textField#"
enable=
"false"
>
<EF:EFCodeOption
codeName=
"hggp.cw.billTybe"
/>
</EF:EFComboColumn>
<EF:EFColumn
ename=
"signingDate"
cname=
"
开票
日期"
width=
"120"
enable=
"false"
readonly=
"true"
align=
"center"
/>
<EF:EFColumn
ename=
"signingDate"
cname=
"
付款
日期"
width=
"120"
enable=
"false"
readonly=
"true"
align=
"center"
/>
<EF:EFColumn
ename=
"billNumber"
cname=
"发票号"
width=
"120"
enable=
"false"
readonly=
"true"
align=
"center"
/>
<EF:EFColumn
ename=
"taxPoints"
cname=
"税率(%)"
width=
"120"
enable=
"false"
readonly=
"true"
align=
"center"
/>
<EF:EFColumn
ename=
"thisSettlementAmount"
cname=
"不含税金额"
width=
"120"
enable=
"false"
readonly=
"true"
align=
"center"
/>
<EF:EFColumn
ename=
"thisSettlementTax"
cname=
"税额"
width=
"120"
enable=
"false"
readonly=
"true"
align=
"center"
/>
<EF:EFColumn
ename=
"totalContractPriceIncluding"
cname=
"
开票
总额"
width=
"120"
enable=
"false"
readonly=
"true"
align=
"center"
/>
<EF:EFColumn
ename=
"totalContractPriceIncluding"
cname=
"
付款
总额"
width=
"120"
enable=
"false"
readonly=
"true"
align=
"center"
/>
</EF:EFGrid>
</EF:EFRegion>
...
...
src/main/webapp/HG/CW/HGCW016B.jsp
View file @
1427b410
...
...
@@ -11,10 +11,9 @@
<EF:EFRegion
id=
"result"
title=
"记录集"
>
<EF:EFGrid
blockId=
"result"
autoDraw=
"no"
isFloat=
"true"
autoBind=
"false"
checkMode=
"row"
>
<EF:EFColumn
ename=
"id"
cname=
"主键"
hidden=
"true"
/>
<EF:EFColumn
ename=
"projName"
cname=
"项目名称"
width=
"120"
enable=
"false"
readonly=
"true"
align=
"center"
/>
<EF:EFColumn
ename=
"partyA"
cname=
"客户名称"
width=
"120"
enable=
"false"
readonly=
"true"
align=
"center"
/>
<EF:EFColumn
ename=
"contractNumber"
cname=
"来源单号"
width=
"120"
enable=
"false"
readonly=
"true"
align=
"center"
/>
<EF:EFColumn
ename=
"totalContractPriceIncluding"
cname=
"
收
款总额"
width=
"120"
format=
"{0:N3}"
align=
"center"
/>
<EF:EFColumn
ename=
"totalContractPriceIncluding"
cname=
"
付
款总额"
width=
"120"
format=
"{0:N3}"
align=
"center"
/>
</EF:EFGrid>
</EF:EFRegion>
</EF:EFPage>
...
...
src/main/webapp/HG/CW/HGCW016C.jsp
View file @
1427b410
...
...
@@ -11,10 +11,9 @@
<EF:EFRegion
id=
"result"
title=
"记录集"
>
<EF:EFGrid
blockId=
"result"
autoDraw=
"no"
isFloat=
"true"
autoBind=
"false"
checkMode=
"row"
>
<EF:EFColumn
ename=
"id"
cname=
"主键"
hidden=
"true"
/>
<EF:EFColumn
ename=
"projName"
cname=
"项目名称"
width=
"120"
enable=
"false"
readonly=
"true"
align=
"center"
/>
<EF:EFColumn
ename=
"partyA"
cname=
"客户名称"
width=
"120"
enable=
"false"
readonly=
"true"
align=
"center"
/>
<EF:EFColumn
ename=
"contractNumber"
cname=
"来源单号"
width=
"120"
enable=
"false"
readonly=
"true"
align=
"center"
/>
<EF:EFColumn
ename=
"totalContractPriceIncluding"
cname=
"
收
款总额"
width=
"120"
format=
"{0:N3}"
align=
"center"
enable=
"false"
readonly=
"true"
/>
<EF:EFColumn
ename=
"totalContractPriceIncluding"
cname=
"
付
款总额"
width=
"120"
format=
"{0:N3}"
align=
"center"
enable=
"false"
readonly=
"true"
/>
</EF:EFGrid>
</EF:EFRegion>
</EF:EFPage>
...
...
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