From 87f828c5520921e4bd53de94dcf4a53523862d56 Mon Sep 17 00:00:00 2001 From: big-y <804609860@qq.com> Date: Mon, 8 Apr 2024 11:29:54 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E7=9C=8B=E6=9D=BF=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BC=82=E5=B8=B8=E6=95=B0=E6=8D=AE=E5=92=8C=E5=B9=B2?= =?UTF-8?q?=E7=AD=BE=E6=94=B6=E3=80=81=E9=85=8D=E9=80=81=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IndexCountController.java | 4 +- .../report/mapper/InLibraryDeliverMapper.java | 27 ++++++ .../report/mapper/InLibraryDeliverMapper.xml | 24 +++++ .../service/InLibraryDeliverService.java | 33 +++++++ .../report/service/IndexCountService.java | 2 +- .../impl/InLibraryDeliverServiceImpl.java | 87 +++++++++++++++++++ .../service/impl/IndexCountServiceImpl.java | 56 ++++++++++-- 7 files changed, 225 insertions(+), 8 deletions(-) diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/controller/IndexCountController.java b/blade-service/logpm-report/src/main/java/com/logpm/report/controller/IndexCountController.java index 7ffe475fd..5080a82e3 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/controller/IndexCountController.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/controller/IndexCountController.java @@ -55,8 +55,8 @@ public class IndexCountController { @GetMapping("/get_Delivery_data") @ApiOperation(value = "配送数据",tags = "配送数据") - public R getDeliveryData() { - DeliveryDetailDataVo deliveryData = indexCountService.getDeliveryData(); + public R getDeliveryData() { + DeliveryDataVo deliveryData = indexCountService.getDeliveryData(); return R.data(deliveryData); } diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/InLibraryDeliverMapper.java b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/InLibraryDeliverMapper.java index a4719b1c5..86f5e84c7 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/InLibraryDeliverMapper.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/InLibraryDeliverMapper.java @@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.math.BigDecimal; +import java.util.Date; +import java.util.HashMap; import java.util.List; @Mapper @@ -78,6 +81,30 @@ public interface InLibraryDeliverMapper extends BaseMapper { Integer getMainLineJob(@Param("warehouse") List warehouse); Integer getMainLineEndCount(@Param("warehouse") List warehouse); + /*获取异常数据*/ + + Integer getAbnormalAll(@Param("warehouse") List warehouse, HashMap date); + Integer getAbnormalNotProcessed(@Param("warehouse") List warehouse, HashMap date); + BigDecimal getAbnormalApproximateRate(@Param("warehouse") List warehouse, HashMap date); + + /*获取配送数据*/ + Integer getDeliveryAll(@Param("warehouse") List warehouse,Integer type); + Integer getDeliveryAllCount(@Param("warehouse") List warehouse,Integer type); + Integer getDeliveryAllWeight(@Param("warehouse") List warehouse,Integer type); + Integer getDeliveryAllArea(@Param("warehouse") List warehouse,Integer type); + Integer getDeliveryOnTheWay(@Param("warehouse") List warehouse,Integer type); + + /*获取签收数据*/ + + Integer getEndSign(@Param("warehouse") List warehouse, HashMap date); + Integer getNoSign(@Param("warehouse") List warehouse, HashMap date); + BigDecimal getApproximateRate(@Param("warehouse") List warehouse, HashMap date); + Integer getJobApproximateRate(@Param("warehouse") List warehouse, HashMap date); + + Integer getJobNoSign(@Param("warehouse") List warehouse, HashMap date); + Integer getTimeEndSign(@Param("warehouse") List warehouse, HashMap date); + Integer getTimeApproximateRate(@Param("warehouse") List warehouse, HashMap date); + } diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/InLibraryDeliverMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/InLibraryDeliverMapper.xml index bc8f79ec7..682826277 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/InLibraryDeliverMapper.xml +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/InLibraryDeliverMapper.xml @@ -153,4 +153,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/InLibraryDeliverService.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/InLibraryDeliverService.java index 2afb7d487..d8b394065 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/InLibraryDeliverService.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/InLibraryDeliverService.java @@ -4,6 +4,9 @@ package com.logpm.report.service; import io.swagger.models.auth.In; import org.apache.ibatis.annotations.Param; +import java.math.BigDecimal; +import java.util.Date; +import java.util.HashMap; import java.util.List; /** @@ -70,4 +73,34 @@ public interface InLibraryDeliverService { Integer getMainLineJob(@Param("warehouse") List warehouse); Integer getMainLineEndCount(@Param("warehouse") List warehouse); + + + /*获取异常数据*/ + + Integer getAbnormalAll(@Param("warehouse") List warehouse, HashMap date); + Integer getAbnormalNotProcessed(@Param("warehouse") List warehouse, HashMap date); + BigDecimal getAbnormalApproximateRate(@Param("warehouse") List warehouse, HashMap date); + + + /*获取配送数据*/ + + Integer getDeliveryAll(@Param("warehouse") List warehouse,Integer type); + Integer getDeliveryAllCount(@Param("warehouse") List warehouse,Integer type); + Integer getDeliveryAllWeight(@Param("warehouse") List warehouse,Integer type); + Integer getDeliveryAllArea(@Param("warehouse") List warehouse,Integer type); + Integer getDeliveryOnTheWay(@Param("warehouse") List warehouse,Integer type); + + + /*获取签收数据*/ + + Integer getEndSign(@Param("warehouse") List warehouse, HashMap date); + Integer getNoSign(@Param("warehouse") List warehouse, HashMap date); + BigDecimal getApproximateRate(@Param("warehouse") List warehouse, HashMap date); + Integer getJobApproximateRate(@Param("warehouse") List warehouse, HashMap date); + + Integer getJobNoSign(@Param("warehouse") List warehouse, HashMap date); + Integer getTimeEndSign(@Param("warehouse") List warehouse, HashMap date); + Integer getTimeApproximateRate(@Param("warehouse") List warehouse, HashMap date); + + } diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/IndexCountService.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/IndexCountService.java index 335c00ee2..c0aae5113 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/IndexCountService.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/IndexCountService.java @@ -38,7 +38,7 @@ public interface IndexCountService { * 获取配送数据 * @return */ - DeliveryDetailDataVo getDeliveryData(); + DeliveryDataVo getDeliveryData(); /** * 获取签收数据 diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/InLibraryDeliverServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/InLibraryDeliverServiceImpl.java index 1a57c211f..d8ba826d5 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/InLibraryDeliverServiceImpl.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/InLibraryDeliverServiceImpl.java @@ -7,6 +7,9 @@ import io.swagger.models.auth.In; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; +import java.math.BigDecimal; +import java.util.Date; +import java.util.HashMap; import java.util.List; @Service @@ -130,5 +133,89 @@ public class InLibraryDeliverServiceImpl implements InLibraryDeliverService { return inLibraryDeliverMapper.getMainLineStreet(warehouse); } + /*异常数据*/ + + @Override + public Integer getAbnormalAll(List warehouse, HashMap date) { + return null; + } + + @Override + public Integer getAbnormalNotProcessed(List warehouse, HashMap date) { + return null; + } + + @Override + public BigDecimal getAbnormalApproximateRate(List warehouse, HashMap date) { + return null; + } + + + /*配送数据*/ + @Override + public Integer getDeliveryAll(List warehouse, Integer type) { + return null; + } + + @Override + public Integer getDeliveryAllCount(List warehouse, Integer type) { + return null; + } + + @Override + public Integer getDeliveryAllWeight(List warehouse, Integer type) { + return null; + } + + @Override + public Integer getDeliveryAllArea(List warehouse, Integer type) { + return null; + } + + @Override + public Integer getDeliveryOnTheWay(List warehouse, Integer type) { + return null; + } + + + + /*签收数据*/ + + @Override + public Integer getEndSign(List warehouse, HashMap date) { + return null; + } + + @Override + public Integer getNoSign(List warehouse, HashMap date) { + return null; + } + + @Override + public BigDecimal getApproximateRate(List warehouse, HashMap date) { + return null; + } + + @Override + public Integer getJobApproximateRate(List warehouse, HashMap date) { + return null; + } + + + @Override + public Integer getJobNoSign(List warehouse, HashMap date) { + return null; + } + + @Override + public Integer getTimeEndSign(List warehouse, HashMap date) { + return null; + } + + @Override + public Integer getTimeApproximateRate(List warehouse, HashMap date) { + return null; + } + } diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/IndexCountServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/IndexCountServiceImpl.java index e146a79f8..2b01abc57 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/IndexCountServiceImpl.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/IndexCountServiceImpl.java @@ -6,6 +6,8 @@ import com.logpm.report.service.IndexCountService; import com.logpm.report.vo.IndexCountVO; import com.logpm.report.vo.indexCount.*; import lombok.AllArgsConstructor; +import lombok.Data; +import org.checkerframework.checker.units.qual.A; import org.springblade.common.constant.aftersales.WorkOrderStatusConstant; import org.springblade.common.constant.orderpackage.OrderPackageStatusConstant; import org.springblade.common.constant.stockup.StockupTypeConstant; @@ -90,16 +92,44 @@ public class IndexCountServiceImpl implements IndexCountService { */ @Override public AbnormalDataVo getAbnormalData() { - return null; + AbnormalDataVo abnormalDataVo = new AbnormalDataVo(); + abnormalDataVo.setMoon(getAbnormalDataDetail("2")); + abnormalDataVo.setDay(getAbnormalDataDetail("3")); + return abnormalDataVo; + } + + public AbnormalDetailDataVo getAbnormalDataDetail(String type){ + AbnormalDetailDataVo abnormalDetailDataVo = new AbnormalDetailDataVo(); + List warehouse = billingService.getWarehouse(); + abnormalDetailDataVo.setAll(inLibraryDeliverService.getAbnormalAll(warehouse,billingService.getOtherTime(type))); + abnormalDetailDataVo.setNotProcessed(inLibraryDeliverService.getAbnormalNotProcessed(warehouse,billingService.getOtherTime(type))); + abnormalDetailDataVo.setApproximateRate(inLibraryDeliverService.getAbnormalApproximateRate(warehouse,billingService.getOtherTime(type))); + return abnormalDetailDataVo; } /** - * 获取配送数据 + * 获取配送数据 type 1 市配 2商配 * @return */ @Override - public DeliveryDetailDataVo getDeliveryData() { - return null; + public DeliveryDataVo getDeliveryData() { + DeliveryDataVo deliveryDataVo = new DeliveryDataVo(); + deliveryDataVo.setCity(getDeliveryData(1)); + deliveryDataVo.setShopp(getDeliveryData(2)); + return deliveryDataVo; + + } + + + public DeliveryDetailDataVo getDeliveryData(Integer type){ + DeliveryDetailDataVo deliveryDetailDataVo = new DeliveryDetailDataVo(); + List warehouse = billingService.getWarehouse(); + deliveryDetailDataVo.setAll(inLibraryDeliverService.getDeliveryAll(warehouse,type)); + deliveryDetailDataVo.setAllCount(inLibraryDeliverService.getDeliveryAllCount(warehouse,type)); + deliveryDetailDataVo.setAllWeight(inLibraryDeliverService.getDeliveryAllWeight(warehouse,type)); + deliveryDetailDataVo.setAllArea(inLibraryDeliverService.getDeliveryAllArea(warehouse,type)); + deliveryDetailDataVo.setOnTheWay(inLibraryDeliverService.getDeliveryOnTheWay(warehouse,type)); + return deliveryDetailDataVo; } /** @@ -108,7 +138,23 @@ public class IndexCountServiceImpl implements IndexCountService { */ @Override public SignDataVo getSignData() { - return null; + SignDataVo signDataVo = new SignDataVo(); + signDataVo.setMoon(signDataDetail("2")); + signDataVo.setMoon(signDataDetail("3")); + return signDataVo; + } + + public SignDetailDataVo signDataDetail(String type){ + SignDetailDataVo signDetailDataVo = new SignDetailDataVo(); + List warehouse = billingService.getWarehouse(); + signDetailDataVo.setEndSign(inLibraryDeliverService.getEndSign(warehouse,billingService.getOtherTime(type))); + signDetailDataVo.setNoSign(inLibraryDeliverService.getNoSign(warehouse,billingService.getOtherTime(type))); + signDetailDataVo.setTimeEndSign(inLibraryDeliverService.getTimeEndSign(warehouse,billingService.getOtherTime(type))); + signDetailDataVo.setJobNoSign(inLibraryDeliverService.getJobNoSign(warehouse,billingService.getOtherTime(type))); + signDetailDataVo.setJobApproximateRate(inLibraryDeliverService.getJobApproximateRate(warehouse,billingService.getOtherTime(type))); + signDetailDataVo.setTimeApproximateRate(inLibraryDeliverService.getTimeApproximateRate(warehouse,billingService.getOtherTime(type))); + signDetailDataVo.setApproximateRate(inLibraryDeliverService.getApproximateRate(warehouse,billingService.getOtherTime(type))); + return signDetailDataVo; } /**