生物安全修改

huimv-receive/src/main/java/com/huimv/receive/service/impl/BillCleanServiceImpl.java

@@ -892,7 +892,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                     }
 
                     //第一次通过生成洗消
-                    if (billClean.getTestLocationId() == 6 && exist.getExist() == 0) {
+                    if (billClean.getTestLocationId() == 6 && exist.getExist() == 0 && billClean.getDestId() > 6) {
 
                         BillClean clean = new BillClean();
                         clean.setVistitType(billClean.getVistitType());
@@ -1258,9 +1258,9 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
         QueryWrapper<BillClean> queryWrapper = new QueryWrapper<>();
         queryWrapper.orderByDesc("pass_date");
         if (type.equals("1")) {
-            queryWrapper.eq("farm_id", farmId).eq("vistit_type", 0);
+            queryWrapper.eq("farm_id", farmId).eq("vistit_type", 0).ne("bill_status", 0);
         } else {
-            queryWrapper.eq("farm_id", farmId).ne("vistit_type", 0);
+            queryWrapper.eq("farm_id", farmId).ne("vistit_type", 0).ne("bill_status", 0);
         }
 
         return new Result(ResultCode.SUCCESS, billCleanMapper.selectList(queryWrapper));