楚江ERP-手动生成发货单bug修复

@@ -33,6 +33,7 @@ import com.lframework.xingyun.sc.vo.shipments.car.CreateCarRequestPlanVo;
 import com.lframework.xingyun.sc.vo.shipments.car.CreateDraftRequestCarTicketVo;
 import com.lframework.xingyun.sc.vo.shipments.car.CreateDraftRequestCarTicketVo;
 import com.lframework.xingyun.sc.vo.shipments.car.CreateRequestCarTicketVo;
 import com.lframework.xingyun.sc.vo.shipments.car.CreateRequestCarTicketVo;
 import com.lframework.xingyun.sc.vo.shipments.order.*;
 import com.lframework.xingyun.sc.vo.shipments.order.*;
+import com.lframework.xingyun.sc.vo.shipments.plan.QueryShipmentsPlanDetailVo;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -260,7 +261,9 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
             if (CollectionUtils.isEmpty(planDetailIds)) {
             if (CollectionUtils.isEmpty(planDetailIds)) {
                 throw new DefaultClientException("发货明细id不能为空！");
                 throw new DefaultClientException("发货明细id不能为空！");
             }
             }
-            List<ShipmentsPlanDetail> detailList = shipmentsPlanDetailService.listByIds(planDetailIds);
+            QueryShipmentsPlanDetailVo planDetailVo = new QueryShipmentsPlanDetailVo();
+            planDetailVo.setIds(planDetailIds);
+            List<ShipmentsPlanDetail> detailList = shipmentsPlanDetailService.query(planDetailVo);
             if (CollectionUtils.isEmpty(detailList)) {
             if (CollectionUtils.isEmpty(detailList)) {
                 throw new DefaultClientException("发货明细数据不存在！");
                 throw new DefaultClientException("发货明细数据不存在！");
             }
             }

@@ -15,6 +15,12 @@ public class QueryShipmentsPlanDetailVo extends PageVo implements BaseVo, Serial
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
     /**
     /**
+     * ID集合
+     */
+    @ApiModelProperty("ID集合")
+    private List<String> ids;
+
+    /**
      * 发货计划ID
      * 发货计划ID
      */
      */
     @ApiModelProperty("发货计划ID")
     @ApiModelProperty("发货计划ID")

@@ -86,6 +86,12 @@
             <if test="vo.shipmentsDate != null">
             <if test="vo.shipmentsDate != null">
                 AND tb.shipments_date = #{vo.shipmentsDate}
                 AND tb.shipments_date = #{vo.shipmentsDate}
             </if>
             </if>
+            <if test="vo.ids != null and vo.ids.size() > 0">
+                AND tb.id in
+                <foreach collection="vo.ids" open="(" separator="," close=")" item="item">
+                    #{item}
+                </foreach>
+            </if>
             <if test="vo.completed != null">
             <if test="vo.completed != null">
                 <choose>
                 <choose>
                     <when test="vo.completed == true">
                     <when test="vo.completed == true">