在途问题处理

hx-purchase/src/main/java/com/fjhx/purchase/service/purchase/impl/PurchaseServiceImpl.java

@@ -248,7 +248,7 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase>
 
         //是否在途过滤
         if (ObjectUtil.isNotEmpty(dto.getIsTransit())) {
-            wrapper.having("(IF(sum( dg.`status` ) != count( dg.`status` ), 1, 0)) = {0}", dto.getIsTransit());
+            wrapper.having("isTransit = {0}", dto.getIsTransit());
         }
 
         //添加权限过滤

hx-purchase/src/main/resources/mapper/purchase/PurchaseMapper.xml

@@ -32,12 +32,14 @@
                p.count,
                p.data_resource,
                p.data_resource_id,
-               IF(sum( dg.`status` ) != count( dg.`status` ), 1, 0) isTransit,
+--                IF(sum( dg.`status` ) != count( dg.`status` ), 1, 0) isTransit,
+               IF(((sum( dg.`status` ) != count( dg.`status` )) or sum(IF( sw.`status` != 2, 1, 0 ))>0) , 1, 0 ) isTransit,
                de.dept_name,
                p.contractCode
         FROM purchase p
                  LEFT JOIN bytesailing_base.sys_dept de ON p.team_id = de.dept_id
                  LEFT JOIN bytesailing_victoriatourist.deliver_goods dg ON dg.purchase_id = p.id
+                 LEFT JOIN bytesailing_wms.stock_wait sw ON sw.deliverGoodsId = dg.id
             ${ew.customSqlSegment}
     </sql>