Merge remote-tracking branch 'origin/dev' into dev

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWayBillDetail.java

@@ -13,7 +13,7 @@ public class WarehouseWayBillDetail extends BaseEntity {
 
 	/** 运单号 */
 	@ApiModelProperty(name = "运单号",notes = "")
-	private String waybillCode;
+	private String waybillNo;
 
 	/** 运单号id */
 	@ApiModelProperty(name = "运单id",notes = "")

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockArticleClient.java

@@ -93,7 +93,7 @@ public class DistributionStockArticleClient implements IDistributionStockArticle
 	@Override
 	public DistributionStockArticleEntity findByOrderSelfNum(String waybillNo) {
     	QueryWrapper<DistributionStockArticleEntity> queryWrapper = new QueryWrapper<>();
-    	queryWrapper.eq("order_self_numbering",waybillNo);
+    	queryWrapper.eq("waybill_number",waybillNo);
 
 		return distributionStockArticleService.getOne(queryWrapper);
 	}

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/receiver/WaybillDataHandler.java

@@ -30,16 +30,20 @@ public class WaybillDataHandler {
 
 	@RabbitHandler
 	public void waybillDataHandler(Map map, Message message, Channel channel) {
-		 // 如果手动ACK,消息会被监听消费,但是消息在队列中依旧存在,如果 未配置 acknowledge-mode 默认是会在消费完毕后自动ACK掉
+		// 如果手动ACK,消息会被监听消费,但是消息在队列中依旧存在,如果 未配置 acknowledge-mode 默认是会在消费完毕后自动ACK掉
 		final long deliveryTag = message.getMessageProperties().getDeliveryTag();
 		String msg = new String(message.getBody());
 		WaybillDTO waybillDTO = (WaybillDTO) map.get("messageData");
-		log.info("##################waybillDataHandler: 处理开单零单数据 waybillDTO={}",waybillDTO);
+		log.info("##################waybillDataHandler: 处理开单零单数据 waybillDTO={}", waybillDTO);
 
-		if(!Objects.isNull(waybillDTO)) {
+		if (!Objects.isNull(waybillDTO)) {
-			warehouseWaybillService.waybillDataHandler(waybillDTO);
+			try {
-		}else {
+				warehouseWaybillService.waybillDataHandler(waybillDTO);
-			log.info("##################waybillDataHandler: 处理开单零单数据 失败 WaybillNo={} ",waybillDTO.getWaybillNo());
+			} catch (Exception e) {
+				log.error(e.getMessage());
+			}
+		} else {
+			log.info("##################waybillDataHandler: 处理开单零单数据 失败 WaybillNo={} ", waybillDTO.getWaybillNo());
 		}
 	}
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java

@@ -87,12 +87,12 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 
 		WayBillEntity wayBillEntity = wayBillClient.getByWaybillId(wayBillId);
 
-		if(ObjectUtils.isNull(wayBillEntity)){
+		if (ObjectUtils.isNull(wayBillEntity)) {
 			log.warn("##############waybillDataHandler: 老系统中未找到对应运单waybillId={}", waybillDTO.getId());
 			throw new CustomerException("老系统中未找到对应运单");
 		}
 
-		String waybillNo =wayBillEntity.getWaybillNo();
+		String waybillNo = wayBillEntity.getWaybillNo();
 		//通过运单号先去查询新系统是否存在这个运单号
 		QueryWrapper<WarehouseWaybillEntity> waybillQueryWrapper = new QueryWrapper<>();
 		waybillQueryWrapper.eq("waybill_no", waybillNo);
@@ -114,7 +114,7 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 			for (WaybillDesEntity waybillDesEntity : des) {
 				WarehouseWayBillDetail warehouseWayBillDetail = new WarehouseWayBillDetail();
 				warehouseWayBillDetail.setWaybillId(waybillId);
-				warehouseWayBillDetail.setWaybillCode(waybillNo);
+				warehouseWayBillDetail.setWaybillNo(waybillNo);
 				warehouseWayBillDetail.setProductName(waybillDesEntity.getName());
 				warehouseWayBillDetail.setNum(waybillDesEntity.getNum());
 				warehouseWayBillDetail.setStatus(1);
@@ -123,8 +123,8 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 				warehouseWayBillDetail.setUpdateTime(date);
 				ls.add(warehouseWayBillDetail);
 			}
+
 			warehouseWayBillDetailService.addList(ls);
-			//创建在库订单
 			createStockArticle(warehouseWaybill);
 
 		} else {
@@ -343,6 +343,7 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 
 	/**
 	 * 插入运单
+	 *
 	 * @param wayBillEntity
 	 * @param allNum
 	 * @return