取消随货拦截

src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java

@@ -414,7 +414,7 @@ public class TzcPolicyApplicationServiceImpl implements TzcPolicyApplicationServ
             LambdaQueryWrapper<TbsBudget> budgetLqw = new LambdaQueryWrapper<>();
             budgetLqw.in(TbsBudget::getId,budgetIds);
             //默认为随货折让(FYMC05)
-            budgetLqw.eq(TbsBudget::getSubjectCode,"FYMC05");
+            //budgetLqw.eq(TbsBudget::getSubjectCode,"FYMC05");
             budgetLqw.in(TbsBudget::getCenterId,centerIds);
             budgetLqw.eq(TbsBudget::getBudgetState,1);
             budgetList = tbsBudgetMapper.selectList(budgetLqw);

src/main/resources/mapper/tbs/TbsScheduleItemBudgetMapper.xml

@@ -87,7 +87,7 @@
                     #{selectId}
                 </foreach>
           AND `tbs_cost_apply`.id != #{applyId}
-          AND opt_type IN (1,4,5,6,15)
+          AND opt_type != 0
         group by `tbs_budget_log`.budget_id,`tbs_budget_log`.schedule_item_id
     </select>
 
@@ -131,7 +131,7 @@
             #{selectId}
         </foreach>
         AND `tzc_policy`.id != #{policyId}
-        AND opt_type IN (11,12,13,14)
+        AND opt_type != 0
         group by `tbs_budget_log`.budget_id,`tbs_budget_log`.schedule_item_id
     </select>