1.对比元器件信息 修改

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

@@ -188,10 +188,16 @@ public class DeviceController {
 
 
                     //判断尺寸是否和元器件是否一致
                     //判断尺寸是否和元器件是否一致
                     Component component = componentManager.findByPartNumberAndProvider(barcode.getPartNumber(), barcode.getProvider());
                     Component component = componentManager.findByPartNumberAndProvider(barcode.getPartNumber(), barcode.getProvider());
-                    if (component != null){
-                        if (component.getPlateSize() != barcode.getPlateSize() || component.getHeight() != barcode.getHeight()){
+                    if (component != null) {
+                        if (component.getPlateSize() != barcode.getPlateSize()) {
+                            //如果盘宽相差不超过4,则可以入库
+                            int componentHeight = component.getHeight();
+                            int barcodeHeight = barcode.getHeight();
+                            int difference = componentHeight - barcodeHeight;
+                            if (difference > 4 || difference < -4) {
                                 throw new ValidateException("smfcore.error.component.sizeNotMatch", "料盘尺寸[{0}}]与元器件{1}尺寸[{2}]不符,无法入库"
                                 throw new ValidateException("smfcore.error.component.sizeNotMatch", "料盘尺寸[{0}}]与元器件{1}尺寸[{2}]不符,无法入库"
-                                    , new String[]{barcode.getPlateSize()+"x"+barcode.getHeight(),component.getPartNumber(),component.getPlateSize()+"x"+component.getHeight()});
+                                        , new String[]{barcode.getPlateSize() + "x" + barcode.getHeight(), component.getPartNumber(), component.getPlateSize() + "x" + component.getHeight()});
+                            }
                         }
                         }
                     }
                     }