查找库位排除库位为空

src/main/java/com/neotel/smfcore/core/storage/service/manager/impl/StoragePosManagerImpl.java

@@ -562,6 +562,9 @@ public class StoragePosManagerImpl implements IStoragePosManager {
         if (excludePosIds != null && !excludePosIds.isEmpty()) {
         if (excludePosIds != null && !excludePosIds.isEmpty()) {
             c = c.and("id").nin(excludePosIds);
             c = c.and("id").nin(excludePosIds);
         }
         }
+
+        c.and("posName").ne("");
+
         Query query = new Query(c);
         Query query = new Query(c);
         String msg = "";
         String msg = "";
 
 

src/main/java/com/neotel/smfcore/custom/lizhen/kanban/outer/OuterKanbanController.java

@@ -195,21 +195,21 @@ public class OuterKanbanController {
 
 
 
 
     private long getExpireCount() {
     private long getExpireCount() {
-        Query query = new Query().addCriteria(Criteria.where("posName").exists(true).ne("").and("expireDate").lt(new Date()));
+        Query query = new Query().addCriteria(Criteria.where("posName").exists(true).ne("").and("expireDate").lt(new Date()).and("barcode").ne("").exists(true));
         return barcodeManager.countByQuery(query);
         return barcodeManager.countByQuery(query);
     }
     }
 
 
     private long getNoExpireCount() {
     private long getNoExpireCount() {
         List<Criteria> orCriList = new ArrayList<>();
         List<Criteria> orCriList = new ArrayList<>();
-        orCriList.add(Criteria.where("expireDate").gt(new Date()).and("posName").exists(true).ne("").and("partNumber").nin(Arrays.asList("CS", "CM", "CB")));
-        orCriList.add(Criteria.where("expireDate").exists(false).and("posName").exists(true).ne("").and("partNumber").nin(Arrays.asList("CS", "CM", "CB")));
+        orCriList.add(Criteria.where("expireDate").gt(new Date()).and("posName").exists(true).ne("").and("partNumber").nin(Arrays.asList("CS", "CM", "CB")).and("barcode").ne("").exists(true));
+        orCriList.add(Criteria.where("expireDate").exists(false).and("posName").exists(true).ne("").and("partNumber").nin(Arrays.asList("CS", "CM", "CB")).and("barcode").ne("").exists(true));
         return barcodeManager.countByQuery(new Query(new Criteria().orOperator(orCriList)));
         return barcodeManager.countByQuery(new Query(new Criteria().orOperator(orCriList)));
     }
     }
 
 
     private long getZeroToServenExpireCount() {
     private long getZeroToServenExpireCount() {
         Date startDate = new Date();
         Date startDate = new Date();
         Date endDate = DateUtil.addDays(startDate, 7);
         Date endDate = DateUtil.addDays(startDate, 7);
-        Query query = new Query().addCriteria(Criteria.where("posName").exists(true).ne("").and("expireDate").gte(startDate).lt(endDate));
+        Query query = new Query().addCriteria(Criteria.where("posName").exists(true).ne("").and("expireDate").gte(startDate).lt(endDate).and("barcode").ne("").exists(true));
         return barcodeManager.countByQuery(query);
         return barcodeManager.countByQuery(query);
     }
     }
 
 
@@ -217,7 +217,7 @@ public class OuterKanbanController {
         Date date = new Date();
         Date date = new Date();
         Date startDate = DateUtil.addDays(date, 7);
         Date startDate = DateUtil.addDays(date, 7);
         Date endDate = DateUtil.addDays(date, 30);
         Date endDate = DateUtil.addDays(date, 30);
-        Query query = new Query().addCriteria(Criteria.where("posName").exists(true).ne("").and("expireDate").gte(startDate).lt(endDate));
+        Query query = new Query().addCriteria(Criteria.where("posName").exists(true).ne("").and("expireDate").gte(startDate).lt(endDate).and("barcode").ne("").exists(true));
         return barcodeManager.countByQuery(query);
         return barcodeManager.countByQuery(query);
     }
     }
 }
 }

src/main/java/com/neotel/smfcore/custom/lizhen/report/outer/OuterReportController.java

@@ -484,7 +484,7 @@ public class OuterReportController {
         }
         }
         if (queryCondition != null) {
         if (queryCondition != null) {
             query = QueryHelp.getQuery(queryCondition);
             query = QueryHelp.getQuery(queryCondition);
-            query.addCriteria(Criteria.where("posName").exists(true).ne("").and("partNumber").nin(Arrays.asList("CS", "CM", "CB")));
+            query.addCriteria(Criteria.where("posName").exists(true).ne("").and("partNumber").nin(Arrays.asList("CS", "CM", "CB")).and("barcode").exists(true).ne(""));
         }
         }
         PageData<InventoryDto> resultData = new PageData<>();
         PageData<InventoryDto> resultData = new PageData<>();
         PageData<Barcode> data = barcodeManager.findByPage(query, pageable);
         PageData<Barcode> data = barcodeManager.findByPage(query, pageable);
@@ -578,7 +578,7 @@ public class OuterReportController {
     public void inventoryDownload(ReportQueryCondition queryCondition, Pageable pageable, HttpServletResponse response) {
     public void inventoryDownload(ReportQueryCondition queryCondition, Pageable pageable, HttpServletResponse response) {
         log.info("导出开始:"+new Date());
         log.info("导出开始:"+new Date());
         Query query = QueryHelp.getQuery(queryCondition);
         Query query = QueryHelp.getQuery(queryCondition);
-        query.addCriteria(Criteria.where("posName").exists(true).ne("").and("partNumber").nin(Arrays.asList("CS","CM","CB")));
+        query.addCriteria(Criteria.where("posName").exists(true).ne("").and("partNumber").nin(Arrays.asList("CS","CM","CB")).and("barcode").exists(true).ne(""));
         try {
         try {
             FileUtil.downloadExcel(query, pageable, response, new IExcelDownLoad() {
             FileUtil.downloadExcel(query, pageable, response, new IExcelDownLoad() {
                 @Override
                 @Override
@@ -793,7 +793,7 @@ public class OuterReportController {
     public PageData<ExpireDto> expireInfo(ReportQueryCondition queryCondition, Pageable pageable) {
     public PageData<ExpireDto> expireInfo(ReportQueryCondition queryCondition, Pageable pageable) {
         Query query = QueryHelp.getQuery(queryCondition);
         Query query = QueryHelp.getQuery(queryCondition);
 
 
-        Criteria c = Criteria.where("posName").exists(true).ne("").and("partNumber").nin(Arrays.asList("CS", "CM", "CB"));
+        Criteria c = Criteria.where("posName").exists(true).ne("").and("partNumber").nin(Arrays.asList("CS", "CM", "CB")).and("barcode").ne("").exists(true);
         //判断传入的类型
         //判断传入的类型
         String expireStatus = queryCondition.getExpireStatus();
         String expireStatus = queryCondition.getExpireStatus();
         Date startDate,endDate;
         Date startDate,endDate;
@@ -882,7 +882,7 @@ public class OuterReportController {
     @AnonymousAccess
     @AnonymousAccess
     public void expireInfoDownload(ReportQueryCondition queryCondition, Pageable pageable, HttpServletResponse response) throws IOException {
     public void expireInfoDownload(ReportQueryCondition queryCondition, Pageable pageable, HttpServletResponse response) throws IOException {
         Query query = QueryHelp.getQuery(queryCondition);
         Query query = QueryHelp.getQuery(queryCondition);
-        Criteria c = Criteria.where("posName").exists(true).ne("").and("partNumber").nin(Arrays.asList("CS", "CM", "CB"));
+        Criteria c = Criteria.where("posName").exists(true).ne("").and("partNumber").nin(Arrays.asList("CS", "CM", "CB")).and("barcode").ne("").exists(true);
 
 
         //判断传入的类型
         //判断传入的类型
         String expireStatus = queryCondition.getExpireStatus();
         String expireStatus = queryCondition.getExpireStatus();