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
23624e9a
Commit
23624e9a
authored
Jun 19, 2019
by
wutong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
自动周转判断条件修改, 根据张莹霞和张莹霞1区分是否JIT
parent
63266ce3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
5 deletions
+2
-5
AutoTurnoverJob.java
...over/src/main/java/com/bailuntec/job/AutoTurnoverJob.java
+1
-1
AutoTurnoverTest.java
...ow/show-auto-turnover/src/test/java/AutoTurnoverTest.java
+1
-4
No files found.
data-show/show-auto-turnover/src/main/java/com/bailuntec/job/AutoTurnoverJob.java
View file @
23624e9a
...
...
@@ -721,7 +721,7 @@ public class AutoTurnoverJob extends PointJob {
if
(
turnoverSupplierDelivery
==
null
||
turnoverSupplierDelivery
.
equals
(-
1
))
{
turnoverSupplierDelivery
=
turnoverSku
.
getSupplierDelivery
();
//如果非国内仓且是JIT,就取调拨交期
if
(
dcBaseWarehouse
!=
null
&&
!
dcBaseWarehouse
.
getHqType
().
equals
(
CommonConstant
.
DOMESTIC_WAREHOUSE
)
&&
(
Constant
.
BUYER_JIT_1
.
equals
(
turnoverSku
.
getBuyerName
())
||
Constant
.
BUYER_JIT_
1
.
equals
(
turnoverSku
.
getBuyerName
())))
{
if
(
dcBaseWarehouse
!=
null
&&
!
dcBaseWarehouse
.
getHqType
().
equals
(
CommonConstant
.
DOMESTIC_WAREHOUSE
)
&&
(
Constant
.
BUYER_JIT_1
.
equals
(
turnoverSku
.
getBuyerName
())
||
Constant
.
BUYER_JIT_
2
.
equals
(
turnoverSku
.
getBuyerName
())))
{
turnoverSupplierDelivery
=
turnoverSku
.
getTransferDelivery
();
}
}
...
...
data-show/show-auto-turnover/src/test/java/AutoTurnoverTest.java
View file @
23624e9a
...
...
@@ -49,10 +49,7 @@ public class AutoTurnoverTest {
DcBaseStock
dcBaseStock
=
null
;
try
{
DcBaseStockMapper
mapper
=
SessionUtil
.
getSession
().
getMapper
(
DcBaseStockMapper
.
class
);
// dcBaseStock = mapper.selectOneByExample(DcBaseStockExample.newAndCreateCriteria().andBailunSkuEqualTo("322572421").andWarehouseCodeEqualTo("QYBLZZ").example());
// dcBaseStock = mapper.selectOneByExample(DcBaseStockExample.newAndCreateCriteria().andBailunSkuEqualTo("232232601").andWarehouseCodeEqualTo("CHUKFBA").example());
// dcBaseStock = mapper.selectOneByExample(DcBaseStockExample.newAndCreateCriteria().andBailunSkuEqualTo("213789601").andWarehouseCodeEqualTo("GZBLWH").example());
dcBaseStock
=
mapper
.
selectOneByExample
(
DcBaseStockExample
.
newAndCreateCriteria
().
andBailunSkuEqualTo
(
"227290301"
).
andWarehouseCodeEqualTo
(
"AUFBACM"
).
example
());
dcBaseStock
=
mapper
.
selectOneByExample
(
DcBaseStockExample
.
newAndCreateCriteria
().
andBailunSkuEqualTo
(
"228443101"
).
andWarehouseCodeEqualTo
(
"USGCBL"
).
example
());
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
}
finally
{
...
...
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