1.13寸兼容上下4毫米

2.未找到库位,提示语修改

src/main/java/com/neotel/smfcore/core/device/rest/DeviceController.java

@@ -211,7 +211,7 @@ public class DeviceController {
                         }
                         }
                         int componentHeight = component.getHeight();
                         int componentHeight = component.getHeight();
                         int barcodeHeight = barcode.getHeight();
                         int barcodeHeight = barcode.getHeight();
-                        if (component.getPlateSize() == 7){
+                        if (component.getPlateSize() == 7 || component.getPlateSize() == 13){
                             //如果盘宽相差不超过4,则可以入库
                             //如果盘宽相差不超过4,则可以入库
                             int difference = componentHeight - barcodeHeight;
                             int difference = componentHeight - barcodeHeight;
                             if (difference > 4 || difference < -4) {
                             if (difference > 4 || difference < -4) {
@@ -308,7 +308,11 @@ public class DeviceController {
 
 
                     } else {
                     } else {
                         resultMap.put("result", "104");
                         resultMap.put("result", "104");
-                        errorMsg = "[" + barcode.getBarcode() + "]未找到可用的[" + barcode.getPlateSize() + "x" + barcode.getHeight() + "]仓位";
+                        int addHeight1 = barcode.getAddHeight();
+                        if (addHeight1 == 0){
+                            addHeight1 = barcode.getHeight();
+                        }
+                        errorMsg = "[" + barcode.getBarcode() + "]未找到可用的[" + barcode.getPlateSize() + "x" + addHeight1 + "]仓位";
                         resultMap.put("msg", errorMsg);
                         resultMap.put("msg", errorMsg);
 
 
                     }
                     }