From 72a6774e1cf1440469f958b1c0044f9536ec970b Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" <123456> Date: Wed, 22 Nov 2023 17:12:39 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AD=BE=E6=94=B6?= =?UTF-8?q?=E5=90=8E=E6=89=98=E7=9B=98=E6=B2=A1=E6=9C=89=E4=B8=8B=E6=9E=B6?= =?UTF-8?q?=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/DistributionSignforServiceImpl.java | 5 +++++ 1 file changed, 5 insertions(+) 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 ada359ded..7e9ddbc64 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 @@ -299,6 +299,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl>>>>>>>>>>>>>>parcelListEntity.getOrderPackageCode():{}",parcelListEntity.getOrderPackageCode()); warehouseUpdownTypeClient.downPackageOrDelTray(parcelListEntity.getOrderPackageCode(), myCurrentWarehouse.getId()); } else { //存在装车数据 @@ -1847,6 +1849,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl>>>>>>>>>>>>>>parcelListEntity.getOrderPackageCode():{}",parcelListEntity.getOrderPackageCode()); + warehouseUpdownTypeClient.downPackageOrDelTray(parcelListEntity.getOrderPackageCode(), myCurrentWarehouse.getId()); + } } distributionParcelListService.updateById(parcelListEntity); From 6a83f91cd98ac21ccc20b3b042864d248b049913 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" <123456> Date: Wed, 22 Nov 2023 17:38:28 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=9A=82=E6=97=B6=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E8=80=81=E7=B3=BB=E7=BB=9F=E7=9A=84=E6=95=B0=E6=8D=AE=E6=8E=A8?= =?UTF-8?q?=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/ModuleNameConstant.java | 2 +- .../impl/AftersalesWorkOrderServiceImpl.java | 2 -- .../ClerkCheckPushDataQueueHandler.java | 17 ----------------- .../impl/DistributionSignforServiceImpl.java | 3 ++- 4 files changed, 3 insertions(+), 21 deletions(-) diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java index 983c2ab4c..95746ccec 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java @@ -8,7 +8,7 @@ public interface ModuleNameConstant { /** * 如果不需要 "" */ - public static final String DEVAUTH ="-cyz"; + public static final String DEVAUTH =""; /** * 工厂对接服务名称 diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java index f61dc11f5..2f59658db 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java @@ -175,8 +175,6 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl 0 ? true : false; } } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/ClerkCheckPushDataQueueHandler.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/ClerkCheckPushDataQueueHandler.java index 9cdb99d63..323b7c5ef 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/ClerkCheckPushDataQueueHandler.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/ClerkCheckPushDataQueueHandler.java @@ -167,23 +167,6 @@ public class ClerkCheckPushDataQueueHandler { } } - //得到客户对应的签收数据 - // TODO 这里的数据需要查询 等TJJ 空了来帮我写 - - - - - - - - - -// // 得到签收订单数量 -// -//// 调用方法　推送老系统　闭环 -// SignPushDataDTO signPushDataDTO = new SignPushDataDTO(); - - 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 144f7e8d4..4808f8142 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 @@ -2874,7 +2874,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl>>>>>>>>>>>>>>>>>> 推送老系统 的签收数据 {} ",distributionSignfor); + //rabbitTemplate.convertAndSend(RabbitConstant.CLERK_CHECK_PUSH_DATA_EXCHANGE, RabbitConstant.CLERK_CHECK_PUSH_DATA_ROUTING, map); } From 44f995e43bd6f64a87f7a4f36a4b6ea2db6c490f Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Wed, 22 Nov 2023 17:44:13 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E9=85=8D=E9=80=81=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=AD=BE=E6=94=B6=E6=95=B0=E9=87=8F=E3=80=81?= =?UTF-8?q?=E7=AD=BE=E6=94=B6=E6=98=8E=E7=BB=86=E5=A2=9E=E5=8A=A0=E5=8F=B8?= =?UTF-8?q?=E6=9C=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/DistributionDeliveryListEntity.java | 7 +++++++ .../distribution/vo/DistributionSigndetailVO.java | 12 ++++++++++++ .../mapper/DistributionDeliveryListMapper.xml | 7 +++++++ .../mapper/DistributionSigndetailMapper.xml | 8 ++++++++ .../impl/DistributionDeliveryListServiceImpl.java | 2 ++ .../service/impl/DistributionSignforServiceImpl.java | 1 - .../java/com/logpm/distribution/TestService.java | 2 +- 7 files changed, 37 insertions(+), 2 deletions(-) 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 9f3b2c909..9abb6a5c4 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 @@ -268,6 +268,13 @@ public class DistributionDeliveryListEntity extends TenantEntity { @TableField(exist = false) private String clineName; + /** + * 签收件数 + */ + @ApiModelProperty(value = "客户名称") + @TableField(exist = false) + private Integer signingNumber; + diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSigndetailVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSigndetailVO.java index 42adbdc00..9de6459dd 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSigndetailVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSigndetailVO.java @@ -79,6 +79,18 @@ public class DistributionSigndetailVO extends DistributionSigndetailEntity { @ApiModelProperty(value = "订单自编号") private String orderCode; + /** + * 司机名称 + */ + @ApiModelProperty(value = "司机名称") + private String driverName; + + /** + * 车牌号 + */ + @ApiModelProperty(value = "车牌号") + private String vehicleName; + /** * 签收数 */ 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 e543f063f..5533b0d46 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 @@ -188,6 +188,13 @@ WHERE lddl.id = lds.delivery_id ) scannedNumber, + (SELECT + COALESCE (sum(lds.received_quantity), 0) + FROM + logpm_distribution_signfor lds + WHERE + lddl.id = lds.delivery_id + ) signingNumber, GROUP_CONCAT(DISTINCT ldr.consignee SEPARATOR ',') clineName FROM logpm_distribution_delivery_list lddl left JOIN logpm_distribution_signfor lds on lddl.id = lds.delivery_id diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSigndetailMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSigndetailMapper.xml index f15b56997..1840ef057 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSigndetailMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSigndetailMapper.xml @@ -119,6 +119,11 @@ ldr.service_number serviceNumber, ldsa.order_code orderCode, lddl.train_number trainNumber, + case lddl.type + when 1 then '商配' + when 2 then '市配' + else '' + end serveType, lddl.type type, ldsa.mall_name mallName, ldsa.warehouse warehouse, @@ -131,6 +136,9 @@ ldr.delivery_address deliveryAddress, lds.signing_time signingTime, lds.sjsigning_time sjsigningTime, + lddl.driver_name driverName, + lddl.vehicle_name vehicleName, + lddl.kind, (SELECT GROUP_CONCAT(ldpl.material_name SEPARATOR ',') FROM logpm_distribution_parcel_list ldpl WHERE ldpl.stock_article_id = ldsa.id) materialName, (SELECT COALESCE (count(*) ,0) FROM logpm_distribution_reservation_package ldrpp WHERE ldsa.id = ldrpp.stock_article_id and ldrpp.reservation_id =ldrs.reservation_id) totalNumber, (select COALESCE (count(*) ,0) from logpm_distribution_loadscan ldl WHERE ldl.order_id =ldsa.id and ldl.signfor_state =2) signfornum 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 2861530e2..557e240f5 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 @@ -189,6 +189,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl collect = myWatchWarehouse.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList()); distributionDeliveryList.setWarehouseIdList(collect); List distributionDeliveryListEntities = baseMapper.selectDistributionDeliveryListPage(page, distributionDeliveryList); + return page.setRecords(distributionDeliveryListEntities); } @@ -1429,6 +1430,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl Date: Wed, 22 Nov 2023 17:47:54 +0800 Subject: [PATCH 4/6] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BF=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/trunkline/dto/LoadCarsDTO.java | 3 ++ .../entity/TrunklineCarsLoadEntity.java | 1 + .../entity/TrunklineCarsLoadLineEntity.java | 2 +- .../entity/TrunklineCarsOrderEntity.java | 3 ++ .../controller/CarsLoadController.java | 16 +++++++ .../mapper/TrunklineCarsLoadLineMapper.java | 6 +++ .../mapper/TrunklineCarsLoadLineMapper.xml | 16 +++++++ .../ITrunklineCarsLoadLineService.java | 5 +++ .../TrunklineCarsLoadLineServiceImpl.java | 10 +++++ .../impl/TrunklineCarsLoadServiceImpl.java | 43 ++++++++++++++++++- 10 files changed, 103 insertions(+), 2 deletions(-) diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java index 4e4582435..f8b83d291 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java @@ -8,6 +8,7 @@ import java.io.Serializable; public class LoadCarsDTO implements Serializable { private Long loadId; + private String nodeType; private Integer pageNum; private Integer pageSize; @@ -16,4 +17,6 @@ public class LoadCarsDTO implements Serializable { private Long warehouseId; + private Integer startCarType; + } diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadEntity.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadEntity.java index c0b696fb8..748a897be 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadEntity.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadEntity.java @@ -105,6 +105,7 @@ public class TrunklineCarsLoadEntity extends TenantEntity { @ApiModelProperty(name = "配载类型 配载类型：1=干线类型，2=支线类型，3=专车类型，4=外部中转,5=外围路线",notes = "") private String loadType ; /** 批次状态：1=已装车，2=已发车，-2=取消发车，3=网点到达，4=网点发车，5=终点到达，6=已卸车，7=已出库，8=已签收,9=出库到达 */ + //0 未发车 10已发车 20网点到车 30网点发车 @ApiModelProperty(name = "批次状态：1=已装车，2=已发车，-2=取消发车，3=网点到达，4=网点发车，5=终点到达，6=已卸车，7=已出库，8=已签收,9=出库到达",notes = "") private String loadStatus ; /** 车辆满载率 */ diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadLineEntity.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadLineEntity.java index 73b3bbe35..760685a25 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadLineEntity.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadLineEntity.java @@ -53,7 +53,7 @@ public class TrunklineCarsLoadLineEntity extends TenantEntity { @ApiModelProperty(name = "联系人地址",notes = "") private String linkAddress ; /** 节点状态 0未到达 1已到达 */ - @ApiModelProperty(name = "节点状态 0未到达 1已到达",notes = "") + @ApiModelProperty(name = "节点状态 0未到达 10到车 11取消",notes = "") private String nodeStatus ; /** 排序 */ @ApiModelProperty(name = "排序",notes = "") diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsOrderEntity.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsOrderEntity.java index d654afb7c..c91f0ee5d 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsOrderEntity.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsOrderEntity.java @@ -55,5 +55,8 @@ public class TrunklineCarsOrderEntity extends TenantEntity { /** 计划件数 */ @ApiModelProperty(name = "计划件数",notes = "") private Integer planNum ; + /** 是否是直发商家 0否 1是 */ + @ApiModelProperty(name = "是否是直发商家 0否 1是",notes = "") + private String isCustomer ; } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java index 20d130449..dfd27cfb9 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java @@ -62,6 +62,7 @@ public class CarsLoadController { String method = "############startCarByLoadId: "; log.info(method + "请求参数{}", loadCarsDTO); Long loadId = loadCarsDTO.getLoadId(); + Integer startCarType = loadCarsDTO.getStartCarType(); try{ //当前登录人选择的仓库 @@ -76,6 +77,21 @@ public class CarsLoadController { return R.fail(405,"请选择一条配载计划"); } + if(Objects.isNull(startCarType)){ + log.warn(method+"发车类型不能为空 startCarType={}",startCarType); + return R.fail(405,"发车类型不能为空"); + } + + if(startCarType != 1 && startCarType != 2){ + log.warn(method+"未知的发车类型 startCarType={}",startCarType); + return R.fail(405,"未知的发车类型"); + } + +// if(StringUtil.isBlank(nodeType)){ +// log.warn(method+"节点类型不能为空 nodeType={}",nodeType); +// return R.fail(405,"节点类型不能为空"); +// } + carsLoadService.startCarByLoadId(loadCarsDTO); return R.success("操作成功"); }catch (CustomerException e){ diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadLineMapper.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadLineMapper.java index 362b436ad..4ef9c422d 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadLineMapper.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadLineMapper.java @@ -3,7 +3,13 @@ package com.logpm.trunkline.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.logpm.trunkline.entity.TrunklineCarsLoadLineEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; @Mapper public interface TrunklineCarsLoadLineMapper extends BaseMapper { + + TrunklineCarsLoadLineEntity findStartNodeByLoadId(@Param("loadId") Long loadId); + + TrunklineCarsLoadLineEntity findEndNodeByLoadId(@Param("loadId") Long loadId); + } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadLineMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadLineMapper.xml index 5ae01e942..3eca28d9b 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadLineMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadLineMapper.xml @@ -3,4 +3,20 @@ + + + + diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadLineService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadLineService.java index aaf49adab..627c282b6 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadLineService.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadLineService.java @@ -4,4 +4,9 @@ import com.logpm.trunkline.entity.TrunklineCarsLoadLineEntity; import org.springblade.core.mp.base.BaseService; public interface ITrunklineCarsLoadLineService extends BaseService { + + TrunklineCarsLoadLineEntity findStartNodeByLoadId(Long loadId); + + TrunklineCarsLoadLineEntity findEndNodeByLoadId(Long loadId); + } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadLineServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadLineServiceImpl.java index b811d84c2..c5602877c 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadLineServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadLineServiceImpl.java @@ -12,4 +12,14 @@ import org.springframework.stereotype.Service; @Service @AllArgsConstructor public class TrunklineCarsLoadLineServiceImpl extends BaseServiceImpl implements ITrunklineCarsLoadLineService { + + @Override + public TrunklineCarsLoadLineEntity findStartNodeByLoadId(Long loadId) { + return baseMapper.findStartNodeByLoadId(loadId); + } + + @Override + public TrunklineCarsLoadLineEntity findEndNodeByLoadId(Long loadId) { + return baseMapper.findEndNodeByLoadId(loadId); + } } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java index 3a9b59063..17d2e14a5 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java @@ -12,10 +12,13 @@ import com.logpm.trunkline.service.ITrunklineCarsLoadService; import com.logpm.trunkline.vo.TrunklineCarsLoadVO; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springblade.common.exception.CustomerException; import org.springblade.core.mp.base.BaseServiceImpl; import org.springframework.stereotype.Service; +import java.util.Date; import java.util.List; +import java.util.Objects; @Slf4j @Service @@ -48,9 +51,47 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl Date: Wed, 22 Nov 2023 18:35:32 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E7=AD=BE=E6=94=B6=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=B8=E6=9C=BA=E7=94=B5=E8=AF=9D=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/distribution/vo/DistributionSigndetailVO.java | 6 ++++++ .../distribution/mapper/DistributionSigndetailMapper.xml | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSigndetailVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSigndetailVO.java index 9de6459dd..86849b643 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSigndetailVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSigndetailVO.java @@ -85,6 +85,12 @@ public class DistributionSigndetailVO extends DistributionSigndetailEntity { @ApiModelProperty(value = "司机名称") private String driverName; + /** + * 司机电话 + */ + @ApiModelProperty(value = "司机电话") + private String driverPhone; + /** * 车牌号 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSigndetailMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSigndetailMapper.xml index 1840ef057..3fb82cf7e 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSigndetailMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSigndetailMapper.xml @@ -139,6 +139,11 @@ lddl.driver_name driverName, lddl.vehicle_name vehicleName, lddl.kind, + CASE lddl.kind + WHEN '1' THEN (SELECT ldds.driver_phone FROM logpm_distribution_delivery_self AS ldds WHERE ldds.delivery_id = lddl.id AND ldds.is_master = 2) + WHEN '2' THEN (SELECT lddt.driver_phone FROM logpm_distribution_delivery_tripartite AS lddt WHERE lddt.delivery_id = lddl.id ) + ELSE '' + END driverPhone, (SELECT GROUP_CONCAT(ldpl.material_name SEPARATOR ',') FROM logpm_distribution_parcel_list ldpl WHERE ldpl.stock_article_id = ldsa.id) materialName, (SELECT COALESCE (count(*) ,0) FROM logpm_distribution_reservation_package ldrpp WHERE ldsa.id = ldrpp.stock_article_id and ldrpp.reservation_id =ldrs.reservation_id) totalNumber, (select COALESCE (count(*) ,0) from logpm_distribution_loadscan ldl WHERE ldl.order_id =ldsa.id and ldl.signfor_state =2) signfornum From b5859ab02d99dcf54aae3a729446d1c307f727ea Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" <123456> Date: Wed, 22 Nov 2023 18:58:39 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/logpm/warehouse/mapper/QuestDetailMapper.xml | 2 +- .../main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/QuestDetailMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/QuestDetailMapper.xml index 49409c8e6..c722dde58 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/QuestDetailMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/QuestDetailMapper.xml @@ -23,7 +23,7 @@ - + diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml index cea96b9fe..b43d22b52 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml @@ -440,7 +440,7 @@ lqd.stock_num stockNum, lqd.position_code positionCode, lqd.grounding_position_code groundingPositionCode, - lqd.orde_package_code ordePackageCode, + lqd.order_package_code ordePackageCode, lqd.order_package_id orderPackageId, lqd.update_time updateTime, ldpl.service_number serviceNumber,