Merge branch 'master_after20' into master_cj_zq

@@ -44,6 +44,7 @@ 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.collections4.MapUtils;
 import org.apache.commons.collections4.MapUtils;
+import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 import com.lframework.xingyun.sc.mappers.ShipmentsOrderInfoMapper;
 import com.lframework.xingyun.sc.mappers.ShipmentsOrderInfoMapper;
@@ -471,7 +472,39 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
             return;
             return;
         }
         }
         List<String> orderIds = detailList.stream().map(ShipmentsPlanDetail::getOrderId).distinct().collect(Collectors.toList());
         List<String> orderIds = detailList.stream().map(ShipmentsPlanDetail::getOrderId).distinct().collect(Collectors.toList());
-        purchaseOrderInfoService.updateStatus(orderIds, "DELIVERED");
+        // 获取订货单规格数据
+        List<PurchaseOrderLine> orderLineList = purchaseOrderLineService.listByOrderIds(orderIds, true);
+        if (CollectionUtils.isEmpty(orderLineList)) {
+            return;
+        }
+        // 按照订货单分组
+        Map<String, List<PurchaseOrderLine>> orderLineMap = new HashMap<>();
+        for (PurchaseOrderLine orderLine : orderLineList) {
+            String orderId = orderLine.getPurchaseOrderId();
+            List<PurchaseOrderLine> list = orderLineMap.computeIfAbsent(orderId, k -> new ArrayList<>());
+            list.add(orderLine);
+        }
+        List<String> needDeliveryOrderIds = new ArrayList<>();
+        for (String orderId : orderIds) {
+            List<PurchaseOrderLine> lineList = orderLineMap.get(orderId);
+            if (CollectionUtils.isEmpty(lineList)) {
+                log.info("========================== 订货单 {} 不存在规格数据！", orderId);
+                continue;
+            }
+            boolean needDelivery = true;
+            for (PurchaseOrderLine line : lineList) {
+                Boolean shipment = line.getShipment();
+                if (!BooleanUtils.isTrue(shipment)) {
+                    needDelivery = false;
+                    break;
+                }
+            }
+            if (needDelivery) {
+                needDeliveryOrderIds.add(orderId);
+            }
+        }
+
+        purchaseOrderInfoService.updateStatus(needDeliveryOrderIds, "DELIVERED");
     }
     }
 
 
     @Override
     @Override

@@ -186,40 +186,49 @@
                 AND tb.standard_approved = #{vo.standardApproved}
                 AND tb.standard_approved = #{vo.standardApproved}
             </if>
             </if>
             <if test="vo.workshopIdList != null and vo.workshopIdList.size() > 0">
             <if test="vo.workshopIdList != null and vo.workshopIdList.size() > 0">
-                OR tb.workshop_id IN
+                AND tb.workshop_id IN
                 <foreach collection="vo.workshopIdList" open="(" separator="," close=")" item="item">
                 <foreach collection="vo.workshopIdList" open="(" separator="," close=")" item="item">
                     #{item}
                     #{item}
                 </foreach>
                 </foreach>
             </if>
             </if>
-            <choose>
-                <when test="vo.contractIdList != null and vo.contractIdList.size() > 0">
-                AND (tb.id IN
-                    <foreach collection="vo.contractIdList" open="(" separator="," close=")" item="item">
-                        #{item}
-                    </foreach>
-                    <if test="vo.createById != null and vo.createById != ''">
-                        OR tb.create_by_id = #{vo.createById}
-                    </if>
-                    <if test="vo.createByIdList != null and vo.createByIdList.size() > 0">
-                        OR tb.create_by_id IN
-                        <foreach collection="vo.createByIdList" open="(" separator="," close=")" item="item">
-                            #{item}
-                        </foreach>
-                    </if>
-                    )
-                </when>
-                <otherwise>
-                    <if test="vo.createById != null and vo.createById != ''">
-                        AND tb.create_by_id = #{vo.createById}
-                    </if>
-                    <if test="vo.createByIdList != null and vo.createByIdList.size() > 0">
-                        AND tb.create_by_id IN
-                        <foreach collection="vo.createByIdList" open="(" separator="," close=")" item="item">
-                            #{item}
-                        </foreach>
-                    </if>
-                </otherwise>
-            </choose>
+            <if test="vo.createById != null and vo.createById != ''">
+                AND tb.create_by_id = #{vo.createById}
+            </if>
+            <if test="vo.createByIdList != null and vo.createByIdList.size() > 0">
+                AND tb.create_by_id IN
+                <foreach collection="vo.createByIdList" open="(" separator="," close=")" item="item">
+                    #{item}
+                </foreach>
+            </if>
+<!--            <choose>-->
+<!--                <when test="vo.contractIdList != null and vo.contractIdList.size() > 0">-->
+<!--                AND (tb.id IN-->
+<!--                    <foreach collection="vo.contractIdList" open="(" separator="," close=")" item="item">-->
+<!--                        #{item}-->
+<!--                    </foreach>-->
+<!--                    <if test="vo.createById != null and vo.createById != ''">-->
+<!--                        OR tb.create_by_id = #{vo.createById}-->
+<!--                    </if>-->
+<!--                    <if test="vo.createByIdList != null and vo.createByIdList.size() > 0">-->
+<!--                        OR tb.create_by_id IN-->
+<!--                        <foreach collection="vo.createByIdList" open="(" separator="," close=")" item="item">-->
+<!--                            #{item}-->
+<!--                        </foreach>-->
+<!--                    </if>-->
+<!--                    )-->
+<!--                </when>-->
+<!--                <otherwise>-->
+<!--                    <if test="vo.createById != null and vo.createById != ''">-->
+<!--                        AND tb.create_by_id = #{vo.createById}-->
+<!--                    </if>-->
+<!--                    <if test="vo.createByIdList != null and vo.createByIdList.size() > 0">-->
+<!--                        AND tb.create_by_id IN-->
+<!--                        <foreach collection="vo.createByIdList" open="(" separator="," close=")" item="item">-->
+<!--                            #{item}-->
+<!--                        </foreach>-->
+<!--                    </if>-->
+<!--                </otherwise>-->
+<!--            </choose>-->
         </where>
         </where>
         order by tb.create_time desc
         order by tb.create_time desc
     </select>
     </select>