后台仓库导入，调拨机具，失败机具列表显示

辅助工具-换机操作，库存要相应变动

AppStart/ExcelHelper.cs

@@ -174,6 +174,14 @@ namespace MySystem
                                             SuccessCount += 1;
                                             RedisDbconn.Instance.Set("CheckImport:" + checkKey, SuccessCount + " / " + TotalCount);
                                         }
+                                        else
+                                        {
+                                            RedisDbconn.Instance.AddList("ErrList" + checkKey, "机具" + SnNo + "的品牌填写有误");
+                                        }
+                                    }
+                                    else
+                                    {
+                                        RedisDbconn.Instance.AddList("ErrList" + checkKey, "机具" + SnNo + "已存在，请勿重复录入");
                                     }
                                 }
                                 DoCount += Size;
@@ -382,15 +390,31 @@ namespace MySystem
                                                         SuccessCount += 1;
                                                         RedisDbconn.Instance.Set("CheckImport:" + checkKey, SuccessCount + " / " + TotalCount);
                                                     }
+                                                    else
+                                                    {
+                                                        RedisDbconn.Instance.AddList("ErrList" + checkKey, "机具" + SnNo + "不是仓库机或不在填写的收货仓库中");
+                                                    }
                                                     if (string.IsNullOrEmpty(tostore.ProductName))
                                                     {
                                                         tostore.BrandId = BrandId.ToString();
                                                         tostore.ProductName = kqProduct.Name;
                                                     }
                                                 }
+                                                else
+                                                {
+                                                    RedisDbconn.Instance.AddList("ErrList" + checkKey, "机具" + SnNo + "填写的收货仓库编号不正确");
+                                                }
+                                            }
+                                            else
+                                            {
+                                                RedisDbconn.Instance.AddList("ErrList" + checkKey, "机具" + SnNo + "所在的仓库" + store.StoreName + "(" + store.StoreNo + ")库存不足");
                                             }
                                             db.SaveChanges();
                                         }
+                                        else
+                                        {
+                                            RedisDbconn.Instance.AddList("ErrList" + checkKey, "机具" + SnNo + "的品牌填写有误");
+                                        }
                                     }
                                     DoCount += Size;
                                     foreach (string key in storeData.Keys)
@@ -682,8 +706,24 @@ namespace MySystem
                                                         SuccessCount += 1;
                                                         RedisDbconn.Instance.Set("CheckImport:" + checkKey, SuccessCount + " / " + TotalCount);
                                                     }
+                                                    else
+                                                    {
+                                                        RedisDbconn.Instance.AddList("ErrList" + checkKey, "机具" + SnNo + "不是仓库机");
+                                                    }
+                                                }
+                                                else
+                                                {
+                                                    RedisDbconn.Instance.AddList("ErrList" + checkKey, "机具" + SnNo + "填写的收货创客编号不正确或创客未认证");
                                                 }
                                             }
+                                            else
+                                            {
+                                                RedisDbconn.Instance.AddList("ErrList" + checkKey, "机具" + SnNo + "所在的仓库" + store.StoreName + "(" + store.StoreNo + ")库存不足");
+                                            }
+                                        }
+                                        else
+                                        {
+                                            RedisDbconn.Instance.AddList("ErrList" + checkKey, "机具" + SnNo + "的品牌填写有误");
                                         }
                                     }
                                     DoCount += Size;

Areas/Admin/Controllers/MainServer/StoreHouseController.cs

@@ -417,6 +417,18 @@ namespace MySystem.Areas.Admin.Controllers
             RedisDbconn.Instance.AddList("ExcelImportV2", ExcelPath + "#cut#" + Kind + "#cut#" + key);
             return "success|" + key;
         }
+
+        // [HttpPost]
+        // public Dictionary<string, object> ImportPostV2(string ExcelPath, int Kind = 0)
+        // {
+        //     Dictionary<string, object> Obj = new Dictionary<string, object>();
+        //     string key = function.MD5_16(Guid.NewGuid().ToString());
+        //     RedisDbconn.Instance.AddList("ExcelImportV2", ExcelPath + "#cut#" + Kind + "#cut#" + key);
+        //     Obj.Add("status", "success");
+        //     Obj.Add("key", key);
+        //     Obj.Add("errlist", RedisDbconn.Instance.GetList<string>("ErrList" + key));
+        //     return Obj;
+        // }
         public string CheckImport(string key)
         {
             string result = RedisDbconn.Instance.Get<string>("CheckImport:" + key);
@@ -431,6 +443,36 @@ namespace MySystem.Areas.Admin.Controllers
             }
             return "0";
         }
+        public Dictionary<string, object> CheckImportV2(string key)
+        {
+            Dictionary<string, object> Obj = new Dictionary<string, object>();
+            string result = RedisDbconn.Instance.Get<string>("CheckImport:" + key);
+            if (!string.IsNullOrEmpty(result))
+            {
+                string[] datalist = result.Split('|');
+                if (datalist[0] == "success")
+                {
+                    List<string> errList = RedisDbconn.Instance.GetList<string>("ErrList" + key);
+                    if(errList.Count > 0)
+                    {
+                        Obj.Add("status", 2);
+                        Obj.Add("errList", errList);
+                    }
+                    else
+                    {
+                        Obj.Add("status", 1);
+                        Obj.Add("data", result);
+                    }
+                    return Obj;
+                }
+                Obj.Add("status", 0);
+                Obj.Add("data", datalist[0]);
+                return Obj;
+            }
+            Obj.Add("status", -1);
+            Obj.Add("data", "执行中...");
+            return Obj;
+        }
         #endregion
 
         #region 导出Excel

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -1273,6 +1273,8 @@ namespace MySystem.Areas.Admin.Controllers
             add.ChangeDeviceName = ChangeDeviceName; //转换机具名称
             add.ChangeDeviceNum = OldSnList.Length; //转换机具数量
             add.ChangeSnExpand = ChangeSnExpand; //机具SN
+            BackStore.LaveNum += OldSnList.Length; //退回仓库库存
+            OutStore.LaveNum -= OldSnList.Length; //出货仓库库存
             db.SaveChanges();
             db.Dispose();
             return "success";

wwwroot/layuiadmin/modules/MsgPlacard_Admin.js

@@ -94,14 +94,13 @@ $('#CreateDate').val(value);
             ,{field:'MsgType', width: 200, title:'公告消息类型', sort: true}
             ,{field:'ShowType', width: 200, title:'展示类型', sort: true}
             ,{field:'Title', width: 200, title:'标题', sort: true}
-            ,{field:'Content', width: 200, title:'正文内容', sort: true, templet: '#ContentTpl', unresize: true}
             ,{field:'Summary', width: 200, title:'推送内容', sort: true}
             ,{field:'BgPic', width: 200, title:'列表图片地址', sort: true, templet: '#BgPicTpl', unresize: true}
             ,{field:'PushType', width: 200, title:'推送类型', sort: true}
             ,{field:'PushFlag', width: 200, title:'推送标识', sort: true}
             ,{field:'PushTime', width: 200, title:'推送时间', sort: true}
             ,{field:'CreateDate', width: 200, title:'创建时间', sort: true}
-            , { title: '操作', width: 100, align: 'center', fixed: 'right', toolbar: '#table-list-tools' }
+            , { title: '操作', width: 200, align: 'center', fixed: 'right', toolbar: '#table-list-tools' }
         ]]
         , where: {
             

wwwroot/layuiadmin/modules_main/StoreHouse_Admin.js

@@ -26,20 +26,28 @@ function ConfirmImport() {
 
 function CheckImport(table, key, loadindex, index) {
     $.ajax({
-        url: "/Admin/StoreHouse/CheckImport?r=" + Math.random(1),
+        url: "/Admin/StoreHouse/CheckImportV2?r=" + Math.random(1),
         data: "key=" + key,
-        dataType: "text",
+        dataType: "json",
         success: function (data) {
-            if (data.indexOf('success') == 0) {
-                layer.msg("成功操作" + data.split('|')[1] + "部机具", {
+            if (data.status == 1) {
+                layer.msg("成功操作" + data.data + "部机具", {
                     time: 2000
                 }, function () {
                     layer.close(index); //关闭弹层
                     layer.close(loadindex);
                     table.reload('LAY-list-manage'); //数据刷新
                 });
+            } else if (data.status == 2) {
+                layer.close(index); //关闭弹层
+                layer.close(loadindex);
+                var content = '';
+                for (var i = 0; i < data.errList; i++) {
+                    content += data.errList[i] + '<br/>'
+                }
+                layer.alert(content);
             } else {
-                layer.msg(data, {
+                layer.msg(data.data, {
                     time: 1000
                 }, function () {
                     CheckImport(table, key, loadindex, index);