1.入库获取库位,使用实际厚度

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

@@ -382,13 +382,18 @@ public class StoragePosManagerImpl implements IStoragePosManager {
 
         COMPATIBLE_TYPE compatibleType = storage.getCompatibleType();
 
+        int height = barcode.getHeight();
+        if (barcode.getAddHeight() != 0){
+            height = barcode.getAddHeight();
+        }
+
         if (compatibleType == COMPATIBLE_TYPE.EXACT_MATCH) {//完全匹配
-            c = c.and("w").is(barcode.getPlateSize()).and("h").is(barcode.getHeight()+barcode.getAddHeight());
+            c = c.and("w").is(barcode.getPlateSize()).and("h").is(height);
         } else if (compatibleType == COMPATIBLE_TYPE.FULLY_COMPATIBLE) {//同厚度兼容
-            c = c.and("w").gte(barcode.getPlateSize()).and("h").gte(barcode.getHeight()+barcode.getAddHeight());//除7寸外,完全兼容
+            c = c.and("w").gte(barcode.getPlateSize()).and("h").gte(height);//除7寸外,完全兼容
 
         } else if (compatibleType == COMPATIBLE_TYPE.SIZE_COMPATIBLE) {//同尺寸兼容
-            c = c.and("w").is(barcode.getPlateSize()).and("h").gte(barcode.getHeight()+barcode.getAddHeight());//宽度等于料盘宽度,高度大于等于料盘高度
+            c = c.and("w").is(barcode.getPlateSize()).and("h").gte(height);//宽度等于料盘宽度,高度大于等于料盘高度
         }
 
         c = c.and("enabled").is(true)//可用