Commit e89f77e7 by huluobin

# 周转

# 费用系统jenkins
# 数据中心 pom
parent db2d1e24
......@@ -16,7 +16,6 @@
<module>base-sync-oms-order</module>
<module>base-sync-transfer</module>
<module>base-sync-purchase</module>
<!-- <module>base-sync-purchase-details</module>-->
<module>base-sync-warehouse</module>
<module>base-sync-stock-wms</module>
<module>base-sync-sku</module>
......@@ -27,7 +26,13 @@
<module>base-sync-finance-wish</module>
<module>base-sync-semi-order</module>
<module>base-sync-shopify</module>
<module>base-sync-finance-fee</module>
<!--deprecate-->
<!-- <module>base-sync-purchase-details</module>-->
<!-- <module>base-sync-finance-fee</module>-->
<!-- <module>base-sync-amazon-ad</module>-->
<!-- <module>base-sync-cashier</module>-->
<!-- <module>base-sync-company</module>-->
</modules>
<packaging>pom</packaging>
......
......@@ -9,14 +9,16 @@
<packaging>pom</packaging>
<version>1.0-SNAPSHOT</version>
<modules>
<!-- <module>mid-calculate-transit</module>-->
<module>mid-fba-fee-avg</module>
<module>mid-calculate-sales</module>
<module>mid-daily-stock</module>
<module>mid-auto-turnover-prepare</module>
<module>mid-calculate-cost-first</module>
<module>mid-duration-stock</module>
<module>mid-calculate-item</module>
<module>mid-ebay-uk-report</module>
<!--deprecate-->
<!-- <module>mid-duration-stock</module>-->
<!-- <module>mid-auto-turnover-prepare</module>-->
<!-- <module>mid-calculate-transit</module>-->
</modules>
<parent>
......
......@@ -2191,11 +2191,11 @@ public class AutoTurnoverJob extends PointJob {
.add(totalSales)//累计销量
.subtract(BigDecimal.valueOf(totalInbound.doubleValue()))//累计到货
.subtract(outStock > 0 ? BigDecimal.ZERO : BigDecimal.valueOf(realInventory.longValue())) //真实库存,如果缺货就不减
.add(forecastSalesList.get(j));//预计销量
.add(forecastSalesList.get(Math.max(j - 1, 0)));//预计销量
}
//采购建议数如果大于1的时候就向上取整。如果小于1就四舍五入
if (totalAdvised.compareTo(BigDecimal.ONE) == 1) {
if (totalAdvised.compareTo(BigDecimal.ONE) > 0) {
totalAdvised = totalAdvised.setScale(0, RoundingMode.CEILING);
} else {
totalAdvised = totalAdvised.setScale(0, RoundingMode.HALF_EVEN);
......
......@@ -268,7 +268,7 @@ public class AutoTurnoverTest {
public void testXX2() {
DcBaseStock dcBaseStock = SessionUtil.getSession().getMapper(DcBaseStockMapper.class)
.selectOneByExample(DcBaseStockExample.newAndCreateCriteria()
.andBailunSkuEqualTo("949282602")
.andBailunSkuEqualTo("946861301")
.andWarehouseCodeEqualTo("GZBLWH")
.example());
......
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