From 88341fd1bdb7a1af313ed87852a5c68997350c44 Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Tue, 18 Jul 2023 16:59:20 +0800 Subject: [PATCH] =?UTF-8?q?1.=E7=AD=BE=E6=94=B6=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/DistributionSignforEntity.java | 2 +- .../vo/DistributionDeliveryInfoVO.java | 16 +++ ...DistributionReservationStockarticleVO.java | 11 ++ .../vo/DistributionSignforVO.java | 11 ++ .../com/logpm/basic/BasicApplication.java | 1 + ...tionReservationStockarticleController.java | 11 ++ .../DistributionSignforController.java | 8 +- .../mapper/DistributionDeliveryInfoMapper.xml | 5 + .../mapper/DistributionDeliveryListMapper.xml | 1 + ...ributionReservationStockarticleMapper.java | 8 ++ ...tributionReservationStockarticleMapper.xml | 3 + .../mapper/DistributionSignforMapper.java | 6 + .../mapper/DistributionSignforMapper.xml | 129 +++++++++++------- ...ibutionReservationStockarticleService.java | 9 +- .../service/IDistributionSignforService.java | 4 + .../DistributionDeliveryListServiceImpl.java | 4 +- ...ionReservationStockarticleServiceImpl.java | 5 + .../impl/DistributionSignforServiceImpl.java | 5 + .../DistributionStockArticleServiceImpl.java | 7 +- 19 files changed, 186 insertions(+), 60 deletions(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSignforEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSignforEntity.java index fa31b60b3..19be6ee51 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSignforEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSignforEntity.java @@ -117,7 +117,7 @@ public class DistributionSignforEntity extends TenantEntity { * 商城名称 */ @ApiModelProperty(value = "商城名称") - private String shoppingName; + private String mallName; /** * 订单来源 */ diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryInfoVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryInfoVO.java index c677898bb..5128e1d36 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryInfoVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryInfoVO.java @@ -43,6 +43,22 @@ public class DistributionDeliveryInfoVO extends DistributionDeliveryInfoEntity { */ @ApiModelProperty(value = "仓库") private String warehouse; + /** + * 签收类型;1-签收，2-代签收 + */ + @ApiModelProperty(value = "签收类型;1-签收，2-代签收") + private String signingType; + /** + * 司机签收图片 + */ + @ApiModelProperty(value = "司机签收图片") + private String deliverySignPictures; + /** + * 文员复核图片 + */ + @ApiModelProperty(value = "文员复核图片") + private String clerkSignPictures; + /** * 订单 */ diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionReservationStockarticleVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionReservationStockarticleVO.java index f93179da5..c9366fdb5 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionReservationStockarticleVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionReservationStockarticleVO.java @@ -17,6 +17,7 @@ package com.logpm.distribution.vo; import com.logpm.distribution.entity.DistributionReservationStockarticleEntity; +import io.swagger.annotations.ApiModelProperty; import org.springblade.core.tool.node.INode; import lombok.Data; import lombok.EqualsAndHashCode; @@ -31,5 +32,15 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) public class DistributionReservationStockarticleVO extends DistributionReservationStockarticleEntity { private static final long serialVersionUID = 1L; + /** + * 订单自编号 + */ + @ApiModelProperty(value = "订单自编号") + private String orderSelfNumbering; + /** + * 运单号 + */ + @ApiModelProperty(value = "运单号") + private String waybillNumber; } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforVO.java index c355aed82..a443743cd 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforVO.java @@ -37,6 +37,17 @@ public class DistributionSignforVO extends DistributionSignforEntity { */ @ApiModelProperty(value = "门店名称") private String storeName; + + /** + * 配送单号 + */ + @ApiModelProperty(value = "配送单号") + private String reservationCode; + /** + * 预约时间 + */ + @ApiModelProperty(value = "预约时间") + private String reservationDate; /** * 装车未扫数 */ diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/BasicApplication.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/BasicApplication.java index 59665d0fc..21e37ac71 100644 --- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/BasicApplication.java +++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/BasicApplication.java @@ -3,6 +3,7 @@ package com.logpm.basic; import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.common.constant.TenantNum; import org.springblade.core.cloud.client.BladeCloudApplication; import org.springblade.core.launch.BladeApplication; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationStockarticleController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationStockarticleController.java index 94679ab01..72979cc47 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationStockarticleController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationStockarticleController.java @@ -79,6 +79,7 @@ public class DistributionReservationStockarticleController extends BladeControll return R.data(pages); } + /** * 预约订单中间表 自定义分页 */ @@ -89,6 +90,16 @@ public class DistributionReservationStockarticleController extends BladeControll IPage pages = distributionReservationStockarticleService.selectDistributionReservationStockarticlePage(Condition.getPage(query), distributionReservationStockarticle); return R.data(pages); } + /** + * 预约订单中间表 查询客户订单 自定义分页 + */ + @GetMapping("/orderpage") + @ApiOperationSupport(order = 3) + @ApiOperation(value = "分页", notes = "传入distributionReservationStockarticle") + public R> orderpage(DistributionReservationStockarticleVO distributionReservationStockarticle, Query query) { + IPage pages = distributionReservationStockarticleService.selectDistributionReservationStockarticleorderPage(Condition.getPage(query), distributionReservationStockarticle); + return R.data(pages); + } /** * 预约订单中间表 新增 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java index e2d466ee5..f705332cc 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java @@ -76,11 +76,11 @@ public class DistributionSignforController extends BladeController { @ApiOperationSupport(order = 1) @ApiOperation(value = "详情", notes = "传入distributionSignfor") public R detail(DistributionSignforDTO distributionSignfor) { - DistributionSignforEntity detail = distributionSignforService.getOne(Condition.getQueryWrapper(distributionSignfor)); - DistributionSignforVO distributionSignforVO = new DistributionSignforVO(); - BeanUtils.copyProperties(detail,distributionSignforVO); + DistributionSignforVO detail = distributionSignforService.getOneCustom(distributionSignfor.getId()); +// DistributionSignforVO distributionSignforVO = new DistributionSignforVO(); +// BeanUtils.copyProperties(detail,distributionSignforVO); //查询预约单号及服务 - return R.data(distributionSignforVO); + return R.data(detail); } 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 1b214e6aa..1b6e1eca5 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 @@ -63,12 +63,17 @@ SELECT * FROM logpm_distribution_reservation_stockarticle ${ew.customSqlSegment} + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java index aa334b4f0..0618b3fd4 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java @@ -103,4 +103,10 @@ public interface DistributionSignforMapper extends BaseMapper lds.is_deleted = 0 - - and ldr.mall_name like concat('%',#{param.shoppingName},'%') + + and ldr.mall_name like concat('%',#{param.mallName},'%') and date_format(lds.delivery_time,'%y%m%d%') = date_format(#{param.deliveryTime},'%y%m%d%') @@ -348,47 +350,45 @@ select COALESCE(COUNT(*), 0) from logpm_distribution_signfor is_deleted = 0 and driver_signing ='1' - - and number like concat('%',#{param.number},'%') - - - and shopping_name like concat('%',#{param.shoppingName},'%') - - - and signing_status = #{param.signingStatus} + + and ldr.mall_name like concat('%',#{param.mallName},'%') - and date_format(delivery_time,'%y%m%d%') = date_format(#{param.deliveryTime},'%y%m%d%') + and date_format(lds.delivery_time,'%y%m%d%') = date_format(#{param.deliveryTime},'%y%m%d%') - and date_format(signing_time,'%y%m%d%') = date_format(#{param.signingTime},'%y%m%d%') + and date_format(lds.signing_time,'%y%m%d%') = date_format(#{param.signingTime},'%y%m%d%') - and date_format(sjsigning_time,'%y%m%d%') = date_format(#{param.sjsigningTime},'%y%m%d%') + and date_format(lds.sjsigning_time,'%y%m%d%') = date_format(#{param.sjsigningTime},'%y%m%d%') + + + and date_format(lds.create_time,'%y%m%d%') = date_format(#{param.createTime_query},'%y%m%d%') - - and order_id like concat('%',#{param.orderId},'%') + + and ldr.stock_article_id like concat('%',#{param.stockArticleId},'%') - and consignee like concat('%',#{param.consignee},'%') + and ldr.consignee like concat('%',#{param.consignee},'%') - and delivery_type = #{param.deliveryType} - - - and order_source = #{param.orderSource} + and ldr.delivery_type = #{param.deliveryType} - and delivery_phone = #{param.deliveryPhone} + and ldr.delivery_phone like concat('%',#{param.deliveryPhone},'%') - and train_number like concat('%',#{param.trainNumber},'%') - - - and delivery_driver_name like concat('%',#{param.deliveryDriverName},'%') + and lddl.train_number like concat('%',#{param.trainNumber},'%') + - and delivery_address like concat('%',#{param.deliveryAddress},'%') + and ldr.delivery_address like concat('%',#{param.deliveryAddress},'%') + + + and lds.driver_signing = #{param.driverSigning} + + + and lds.signing_status = #{param.signingStatus} @@ -396,47 +396,45 @@ select COALESCE(COUNT(*), 0) from logpm_distribution_signfor is_deleted = 0 and signing_status ='1' - - and number like concat('%',#{param.number},'%') - - - and signing_status = #{param.signingStatus} - - - and shopping_name like concat('%',#{param.shoppingName},'%') + + and ldr.mall_name like concat('%',#{param.mallName},'%') - and date_format(delivery_time,'%y%m%d%') = date_format(#{param.deliveryTime},'%y%m%d%') + and date_format(lds.delivery_time,'%y%m%d%') = date_format(#{param.deliveryTime},'%y%m%d%') - and date_format(signing_time,'%y%m%d%') = date_format(#{param.signingTime},'%y%m%d%') + and date_format(lds.signing_time,'%y%m%d%') = date_format(#{param.signingTime},'%y%m%d%') - and date_format(sjsigning_time,'%y%m%d%') = date_format(#{param.sjsigningTime},'%y%m%d%') + and date_format(lds.sjsigning_time,'%y%m%d%') = date_format(#{param.sjsigningTime},'%y%m%d%') - - and order_id like concat('%',#{param.orderId},'%') + + and date_format(lds.create_time,'%y%m%d%') = date_format(#{param.createTime_query},'%y%m%d%') + + + and ldr.stock_article_id like concat('%',#{param.stockArticleId},'%') - and consignee like concat('%',#{param.consignee},'%') + and ldr.consignee like concat('%',#{param.consignee},'%') - and delivery_type = #{param.deliveryType} - - - and order_source = #{param.orderSource} + and ldr.delivery_type = #{param.deliveryType} - and delivery_phone = #{param.deliveryPhone} + and ldr.delivery_phone like concat('%',#{param.deliveryPhone},'%') - and train_number like concat('%',#{param.trainNumber},'%') - - - and delivery_driver_name like concat('%',#{param.deliveryDriverName},'%') + and lddl.train_number like concat('%',#{param.trainNumber},'%') + - and delivery_address like concat('%',#{param.deliveryAddress},'%') + and ldr.delivery_address like concat('%',#{param.deliveryAddress},'%') + + + and lds.driver_signing = #{param.driverSigning} + + + and lds.signing_status = #{param.signingStatus} @@ -447,5 +445,34 @@ order by create_time desc limit 1 + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationStockarticleService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationStockarticleService.java index 4434b1a5e..191763e5c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationStockarticleService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationStockarticleService.java @@ -48,5 +48,12 @@ public interface IDistributionReservationStockarticleService extends BaseService * @return */ List exportDistributionReservationStockarticle(Wrapper queryWrapper); - + /** + * 查询该客户订单自定义分页 + * + * @param page + * @param distributionReservationStockarticle + * @return + */ + IPage selectDistributionReservationStockarticleorderPage(IPage page, DistributionReservationStockarticleVO distributionReservationStockarticle); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java index e63280ec8..04eb15d40 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java @@ -70,4 +70,8 @@ public interface IDistributionSignforService extends BaseService stripList = distributionDeliveryInfoMapper.selectStripList(detail.getId()); - distributionDeliveryListVO.setPackadeList(stripList); + //List stripList = distributionDeliveryInfoMapper.selectStripList(detail.getId()); + //distributionDeliveryListVO.setPackadeList(stripList); if (detail.getSource() == 1) { //查询客户信息 List customList = distributionDeliveryInfoMapper.selectcustomList(detail.getId()); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationStockarticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationStockarticleServiceImpl.java index d00a133e1..895538232 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationStockarticleServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationStockarticleServiceImpl.java @@ -51,4 +51,9 @@ public class DistributionReservationStockarticleServiceImpl extends BaseServiceI return distributionReservationStockarticleList; } + @Override + public IPage selectDistributionReservationStockarticleorderPage(IPage page, DistributionReservationStockarticleVO distributionReservationStockarticle) { + return page.setRecords(baseMapper.selectDistributionReservationStockarticleorderPage(page, distributionReservationStockarticle)); + } + } 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 8af269493..2416c9857 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 @@ -128,5 +128,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl