修复自动周转异常提醒漏广州01仓

data-show/show-auto-turnover/src/main/java/com/bailuntec/job/AutoTurnoverJob.java

@@ -556,7 +556,9 @@ public class AutoTurnoverJob extends PointJob {
                 dcAutoForecastFluctuationActual = new DcAutoForecastFluctuation();
                 //实际冗余
                 dcAutoForecastFluctuationActual.setType(3);
-            } else if (outStock > 0) {
+            }
+
+            if (outStock > 0) {
                 dcAutoForecastFluctuationActual = new DcAutoForecastFluctuation();
                 //实际缺货
                 dcAutoForecastFluctuationActual.setType(1);
@@ -586,7 +588,7 @@ public class AutoTurnoverJob extends PointJob {
             DcAutoForecastFluctuationMapper mapper = SessionUtil.getSession().getMapper(DcAutoForecastFluctuationMapper.class);
             //JIT的 可以不做 冗余 和 缺货预测 实际冗余和实际缺货也不用提醒
             //如果仓库是广州01 且 是这三个销售员, 就不提醒
-            if (!warehouseCode.equals(Constant.WAREHOUSE_JIT) && !turnoverSku.getBuyerName().equals(Constant.BUYER_JIT_1) && !turnoverSku.getBuyerName().equals(Constant.BUYER_JIT_2) && !turnoverSku.getBuyerName().equals(Constant.BUYER_JIT_3)) {
+            if (!warehouseCode.equals(Constant.WAREHOUSE_JIT) || !turnoverSku.getBuyerName().equals(Constant.BUYER_JIT_1) && !turnoverSku.getBuyerName().equals(Constant.BUYER_JIT_2) && !turnoverSku.getBuyerName().equals(Constant.BUYER_JIT_3)) {
                 if (dcAutoConfigSkuWarehouse == null || dcAutoConfigSkuWarehouse.getStatus().equals(0)) {
                     if (forecastFluctuationList != null && forecastFluctuationList.size() > 0) {
                         //拿最早的时间  +  最晚的时间, SKU-仓库维度只放一条

data-show/show-auto-turnover/src/test/java/AutoTurnoverTest.java

@@ -51,7 +51,7 @@ public class AutoTurnoverTest {
             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("204912701").andWarehouseCodeEqualTo("GZBLWH").example());
+            dcBaseStock = mapper.selectOneByExample(DcBaseStockExample.newAndCreateCriteria().andBailunSkuEqualTo("213789601").andWarehouseCodeEqualTo("GZBLWH").example());
         } catch (Exception e) {
             e.printStackTrace();
         } finally {