1.入库获取库位的时候,增加高度

src/main/java/com/neotel/smfcore/core/barcode/service/po/Barcode.java

@@ -243,6 +243,12 @@ public class Barcode extends BasePo implements Serializable {
      * 料盒是否装满,true是装满,false是不装满
      * 料盒是否装满,true是装满,false是不装满
      */
      */
     private boolean fillUp = false;
     private boolean fillUp = false;
+
+    /**
+     * 需要增加的高度
+     */
+    private int addHeight = 0;
+
     /**
     /**
      * 添加相关联条码
      * 添加相关联条码
      *
      *

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

@@ -138,9 +138,20 @@ public class DeviceController {
         String rfid = request.getParameter("rfid");
         String rfid = request.getParameter("rfid");
         String rfidLoc = request.getParameter("rfidLoc");
         String rfidLoc = request.getParameter("rfidLoc");
         String lastPosId = request.getParameter("lastPosId");
         String lastPosId = request.getParameter("lastPosId");
+        String addHeightStr = request.getParameter("addHeight");
 
 
         lineMsg = "";
         lineMsg = "";
-        log.info("流水线[" + cids + "]获取[" + rfid + "][" + code + "]的入库库位");
+        log.info("流水线[" + cids + "]获取[" + rfid + "][" + code + "]的入库库位,需要增加的尺寸为:"+addHeightStr);
+
+        //处理要增加的高度信息
+        int addHeight = 0;
+        try {
+            addHeight = Integer.parseInt(addHeightStr);
+        } catch (NumberFormatException e) {
+            e.printStackTrace();
+            log.info(addHeightStr+"转化出错,默认为0");
+        }
+
         Map<String, Object> resultMap = Maps.newHashMap();
         Map<String, Object> resultMap = Maps.newHashMap();
 
 
         if (dataCache.getCache(Constants.CACHE_StopOut)) {
         if (dataCache.getCache(Constants.CACHE_StopOut)) {
@@ -244,6 +255,7 @@ public class DeviceController {
                         }
                         }
                     }
                     }
 
 
+                    barcode.setAddHeight(addHeight);
                     StoragePos pos = taskService.findEmptyPosForPutIn(storageList, barcode, rfid, lastPosId);
                     StoragePos pos = taskService.findEmptyPosForPutIn(storageList, barcode, rfid, lastPosId);
 
 
                     if (pos != null) {
                     if (pos != null) {

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

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