Browse Source

Merge branch 'dev' into pre-production

master
zhaoqiaobo 10 months ago
parent
commit
023b660ee9
  1. 8
      blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/HwyUnloadCarComHandler.java

8
blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/HwyUnloadCarComHandler.java

@ -3,14 +3,13 @@ package com.logpm.factory.receiver;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.EnumUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONObject; import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import com.logpm.factory.comfac.dto.UnloadCarDTO;
import com.logpm.factory.mt.entity.MtPushData; import com.logpm.factory.mt.entity.MtPushData;
import com.logpm.factory.mt.service.IMtFactoryDataService; import com.logpm.factory.mt.service.IMtFactoryDataService;
import com.logpm.factory.mt.service.IMtFactoryOrderMainService; import com.logpm.factory.mt.service.IMtFactoryOrderMainService;
@ -18,7 +17,6 @@ import com.logpm.factory.mt.service.IMtPushDataService;
import com.logpm.factory.snm.vo.MTOrderPackageRelationVO; import com.logpm.factory.snm.vo.MTOrderPackageRelationVO;
import com.logpm.factorydata.enums.BrandEnums; import com.logpm.factorydata.enums.BrandEnums;
import com.logpm.factorydata.vo.NodePushMsg; import com.logpm.factorydata.vo.NodePushMsg;
import com.logpm.factorydata.vo.SendMsg;
import com.logpm.oldproject.feign.IAdvanceDetailClient; import com.logpm.oldproject.feign.IAdvanceDetailClient;
import com.rabbitmq.client.Channel; import com.rabbitmq.client.Channel;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@ -76,7 +74,9 @@ public class HwyUnloadCarComHandler {
} }
private void pushMentTian(NodePushMsg nodePushMsg) { private void pushMentTian(NodePushMsg nodePushMsg) {
if (!ObjectUtil.equals(WorkNodeEnums.END_WAREHOUSE_UNLOADING, nodePushMsg.getNode())) {
return;
}
// 根据包件获取车次 // 根据包件获取车次
List<Object> content = nodePushMsg.getContent(); List<Object> content = nodePushMsg.getContent();
List<String> carNumList = new ArrayList<>(); List<String> carNumList = new ArrayList<>();

Loading…
Cancel
Save