Commit 0866cbf8 by huluobin

# update

parent 44abdb99
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
<configuration> <configuration>
<!--<properties resource="db-tj.properties"/>--> <!--<properties resource="db-tj.properties"/>-->
<!-- <properties resource="db-dev.properties"/>--> <properties resource="db-dev.properties"/>
<properties resource="db-prod.properties"/> <!-- <properties resource="db-prod.properties"/>-->
<settings> <settings>
<setting name="mapUnderscoreToCamelCase" value="true"/> <setting name="mapUnderscoreToCamelCase" value="true"/>
</settings> </settings>
......
...@@ -966,7 +966,7 @@ public class AutoTurnoverJob extends PointJob { ...@@ -966,7 +966,7 @@ public class AutoTurnoverJob extends PointJob {
//冗余或缺货天数索引 //冗余或缺货天数索引
int index = -1; int index = -1;
// if (forecastShortSupplyList.get(turnoverDays).compareTo(BigDecimal.ZERO) > 0) {
for (int i = 0; i <= turnoverDays; i++) { for (int i = 0; i <= turnoverDays; i++) {
if (forecastShortSupplyList.get(i).compareTo(BigDecimal.ZERO) > 0) { if (forecastShortSupplyList.get(i).compareTo(BigDecimal.ZERO) > 0) {
days++; days++;
...@@ -983,7 +983,7 @@ public class AutoTurnoverJob extends PointJob { ...@@ -983,7 +983,7 @@ public class AutoTurnoverJob extends PointJob {
break; break;
} }
} }
// }
//status` '监控状态, 默认0监控, 停止监控1', //status` '监控状态, 默认0监控, 停止监控1',
try { try {
...@@ -1737,6 +1737,7 @@ public class AutoTurnoverJob extends PointJob { ...@@ -1737,6 +1737,7 @@ public class AutoTurnoverJob extends PointJob {
.subtract(BigDecimal.valueOf(totalInbound.doubleValue()))//累计到货 .subtract(BigDecimal.valueOf(totalInbound.doubleValue()))//累计到货
.subtract(outStock > 0 ? BigDecimal.ZERO : BigDecimal.valueOf(realInventory.longValue())) //真实库存, 如果缺货就不减,不缺就减去 .subtract(outStock > 0 ? BigDecimal.ZERO : BigDecimal.valueOf(realInventory.longValue())) //真实库存, 如果缺货就不减,不缺就减去
.add(forecastSalesList.get(j));//预计销量 .add(forecastSalesList.get(j));//预计销量
//采购建议数如果大于1的时候就向上取整。如果小于1就四舍五入 //采购建议数如果大于1的时候就向上取整。如果小于1就四舍五入
if (totalAdvised.compareTo(BigDecimal.ONE) > 0) { if (totalAdvised.compareTo(BigDecimal.ONE) > 0) {
totalAdvised = totalAdvised.setScale(0, RoundingMode.CEILING); totalAdvised = totalAdvised.setScale(0, RoundingMode.CEILING);
......
...@@ -262,7 +262,7 @@ public class AutoTurnoverTest { ...@@ -262,7 +262,7 @@ public class AutoTurnoverTest {
public void testXX2() { public void testXX2() {
DcBaseStock dcBaseStock = SessionUtil.getSession().getMapper(DcBaseStockMapper.class) DcBaseStock dcBaseStock = SessionUtil.getSession().getMapper(DcBaseStockMapper.class)
.selectOneByExample(DcBaseStockExample.newAndCreateCriteria() .selectOneByExample(DcBaseStockExample.newAndCreateCriteria()
.andBailunSkuEqualTo("950875101") .andBailunSkuEqualTo("949776301")
.andWarehouseCodeEqualTo("GZBLWH") .andWarehouseCodeEqualTo("GZBLWH")
.example()); .example());
try { try {
......
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