尺寸厚度归类计算

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

@@ -210,18 +210,23 @@ public class DeviceController {
                                     , new String[]{barcode.getPlateSize() + "x" + barcode.getHeight(), component.getPartNumber(), component.getPlateSize() + "x" + component.getHeight()});
                         }*/
                         int componentHeight = component.getHeight();
+
                         int barcodeHeight = barcode.getHeight();
+                        if (addHeight != 0){
+                            barcodeHeight = addHeight;
+                        }
+
                         if (barcode.getPlateSize() == 7 || barcode.getPlateSize() == 13){
                             //如果盘宽相差不超过4,则可以入库
                             int difference = componentHeight - barcodeHeight;
-                            if (difference > 4 || difference < -4) {
+                            if (difference > 3 || difference < -3) {
                                 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" + barcodeHeight, component.getPartNumber(), component.getPlateSize() + "x" + component.getHeight()});
                             }
                         } else {
                             if (componentHeight != barcodeHeight){
                                 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" + barcodeHeight, component.getPartNumber(), component.getPlateSize() + "x" + component.getHeight()});
                             }
                         }
                     }

src/main/java/com/neotel/smfcore/core/kanban/rest/BoxKanbanController.java

@@ -2,7 +2,6 @@ package com.neotel.smfcore.core.kanban.rest;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.google.common.base.Strings;
-import com.google.common.collect.Lists;
 import com.neotel.smfcore.common.bean.PageData;
 import com.neotel.smfcore.common.bean.ResultBean;
 import com.neotel.smfcore.common.exception.ValidateException;
@@ -26,20 +25,16 @@ import com.neotel.smfcore.core.storage.service.po.Storage;
 import com.neotel.smfcore.core.storage.service.po.StoragePos;
 import com.neotel.smfcore.core.system.service.manager.impl.DataLogManagerImpl;
 import com.neotel.smfcore.core.system.service.po.DataLog;
-import com.neotel.smfcore.core.system.service.po.Humiture;
 import com.neotel.smfcore.core.system.util.DevicesStatusUtil;
 import com.neotel.smfcore.core.system.util.TaskService;
 import com.neotel.smfcore.security.annotation.AnonymousAccess;
 import com.neotel.smfcore.security.annotation.AnonymousPutMapping;
 import com.neotel.smfcore.security.service.manager.IGroupManager;
-import com.neotel.smfcore.security.service.manager.impl.GroupManagerImpl;
 import com.neotel.smfcore.security.service.manager.impl.UserManagerImpl;
 import com.neotel.smfcore.security.service.po.Group;
 import com.neotel.smfcore.security.service.po.User;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import javafx.concurrent.Task;
-import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -47,7 +42,6 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;