From feb6f96bcbca788d580bb5abc128857eca736754 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" <123456> Date: Wed, 12 Jul 2023 19:25:24 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E9=85=8D?= =?UTF-8?q?=E9=80=81=E5=8D=95=E9=85=8D=E9=80=81=E5=AE=A2=E6=88=B7=E7=9A=84?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20=E5=BE=85=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...istributionDeliveryListPrintReponseVO.java | 99 +++++++++++++++ ...istributionDeliveryListPrintRequestVO.java | 22 ++++ .../distribution/DistributionApplication.java | 2 +- .../DistributionDeliveryListController.java | 17 ++- .../DistributionDeliveryListMapper.java | 5 + .../mapper/DistributionDeliveryListMapper.xml | 115 +++++++++++------- .../IDistributionDeliveryListService.java | 11 ++ .../DistributionDeliveryListServiceImpl.java | 19 ++- 8 files changed, 238 insertions(+), 52 deletions(-) create mode 100644 blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryListPrintReponseVO.java create mode 100644 blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryListPrintRequestVO.java diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryListPrintReponseVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryListPrintReponseVO.java new file mode 100644 index 000000000..239d56ef4 --- /dev/null +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryListPrintReponseVO.java @@ -0,0 +1,99 @@ +package com.logpm.distribution.vo; + +import io.swagger.models.auth.In; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.util.Date; + +/** + * 配送客户清单打印实体 + */ +@Data +public class DistributionDeliveryListPrintReponseVO { + + /** + * id + */ + private Integer id; + + + /** + * 配送客户单号 + */ + private String reservationCode; + + + /** + * 商城名称 + */ + private String mallName; + + + /** + * 门店名称 + */ + private String storeName; + + + /** + * 订单自编号集合 + */ + private String orderSelfNumberings; + + + /** + * 收货人 + */ + private String consignee; + + /** + * 收货人电话 + */ + private String deliveryPhone; + + /** + * 收货地址 + */ + private String deliveryAddress; + + /** + * 计划数量 + */ + private Integer planNum; + + /** + * 装车数 + */ + private Integer loadCarNum; + + /** + * 签收数 + */ + private Integer signNum; + + /** + * 回库数 + */ + private Integer recycleNum; + + + /** + * 回库订单编号集合 + */ + private Integer recycleOrderSelfNumbers; + + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 更新时间 + */ + private Date updateTime; + + +} diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryListPrintRequestVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryListPrintRequestVO.java new file mode 100644 index 000000000..e28454555 --- /dev/null +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryListPrintRequestVO.java @@ -0,0 +1,22 @@ +package com.logpm.distribution.vo; + +import lombok.Data; + +/** + * 配送客户请求VO + */ +@Data +public class DistributionDeliveryListPrintRequestVO { + + + private String deliveryId; + /** + * 配送单号 + */ + private String noteNumber; + + /** + * 商城名称 + */ + private String mallName; +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/DistributionApplication.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/DistributionApplication.java index de58864a3..12b39ef2c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/DistributionApplication.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/DistributionApplication.java @@ -29,7 +29,7 @@ import org.springblade.core.launch.BladeApplication; public class DistributionApplication { public static void main(String[] args) { - BladeApplication.run(ModuleNameConstant.APPLICATION_DISTRIBUTION_NAME, DistributionApplication.class, args); + BladeApplication.run(ModuleNameConstant.APPLICATION_DISTRIBUTION_NAME.concat("-pref"), DistributionApplication.class, args); } } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java index adfd6ef7a..f411c9508 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java @@ -22,8 +22,7 @@ import com.logpm.distribution.dto.DistributionDeliveryInfoDTO; import com.logpm.distribution.dto.DistributionDeliveryListDTO; import com.logpm.distribution.dto.DistrilbutionloadingscanDTO; import com.logpm.distribution.service.IDistributionDeliveryInfoService; -import com.logpm.distribution.vo.DistributionDeliveryInfoVO; -import com.logpm.distribution.vo.DistributionstatisticsnmbVO; +import com.logpm.distribution.vo.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -42,7 +41,6 @@ import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.distribution.entity.DistributionDeliveryListEntity; -import com.logpm.distribution.vo.DistributionDeliveryListVO; import com.logpm.distribution.excel.DistributionDeliveryListExcel; import com.logpm.distribution.service.IDistributionDeliveryListService; import org.springblade.core.boot.ctrl.BladeController; @@ -259,4 +257,17 @@ public class DistributionDeliveryListController extends BladeController { ExcelUtil.export(response, "配送管理数据" + DateUtil.time(), "配送管理数据表", list, DistributionDeliveryListExcel.class); } + + /** + * 配送客户列表 + */ + @GetMapping("/customList") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "customArgs") + public R> customList(@ApiIgnore @RequestParam Map customArgs, Query query) { + IPage pages = distributionDeliveryListService.customListPage(Condition.getPage(query), Condition.getQueryWrapper(customArgs, DistributionDeliveryListPrintRequestVO.class)); + return R.data(pages); + } + + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java index e159a3997..6a4bd1c35 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java @@ -16,9 +16,12 @@ */ package com.logpm.distribution.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.logpm.distribution.dto.DistributionDeliveryListDTO; import com.logpm.distribution.dto.DistrilbutionloadingscanDTO; import com.logpm.distribution.entity.DistributionDeliveryListEntity; +import com.logpm.distribution.vo.DistributionDeliveryListPrintReponseVO; +import com.logpm.distribution.vo.DistributionDeliveryListPrintRequestVO; import com.logpm.distribution.vo.DistributionDeliveryListVO; import com.logpm.distribution.excel.DistributionDeliveryListExcel; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -88,4 +91,6 @@ public interface DistributionDeliveryListMapper extends BaseMapper customListPage(IPage page, @Param("qw") QueryWrapper queryWrapper); } 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 b49f5b279..aaabcd3b0 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 @@ -3,7 +3,8 @@ - + @@ -52,34 +53,35 @@ + + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java index e77454be2..9768230a9 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java @@ -17,9 +17,12 @@ package com.logpm.distribution.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.logpm.distribution.dto.DistributionDeliveryListDTO; import com.logpm.distribution.dto.DistrilbutionloadingscanDTO; import com.logpm.distribution.entity.DistributionDeliveryListEntity; +import com.logpm.distribution.vo.DistributionDeliveryListPrintReponseVO; +import com.logpm.distribution.vo.DistributionDeliveryListPrintRequestVO; import com.logpm.distribution.vo.DistributionDeliveryListVO; import com.logpm.distribution.excel.DistributionDeliveryListExcel; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -100,4 +103,12 @@ public interface IDistributionDeliveryListService extends BaseService customListPage(IPage page, QueryWrapper queryWrapper); } 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 b373e8af9..91806b928 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 @@ -52,10 +52,7 @@ import org.springframework.transaction.annotation.Transactional; import java.math.BigInteger; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.List; +import java.util.*; import java.util.concurrent.TimeUnit; /** @@ -419,4 +416,18 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl customListPage(IPage page, QueryWrapper queryWrapper) { + + // 查询配送单关联的预约单 + List result =distributionDeliveryListMapper.customListPage(page,queryWrapper); + + // 通过对查询的预约单进行数据处理 + // TODO 需要没有完成对实际装车数和 签收数据的汇总 + + page.setRecords(result); + + return page; + } }