根据机种查找库位

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

@@ -613,6 +613,10 @@ public class StoragePosManagerImpl implements IStoragePosManager {
             c = c.and("wareHouseCode").is(barcode.getWarehouseCode());
             c = c.and("wareHouseCode").is(barcode.getWarehouseCode());
         }
         }
 
 
+        if (StringUtils.isNotEmpty(barcode.getModelFamily())){
+            c = c.and("model").is(barcode.getModelFamily());
+        }
+
         Query query = new Query(c);
         Query query = new Query(c);
         String msg = "";
         String msg = "";
 
 

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/wipstor/controller/LineController.java

@@ -217,11 +217,19 @@ public class LineController {
             cidList.add(storage.getCid());
             cidList.add(storage.getCid());
         }
         }
 
 
-
+        String modelFamily = barcode.getModelFamily();
+        log.info(barcode.getBarcode() + "根据机种" + modelFamily + "查询库位开始");
         StoragePos pos = taskService.findEmptyPosForPutIn(storageList, barcode, "", "");
         StoragePos pos = taskService.findEmptyPosForPutIn(storageList, barcode, "", "");
         if (pos == null) {
         if (pos == null) {
+            log.info(barcode.getBarcode() + "根据机种" + modelFamily + "未找到库位信息,机种设为空,重新寻找库位");
+            barcode.setModelFamily("");
+            pos = taskService.findEmptyPosForPutIn(storageList, barcode, "", "");
+        }
+        if (pos == null) {
             return ResultBean.newErrorResult(-1, "", boxId + "未找到可用库位");
             return ResultBean.newErrorResult(-1, "", boxId + "未找到可用库位");
         }
         }
+        log.info(barcode.getBarcode() + "查询到的库位为:"+pos.getPosName()+"库别为:"+pos.getWareHouseCode()+"机种为:"+pos.getModel());
+        barcode.setModelFamily(modelFamily);
 
 
         //3.锁定库位
         //3.锁定库位
         Storage storage = dataCache.getStorageById(pos.getStorageId());
         Storage storage = dataCache.getStorageById(pos.getStorageId());