Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
dc-cost-system
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
bltdc
dc-cost-system
Commits
2478960a
Commit
2478960a
authored
Nov 12, 2020
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
be3599ce
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
5 deletions
+7
-5
CostTemplate.java
...in/java/com/blt/other/module/cost/model/CostTemplate.java
+1
-1
FinalCheckState.java
...r/module/cost/service/impl/costcheck/FinalCheckState.java
+2
-1
CostPlanNewLend2ServiceImpl.java
...st/service/impl/costplan/CostPlanNewLend2ServiceImpl.java
+2
-1
CostPlanNewPayServiceImpl.java
...cost/service/impl/costplan/CostPlanNewPayServiceImpl.java
+2
-2
No files found.
bailuntec-cost-core/src/main/java/com/blt/other/module/cost/model/CostTemplate.java
View file @
2478960a
...
@@ -92,7 +92,7 @@ public class CostTemplate implements Serializable {
...
@@ -92,7 +92,7 @@ public class CostTemplate implements Serializable {
}
}
public
boolean
shouldFinalCheck
(
BigDecimal
amount
)
{
public
boolean
shouldFinalCheck
(
BigDecimal
amount
)
{
return
amount
.
compareTo
(
finalMinimumReviewAmount
)
>
0
;
return
amount
.
compareTo
(
finalMinimumReviewAmount
)
>
=
0
;
}
}
}
}
bailuntec-cost-core/src/main/java/com/blt/other/module/cost/service/impl/costcheck/FinalCheckState.java
View file @
2478960a
...
@@ -61,7 +61,8 @@ public class FinalCheckState extends CostState {
...
@@ -61,7 +61,8 @@ public class FinalCheckState extends CostState {
if
(!
costTemplate
.
shouldFinalCheck
(
costDomain
.
getAmount
()))
{
if
(!
costTemplate
.
shouldFinalCheck
(
costDomain
.
getAmount
()))
{
costDomain
.
setCostStatus
(
CostDomain
.
STATUS_UN_PAY
);
costDomain
.
setCostStatus
(
CostDomain
.
STATUS_UN_PAY
);
costDao
.
updateById
(
costDomain
);
costDao
.
updateById
(
costDomain
);
costLogService
.
saveByManage
(
costDomain
.
getCostNo
(),
"金额不够最终审核标准,无需最终审核"
,
null
);
costLogService
.
saveByManage
(
costDomain
.
getCostNo
(),
"最终审核自动通过"
,
CostLogDomain
.
FINAL_AUTO_PASS
);
//通知财务系统
//通知财务系统
costContext
.
costService
.
toFinancial
(
costDomain
);
costContext
.
costService
.
toFinancial
(
costDomain
);
...
...
bailuntec-cost-core/src/main/java/com/blt/other/module/cost/service/impl/costplan/CostPlanNewLend2ServiceImpl.java
View file @
2478960a
...
@@ -97,7 +97,7 @@ public class CostPlanNewLend2ServiceImpl extends AbstractCostPlanService impleme
...
@@ -97,7 +97,7 @@ public class CostPlanNewLend2ServiceImpl extends AbstractCostPlanService impleme
return
;
return
;
}
}
// 2.1、冲销刚好抵消差额 / 冲销小于差额 ===== 生成一张无需
付款
的借还单
// 2.1、冲销刚好抵消差额 / 冲销小于差额 ===== 生成一张无需
推送财务系统
的借还单
if
(
counteract
.
compareTo
(
subtract
)
<=
0
)
{
if
(
counteract
.
compareTo
(
subtract
)
<=
0
)
{
CostDomain
costDomain
=
planToCost
(
costPlanDomain
.
getCostPlanNo
());
CostDomain
costDomain
=
planToCost
(
costPlanDomain
.
getCostPlanNo
());
costDomain
.
setCostNo
(
getCostNo
());
costDomain
.
setCostNo
(
getCostNo
());
...
@@ -156,6 +156,7 @@ public class CostPlanNewLend2ServiceImpl extends AbstractCostPlanService impleme
...
@@ -156,6 +156,7 @@ public class CostPlanNewLend2ServiceImpl extends AbstractCostPlanService impleme
*/
*/
CostPlanDomain
payPlan
=
new
CostPlanDomain
();
CostPlanDomain
payPlan
=
new
CostPlanDomain
();
BeanUtils
.
copyProperties
(
costPlanDomain
,
payPlan
);
BeanUtils
.
copyProperties
(
costPlanDomain
,
payPlan
);
//付款金额 (关联借支单币种)
//付款金额 (关联借支单币种)
BigDecimal
compensate
=
costPlanDomain
.
getCounteract
().
subtract
(
subtract
);
BigDecimal
compensate
=
costPlanDomain
.
getCounteract
().
subtract
(
subtract
);
payPlan
.
setCostPlanNo
(
"S"
+
createNo
());
payPlan
.
setCostPlanNo
(
"S"
+
createNo
());
...
...
bailuntec-cost-core/src/main/java/com/blt/other/module/cost/service/impl/costplan/CostPlanNewPayServiceImpl.java
View file @
2478960a
...
@@ -134,8 +134,8 @@ public class CostPlanNewPayServiceImpl extends AbstractCostPlanService implement
...
@@ -134,8 +134,8 @@ public class CostPlanNewPayServiceImpl extends AbstractCostPlanService implement
// 执行添加记录流程
// 执行添加记录流程
costDomain
.
setCostPlanNo
(
costPlanNo
);
costDomain
.
setCostPlanNo
(
costPlanNo
);
Integer
insert
=
costDao
.
insert
(
costDomain
);
int
insert
=
costDao
.
insert
(
costDomain
);
if
(
null
!=
insert
&&
insert
>=
1
)
{
if
(
insert
>=
1
)
{
// 记录日志
// 记录日志
costLogService
.
save
(
costDomain
.
getCostNo
(),
costDomain
.
getCreateUserid
(),
"由费用计划:"
+
costDomain
.
getCostPlanNo
()
+
" 生成付款单"
);
costLogService
.
save
(
costDomain
.
getCostNo
(),
costDomain
.
getCreateUserid
(),
"由费用计划:"
+
costDomain
.
getCostPlanNo
()
+
" 生成付款单"
);
...
...
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