1.bug修复

blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/entity/OrderCountEntity.java

@@ -7,12 +7,13 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.Date;
 
 @Data
 @TableName("ht_order_count")
 @ApiModel(value = "OrderCount对象", description = "订单整合信息")
-public class OrderCountEntity {
+public class OrderCountEntity implements Serializable {
 
 	@TableId(
 		value = "id",

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java

@@ -19,7 +19,6 @@ package com.logpm.distribution.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.logpm.basicdata.entity.BasicdataClientUserEntity;
-import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.feign.IBasicdataClientClient;
 import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
 import com.logpm.distribution.dto.DistributionStockArticleDTO;

blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/FactoryCommonServiceImpl.java

@@ -136,7 +136,7 @@ public class FactoryCommonServiceImpl implements IFactoryCommonService {
 			//查询destinationWarehouse logiBillNo plantId数据
 			Map<String, String> supplyData = advanceDetailClient.getSupplyData(unitNo);
 			log.info(">>>>>>>>>>>>>>> extracted supplyData {}",supplyData);
-			if (supplyData== null||!supplyData.isEmpty()) {
+			if (supplyData != null && !supplyData.isEmpty()) {
 
 				String destinationWarehouseId = supplyData.get("destinationWarehouseId");//目的仓id
 				if (StringUtil.isBlank(currentWarehouseId) || StringUtil.isBlank(destinationWarehouseId)) {

blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/OrderPackageStatusFallJob.java

@@ -9,6 +9,7 @@ import com.xxl.job.core.handler.annotation.XxlJob;
 import com.xxl.job.core.log.XxlJobLogger;
 import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j2;
+import org.springblade.common.exception.CustomerException;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -43,6 +44,10 @@ public class OrderPackageStatusFallJob {
 
 				orderPackageStatusPushFailLogEntity.setDataStatus(1);
 
+			}catch (CustomerException e){
+				XxlJobLogger.log(e);
+
+				orderPackageStatusPushFailLogEntity.setDataStatus(2);
 			}catch (Exception e){
 				XxlJobLogger.log(e);