|
|
|
@ -26,7 +26,6 @@ import com.logpm.trunkline.service.ITrunklineAdvanceDetailService;
|
|
|
|
|
import com.logpm.trunkline.vo.*; |
|
|
|
|
import com.logpm.warehouse.entity.WarehouseWaybillEntity; |
|
|
|
|
import com.logpm.warehouse.feign.IWarehouseWaybillClient; |
|
|
|
|
import lombok.AllArgsConstructor; |
|
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
|
import org.springblade.common.constant.WorkNodeEnums; |
|
|
|
|
import org.springblade.common.constant.broadcast.FanoutConstants; |
|
|
|
@ -47,6 +46,8 @@ import org.springblade.core.tool.api.R;
|
|
|
|
|
import org.springblade.core.tool.utils.Func; |
|
|
|
|
import org.springblade.core.tool.utils.ObjectUtil; |
|
|
|
|
import org.springblade.core.tool.utils.StringUtil; |
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
|
import org.springframework.context.annotation.Lazy; |
|
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
|
|
|
|
|
|
import java.util.*; |
|
|
|
@ -54,22 +55,23 @@ import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
|
@Slf4j |
|
|
|
|
@Service |
|
|
|
|
@AllArgsConstructor |
|
|
|
|
public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl<TrunklineAdvanceDetailMapper, TrunklineAdvanceDetailEntity> implements ITrunklineAdvanceDetailService { |
|
|
|
|
|
|
|
|
|
private final IBasicPrintTemplateClient basicPrintTemplateClient; |
|
|
|
|
|
|
|
|
|
private final TrunklineAdvanceMapper advanceMapper; |
|
|
|
|
|
|
|
|
|
private final IWarehouseWaybillClient warehouseWaybillClient; |
|
|
|
|
|
|
|
|
|
private final IBasicdataBrandClient basicdataBrandClient; |
|
|
|
|
|
|
|
|
|
private final BladeRedis bladeRedis; |
|
|
|
|
|
|
|
|
|
private final ISendFanoutService sendFanoutService; |
|
|
|
|
|
|
|
|
|
private final IPackageTrackLogAsyncService packageTrackLogAsyncService; |
|
|
|
|
@Autowired |
|
|
|
|
private IBasicPrintTemplateClient basicPrintTemplateClient; |
|
|
|
|
@Autowired |
|
|
|
|
private TrunklineAdvanceMapper advanceMapper; |
|
|
|
|
@Autowired |
|
|
|
|
private IWarehouseWaybillClient warehouseWaybillClient; |
|
|
|
|
@Autowired |
|
|
|
|
private IBasicdataBrandClient basicdataBrandClient; |
|
|
|
|
@Autowired |
|
|
|
|
private BladeRedis bladeRedis; |
|
|
|
|
@Autowired |
|
|
|
|
private ISendFanoutService sendFanoutService; |
|
|
|
|
@Lazy |
|
|
|
|
@Autowired |
|
|
|
|
private IPackageTrackLogAsyncService packageTrackLogAsyncService; |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public void updatePackageStatusById(String packageStatus, Long advanceDetailId, Long warehouseId, String warehouseName, Date incomingTime) { |
|
|
|
|