|
@@ -14,6 +14,7 @@ import com.fjhx.stock.service.StockBackPlanService;
|
|
|
import com.fjhx.utils.BigDecimalUtil;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
+import org.springframework.transaction.annotation.Transactional;
|
|
|
import org.springframework.web.client.RestTemplate;
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
@@ -100,12 +101,13 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
|
|
|
saveBatch(new ArrayList<>(flagMap.values()));
|
|
|
}
|
|
|
|
|
|
+ @Transactional(rollbackFor = Exception.class)
|
|
|
@Override
|
|
|
- public void statisticsScheduleDateTask() {
|
|
|
+ public synchronized void statisticsScheduleDateTask() {
|
|
|
|
|
|
// 统计近3天排班
|
|
|
Date endDate = new Date();
|
|
|
- Date beginDate = DateUtil.beginOfDay(DateUtil.offsetDay(endDate, -3));
|
|
|
+ Date beginDate = DateUtil.beginOfDay(DateUtil.offsetDay(endDate, -2));
|
|
|
|
|
|
List<StockBackPlan> list = list(Wrappers.<StockBackPlan>lambdaQuery()
|
|
|
.between(StockBackPlan::getPlanTime, beginDate, endDate));
|
|
@@ -157,6 +159,17 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
|
|
|
stockBackPlanDetails.setBackNum(0);
|
|
|
stockBackPlanDetails.setBackMeters(BigDecimal.ZERO);
|
|
|
stockBackPlanDetails.setBackArea(BigDecimal.ZERO);
|
|
|
+
|
|
|
+ stockBackPlanDetails.setTransferOutMoney(BigDecimal.ZERO);
|
|
|
+ stockBackPlanDetails.setTransferOutMeters(BigDecimal.ZERO);
|
|
|
+ stockBackPlanDetails.setTransferOutArea(BigDecimal.ZERO);
|
|
|
+ stockBackPlanDetails.setTransferOutNum(0);
|
|
|
+
|
|
|
+ stockBackPlanDetails.setTransferInMoney(BigDecimal.ZERO);
|
|
|
+ stockBackPlanDetails.setTransferInMeters(BigDecimal.ZERO);
|
|
|
+ stockBackPlanDetails.setTransferInArea(BigDecimal.ZERO);
|
|
|
+ stockBackPlanDetails.setTransferInNum(0);
|
|
|
+
|
|
|
return stockBackPlanDetails;
|
|
|
}
|
|
|
|
|
@@ -388,16 +401,16 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
|
|
|
|
|
|
// 金额
|
|
|
stockBackPlanDetails.setTransferInMoney(
|
|
|
- BigDecimalUtil.init(stockBackPlanDetails.getPickingMoney()).add(price.multiply(changeNum)).getValue(2));
|
|
|
+ BigDecimalUtil.init(stockBackPlanDetails.getTransferInMoney()).add(price.multiply(changeNum)).getValue(2));
|
|
|
|
|
|
// 数量
|
|
|
- stockBackPlanDetails.setTransferInNum(stockBackPlanDetails.getPickingNum() + 1);
|
|
|
+ stockBackPlanDetails.setTransferInNum(stockBackPlanDetails.getTransferInNum() + 1);
|
|
|
|
|
|
// 米
|
|
|
- stockBackPlanDetails.setTransferInMeters(stockBackPlanDetails.getPickingMeters().add(changeNum));
|
|
|
+ stockBackPlanDetails.setTransferInMeters(stockBackPlanDetails.getTransferInMeters().add(changeNum));
|
|
|
|
|
|
// 面积
|
|
|
- stockBackPlanDetails.setTransferInArea(stockBackPlanDetails.getPickingArea().add(
|
|
|
+ stockBackPlanDetails.setTransferInArea(stockBackPlanDetails.getTransferInArea().add(
|
|
|
BigDecimalUtil.init(changeNum).multiply(width).divide(100, 2).getValue()));
|
|
|
}
|
|
|
|
|
@@ -447,16 +460,16 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
|
|
|
|
|
|
// 金额
|
|
|
stockBackPlanDetails.setTransferOutMoney(
|
|
|
- BigDecimalUtil.init(stockBackPlanDetails.getBackMoney()).add(price.multiply(changeNum)).getValue(2));
|
|
|
+ BigDecimalUtil.init(stockBackPlanDetails.getTransferOutMoney()).add(price.multiply(changeNum)).getValue(2));
|
|
|
|
|
|
// 数量
|
|
|
- stockBackPlanDetails.setTransferOutNum(stockBackPlanDetails.getBackNum() + 1);
|
|
|
+ stockBackPlanDetails.setTransferOutNum(stockBackPlanDetails.getTransferOutNum() + 1);
|
|
|
|
|
|
// 米
|
|
|
- stockBackPlanDetails.setTransferOutMeters(stockBackPlanDetails.getBackMeters().add(changeNum));
|
|
|
+ stockBackPlanDetails.setTransferOutMeters(stockBackPlanDetails.getTransferOutMeters().add(changeNum));
|
|
|
|
|
|
// 面积
|
|
|
- stockBackPlanDetails.setTransferOutArea(stockBackPlanDetails.getBackArea().add(
|
|
|
+ stockBackPlanDetails.setTransferOutArea(stockBackPlanDetails.getTransferOutArea().add(
|
|
|
BigDecimalUtil.init(changeNum).multiply(width).divide(100, 2).getValue()));
|
|
|
}
|
|
|
}
|