Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
cloud-fb
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
王衍超
cloud-fb
Commits
ae0c3aca
Commit
ae0c3aca
authored
Jun 23, 2021
by
wukaiqiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
杨清松修改临时销售计划内容判断
parent
a526b969
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 additions
and
1 deletions
+1
-1
SalesPlanServiceImpl.java
...st/dinas/sales/internal/service/SalesPlanServiceImpl.java
+1
-1
No files found.
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/internal/service/SalesPlanServiceImpl.java
View file @
ae0c3aca
...
...
@@ -465,7 +465,7 @@ public class SalesPlanServiceImpl implements SalesPlanService{
}
//可分配量 <=合同可用余量+实际销售量 - 临时销售计划分配量之和 - 日常销售计划分配量
BigDecimal
distributedVolum
=
contractAvailableAmount
.
add
(
actualSaleTotalAmount
).
subtract
(
totalTempSalesPlanAmount
).
subtract
(
totalSalesPlanAmount
);
if
(
salesPlanAmount
.
compareTo
(
BigDecimal
.
ZERO
)
!=
0
&&
(
salesPlanAmount
.
compareTo
(
distributedVolum
)
>
-
1
||
salesPlanAmount
.
compareTo
(
contractAvailableAmount
)
>
-
1
))
{
//大于等
于
if
(
salesPlanAmount
.
compareTo
(
BigDecimal
.
ZERO
)
!=
0
&&
(
salesPlanAmount
.
compareTo
(
distributedVolum
)
==
1
||
salesPlanAmount
.
compareTo
(
contractAvailableAmount
)
==
1
))
{
//大
于
Map
<
String
,
Object
>
map
=
new
HashMap
<>();
map
.
put
(
"dinasTypeName"
,
salesPlanTempDetail
.
getString
(
"dinasTypeName"
));
map
.
put
(
"distributedVolum"
,
distributedVolum
);
...
...
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