diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java b/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java index 95d0c11a6..b323139e4 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java @@ -47,6 +47,8 @@ public class OldSystemDataPushConfig { // 清远 warehourseIds.add("68"); + // 清远基地仓 + warehourseIds.add("34"); } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java index 38b791adb..3db2ab7bb 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java @@ -141,6 +141,12 @@ public class DistributionStockArticleVO extends DistributionStockArticleEntity { @ApiModelProperty(value = "签收数量") private Integer signingNumber; + /** + * 计划数量 + */ + @ApiModelProperty(value = "计划数量") + private Integer reservationNum; + /** * 备货数量 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java index 76ccb2008..0221fd894 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java @@ -355,6 +355,7 @@ public class DistributionStockupAppController extends BladeController { return R.fail("未知的查询类型"); } } +// return Resp.scanFail("零担备货维护中!!!","零担备货维护中!!!"); return R.data(map); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionBillLadingZeroPackageDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionBillLadingZeroPackageDTO.java new file mode 100644 index 000000000..91dce8c64 --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionBillLadingZeroPackageDTO.java @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.distribution.dto; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.logpm.distribution.entity.DistributionParcelListEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.util.List; + +/** + * 在库订单包件清单 数据传输对象实体类 + * + * @author cyz + * @since 2023-06-13 + */ +@Data +public class DistributionBillLadingZeroPackageDTO implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 包件ID + */ + private Long id ; + + /** + * 录入数量 + */ + private Long tiQuantity ; + + + /** + * 订单ID + */ + private Long stockArticleId ; + + /** + * 零担品类 + */ + private String firsts ; + + + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionParcelListDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionParcelListDTO.java index 2b5dd0334..12323479e 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionParcelListDTO.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionParcelListDTO.java @@ -39,6 +39,7 @@ public class DistributionParcelListDTO extends DistributionParcelListEntity { private String materialName; private String materialCode; private Integer isLoading; + private Integer tiQuantity; private Integer isSigning; private String materialUnit; private Integer reservationNum; //预约数量 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/BillLadingAppDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/BillLadingAppDTO.java index edba37dc3..258ba8fd0 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/BillLadingAppDTO.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/BillLadingAppDTO.java @@ -21,6 +21,7 @@ public class BillLadingAppDTO implements Serializable { private Integer orderStatus;//订单状态 private Long billLadingId;//自提单id + private Long stockArtieleld;//自提单id private Integer scanStatus;//扫码类型 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelNumberMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelNumberMapper.java index c6c40064e..26b6142a7 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelNumberMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelNumberMapper.java @@ -65,4 +65,13 @@ public interface DistributionParcelNumberMapper extends BaseMapper selectParcelNumber(String orderCode, Long warehouseId); + + /** + * 维护零担品类出库信息 + * @param id + * @param stockArticleId + * @param quantity + * @return + */ + Integer augmentSignForNum(@Param("packageId") Long id,@Param("stockArticleId") Long stockArticleId,@Param("quantity") Integer quantity); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelNumberMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelNumberMapper.xml index f19549a97..1d523bd31 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelNumberMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelNumberMapper.xml @@ -25,6 +25,18 @@ + + UPDATE + logpm_distribution_parcel_number + SET + delivery_quantity = delivery_quantity - #{quantity}, + hand_quantity = hand_quantity - #{quantity}, + outbound_quantity = outbound_quantity + #{quantity}, + signin_quantity = signin_quantity + #{quantity} + WHERE + parcel_list_id = #{packageId} + AND stock_article_id = #{stockArticleId} + SELECT - ( SELECT count( 1 ) FROM logpm_distrilbution_bill_stock WHERE bill_lading_id = ldbl.id AND order_status != 2 AND is_deleted = 0 AND order_status ！= 2 ) AS orderNum , + ( SELECT count( 1 ) FROM logpm_distrilbution_bill_stock WHERE bill_lading_id = ldbl.id AND order_status != 2 AND is_deleted = 0 AND order_status != 2 ) AS orderNum , (IFNULL((SELECT SUM(quantity) FROM logpm_distribution_reservation_zero_package WHERE reservation_id = ldbl.id AND zero_package_status != 2 AND is_deleted = 0),0)) + - (IFNULL((SELECT sum(packet_number) FROM logpm_distrilbution_bill_package WHERE bill_lading_id = ldbl.id AND packet_bar_status ！= 2 AND is_deleted = 0),0))+ + (IFNULL((SELECT sum(packet_number) FROM logpm_distrilbution_bill_package WHERE bill_lading_id = ldbl.id AND packet_bar_status != 2 AND is_deleted = 0),0))+ (IFNULL((SELECT SUM(quantity) FROM logpm_distribution_delivery_details WHERE bill_lading_id = ldbl.id AND inventory_status != 2 AND is_deleted = 0),0)) AS planNum, IFNULL((SELECT SUM(quantity) FROM logpm_distribution_delivery_details WHERE bill_lading_id = ldbl.id AND is_deleted = 0 AND inventory_status != 2),0) AS inventoryNub, IFNULL((SELECT SUM(quantity) FROM logpm_distribution_bill_lading_scan WHERE bill_lading_id = ldbl.id AND is_deleted = 0) ,0) AS signedNum @@ -550,6 +542,22 @@ ldbl.id = #{param.id} and lddd.is_deleted = '0' + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml index e50046e1f..9e51b1592 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml @@ -115,10 +115,11 @@ + + + + + + + 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; + + + +}