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

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

@@ -1002,8 +1002,8 @@ public class OpenOrderController {
 
 		Long consigneeId = openOrderDTO.getConsigneeId();
 		if(Objects.isNull(consigneeId)){
-			log.warn("#################openOrderParamVerify: 收货单位不能为空 consigneeId={} ", consigneeId);
-			throw new CustomerException(405, "收货单位信息不能为空");
+			log.warn("#################openOrderParamVerify: 请先维护收货单位 consigneeId={} ", consigneeId);
+			throw new CustomerException(405, "请先维护收货单位");
 		}
 
 		String consignee = openOrderDTO.getConsignee();

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

@@ -4874,6 +4874,14 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 			editOrderMsgVO.setOldValue(consignee);
 			editOrderMsgVO.setNewValue(newConsignee);
 			msgList.add(editOrderMsgVO);
+		}else{
+			if (!ObjectUtil.equals(consignee, newConsignee)) {
+				EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO();
+				editOrderMsgVO.setItemName("收货单位");
+				editOrderMsgVO.setOldValue(consignee);
+				editOrderMsgVO.setNewValue(newConsignee);
+				msgList.add(editOrderMsgVO);
+			}
 		}
 
 		String newConsigneeName = openOrderDTO.getConsigneeName();