7x12料盘 可以放到7x12和13x12 中

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

@@ -443,7 +443,15 @@ public class StoragePosManagerImpl implements IStoragePosManager {
         COMPATIBLE_TYPE compatibleType = storage.getCompatibleType();
         COMPATIBLE_TYPE compatibleType = storage.getCompatibleType();
 
 
         if (compatibleType == COMPATIBLE_TYPE.EXACT_MATCH) {//完全匹配
         if (compatibleType == COMPATIBLE_TYPE.EXACT_MATCH) {//完全匹配
+            //如果是7寸物料,可以放7寸和13寸的料格
+            if (7 ==barcode.getPlateSize() && 12 == barcode.getHeight()){
+                List<Criteria> criteria = new ArrayList<>();
+                criteria.add(Criteria.where("w").is(barcode.getPlateSize()).and("h").is(barcode.getHeight()));
+                criteria.add(Criteria.where("w").is(13).and("h").is(barcode.getHeight()));
+                c.orOperator(criteria);
+            } else {
                 c = c.and("w").is(barcode.getPlateSize()).and("h").is(barcode.getHeight());
                 c = c.and("w").is(barcode.getPlateSize()).and("h").is(barcode.getHeight());
+            }
         } else if (compatibleType == COMPATIBLE_TYPE.FULLY_COMPATIBLE) {//同厚度兼容
         } else if (compatibleType == COMPATIBLE_TYPE.FULLY_COMPATIBLE) {//同厚度兼容
             c = c.and("w").gte(barcode.getPlateSize()).and("h").gte(barcode.getHeight());//除7寸外,完全兼容
             c = c.and("w").gte(barcode.getPlateSize()).and("h").gte(barcode.getHeight());//除7寸外,完全兼容