BUG修改： UID类型查找pizzaBox分类错误

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

@@ -345,44 +345,48 @@ public class StoragePosController {
 
 
         query.addCriteria(baseCriteria);
         query.addCriteria(baseCriteria);
 
 
+        String w="barcode.plateSize";
+        String h="barcode.height";
+        h="h";
+        w="w";
         //判断物料类型
         //判断物料类型
         if(ObjectUtil.isNotEmpty(criteria.getReelType())){
         if(ObjectUtil.isNotEmpty(criteria.getReelType())){
             ;
             ;
             //    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("barcode.plateSize").is(310);
-              c.and("barcode.height").is(80);
+              Criteria c=Criteria.where(w).is(310);
+              c.and(h).is(80);
               query.addCriteria(c);
               query.addCriteria(c);
             }else if(criteria.getReelType().toLowerCase().equals("tray")){
             }else if(criteria.getReelType().toLowerCase().equals("tray")){
-                Criteria c=Criteria.where("barcode.plateSize").is(330);
-                c.and("barcode.height").is(120);
+                Criteria c=Criteria.where(w).is(330);
+                c.and(h).is(120);
                 query.addCriteria(c);
                 query.addCriteria(c);
             }else if(criteria.getReelType().toLowerCase().equals("shoebox")){
             }else if(criteria.getReelType().toLowerCase().equals("shoebox")){
-                Criteria c=Criteria.where("barcode.plateSize").is(386);
-                c.and("barcode.height").is(86);
+                Criteria c=Criteria.where(w).is(386);
+                c.and(h).is(86);
                 query.addCriteria(c);
                 query.addCriteria(c);
             }else if(criteria.getReelType().toLowerCase().equals("pizzabox")){
             }else if(criteria.getReelType().toLowerCase().equals("pizzabox")){
-                Criteria c=Criteria.where("barcode.plateSize").is(400);
-                c.and("barcode.height").is(70);
+                Criteria c=Criteria.where(w).is(400);
+                c.and(h).is(70);
                 query.addCriteria(c);
                 query.addCriteria(c);
             }else if(criteria.getReelType().toLowerCase().equals("reel")){
             }else if(criteria.getReelType().toLowerCase().equals("reel")){
                 Criteria c = new Criteria().norOperator(
                 Criteria c = new Criteria().norOperator(
                         new Criteria().andOperator(
                         new Criteria().andOperator(
-                                Criteria.where("barcode.plateSize").is(310),
-                                Criteria.where("barcode.height").is(80)
+                                Criteria.where(w).is(310),
+                                Criteria.where(h).is(80)
                         ),
                         ),
                         new Criteria().andOperator(
                         new Criteria().andOperator(
-                                Criteria.where("barcode.plateSize").is(330),
-                                Criteria.where("barcode.height").is(120)
+                                Criteria.where(w).is(330),
+                                Criteria.where(h).is(120)
                         ),
                         ),
                         new Criteria().andOperator(
                         new Criteria().andOperator(
-                                Criteria.where("barcode.plateSize").is(386),
-                                Criteria.where("barcode.height").is(86)
+                                Criteria.where(w).is(386),
+                                Criteria.where(h).is(86)
                         ),
                         ),
                         new Criteria().andOperator(
                         new Criteria().andOperator(
-                                Criteria.where("barcode.plateSize").is(400),
-                                Criteria.where("barcode.height").is(70)
+                                Criteria.where(w).is(400),
+                                Criteria.where(h).is(70)
                         )
                         )
                 );
                 );