From d2322e0efb6a7c275a2f9d6a798077714d7890cd Mon Sep 17 00:00:00 2001 From: big-y <804609860@qq.com> Date: Wed, 3 Apr 2024 14:43:01 +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=9C=A8=E4=BB=93=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/report/mapper/BillDataMapper.xml | 8 +- .../report/mapper/InLibraryDeliverMapper.java | 44 ++++++++++- .../report/mapper/InLibraryDeliverMapper.xml | 75 +++++++++++++++++++ .../service/InLibraryDeliverService.java | 6 ++ .../impl/InLibraryDeliverServiceImpl.java | 9 +++ .../report/vo/indexCount/AbnormalDataVo.java | 16 ++++ .../vo/indexCount/AbnormalDetailDataVo.java | 21 ++++++ .../report/vo/indexCount/DeliveryDataVo.java | 16 ++++ .../vo/indexCount/DeliveryDetailDataVo.java | 21 ++++++ .../report/vo/indexCount/FreightDataVo.java | 27 +++++++ .../report/vo/indexCount/InStoreDataVO.java | 14 ++++ .../report/vo/indexCount/MainLineDataVo.java | 33 ++++++++ .../report/vo/indexCount/SignDataVo.java | 12 +++ .../vo/indexCount/SignDetailDataVo.java | 33 ++++++++ 14 files changed, 329 insertions(+), 6 deletions(-) create mode 100644 blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/AbnormalDataVo.java create mode 100644 blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/AbnormalDetailDataVo.java create mode 100644 blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/DeliveryDataVo.java create mode 100644 blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/DeliveryDetailDataVo.java create mode 100644 blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/FreightDataVo.java create mode 100644 blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/MainLineDataVo.java create mode 100644 blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/SignDataVo.java create mode 100644 blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/SignDetailDataVo.java diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/BillDataMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/BillDataMapper.xml index e0481ae92..31b2c024b 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/BillDataMapper.xml +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/BillDataMapper.xml @@ -9,12 +9,12 @@ logpm_platform.logpm_warehouse_waybill where freeze_status = 0 + + and destination_warehouse_id in - - and destination_warehouse_id = #{item} - - + #{item} + 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 451486fbf..6e52d81f2 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 @@ -1,7 +1,6 @@ package com.logpm.report.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import io.swagger.models.auth.In; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -10,11 +9,52 @@ import java.util.List; @Mapper public interface InLibraryDeliverMapper extends BaseMapper { + /** + * 根据仓库ID获取在库总量数据 + * @param warehouseId + * @return + */ Integer obtainTheNumberOfInventoryListings (Long warehouseId); + /** + * 根据仓库ID\1已上架 2未上架获取在库数 + * @param warehouseId + * @param order_package_grounding_status + * @return + */ Integer theNumberOfShelvesInTheLibrary(Long warehouseId , Integer order_package_grounding_status); -// Integer quantityInTransit(@Param("id") Long id,) + + /** + * 获取零担件数 + * @param warehouse + * @return + */ + Integer getScatterCount(@Param("warehouse") List warehouse); + + + /** + * 获取中转仓数据 + * @param warehouse + * @return + */ + Integer getThirdParty(@Param("warehouse") List warehouse); + + /** + * 获取商配数据 + * @param warehouse + * @return + */ + Integer getShoppData(@Param("warehouse") List warehouse); + + /** + * 获取市配数据 + * @param warehouse + * @return + */ + Integer getCityData(@Param("warehouse") List warehouse); + Integer getSelfHelp(@Param("warehouse") List warehouse); + } 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 bc9286f45..bd5a3188d 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 @@ -24,4 +24,79 @@ and warehouse_id = #{warehouseId} + + + + + + + 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 ab855e611..eb12d662e 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 @@ -13,6 +13,12 @@ public interface InLibraryDeliverService { Integer theNumberOfShelvesInTheLibrary(Long id,Integer order_package_grounding_statu); + /** + * 获取在库零担件数 + * @return + */ + Integer getScatterCount(); + } 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 0ae7f045b..ff753ca8d 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 @@ -33,4 +33,13 @@ public class InLibraryDeliverServiceImpl implements InLibraryDeliverService { public Integer theNumberOfShelvesInTheLibrary(Long id, Integer order_package_grounding_status){ return inLibraryDeliverMapper.theNumberOfShelvesInTheLibrary(id, order_package_grounding_status); } + + /** + * 获取在库零担数据 + * @return + */ + @Override + public Integer getScatterCount() { + return null; + } } diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/AbnormalDataVo.java b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/AbnormalDataVo.java new file mode 100644 index 000000000..21573c5e3 --- /dev/null +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/AbnormalDataVo.java @@ -0,0 +1,16 @@ +package com.logpm.report.vo.indexCount; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +import java.util.List; + +@ApiModel("异常数据") +public class AbnormalDataVo { + + + @ApiModelProperty("当月") + private AbnormalDetailDataVo moon; + @ApiModelProperty("当日") + private AbnormalDetailDataVo day; +} diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/AbnormalDetailDataVo.java b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/AbnormalDetailDataVo.java new file mode 100644 index 000000000..f46f0f875 --- /dev/null +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/AbnormalDetailDataVo.java @@ -0,0 +1,21 @@ +package com.logpm.report.vo.indexCount; + + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +import java.math.BigDecimal; +import java.util.List; + +@ApiModel("异常数据明细") +public class AbnormalDetailDataVo { + + @ApiModelProperty("发起数") + private Integer all; + @ApiModelProperty("待处理数") + private Integer notProcessed; + + @ApiModelProperty("异常率") + private BigDecimal approximateRate; + +} diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/DeliveryDataVo.java b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/DeliveryDataVo.java new file mode 100644 index 000000000..b91525dff --- /dev/null +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/DeliveryDataVo.java @@ -0,0 +1,16 @@ +package com.logpm.report.vo.indexCount; + + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +@ApiModel("当前配送数据") +public class DeliveryDataVo { + @ApiModelProperty("商配") + private DeliveryDetailDataVo shopp; + + @ApiModelProperty("市配") + private DeliveryDetailDataVo city; + + +} diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/DeliveryDetailDataVo.java b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/DeliveryDetailDataVo.java new file mode 100644 index 000000000..d46475a73 --- /dev/null +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/DeliveryDetailDataVo.java @@ -0,0 +1,21 @@ +package com.logpm.report.vo.indexCount; + + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +@ApiModel("异常数据") +public class DeliveryDetailDataVo { + @ApiModelProperty("配送计划总数") + private Integer all; + @ApiModelProperty("总件数") + private Integer allCount; + @ApiModelProperty("总重量") + private Integer allWeight; + @ApiModelProperty("总方数") + private Integer allArea; + @ApiModelProperty("在途件数") + private Integer onTheWay; + + +} diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/FreightDataVo.java b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/FreightDataVo.java new file mode 100644 index 000000000..a42d47779 --- /dev/null +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/FreightDataVo.java @@ -0,0 +1,27 @@ +package com.logpm.report.vo.indexCount; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * 库位数据 + */ + +@ApiModel("库位数据") + +public class FreightDataVo { + @ApiModelProperty("总数") + private Integer all; + @ApiModelProperty("已上架库位数") + private Integer shelves; + @ApiModelProperty("闲置库位数") + private Integer idle; + @ApiModelProperty("已上架件数") + private Integer shelvesCount; + @ApiModelProperty("未上架件数") + private Integer idleCount; + + + + +} diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/InStoreDataVO.java b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/InStoreDataVO.java index 2d5d3a094..0aefba98e 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/InStoreDataVO.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/InStoreDataVO.java @@ -16,4 +16,18 @@ public class InStoreDataVO { @ApiModelProperty("未上架数量") private Integer notOnTheShelves; + @ApiModelProperty("零担") + private Integer scatter; + @ApiModelProperty("三方中转") + private Integer thirdParty; + @ApiModelProperty("商配") + private Integer shopp; + @ApiModelProperty("市配") + private Integer city; + @ApiModelProperty("自提") + private Integer selfHelp; + + + + } diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/MainLineDataVo.java b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/MainLineDataVo.java new file mode 100644 index 000000000..9729a9f04 --- /dev/null +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/MainLineDataVo.java @@ -0,0 +1,33 @@ +package com.logpm.report.vo.indexCount; + + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +@ApiModel("干线数据") +public class MainLineDataVo { + + @ApiModelProperty("运单总数") + private Integer billAll; + @ApiModelProperty("在库总件数") + private Integer inWareCount; + @ApiModelProperty("在库总重量") + private Integer inWareWeight; + @ApiModelProperty("在库总方数") + private Integer inWareArea; + + /** + * 干线车次统计 + */ + @ApiModelProperty("总车次") + private Integer allCar; + @ApiModelProperty("在途") + private Integer street; + @ApiModelProperty("作业") + private Integer job; + @ApiModelProperty("卸车完成数") + private Integer endCount; + + + +} diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/SignDataVo.java b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/SignDataVo.java new file mode 100644 index 000000000..706276693 --- /dev/null +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/SignDataVo.java @@ -0,0 +1,12 @@ +package com.logpm.report.vo.indexCount; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +@ApiModel("签收数据") +public class SignDataVo { + @ApiModelProperty("当月") + private SignDetailDataVo moon; + @ApiModelProperty("当日") + private SignDetailDataVo day; +} diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/SignDetailDataVo.java b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/SignDetailDataVo.java new file mode 100644 index 000000000..771bbd0af --- /dev/null +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/SignDetailDataVo.java @@ -0,0 +1,33 @@ +package com.logpm.report.vo.indexCount; + + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +import java.math.BigDecimal; + +@ApiModel("已签收数据") +public class SignDetailDataVo { + + @ApiModelProperty("已签收") + private Integer endSign; + @ApiModelProperty("未签收") + private Integer noSign; + + @ApiModelProperty("签收率") + private BigDecimal approximateRate; + + + @ApiModelProperty("文员签收数") + private Integer jobApproximateRate; + @ApiModelProperty("文员签收率") + private Integer jobNoSign; + + @ApiModelProperty("超时签收") + private Integer timeEndSign; + @ApiModelProperty("超时签收率") + private Integer timeApproximateRate; + + + +}