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)