工单导入bug修改

src/main/java/com/neotel/smfcore/core/order/listener/DefaultOrderFileListener.java

@@ -84,8 +84,8 @@ public class DefaultOrderFileListener implements IOrderFileListener {
                             liteOrderCache.addOrderToMap(liteOrder);
                             liteOrderCache.addOrderToMap(liteOrder);
 
 
                             //resultFile = new File(localDir+File.separator + "sucess",backupFileName);
                             //resultFile = new File(localDir+File.separator + "sucess",backupFileName);
-                            return true;
                         }
                         }
+                        return true;
                     }
                     }
                 }catch (Exception e){
                 }catch (Exception e){
                     log.error("read order from file ["+orderFile.getAbsolutePath()+"] :",e);
                     log.error("read order from file ["+orderFile.getAbsolutePath()+"] :",e);

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

@@ -262,17 +262,17 @@ public class StoragePosManagerImpl implements IStoragePosManager {
     public StoragePos findPartNumberInStorages(List<String> storageIdList, String pn, Collection<String> excludePosIds, CHECKOUT_TYPE checkOutType) {
     public StoragePos findPartNumberInStorages(List<String> storageIdList, String pn, Collection<String> excludePosIds, CHECKOUT_TYPE checkOutType) {
         return findPartNumberInStorages(storageIdList,"",pn,excludePosIds,checkOutType);
         return findPartNumberInStorages(storageIdList,"",pn,excludePosIds,checkOutType);
     }
     }
-    private   String escapeExprSpecialWord(String keyword) {
-        if (ObjectUtil.isNotEmpty(keyword)) {
-            String[] fbsArr = { "\\", "$", "(", ")", "*", "+", ".", "[", "]", "?", "^", "{", "}", "|" };
-            for (String key : fbsArr) {
-                if (keyword.contains(key)) {
-                    keyword = keyword.replace(key, "\\" + key);
-                }
-            }
-        }
-        return keyword;
-    }
+//    private   String escapeExprSpecialWord(String keyword) {
+//        if (ObjectUtil.isNotEmpty(keyword)) {
+//            String[] fbsArr = { "\\", "$", "(", ")", "*", "+", ".", "[", "]", "?", "^", "{", "}", "|" };
+//            for (String key : fbsArr) {
+//                if (keyword.contains(key)) {
+//                    keyword = keyword.replace(key, "\\" + key);
+//                }
+//            }
+//        }
+//        return keyword;
+//    }
     @Override
     @Override
     public StoragePos findPartNumberInStorages(List<String> storageIdList,String labelId, String pn, Collection<String> excludePosIds, CHECKOUT_TYPE checkOutType,Map<String, String> appendDate) {
     public StoragePos findPartNumberInStorages(List<String> storageIdList,String labelId, String pn, Collection<String> excludePosIds, CHECKOUT_TYPE checkOutType,Map<String, String> appendDate) {
 //
 //
@@ -324,7 +324,7 @@ public class StoragePosManagerImpl implements IStoragePosManager {
         if (pos == null) {
         if (pos == null) {
             log.info("使用" + checkOutType + " 策略出库 partNumber=" + pn + ",未找到可以出库的物料 ");
             log.info("使用" + checkOutType + " 策略出库 partNumber=" + pn + ",未找到可以出库的物料 ");
         } else {
         } else {
-            log.info("使用" + checkOutType + " 策略出库 partNumber=" + pn + ",找到出仓位置【" + pos.getPosName() + "】，RI【" + pos.getBarcode().getBarcode() + "】 ");
+            log.info("使用" + checkOutType + " 策略出库 partNumber=" + pn + ",找到出仓位置【" + pos.getPosName() + "】，RI【" + pos.getBarcode().getBarcode() + "】PN【"+pos.getBarcode().getPartNumber()+"】 ");
         }
         }
         return pos;
         return pos;
     }
     }