感应料架禁用的库位不处理出入库。

src/main/java/com/neotel/smfcore/core/device/handler/impl/NLPShelfHandler.java

@@ -307,6 +307,19 @@ public class NLPShelfHandler extends BaseDeviceHandler{
         List<String> outNgList = new ArrayList<>();
         List<String> outNgList = new ArrayList<>();
 
 
         if(hasReelPosList != null){
         if(hasReelPosList != null){
+
+            List<String> newList=new ArrayList<>();
+            for (String posName :
+                    hasReelPosList) {
+                StoragePos pos = storagePosManager.getByPosName(posName);
+                if(!pos.isEnabled()){
+                    continue;
+                }
+                newList.add(posName);
+            }
+
+            hasReelPosList=newList.toArray(new String[newList.size()]);
+
             //入库的库位列表
             //入库的库位列表
             if(hasReelPosList.length > 1){
             if(hasReelPosList.length > 1){
                 String msg = "不可同时放入多盘物料:"+ String.join(",",hasReelPosList);
                 String msg = "不可同时放入多盘物料:"+ String.join(",",hasReelPosList);
@@ -315,7 +328,7 @@ public class NLPShelfHandler extends BaseDeviceHandler{
                 for (String posStr : hasReelPosList) {
                 for (String posStr : hasReelPosList) {
                     inNgList.add(posStr);
                     inNgList.add(posStr);
                 }
                 }
-            }else{
+            }else if (hasReelPosList.length==1){
                 StoragePos pos = storagePosManager.getByPosName(hasReelPosList[0]);
                 StoragePos pos = storagePosManager.getByPosName(hasReelPosList[0]);
                 if(pos == null){
                 if(pos == null){
                     String msg = "未找到库位:"+String.join(",",hasReelPosList) ;
                     String msg = "未找到库位:"+String.join(",",hasReelPosList) ;
@@ -376,6 +389,9 @@ public class NLPShelfHandler extends BaseDeviceHandler{
             //出库
             //出库
             for (String posName : noReelPosList) {
             for (String posName : noReelPosList) {
                 StoragePos pos = storagePosManager.getByPosName(posName);
                 StoragePos pos = storagePosManager.getByPosName(posName);
+                if(!pos.isEnabled()){
+                    continue;
+                }
                 if(pos == null){
                 if(pos == null){
                     String msg = "未找到库位:"+String.join(",",hasReelPosList) ;
                     String msg = "未找到库位:"+String.join(",",hasReelPosList) ;
                     log.error(msg);
                     log.error(msg);

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

@@ -317,6 +317,9 @@ public class BoxKanbanController {
             List<StoragePos> posList= storagePosManager.findByQuery(query);
             List<StoragePos> posList= storagePosManager.findByQuery(query);
             for (StoragePos pos:posList
             for (StoragePos pos:posList
                  ) {
                  ) {
+                if(!pos.isEnabled()){
+                    continue;
+                }
                 if(!pos.isUsed()){
                 if(!pos.isUsed()){
                     continue;
                     continue;
                 }
                 }
@@ -337,6 +340,9 @@ public class BoxKanbanController {
             List<StoragePos> posList= storagePosManager.findByQuery(query);
             List<StoragePos> posList= storagePosManager.findByQuery(query);
             for (StoragePos pos:posList
             for (StoragePos pos:posList
             ) {
             ) {
+                if(!pos.isEnabled()) {
+                    continue;
+                }
                 if(pos.isUsed()){
                 if(pos.isUsed()){
                     continue;
                     continue;
                 }
                 }