PDA自动下发任务领取

mhd_wms/src/main/resources/mapper/deliveTask/DeliveTaskMapper.xml

@@ -138,7 +138,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
         </where>
     </sql>
-    <!-- PDA 下发任务列表：与 del_flag、top_organization_id、warehouse_id、task_status、task_distribution_id 为主条件，不按 operators_by/tabType 过滤 -->
+    <!-- PDA 下发任务列表：del_flag、组织、仓库、tabType(1=指派给我/2=任务大厅未领取) 等 -->
     <sql id="selectDeliveTaskPoApp1">
         <where>
             del_flag = 1
@@ -196,6 +196,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="taskDistributionName != null  and taskDistributionName != ''">
                 and task_distribution_name like concat('%', #{taskDistributionName}, '%')
             </if>
+            <if test="tabType != null and tabType==1">
+                and operators_by = #{operatorsBy}
+            </if>
+            <if test="tabType != null and tabType==2">
+                and operators_by IS NULL
+            </if>
             <if test="operatorsName != null  and operatorsName != ''">
                 and operators_name like concat('%', #{operatorsName}, '%')
             </if>