锡膏料仓库位导入处理

src/main/java/com/neotel/smfcore/core/storage/rest/StorageController.java

@@ -476,6 +476,7 @@ public class StorageController {
         int wIndex = csvRead.getCsvIndex("宽度","w");
         int warmPosIndex = csvRead.getHasCsvIndex("回温库位","warmPos");//true表示回温区库位，
         int areaIndex = csvRead.getHasCsvIndex("区域","area");
+        int posTypeIndex = csvRead.getHasCsvIndex("库位类型","posType");
 
 
         int row = 1;
@@ -493,6 +494,7 @@ public class StorageController {
             Integer height =0;
             Integer width =0;
             String labelName="";
+            Integer posType=0;
             try {
                  priority =Integer.parseInt(lineValues[priIndex]) ;
                  height = Integer.parseInt(lineValues[hIndex]);
@@ -505,6 +507,9 @@ public class StorageController {
                      String areaStr=lineValues[areaIndex];
                      labelName=areaStr.trim();
                  }
+                 if(posTypeIndex>=0){
+                     posType=Integer.parseInt(lineValues[posTypeIndex]);
+                 }
             }catch (Exception ex){
                 log.warn("第"+row+"行中有空白内容,此行忽略");
                 continue;
@@ -514,6 +519,15 @@ public class StorageController {
                 log.warn("第"+row+"行中有空白内容,此行忽略");
                 continue;
             }
+            if(storage.isSolderPaste()&&posType>0){
+                if(posType>=3){
+                    log.warn("锡膏料仓["+storage.getCid()+"-"+storage.getName()+"]上传库位号，第"+row+"行，库位号["+posName+"]类型="+posType+"，此库位忽略");
+                    continue;
+                }
+                else if(posType==2){
+                    isWarmPos=true;
+                }
+            }
 //            StoragePos posInfo = storagePosManager.getByPosName(posName);
             StoragePos posInfo =findFormList(storagePosList,posName);