读取 CSV 订单文件(两列:PN,num) 修改

myproject/src/main/java/com/myproject/api/OrderFileWatch.java

@@ -285,8 +285,9 @@ public class OrderFileWatch {
 
             int columnCount = csvRead.getHeaderCount();
 
-            int reelIdIndex = csvRead.getIndex("RI");
-            if(reelIdIndex != -1 || columnCount > 22){
+            int partNumberIndex = csvRead.getIndex("PN");
+            if(partNumberIndex == -1){
+                int reelIdIndex = csvRead.getIndex("RI");
                 while(csvRead.readRecord()){
                     String[] lineValues = csvRead.getValues();
                     String reelId = "";
@@ -304,7 +305,9 @@ public class OrderFileWatch {
                         }
 
                     }else{
-                        reelId = lineValues[reelIdIndex];
+                        if(reelIdIndex != -1){
+                            reelId = lineValues[reelIdIndex];
+                        }
                     }
                     if(reelId.isEmpty()){
                         log.warn("行[reelId="+reelId + "]中RI 为空,此行忽略");
@@ -317,8 +320,9 @@ public class OrderFileWatch {
                         items.add(item);
                     }
                 }
-            }else{
-                int partNumberIndex = csvRead.getIndex("PN");
+            }
+
+            if(items.isEmpty()){
                 if (partNumberIndex == -1){
                     log.info("未包含PN列");
                     return null;