From 0707ac3b42f589891bf5268e55c527309b7b6790 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Thu, 22 Feb 2024 11:28:50 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=80=83=E6=A0=B8-=E6=8C=87=E6=A0=87?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/logpm/supervise/entity/IndicatorsEntity.java | 2 ++ .../distribution/mapper/DistributionDeliveryInfoMapper.java | 2 ++ .../service/impl/DistributionDeliveryListServiceImpl.java | 6 +++--- .../java/com/logpm/supervise/mapper/IndicatorsMapper.xml | 1 + .../logpm/supervise/service/impl/IndicatorsServiceImpl.java | 1 + 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/entity/IndicatorsEntity.java b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/entity/IndicatorsEntity.java index 5fdb00beb..f50cf278f 100644 --- a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/entity/IndicatorsEntity.java +++ b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/entity/IndicatorsEntity.java @@ -45,5 +45,7 @@ public class IndicatorsEntity extends TenantEntity { @ApiModelProperty(value = "异议备注") private String objectionRemark; + @ApiModelProperty(value = "申述原因") + private String appealReason; } 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 abef2e216..b5d07e4f7 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 @@ -29,6 +29,7 @@ import com.logpm.distribution.vo.DistributionStockArticleVO; import com.logpm.distribution.vo.DistributionStockListVO; import com.logpm.distribution.vo.app.DistributionAppReservationVO; import com.logpm.distribution.vo.app.DistributionAppStockArticleVO; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -40,6 +41,7 @@ import java.util.Map; * @author TJJ * @since 2023-06-16 */ +@Mapper public interface DistributionDeliveryInfoMapper extends BaseMapper { /** 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 2bd125e7b..e4febb0f4 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 @@ -25,7 +25,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.logpm.aftersales.vo.AftersalesAbnormalPackageVO; import com.logpm.basic.entity.BasicPrintTemplateEntity; import com.logpm.basic.feign.IBasicPrintTemplateClient; @@ -73,7 +72,6 @@ import org.springblade.common.constant.order.OrderStatusConstant; import org.springblade.common.constant.orderpackage.*; import org.springblade.common.constant.printTemplate.PrintTemplateStatusConstant; import org.springblade.common.constant.reservation.*; -import org.springblade.common.constant.signing.SignforDriverSigningStatusConstant; import org.springblade.common.constant.signing.SignforStatusConstant; import org.springblade.common.constant.stockup.StockAssignStatusConstant; import org.springblade.common.constant.stockup.StockupStatusConstant; @@ -6157,6 +6155,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl driverCar = getDriverCar(kind, deliveryListEntityId); String dirverName = driverCar.get("dirverName"); String dirverPhone = driverCar.get("dirverPhone"); @@ -6168,9 +6167,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl map = new HashMap<>(); map.put("配送单号", reservationEntity.getReservationCode()); + map.put("车次号", trainNumber); String fileTypeName = QRCodeUtil.createCodeToFile(reservationEntity.getReservationCode()); map.put("配送单二维码", QRCodeUtil.getEmpAutograph(fileTypeName)); - map.put("收货单单位", reservationEntity.getReceivingUnit());//收货单单位 + map.put("收货单位", reservationEntity.getReceivingUnit());//收货单单位 map.put("商城名称", reservationEntity.getStoreName());//商场名称 map.put("收货人", reservationEntity.getConsignee());//收货人 map.put("联系电话", reservationEntity.getDeliveryPhone());//收货人电话 diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml index a20698343..b3d928ccc 100644 --- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml @@ -15,6 +15,7 @@ si.assess_user_name assessUserName, si.point point, si.remark remark, + si.appeal_reason appealReason, si.indicators_status indicatorsStatus, si.is_objection isObjection, si.objection_remark objectionRemark, diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/IndicatorsServiceImpl.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/IndicatorsServiceImpl.java index bbc86cff2..26e79aeb2 100644 --- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/IndicatorsServiceImpl.java +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/IndicatorsServiceImpl.java @@ -110,6 +110,7 @@ public class IndicatorsServiceImpl extends BaseServiceImpl