|
|
@@ -1,6 +1,5 @@
|
|
|
package com.fjhx.form.service.impl;
|
|
|
|
|
|
-import com.fjhx.account.service.account.AccountRunningWaterService;
|
|
|
import com.fjhx.common.entity.claim.dto.ClaimSelectDto;
|
|
|
import com.fjhx.flow.entity.flow.dto.FlowExampleSelectDto;
|
|
|
import com.fjhx.flow.service.flow.FlowExampleService;
|
|
|
@@ -8,6 +7,8 @@ import com.fjhx.form.mapper.StatisticsMapper;
|
|
|
import com.fjhx.form.service.StatisticsService;
|
|
|
import com.fjhx.mes.entity.production.dto.ProduceOrderSelectDto;
|
|
|
import com.fjhx.mes.service.production.ProduceOrderService;
|
|
|
+import com.fjhx.purchase.entity.subscribe.dto.SubscribeDetailSelectDto;
|
|
|
+import com.fjhx.purchase.service.subscribe.SubscribeDetailService;
|
|
|
import com.fjhx.sale.entity.contract.vo.ContractVo;
|
|
|
import com.fjhx.sale.entity.purchase.vo.EhsdPurchaseVo;
|
|
|
import com.fjhx.sale.entity.sale.dto.SaleQuotationSelectDto;
|
|
|
@@ -22,6 +23,7 @@ import com.ruoyi.common.utils.wrapper.IWrapper;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
+import javax.annotation.Resource;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
@@ -31,8 +33,6 @@ public class StatisticsServiceImpl implements StatisticsService {
|
|
|
@Autowired
|
|
|
private FlowExampleService flowExampleService;
|
|
|
@Autowired
|
|
|
- private AccountRunningWaterService accountRunningWaterService;
|
|
|
- @Autowired
|
|
|
private StatisticsMapper statisticsMapper;
|
|
|
@Autowired
|
|
|
private SaleQuotationService saleQuotationService;
|
|
|
@@ -44,6 +44,8 @@ public class StatisticsServiceImpl implements StatisticsService {
|
|
|
private StockWaitService stockWaitService;
|
|
|
@Autowired
|
|
|
private ClaimService claimService;
|
|
|
+ @Resource
|
|
|
+ private SubscribeDetailService subscribeDetailService;
|
|
|
|
|
|
/**
|
|
|
* 工作统计
|
|
|
@@ -92,8 +94,14 @@ public class StatisticsServiceImpl implements StatisticsService {
|
|
|
//库存预警-子公司看
|
|
|
long stockWarnCount = stockService.stockWarningPage(new StockSelectDto()).getTotal();
|
|
|
|
|
|
+ //待采购
|
|
|
+ SubscribeDetailSelectDto subscribeDto = new SubscribeDetailSelectDto();
|
|
|
+ subscribeDto.setIsWaitPurchase(1);
|
|
|
+ subscribeDto.setStatus("15,30");
|
|
|
+ long waitPurchaseCount = subscribeDetailService.getPage(subscribeDto).getTotal();
|
|
|
+
|
|
|
//总数
|
|
|
- long sumCount = waitFlowCount + waitQuotationCount + waitProduceCount + waitInStockCount + waitOutStockCount;
|
|
|
+ long sumCount = waitFlowCount + waitQuotationCount + waitProduceCount + waitInStockCount + waitOutStockCount + waitPurchaseCount;
|
|
|
|
|
|
if (isHeadOffice) {
|
|
|
sumCount += waitClaimCount;//总公司待认领
|
|
|
@@ -110,6 +118,7 @@ public class StatisticsServiceImpl implements StatisticsService {
|
|
|
map.put("waitOutStockCount", waitOutStockCount);
|
|
|
map.put("waitClaimCount", waitClaimCount);
|
|
|
map.put("stockWarnCount", stockWarnCount);
|
|
|
+ map.put("waitPurchaseCount", waitPurchaseCount);
|
|
|
map.put("sumCount", sumCount);
|
|
|
|
|
|
return map;
|
yzc