Commit de430dc02a946e729e89045c3537555adc643551

Authored by yeqianyong
1 parent 4b27f6e4

楚江erp:可发货列表数据调整(供前端使用,过滤掉不需要的数据)

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