楚江erp：发货计划明细数据过滤

@@ -311,6 +311,7 @@ public class PurchaseOrderLineServiceImpl extends BaseMpServiceImpl<PurchaseOrde
         }
         // 根据日期批量查询
         LambdaQueryWrapper<PurchaseOrderLine> queryWrapper = Wrappers.lambdaQuery(PurchaseOrderLine.class);
+        queryWrapper.eq(PurchaseOrderLine::getDelFlag , Boolean.FALSE);
         if (!includeShipment) {
             queryWrapper.eq(PurchaseOrderLine::getShipment, Boolean.FALSE);
         }

@@ -150,6 +150,7 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
         if (plan == null) {
             throw new DefaultClientException("发货计划不存在！");
         }
+        vo.setWorkshopId(plan.getWorkshopId());
         // 获取已经存在的明细数据
         List<String> orderSpecIds = getBaseMapper().getExistsOrderSpecIds(plan.getAfTomoPreShipDate());
         if (CollectionUtils.isNotEmpty(orderSpecIds)) {
@@ -223,7 +224,25 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
         // 获取订货单数据
         Map<String, PurchaseOrderInfo> orderInfoMap = new HashMap<>();
         if (CollectionUtils.isNotEmpty(orderLineList)) {
-            List<String> orderIds = orderLineList.stream().map(PurchaseOrderLine::getPurchaseOrderId).collect(Collectors.toList());
+            List<String> orderIds = new ArrayList<>();
+            List<String> orderSpecIds = new ArrayList<>();
+            // 获取发货明细
+            for (PurchaseOrderLine orderLine : orderLineList) {
+                orderSpecIds.add(orderLine.getId());
+                String orderId = orderLine.getPurchaseOrderId();
+                if (StringUtils.isNotBlank(orderId) && !orderIds.contains(orderId)) {
+                    orderIds.add(orderId);
+                }
+            }
+            QueryShipmentsPlanDetailVo detailVo = new QueryShipmentsPlanDetailVo();
+            detailVo.setOrderSpecIds(orderSpecIds);
+            detailVo.setCompleted(Boolean.TRUE);
+            List<ShipmentsPlanDetail> detailList = query(detailVo);
+            if (CollectionUtils.isNotEmpty(detailList)) {
+                List<String> orderSpecIdList = detailList.stream().map(ShipmentsPlanDetail::getOrderSpecId).distinct().collect(Collectors.toList());
+                // 过滤掉已发货的数据
+                orderLineList.removeIf(next -> orderSpecIdList.contains(next.getId()));
+            }
             List<PurchaseOrderInfo> orderInfoList = purchaseOrderInfoService.listByIds(orderIds);
             if (CollectionUtils.isNotEmpty(orderInfoList)) {
                 orderInfoMap = orderInfoList.stream().collect(Collectors.toMap(PurchaseOrderInfo::getId, Function.identity()));
@@ -252,6 +271,17 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
                     if (orderInfo == null) {
                         continue;
                     }
+                    String type = orderInfo.getType();
+                    String examineStatus = orderInfo.getExamineStatus();
+                    String status = orderInfo.getStatus();
+                    String revokeStatus = orderInfo.getRevokeStatus();
+                    String specChangeStatus = orderInfo.getSpecChangeStatus();
+                    // 过滤掉无需发货的数据
+                    if (!"PRODUCTION".equals(type) || !"PASS".equals(examineStatus)
+                            || "SHIPPED".equals(status) || "DELIVERED".equals(status) || "CANCEL".equals(status)
+                            || "UNDOING".equals(revokeStatus) || "IN_PROGRESS".equals(specChangeStatus)) {
+                        continue;
+                    }
                     String workshopId = orderInfo.getWorkshopId();
                     if (!workshop.getId().equals(workshopId)) {
                         continue;

@@ -21,6 +21,12 @@ public class QueryShipmentsPlanDetailVo extends PageVo implements BaseVo, Serial
     private List<String> ids;
 
     /**
+     * 厂房ID
+     */
+    @ApiModelProperty("厂房ID")
+    private String workshopId;
+
+    /**
      * 发货计划ID
      */
     @ApiModelProperty("发货计划ID")

@@ -106,6 +106,12 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="vo.orderSpecIds != null and vo.orderSpecIds.size() > 0">
+                AND ol.id IN
+                <foreach collection="vo.orderSpecIds" open="(" separator="," close=")" item="item">
+                    #{item}
+                </foreach>
+            </if>
             <if test="vo.completed != null">
                 <choose>
                     <when test="vo.completed == true">
@@ -181,9 +187,12 @@
         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
-        and o.type = 'PRODUCTION' and o.examine_status = 'PASS' and o.status not in ('SHIPPED', 'DELIVERED')
+        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)
+        <if test="vo.workshopId != null and vo.workshopId != ''">
+            AND o.workshop_id = #{vo.workshopId}
+        </if>
         <if test="vo.orderSpecIds != null and vo.orderSpecIds.size() > 0">
             and ol.id not in
             <foreach collection="vo.orderSpecIds" open="(" separator="," close=")" item="item">