Răsfoiți Sursa

机具已绑定或已激活提示

DuGuYang 3 ani în urmă
părinte
comite
e882c33e3b

+ 4 - 0
Areas/Admin/Controllers/MainServer/StoreMachineApplyController.cs

@@ -581,6 +581,10 @@ namespace MySystem.Areas.Admin.Controllers
                 BrandId = Convert.ToInt32(Brand);
                 MachineForSnNo posInfo = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == SnNo) ?? new MachineForSnNo();
                 var pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == posInfo.SnId) ?? new PosMachinesTwo();
+                if (pos.BindingState == 1 || pos.ActivationState == 1)
+                {
+                    error += "以下操作失败" + SnNo + ',' + "该机具已绑定或已激活" + '\n';
+                }
                 if (posInfo.SnId > 0)
                 {
                     if (pos.Id > 0)

+ 4 - 0
Areas/Admin/Controllers/OperateServer/StoreMachineApplyOperateController.cs

@@ -707,6 +707,10 @@ namespace MySystem.Areas.Admin.Controllers
                 if (BrandId == 11) FromStoreId = 5513;
                 Models.MachineForSnNo posInfo = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == SnNo) ?? new Models.MachineForSnNo();
                 var pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == posInfo.SnId && m.StoreId == FromStoreId && m.UserId == 0 && m.BuyUserId == 0 && m.PreUserId == 0) ?? new Models.PosMachinesTwo();
+                if (pos.BindingState == 1 || pos.ActivationState == 1)
+                {
+                    error += "以下操作失败" + SnNo + ',' + "该机具已绑定或已激活" + '\n';
+                }
                 if (posInfo.SnId > 0)
                 {
                     if (pos.Id > 0)

+ 4 - 0
Areas/Admin/Controllers/OperateServer/StoreMachineApplysOperateController.cs

@@ -602,6 +602,10 @@ namespace MySystem.Areas.Admin.Controllers
                 if (BrandId == 11) FromStoreId = 5513;
                 MachineForSnNo posInfo = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == SnNo) ?? new MachineForSnNo();
                 var pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == posInfo.SnId && m.StoreId == FromStoreId && m.UserId == 0 && m.BuyUserId == 0 && m.PreUserId == 0) ?? new PosMachinesTwo();
+                if (pos.BindingState == 1 || pos.ActivationState == 1)
+                {
+                    error += "以下操作失败" + SnNo + ',' + "该机具已绑定或已激活" + '\n';
+                }
                 if (posInfo.SnId > 0)
                 {
                     if (pos.Id > 0)

+ 1 - 1
wwwroot/layuiadmin/modules_main/StoreMachineApply_Admin.js

@@ -289,7 +289,7 @@ layui.config({
                                         });
                                     } else {
                                         layer.close(index); //关闭弹层
-                                        layer.msg('审核完成', {
+                                        layer.msg('失败', {
                                             time: 1500
                                         }, function () {
                                             table.reload('LAY-list-manage'); //数据刷新

+ 1 - 1
wwwroot/layuiadmin/modules_operate/StoreMachineApplys1_Admin.js

@@ -297,7 +297,7 @@ layui.config({
                                         });
                                     } else {
                                         layer.close(index); //关闭弹层
-                                        layer.msg('审核完成', {
+                                        layer.msg('失败', {
                                             time: 1500
                                         }, function () {
                                             table.reload('LAY-list-manage'); //数据刷新

+ 1 - 1
wwwroot/layuiadmin/modules_operate/StoreMachineApplys_Admin.js

@@ -294,7 +294,7 @@ layui.config({
                                         });
                                     } else {
                                         layer.close(index); //关闭弹层
-                                        layer.msg('审核完成', {
+                                        layer.msg('失败', {
                                             time: 1500
                                         }, function () {
                                             table.reload('LAY-list-manage'); //数据刷新