1.干线bug修复

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/OpenOrderController.java

@@ -999,6 +999,13 @@ public class OpenOrderController {
 			log.warn("#################openOrderParamVerify: 发货单位不能为空 shipper={} ", shipper);
 			throw new CustomerException(405, "发货单位不能为空");
 		}
+
+		Long consigneeId = openOrderDTO.getConsigneeId();
+		if(Objects.isNull(consigneeId)){
+			log.warn("#################openOrderParamVerify: 收货单位不能为空 consigneeId={} ", consigneeId);
+			throw new CustomerException(405, "收货单位信息不能为空");
+		}
+
 		String consignee = openOrderDTO.getConsignee();
 		if (StringUtil.isBlank(consignee)) {
 			log.warn("#################openOrderParamVerify: 收货单位不能为空 consignee={} ", consignee);

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

@@ -642,11 +642,11 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		waybillEntity.setShipperAddress(openOrderDTO.getShipperAddress());
 
 		Long consigneeId = openOrderDTO.getConsigneeId();//收货单位id
-		if (Objects.isNull(consigneeId)) {
-			//如果收货单位没有id值，则把收货单位信息自动添加到client中
-			consigneeId = saveNewClient(openOrderDTO.getConsignee(), openOrderDTO.getConsigneeName(), openOrderDTO.getConsigneeMobile(), openOrderDTO.getConsigneeAddress(), "2");
-
-		}
+//		if (Objects.isNull(consigneeId)) {
+//			//如果收货单位没有id值，则把收货单位信息自动添加到client中
+//			consigneeId = saveNewClient(openOrderDTO.getConsignee(), openOrderDTO.getConsigneeName(), openOrderDTO.getConsigneeMobile(), openOrderDTO.getConsigneeAddress(), "2");
+//
+//		}
 		waybillEntity.setConsigneeId(consigneeId);
 		waybillEntity.setConsignee(openOrderDTO.getConsignee());
 		waybillEntity.setConsigneeName(openOrderDTO.getConsigneeName());
@@ -2936,6 +2936,18 @@ 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);
+			}
+		}
+
 		String updateMsg = verifyUpdateData(openOrderDTO, waybillEntity);
 
 		warehouseWaybillClient.updateEntity(waybillEntity);