1

src/main/java/com/chinaitop/depot/keeperAccount/service/impl/StorageFcbgzServiceImpl.java

@@ -889,7 +889,7 @@ public class StorageFcbgzServiceImpl implements StorageFcbgzService {
 		if (StringUtils.isNotBlank(jznd)) {
 			criteria.andJzndEqualTo(jznd);
 		}
-		if ("1".equals(ylorcpl)) {
+		if ("1".equals(ylorcpl) && StringUtils.isBlank(jzzy)) {
 			if ("0".equals(ywlx)) {
 				criteria.andJzzyEqualTo("入库");
 			}
@@ -897,7 +897,7 @@ public class StorageFcbgzServiceImpl implements StorageFcbgzService {
 				criteria.andJzzyEqualTo("出库");
 			}
 		}
-		if ("0".equals(ylorcpl)) {
+		if ("0".equals(ylorcpl) && StringUtils.isBlank(jzzy)) {
 			List<String> jzzy_list = new ArrayList<>();
 			if ("0".equals(ywlx)) {
 				jzzy_list.add("入库");