Merge branch 'feature-dgy-辅助工具跨品牌换机' into feature-dgy-后台测试

Areas/Admin/Controllers/MainServer/StoreChangeHistoryController.cs

@@ -133,8 +133,8 @@ namespace MySystem.Areas.Admin.Controllers
                 if (TransType == 3) dic["TransType"] = "退货";
                 if (TransType == 4) dic["TransType"] = "驳回";
                 if (TransType == 5) dic["TransType"] = "回仓退款";
-                if (TransType == 6) dic["TransType"] = "换机出库";
-                if (TransType == 7) dic["TransType"] = "换机入库";
+                if (TransType == 6) dic["TransType"] = "换机出仓";
+                if (TransType == 7) dic["TransType"] = "换机回仓";
                 if (TransType == 0) dic["TransType"] = "采购";
                 //SN机具类型
                 int SnType = int.Parse(dic["SnType"].ToString());

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -2369,8 +2369,8 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 return "请输入新机发货仓库编号";
             }
-            OldSnList = OldSn.Replace("\r", "").Split('\n');
-            NewSnList = NewSn.Replace("\r", "").Split('\n');
+            OldSnList = OldSn.Replace("\r", "").Replace("\n", ",").Split(',');
+            NewSnList = NewSn.Replace("\r", "").Replace("\n", ",").Split(',');
             if (OldSnList.Length != NewSnList.Length)
             {
                 return "原机具SN数量和新机具SN数量不一致";
@@ -2412,7 +2412,7 @@ namespace MySystem.Areas.Admin.Controllers
                 {
                     return "您输入的旧机SN不存在或者不在" + MakerCode + "名下";
                 }
-                PosMachinesTwo newpos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == newForSnNo.SnId && m.BindingState == 0 && m.ActivationState == 0 && m.PreUserId == 0) ?? new PosMachinesTwo();
+                PosMachinesTwo newpos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == newForSnNo.SnId && m.BindingState == 0 && m.ActivationState == 0 && m.BuyUserId == 0 && m.UserId == 0 && m.PreUserId == 0) ?? new PosMachinesTwo();
                 if (newpos.Id == 0)
                 {
                     return "您输入的新机SN不存在或不满足条件";

Areas/Admin/Views/MainServer/StoreChangeHistory/Index.cshtml

@@ -99,8 +99,8 @@
                                 <option value="3">退货</option>
                                 <option value="4">驳回</option>
                                 <option value="5">回仓退款</option>
-                                <option value="6">换机出库</option>
-                                <option value="7">换机入库</option>
+                                <option value="6">换机出仓</option>
+                                <option value="7">换机回仓</option>
                             </select>
                         </div>
                     </div>