楚江erp：发货计划添加bug修复(包括自动生成)

@@ -172,8 +172,17 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
         }
         vo.setWorkshopId(plan.getWorkshopId());
         // 获取已经存在的明细数据
-        List<String> orderSpecIds = getBaseMapper().getExistsOrderSpecIds(plan.getAfTomoPreShipDate());
-        if (CollectionUtils.isNotEmpty(orderSpecIds)) {
+        LambdaQueryWrapper<ShipmentsPlanDetail> queryWrapper = Wrappers.lambdaQuery(ShipmentsPlanDetail.class);
+        queryWrapper.eq(ShipmentsPlanDetail::getPreShipments, Boolean.FALSE)
+                .eq(ShipmentsPlanDetail::getDelFlag, Boolean.FALSE);
+        List<ShipmentsPlanDetail> detailList = getBaseMapper().selectList(queryWrapper);
+        if (CollectionUtils.isNotEmpty(detailList)) {
+            List<String> orderSpecIds = detailList.stream().map(ShipmentsPlanDetail::getOrderSpecId).collect(Collectors.toList());
+            vo.setOrderSpecIds(orderSpecIds);
+        }
+        detailList = listByPlanId(plan.getId(), true);
+        if (CollectionUtils.isNotEmpty(detailList)) {
+            List<String> orderSpecIds = detailList.stream().map(ShipmentsPlanDetail::getOrderSpecId).collect(Collectors.toList());
             vo.setOrderSpecIds(orderSpecIds);
         }
         // 开启分页
@@ -254,10 +263,12 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
                     orderIds.add(orderId);
                 }
             }
-            QueryShipmentsPlanDetailVo detailVo = new QueryShipmentsPlanDetailVo();
-            detailVo.setOrderSpecIds(orderSpecIds);
-            detailVo.setCompleted(Boolean.TRUE);
-            List<ShipmentsPlanDetail> detailList = query(detailVo);
+            // 获取已经加入过发货计划中的数据
+            LambdaQueryWrapper<ShipmentsPlanDetail> queryWrapper = Wrappers.lambdaQuery(ShipmentsPlanDetail.class);
+            queryWrapper.in(ShipmentsPlanDetail::getOrderSpecId, orderSpecIds)
+                    .eq(ShipmentsPlanDetail::getDelFlag, Boolean.FALSE)
+                    .eq(ShipmentsPlanDetail::getPreShipments, Boolean.FALSE);
+            List<ShipmentsPlanDetail> detailList = getBaseMapper().selectList(queryWrapper);
             if (CollectionUtils.isNotEmpty(detailList)) {
                 List<String> orderSpecIdList = detailList.stream().map(ShipmentsPlanDetail::getOrderSpecId).distinct().collect(Collectors.toList());
                 // 过滤掉已发货的数据

@@ -64,13 +64,4 @@ public interface ShipmentsPlanDetailMapper extends BaseMapper<ShipmentsPlanDetai
      * @return ShipmentsPlanDetail
      */
     ShipmentsPlanDetail findById(@Param("id") String id);
-
-    /**
-     * 获取已经存在的规格ID
-     * 包含预发数据
-     *
-     * @param shipmentsDate 发货日期
-     * @return              List<String>
-     */
-    List<String> getExistsOrderSpecIds(LocalDate shipmentsDate);
 }

@@ -185,7 +185,8 @@
             ol.length,
             ol.length_tol_pos,
             ol.length_tol_neg,
-            ol.quantity
+            ol.quantity,
+            ol.delivery_date as shipments_date
         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
@@ -296,10 +297,4 @@
             </if>
         </where>
     </select>
-
-    <select id="getExistsOrderSpecIds" resultType="java.lang.String">
-        select distinct tb.order_spec_id
-        from shipments_plan_detail tb
-        where tb.pre_shipments = false or (tb.pre_shipments = true and tb.shipments_date = #{shipmentsDate})
-    </select>
 </mapper>