Просмотр исходного кода

修复仓库调拨失败信息显示问题

lichunlei 4 лет назад
Родитель
Сommit
19fd58796c

+ 2 - 2
Areas/Admin/Controllers/MainServer/StoreHouseController.cs

@@ -867,7 +867,7 @@ namespace MySystem.Areas.Admin.Controllers
         {
             if (Id > 0)
             {
-                DataTable dt = OtherMySqlConn.dtable("select Id,(select count(Id) from PosMachinesTwo where StoreId=s.Id and UserId=0) as CurLaveNum from StoreHouse s where Id=" + Id);
+                DataTable dt = OtherMySqlConn.dtable("select Id,(select count(Id) from PosMachinesTwo where StoreId=s.Id and UserId=0 and Status>-1) as CurLaveNum from StoreHouse s where Id=" + Id);
                 if (dt.Rows.Count > 0)
                 {
                     int CurLaveNum = int.Parse(function.CheckInt(dt.Rows[0]["CurLaveNum"].ToString()));
@@ -882,7 +882,7 @@ namespace MySystem.Areas.Admin.Controllers
             }
             else
             {
-                DataTable dt = OtherMySqlConn.dtable("select s.Id,LaveNum,count(p.Id) as CurLaveNum from StoreHouse s left join PosMachinesTwo p on s.Id=p.StoreId and s.BrandId=p.BrandId and p.UserId=0 group by s.Id HAVING LaveNum!=count(p.Id)");
+                DataTable dt = OtherMySqlConn.dtable("select s.Id,LaveNum,count(p.Id) as CurLaveNum from StoreHouse s left join PosMachinesTwo p on s.Id=p.StoreId and s.BrandId=p.BrandId and p.UserId=0 and p.Status>-1 group by s.Id HAVING LaveNum!=count(p.Id)");
                 foreach (DataRow dr in dt.Rows)
                 {
                     int StoreId = int.Parse(function.CheckInt(dr["Id"].ToString()));

+ 1 - 1
Areas/Admin/Views/BsServer/MsgPersonal/Edit.cshtml

@@ -1,4 +1,4 @@
-@using MySystem.BsModels;
+@using MySystem.Models;
 @{MsgPersonal editData = ViewBag.data as MsgPersonal;}
 @{
     string RightInfo = ViewBag.RightInfo as string;

+ 1 - 1
Areas/Admin/Views/BsServer/MsgPlacard/Detail.cshtml

@@ -1,4 +1,4 @@
-@using MySystem.BsModels;
+@using MySystem.Models;
 @{MsgPlacard editData = ViewBag.data as MsgPlacard;}
 @{
     string RightInfo = ViewBag.RightInfo as string;

+ 1 - 1
Areas/Admin/Views/BsServer/MsgPlacard/Edit.cshtml

@@ -1,4 +1,4 @@
-@using MySystem.BsModels;
+@using MySystem.Models;
 @{MsgPlacard editData = ViewBag.data as MsgPlacard;}
 @{
     string RightInfo = ViewBag.RightInfo as string;

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

@@ -42,7 +42,7 @@ function CheckImport(table, key, loadindex, index) {
                 layer.close(index); //关闭弹层
                 layer.close(loadindex);
                 var content = '';
-                for (var i = 0; i < data.errList; i++) {
+                for (var i = 0; i < data.errList.length; i++) {
                     content += data.errList[i] + '<br/>'
                 }
                 layer.alert(content);