Merge remote-tracking branch 'origin/master'

src/main/java/fi/fa/webService/DispatchMidController.java

@@ -183,6 +183,7 @@ public class DispatchMidController implements Serializable {
                     } else {
                         return "资产信息的组织在组织对照表中未查询到数据,生成调拨单失败";
                     }
+                    return "星瀚系统未生成实物卡片，已更新e管家实物卡片清单";
                 }else {
                     //查询e管家实物卡片清单
                     QFilter qfilter = new QFilter("nckd_card_real_code", QCP.equals,code);

src/main/java/kd/imc/rim/common/invoice/collector/InvoiceCollectTaskNew.java

@@ -19,6 +19,7 @@ import kd.bos.logging.Log;
 import kd.bos.logging.LogFactory;
 import kd.bos.mvc.cache.PageCache;
 import kd.bos.orm.util.CollectionUtils;
+import kd.imc.rim.RecognitionCheckServiceEx;
 import kd.imc.rim.common.invoice.recognition.impl.RecognitionProgress;
 import kd.imc.rim.common.invoice.recognition.impl.RecognitionProgressError;
 import kd.imc.rim.common.invoice.recognition.listener.IRecognitionListener;
@@ -26,7 +27,6 @@ import kd.imc.rim.common.invoice.recognition.listener.RecognitionListenerResult;
 import kd.imc.rim.common.service.EInvoiceZipXmlDealService;
 import kd.imc.rim.common.service.ElectAccVoucherService;
 import kd.imc.rim.common.service.ExcelInvoiceUploadService;
-import kd.imc.rim.common.service.RecognitionCheckServiceEx;
 import kd.imc.rim.common.utils.FileUtils;
 
 public class InvoiceCollectTaskNew implements Runnable, IRecognitionListener {