1.锁定超过8个小时,释放

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

@@ -128,9 +128,9 @@ public class DeviceController {
             copyList.add(lockPosInfo);
             copyList.add(lockPosInfo);
         }
         }
         for (ReelLockPosInfo lockPosInfo : copyList) {
         for (ReelLockPosInfo lockPosInfo : copyList) {
-            if (System.currentTimeMillis() - lockPosInfo.getCreateDate().getTime() >= 1000 * 60 * 30) {
+            if (System.currentTimeMillis() - lockPosInfo.getCreateDate().getTime() >= 1000 * 60 * 60 * 8) {
                 ReelLockPosUtil.removeReelLockPosInfo(lockPosInfo.getBarcode());
                 ReelLockPosUtil.removeReelLockPosInfo(lockPosInfo.getBarcode());
-                log.info(lockPosInfo.getBarcode() + "锁定时间超过1小时,解除锁定:" + lockPosInfo.getCreateDate());
+                log.info(lockPosInfo.getBarcode() + "锁定时间超过8小时,解除锁定:" + lockPosInfo.getCreateDate());
             }
             }
         }
         }
         String code = request.getParameter("code");
         String code = request.getParameter("code");
@@ -205,13 +205,13 @@ public class DeviceController {
                     //判断尺寸是否和元器件是否一致
                     //判断尺寸是否和元器件是否一致
                     Component component = componentManager.findByPartNumberAndProvider(barcode.getPartNumber(), barcode.getProvider());
                     Component component = componentManager.findByPartNumberAndProvider(barcode.getPartNumber(), barcode.getProvider());
                     if (component != null) {
                     if (component != null) {
-                        if (component.getPlateSize() != barcode.getPlateSize()){
+                        /*if (component.getPlateSize() != barcode.getPlateSize()){
                             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()});
-                        }
+                        }*/
                         int componentHeight = component.getHeight();
                         int componentHeight = component.getHeight();
                         int barcodeHeight = barcode.getHeight();
                         int barcodeHeight = barcode.getHeight();
-                        if (component.getPlateSize() == 7 || component.getPlateSize() == 13){
+                        if (barcode.getPlateSize() == 7 || barcode.getPlateSize() == 13){
                             //如果盘宽相差不超过4,则可以入库
                             //如果盘宽相差不超过4,则可以入库
                             int difference = componentHeight - barcodeHeight;
                             int difference = componentHeight - barcodeHeight;
                             if (difference > 4 || difference < -4) {
                             if (difference > 4 || difference < -4) {

src/main/java/com/neotel/smfcore/core/system/util/TaskService.java

@@ -484,7 +484,10 @@ public class TaskService {
                     boolean isSingleOut = task.isSingleOut();
                     boolean isSingleOut = task.isSingleOut();
                     if (codeObj != null) {
                     if (codeObj != null) {
                         plateW = codeObj.getPlateSize();
                         plateW = codeObj.getPlateSize();
+                        plateH = codeObj.getAddHeight();
+                        if (plateH == 0){
                             plateH = codeObj.getHeight();
                             plateH = codeObj.getHeight();
+                        }
                         if (codeObj.isOnlySingleOut()) {
                         if (codeObj.isOnlySingleOut()) {
                             log.info(codeObj.getBarcode() + " 只能单盘出库");
                             log.info(codeObj.getBarcode() + " 只能单盘出库");
                             isSingleOut = true;
                             isSingleOut = true;