楚江erp：发货计划明细新增去除时间限制

@@ -171,6 +171,7 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
             throw new DefaultClientException("发货计划不存在！");
         }
         vo.setWorkshopId(plan.getWorkshopId());
+        List<String> existOrderSpecIds = new ArrayList<>();
         // 获取已经存在的明细数据
         LambdaQueryWrapper<ShipmentsPlanDetail> queryWrapper = Wrappers.lambdaQuery(ShipmentsPlanDetail.class);
         queryWrapper.eq(ShipmentsPlanDetail::getPreShipments, Boolean.FALSE)
@@ -178,13 +179,14 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
         List<ShipmentsPlanDetail> detailList = getBaseMapper().selectList(queryWrapper);
         if (CollectionUtils.isNotEmpty(detailList)) {
             List<String> orderSpecIds = detailList.stream().map(ShipmentsPlanDetail::getOrderSpecId).collect(Collectors.toList());
-            vo.setOrderSpecIds(orderSpecIds);
+            existOrderSpecIds.addAll(orderSpecIds);
         }
         detailList = listByPlanId(plan.getId(), true);
         if (CollectionUtils.isNotEmpty(detailList)) {
             List<String> orderSpecIds = detailList.stream().map(ShipmentsPlanDetail::getOrderSpecId).collect(Collectors.toList());
-            vo.setOrderSpecIds(orderSpecIds);
+            existOrderSpecIds.addAll(orderSpecIds);
         }
+        vo.setOrderSpecIds(existOrderSpecIds);
         // 开启分页
         PageHelperUtil.startPage(pageIndex, pageSize);
         List<ShipmentsPlanDetail> dataList = getBaseMapper().queryCanShipmentsData(vo);

@@ -190,7 +190,7 @@
         from tbl_purchase_order_line ol
         inner join purchase_order_info o on ol.purchase_order_id = o.id
         left join base_data_customer c on o.ordering_unit = c.id
-        where ol.delivery_date >= #{vo.shipmentDate} and ol.del_flag = false
+        where ol.del_flag = false
         and o.type = 'PRODUCTION' and o.examine_status = 'PASS' and o.status not in ('SHIPPED', 'DELIVERED', 'CANCEL')
         and (o.revoke_status != 'UNDOING' or o.revoke_status is null)
         and (o.spec_change_status != 'IN_PROGRESS' or o.spec_change_status is null)