From 1e4e6e8aa4b738320bf8b5a0ee43aa62ca2c13e7 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 14 Apr 2021 14:46:36 +0800
Subject: [PATCH] finish paiban add proj

---
 zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopOrderAction.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopOrderAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopOrderAction.java
index 3185e15..7d133fd 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopOrderAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopOrderAction.java
@@ -108,13 +108,13 @@
         List<LogisticsImportVo> logisticsImportVos = logisticsImportFile(saveFile);
         if(CollUtil.isNotEmpty(logisticsImportVos)){
             for(LogisticsImportVo logisticsImportVo : logisticsImportVos){
-                infoRemind = infoRemind + logisticsImportVo.getRemark()+";//r//n";
+                infoRemind = infoRemind + logisticsImportVo.getRemark()+";";
             }
             ajaxResult = AjaxResult.buildSuccessInstance(infoRemind);
-            ajaxResult.setStatus(AjaxResult.STATUS_SUCCESS);
+            ajaxResult.setStatus(AjaxResult.STATUS_FAIL);
         }else{
             ajaxResult = AjaxResult.buildSuccessInstance("导入成功");
-            ajaxResult.setStatus(AjaxResult.STATUS_FAIL);
+            ajaxResult.setStatus(AjaxResult.STATUS_SUCCESS);
         }
         return ajaxResult;
     }

--
Gitblit v1.9.1