暂存

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -1331,8 +1331,8 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 return "请输入商户编号";
             }
-            string[] OldSnList = OldSn.Split('\n');
-            string[] NewSnList = NewSn.Split('\n');
+            string[] OldSnList = OldSn.Replace("\r", "").Split('\n');
+            string[] NewSnList = NewSn.Replace("\r", "").Split('\n');
             if (OldSnList.Length != NewSnList.Length)
             {
                 return "原机具SN数量和新机具SN数量不一致";
@@ -1584,8 +1584,8 @@ namespace MySystem.Areas.Admin.Controllers
                 {
                     return "请输入坏机退回仓库编号";
                 }
-                OldSnList = OldSn.Split('\n');
-                NewSnList = NewSn.Split('\n');
+                OldSnList = OldSn.Replace("\r", "").Split('\n');
+                NewSnList = NewSn.Replace("\r", "").Split('\n');
                 if (OldSnList.Length != NewSnList.Length)
                 {
                     return "原机具SN数量和新机具SN数量不一致";
@@ -1821,8 +1821,8 @@ namespace MySystem.Areas.Admin.Controllers
                 {
                     return "请输入坏机退回仓库编号";
                 }
-                OldSnList = OldSn.Split('\n');
-                NewSnList = NewSn.Split('\n');
+                OldSnList = OldSn.Replace("\r", "").Split('\n');
+                NewSnList = NewSn.Replace("\r", "").Split('\n');
                 if (OldSnList.Length != NewSnList.Length)
                 {
                     return "原机具SN数量和新机具SN数量不一致";
@@ -2060,8 +2060,8 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 return "请输入新机发货仓库编号";
             }
-            OldSnList = OldSn.Split('\n');
-            NewSnList = NewSn.Split('\n');
+            OldSnList = OldSn.Replace("\r", "").Split('\n');
+            NewSnList = NewSn.Replace("\r", "").Split('\n');
             if (OldSnList.Length != NewSnList.Length)
             {
                 return "原机具SN数量和新机具SN数量不一致";
@@ -2431,7 +2431,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 return "创客不存在";
             }
-            string[] SnList = Coupons.Split('\n');
+            string[] SnList = Coupons.Replace("\r", "").Split('\n');
             foreach (var item in SnList)
             {
                 var coupos = db.PosCoupons.FirstOrDefault(m => m.ExchangeCode == item && m.LeaderUserId == 0);
@@ -2476,7 +2476,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 return "创客不存在";
             }
-            string[] SnList = PosSn.Split('\n');
+            string[] SnList = PosSn.Replace("\r", "").Split('\n');
             foreach (var item in SnList)
             {
                 var pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == item && m.LeaderUserId == 0);
@@ -3367,7 +3367,7 @@ namespace MySystem.Areas.Admin.Controllers
                 return "请输入机具号";
             }
             string result = SysUserName + "设置\n";
-            string[] PosSnList = PosSns.Split('\n');
+            string[] PosSnList = PosSns.Replace("\r", "").Split('\n');
             int total = PosSnList.Length;
             int index = 0;
             foreach (string SubPosSn in PosSnList)
@@ -3826,7 +3826,7 @@ namespace MySystem.Areas.Admin.Controllers
                 FeeType = "0.63";
             }
 
-            string[] PosSnList = PosSn.Split('\n');
+            string[] PosSnList = PosSn.Replace("\r", "").Split('\n');
             var PosId = "";
             var RecordId = "";
             var error = "";

Areas/Admin/Views/MainServer/SysTools/BadPosToStore.cshtml

@@ -34,7 +34,7 @@
                                     <label class="layui-form-label">坏机SN</label>
                                     <div class="layui-input-block">
                                         <textarea class="layui-textarea" lay-verify="required|" name="OldSn" id="OldSn"
-                                            placeholder="请输入坏机SN"></textarea>
+                                            placeholder="请输入坏机SN,多个SN用回车隔开"></textarea>
                                     </div>
                                 </div>
                             </div>

Areas/Admin/Views/MainServer/SysTools/ChangeBadPos.cshtml

@@ -59,14 +59,14 @@
                                     <label class="layui-form-label">坏机SN</label>
                                     <div class="layui-input-block">
                                         <textarea class="layui-textarea" lay-verify="required|" name="OldSn" id="OldSn"
-                                            placeholder="请输入坏机SN"></textarea>
+                                            placeholder="请输入坏机SN,多个SN用回车隔开"></textarea>
                                     </div>
                                 </div>
                                 <div class="layui-form-item">
                                     <label class="layui-form-label">新机SN</label>
                                     <div class="layui-input-block">
                                         <textarea class="layui-textarea" lay-verify="required|" name="NewSn" id="NewSn"
-                                            placeholder="请输入新机SN"></textarea>
+                                            placeholder="请输入新机SN,多个SN用回车隔开"></textarea>
                                     </div>
                                 </div>
                                 <div class="layui-form-item">

Areas/Admin/Views/MainServer/SysTools/ChangePosCrossBrand.cshtml

@@ -42,7 +42,7 @@
                                     <label class="layui-form-label">旧机SN</label>
                                     <div class="layui-input-block">
                                         <textarea class="layui-textarea" lay-verify="required|" name="OldSn" id="OldSn"
-                                            placeholder="请输入旧机SN"></textarea>
+                                            placeholder="请输入旧机SN,多个SN用回车隔开"></textarea>
                                     </div>
                                 </div>
                                 <div class="layui-form-item" id="StoreCodeSelect" style="display: none;">
@@ -57,7 +57,7 @@
                                     <label class="layui-form-label">新机SN</label>
                                     <div class="layui-input-block">
                                         <textarea class="layui-textarea" lay-verify="required|" name="NewSn" id="NewSn"
-                                            placeholder="请输入新机SN"></textarea>
+                                            placeholder="请输入新机SN,多个SN用回车隔开"></textarea>
                                     </div>
                                 </div>
                                 <div class="layui-form-item">