From b2e6e2aefa99a3399bc2fcac4f2985464b85313a Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Thu, 14 Mar 2024 23:19:01 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E5=9B=9E=E5=A4=8DTJJ=20=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionParcelListServiceImpl.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java index ece08625c..ef1cf9b91 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java @@ -855,7 +855,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl>>>>>>>,{}",distributionStockListEntity); -// distributionStockListService.save(distributionStockListEntity); - distributionStockListService.getBaseMapper().insert(distributionStockListEntity); + distributionStockListService.save(distributionStockListEntity); } // distributionStockListEntity.setTrayName(Optional.ofNullable(distributionParcelList.getPallet()).orElse(null)); //托盘 // distributionStockListEntity.setStorageLocation(Optional.ofNullable(distributionParcelList.getGoodsAllocation()).orElse(null)); //库位信息 From 2609a93d284586bf85bc4313ff66c1e2b97efa10 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Fri, 15 Mar 2024 09:41:46 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E7=9A=84dockerfile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- blade-service/logpm-report/Dockerfile | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 blade-service/logpm-report/Dockerfile diff --git a/blade-service/logpm-report/Dockerfile b/blade-service/logpm-report/Dockerfile new file mode 100644 index 000000000..9abdcb752 --- /dev/null +++ b/blade-service/logpm-report/Dockerfile @@ -0,0 +1,15 @@ +FROM bladex/alpine-java:openjdk8-openj9_cn_slim + +MAINTAINER h5u@163.com + +RUN mkdir -p /logpm/report + +WORKDIR /logpm/report + +EXPOSE 8900 + +ADD ./target/logpm-report.jar ./app.jar + +ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar","-Xms128m","-Xmx512m", "app.jar"] +CMD ["--spring.profiles.active=dev"] + From 73e949903aa0ada341a39f203901289d3872097a Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Fri, 15 Mar 2024 09:48:42 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- blade-service/logpm-report/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-report/Dockerfile b/blade-service/logpm-report/Dockerfile index 9abdcb752..cd4fe081b 100644 --- a/blade-service/logpm-report/Dockerfile +++ b/blade-service/logpm-report/Dockerfile @@ -11,5 +11,5 @@ EXPOSE 8900 ADD ./target/logpm-report.jar ./app.jar ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar","-Xms128m","-Xmx512m", "app.jar"] -CMD ["--spring.profiles.active=dev"] +CMD ["--spring.profiles.active=test"] From 47f1ecf36f8e90443b8b862e035f6bdd7bff96e1 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Fri, 15 Mar 2024 10:30:34 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E6=96=87=E5=91=98=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E4=BF=AE=E6=94=B9=E9=A2=84=E7=BA=A6=E5=8D=95?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/dto/DistributionStockArticleOweDTO.java | 1 - .../distribution/mapper/DistributionStockArticleMapper.xml | 3 +-- .../service/impl/DistributionSignforServiceImpl.java | 6 ++++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockArticleOweDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockArticleOweDTO.java index d553d0a38..8c8aecc11 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockArticleOweDTO.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockArticleOweDTO.java @@ -28,6 +28,5 @@ public class DistributionStockArticleOweDTO extends DistributionStockArticleEnti private String reservation; private String startDate; private String entDate; - private String isAll; private List warehouseIdList; } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml index 2e769b63c..1b5065a7c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml @@ -432,6 +432,7 @@ LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldpl.id ldsa.is_deleted = 0 and ldsa.order_status in (10,20,30,40,50,60,70) + and ldsa.hand_quantity > 0 and ldsa.order_code in @@ -473,8 +474,6 @@ and ldsa.warehouse_entry_time between #{param.startDate} and #{param.entDate} - and ldsa.hand_quantity > 0 - and DATE(ldsa.warehouse_entry_time) = #{param.warehouseEntryTime} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index 4cd3714b8..aff4a6611 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -792,6 +792,12 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl Date: Fri, 15 Mar 2024 10:35:03 +0800 Subject: [PATCH 05/15] =?UTF-8?q?fix(xml):=20=E4=BF=AE=E6=94=B9=E8=87=AA?= =?UTF-8?q?=E6=8F=90=E6=98=8E=E7=BB=86=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 修改自提明细报表查询报错 --- .../java/com/logpm/report/mapper/ReportBillLoadingMapper.xml | 2 +- .../src/main/java/com/logpm/report/util/ThreadPoolUtil.java | 4 +++- .../src/main/java/com/logpm/report/vo/BillLoadingTasksVO.java | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportBillLoadingMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportBillLoadingMapper.xml index 49a5e306a..dab9ed3c6 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportBillLoadingMapper.xml +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportBillLoadingMapper.xml @@ -82,7 +82,7 @@ dpl.description_goods material_name, '' start_ware_in_time, '' start_ware_out_time, - dpl.warehousing_time, + dpl.warehousing_time warehouse_entry_time_end, dbls.create_user scan_user, dbls.create_time scan_time, dbl.update_time examine_time, diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/util/ThreadPoolUtil.java b/blade-service/logpm-report/src/main/java/com/logpm/report/util/ThreadPoolUtil.java index 3839a59dc..f380ba860 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/util/ThreadPoolUtil.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/util/ThreadPoolUtil.java @@ -16,7 +16,9 @@ public class ThreadPoolUtil { private ThreadPoolUtil() { } - //构建线程池 + /** + * 导出线程池 + */ public static ExecutorService executor = null; static { init(); diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/BillLoadingTasksVO.java b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/BillLoadingTasksVO.java index aad1dace7..62659a5ee 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/BillLoadingTasksVO.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/BillLoadingTasksVO.java @@ -87,7 +87,7 @@ public class BillLoadingTasksVO implements Serializable { @ApiModelProperty(value = "实际提货件数") @ExcelProperty("实际提货件数") - private String BillLoadingNum; + private String billLoadingNum; @ApiModelProperty(value = "到付运费") @ExcelProperty("到付运费") From 2b3a6c58a5471444fdaae490ee0c53fcf076a72e Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Fri, 15 Mar 2024 15:43:30 +0800 Subject: [PATCH 06/15] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=BD=AC=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E5=93=81=E8=BF=87=E6=BB=A4=E8=A3=85=E8=BD=A6=E7=AD=BE?= =?UTF-8?q?=E6=94=B6=E5=8C=85=E4=BB=B6=E3=80=81=E9=A2=84=E7=BA=A6=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E6=89=B9=E9=87=8F=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=AE=A2=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionStockArticleController.java | 7 ++++++ .../dto/DistributionParcelListDTO.java | 2 ++ .../dto/DistributionStockArticleDTO.java | 6 +++++ .../mapper/DistributionDeliveryInfoMapper.xml | 22 ++++++++++--------- .../mapper/DistributionParcelListMapper.xml | 6 +++++ .../IDistributionStockArticleService.java | 1 + .../DistributionStockArticleServiceImpl.java | 3 +++ 7 files changed, 37 insertions(+), 10 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java index c5c4730f4..6795a0ad5 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java @@ -353,6 +353,13 @@ public class DistributionStockArticleController extends BladeController { return R.status(distributionStockArticleService.updateById(distributionStockArticle)); } + @PostMapping("/updateBatchClient") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "修改", notes = "传入distributionStockArticle") + public R updateBatchClient(@Valid @RequestBody DistributionStockArticleDTO distributionStockArticleDTO) { + return R.status(distributionStockArticleService.updateBatchById(distributionStockArticleDTO.getEntityList())); + } + /** * 配送在库订单 新增或修改 */ 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 6be069388..2b5dd0334 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 @@ -38,6 +38,8 @@ public class DistributionParcelListDTO extends DistributionParcelListEntity { private Long materialId; private String materialName; private String materialCode; + private Integer isLoading; + private Integer isSigning; private String materialUnit; private Integer reservationNum; //预约数量 private String sku; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockArticleDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockArticleDTO.java index dc782a79f..0e07f02ab 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockArticleDTO.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockArticleDTO.java @@ -71,5 +71,11 @@ public class DistributionStockArticleDTO extends DistributionStockArticleEntity @TableField(exist = false) private List parcelNumberVOS; + /** + // * 零担订单品类信息 + // */ + @TableField(exist = false) + private List entityList; + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml index 61bd18ca2..44d5cdbbe 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml @@ -93,14 +93,6 @@ lds.received_quantity receivedQuantity, lds.is_have_abnormal_package isHaveAbnormalPackage, lds.signee_name signeeName, - (SELECT - ldss.forklift_name - FROM - logpm_distribution_stockup_info AS ldsi - LEFT JOIN logpm_distribution_stockup AS ldss ON ldsi.stockup_id = ldss.id - WHERE - ldsi.reservation_id = lds.reservation_id - ) AS forkliftName, CASE WHEN ldr.stockup_status ='10' THEN '待指派' WHEN ldr.stockup_status ='20' THEN '待备货' @@ -118,10 +110,20 @@ CASE WHEN lds.driver_signing ='1' THEN '未完成' else '已完成' - END driverSigning + END driverSigning, + t.forklift_name AS forkliftName FROM logpm_distribution_signfor lds - JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id + LEFT JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id + LEFT JOIN (SELECT + ldss.forklift_name, + ldsi.reservation_id + FROM + logpm_distribution_stockup_info AS ldsi + LEFT JOIN logpm_distribution_stockup AS ldss ON ldsi.stockup_id = ldss.id + WHERE + ldsi.reservation_id = lds.reservation_id + ) AS t ON t.reservation_id = ldsi.reservation_id lds.is_deleted = 0 and lds.delivery_id = #{id} and ldr.reservation_status != 40 AND (ldr.reservation_num + ldr.reservation_stock_list_num) > 0 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml index 7ad7da730..f7d29e848 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml @@ -638,6 +638,12 @@ and ldpl.order_package_reservation_status = #{param.orderPackageReservationStatus} + and + ldpl.order_package_loading_status != 20 + + and + ldpl.order_package_status != 70 + and ldpl.order_package_freeze_status = #{param.orderPackageFreezeStatus} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java index 9a8fee6e1..f80b7252c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java @@ -232,4 +232,5 @@ public interface IDistributionStockArticleService extends BaseService queryWrapper = new QueryWrapper<>(); From 136821eeb3337d4124d5fbd6b7c6b37b3077257e Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Fri, 15 Mar 2024 15:55:27 +0800 Subject: [PATCH 07/15] =?UTF-8?q?=E9=85=8D=E9=80=81=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=95=86=E5=9C=BA=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/DistributionDeliveryListEntity.java | 7 +++++++ .../distribution/mapper/DistributionDeliveryListMapper.xml | 6 +++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java index 077c440e0..46c78495b 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java @@ -269,6 +269,13 @@ public class DistributionDeliveryListEntity extends TenantEntity { @TableField(exist = false) private String clineName; + /** + * 商场名称 + */ + @ApiModelProperty(value = "商场名称") + @TableField(exist = false) + private String mallName; + /** * 签收件数 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml index a36cd515d..ee890f0f1 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml @@ -205,7 +205,8 @@ WHERE lddl.id = lds.delivery_id ) signingNumber, - GROUP_CONCAT(DISTINCT ldr.consignee SEPARATOR ',') clineName + GROUP_CONCAT(DISTINCT ldr.consignee SEPARATOR ',') clineName, + GROUP_CONCAT(DISTINCT ldr.mall_name SEPARATOR ',') mallName FROM logpm_distribution_delivery_list lddl left JOIN logpm_distribution_signfor lds on lddl.id = lds.delivery_id LEFT JOIN logpm_distribution_reservation ldr on ldr.id = lds.reservation_id @@ -226,6 +227,9 @@ and ldr.consignee like concat('%',#{param.clineName},'%') + + and ldr.mall_name like concat('%',#{param.mallName},'%') + and lddl.vehicle_name like concat('%',#{param.vehicleName},'%') From 269880da6ae7d7839c4dc20d6c36c15571007bfe Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Fri, 15 Mar 2024 16:17:06 +0800 Subject: [PATCH 08/15] =?UTF-8?q?=E9=85=8D=E9=80=81=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=95=86=E5=9C=BA=E5=90=8D=E7=A7=B0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/distribution/vo/DistributionDeliveryListVO.java | 6 ++++++ .../distribution/excel/DistributionDeliveryListExcel.java | 6 ++++++ .../distribution/mapper/DistributionDeliveryListMapper.xml | 6 +++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryListVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryListVO.java index 4613d086a..2fc82ee9d 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryListVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryListVO.java @@ -64,6 +64,12 @@ public class DistributionDeliveryListVO extends DistributionDeliveryListEntity { @ApiModelProperty(value = "客户名称") private String consignee; + /** + * 客户名称 + */ + @ApiModelProperty(value = "客户名称") + private String mallName; + /** * 配送日期 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryListExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryListExcel.java index e98ffcc23..faeae066e 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryListExcel.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryListExcel.java @@ -68,6 +68,12 @@ public class DistributionDeliveryListExcel implements Serializable { @ColumnWidth(20) @ExcelProperty("客户名称") private String consignee; + /** + * 仓库 + */ + @ColumnWidth(35) + @ExcelProperty("商场名称") + private String mallName; /** * 配送类型;1-自主配送,2-三方配送 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml index ee890f0f1..f15039df7 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml @@ -306,6 +306,7 @@ lddl.task_time AS taskTime, ldr.warehouse_id AS warehouseId, ldr.consignee AS consignee, + ldr.mall_name AS mallName, CASE lddl.kind WHEN 1 THEN @@ -355,7 +356,7 @@ WHERE lddl.id = lds.delivery_id ) signingNumber, - GROUP_CONCAT( lddl.loading_team_name, lddl.loading_team_name ) AS handlingCrew + GROUP_CONCAT( lddl.loading_team_name, lddl.unloading_team_name ) AS handlingCrew FROM logpm_distribution_delivery_list AS lddl LEFT JOIN logpm_distribution_signfor AS lds ON lddl.id = lds.delivery_id @@ -376,6 +377,9 @@ AND ldr.consignee like concat('%',#{params.clineName},'%') + + AND ldr.mall_name like concat('%',#{params.mallName},'%') + AND lddl.type = #{params.type} From 179bb455fbc4579d134e9cd03b079c5b53308cb2 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo Date: Fri, 15 Mar 2024 18:13:57 +0800 Subject: [PATCH 09/15] =?UTF-8?q?feat(all):=20=E6=96=B0=E5=A2=9E=E5=9C=A8?= =?UTF-8?q?=E5=BA=93=E8=AE=A2=E5=8D=95=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 新增在库订单报表 2 修改在库订单现有问题 --- .../report/constant/ReportConstants.java | 15 ++ .../ReportBillLoadingController.java | 6 +- .../controller/ReportDeliveryController.java | 18 ++ .../mapper/ReportBillLoadingMapper.java | 17 ++ .../report/mapper/ReportBillLoadingMapper.xml | 1 + .../report/mapper/ReportDeliverMapeer.java | 31 ++++ .../report/mapper/ReportDeliverMapper.xml | 76 ++++++++ .../report/mapper/ReportStockMapeer.java | 21 +++ .../logpm/report/mapper/ReportStockMapper.xml | 8 +- .../logpm/report/query/StockOrderQuery.java | 41 +++++ .../reader/BillLoadingDetailsReader.java | 4 +- .../report/reader/BillLoadingTasksReader.java | 4 +- .../report/reader/DeliveryCustomerReader.java | 4 +- .../report/reader/DeliveryDetailReader.java | 4 +- .../report/reader/DeliveryInStocksReader.java | 4 +- .../reader/DeliveryOutStocksReader.java | 4 +- .../report/reader/DeliveryStockReader.java | 4 +- .../report/reader/DeliveryTrainReader.java | 4 +- .../logpm/report/reader/StockOrderReader.java | 36 ++++ ...rtReaderService.java => ExportReader.java} | 2 +- .../IReportBillLoadingAsyncService.java | 30 +++- .../report/service/ReportDeliverService.java | 60 +++++++ .../report/service/ReportStockService.java | 42 +++++ .../impl/ReportBillLoadingAsyncService.java | 13 +- .../impl/ReportDeliverServiceImpl.java | 35 ++++ .../service/impl/ReportStockServiceImpl.java | 22 ++- .../java/com/logpm/report/util/QueryUtil.java | 3 +- .../logpm/report/util/ReportExcelUtil.java | 35 ++-- .../logpm/report/vo/BillLoadingTasksVO.java | 4 +- .../com/logpm/report/vo/StockOrderVO.java | 169 ++++++++++++++++++ 30 files changed, 668 insertions(+), 49 deletions(-) create mode 100644 blade-service/logpm-report/src/main/java/com/logpm/report/constant/ReportConstants.java create mode 100644 blade-service/logpm-report/src/main/java/com/logpm/report/query/StockOrderQuery.java create mode 100644 blade-service/logpm-report/src/main/java/com/logpm/report/reader/StockOrderReader.java rename blade-service/logpm-report/src/main/java/com/logpm/report/service/{ExportReaderService.java => ExportReader.java} (94%) create mode 100644 blade-service/logpm-report/src/main/java/com/logpm/report/vo/StockOrderVO.java diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/constant/ReportConstants.java b/blade-service/logpm-report/src/main/java/com/logpm/report/constant/ReportConstants.java new file mode 100644 index 000000000..a39072b15 --- /dev/null +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/constant/ReportConstants.java @@ -0,0 +1,15 @@ +package com.logpm.report.constant; + +/** + * @author zhaoqiaobo + * @create 2024-03-14 18:54 + */ +public class ReportConstants { + + public static final int HASHMAP_DEFAULT_SIZE = 16; + + public static final String PARAM_SPLITTER = ","; + + public static final Integer HTTP_SUCCESS_CODE = 200; + +} diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/controller/ReportBillLoadingController.java b/blade-service/logpm-report/src/main/java/com/logpm/report/controller/ReportBillLoadingController.java index 25d313cb8..5469f68be 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/controller/ReportBillLoadingController.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/controller/ReportBillLoadingController.java @@ -18,8 +18,10 @@ import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; /** - * 自提单包条控制器 - */ + * 自提报表前端控制器 + * @Author zqb + * @Date 2024/3/14 + **/ @RestController @AllArgsConstructor @RequestMapping("/reportBillLoading") diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/controller/ReportDeliveryController.java b/blade-service/logpm-report/src/main/java/com/logpm/report/controller/ReportDeliveryController.java index d66a8d1ad..09de067aa 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/controller/ReportDeliveryController.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/controller/ReportDeliveryController.java @@ -21,10 +21,12 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.logpm.report.query.DevilerDetailsQuery; import com.logpm.report.query.ReportCustomerQuery; import com.logpm.report.query.ReportDevilerQuery; +import com.logpm.report.query.StockOrderQuery; import com.logpm.report.service.ReportDeliverService; import com.logpm.report.vo.ReportCustomerVO; import com.logpm.report.vo.ReportDetailVO; import com.logpm.report.vo.ReportDevilerVO; +import com.logpm.report.vo.StockOrderVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; @@ -94,6 +96,22 @@ public class ReportDeliveryController extends BladeController { @ApiOperation(value = "导出配送明细报表", notes = "导出配送明细报表") public void exportDetails(HttpServletResponse response, ReportDetailVO vo, DevilerDetailsQuery query) { reportDeliverService.exportDetails(response, vo, query); + + } + + @GetMapping("/stockOrder") + @ApiOperationSupport(order = 7) + @ApiOperation(value = "在库订单报表", notes = "在库订单报表") + public R> stockOrderPage(StockOrderVO vo, StockOrderQuery query) { + IPage pages = reportDeliverService.stockOrderPage(vo, query); + return R.data(pages); + } + + @GetMapping("/exportStockOrder") + @ApiOperationSupport(order = 8) + @ApiOperation(value = "导出在库订单报表", notes = "导出在库订单报表") + public void exportStockOrder(HttpServletResponse response, StockOrderVO vo, StockOrderQuery query) { + reportDeliverService.exportStockOrder(response, vo, query); } diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportBillLoadingMapper.java b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportBillLoadingMapper.java index 266f79f06..9640aaa4a 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportBillLoadingMapper.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportBillLoadingMapper.java @@ -10,11 +10,28 @@ import org.apache.ibatis.annotations.Param; import java.util.List; +/** + * 自提报表Mapper + * @Author zqb + * @Date 2024/3/14 + **/ @Mapper public interface ReportBillLoadingMapper extends BaseMapper { + /** + * 查询自提明细分页sql + * @param page + * @param queryWrapper + * @return + */ List getDetailsPage(IPage page,@Param("ew") Wrapper queryWrapper); + /** + * 查询自提任务报表sql + * @param page + * @param queryWrapper + * @return + */ List getTasksPage(IPage page,@Param("ew") Wrapper queryWrapper); } diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportBillLoadingMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportBillLoadingMapper.xml index dab9ed3c6..9b908a320 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportBillLoadingMapper.xml +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportBillLoadingMapper.xml @@ -115,6 +115,7 @@ storage_fee, forklift_fee, add_value_fee, + (collect_payment_fee + transport_fee + storage_fee + forklift_fee + add_value_fee) amount_to_fee, goods_info, created_time from (SELECT ldbl.pickup_batch AS pickup_atch, diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapeer.java b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapeer.java index 26b3c4f36..db23a5f52 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapeer.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapeer.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.report.vo.ReportCustomerVO; import com.logpm.report.vo.ReportDetailVO; import com.logpm.report.vo.ReportDevilerVO; +import com.logpm.report.vo.StockOrderVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -18,10 +19,40 @@ import java.util.List; @Mapper public interface ReportDeliverMapeer extends BaseMapper { + /** + * 查询配送车次报表sql + * + * @param page + * @param query + * @return + */ List getDeliveryTrainPage(IPage page, @Param("ew") Wrapper query); + /** + * 查询配送客户报表sql + * + * @param page + * @param query + * @return + */ List getCustomerPage(IPage page, @Param("ew") Wrapper query); + /** + * 拆线呢配送明细报表sql + * + * @param page + * @param query + * @return + */ List getDetailsPage(IPage page, @Param("ew") Wrapper query); + /** + * 查询在库订单报表sql + * + * @param page + * @param queryWrapper + * @return + */ + List getStockOrderPage(IPage page, @Param("ew") Wrapper queryWrapper); + } diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml index 58be46c68..097fbff78 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml @@ -535,5 +535,81 @@ FROM logpm_distribution_reservation obj WHERE obj.id = t.id) + diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportStockMapeer.java b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportStockMapeer.java index 738d8d314..083fabac1 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportStockMapeer.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportStockMapeer.java @@ -18,10 +18,31 @@ import java.util.List; @Mapper public interface ReportStockMapeer extends BaseMapper { + /** + * 查询库存品报表sql + * + * @param page + * @param queryWrapper + * @return + */ List getDetailPage(IPage page, @Param("ew") Wrapper queryWrapper); + /** + * 查询库存入库报表sql + * + * @param page + * @param queryWrapper + * @return + */ List getInStocks(IPage page, @Param("ew") Wrapper queryWrapper); + /** + * 查询库存出库报表sql + * + * @param page + * @param queryWrapper + * @return + */ List getOutStocks(IPage page, @Param("ew") Wrapper queryWrapper); } diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportStockMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportStockMapper.xml index 40e825687..c2d9b5a75 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportStockMapper.xml +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportStockMapper.xml @@ -16,9 +16,7 @@ allocation_title from (select t.warehouse_name, t.market_name, - case - when t.service_type = 2 then '市内库存品' - when t.service_type = 3 then '自提库存品' end service_type, + t.service_type service_type, t.cargo_number, t.description_goods, t.quantity_stock, @@ -49,9 +47,7 @@ allocation_title from (select t.warehouse_name, t.market_name, - case - when t.service_type = 2 then '市内库存品' - when t.service_type = 3 then '自提库存品' end service_type, + t.service_type service_type, t.cargo_number, t.description_goods, t.warehousing_time, diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/query/StockOrderQuery.java b/blade-service/logpm-report/src/main/java/com/logpm/report/query/StockOrderQuery.java new file mode 100644 index 000000000..922155666 --- /dev/null +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/query/StockOrderQuery.java @@ -0,0 +1,41 @@ +package com.logpm.report.query; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springblade.core.mp.support.Query; + +import java.util.Date; + +/** + * 库存出库报表 query + * + * @author zhaoqiaobo + * @create 2024-03-13 14:21 + */ +@ApiModel(value = "库存出库报表查询对象", description = "库存出库报表查询对象") +@Data +public class StockOrderQuery extends Query { + + @ApiModelProperty(value = "入库时间开始（范围）", position = 2) + private Date startWarehouseEntryTime; + + @ApiModelProperty(value = "入库时间结束（范围）", position = 3) + private Date endWarehouseEntryTime; + + @ApiModelProperty(value = "仓库（范围）", position = 6) + private String warehouseRange; + + @ApiModelProperty(value = "运单号（范围）", position = 8) + private String waybillNumberRange; + + @ApiModelProperty(value = "商场名称（范围）", position = 10) + private String mallNameRange; + + @ApiModelProperty(value = "收货人（范围）", position = 12) + private String consigneePersonRange; + + @ApiModelProperty(value = "品牌（范围）", position = 14) + private String brandRange; + +} diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/reader/BillLoadingDetailsReader.java b/blade-service/logpm-report/src/main/java/com/logpm/report/reader/BillLoadingDetailsReader.java index 800725a76..1b1a6cf9c 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/reader/BillLoadingDetailsReader.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/reader/BillLoadingDetailsReader.java @@ -3,7 +3,7 @@ package com.logpm.report.reader; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.logpm.report.mapper.ReportBillLoadingMapper; -import com.logpm.report.service.ExportReaderService; +import com.logpm.report.service.ExportReader; import org.apache.poi.ss.formula.functions.T; import org.springframework.stereotype.Component; @@ -15,7 +15,7 @@ import java.util.List; * @create 2024-03-08 9:50 */ @Component -public class BillLoadingDetailsReader implements ExportReaderService { +public class BillLoadingDetailsReader implements ExportReader { @Resource private ReportBillLoadingMapper billLoadingMapper; diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/reader/BillLoadingTasksReader.java b/blade-service/logpm-report/src/main/java/com/logpm/report/reader/BillLoadingTasksReader.java index 7bdd3feb5..1278c18f3 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/reader/BillLoadingTasksReader.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/reader/BillLoadingTasksReader.java @@ -3,7 +3,7 @@ package com.logpm.report.reader; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.logpm.report.mapper.ReportBillLoadingMapper; -import com.logpm.report.service.ExportReaderService; +import com.logpm.report.service.ExportReader; import org.apache.poi.ss.formula.functions.T; import org.springframework.stereotype.Component; @@ -15,7 +15,7 @@ import java.util.List; * @create 2024-03-08 9:50 */ @Component -public class BillLoadingTasksReader implements ExportReaderService { +public class BillLoadingTasksReader implements ExportReader { @Resource private ReportBillLoadingMapper billLoadingMapper; diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/reader/DeliveryCustomerReader.java b/blade-service/logpm-report/src/main/java/com/logpm/report/reader/DeliveryCustomerReader.java index 4ec530ed8..1d3df247e 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/reader/DeliveryCustomerReader.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/reader/DeliveryCustomerReader.java @@ -3,7 +3,7 @@ package com.logpm.report.reader; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.logpm.report.mapper.ReportDeliverMapeer; -import com.logpm.report.service.ExportReaderService; +import com.logpm.report.service.ExportReader; import org.apache.poi.ss.formula.functions.T; import org.springframework.stereotype.Component; @@ -16,7 +16,7 @@ import java.util.List; * @create 2024-03-08 9:50 */ @Component -public class DeliveryCustomerReader implements ExportReaderService { +public class DeliveryCustomerReader implements ExportReader { @Resource private ReportDeliverMapeer reportDeliverMapeer; diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/reader/DeliveryDetailReader.java b/blade-service/logpm-report/src/main/java/com/logpm/report/reader/DeliveryDetailReader.java index 055f3bbb0..3d766d92d 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/reader/DeliveryDetailReader.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/reader/DeliveryDetailReader.java @@ -3,7 +3,7 @@ package com.logpm.report.reader; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.logpm.report.mapper.ReportDeliverMapeer; -import com.logpm.report.service.ExportReaderService; +import com.logpm.report.service.ExportReader; import org.apache.poi.ss.formula.functions.T; import org.springframework.stereotype.Component; @@ -16,7 +16,7 @@ import java.util.List; * @create 2024-03-08 9:50 */ @Component -public class DeliveryDetailReader implements ExportReaderService { +public class DeliveryDetailReader implements ExportReader { @Resource private ReportDeliverMapeer reportDeliverMapeer; diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/reader/DeliveryInStocksReader.java b/blade-service/logpm-report/src/main/java/com/logpm/report/reader/DeliveryInStocksReader.java index 876e73e6b..64503a4b8 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/reader/DeliveryInStocksReader.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/reader/DeliveryInStocksReader.java @@ -3,7 +3,7 @@ package com.logpm.report.reader; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.logpm.report.mapper.ReportStockMapeer; -import com.logpm.report.service.ExportReaderService; +import com.logpm.report.service.ExportReader; import org.apache.poi.ss.formula.functions.T; import org.springframework.stereotype.Component; @@ -16,7 +16,7 @@ import java.util.List; * @create 2024-03-08 9:50 */ @Component -public class DeliveryInStocksReader implements ExportReaderService { +public class DeliveryInStocksReader implements ExportReader { @Resource private ReportStockMapeer reportStockMapeer; diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/reader/DeliveryOutStocksReader.java b/blade-service/logpm-report/src/main/java/com/logpm/report/reader/DeliveryOutStocksReader.java index 7c9c6e438..c3e8e5906 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/reader/DeliveryOutStocksReader.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/reader/DeliveryOutStocksReader.java @@ -3,7 +3,7 @@ package com.logpm.report.reader; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.logpm.report.mapper.ReportStockMapeer; -import com.logpm.report.service.ExportReaderService; +import com.logpm.report.service.ExportReader; import org.apache.poi.ss.formula.functions.T; import org.springframework.stereotype.Component; @@ -16,7 +16,7 @@ import java.util.List; * @create 2024-03-08 9:50 */ @Component -public class DeliveryOutStocksReader implements ExportReaderService { +public class DeliveryOutStocksReader implements ExportReader { @Resource private ReportStockMapeer reportStockMapeer; diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/reader/DeliveryStockReader.java b/blade-service/logpm-report/src/main/java/com/logpm/report/reader/DeliveryStockReader.java index 10947c0a8..31d5ab069 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/reader/DeliveryStockReader.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/reader/DeliveryStockReader.java @@ -3,7 +3,7 @@ package com.logpm.report.reader; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.logpm.report.mapper.ReportStockMapeer; -import com.logpm.report.service.ExportReaderService; +import com.logpm.report.service.ExportReader; import org.apache.poi.ss.formula.functions.T; import org.springframework.stereotype.Component; @@ -16,7 +16,7 @@ import java.util.List; * @create 2024-03-08 9:50 */ @Component -public class DeliveryStockReader implements ExportReaderService { +public class DeliveryStockReader implements ExportReader { @Resource private ReportStockMapeer reportStockMapeer; diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/reader/DeliveryTrainReader.java b/blade-service/logpm-report/src/main/java/com/logpm/report/reader/DeliveryTrainReader.java index bab4a5ec1..6c9417906 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/reader/DeliveryTrainReader.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/reader/DeliveryTrainReader.java @@ -3,7 +3,7 @@ package com.logpm.report.reader; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.logpm.report.mapper.ReportDeliverMapeer; -import com.logpm.report.service.ExportReaderService; +import com.logpm.report.service.ExportReader; import org.apache.poi.ss.formula.functions.T; import org.springframework.stereotype.Component; @@ -16,7 +16,7 @@ import java.util.List; * @create 2024-03-08 9:50 */ @Component -public class DeliveryTrainReader implements ExportReaderService { +public class DeliveryTrainReader implements ExportReader { @Resource private ReportDeliverMapeer reportDeliverMapeer; diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/reader/StockOrderReader.java b/blade-service/logpm-report/src/main/java/com/logpm/report/reader/StockOrderReader.java new file mode 100644 index 000000000..2e54731bd --- /dev/null +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/reader/StockOrderReader.java @@ -0,0 +1,36 @@ +package com.logpm.report.reader; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.logpm.report.mapper.ReportDeliverMapeer; +import com.logpm.report.service.ExportReader; +import org.apache.poi.ss.formula.functions.T; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.util.List; + +/** + * + * @author zhaoqiaobo + * @create 2024-03-08 9:50 + */ +@Component +public class StockOrderReader implements ExportReader { + + @Resource + private ReportDeliverMapeer reportDeliverMapeer; + + @Override + public Long getCount(Wrapper query) { + Page page = new Page(1, 1); + reportDeliverMapeer.getStockOrderPage(page, query); + return page.getTotal(); + } + + @Override + public List findList(Page page, Wrapper query) { + return reportDeliverMapeer.getStockOrderPage(page,query); + } + +} diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/ExportReaderService.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/ExportReader.java similarity index 94% rename from blade-service/logpm-report/src/main/java/com/logpm/report/service/ExportReaderService.java rename to blade-service/logpm-report/src/main/java/com/logpm/report/service/ExportReader.java index f42095e81..0ec73e817 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/ExportReaderService.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/ExportReader.java @@ -12,7 +12,7 @@ import java.util.List; * @author zhaoqiaobo * @create 2024-03-07 18:14 */ -public interface ExportReaderService { +public interface ExportReader { /** * 导出的总条数 diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/IReportBillLoadingAsyncService.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/IReportBillLoadingAsyncService.java index daf04467c..d7d271992 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/IReportBillLoadingAsyncService.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/IReportBillLoadingAsyncService.java @@ -8,14 +8,42 @@ import com.logpm.report.vo.BillLoadingTasksVO; import javax.servlet.http.HttpServletResponse; +/** + * 自提报表接口 + * @Author zqb + * @Date 2024/3/14 + **/ public interface IReportBillLoadingAsyncService { - + /** + * 自提明细报表分页 + * @param vo + * @param query + * @return + */ IPage detailsPage(BillLoadingDetailsVO vo, BillDetailsQuery query); + /** + * 导出自提明细报表excel + * @param response + * @param vo + * @param query + */ void exportDetails(HttpServletResponse response, BillLoadingDetailsVO vo, BillDetailsQuery query); + /** + * 自提任务报表分页 + * @param vo + * @param query + * @return + */ IPage tasksPage(BillLoadingTasksVO vo, BillLoadingTasksQuery query); + /** + * 导出自提任务报表excel + * @param response + * @param vo + * @param query + */ void exportTasks(HttpServletResponse response, BillLoadingTasksVO vo, BillLoadingTasksQuery query); } diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/ReportDeliverService.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/ReportDeliverService.java index 3b2b5f02c..2080c8bc6 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/ReportDeliverService.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/ReportDeliverService.java @@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.report.query.DevilerDetailsQuery; import com.logpm.report.query.ReportCustomerQuery; import com.logpm.report.query.ReportDevilerQuery; +import com.logpm.report.query.StockOrderQuery; import com.logpm.report.vo.ReportCustomerVO; import com.logpm.report.vo.ReportDetailVO; import com.logpm.report.vo.ReportDevilerVO; +import com.logpm.report.vo.StockOrderVO; import javax.servlet.http.HttpServletResponse; @@ -16,15 +18,73 @@ import javax.servlet.http.HttpServletResponse; */ public interface ReportDeliverService { + /** + * 配送车次报表分页 + * + * @param vo + * @param query + * @return + */ IPage deliveryTrainPage(ReportDevilerVO vo, ReportDevilerQuery query); + /** + * 导出配送车次报表excel + * + * @param response + * @param vo + * @param query + */ void exportTrain(HttpServletResponse response, ReportDevilerVO vo, ReportDevilerQuery query); + /** + * 查询配送客户分页 + * + * @param vo + * @param query + * @return + */ IPage customerPage(ReportCustomerVO vo, ReportCustomerQuery query); + /** + * 导出配送客户报表excel + * + * @param response + * @param vo + * @param query + */ void exportCustomer(HttpServletResponse response, ReportCustomerVO vo, ReportCustomerQuery query); + /** + * 查询配送明细分页 + * + * @param vo + * @param query + * @return + */ IPage detailsPage(ReportDetailVO vo, DevilerDetailsQuery query); + /** + * 导出配送明细报表excel + * + * @param response + * @param vo + * @param query + */ void exportDetails(HttpServletResponse response, ReportDetailVO vo, DevilerDetailsQuery query); + + /** + * 查询在库订单分页 + * @param vo + * @param query + * @return + */ + IPage stockOrderPage(StockOrderVO vo, StockOrderQuery query); + + /** + * 导出在库订单excel + * @param response + * @param vo + * @param query + */ + void exportStockOrder(HttpServletResponse response, StockOrderVO vo, StockOrderQuery query); } diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/ReportStockService.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/ReportStockService.java index 5ce678da1..cbc266f94 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/ReportStockService.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/ReportStockService.java @@ -16,15 +16,57 @@ import javax.servlet.http.HttpServletResponse; */ public interface ReportStockService { + /** + * 查询库存品报表分页 + * + * @param vo + * @param query + * @return + */ IPage detailsPage(StockDetailsVO vo, StockDetailsQuery query); + /** + * 导出库存品报表excel + * + * @param response + * @param vo + * @param query + */ void exportDetails(HttpServletResponse response, StockDetailsVO vo, StockDetailsQuery query); + /** + * 查询库存入库报表 + * + * @param vo + * @param query + * @return + */ IPage inStocks(ReportInStockVO vo, StockInQuery query); + /** + * 导出库存入库excel + * + * @param response + * @param vo + * @param query + */ void exportInStocks(HttpServletResponse response, ReportInStockVO vo, StockInQuery query); + /** + * 查询库存出库报表 + * + * @param vo + * @param query + * @return + */ IPage outStocks(ReportOutStockVO vo, StockOutQuery query); + /** + * 导出库存出库报表excel + * + * @param response + * @param vo + * @param query + */ void exportOutStocks(HttpServletResponse response, ReportOutStockVO vo, StockOutQuery query); } diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportBillLoadingAsyncService.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportBillLoadingAsyncService.java index 7c2119847..048211723 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportBillLoadingAsyncService.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportBillLoadingAsyncService.java @@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.report.constant.ReportConstants; import com.logpm.report.mapper.ReportBillLoadingMapper; import com.logpm.report.query.BillDetailsQuery; import com.logpm.report.query.BillLoadingTasksQuery; @@ -31,6 +32,12 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; +/** + * 自提报表业务实现类 + * + * @Author zqb + * @Date 2024/3/14 + **/ @Log4j2 @Service @AllArgsConstructor @@ -61,8 +68,8 @@ public class ReportBillLoadingAsyncService implements IReportBillLoadingAsyncSer // 提货人 QueryUtil.splitEqQuery("bill_user", query.getBillUserRange(), queryWrapper); // 提货时间 - QueryUtil.timeGe("create_time", query.getStartCreatedTime(), queryWrapper); - QueryUtil.timeLe("create_time", query.getEndCreatedTime(), queryWrapper); + QueryUtil.timeGe("created_time", query.getStartCreatedTime(), queryWrapper); + QueryUtil.timeLe("created_time", query.getEndCreatedTime(), queryWrapper); } @Override @@ -91,7 +98,7 @@ public class ReportBillLoadingAsyncService implements IReportBillLoadingAsyncSer } } R> listR = userClient.userInfoByIds(AuthUtil.getTenantId(), CollUtil.join(userIds, ",")); - if (ObjectUtil.equal(200, listR.getCode())) { + if (ObjectUtil.equal(ReportConstants.HTTP_SUCCESS_CODE, listR.getCode())) { List data = listR.getData(); Map collect = data.stream().collect(Collectors.toMap(User::getId, User::getName)); for (BillLoadingDetailsVO detailsVO : detailsPage) { diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java index 5fae0d4ef..c37999c00 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java @@ -6,15 +6,18 @@ import com.logpm.report.mapper.ReportDeliverMapeer; import com.logpm.report.query.DevilerDetailsQuery; import com.logpm.report.query.ReportCustomerQuery; import com.logpm.report.query.ReportDevilerQuery; +import com.logpm.report.query.StockOrderQuery; import com.logpm.report.reader.DeliveryCustomerReader; import com.logpm.report.reader.DeliveryDetailReader; import com.logpm.report.reader.DeliveryTrainReader; +import com.logpm.report.reader.StockOrderReader; import com.logpm.report.service.ReportDeliverService; import com.logpm.report.util.QueryUtil; import com.logpm.report.util.ReportExcelUtil; import com.logpm.report.vo.ReportCustomerVO; import com.logpm.report.vo.ReportDetailVO; import com.logpm.report.vo.ReportDevilerVO; +import com.logpm.report.vo.StockOrderVO; import lombok.AllArgsConstructor; import org.springblade.core.mp.support.Condition; import org.springframework.stereotype.Service; @@ -33,6 +36,7 @@ public class ReportDeliverServiceImpl implements ReportDeliverService { private final DeliveryTrainReader deliveryTrainReader; private final DeliveryCustomerReader deliveryCustomerReader; private final DeliveryDetailReader deliveryDetailReader; + private final StockOrderReader stockOrderReader; @Override public IPage deliveryTrainPage(ReportDevilerVO vo, ReportDevilerQuery query) { @@ -139,4 +143,35 @@ public class ReportDeliverServiceImpl implements ReportDeliverService { new ReportExcelUtil().export(response, deliveryDetailReader, ReportDetailVO.class, queryWrapper, "配送明细报表"); } + @Override + public IPage stockOrderPage(StockOrderVO vo, StockOrderQuery query) { + IPage page = Condition.getPage(query); + QueryWrapper queryWrapper = QueryUtil.buildQueryWrapper(vo, StockOrderVO.class); + stockOrderQuery(query, queryWrapper); + return page.setRecords(reportDeliverMapeer.getStockOrderPage(page, queryWrapper)); + } + + private void stockOrderQuery(StockOrderQuery query, QueryWrapper queryWrapper) { + // 入库时间开始 + QueryUtil.timeGe("warehouse_entry_time", query.getStartWarehouseEntryTime(), queryWrapper); + QueryUtil.timeLe("warehouse_entry_time", query.getEndWarehouseEntryTime(), queryWrapper); + // 仓库 + QueryUtil.splitEqQuery("warehouse", query.getWarehouseRange(), queryWrapper); + // 运单号 + QueryUtil.splitEqQuery("waybill_number", query.getWaybillNumberRange(), queryWrapper); + // 商场名称 + QueryUtil.splitEqQuery("mall_name", query.getMallNameRange(), queryWrapper); + // 收货人 + QueryUtil.splitEqQuery("consignee_person", query.getConsigneePersonRange(), queryWrapper); + // 品牌 + QueryUtil.splitEqQuery("brand", query.getBrandRange(), queryWrapper); + } + + @Override + public void exportStockOrder(HttpServletResponse response, StockOrderVO vo, StockOrderQuery query) { + QueryWrapper queryWrapper = QueryUtil.buildQueryWrapper(vo, StockOrderVO.class); + stockOrderQuery(query, queryWrapper); + new ReportExcelUtil().export(response, stockOrderReader, StockOrderVO.class, queryWrapper, "在库订单表"); + } + } diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportStockServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportStockServiceImpl.java index c74b16fac..f387b1a74 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportStockServiceImpl.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportStockServiceImpl.java @@ -1,5 +1,8 @@ package com.logpm.report.service.impl; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.report.mapper.ReportStockMapeer; @@ -16,10 +19,14 @@ import com.logpm.report.vo.ReportInStockVO; import com.logpm.report.vo.ReportOutStockVO; import com.logpm.report.vo.StockDetailsVO; import lombok.AllArgsConstructor; +import org.springblade.common.constant.DictBizConstant; import org.springblade.core.mp.support.Condition; +import org.springblade.core.tool.api.R; +import org.springblade.system.feign.IDictBizClient; import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * @author zhaoqiaobo @@ -33,6 +40,7 @@ public class ReportStockServiceImpl implements ReportStockService { private final DeliveryStockReader deliveryStockReader; private final DeliveryInStocksReader inStocksReader; private final DeliveryOutStocksReader outStocksReader; + private final IDictBizClient dictBizClient; @Override public IPage detailsPage(StockDetailsVO vo, StockDetailsQuery query) { @@ -67,7 +75,19 @@ public class ReportStockServiceImpl implements ReportStockService { IPage page = Condition.getPage(query); QueryWrapper queryWrapper = QueryUtil.buildQueryWrapper(vo, ReportInStockVO.class); inStocksCustomQuery(query, queryWrapper); - return page.setRecords(reportStockMapeer.getInStocks(page, queryWrapper)); + List inStocks = reportStockMapeer.getInStocks(page, queryWrapper); + if (CollUtil.isNotEmpty(inStocks)) { + for (ReportInStockVO inStock : inStocks) { + String serviceType = inStock.getServiceType(); + if (StrUtil.isNotBlank(serviceType)) { + R value = dictBizClient.getValue(DictBizConstant.DISTRIBUTION_TYPE, serviceType); + if (ObjectUtil.isNotNull(value)) { + inStock.setServiceType(value.getData()); + } + } + } + } + return page.setRecords(inStocks); } private void inStocksCustomQuery(StockInQuery query, QueryWrapper queryWrapper) { diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/util/QueryUtil.java b/blade-service/logpm-report/src/main/java/com/logpm/report/util/QueryUtil.java index 606ac057a..4ae8d9895 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/util/QueryUtil.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/util/QueryUtil.java @@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.logpm.report.constant.ReportConstants; import org.springblade.core.mp.support.Condition; import java.util.Date; @@ -67,7 +68,7 @@ public class QueryUtil { public static void splitEqQuery(String field, String value, QueryWrapper wrapper) { if (StrUtil.isNotBlank(value)) { String splitValue = value.replaceAll("，", ","); - if (value.contains(",")) { + if (value.contains(ReportConstants.PARAM_SPLITTER)) { List splits = StrUtil.split(splitValue, ","); if (CollUtil.isNotEmpty(splits)) { StrUtil.trim(splits.toArray(new String[0])); diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/util/ReportExcelUtil.java b/blade-service/logpm-report/src/main/java/com/logpm/report/util/ReportExcelUtil.java index 3e43be101..1b862b28a 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/util/ReportExcelUtil.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/util/ReportExcelUtil.java @@ -6,7 +6,8 @@ import com.alibaba.excel.ExcelWriter; import com.alibaba.excel.write.metadata.WriteSheet; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.logpm.report.service.ExportReaderService; +import com.logpm.report.constant.ReportConstants; +import com.logpm.report.service.ExportReader; import org.apache.poi.ss.formula.functions.T; import javax.servlet.http.HttpServletResponse; @@ -41,6 +42,7 @@ public class ReportExcelUtil { /** * 设置excel导出的返回头 + * * @param response HttpServletResponse对象 * @param fileName 文件名 */ @@ -56,30 +58,31 @@ public class ReportExcelUtil { /** * 多线程导出数据到excel 带默认参数 pageSize onceSheetDataNum + * * @param response HttpServletResponse对象 - * @param service ExportReaderService读取器接口实现类 - * @param classz easyexcel 导出数据定义对象 - * @param query 数据查询对象 + * @param service ExportReaderService读取器接口实现类 + * @param classz easyexcel 导出数据定义对象 + * @param query 数据查询对象 * @param fileName 导出文件名称 */ - public void export(HttpServletResponse response, ExportReaderService service, Class classz, Wrapper query, String fileName) { + public void export(HttpServletResponse response, ExportReader service, Class classz, Wrapper query, String fileName) { export(response, service, classz, query, fileName, PAGESIZE, SHEETDATANUM); } /** * 多线程导出数据到excel * 注意事项： - * 1 需要定义导出数据读取器，实现 ExportReaderService 接口.实现接口中的两个方法 + * 1 需要定义导出数据读取器，实现 ExportReaderService 接口.实现接口中的两个方法 * - * @param response HttpServletResponse对象 - * @param service ExportReaderService读取器接口实现类 - * @param classz easyexcel 导出数据定义对象 - * @param query 数据查询对象 - * @param fileName 导出文件名称 - * @param pageSize 每次查询多少条数据 + * @param response HttpServletResponse对象 + * @param service ExportReaderService读取器接口实现类 + * @param classz easyexcel 导出数据定义对象 + * @param query 数据查询对象 + * @param fileName 导出文件名称 + * @param pageSize 每次查询多少条数据 * @param onceSheetDataNum 一个sheet页最大装多少条数据 */ - public void export(HttpServletResponse response, ExportReaderService service, Class classz, Wrapper query, String fileName, Long pageSize, Long onceSheetDataNum) { + public void export(HttpServletResponse response, ExportReader service, Class classz, Wrapper query, String fileName, Long pageSize, Long onceSheetDataNum) { // 设置响应头 ReportExcelUtil.setExportHeader(response, fileName); // 获取需要导出的总条数 @@ -91,7 +94,7 @@ public class ReportExcelUtil { // 总共需要查询数据库几次 int findNum = (int) Math.ceil((count / pageSize.doubleValue())); // 封装查询后需要导出的数据 - Map> pageMap = new HashMap<>(); + Map> pageMap = new HashMap<>(ReportConstants.HASHMAP_DEFAULT_SIZE); // 定义线程池，大表导出使用一个线程池 ExecutorService executorService = ThreadPoolUtil.getThreadPool(); // 控制线程全部查询完后执行导出操作 @@ -128,9 +131,9 @@ public class ReportExcelUtil { // 执行查询操作返回数据 List deliveryTrainPage = service.findList(page, query); // 获取组装的数据列表 - List reportDevilerVOS = pageMap.get(finalI); + List detailVo = pageMap.get(finalI); // 将查询数据添加到本地缓存 - if (CollectionUtil.isEmpty(reportDevilerVOS)) { + if (CollectionUtil.isEmpty(detailVo)) { pageMap.put(finalI, deliveryTrainPage); } else { pageMap.get(finalI).addAll(deliveryTrainPage); diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/BillLoadingTasksVO.java b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/BillLoadingTasksVO.java index 62659a5ee..559ecc1d7 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/BillLoadingTasksVO.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/BillLoadingTasksVO.java @@ -109,8 +109,8 @@ public class BillLoadingTasksVO implements Serializable { @ExcelProperty("增值费") private String addValueFee; - @ApiModelProperty(value = "增值费") - @ExcelProperty("增值费") + @ApiModelProperty(value = "费用合计") + @ExcelProperty("费用合计") private String amountToFee; @ApiModelProperty(value = "提货时间") diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/StockOrderVO.java b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/StockOrderVO.java new file mode 100644 index 000000000..47b0c55b5 --- /dev/null +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/StockOrderVO.java @@ -0,0 +1,169 @@ +package com.logpm.report.vo; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 在库订单表 vo + * + * @author zhaoqiaobo + * @create 2024-03-06 16:02 + */ +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +@ApiModel(value = "在库订单表", description = "在库订单表") +@Data +public class StockOrderVO implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "运单号", position = 7) + @ExcelProperty("运单号") + private String waybillNumber; + + @ApiModelProperty(value = "服务号") + @ExcelProperty("服务号") + private String serviceNumber; + + @ApiModelProperty(value = "订单自编号") + @ExcelProperty("订单自编号") + private String orderCode; + + @ApiModelProperty(value = "商场名称", position = 9) + @ExcelProperty("商场名称") + private String mallName; + + @ApiModelProperty(value = "货物名称") + @ExcelProperty("货物名称") + private String descriptionGoods; + + @ApiModelProperty(value = "仓库", position = 5) + @ExcelProperty("仓库") + private String warehouse; + + @ApiModelProperty(value = "入库时间", position = 1) + @ExcelProperty("入库时间") + @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date warehouseEntryTime; + + @ApiModelProperty(value = "最新入库时间") + @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @ExcelProperty("最新入库时间") + private Date warehouseEntryTimeEnd; + + @ApiModelProperty(value = "在库时间") + @ExcelProperty("在库时间") + private String storeTime; + + @ApiModelProperty(value = "收货单位") + @ExcelProperty("收货单位") + private String consigneeUnit; + + @ApiModelProperty(value = "收货人", position = 11) + @ExcelProperty("收货人") + private String consigneePerson; + + @ApiModelProperty(value = "订单总件数") + @ExcelProperty("订单总件数") + private Integer totalNumber; + + @ApiModelProperty(value = "在库件数") + @ExcelProperty("在库件数") + private Integer handQuantity; + + @ApiModelProperty(value = "未入库数量") + @ExcelProperty("未入库数量") + private Integer notReceived; + + @ApiModelProperty(value = "分拣件数") + @ExcelProperty("分拣件数") + private Integer sortingQuantity; + + @ApiModelProperty(value = "配送件数") + @ExcelProperty("配送件数") + private Integer deliveryQuantity; + + @ApiModelProperty(value = "中转件数") + @ExcelProperty("中转件数") + private Integer transferQuantity; + + @ApiModelProperty(value = "签收件数") + @ExcelProperty("签收件数") + private Integer signinQuantity; + + @ApiModelProperty(value = "上架状态") + @ExcelProperty("上架状态") + private String groundingStatus; + + @ApiModelProperty(value = "品牌", position = 13) + @ExcelProperty("品牌") + private String brand; + + @ApiModelProperty(value = "所在托盘") + @ExcelProperty("所在托盘") + private String trays; + + @ApiModelProperty(value = "所在货位") + @ExcelProperty("所在货位") + private String allocation; + + @ApiModelProperty(value = "冻结状态") + @ExcelProperty("冻结状态") + private String freezeStatus; + + @ApiModelProperty(value = "订单状态") + @ExcelProperty("订单状态") + private String orderStatus; + + @ApiModelProperty(value = "预约状态") + @ExcelProperty("预约状态") + private String reservationStatus; + + @ApiModelProperty(value = "备货状态") + @ExcelProperty("备货状态") + private String stockupStatus; + + @ApiModelProperty(value = "是否齐套") + @ExcelProperty("是否齐套") + private Integer completeSet; + + @ApiModelProperty(value = "服务类型") + @ExcelProperty("服务类型") + private String typeService; + + @ApiModelProperty(value = "顾客名字") + @ExcelProperty("顾客名字") + private String customerName; + + @ApiModelProperty(value = "顾客电话") + @ExcelProperty("顾客电话") + private String customerTelephone; + + @ApiModelProperty(value = "顾客地址") + @ExcelProperty("顾客地址") + private String customerAddress; + + @ApiModelProperty(value = "增值服务") + @ExcelProperty("增值服务") + private BigDecimal fee; + + @ApiModelProperty(value = "创建人") + @ExcelProperty("创建人") + private String createUser; + + @ApiModelProperty(value = "创建时间") + @ExcelProperty("创建时间") + private String createTime; + +} From 0ba2e89aa89c1539be40d552f25f7325a2085d3c Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Fri, 15 Mar 2024 18:58:26 +0800 Subject: [PATCH 10/15] =?UTF-8?q?PDA=E6=89=B9=E9=87=8F=E7=AD=BE=E6=94=B6?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E3=80=81=E9=85=8D=E9=80=81=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=8C=85=E4=BB=B6=E4=BA=8C=E7=BB=B4=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionSignforAppController.java | 2 +- .../DistributionStockListController.java | 13 + .../mapper/DistributionDeliveryInfoMapper.xml | 4 +- .../IDistributionStockListService.java | 6 + .../impl/DistributionSignforServiceImpl.java | 397 ++++++++---------- .../DistributionStockListServiceImpl.java | 65 ++- 6 files changed, 262 insertions(+), 225 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java index ddfd812fc..8b0aa8a3a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java @@ -239,7 +239,7 @@ public class DistributionSignforAppController { if(StringUtils.isBlank(orderPackageCodes)){ orderPackageCodes = packageCode+""; }else{ - orderPackageCodes = orderPackageCodes + "," +packageCode; + orderPackageCodes = orderPackageCodes + "," + packageCode; } } BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockListController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockListController.java index 9f591fb63..73d095ac0 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockListController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockListController.java @@ -153,7 +153,20 @@ public class DistributionStockListController extends BladeController { return R.fail(e.getMessage()); } return R.data(orderPackgeCodeDataVo); + } + @GetMapping("/showInventoryPackgeCode") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "返回模板和模板内容") + public R showOrderPackgeCode(@ApiIgnore @RequestParam Long id){ + + OrderPackgeCodeDataVO orderPackgeCodeDataVo= null; + try { + orderPackgeCodeDataVo = distributionStockListService.showInvnetoryPackgeCode(id); + } catch (Exception e) { + return R.fail(e.getMessage()); + } + return R.data(orderPackgeCodeDataVo); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml index 44d5cdbbe..a6beae1dc 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml @@ -121,9 +121,7 @@ FROM logpm_distribution_stockup_info AS ldsi LEFT JOIN logpm_distribution_stockup AS ldss ON ldsi.stockup_id = ldss.id - WHERE - ldsi.reservation_id = lds.reservation_id - ) AS t ON t.reservation_id = ldsi.reservation_id + ) AS t ON t.reservation_id = lds.reservation_id lds.is_deleted = 0 and lds.delivery_id = #{id} and ldr.reservation_status != 40 AND (ldr.reservation_num + ldr.reservation_stock_list_num) > 0 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockListService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockListService.java index 1bb5d54df..943fd0bd1 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockListService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockListService.java @@ -196,6 +196,12 @@ public interface IDistributionStockListService extends BaseService 这里一件签收针对的就是制定的任务下的包件和库存品 @@ -3986,16 +3991,13 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl> map = distributionSignfor.getMap(); -// if (Func.isEmpty(map)){ -// log.error("#############无图片信息:{}", map); -// return R.fail("无图片信息"); -// } + this.updatePicture(distributionSignfor); //2、维护状态 DistributionReservationEntity reservationEntity = distributionReservationMapper.selectById(distributionSignfor.getReservationId()); if (Func.isEmpty(reservationEntity)) { - log.error("#############reservationEntity参数错误:{}", reservationEntity); + + log.error(method+"reservationEntity参数错误:{}", reservationEntity); return R.fail("服务器正忙~~"); } //查询数据 @@ -4007,7 +4009,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl detailEntities = distributionReservationMapper.selectInventoryListByReservation(distributionSignforEntity.getReservationId()); if (detailEntities.size() > 0 && Func.isNotEmpty(detailEntities)) { + loadingInventoryNum+=detailEntities.stream().mapToInt(DisStockListDetailEntity::getNum).sum(); + signingInventoryNum+=detailEntities.stream().mapToInt(DisStockListDetailEntity::getNum).sum(); boolean flag = detailEntities.stream().allMatch(s -> Func.isNotEmpty(s.getStockPackageCode())); //只要库存品没有进行备货操作则不能进行一件装车操作 if (flag) { @@ -4059,11 +4063,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl parcelNumberEntityList = distributionReservationMapper.selectZeroPackageListByReservationId(distributionSignforEntity.getReservationId()); if (Func.isNotEmpty(parcelNumberEntityList)) { + loadingPackageNum += parcelNumberEntityList.stream().mapToInt(DistributionParcelNumberDTO::getReservationNum).sum(); + signingPackageNum += parcelNumberEntityList.stream().mapToInt(DistributionParcelNumberDTO::getReservationNum).sum(); for (DistributionParcelNumberDTO parcelNumberEntity : parcelNumberEntityList) { DistributionLoadscanEntity distributionLoadscanEntity = distributionLoadscanService.getOne(Wrappers.query().lambda().eq(DistributionLoadscanEntity::getReservationId, distributionSignforEntity.getReservationId()).eq(DistributionLoadscanEntity::getPackageId, parcelNumberEntity.getParcelListId()).ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())); + DistributionParcelNumberEntity parcelNumberServiceById = distributionParcelNumberService.getOne(Wrappers.query().lambda().eq(DistributionParcelNumberEntity::getParcelListId, parcelNumberEntity.getId())); + Integer outboundQuantity = 0; + Integer signinQuantity = 0; + Integer deliveryQuantity = 0; + Integer handQuantity = 0; if (Func.isNotEmpty(distributionLoadscanEntity)) { //情况列举： // 1、装车件数未按照计划数量 @@ -4150,67 +4152,42 @@ public class DistributionSignforServiceImpl extends BaseServiceImplquery().lambda().eq(DistributionParcelNumberEntity::getParcelListId, parcelNumberEntity.getId())); + if (distributionLoadscanEntity.getSignforState().equals(LoadScanSigningStatusConstant.yiqianshou.getValue())) { //装车数量和签收数量只会一样， - if (distributionLoadscanEntity.getReceivedQuantity() > 0) { - distributionParcelNumberEntity.setSigninQuantity(signinQuantity.add(reservationNum).subtract(receivedQuantity).intValue()); - distributionParcelNumberEntity.setHandQuantity(handQuantity.add(receivedQuantity).subtract(reservationNum).intValue()); - distributionParcelNumberEntity.setOutboundQuantity(outboundQuantity.add(reservationNum).subtract(receivedQuantity).intValue()); - distributionParcelNumberEntity.setDeliveryQuantity(deliveryQuantity.add(receivedQuantity).subtract(reservationNum).intValue()); - distributionParcelNumberService.updateById(distributionParcelNumberEntity); + if (distributionLoadscanEntity.getReceivedQuantity() > 0 && distributionLoadscanEntity.getReceivedQuantity() <= parcelNumberEntity.getReservationNum()) { + outboundQuantity = distributionParcelNumberEntity.getOutboundQuantity() + distributionLoadscanEntity.getLoadedNub() - parcelNumberEntity.getReservationNum(); + signinQuantity = distributionParcelNumberEntity.getSigninQuantity() + distributionLoadscanEntity.getReceivedQuantity() - parcelNumberEntity.getReservationNum(); + deliveryQuantity = distributionParcelNumberEntity.getDeliveryQuantity() + distributionLoadscanEntity.getLoadedNub() - parcelNumberEntity.getReservationNum(); + handQuantity = distributionParcelNumberEntity.getHandQuantity() + distributionLoadscanEntity.getLoadedNub() - parcelNumberEntity.getReservationNum(); + //装车按照计划完成装车 + distributionLoadscanEntity.setPackageNub(parcelNumberEntity.getReservationNum()); + distributionLoadscanEntity.setLoadedNub(parcelNumberEntity.getReservationNum()); + distributionLoadscanEntity.setReceivedQuantity(parcelNumberEntity.getReservationNum()); + distributionLoadscanService.updateById(distributionLoadscanEntity); } else { - log.error("################扫描签收零担订单数量为0:{}", distributionLoadscanEntity); - return Resp.scanFail("服务器正忙...", "请稍后重试"); + log.error("################扫描签收零担订单数量异常:{}", distributionLoadscanEntity); + return Resp.scanFail("数量录入错误", "数量录入错误"); } } else if (distributionLoadscanEntity.getSignforState().equals(LoadScanSigningStatusConstant.weiqianshou.getValue())) { - if (distributionLoadscanEntity.getLoadedNub().equals(parcelNumberEntity.getReservationNum())) { - //装车数量和计划数量一致，这里进行签收数量的维护 - //修改这里装车数量已经维护好了，只需要维护签收数量 - distributionParcelNumberEntity.setSigninQuantity(signinQuantity.add(reservationNum).intValue()); - distributionParcelNumberService.updateById(distributionParcelNumberEntity); + outboundQuantity = distributionParcelNumberEntity.getOutboundQuantity() + (distributionLoadscanEntity.getLoadedNub() - parcelNumberEntity.getReservationNum()); + signinQuantity = distributionParcelNumberEntity.getSigninQuantity() + distributionLoadscanEntity.getReceivedQuantity(); + deliveryQuantity = distributionParcelNumberEntity.getDeliveryQuantity() + (distributionLoadscanEntity.getLoadedNub() - parcelNumberEntity.getReservationNum()); + handQuantity = distributionParcelNumberEntity.getHandQuantity() + (distributionLoadscanEntity.getLoadedNub() - parcelNumberEntity.getReservationNum()); + distributionLoadscanEntity.setReceivedQuantity(parcelNumberEntity.getReservationNum()); + distributionLoadscanEntity.setLoadedNub(parcelNumberEntity.getReservationNum()); + distributionLoadscanEntity.setPackageNub(parcelNumberEntity.getReservationNum()); + distributionLoadscanEntity.setSignforState(LoadScanSigningStatusConstant.yiqianshou.getValue()); + if (distributionSignfor.getIsClerk()) { + distributionLoadscanEntity.setMsg("文员一键签收数据补录"); } else { - if (distributionLoadscanEntity.getLoadedNub() > 0) { - distributionParcelNumberEntity.setSigninQuantity(signinQuantity.add(reservationNum).intValue()); - distributionParcelNumberEntity.setHandQuantity(handQuantity.add(loadedQuantity).subtract(reservationNum).intValue()); - distributionParcelNumberEntity.setOutboundQuantity(outboundQuantity.add(reservationNum).subtract(loadedQuantity).intValue()); - distributionParcelNumberEntity.setDeliveryQuantity(deliveryQuantity.add(loadedQuantity).subtract(reservationNum).intValue()); - distributionParcelNumberService.updateById(distributionParcelNumberEntity); - } + distributionLoadscanEntity.setMsg("司机一键签收数据补录"); } - } else { - log.error("##################扫描签收状态异常:{}", distributionLoadscanEntity.getId()); - throw new RuntimeException("服务器正忙..."); - } - distributionLoadscanEntity.setReceivedQuantity(parcelNumberEntity.getReservationNum()); - distributionLoadscanEntity.setLoadedNub(parcelNumberEntity.getReservationNum()); - distributionLoadscanEntity.setPackageNub(parcelNumberEntity.getReservationNum()); - distributionLoadscanEntity.setSignforState(LoadScanSigningStatusConstant.yiqianshou.getValue()); - if (distributionSignfor.getIsClerk()) { - distributionLoadscanEntity.setMsg("文员一键签收数据补录"); - } else { - distributionLoadscanEntity.setMsg("司机一键签收数据补录"); + distributionLoadscanService.updateById(distributionLoadscanEntity); } - distributionLoadscanService.updateById(distributionLoadscanEntity); - distributionAsyncService.checkSignStatus(distributionLoadscanEntity.getPackageId(), distributionLoadscanEntity.getReservationId(), distributionLoadscanEntity.getDeliveryId()); - //更新签收人 - Integer m = distributionSignforMapper.updateSignUser(distributionLoadscanEntity.getDeliveryId(), distributionLoadscanEntity.getReservationId(), AuthUtil.getUser()); - //维护签收数量 - DistributionSignforEntity signforEntity = distributionSignforMapper.selectOne(Wrappers.query().lambda().eq(DistributionSignforEntity::getDeliveryId, distributionLoadscanEntity.getDeliveryId()).eq(DistributionSignforEntity::getReservationId, distributionLoadscanEntity.getReservationId())); - BigDecimal loadedNumber = new BigDecimal(signforEntity.getLoadedNumber()); - BigDecimal signingReceivedQuantity = new BigDecimal(signforEntity.getReceivedQuantity()); - signforEntity.setLoadedNumber(loadedNumber.subtract(loadedQuantity).add(reservationNum).intValue()); - signforEntity.setReceivedQuantity(signingReceivedQuantity.subtract(receivedQuantity).add(reservationNum).intValue()); - distributionSignforMapper.updateById(signforEntity); - } else { + }else { //不存在装车数据 DistributionLoadscanEntity loadscanEntity = new DistributionLoadscanEntity(); loadscanEntity.setPackageId(parcelNumberEntity.getParcelListId()); @@ -4221,7 +4198,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl packageIds = new ArrayList<>(); - List orderCodes = new ArrayList<>(); - if (Func.isNotEmpty(parcelListEntityList)) { - for (DistributionParcelListEntity parcelListEntity : parcelListEntityList) { - //查询是否进行装车 - DistributionLoadscanEntity loadscanEntities = distributionLoadscanService.getOne(Wrappers.query().lambda() - .eq(DistributionLoadscanEntity::getPackageId, parcelListEntity.getId()) - .eq(DistributionLoadscanEntity::getDeliveryId, distributionSignforEntity.getDeliveryId()) - .eq(DistributionLoadscanEntity::getReservationId, distributionSignforEntity.getReservationId()) - .ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())); - parcelListEntity.setOrderPackageLoadingStatus(OrderPackageLoadingStatusConstant.yizhuangche.getValue()); - parcelListEntity.setOrderPackageStatus(OrderPackageStatusConstant.yiqianshou.getValue()); - if (Func.isEmpty(loadscanEntities)) { - //没有进行过装车操作 - DistributionLoadscanEntity loadscanEntity = new DistributionLoadscanEntity(); - loadscanEntity.setPackageId(parcelListEntity.getId()); - loadscanEntity.setOrderPackageCode(parcelListEntity.getOrderPackageCode()); - loadscanEntity.setOrderId(parcelListEntity.getStockArticleId()); - loadscanEntity.setDeliveryId(distributionSignforEntity.getDeliveryId()); - loadscanEntity.setReservationId(distributionSignforEntity.getReservationId()); - loadscanEntity.setScanUser(user.getNickName()); - loadscanEntity.setScanTime(signingTime); - loadscanEntity.setPackageNub(parcelListEntity.getQuantity()); - loadscanEntity.setSigningUser(user.getNickName()); - loadscanEntity.setSigningUserId(user.getUserId()); - if (Func.isNotEmpty(distributionDeliverySelfEntity.getDriverId())) { - loadscanEntity.setDriverId(distributionDeliverySelfEntity.getDriverId()); - } - if (Func.isNotEmpty(distributionDeliverySelfEntity.getDriverName())) { - loadscanEntity.setDriverName(distributionDeliverySelfEntity.getDriverName()); - } - if (Func.isNotEmpty(distributionDeliverySelfEntity.getVehicleId())) { - loadscanEntity.setVehicleId(distributionDeliverySelfEntity.getVehicleId()); - } - if (Func.isNotEmpty(distributionDeliverySelfEntity.getVehicleNub())) { - loadscanEntity.setVehicleName(distributionDeliverySelfEntity.getVehicleNub()); - } - if (Func.isNotEmpty(distributionDeliverySelfEntity.getDriverPhone())) { - loadscanEntity.setDriverPhone(distributionDeliverySelfEntity.getDriverPhone()); - } - loadscanEntity.setLoadingId(distributionDeliverySelfEntity.getId().toString()); - loadscanEntity.setScanStatus(LoadingStatusConstant.yijianzhuangche.getValue()); - loadscanEntity.setIsInsert(LoadingIsInsertConstant.bulu.getValue()); - loadscanEntity.setScanType("1"); - loadscanEntity.setType(2); - loadscanEntity.setSignforState(LoadScanSigningStatusConstant.yiqianshou.getValue()); - loadscanEntity.setIsSignfor(1); - loadscanEntity.setReceivedQuantity(parcelListEntity.getQuantity()); - loadscanEntity.setOneClick(2); - loadscanEntity.setOneQclick(2); - loadscanEntity.setSigningTime(signingTime); - if (distributionSignfor.getIsClerk()) { - loadscanEntity.setMsg("文员一键签收数据补录"); - } else { - loadscanEntity.setMsg("司机一键签收数据补录"); - } - distributionLoadscanService.save(loadscanEntity); - Integer i = distributionDeliveryListMapper.updateloadingTimeById(distributionDeliveryListEntity.getId()); - //更新签收表的签收数量和装车数量 - Integer j = distributionSignforMapper.updateSignforByReservationId(loadscanEntity.getDeliveryId(), loadscanEntity.getReservationId(), loadscanEntity.getPackageNub()); - //扣减订单的在库数量 - Integer k = distributionStockArticleMapper.deductionHandQuantity(loadscanEntity.getOrderId(), loadscanEntity.getLoadedNub()); - //更新签收人 - Integer m = distributionSignforMapper.updateSignUser(loadscanEntity.getDeliveryId(), loadscanEntity.getReservationId(), AuthUtil.getUser()); - - } else { - //存在装车数据 - if (distributionSignfor.getIsClerk()) { - loadscanEntities.setMsg("文员一键签收数据补录"); + String signingTime = simpleDateFormat.format(new Date()); + List packageIds = new ArrayList<>(); + List orderCodes = new ArrayList<>(); + if (Func.isNotEmpty(parcelListEntityList)) { + loadingPackageNum+=parcelListEntityList.stream().mapToInt(DistributionParcelListEntity::getQuantity).sum(); + signingPackageNum+=parcelListEntityList.stream().mapToInt(DistributionParcelListEntity::getQuantity).sum(); + for (DistributionParcelListEntity parcelListEntity : parcelListEntityList) { + //查询是否进行装车 + DistributionLoadscanEntity loadscanEntities = distributionLoadscanService.getOne(Wrappers.query().lambda() + .eq(DistributionLoadscanEntity::getPackageId, parcelListEntity.getId()) + .eq(DistributionLoadscanEntity::getDeliveryId, distributionSignforEntity.getDeliveryId()) + .eq(DistributionLoadscanEntity::getReservationId, distributionSignforEntity.getReservationId()) + .ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())); + parcelListEntity.setOrderPackageLoadingStatus(OrderPackageLoadingStatusConstant.yizhuangche.getValue()); + parcelListEntity.setOrderPackageStatus(OrderPackageStatusConstant.yiqianshou.getValue()); + if (Func.isEmpty(loadscanEntities)) { + //没有进行过装车操作 + DistributionLoadscanEntity loadscanEntity = new DistributionLoadscanEntity(); + loadscanEntity.setPackageId(parcelListEntity.getId()); + loadscanEntity.setOrderPackageCode(parcelListEntity.getOrderPackageCode()); + loadscanEntity.setOrderId(parcelListEntity.getStockArticleId()); + loadscanEntity.setDeliveryId(distributionSignforEntity.getDeliveryId()); + loadscanEntity.setReservationId(distributionSignforEntity.getReservationId()); + loadscanEntity.setScanUser(user.getNickName()); + loadscanEntity.setScanTime(signingTime); + loadscanEntity.setPackageNub(parcelListEntity.getQuantity()); + loadscanEntity.setSigningUser(user.getNickName()); + loadscanEntity.setSigningUserId(user.getUserId()); + if (Func.isNotEmpty(distributionDeliverySelfEntity.getDriverId())) { + loadscanEntity.setDriverId(distributionDeliverySelfEntity.getDriverId()); + } + if (Func.isNotEmpty(distributionDeliverySelfEntity.getDriverName())) { + loadscanEntity.setDriverName(distributionDeliverySelfEntity.getDriverName()); + } + if (Func.isNotEmpty(distributionDeliverySelfEntity.getVehicleId())) { + loadscanEntity.setVehicleId(distributionDeliverySelfEntity.getVehicleId()); + } + if (Func.isNotEmpty(distributionDeliverySelfEntity.getVehicleNub())) { + loadscanEntity.setVehicleName(distributionDeliverySelfEntity.getVehicleNub()); + } + if (Func.isNotEmpty(distributionDeliverySelfEntity.getDriverPhone())) { + loadscanEntity.setDriverPhone(distributionDeliverySelfEntity.getDriverPhone()); + } + loadscanEntity.setLoadingId(distributionDeliverySelfEntity.getId().toString()); + loadscanEntity.setScanStatus(LoadingStatusConstant.yijianzhuangche.getValue()); + loadscanEntity.setIsInsert(LoadingIsInsertConstant.bulu.getValue()); + loadscanEntity.setScanType("1"); + loadscanEntity.setType(2); + loadscanEntity.setSignforState(LoadScanSigningStatusConstant.yiqianshou.getValue()); + loadscanEntity.setIsSignfor(1); + loadscanEntity.setReceivedQuantity(parcelListEntity.getQuantity()); + loadscanEntity.setOneClick(2); + loadscanEntity.setOneQclick(2); + loadscanEntity.setSigningTime(signingTime); + if (distributionSignfor.getIsClerk()) { + loadscanEntity.setMsg("文员一键签收数据补录"); + } else { + loadscanEntity.setMsg("司机一键签收数据补录"); + } + distributionLoadscanService.save(loadscanEntity); } else { - loadscanEntities.setMsg("司机一键签收数据补录"); - } - if (!loadscanEntities.getSignforState().equals(LoadScanSigningStatusConstant.yiqianshou.getValue())) { - //已经进行过装车 这里不需要进行订制品订单在库数量扣减 - loadscanEntities.setSignforState(LoadScanSigningStatusConstant.yiqianshou.getValue()); - loadscanEntities.setReceivedQuantity(parcelListEntity.getQuantity()); - loadscanEntities.setOneClick(1); - loadscanEntities.setOneQclick(2); - loadscanEntities.setSigningUser(user.getNickName()); - loadscanEntities.setSigningUserId(user.getUserId()); - loadscanEntities.setReceivedQuantity(parcelListEntity.getQuantity()); - loadscanEntities.setSigningTime(signingTime); - distributionLoadscanService.updateById(loadscanEntities); - Integer i = distributionDeliveryListMapper.updateloadingTimeById(distributionDeliveryListEntity.getId()); - //更新签收数量 - Integer j = distributionSignforMapper.updateSignforNum(loadscanEntities.getDeliveryId(), loadscanEntities.getReservationId(), loadscanEntities.getPackageNub()); - //更新签收人 - Integer m = distributionSignforMapper.updateSignUser(loadscanEntities.getDeliveryId(), loadscanEntities.getReservationId(), AuthUtil.getUser()); - distributionAsyncService.checkSignStatus(loadscanEntities.getPackageId(), loadscanEntities.getReservationId(), loadscanEntities.getDeliveryId()); + //存在装车数据 + if (distributionSignfor.getIsClerk()) { + loadscanEntities.setMsg("文员一键签收数据补录"); + } else { + loadscanEntities.setMsg("司机一键签收数据补录"); + } + if (!loadscanEntities.getSignforState().equals(LoadScanSigningStatusConstant.yiqianshou.getValue())) { + //已经进行过装车 这里不需要进行订制品订单在库数量扣减 + loadscanEntities.setSignforState(LoadScanSigningStatusConstant.yiqianshou.getValue()); + loadscanEntities.setReceivedQuantity(parcelListEntity.getQuantity()); + loadscanEntities.setOneClick(1); + loadscanEntities.setOneQclick(2); + loadscanEntities.setSigningUser(user.getNickName()); + loadscanEntities.setSigningUserId(user.getUserId()); + loadscanEntities.setReceivedQuantity(parcelListEntity.getQuantity()); + loadscanEntities.setSigningTime(signingTime); + distributionLoadscanService.updateById(loadscanEntities); + } } + distributionAsyncService.sendFactory(parcelListEntity, simpleDateFormat.format(new Date()), reservationEntity.getId(), reservationEntity.getReservationCode(), myCurrentWarehouse.getName(), user.getNickName()); + packageIds.add(parcelListEntity.getId()); + orderCodes.add(parcelListEntity.getOrderCode()); + } + //批量维护订单信息 + if (Func.isNotEmpty(orderCodes)) { + String orderCode = orderCodes.stream().distinct().collect(Collectors.joining(",")); + distributionStockArticleService.maintenanceOrderInfo(orderCode, myCurrentWarehouse.getId()); } - distributionAsyncService.sendFactory(parcelListEntity, simpleDateFormat.format(new Date()), reservationEntity.getId(), reservationEntity.getReservationCode(), myCurrentWarehouse.getName(), user.getNickName()); - packageIds.add(parcelListEntity.getId()); - orderCodes.add(parcelListEntity.getOrderCode()); - } - //批量维护订单信息 - if (Func.isNotEmpty(orderCodes)) { - String orderCode = orderCodes.stream().distinct().collect(Collectors.joining(",")); - distributionStockArticleService.maintenanceOrderInfo(orderCode, myCurrentWarehouse.getId()); - } - if (Func.isNotEmpty(packageIds)) { - distributionAsyncService.handlPakcage(packageIds, myCurrentWarehouse.getId()); - //批量推送 - distributionAsyncService.sendReviewFactory(distributionSignforEntity.getId(), myCurrentWarehouse.getName(), myCurrentWarehouse.getId()); + if (Func.isNotEmpty(packageIds)) { + distributionAsyncService.handlPakcage(packageIds, myCurrentWarehouse.getId()); + //批量推送 + distributionAsyncService.sendReviewFactory(distributionSignforEntity.getId(), myCurrentWarehouse.getName(), myCurrentWarehouse.getId()); + } } - } - - //维护客户信息状态 - reservationEntity.setLoadingStatus(ReservationLoadingStatusConstant.yizhuangche.getValue()); - reservationEntity.setSigningStatus(ReservationSigningStatusConstant.yiqianshou.getValue()); - distributionReservationMapper.updateById(reservationEntity); - //维护签收状态 -// distributionAsyncService.checkDeliverySignStatusByReservation(distributionSignforEntity.getDeliveryId()); -// distributionDeliveryListEntity.setDeliveryListLoadingStatus(ReservationLoadingStatusConstant.yizhuangche.getValue()); -// if (distributionSignfor.getIsClerk()) { -// distributionDeliveryListEntity.setDeliveryStatus(DeliveryStatusConstant.peisongzhong.getValue()); -// } else { -// distributionDeliveryListEntity.setDeliveryStatus(DeliveryStatusConstant.yiwancheng.getValue()); -// } -// distributionDeliveryListMapper.updateById(distributionDeliveryListEntity); - LambdaUpdateWrapper set = new UpdateWrapper().lambda() - .eq(DistributionSignforEntity::getId, distributionSignforEntity.getId()) - .set(StringUtils.isNotBlank(distributionSignfor.getDeliverySignPictures()), DistributionSignforEntity::getDeliverySignPictures, distributionSignfor.getDeliverySignPictures()) - .set(StringUtils.isNotBlank(distributionSignfor.getSigningType()), DistributionSignforEntity::getSigningType, distributionSignfor.getSigningType()) - .set(DistributionSignforEntity::getDriverSigning, 2) - .set(!distributionSignfor.getIsClerk() && StringUtils.isNotBlank(distributionSignfor.getDriverRemarks()), DistributionSignforEntity::getDriverRemarks, distributionSignfor.getDriverRemarks()) - .set(DistributionSignforEntity::getDriverSigning, 2); - boolean update = this.update(set); - //维护配送信息 - return R.status(true); - } + //维护客户信息状态 + reservationEntity.setLoadingStatus(ReservationLoadingStatusConstant.yizhuangche.getValue()); + reservationEntity.setSigningStatus(ReservationSigningStatusConstant.yiqianshou.getValue()); + distributionReservationMapper.updateById(reservationEntity); + //更新配送装车时间 + Integer i = distributionDeliveryListMapper.updateloadingTimeById(distributionDeliveryListEntity.getId()); + distributionDeliveryListEntity.setDeliveryStatus(DeliveryStatusConstant.peisongzhong.getValue()); + distributionDeliveryListEntity.setDeliveryListLoadingStatus(DeliveryLoadingStatusConstant.yizhuangche.getValue()); + distributionDeliveryListService.updateById(distributionDeliveryListEntity); + //更新装车人 + Integer m = distributionSignforMapper.updateSignUser(distributionDeliveryListEntity.getId(),distributionSignfor.getReservationId(), AuthUtil.getUser()); + log.info(method+"装车包件数>>>>>>>>>>>>>>:{}",loadingPackageNum); + log.info(method+"装车库存品数>>>>>>>>>>>>>>:{}",loadingInventoryNum); + log.info(method+"签收包件数>>>>>>>>>>>>>>:{}",signingPackageNum); + log.info(method+"签收库存品数>>>>>>>>>>>>>>:{}",signingPackageNum); + + LambdaUpdateWrapper set = new UpdateWrapper().lambda() + .eq(DistributionSignforEntity::getId, distributionSignforEntity.getId()) + .set(StringUtils.isNotBlank(distributionSignfor.getDeliverySignPictures()), DistributionSignforEntity::getDeliverySignPictures, distributionSignfor.getDeliverySignPictures()) + .set(StringUtils.isNotBlank(distributionSignfor.getSigningType()), DistributionSignforEntity::getSigningType, distributionSignfor.getSigningType()) + .set( DistributionSignforEntity::getLoadedinNumber, loadingInventoryNum) + .set( DistributionSignforEntity::getLoadedNumber, loadingPackageNum) + .set( DistributionSignforEntity::getReceivedinQuantity, signingInventoryNum) + .set( DistributionSignforEntity::getReceivedQuantity, signingPackageNum) + .set(DistributionSignforEntity::getDriverSigning, 2) + .set(!distributionSignfor.getIsClerk() && StringUtils.isNotBlank(distributionSignfor.getDriverRemarks()), DistributionSignforEntity::getDriverRemarks, distributionSignfor.getDriverRemarks()) + .set(DistributionSignforEntity::getDriverSigning, 2); + boolean update = this.update(set); + //维护配送信息 + return R.status(true); + } @Override diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java index 60b03b44c..c07ae37e2 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java @@ -108,6 +108,9 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl map = JSONObject.parseObject(JSONObject.toJSONString(stockListEntity), Map.class); + Map map =JSONObject.parseObject(JSONObject.toJSONString(stockListEntity), Map.class); map.put("id",disStockListDetailEntity.getId()); map.put("customerName",distributionReservationEntity.getConsignee()); map.put("customerTelephone",distributionReservationEntity.getDeliveryPhone()); @@ -765,6 +768,66 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl data = new ArrayList<>(); + BasicPrintTemplateEntity template = basicPrintTemplateClient.getPrintTemplate(PrintTemplateStatusConstant.daiqueren_11.getValue()); + if (ObjectUtil.isEmpty(template)) { + throw new ServiceException("模板内容未找到"); + } + + String html = null; + try { + html = TemplateUtil.getTemplateByUrl(template.getTemplateUrl()); + orderPackgeCodeDataVO.setTemplateHtml(html); + orderPackgeCodeDataVO.setTemplateId(template.getId()); + //查询库存品包件 + DisStockListDetailEntity disStockListDetail = disStockListDetailService.getById(id); + if (Func.isEmpty(disStockListDetail)){ + log.error("##################查询库存品包件失败id:{}",id); + throw new ServiceException("库存品包件查询失败"); + } + + + //查询库存品信息 + DistributionStockListEntity stockListEntity = this.getById(disStockListDetail.getStockListId()); + if (Func.isEmpty(stockListEntity)){ + log.info("##############查询ID:{}",disStockListDetail.getStockListId()); + throw new ServiceException("查询库存品信息失败"); + } + + DistributionReservationEntity distributionReservationEntity = distributionReservationMapper.selectById(disStockListDetail.getReservationId()); + if (Func.isEmpty(distributionReservationEntity)){ + log.info("##############查询ID:{}",distributionReservationEntity); + throw new ServiceException("查询库存品信息失败"); + } + Map map =JSONObject.parseObject(JSONObject.toJSONString(stockListEntity), Map.class); + map.put("id",disStockListDetail.getId()); + map.put("customerName",distributionReservationEntity.getConsignee()); + map.put("customerTelephone",distributionReservationEntity.getDeliveryPhone()); + map.put("customerAddress",distributionReservationEntity.getDeliveryAddress()); + map.put("shipperName"," "); + map.put("shipperAddress"," "); + map.put("stockPackageCode",disStockListDetail.getStockPackageCode()); + String filename = QRCodeUtil.createCodeToFile(disStockListDetail.getStockPackageCode()); + map.put("img", QRCodeUtil.getEmpAutograph(filename)); + if (Func.isNotEmpty(stockListEntity.getOrderCode())){ + String fileTypeName = QRCodeUtil.createCodeToFile(stockListEntity.getOrderCode()); + map.put("imgType", QRCodeUtil.getEmpAutograph(fileTypeName)); + } + data.add(map); + + orderPackgeCodeDataVO.setDataList(data); + + return orderPackgeCodeDataVO; + } catch (Exception e) { + throw new RuntimeException(e); + } + + } + @Override public OrderPackgeCodeDataVO showInventorySourcePackageCode(String incomingBatch, Long packageIds) throws Exception { OrderPackgeCodeDataVO orderPackgeCodeDataVO = new OrderPackgeCodeDataVO(); From 571d5b02dfd976493138fb54409cd5309d4a690f Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Fri, 15 Mar 2024 20:20:01 +0800 Subject: [PATCH 11/15] =?UTF-8?q?=E6=89=98=E7=9B=98=E8=A3=85=E8=BD=A6BUG?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionDeliveryListServiceImpl.java | 2 +- .../warehouse/service/impl/WarehouseTrayTypeServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index ddcc77a78..40495df6a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -5084,7 +5084,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl goodsLsit = trayTypeDataVO.getGoodsLsit(); if (Func.isNotEmpty(goodsLsit)) { diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java index ce6263211..e6c011e6f 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java @@ -2893,7 +2893,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl Date: Fri, 15 Mar 2024 20:44:26 +0800 Subject: [PATCH 12/15] =?UTF-8?q?=E6=89=98=E7=9B=98=E8=B4=A7=E7=89=A9?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WarehouseTrayTypeServiceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java index e6c011e6f..a738cef38 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java @@ -2893,7 +2893,12 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl Date: Fri, 15 Mar 2024 20:51:08 +0800 Subject: [PATCH 13/15] =?UTF-8?q?=E6=89=98=E7=9B=98=E8=B4=A7=E7=89=A9?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../warehouse/service/impl/WarehouseTrayTypeServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java index a738cef38..585e01b91 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java @@ -2897,7 +2897,6 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl Date: Fri, 15 Mar 2024 22:34:32 +0800 Subject: [PATCH 14/15] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/thread/JobRegistryMonitorHelper.java | 4 +- .../admin/core/thread/JobScheduleHelper.java | 2 +- .../impl/BasicdataGoodsShelfServiceImpl.java | 3 +- .../impl/BasicdataVehicleServiceImpl.java | 2 +- .../impl/DistributionAsyncServiceImpl.java | 14 +- .../DistributionDeliveryListServiceImpl.java | 7 +- .../impl/DistributionSignforServiceImpl.java | 416 +++++++++--------- .../DistributionStockArticleServiceImpl.java | 8 +- .../impl/DistributionStockupServiceImpl.java | 6 +- .../ZbFactoryAccountsInterceptor.java | 2 +- .../service/impl/OuPaiFactoryServiceImpl.java | 2 +- .../service/impl/TaskQuestServiceImpl.java | 6 +- 12 files changed, 225 insertions(+), 247 deletions(-) diff --git a/blade-ops/blade-xxljob-admin/src/main/java/com/xxl/job/admin/core/thread/JobRegistryMonitorHelper.java b/blade-ops/blade-xxljob-admin/src/main/java/com/xxl/job/admin/core/thread/JobRegistryMonitorHelper.java index 1e91014f7..ea6001eeb 100644 --- a/blade-ops/blade-xxljob-admin/src/main/java/com/xxl/job/admin/core/thread/JobRegistryMonitorHelper.java +++ b/blade-ops/blade-xxljob-admin/src/main/java/com/xxl/job/admin/core/thread/JobRegistryMonitorHelper.java @@ -78,14 +78,14 @@ public class JobRegistryMonitorHelper { } } catch (Exception e) { if (!toStop) { - logger.error(">>>>>>>>>>> xxl-job, job registry monitor thread error:{}", e); + logger.error(">>>>>>>>>>> xxl-job, job registry monitor thread error:", e); } } try { TimeUnit.SECONDS.sleep(RegistryConfig.BEAT_TIMEOUT); } catch (InterruptedException e) { if (!toStop) { - logger.error(">>>>>>>>>>> xxl-job, job registry monitor thread error:{}", e); + logger.error(">>>>>>>>>>> xxl-job, job registry monitor thread error:", e); } } } diff --git a/blade-ops/blade-xxljob-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java b/blade-ops/blade-xxljob-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java index 765161a94..d2a3163de 100644 --- a/blade-ops/blade-xxljob-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java +++ b/blade-ops/blade-xxljob-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java @@ -143,7 +143,7 @@ public class JobScheduleHelper { } catch (Exception e) { if (!scheduleThreadToStop) { - logger.error(">>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}", e); + logger.error(">>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:", e); } } finally { diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java index 3a7eac048..b6965786a 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java @@ -121,8 +121,7 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl basicdataGoodsShelfVOIPage = basicdataGoodsShelfMapper.getGoodsShelfList(page, basicdataGoodsShelf); - return basicdataGoodsShelfVOIPage; + return basicdataGoodsShelfMapper.getGoodsShelfList(page, basicdataGoodsShelf); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataVehicleServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataVehicleServiceImpl.java index 1cccc09f3..7ce8876f4 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataVehicleServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataVehicleServiceImpl.java @@ -165,7 +165,7 @@ public class BasicdataVehicleServiceImpl extends BaseServiceImpl data) { String method = "#############BasicdataVehicleServiceImpl.importDriverArtery"; - log.info("车辆模板导入信息>>>>",data); + log.info("车辆模板导入信息>>>>{}",data); try { ListdrivermiddleEntities = new ArrayList<>(); //对导入数据进行处理 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java index 6161b3d81..879382d5c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java @@ -1439,13 +1439,15 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { break; case "欧派": //推送到欧派 - try { - // ouPaiFactoryClinet.newSystemHandleStatusDataSignforOne("7",distributionParcelListEntity.getOrderPackageCode(), signingTime, userName );//*签收人*// - // log.info(">>>>>>>>>>>>>>>>>>>>>>>> 签收推送 欧派:{} {} {} {}", "7",distributionParcelListEntity.getOrderPackageCode(), signingTime, userName ); - } catch (Exception e) { - throw new RuntimeException(e); - } +// try { +// // ouPaiFactoryClinet.newSystemHandleStatusDataSignforOne("7",distributionParcelListEntity.getOrderPackageCode(), signingTime, userName );//*签收人*// +// // log.info(">>>>>>>>>>>>>>>>>>>>>>>> 签收推送 欧派:{} {} {} {}", "7",distributionParcelListEntity.getOrderPackageCode(), signingTime, userName ); +// } catch (Exception e) { +// throw new RuntimeException(e); +// } break; + default: + log.info("开单其它品牌stockArticleEntity.getBrand() ={}",stockArticleEntity.getBrand()); //其他..... } } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index 40495df6a..3d340533b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -4587,8 +4587,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl collect = list.stream().filter(l -> !l.getScanStatus().equals(LoadingStatusConstant.quxiao.getValue())).map(DistributionLoadscaninvnEntity::getScanUser).collect(Collectors.toList()); int loadingNum = list.stream().mapToInt(DistributionLoadscaninvnEntity::getLoadedNub).sum(); rs.setLoadedinNumber(loadingNum); - HashSet strings = new HashSet<>(); - strings.addAll(collect); + HashSet strings = new HashSet<>(collect); rs.setScanUser(String.join(",", strings)); if (loadingNum > 0 && loadingNum == rs.getReservationNum()) { @@ -5653,12 +5652,12 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl reservationStockarticleEntityList = baseMapper.selectReservationStockByDeliveryId(distrilbutionloadingscanDTO.getDeliveryId()); if (Func.isEmpty(reservationStockarticleEntityList)) { - log.error("#############配送任务查询订单错误,deliveryId:{}", distrilbutionloadingscanDTO.getDeliveryId()); + log.info("#############配送任务查询订单错误,deliveryId:{}", distrilbutionloadingscanDTO.getDeliveryId()); return null; } List orderIds = reservationStockarticleEntityList.stream().filter(rs -> Func.isNotEmpty(rs.getIsZero()) && rs.getIsZero().equals(IsOrNoConstant.yes.getValue())).map(DistributionReservationStockarticleEntity::getStockArticleId).collect(Collectors.toList()); if (Func.isEmpty(orderIds)) { - log.error("####################配送任务下无零担信息:{}"); + log.info("####################配送任务下无零担信息:{}",orderIds); return Resp.scanFail("查询错误", "该任务无零担订单"); } List parcelNumberVOS = new ArrayList<>(); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index 013f12daa..a41811904 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -47,7 +47,6 @@ import com.logpm.distribution.wrapper.DistributionStockArticleWrapper; import com.logpm.warehouse.feign.IWarehouseUpdownTypeClient; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; -import org.apache.logging.log4j.util.Strings; import org.jetbrains.annotations.NotNull; import org.springblade.common.constant.DictBizConstant; import org.springblade.common.constant.DistributionTypeConstant; @@ -209,7 +208,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl selectDistributionSignforPage(IPage page, DistributionSignforVO distributionSignfor) { @@ -241,7 +239,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl0){ + if (Func.isNotEmpty(list) && list.size() > 0) { zhuangchejianshu += list.stream().filter(f -> f.getStockLockingStatus().equals(InventoryLoadingStatusConstant.yizhuangche.getValue())).mapToInt(DisStockListDetailEntity::getNum).sum(); // weizhuangchejianshu += list.stream().filter(f -> f.getStockLockingStatus().equals(InventoryLoadingStatusConstant.weizhuangche.getValue())).mapToInt(DisStockListDetailEntity::getNum).sum(); qianshoujianshu += list.stream().filter(f -> f.getStockSignfoStatus().equals(InventorySigningStatusConstant.yiqianshou.getValue())).mapToInt(DisStockListDetailEntity::getNum).sum(); @@ -538,8 +536,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl distributionSignPrintList = new ArrayList<>(); distributionSignfor.getMap().forEach((k, v) -> { - v.stream().forEach(i -> { + v.forEach(i -> { DistributionSignPrintEntity distributionSignPrint = new DistributionSignPrintEntity(); BeanUtils.copyProperties(i, distributionSignPrint); distributionSignPrint.setId(null); @@ -821,16 +819,16 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl list = Func.toLongList(zeroPackageIds); @@ -884,13 +885,13 @@ public class DistributionSignforServiceImpl extends BaseServiceImplquery().lambda() .eq(DistributionLoadscanEntity::getReservationId, reservationId) .in(DistributionLoadscanEntity::getPackageId, list) .ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()) ); - if (Func.isEmpty(loadscanEntity)){ - if ("1".equals(deliveryListEntity.getKind())){ + if (Func.isEmpty(loadscanEntity)) { + if ("1".equals(deliveryListEntity.getKind())) { //自主配送 driverPhone = deliverySelfInfo.stream().filter(f -> 2 == f.getIsMaster()).map(DistributionDeliverySelfVO::getDriverPhone).collect(Collectors.joining(",")); driverName = deliverySelfInfo.stream().filter(f -> 2 == f.getIsMaster()).map(DistributionDeliverySelfVO::getDriverName).collect(Collectors.joining(",")); vehicleNub = deliverySelfInfo.stream().filter(f -> 2 == f.getIsMaster()).map(DistributionDeliverySelfVO::getVehicleNub).collect(Collectors.joining(",")); List collect = deliverySelfInfo.stream().filter(f -> 2 == f.getIsMaster()).map(DistributionDeliverySelfVO::getId).collect(Collectors.toList()); loadingId = collect.get(0); - }else if ("2".equals(deliveryListEntity.getKind())){ + } else if ("2".equals(deliveryListEntity.getKind())) { //外协 - }else { - log.error(method+"配送司机异常:{}",distrilbutionloadingscanDTO.getDeliveryId()); + } else { + log.error(method + "配送司机异常:{}", distrilbutionloadingscanDTO.getDeliveryId()); return R.fail("请联系管理员"); } a = distributionParcelNumberEntity.getHandQuantity() - reservationZeroPackageEntity.getQuantity(); @@ -986,7 +987,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl parcelListDTOS = distrilbutionloadingscanDTO.getParcelListDTOS(); - if (parcelListDTOS.size()>1 || parcelListDTOS.size() == 0){ - log.error(method+"提交零担订单错误:{}",distrilbutionloadingscanDTO.getDeliveryId()); + if (parcelListDTOS.size() > 1 || parcelListDTOS.size() == 0) { + log.error(method + "提交零担订单错误:{}", distrilbutionloadingscanDTO.getDeliveryId()); return R.fail("请联系管理员"); } DistributionParcelNumberDTO distributionParcelNumberDTO = parcelListDTOS.get(0); - if (distributionParcelNumberDTO.getNumber() > reservationZeroPackageEntities.getQuantity()){ + if (distributionParcelNumberDTO.getNumber() > reservationZeroPackageEntities.getQuantity()) { //超过计划数 - log.error(method+"签收零担订单数量超过计划数错误:{}",distributionParcelNumberDTO.getParcelListId()); - return R.fail("请联系管理员"); + log.error(method + "签收零担订单数量超过计划数错误:{}", distributionParcelNumberDTO.getParcelListId()); + return R.fail("请联系管理员"); } //查询零担包件详情 DistributionParcelNumberEntity distributionParcelNumberEntity = distributionParcelNumberService.getOne(Wrappers.query().lambda() @@ -1085,26 +1086,26 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl deliverySelfInfo = distributionDeliverySelfMapper.getDeliverySelfInfo(deliveryListEntity.getId()); //在库数 - int a =0; + int a = 0; //签收数 - int b =0; + int b = 0; //出库数 - int c =0; + int c = 0; //冻结数 - int d =0; - if (Func.isEmpty(loadscanEntity)){ + int d = 0; + if (Func.isEmpty(loadscanEntity)) { - if ("1".equals(deliveryListEntity.getKind())){ + if ("1".equals(deliveryListEntity.getKind())) { //自主配送 driverPhone = deliverySelfInfo.stream().filter(f -> 2 == f.getIsMaster()).map(DistributionDeliverySelfVO::getDriverPhone).collect(Collectors.joining(",")); driverName = deliverySelfInfo.stream().filter(f -> 2 == f.getIsMaster()).map(DistributionDeliverySelfVO::getDriverName).collect(Collectors.joining(",")); vehicleNub = deliverySelfInfo.stream().filter(f -> 2 == f.getIsMaster()).map(DistributionDeliverySelfVO::getVehicleNub).collect(Collectors.joining(",")); List collect = deliverySelfInfo.stream().filter(f -> 2 == f.getIsMaster()).map(DistributionDeliverySelfVO::getId).collect(Collectors.toList()); loadingId = collect.get(0); - }else if ("2".equals(deliveryListEntity.getKind())){ + } else if ("2".equals(deliveryListEntity.getKind())) { //外协 - }else { - log.error(method+"配送司机异常:{}",distrilbutionloadingscanDTO.getDeliveryId()); + } else { + log.error(method + "配送司机异常:{}", distrilbutionloadingscanDTO.getDeliveryId()); return R.fail("请联系管理员"); } a = distributionParcelNumberDTO.getHandQuantity() - reservationZeroPackageEntities.getQuantity(); @@ -1158,7 +1159,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl 0){ + if (stockupNum > 0) { DeliveryNodeVo middleStockUpNodeVo = new DeliveryNodeVo(); middleStockUpNodeVo.setNodeName(StockUpNode.beihuozhong.getName()); //查询备货扫描列表 @@ -1226,20 +1227,20 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl scanUser = new ArrayList<>(); for (Long id : userId) { R userR = userClient.userInfoById(id); - if (Func.isNotEmpty(userR)){ + if (Func.isNotEmpty(userR)) { scanUser.add(userR.getData().getName()); } } middleStockUpNodeVo.setNodeUserName(String.join(",", scanUser)); List collect = distributionStockEntities.stream().map(DistributionStockEntity::getCreateTime).distinct().collect(Collectors.toList()); middleStockUpNodeVo.setTime(Collections.max(collect)); - if (stockupNum.equals(stockUpPlanNum)){ + if (stockupNum.equals(stockUpPlanNum)) { middleStockUpNodeVo.setNodeName(StockUpNode.yiwancheng.getName()); } - middleStockUpNodeVo.setNodeInfo("计划备货"+stockUpPlanNum+"件;"+"备货"+stockupNum+"件;"); + middleStockUpNodeVo.setNodeInfo("计划备货" + stockUpPlanNum + "件;" + "备货" + stockupNum + "件;"); nodeVos.add(middleStockUpNodeVo); } - }catch (Exception e){ + } catch (Exception e) { throw new RuntimeException(e); } @@ -1257,29 +1258,29 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl0){ + if (loadingNum > 0) { //存在装车环境,进行数量的比对 DeliveryNodeVo middleBillLadingNodeVo = new DeliveryNodeVo(); middleBillLadingNodeVo.setNodeName(BillLadingNode.qianshouzhong.getName()); - if (loadingNum.equals(billLadingNum)){ + if (loadingNum.equals(billLadingNum)) { middleBillLadingNodeVo.setNodeName(BillLadingNode.qianshouwancheng.getName()); } //自提签收的操作人 List distributionBillLadingScanEntityList = distributionBillLadingScanService.list(Wrappers.query().lambda() - .eq(DistributionBillLadingScanEntity::getBillLadingId,distrilbutionBillLadingEntity.getId()) + .eq(DistributionBillLadingScanEntity::getBillLadingId, distrilbutionBillLadingEntity.getId()) ); List userName = new ArrayList<>(); - if (Func.isNotEmpty(distributionBillLadingScanEntityList)){ + if (Func.isNotEmpty(distributionBillLadingScanEntityList)) { List userIds = distributionBillLadingScanEntityList.stream().map(DistributionBillLadingScanEntity::getCreateUser).distinct().collect(Collectors.toList()); - if (Func.isNotEmpty(userIds)){ + if (Func.isNotEmpty(userIds)) { //查询用户 for (Long userId : userIds) { R userR = userClient.userInfoById(userId); - if (Func.isNotEmpty(userR)){ + if (Func.isNotEmpty(userR)) { userName.add(userR.getData().getName()); } } @@ -1288,22 +1289,22 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl collect = distributionBillLadingScanEntityList.stream().map(DistributionBillLadingScanEntity::getCreateTime).distinct().collect(Collectors.toList()); Date max = Collections.max(collect); middleBillLadingNodeVo.setTime(max); - middleBillLadingNodeVo.setNodeUserName(String.join(",",userName)); - middleBillLadingNodeVo.setNodeInfo("计划自提"+billLadingNum+"件,"+"装车"+loadingNum+"件"); + middleBillLadingNodeVo.setNodeUserName(String.join(",", userName)); + middleBillLadingNodeVo.setNodeInfo("计划自提" + billLadingNum + "件," + "装车" + loadingNum + "件"); nodeVos.add(middleBillLadingNodeVo); } - if (distrilbutionBillLadingEntity.getConditions().equals(BillLadingStatusConstant.yiqianshou.getValue())){ + if (distrilbutionBillLadingEntity.getConditions().equals(BillLadingStatusConstant.yiqianshou.getValue())) { //文员完成确动作 DeliveryNodeVo endBillLadingNodeVo = new DeliveryNodeVo(); endBillLadingNodeVo.setNodeName(BillLadingNode.yiwancheng.getName()); endBillLadingNodeVo.setTime(distrilbutionBillLadingEntity.getUpdateTime()); String endUserName = userClient.userInfoById(distrilbutionBillLadingEntity.getUpdateUser()).getData().getName(); endBillLadingNodeVo.setNodeUserName(endUserName); - endBillLadingNodeVo.setNodeInfo("计划自提"+billLadingNum+"件,"+"签收"+loadingNum+"件"); + endBillLadingNodeVo.setNodeInfo("计划自提" + billLadingNum + "件," + "签收" + loadingNum + "件"); nodeVos.add(endBillLadingNodeVo); } } - }catch (Exception e){ + } catch (Exception e) { throw new RuntimeException(e); } @@ -1322,11 +1323,11 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl 0){ + if (loadingNum > 0) { DeliveryNodeVo middleReservationNodeVo = new DeliveryNodeVo(); middleReservationNodeVo.setNodeName(ReservationNode.zhuangchezhong.getName()); //查询预约装车操作人有那些 @@ -1337,7 +1338,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl scanUser = new ArrayList<>(); List loadingTime = new ArrayList<>(); - if (Func.isNotEmpty(loadscanEntityList)){ + if (Func.isNotEmpty(loadscanEntityList)) { List packageScanUser = loadscanEntityList.stream().map(DistributionLoadscanEntity::getScanUser).collect(Collectors.toList()); scanUser.addAll(packageScanUser); List packagheLoadingTime = loadscanEntityList.stream().map(DistributionLoadscanEntity::getScanTime).collect(Collectors.toList()); @@ -1347,30 +1348,30 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl InventoryScanUser = inventoryLoading.stream().map(DistributionLoadscaninvnEntity::getScanUser).collect(Collectors.toList()); scanUser.addAll(InventoryScanUser); List inventoryLoadingTime = inventoryLoading.stream().map(DistributionLoadscaninvnEntity::getScanTime).collect(Collectors.toList()); loadingTime.addAll(inventoryLoadingTime); } - if (Func.isNotEmpty(scanUser)){ + if (Func.isNotEmpty(scanUser)) { String scanUsers = scanUser.stream().distinct().collect(Collectors.joining(",")); middleReservationNodeVo.setNodeUserName(scanUsers); } - if (Func.isNotEmpty(loadingTime)){ + if (Func.isNotEmpty(loadingTime)) { String max = Collections.max(loadingTime); middleReservationNodeVo.setTime(sdf.parse(max)); } - if (reservationEntity.getLoadingStatus().equals(ReservationLoadingStatusConstant.yizhuangche.getValue())){ + if (reservationEntity.getLoadingStatus().equals(ReservationLoadingStatusConstant.yizhuangche.getValue())) { middleReservationNodeVo.setNodeName(ReservationNode.zhuangchewancheng.getName()); } - middleReservationNodeVo.setNodeInfo("计划配送"+projectNum+"件"+"装车"+loadingNum+"件"); + middleReservationNodeVo.setNodeInfo("计划配送" + projectNum + "件" + "装车" + loadingNum + "件"); nodeVos.add(middleReservationNodeVo); } Integer signingNum = distributionLoadscanMapper.selectSigningNumByReservationId(reservationEntity.getId()); - if (signingNum>0){ + if (signingNum > 0) { DeliveryNodeVo endReservationNodeVo = new DeliveryNodeVo(); endReservationNodeVo.setNodeName(ReservationNode.qianshouzhong.getName()); //查询预约装车操作人有那些 @@ -1381,7 +1382,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl scanUser = new ArrayList<>(); List signTime = new ArrayList<>(); - if (Func.isNotEmpty(loadscanEntityList)){ + if (Func.isNotEmpty(loadscanEntityList)) { List packageScanUser = loadscanEntityList.stream().map(DistributionLoadscanEntity::getScanUser).collect(Collectors.toList()); scanUser.addAll(packageScanUser); List packagheSignTimeTime = loadscanEntityList.stream().map(DistributionLoadscanEntity::getSigningTime).collect(Collectors.toList()); @@ -1393,40 +1394,40 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl inventoryScanUser = inventoryLoading.stream().map(DistributionLoadscaninvnEntity::getScanUser).collect(Collectors.toList()); scanUser.addAll(inventoryScanUser); List inventorySignTimeTime = inventoryLoading.stream().map(DistributionLoadscaninvnEntity::getSigningTime).collect(Collectors.toList()); signTime.addAll(inventorySignTimeTime); } - if (Func.isNotEmpty(scanUser)){ + if (Func.isNotEmpty(scanUser)) { String scanUsers = scanUser.stream().distinct().collect(Collectors.joining(",")); endReservationNodeVo.setNodeUserName(scanUsers); } - if (Func.isNotEmpty(signTime)){ + if (Func.isNotEmpty(signTime)) { String max = Collections.max(signTime); endReservationNodeVo.setTime(sdf.parse(max)); } - if (reservationEntity.getSigningStatus().equals(ReservationSigningStatusConstant.yiqianshou.getValue())){ + if (reservationEntity.getSigningStatus().equals(ReservationSigningStatusConstant.yiqianshou.getValue())) { endReservationNodeVo.setNodeName(ReservationNode.qianshouwancheng.getName()); } - endReservationNodeVo.setNodeInfo("计划配送"+projectNum+"件;"+"装车"+loadingNum+"件;"+"签收"+signingNum+"件"); + endReservationNodeVo.setNodeInfo("计划配送" + projectNum + "件;" + "装车" + loadingNum + "件;" + "签收" + signingNum + "件"); nodeVos.add(endReservationNodeVo); } //查询此预约是否完成复核 DistributionSignforEntity signforEntity = distributionSignforMapper.selectByReservationId(reservationEntity.getId()); - if (Func.isNotEmpty(signforEntity)){ - if (signforEntity.getSigningStatus().equals(SignforStatusConstant.yiqianshou.getValue())){ + if (Func.isNotEmpty(signforEntity)) { + if (signforEntity.getSigningStatus().equals(SignforStatusConstant.yiqianshou.getValue())) { DeliveryNodeVo signReservationNodeVo = new DeliveryNodeVo(); signReservationNodeVo.setTime(sdf.parse(signforEntity.getSigningTime())); signReservationNodeVo.setNodeUserName(signforEntity.getExamineUserName()); signReservationNodeVo.setNodeName(ReservationNode.fuhewancheng.getName()); - signReservationNodeVo.setNodeInfo("计划配送"+projectNum+"件;"+"装车"+loadingNum+"件;"+"签收"+signingNum+"件"); + signReservationNodeVo.setNodeInfo("计划配送" + projectNum + "件;" + "装车" + loadingNum + "件;" + "签收" + signingNum + "件"); nodeVos.add(signReservationNodeVo); } } - }catch (Exception e){ + } catch (Exception e) { throw new RuntimeException(e); } @@ -1436,49 +1437,49 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl handleDeliveryNode(DistributionDeliveryListEntity deliveryListEntity) { List nodeVos = new ArrayList<>(); try { - String deliveryStatus = deliveryListEntity.getDeliveryStatus(); - //存在该配送任务一定存在创建时间 - DeliveryNodeVo deliveryNodeVo = new DeliveryNodeVo(); - deliveryNodeVo.setTime(deliveryListEntity.getCreateTime()); - String name = userClient.userInfoById(deliveryListEntity.getCreateUser()).getData().getName(); - deliveryNodeVo.setNodeUserName(name); - deliveryNodeVo.setNodeName(DeliveryNode.chuangjianchenggong.getName()); - deliveryNodeVo.setNodeInfo(deliveryListEntity.getTrainNumber()+"车次计划配送"+(deliveryListEntity.getDeliveryNumber()+deliveryListEntity.getInventoryNub())); - nodeVos.add(deliveryNodeVo); + String deliveryStatus = deliveryListEntity.getDeliveryStatus(); + //存在该配送任务一定存在创建时间 + DeliveryNodeVo deliveryNodeVo = new DeliveryNodeVo(); + deliveryNodeVo.setTime(deliveryListEntity.getCreateTime()); + String name = userClient.userInfoById(deliveryListEntity.getCreateUser()).getData().getName(); + deliveryNodeVo.setNodeUserName(name); + deliveryNodeVo.setNodeName(DeliveryNode.chuangjianchenggong.getName()); + deliveryNodeVo.setNodeInfo(deliveryListEntity.getTrainNumber() + "车次计划配送" + (deliveryListEntity.getDeliveryNumber() + deliveryListEntity.getInventoryNub())); + nodeVos.add(deliveryNodeVo); Integer loadingNum = distributionLoadscanMapper.selectLoadingNumByDeliveryId(deliveryListEntity.getId()); - if (loadingNum != 0){ - DistributionDeliverySelfEntity distributionDeliverySelfEntity= distributionDeliverySelfMapper.selectByDeliveyId(deliveryListEntity.getId()); - if (Func.isEmpty(distributionDeliverySelfEntity)){ - log.error(deliveryListEntity.getKind()+"配送任务的配送方式"); + if (loadingNum != 0) { + DistributionDeliverySelfEntity distributionDeliverySelfEntity = distributionDeliverySelfMapper.selectByDeliveyId(deliveryListEntity.getId()); + if (Func.isEmpty(distributionDeliverySelfEntity)) { + log.error(deliveryListEntity.getKind() + "配送任务的配送方式"); return nodeVos; } //司机点击发车按钮 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); DeliveryNodeVo middleDeliveryNodeVo = new DeliveryNodeVo(); middleDeliveryNodeVo.setNodeUserName(distributionDeliverySelfEntity.getDriverName()); - if(Func.isNotEmpty(distributionDeliverySelfEntity.getDepartureTime())){ + if (Func.isNotEmpty(distributionDeliverySelfEntity.getDepartureTime())) { middleDeliveryNodeVo.setTime(sdf.parse(distributionDeliverySelfEntity.getDepartureTime())); } middleDeliveryNodeVo.setNodeName(DeliveryNode.peisongzhong.getName()); - middleDeliveryNodeVo.setNodeInfo(deliveryListEntity.getTrainNumber()+"车次计划配送"+(deliveryListEntity.getDeliveryNumber()+deliveryListEntity.getInventoryNub())+"件"+"装车"+loadingNum+"件"); + middleDeliveryNodeVo.setNodeInfo(deliveryListEntity.getTrainNumber() + "车次计划配送" + (deliveryListEntity.getDeliveryNumber() + deliveryListEntity.getInventoryNub()) + "件" + "装车" + loadingNum + "件"); nodeVos.add(middleDeliveryNodeVo); } - Integer signingNum = distributionLoadscanMapper.selectSigningNumByDeliveryId(deliveryListEntity.getId()); - if (signingNum != 0 && deliveryStatus.equals(DeliveryStatusConstant.yiwancheng.getValue())){ - DeliveryNodeVo endDeliveryNodeVo = new DeliveryNodeVo(); - String endName = userClient.userInfoById(deliveryListEntity.getUpdateUser()).getData().getName(); - endDeliveryNodeVo.setNodeUserName(endName); - endDeliveryNodeVo.setNodeName(DeliveryNode.yiwancheng.getName()); - endDeliveryNodeVo.setTime(deliveryListEntity.getUpdateTime()); - endDeliveryNodeVo.setNodeInfo(deliveryListEntity.getTrainNumber()+"车次计划配送"+(deliveryListEntity.getDeliveryNumber()+deliveryListEntity.getInventoryNub())+"件"+"签收"+signingNum+"件"); - nodeVos.add(endDeliveryNodeVo); - } - //查询是否进行发车按钮 - } catch (ParseException e) { - throw new RuntimeException(e); + Integer signingNum = distributionLoadscanMapper.selectSigningNumByDeliveryId(deliveryListEntity.getId()); + if (signingNum != 0 && deliveryStatus.equals(DeliveryStatusConstant.yiwancheng.getValue())) { + DeliveryNodeVo endDeliveryNodeVo = new DeliveryNodeVo(); + String endName = userClient.userInfoById(deliveryListEntity.getUpdateUser()).getData().getName(); + endDeliveryNodeVo.setNodeUserName(endName); + endDeliveryNodeVo.setNodeName(DeliveryNode.yiwancheng.getName()); + endDeliveryNodeVo.setTime(deliveryListEntity.getUpdateTime()); + endDeliveryNodeVo.setNodeInfo(deliveryListEntity.getTrainNumber() + "车次计划配送" + (deliveryListEntity.getDeliveryNumber() + deliveryListEntity.getInventoryNub()) + "件" + "签收" + signingNum + "件"); + nodeVos.add(endDeliveryNodeVo); } + //查询是否进行发车按钮 + } catch (ParseException e) { + throw new RuntimeException(e); + } return nodeVos; } @@ -1532,8 +1533,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl detailDTOS = handleNumberDetailInventory(signingInventoryList); - return detailDTOS; + return handleNumberDetailInventory(signingInventoryList); } /** @@ -1547,8 +1547,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl detailDTOS = handleNumberDetailPackage(signingPackageList); - return detailDTOS; + return handleNumberDetailPackage(signingPackageList); } /** @@ -1562,8 +1561,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl detailDTOS = handleNumberDetailInventory(unloadingInventoryList); - return detailDTOS; + return handleNumberDetailInventory(unloadingInventoryList); } /** @@ -1577,8 +1575,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl detailDTOS = handleNumberDetailPackage(unLoadingPackageList); - return detailDTOS; + return handleNumberDetailPackage(unLoadingPackageList); } @@ -1593,8 +1590,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl detailDTOS = handleNumberDetailInventory(inventoryLoadingList); - return detailDTOS; + return handleNumberDetailInventory(inventoryLoadingList); } /** @@ -1608,8 +1604,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl detailDTOS = handleNumberDetailPackage(loadingPackageList); - return detailDTOS; + return handleNumberDetailPackage(loadingPackageList); } /** @@ -1622,7 +1617,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl handleNumberDetailPackage(List loadingPackageList) { List detailDTOS = new ArrayList<>(); - loadingPackageList.stream().forEach(p -> { + loadingPackageList.forEach(p -> { DistributionNumberDetailDTO distributionNumberDetailDTO = new DistributionNumberDetailDTO(); distributionNumberDetailDTO.setServiceNumber(p.getServiceNumber()); distributionNumberDetailDTO.setWaybillNumber(p.getWaybillNumber()); @@ -1737,8 +1732,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl list = new ArrayList<>(); distributionSignforList.forEach(d -> { - DistributionSignforOwnExcel signforExcel = Func.copy(d,DistributionSignforOwnExcel.class); - signforExcel.setLoadingTime(d.getLoadingTime()); + DistributionSignforOwnExcel signforExcel = Func.copy(d, DistributionSignforOwnExcel.class); + assert signforExcel != null; + signforExcel.setLoadingTime(d.getLoadingTime()); signforExcel.setDeliveryDriverPhone(d.getDriverPhone()); signforExcel.setDeliveryDriverName(d.getDriverName()); signforExcel.setReservationNum(d.getTotalNum()); signforExcel.setLoadedNumber(d.getPackageLoadingNum() + d.getInventoryLoadingNum()); - signforExcel.setReceivedQuantity(d.getPackageSigningNum()+d.getInventorySigningNum()); + signforExcel.setReceivedQuantity(d.getPackageSigningNum() + d.getInventorySigningNum()); signforExcel.setDeliveryStatusName(d.getDeliveryStatusName()); signforExcel.setDeliveryPhone(d.getDeliveryPhone()); signforExcel.setWithoutScanning(d.getTotalNum() - (d.getPackageLoadingNum() + d.getInventoryLoadingNum())); - signforExcel.setUnsigneds(d.getTotalNum() - (d.getPackageSigningNum()+d.getInventorySigningNum())); + signforExcel.setUnsigneds(d.getTotalNum() - (d.getPackageSigningNum() + d.getInventorySigningNum())); signforExcel.setConsignee(d.getConsignee()); list.add(signforExcel); }); @@ -1839,7 +1835,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl 0) { - msg.append("操作成功").append(abnormalSiginNum + "件"); + msg.append("操作成功").append(abnormalSiginNum).append("件"); } else { msg.append("操作失败"); } @@ -2695,7 +2693,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl parcelNumberVOS = distributionReservationMapper.selectReservationZeroOrderDetail(orderId, Long.parseLong(distributionDeliveryList.getReservationId())); distributionAppStockArticleVO.setSignforNub(0); - if (Func.isNotEmpty(parcelNumberVOS)){ + if (Func.isNotEmpty(parcelNumberVOS)) { parcelNumberVOS.forEach(p -> { DistributionLoadscanEntity loadscanEntity = distributionLoadscanService.getOne(Wrappers.query().lambda().eq(DistributionLoadscanEntity::getReservationId, distributionDeliveryList.getReservationId()).eq(DistributionLoadscanEntity::getOrderId, orderId).eq(DistributionLoadscanEntity::getPackageId, p.getParcelListId()).ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())); p.setLoadingNum(0); @@ -3284,7 +3280,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl deliveryIds = distributionDeliverySelfMapper.selectdeliveryList(driverArtery.getId()); if (!deliveryIds.isEmpty()) { - distributionAppDeliveryListVOS = baseMapper.selectDistributionAppDeliveryInListPage(page, distributionAppDeliveryListDTO, deliveryIds,null); + distributionAppDeliveryListVOS = baseMapper.selectDistributionAppDeliveryInListPage(page, distributionAppDeliveryListDTO, deliveryIds, null); } else { return page.setRecords(distributionAppDeliveryListVOS); } @@ -3295,9 +3291,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl warehouseIdList = getWarehouseIdList(); - log.info(">>> 仓库ID {}",warehouseIdList); + log.info(">>> 仓库ID {}", warehouseIdList); - distributionAppDeliveryListVOS = baseMapper.selectDistributionAppDeliveryInListPage(page, distributionAppDeliveryListDTO, null,warehouseIdList); + distributionAppDeliveryListVOS = baseMapper.selectDistributionAppDeliveryInListPage(page, distributionAppDeliveryListDTO, null, warehouseIdList); } @@ -3434,7 +3430,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl distributionAppDeliverySelfVOS = distributionDeliverySelfMapper.selectListcustom(distributionAppDeliveryListVO.getId()); - if (distributionAppDeliverySelfVOS.size() > 0) { + if (!distributionAppDeliverySelfVOS.isEmpty()) { StringBuilder stringBuilder = new StringBuilder(); distributionAppDeliverySelfVOS.forEach(e -> { if (e.getIsMaster() == 2) { @@ -3444,7 +3440,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl myWarehouseList = basicdataWarehouseClient.getMyWarehouseList(); for (BasicdataWarehouseEntity basicdataWarehouseEntity : myWarehouseList) { warehouseIdList.add(basicdataWarehouseEntity.getId()); } - }else{ + } else { warehouseIdList.add(myCurrentWarehouse.getId()); } return warehouseIdList; @@ -3504,7 +3499,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl().lambda() .eq(DistributionDeliverySelfEntity::getIsMaster, 2) @@ -4200,7 +4197,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl parcelListEntities = baseMapper.getSignforPackageList(signforEntity.getReservationId()); +// List parcelListEntities = baseMapper.getSignforPackageList(signforEntity.getReservationId()); List reservationStockarticleEntityList = distributionReservationStockarticleService.list(Wrappers.query().lambda() .eq(DistributionReservationStockarticleEntity::getReservationId, signforEntity.getReservationId()) .ne(DistributionReservationStockarticleEntity::getStockArticleStatus, ReservationOrderStatusConstant.quxiao.getValue())); @@ -4391,10 +4389,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl { if (rs.getIsZero().equals(IsOrNoConstant.no.getValue())) { - List parcelListEntityList = null; - if (Func.isNotEmpty(myCurrentWarehouse)){ - parcelListEntityList = distributionReservationMapper.selectPackageByReservationAndStockArticle(rs.getReservationId(), rs.getStockArticleId(), myCurrentWarehouse.getId()); - }else { + List parcelListEntityList; + if (Func.isNotEmpty(myCurrentWarehouse)) { + parcelListEntityList = distributionReservationMapper.selectPackageByReservationAndStockArticle(rs.getReservationId(), rs.getStockArticleId(), myCurrentWarehouse.getId()); + } else { parcelListEntityList = distributionReservationMapper.selectPackageByReservationAndStockArticle(rs.getReservationId(), rs.getStockArticleId(), null); } List parcelListVOList = DistributionParcelListWrapper.build().listVO(parcelListEntityList); @@ -4423,6 +4421,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl { + v.forEach(i -> { DistributionSignPrintEntity distributionSignPrint = new DistributionSignPrintEntity(); BeanUtils.copyProperties(i, distributionSignPrint); distributionSignPrint.setReservationId(distributionSignfor.getReservationId()); @@ -5129,7 +5109,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl packagePallet, List stockListPallet) { - Set set = new HashSet<>(); - set.addAll(packagePallet); + Set set = new HashSet<>(packagePallet); for (String pallet : stockListPallet) { if (StringUtil.isBlank(pallet)) { @@ -500,8 +499,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl packageAllocation, List stockListAllocation) { - Set set = new HashSet<>(); - set.addAll(packageAllocation); + Set set = new HashSet<>(packageAllocation); for (String allocation : stockListAllocation) { if (StringUtil.isBlank(allocation)) { diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/interceptor/ZbFactoryAccountsInterceptor.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/interceptor/ZbFactoryAccountsInterceptor.java index bb9c842ac..97181d8d0 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/interceptor/ZbFactoryAccountsInterceptor.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/interceptor/ZbFactoryAccountsInterceptor.java @@ -39,7 +39,7 @@ public class ZbFactoryAccountsInterceptor implements HandlerInterceptor { String body = myRequestWrapper.getBody(); JSONObject bodyJson = JSONObject.parseObject(body); - log.info("bodyJson {}",bodyJson,toString()); + log.info("bodyJson ={}",bodyJson.toString()); Map params = new HashMap<>(); params.put("app_key",appKey); diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java index 99c644ac5..1bcf982eb 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java @@ -581,7 +581,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService { FactoryOrderEntity factoryOrder = factoryOrderService.selectEntityByOrderPackageCode(unitNo); if (Objects.isNull(factoryOrder)) { - log.info("》》》》》》》》》》》》 未查询到该单据推送订单信息", orderStatusDTO.getUnitNo()); + log.info("》》》》》》》》》》》》 未查询到该单据推送订单信息 {}", orderStatusDTO.getUnitNo()); return Resp.fail(400, "未查询到该单据推送订单信息"); } // 如何判断这个包间是非干仓配的数据 diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java index 15b27a4a6..532d18661 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java @@ -772,7 +772,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl questDetailEntities = new ArrayList<>(); - taskSearchDTO.getQuestDetailIds().stream().forEach(i -> { + taskSearchDTO.getQuestDetailIds().forEach(i -> { QuestDetailEntity questDetail = new QuestDetailEntity(); - questDetail.setId(Long.valueOf(i)); + questDetail.setId(i); questDetail.setQuestStatus(0); questDetailEntities.add(questDetail); baseMapper.deleteQuestChild(taskSearchDTO.getQuestNum() + "_child", i); From defeaaa57ba459acfe7c78de744894db2dd8fc0f Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Fri, 15 Mar 2024 23:15:30 +0800 Subject: [PATCH 15/15] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=20--?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BC=82=E5=B8=B8=E9=94=99=E8=AF=AF=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionSignforServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index a41811904..9aa5249f8 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -1428,6 +1428,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl