查找出库页面组合查询修改。

src/main/java/com/neotel/smfcore/core/device/handler/impl/BaseDeviceHandler.java

@@ -974,7 +974,7 @@ public class BaseDeviceHandler implements IDeviceHandler {
                 plateH = pos.getH();
                 plateH = pos.getH();
             }
             }
             statusBean.addPosInfo(outTask.getBarcode(), posName, plateW, plateH, false,outTask.isNgReel(),0);
             statusBean.addPosInfo(outTask.getBarcode(), posName, plateW, plateH, false,outTask.isNgReel(),0);
-            log.info("出库" + storage.getName() + "[" + posName + "]物料[" + outTask.getBarcode() + "] 发送到客户端" + storage.getCid());
+            log.info("出库" + storage.getName() + "[" + posName + "]物料[" + outTask.getBarcode() + "]["+outTask.isNgReel()+"] 发送到客户端" + storage.getCid());
         }
         }
         return statusBean;
         return statusBean;
     }
     }

src/main/java/com/neotel/smfcore/core/storage/rest/StoragePosController.java

@@ -343,7 +343,6 @@ public class StoragePosController {
             }
             }
         }
         }
 
 
-        query.addCriteria(baseCriteria);
 
 
         String w="barcode.plateSize";
         String w="barcode.plateSize";
         String h="barcode.height";
         String h="barcode.height";
@@ -355,23 +354,19 @@ public class StoragePosController {
             //    310*80   pcb    330*120   tray    386*86  shoe box   400X70 Pizza box
             //    310*80   pcb    330*120   tray    386*86  shoe box   400X70 Pizza box
 
 
             if(criteria.getReelType().toLowerCase().equals("pcb")){
             if(criteria.getReelType().toLowerCase().equals("pcb")){
-              Criteria c=Criteria.where(w).is(310);
-              c.and(h).is(80);
-              query.addCriteria(c);
+                baseCriteria.and(w).is(310);
+                baseCriteria.and(h).is(80);
             }else if(criteria.getReelType().toLowerCase().equals("tray")){
             }else if(criteria.getReelType().toLowerCase().equals("tray")){
-                Criteria c=Criteria.where(w).is(330);
-                c.and(h).is(120);
-                query.addCriteria(c);
+                baseCriteria.and(w).is(330);
+                baseCriteria.and(h).is(120);
             }else if(criteria.getReelType().toLowerCase().equals("shoebox")){
             }else if(criteria.getReelType().toLowerCase().equals("shoebox")){
-                Criteria c=Criteria.where(w).is(386);
-                c.and(h).is(86);
-                query.addCriteria(c);
+                baseCriteria.and(w).is(386);
+                baseCriteria.and(h).is(86);
             }else if(criteria.getReelType().toLowerCase().equals("pizzabox")){
             }else if(criteria.getReelType().toLowerCase().equals("pizzabox")){
-                Criteria c=Criteria.where(w).is(400);
-                c.and(h).is(70);
-                query.addCriteria(c);
+                baseCriteria.and(w).is(400);
+                baseCriteria.and(h).is(70);
             }else if(criteria.getReelType().toLowerCase().equals("reel")){
             }else if(criteria.getReelType().toLowerCase().equals("reel")){
-                Criteria c = new Criteria().norOperator(
+                baseCriteria.norOperator(
                         new Criteria().andOperator(
                         new Criteria().andOperator(
                                 Criteria.where(w).is(310),
                                 Criteria.where(w).is(310),
                                 Criteria.where(h).is(80)
                                 Criteria.where(h).is(80)
@@ -390,9 +385,9 @@ public class StoragePosController {
                         )
                         )
                 );
                 );
 
 
-                query.addCriteria(c);
             }
             }
         }
         }
+        query.addCriteria(baseCriteria);
         return query;
         return query;
     }
     }