From c920f5543bf5175aff603343dbbe25189018d7ae Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Wed, 20 Dec 2023 13:56:04 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=85=8D=E9=80=81=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=A2=E5=8D=95=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/DistributionDeliveryInfoVO.java | 6 ++ .../DistributionDeliveryListController.java | 4 +- .../DistributionDeliveryInfoMapper.java | 3 +- .../mapper/DistributionDeliveryInfoMapper.xml | 62 +++++++++++++++---- .../IDistributionDeliveryInfoService.java | 3 +- .../DistributionDeliveryInfoServiceImpl.java | 4 +- .../DistributionDeliveryListServiceImpl.java | 10 +++ 7 files changed, 74 insertions(+), 18 deletions(-) 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 c98624a87..5a621d57e 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 @@ -42,6 +42,12 @@ public class DistributionDeliveryInfoVO extends DistributionDeliveryInfoEntity { */ @ApiModelProperty(value = "仓库") private String warehouse; + + /** + * 运单号 + */ + @ApiModelProperty(value = "运单号") + private String waybillNo; /** * 签收类型;1-签收，2-代签收 */ 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 ff0463b4c..4bccd7ad2 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 @@ -133,8 +133,8 @@ public class DistributionDeliveryListController extends BladeController { @GetMapping("/order") @ApiOperationSupport(order = 1) @ApiOperation(value = "查看订单", notes = "传入distributionDeliveryList") - public R> order(DistributionDeliveryInfoDTO distributionDeliveryInfoDTO, Query query) { - IPage pages = distributionDeliveryInfoService.selectDistributionDeliveryorder(Condition.getPage(query), distributionDeliveryInfoDTO); + public R> order(@RequestParam Map distributionStockArticle , Query query) { + IPage pages = distributionDeliveryInfoService.selectDistributionDeliveryorder(Condition.getPage(query), distributionStockArticle); return R.data(pages); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.java index b0816c56e..93fffee11 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.java @@ -32,6 +32,7 @@ import com.logpm.distribution.vo.app.DistributionAppStockArticleVO; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** * 配送装车中间表 Mapper 接口 @@ -112,7 +113,7 @@ public interface DistributionDeliveryInfoMapper extends BaseMapper selectDistributionDeliveryOrderPage(IPage page,@Param("param") DistributionDeliveryInfoDTO distributionDeliveryInfoDTO); + List selectDistributionDeliveryOrderPage(IPage page,@Param("param") Map distributionStockArticle); /** * App-通过配送查询客户信息 * 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 2e33dc6a6..1219d269a 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 @@ -81,6 +81,7 @@ ldr.delivery_address deliveryAddress, ldr.delivery_phone deliveryPhone, ldr.stock_article_id orderIds, + ldr.waybill_no waybillNo, lds.delivery_sign_pictures deliverySignPictures, lds.clerk_sign_pictures clerkSignPictures, ldr.reservation_num packageNub, @@ -233,18 +234,10 @@ ldsa.customer_address, ldsa.total_number, ldsa.hand_quantity, + ldsa.waybill_number, + ldsa.service_number, ldrs.reservation_num AS deliveryNumber, - ldsa.description_goods descriptionGoods, - ( - - SELECT - GROUP_CONCAT( ldpl.material_name SEPARATOR ',' ) - FROM - logpm_distribution_parcel_list ldpl - JOIN logpm_distribution_reservation_package ldrp ON ldrp.parce_list_id = ldpl.id - WHERE - ldrp.reservation_id = lds.reservation_id - ) materialName, + t.materialName, -- (SELECT COUNT(*) from logpm_distribution_reservation_package ldrp WHERE ldrp.stock_article_id = ldsa.id ) deliveryNumber, ( SELECT @@ -282,11 +275,56 @@ WHERE lstock.stock_article=ldrs.stock_article_id ) AS stockupNumber FROM - logpm_distribution_signfor lds + logpm_distribution_signfor lds JOIN logpm_distribution_reservation_stockarticle ldrs ON lds.reservation_id = ldrs.reservation_id JOIN logpm_distribution_delivery_list lddl ON lddl.id = lds.delivery_id JOIN logpm_distribution_stock_article ldsa ON ldrs.stock_article_id = ldsa.id + JOIN + (SELECT + DISTINCT ldpl.stock_article_id,GROUP_CONCAT(ldpl.material_name) AS materialName + FROM + logpm_distribution_parcel_list ldpl + JOIN logpm_distribution_reservation_package ldrp ON ldrp.parce_list_id = ldpl.id + GROUP BY ldpl.stock_article_id + ) AS t ON t.stock_article_id = ldsa.id where lddl.id = #{param.deliveryId} AND ldrs.stock_article_status != 2 + + and ldsa.order_code like concat('%',#{param.orderCode},'%') + + + and ldsa.consignee_unit like concat('%',#{param.consigneeUnit},'%') + + + and ldsa.consignee_person like concat('%',#{param.consigneePerson},'%') + + + and ldsa.consignee_person like concat('%',#{param.consigneePerson},'%') + + + and ldsa.consignee_address like concat('%',#{param.consigneeAddress},'%') + + + and ldsa.consignee_mobile like concat('%',#{param.consigneeMobile},'%') + + + and ldsa.customer_name like concat('%',#{param.customerName},'%') + + + and ldsa.customer_telephone like concat('%',#{param.customerTelephone},'%') + + + and ldsa.customer_address like concat('%',#{param.customerAddress},'%') + + + and ldsa.waybill_number like concat('%',#{param.waybillNumber},'%') + + + and ldsa.service_number like concat('%',#{param.serviceNumber},'%') + + + and t.materialName like concat('%',#{param.materialName},'%') + + + 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 220e6a43f..621c4a9f1 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 @@ -370,7 +370,7 @@ public interface DistributionDeliveryListMapper extends BaseMapper getInventoryByDeliveryId(IPage page,@Param("deliveryListId") Long deliveryId); + List getInventoryByDeliveryId(IPage page,@Param("deliveryListId") Long deliveryId,@Param("param") Map param); /** * 查询该配送计划下指定收货单位的预约信息 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 9fc377110..971f7f4bc 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 @@ -1420,6 +1420,30 @@ and lds.delivery_id = #{deliveryListId} + + and ldsl.incoming_batch like concat('%',#{param.incomingBatch},'%') + + + and ldsl.order_code like concat('%',#{param.orderCode},'%') + + + and ldsl.market_name like concat('%',#{param.marketName},'%') + + + and ldsl.brand_name like concat('%',#{param.brandName},'%') + + + and ldsl.cargo_number like concat('%',#{param.cargoNumber},'%') + + + and ldsl.description_goods like concat('%',#{param.descriptionGoods},'%') + + + and ldsl.cargo_norms like concat('%',#{param.cargoNorms},'%') + + + and ldsl.cargo_unit like concat('%',#{param.cargoUnit},'%') + 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 5ddb082d5..fc284c468 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 @@ -219,7 +219,7 @@ public interface IDistributionDeliveryListService extends BaseService selectDistributionDeliveryinventory(IPage page, DistributionDeliveryInfoDTO distributionDeliveryInfoDTO); + List selectDistributionDeliveryinventory(IPage page, Map distributionInventoryDTO); /** * 生成配送的打印模型 @@ -369,6 +369,14 @@ public interface IDistributionDeliveryListService extends BaseService aftersalesPackageScan(Long deliveryId, String scanBarCode); + /** + * 查询配送任务客户列表 + * @param page + * @param distributionReservationDTO + * @return + */ + IPage getClientDetail(IPage page, Map distributionReservationDTO); + /** * 查询签收预约客户包件信息 * @param reservationId diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java index 4eb2f8e1b..cf619db62 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java @@ -434,4 +434,6 @@ public class DistributionDeliveryInfoServiceImpl extends BaseServiceImpl parcelNumberVOS = baseMapper.getZeroPackageListByDeliveryId(distributionDeliveryInfoDTO.getDeliveryId()); List deliveryStockArticleInfo = baseMapper.getDeliveryStockArticleInfo(deliveryId); @@ -4540,11 +4540,15 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl selectDistributionDeliveryinventory(IPage page, DistributionDeliveryInfoDTO distributionDeliveryInfoDTO) { - - List distributionStockListEntities = baseMapper.getInventoryByDeliveryId(page, distributionDeliveryInfoDTO.getDeliveryId()); + public List selectDistributionDeliveryinventory(IPage page,Map distributionInventoryDTO) { + if (Func.isEmpty(distributionInventoryDTO.get("deliveryId"))){ + log.info("#####查询配送计划库存品列表deliveryId缺失"); + return null; + } + Long deliveryId = Long.parseLong(distributionInventoryDTO.get("deliveryId").toString()); + List distributionStockListEntities = baseMapper.getInventoryByDeliveryId(page, deliveryId,distributionInventoryDTO); distributionStockListEntities.forEach(rs -> { - List list = distributionLoadscaninvnService.list(Wrappers.query().lambda().eq(DistributionLoadscaninvnEntity::getInventoryId, rs.getStocklistId()).eq(DistributionLoadscaninvnEntity::getReservationId, rs.getReservationId()).eq(DistributionLoadscaninvnEntity::getDeliveryId, distributionDeliveryInfoDTO.getDeliveryId()).ne(DistributionLoadscaninvnEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())); + List list = distributionLoadscaninvnService.list(Wrappers.query().lambda().eq(DistributionLoadscaninvnEntity::getInventoryId, rs.getStocklistId()).eq(DistributionLoadscaninvnEntity::getReservationId, rs.getReservationId()).eq(DistributionLoadscaninvnEntity::getDeliveryId, deliveryId).ne(DistributionLoadscaninvnEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())); rs.setLoadedinNumber(0); if (Func.isNotEmpty(list)) { //存在装车记录 @@ -5981,6 +5985,47 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl getClientDetail(IPage page, Map distributionReservationDTO) { + if (Func.isEmpty(distributionReservationDTO.get("deliveryId"))){ + log.info("############获取客户详情失败，deliveryId为空"); + return null; + } + Long deliveryId = Long.parseLong((String)distributionReservationDTO.get("deliveryId")); + List customList = distributionDeliveryInfoMapper.selectClientList(deliveryId,distributionReservationDTO); + if (!customList.isEmpty()) { + customList.forEach(c -> { + if (Func.isNotEmpty(c.getLoadingStatus())) { + switch (c.getLoadingStatus()) { + case "10": + c.setLoadingStatus(ReservationLoadingStatusConstant.daizhuangche.getName()); + break; + case "20": + c.setLoadingStatus(ReservationLoadingStatusConstant.bufenzhuangche.getName()); + break; + case "30": + c.setLoadingStatus(ReservationLoadingStatusConstant.yizhuangche.getName()); + break; + } + } + if (Func.isNotEmpty(c.getReservationSigningStatus())) { + switch (c.getReservationSigningStatus()) { + case "10": + c.setReservationSigningStatus(ReservationSigningStatusConstant.daiqianshou.getName()); + break; + case "20": + c.setReservationSigningStatus(ReservationSigningStatusConstant.bufenqianshou.getName()); + break; + case "30": + c.setReservationSigningStatus(ReservationSigningStatusConstant.yiqianshou.getName()); + break; + } + } + }); + } + return page.setRecords(customList); + } + public Map getDriverCar(String kind, Long deliveryListEntityId) { Map map = new HashMap<>(); From ddfed431d6fb602e3655e531b34a2bd193191baa Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Wed, 20 Dec 2023 17:30:34 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=93=81=E8=BF=87?= =?UTF-8?q?=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/distribution/mapper/DistributionStockListMapper.xml | 2 +- .../service/impl/DistributionDeliveryListServiceImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml index 989d84e26..388318126 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml @@ -449,7 +449,7 @@ FROM logpm_distribution_stock_list - service_type = #{par.serviceType} and warehouse_id = #{par.warehouseId} + service_type = #{par.serviceType} and warehouse_id = #{par.warehouseId} and is_deleted = 0 and incoming_batch like concat('%',#{par.incomingBatch},'%') 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 4e6d7a690..092f76e58 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 @@ -2138,11 +2138,11 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImplquery().lambda().eq(DistributionStockListEntity::getId, distributionLoadscaninvnEntity.getInventoryId())); // BigDecimal quantityStock = new BigDecimal(distributionStockListEntity.getQuantityStock()); // BigDecimal loadedNub = new BigDecimal(distributionLoadscaninvnEntity.getLoadedNub());