diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java index ccc5dc444..d9500b3f7 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java @@ -31,6 +31,7 @@ import com.logpm.distribution.excel.DistributionSignforOwnExcel; import com.logpm.distribution.vo.*; import com.logpm.distribution.vo.app.*; import com.logpm.oldproject.dto.SignPushDataUnitDTO; +import com.logpm.trunkline.dto.WaybillLogDTO; import org.apache.ibatis.annotations.Param; import org.springblade.core.secure.BladeUser; @@ -411,5 +412,10 @@ public interface DistributionSignforMapper extends BaseMapper selectPushOldSingleInventoryPackageSigning(@Param("reservationId")Long reservationId,@Param("deliveryId") Long deliveryId,@Param("orderPackageCode") String orderPackageCode); - + /** + * 查询签收结果数据 + * @param reservationId + * @return + */ + List getWaybillSignforData(@Param("reservationId")Long reservationId,@Param("userId")Long userId,@Param("userName")String userName); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml index 1b19799da..262c1636d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml @@ -1794,4 +1794,74 @@ AND ldl.is_deleted = 0 AND ldl.signfor_state = 2 + 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 ce014a193..09fd5a86a 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 @@ -56,6 +56,8 @@ import com.logpm.oldproject.feign.IOldSignPushClient; import com.logpm.oldproject.feign.IWarehouseClient; import com.logpm.trunkline.dto.WaybillLogDTO; import com.logpm.trunkline.feign.ITrunklinePackageTrackLogClient; +import com.logpm.trunkline.feign.ITrunklineWaybillOrderClient; +import com.logpm.trunkline.feign.ITrunklineWaybillTrackClient; import com.logpm.warehouse.feign.IWarehouseUpdownStockUpAreaClient; import com.logpm.warehouse.feign.IWarehouseUpdownTypeClient; import lombok.extern.slf4j.Slf4j; @@ -246,6 +248,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl>>> updateSign isSuccess ={}", isSuccess); buildArgsToPushMq(distributionSignfor); if (isSuccess) { + //整理签收数据回退干线 + handletrunklineWaybillSignLog(distributionSignfor.getReservationId()); + + + + + + this.updateById(distributionSignfor); // 创建异步队列推送老系统的的签收信息 构建请求参数 return R.status(true); } - WaybillLogDTO waybillLogDTO = new WaybillLogDTO(); - return R.status(false); + } + + /** + * 推送干线运单信息 + * @param reservationId + */ + private void handletrunklineWaybillSignLog(Long reservationId) { + List mapList = baseMapper.getWaybillSignforData(reservationId,AuthUtil.getUser().getUserId(),AuthUtil.getUser().getNickName()); + if (!mapList.isEmpty()) { + for (WaybillLogDTO waybillLogDTO : mapList) { + trunklineWaybillTrackClient.addSignWaybillLog(waybillLogDTO); + } + } + + + } /**