From 2c2177fe3a8bdb8377319a894ce254640b0b17fb Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Thu, 5 Dec 2024 13:57:00 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E5=95=86=E5=AE=B6=E7=AB=AF?= =?UTF-8?q?=E9=A2=84=E6=94=B6=E8=B4=A7=E5=8C=85=E4=BB=B6=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=202.=E5=A2=9E=E5=8A=A0=E5=AE=A1=E5=8D=95=E7=9A=84=E6=97=B6?= =?UTF-8?q?=E5=80=99=E7=9A=84=E6=9F=A5=E8=AF=A2=20=E7=AD=BE=E6=94=B6?= =?UTF-8?q?=E4=BA=BA=20=E7=AD=BE=E6=94=B6=E6=97=B6=E9=97=B4=20=20=E9=85=8D?= =?UTF-8?q?=E9=80=81=E5=8F=B8=E6=9C=BA=20=E9=85=8D=E9=80=81=E6=97=B6?= =?UTF-8?q?=E9=97=B4=20=E7=AD=BE=E6=94=B6=E4=BB=B6=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/WarehouseWaybillEntity.java | 6 ++++ .../logpm/warehouse/vo/FinanceWaybillVO.java | 30 +++++++++++++++++-- .../mapper/BusinessPreOrderMapper.xml | 3 ++ .../mq/waybil/StatusLogListener.java | 1 + .../TrunklineWaybillTrackServiceImpl.java | 4 ++- .../mapper/WarehouseWaybillMapper.xml | 7 ++++- 6 files changed, 47 insertions(+), 4 deletions(-) diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java index 3a3032b7d..420e441b9 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java @@ -547,6 +547,12 @@ public class WarehouseWaybillEntity extends TenantEntity { @ApiModelProperty(value = "文员复核时间 ") private Date signCheckTime; + @ApiModelProperty(value = "配送司机") + private String deliveryDriverName; + + @ApiModelProperty(value = "配送时间") + private Date deliveryTime; + /** *付款状态：(null) 10 未付款 20 部分付款 30 已付款 */ diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/FinanceWaybillVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/FinanceWaybillVO.java index 74970e679..eb54690a0 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/FinanceWaybillVO.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/FinanceWaybillVO.java @@ -84,11 +84,37 @@ public class FinanceWaybillVO implements Serializable { private String goodsTypePickupPrice; private String goodsTypeFreightPrice; private Integer goodsTypeCount; - private String payStatus; - private String settlementStatus; + /** + * 签收件数 + */ + private Integer signCount; + + /** + * 签收人 + */ + private String signUserName; + + /** + * 签收时间 + */ + private Date signTime; + + /** + * 配送时间 + */ + private Date deliveryTime; + + /** + * 配送司机 + */ + private String deliveryDriverName; + + + + } diff --git a/blade-service/logpm-business/src/main/java/com/logpm/business/mapper/BusinessPreOrderMapper.xml b/blade-service/logpm-business/src/main/java/com/logpm/business/mapper/BusinessPreOrderMapper.xml index deac34f67..8661447e3 100644 --- a/blade-service/logpm-business/src/main/java/com/logpm/business/mapper/BusinessPreOrderMapper.xml +++ b/blade-service/logpm-business/src/main/java/com/logpm/business/mapper/BusinessPreOrderMapper.xml @@ -67,6 +67,9 @@ AND train_number like concat(#{param.trainNumber},'%') + + AND order_package_code like concat(#{param.orderPackageCode},'%') + AND order_code like concat(#{param.orderCode},'%') diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mq/waybil/StatusLogListener.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mq/waybil/StatusLogListener.java index f334e6e2c..7f5dbf764 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mq/waybil/StatusLogListener.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mq/waybil/StatusLogListener.java @@ -88,6 +88,7 @@ public class StatusLogListener { t.setDeliveryTime(vo.getDeliveryTime()); t.setNum(waybillCountMap.get(waybillNumber)); t.setSignOrderCode(vo.getPickupBatch()); + t.setType(3); trunklineWaybillTrackClient.addSignWaybillLog(t); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillTrackServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillTrackServiceImpl.java index 36e3892fd..00d939e10 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillTrackServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillTrackServiceImpl.java @@ -64,7 +64,7 @@ public class TrunklineWaybillTrackServiceImpl extends BaseServiceImpl>>>",packageStatus+" **"); + log.info(">>>> {}",packageStatus+" **"); WarehouseWaybillEntity warehouseWaybillEntity = warehouseWaybillClient.findByWaybillNo(waybillNo); if(Objects.isNull(warehouseWaybillEntity)){ @@ -84,6 +84,8 @@ public class TrunklineWaybillTrackServiceImpl extends BaseServiceImpl