From b7133c1e7d28c2c6ecef987b1541e8ae42fb6a23 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 26 Aug 2024 10:27:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=87=AA=E6=8F=90=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E9=87=8A=E6=94=BEBUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistrilbutionBillLadingServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java index 74f9a0af4..907ab32fe 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java @@ -3757,7 +3757,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl logList = new ArrayList<>(); for (DistributionParcelListEntity distributionParcelListEntity : distributionParcelListEntities) { - String content = "包件在" + warehouse.getName() + "由" + AuthUtil.getNickName() + "取消自提,操作方式:复核自提单包件释放,自提批次号:" + pickupBatch; + String content = "包件在" + warehouse.getName() + "由" + AuthUtil.getNickName() + "确认自提,取消包件计划,操作方式:复核自提单包件释放,自提批次号:" + pickupBatch; JSONObject logJS = handleLogJSONObject(warehouse, AuthUtil.getUser(), distributionParcelListEntity.getOrderPackageCode(), content, WorkNodeEnums.CANCEL_BILLOFLADING.getCode()); logList.add(logJS); } From cc9965bc3c60578bd9110018ae24c8940b95cf9b Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 26 Aug 2024 10:32:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=87=AA=E6=8F=90=E8=BF=90=E5=8D=95?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8E=A8=E9=80=81=E8=87=B3=E5=B9=B2=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/DistrilbutionBillLadingMapper.xml | 2 +- .../impl/DistrilbutionBillLadingServiceImpl.java | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml index 77f96c770..7bba4abee 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml @@ -1022,7 +1022,7 @@ GROUP_CONCAT( DISTINCT t.signOrderCode ) AS signOrderCode, 3 AS type, #{userId} AS userId, - #{userName} AS nickName + #{nickName} AS nickName FROM ( SELECT diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java index 907ab32fe..f8ea3e3c3 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java @@ -109,6 +109,7 @@ import com.logpm.oldproject.dto.SignPushDataUnitDTO; import com.logpm.oldproject.feign.IOldSignPushClient; import com.logpm.trunkline.dto.WaybillLogDTO; import com.logpm.trunkline.feign.ITrunklinePackageTrackLogClient; +import com.logpm.trunkline.feign.ITrunklineWaybillTrackClient; import com.logpm.warehouse.feign.IWarehouseUpdownTypeClient; import com.sun.org.apache.xpath.internal.operations.Bool; import lombok.extern.log4j.Log4j2; @@ -255,6 +256,9 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl selectDistrilbutionBillLadingPage(IPage page, DistrilbutionBillLadingVO distrilbutionBillLading) { @@ -3698,8 +3702,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl mapList = baseMapper.getWaybillSignforData(billLadingEntity.getId(),AuthUtil.getUser().getUserId(),AuthUtil.getUser().getNickName()); - + handletrunklineWaybillSignLog(billLadingEntity.getId()); } // 回传工厂数据 sendFactory(myCurrentWarehouse, parcelListIds); @@ -3731,6 +3734,15 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl mapList = baseMapper.getWaybillSignforData(id, AuthUtil.getUser().getUserId(), AuthUtil.getUser().getNickName()); + if (!mapList.isEmpty()) { + for (WaybillLogDTO waybillLogDTO : mapList) { + trunklineWaybillTrackClient.addSignWaybillLog(waybillLogDTO); + } + } + } + public void releaseBillLadingResource(Long l, BasicdataWarehouseEntity warehouse,String pickupBatch) { List list = distrilbutionBillPackageService.list(Wrappers.query().lambda() .eq(DistrilbutionBillPackageEntity::getBillLadingId, l)