Commit 46551fb0 by wutong

自动周转改为如果非国内仓且是JIT,就取调拨交期

parent 29071166
...@@ -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();
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment