From 5ce2d7bd7a71f2be69deaf103fe69b172d8bd30b Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" <123456> Date: Tue, 18 Jul 2023 14:28:05 +0800 Subject: [PATCH 1/4] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=8C=85=E9=97=B4=E7=BC=BA=E5=B0=91=E7=A7=9F?= =?UTF-8?q?=E6=88=B7ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../factory/pan/service/impl/PanFactoryDataServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java index 1d1c4964b..a3a5b4c69 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java @@ -434,7 +434,9 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { BeanUtil.copyProperties(vo,entity); entity.setConditions(1); entity.setStockArticleId(id); - + // 绑定部门--仓库 + entity.setCreateDept(Long.parseLong(basicdataWarehouseEntity.getDepartment())); + entity.setCreateUser(1123598821738675201L); boolean b = distributionParcelListClient.add(entity); if(!b){ logger.warn("#################handleDataToPlatform: 保存包件信息失败 orderSelfNum={}",orderSelfNum); From 3a852152e72cadfb69b0257d81fad06550cf1e86 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" <123456> Date: Tue, 18 Jul 2023 14:54:58 +0800 Subject: [PATCH 2/4] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E8=80=81=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E5=85=B3=E9=94=AE=E5=AD=97long=20=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OrderDetailServiceImpl.java | 32 ++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/OrderDetailServiceImpl.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/OrderDetailServiceImpl.java index 9b3395236..c37cd840d 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/OrderDetailServiceImpl.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/OrderDetailServiceImpl.java @@ -7,6 +7,9 @@ import com.logpm.oldproject.service.IOrderDetailService; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.List; + @Service @AllArgsConstructor public class OrderDetailServiceImpl implements IOrderDetailService { @@ -16,7 +19,34 @@ public class OrderDetailServiceImpl implements IOrderDetailService { @Override public OrderDetailEntity findByUnitNo(String unitNo) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("unitNo",unitNo); + List ls = new ArrayList<>(); + ls.add("id"); + ls.add("warehouse_id"); + ls.add("test"); + ls.add("area"); + ls.add("source"); + ls.add("is_opai"); + ls.add("number"); + ls.add("detail_number"); + ls.add("unitNo"); + ls.add("mctsTruck"); + ls.add("title"); + ls.add("num"); + ls.add("secondPackName"); + ls.add("secondPackCode"); + ls.add("thirdPackName"); + ls.add("thirdPackCode"); + ls.add("`STATUS`"); + ls.add("waybill_no"); + ls.add("wide"); + ls.add("high"); + ls.add("volume"); + ls.add("unit"); + ls.add("price"); + ls.add("sign_time"); + ls.add("sign_time"); + queryWrapper.select(ls). + eq("unitNo", unitNo); return orderDetailMapper.selectOne(queryWrapper); } } From d29e60eb0a5bd4f5042a6a56ed34d51dbd1c00a4 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" <123456> Date: Tue, 18 Jul 2023 15:20:29 +0800 Subject: [PATCH 3/4] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E5=9C=A8=E5=BA=93?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=20=E4=BB=93=E5=BA=93ID=20=E5=92=8C=E5=8C=85?= =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E7=9A=84=E4=BB=93=E5=BA=93ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/entity/DistributionParcelListEntity.java | 3 +++ .../entity/DistributionStockArticleEntity.java | 6 ++++++ .../service/impl/DistributionStockArticleServiceImpl.java | 1 + .../pan/service/impl/PanFactoryDataServiceImpl.java | 8 ++++++++ 4 files changed, 18 insertions(+) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java index 2df397b71..a128cb61d 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java @@ -70,6 +70,9 @@ public class DistributionParcelListEntity extends TenantEntity { */ @ApiModelProperty(value = "仓库") private String warehouse; + + @ApiModelProperty(value = "仓库ID") + private Long warehouseId; /** * 状态 */ diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java index 103e544c6..2756c34cf 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java @@ -120,6 +120,12 @@ public class DistributionStockArticleEntity extends TenantEntity { @ApiModelProperty(value = "仓库") private String warehouse; + /** + * 仓库ID + */ + @ApiModelProperty(value = "仓库ID") + private Long warehouseId; + @TableField(exist = false) private String stateName; @TableField(exist = false) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java index 24a41db00..cd6913bd2 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java @@ -248,6 +248,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl supplyData = advanceDetailClient.getSupplyData(unitNo); String destinationWarehouse = supplyData.get("destinationWarehouse");//目的仓名称 + String takeCompany = supplyData.get("takeCompany"); + // 查询数据对应的仓库名称 BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.findByName(destinationWarehouse); //判断新系统是否有这条订单数据 @@ -363,7 +365,10 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { distributionStockArticleEntity.setOrderSelfNumbering(orderSelfNum); distributionStockArticleEntity.setMallName(takeCompany); distributionStockArticleEntity.setDescriptionGoods(advanceEntity.getFirstPackName()); + distributionStockArticleEntity.setWarehouse(destinationWarehouse); + distributionStockArticleEntity.setWarehouseId(distributionStockArticleEntity.getId()); + distributionStockArticleEntity.setWarehouseEntryTime(date); distributionStockArticleEntity.setTotalNumber(total); distributionStockArticleEntity.setHandQuantity(0); @@ -433,10 +438,13 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { DistributionParcelListEntity entity = new DistributionParcelListEntity(); BeanUtil.copyProperties(vo,entity); entity.setConditions(1); + entity.setWarehouse(distributionStockArticleEntity.getWarehouse()); + entity.setWarehouseId(distributionStockArticleEntity.getId()); entity.setStockArticleId(id); // 绑定部门--仓库 entity.setCreateDept(Long.parseLong(basicdataWarehouseEntity.getDepartment())); entity.setCreateUser(1123598821738675201L); + entity.setTenantId(TenantNum.HUITONGCODE); boolean b = distributionParcelListClient.add(entity); if(!b){ logger.warn("#################handleDataToPlatform: 保存包件信息失败 orderSelfNum={}",orderSelfNum); 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 4/4] =?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