20768/1335科博达料仓入库时未分配最适合尺寸库位修改

src/main/java/com/neotel/smfcore/core/device/util/DataCache.java

@@ -204,7 +204,7 @@ public class DataCache {
             }
             }
         }
         }
 
 
-        log.info("updateCache [" + cacheKey + "]=[" + value + "]");
+        //log.info("updateCache [" + cacheKey + "]=[" + value + "]");
     }
     }
 
 
     /**
     /**

src/main/java/com/neotel/smfcore/custom/keboda1335/KebodaController.java

@@ -212,7 +212,11 @@ public class KebodaController {
                         if(loopCount>=10 ){
                         if(loopCount>=10 ){
                             log.info(barcode.getBarcode()+"已循环查找10次 直接跳出循环");
                             log.info(barcode.getBarcode()+"已循环查找10次 直接跳出循环");
                         }
                         }
-                        pos = taskService.findEmptyPosForPutIn(storageList, barcode, rfid, lastPosId);
+
+                        //遍历所有料仓,找最合适的库位
+                        pos = findBestFixPos(storageList, barcode, rfid, lastPosId);
+
+
                         if (pos == null){
                         if (pos == null){
                             break;
                             break;
                         }
                         }
@@ -360,6 +364,27 @@ public class KebodaController {
         return resultMap;
         return resultMap;
     }
     }
 
 
+    /**
+     * 查找尺寸最合适的库位
+     * @return
+     */
+    private StoragePos findBestFixPos(List<Storage> storageList,Barcode barcode, String rfid, String lastPosId){
+        StoragePos pos = null;
+        for (Storage storage : storageList) {
+            StoragePos tempPos = taskService.findEmptyPosForPutIn(storageList, barcode, rfid, lastPosId);
+            if(tempPos != null){
+                if(tempPos.getW() == barcode.getPlateSize() && tempPos.getH() == barcode.getHeight()){
+                    //库位尺寸与料盘尺寸完全一致,直接返回
+                    return tempPos;
+                }
+                if(pos == null){
+                    pos = tempPos;
+                }
+            }
+        }
+        return pos;
+    }
+
 
 
     public Barcode resolveBarcodeFromApi(CodeValidateParam params) {
     public Barcode resolveBarcodeFromApi(CodeValidateParam params) {
         Barcode barcodeSave = smfApi.canPutInBeforeResolve(params);
         Barcode barcodeSave = smfApi.canPutInBeforeResolve(params);