1.干线bug修复

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java

@@ -2961,17 +2961,17 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		// 得到改单之前的收货单位
 		oldConsignee = waybillEntity.getConsignee();
 
-		Long newConsigneeId = openOrderDTO.getConsigneeId();
-
-		if(Objects.isNull(newConsigneeId)){
-			if(waybillType == 1){
-				log.warn("#############updateWaybill: 运单收货单位id为空 waybillId={} newConsigneeId={}", waybillId,newConsigneeId);
-				return R.fail(405, "请先维护收货单位信息");
-			}else if(waybillType == 2){
-				newConsigneeId = saveNewClient(openOrderDTO.getConsignee(), openOrderDTO.getConsigneeName(), openOrderDTO.getConsigneeMobile(), openOrderDTO.getConsigneeAddress(), "2");
-				openOrderDTO.setConsigneeId(newConsigneeId);
-			}
-		}
+//		Long newConsigneeId = openOrderDTO.getConsigneeId();
+//
+//		if(Objects.isNull(newConsigneeId)){
+//			if(waybillType == 1){
+//				log.warn("#############updateWaybill: 运单收货单位id为空 waybillId={} newConsigneeId={}", waybillId,newConsigneeId);
+//				return R.fail(405, "请先维护收货单位信息");
+//			}else if(waybillType == 2){
+//				newConsigneeId = saveNewClient(openOrderDTO.getConsignee(), openOrderDTO.getConsigneeName(), openOrderDTO.getConsigneeMobile(), openOrderDTO.getConsigneeAddress(), "2");
+//				openOrderDTO.setConsigneeId(newConsigneeId);
+//			}
+//		}
 
 		String updateMsg = verifyUpdateData(openOrderDTO, waybillEntity);