增加状态范围

ktg-mes/src/main/java/com/ktg/mes/md/mapper/BaseKnifeMapper.java

@@ -98,7 +98,6 @@ public interface BaseKnifeMapper {
     );
 
     List<BaseKnife> selectScrapList(
-            @Param("knifeFineState") Integer knifeFineState,
             @Param("isLocked") Integer isLocked
     );
 

ktg-mes/src/main/java/com/ktg/mes/md/service/impl/WmsOutPlanServiceImpl.java

@@ -259,7 +259,7 @@ public class WmsOutPlanServiceImpl implements IWmsOutPlanService {
     @Override
     public int autoScrapOut(String username) {
         // 获得全部可以报废物品
-        List<BaseKnife> baseKnifeList = this.baseKnifeMapper.selectScrapList(0, 0);
+        List<BaseKnife> baseKnifeList = this.baseKnifeMapper.selectScrapList(0);
 
         // 校验是否存在可报废物品
         if (baseKnifeList.isEmpty()) {

ktg-mes/src/main/resources/mapper/md/BaseKnifeMapper.xml

@@ -575,14 +575,12 @@
     <select id="selectScrapList" resultMap="BaseKnifeResult">
         <include refid="selectBaseKnifeVo"/>
         <where>
-            <if test="knifeFineState != null">
-                and KNIFE_FINE_STATE = #{knifeFineState}
-            </if>
             <if test="isLocked != null">
                 and IS_LOCKED = #{isLocked}
             </if>
             and RESET_COUNT = 0
             and KNIFE_LIFE = 0
+            and (KNIFE_FINE_STATE = 0 OR KNIFE_FINE_STATE = 1)
         </where>
     </select>
 </mapper>