Merge branch 'master_after20' into master_cj_zq

@@ -207,7 +207,13 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
                 existOrderSpecIds.addAll(orderSpecIds);
             }
         }
-        vo.setOrderSpecIds(existOrderSpecIds);
+        List<String> orderSpecIds = vo.getOrderSpecIds();
+        if (CollectionUtils.isNotEmpty(orderSpecIds)) {
+            orderSpecIds.addAll(existOrderSpecIds);
+        } else {
+            orderSpecIds = existOrderSpecIds;
+        }
+        vo.setOrderSpecIds(orderSpecIds);
         // 业务员做权限控制
         List<String> userIds = new ArrayList<>();
         String currentUserId = SecurityUtil.getCurrentUser().getId();