Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
dc-java
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-java
Commits
46551fb0
Commit
46551fb0
authored
Jun 09, 2019
by
wutong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
自动周转改为如果非国内仓且是JIT,就取调拨交期
parent
29071166
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
AutoTurnoverJob.java
...over/src/main/java/com/bailuntec/job/AutoTurnoverJob.java
+3
-3
No files found.
data-show/show-auto-turnover/src/main/java/com/bailuntec/job/AutoTurnoverJob.java
View file @
46551fb0
...
@@ -70,7 +70,7 @@ public class AutoTurnoverJob extends PointJob {
...
@@ -70,7 +70,7 @@ public class AutoTurnoverJob extends PointJob {
dcBaseStockList
=
baseStockMapperFor
.
listStockById
(
page
*
jobPointLog
.
getPageSize
(),
jobPointLog
.
getPageSize
());
dcBaseStockList
=
baseStockMapperFor
.
listStockById
(
page
*
jobPointLog
.
getPageSize
(),
jobPointLog
.
getPageSize
());
}
else
{
}
else
{
switch
(
shardingContext
.
getJobParameter
())
{
switch
(
shardingContext
.
getJobParameter
())
{
case
"国
外
仓"
:
case
"国
内
仓"
:
case
"FBA仓"
:
case
"FBA仓"
:
case
"海外仓"
:
case
"海外仓"
:
case
"第三方仓库"
:
case
"第三方仓库"
:
...
@@ -720,8 +720,8 @@ public class AutoTurnoverJob extends PointJob {
...
@@ -720,8 +720,8 @@ public class AutoTurnoverJob extends PointJob {
Integer
turnoverSupplierDelivery
=
dcAveragePurchase
!=
null
&&
dcAveragePurchase
.
getDeliveryDays
()
>=
0
?
dcAveragePurchase
.
getDeliveryDays
()
:
-
1
;
Integer
turnoverSupplierDelivery
=
dcAveragePurchase
!=
null
&&
dcAveragePurchase
.
getDeliveryDays
()
>=
0
?
dcAveragePurchase
.
getDeliveryDays
()
:
-
1
;
if
(
turnoverSupplierDelivery
==
null
||
turnoverSupplierDelivery
.
equals
(-
1
))
{
if
(
turnoverSupplierDelivery
==
null
||
turnoverSupplierDelivery
.
equals
(-
1
))
{
turnoverSupplierDelivery
=
turnoverSku
.
getSupplierDelivery
();
turnoverSupplierDelivery
=
turnoverSku
.
getSupplierDelivery
();
//如果
是国内仓,就还取原来那个字段,否则就要取新字段(调拨交期)
//如果
非国内仓且是JIT,就取调拨交期
if
(
dcBaseWarehouse
!=
null
&&
!
dcBaseWarehouse
.
getHqType
().
equals
(
CommonConstant
.
DOMESTIC_WAREHOUSE
))
{
if
(
dcBaseWarehouse
!=
null
&&
!
dcBaseWarehouse
.
getHqType
().
equals
(
CommonConstant
.
DOMESTIC_WAREHOUSE
)
&&
(
Constant
.
BUYER_JIT_1
.
equals
(
turnoverSku
.
getBuyerName
())
||
Constant
.
BUYER_JIT_1
.
equals
(
turnoverSku
.
getBuyerName
()))
)
{
turnoverSupplierDelivery
=
turnoverSku
.
getTransferDelivery
();
turnoverSupplierDelivery
=
turnoverSku
.
getTransferDelivery
();
}
}
}
}
...
...
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