审核发货

错误弹窗待改善

Areas/Admin/Controllers/MainServer/StoreMachineApplyController.cs

@@ -432,17 +432,23 @@ namespace MySystem.Areas.Admin.Controllers
         public string AuditSend(StoreMachineApply data, string ExcelData)
         {
             Dictionary<string, object> Fields = new Dictionary<string, object>();
-            Fields.Add("ApplyNum", data.ApplyNum); //申请箱数
-            Fields.Add("SendNum", data.SendNum); //发货箱数
-            Fields.Add("SeoDescription", data.SeoDescription); //申请描述
+            Fields.Add("ApplyNum", data.ApplyNum); //申请数
+            Fields.Add("SendNum", data.SendNum); //发货数
+            Fields.Add("ErpCode", data.ErpCode); //快递单号
+            Fields.Add("SendMode", data.SendMode); //发货方式
+            Fields.Add("SeoKeyword", data.SeoKeyword); //申请描述
             Fields.Add("Status", data.Status);
-            new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("StoreMachineApply", Fields, data.Id);
             AddSysLog(data.Id.ToString(), "StoreMachineApply", "AuditSend");
+            Dictionary<string, object> Obj = new Dictionary<string, object>();
+            List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
+            List<SendInfo> sendInfos = new List<SendInfo>();
             StoreMachineApply apply = db.StoreMachineApply.FirstOrDefault(m => m.Id == data.Id) ?? new StoreMachineApply();
             StoreHouse tostore = new StoreHouse();
-            
+            StoreHouse fromstore = new StoreHouse();
+
             var BrandId = 0;
             var FromStoreId = 0;
+            string error = "";
 
             ExcelData = HttpUtility.UrlDecode(ExcelData);
             JsonData list = JsonMapper.ToObject(ExcelData);
@@ -458,43 +464,199 @@ namespace MySystem.Areas.Admin.Controllers
                 string OutNote = itemJson.Contains("\"D\"") ? dr["D"].ToString() : "";
 
                 BrandId = Convert.ToInt32(Brand);
+                // PosMachinesTwo posMachinesTwo = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == SnNo && m.StoreId == FromStoreId);
+
+
 
                 if (BrandId == 1)
                 {
                     FromStoreId = 7;
+                    PosMachinesTwo posMachinesTwo = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == SnNo && m.StoreId == FromStoreId);
+                    if (posMachinesTwo == null)
+                    {
+                        error += "以下操作失败" + SnNo + ',' + "该机具重复发货" + '|' + '\n';
+                    }
+
+                    tostore = db.StoreHouse.FirstOrDefault(m => m.UserId == apply.UserId && m.BrandId == BrandId.ToString());
+                    SendInfo item = sendInfos.FirstOrDefault(m => m.FromStoreId == FromStoreId && m.ToStoreId == tostore.Id && m.BrandId == BrandId);
+                    if (item == null)
+                    {
+                        SendInfo row = new SendInfo()
+                        {
+                            FromStoreId = FromStoreId,
+                            ToStoreId = tostore.Id,
+                            BrandId = BrandId,
+                            Num = 1
+                        };
+                        sendInfos.Add(row);
+                    }
+                    else
+                    {
+                        item.Num += 1;
+                    }
                 }
                 else if (BrandId == 2)
                 {
                     FromStoreId = 721;
+                    PosMachinesTwo posMachinesTwo = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == SnNo && m.StoreId == FromStoreId);
+                    if (posMachinesTwo == null)
+                    {
+                        error += "以下操作失败" + SnNo + ',' + "该机具重复发货" + '|' + '\n';
+                    }
+                    tostore = db.StoreHouse.FirstOrDefault(m => m.UserId == apply.UserId && m.BrandId == BrandId.ToString());
+                    SendInfo item = sendInfos.FirstOrDefault(m => m.FromStoreId == FromStoreId && m.ToStoreId == tostore.Id && m.BrandId == BrandId);
+                    if (item == null)
+                    {
+                        SendInfo row = new SendInfo()
+                        {
+                            FromStoreId = FromStoreId,
+                            ToStoreId = tostore.Id,
+                            BrandId = BrandId,
+                            Num = 1
+                        };
+                        sendInfos.Add(row);
+                    }
+                    else
+                    {
+                        item.Num += 1;
+                    }
                 }
                 else if (BrandId == 3)
                 {
                     FromStoreId = 697;
+                    PosMachinesTwo posMachinesTwo = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == SnNo && m.StoreId == FromStoreId);
+                    if (posMachinesTwo == null)
+                    {
+                        error += "以下操作失败" + SnNo + ',' + "该机具重复发货" + '|' + '\n';
+                    }
+                    tostore = db.StoreHouse.FirstOrDefault(m => m.UserId == apply.UserId && m.BrandId == BrandId.ToString());
+                    SendInfo item = sendInfos.FirstOrDefault(m => m.FromStoreId == FromStoreId && m.ToStoreId == tostore.Id && m.BrandId == BrandId);
+                    if (item == null)
+                    {
+                        SendInfo row = new SendInfo()
+                        {
+                            FromStoreId = FromStoreId,
+                            ToStoreId = tostore.Id,
+                            BrandId = BrandId,
+                            Num = 1
+                        };
+                        sendInfos.Add(row);
+                    }
+                    else
+                    {
+                        item.Num += 1;
+                    }
                 }
                 else if (BrandId == 4)
                 {
                     FromStoreId = 774;
+                    PosMachinesTwo posMachinesTwo = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == SnNo && m.StoreId == FromStoreId);
+                    if (posMachinesTwo == null)
+                    {
+                        error += "以下操作失败" + SnNo + ',' + "该机具重复发货" + '|' + '\n';
+                    }
+                    tostore = db.StoreHouse.FirstOrDefault(m => m.UserId == apply.UserId && m.BrandId == BrandId.ToString());
+                    SendInfo item = sendInfos.FirstOrDefault(m => m.FromStoreId == FromStoreId && m.ToStoreId == tostore.Id && m.BrandId == BrandId);
+                    if (item == null)
+                    {
+                        SendInfo row = new SendInfo()
+                        {
+                            FromStoreId = FromStoreId,
+                            ToStoreId = tostore.Id,
+                            BrandId = BrandId,
+                            Num = 1
+                        };
+                        sendInfos.Add(row);
+                    }
+                    else
+                    {
+                        item.Num += 1;
+                    }
                 }
                 else if (BrandId == 5)
                 {
                     FromStoreId = 775;
+                    PosMachinesTwo posMachinesTwo = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == SnNo && m.StoreId == FromStoreId);
+                    if (posMachinesTwo == null)
+                    {
+                        error += "以下操作失败" + SnNo + ',' + "该机具重复发货" + '|' + '\n';
+                    }
+                    tostore = db.StoreHouse.FirstOrDefault(m => m.UserId == apply.UserId && m.BrandId == BrandId.ToString());
+                    SendInfo item = sendInfos.FirstOrDefault(m => m.FromStoreId == FromStoreId && m.ToStoreId == tostore.Id && m.BrandId == BrandId);
+                    if (item == null)
+                    {
+                        SendInfo row = new SendInfo()
+                        {
+                            FromStoreId = FromStoreId,
+                            ToStoreId = tostore.Id,
+                            BrandId = BrandId,
+                            Num = 1
+                        };
+                        sendInfos.Add(row);
+                    }
+                    else
+                    {
+                        item.Num += 1;
+                    }
                 }
                 else if (BrandId == 6)
                 {
                     FromStoreId = 871;
+                    PosMachinesTwo posMachinesTwo = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == SnNo && m.StoreId == FromStoreId);
+                    if (posMachinesTwo == null)
+                    {
+                        error += "以下操作失败" + SnNo + ',' + "该机具重复发货" + '|' + '\n';
+                    }
+                    tostore = db.StoreHouse.FirstOrDefault(m => m.UserId == apply.UserId && m.BrandId == BrandId.ToString());
+                    SendInfo item = sendInfos.FirstOrDefault(m => m.FromStoreId == FromStoreId && m.ToStoreId == tostore.Id && m.BrandId == BrandId);
+                    if (item == null)
+                    {
+                        SendInfo row = new SendInfo()
+                        {
+                            FromStoreId = FromStoreId,
+                            ToStoreId = tostore.Id,
+                            BrandId = BrandId,
+                            Num = 1
+                        };
+                        sendInfos.Add(row);
+                    }
+                    else
+                    {
+                        item.Num += 1;
+                    }
                 }
                 else if (BrandId == 7)
                 {
                     FromStoreId = 1047;
+                    PosMachinesTwo posMachinesTwo = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == SnNo && m.StoreId == FromStoreId);
+                    if (posMachinesTwo == null)
+                    {
+                        error += "以下操作失败" + SnNo + ',' + "该机具重复发货" + '|' + '\n';
+                    }
+                    tostore = db.StoreHouse.FirstOrDefault(m => m.UserId == apply.UserId && m.BrandId == BrandId.ToString());
+                    SendInfo item = sendInfos.FirstOrDefault(m => m.FromStoreId == FromStoreId && m.ToStoreId == tostore.Id && m.BrandId == BrandId);
+                    if (item == null)
+                    {
+                        SendInfo row = new SendInfo()
+                        {
+                            FromStoreId = FromStoreId,
+                            ToStoreId = tostore.Id,
+                            BrandId = BrandId,
+                            Num = 1
+                        };
+                        sendInfos.Add(row);
+                    }
+                    else
+                    {
+                        item.Num += 1;
+                    }
                 }
 
-                tostore = db.StoreHouse.FirstOrDefault(m => m.Id == FromStoreId);
+                apply.SeoDescription = function.CheckString(SnNo) + ',';
+
+                fromstore = db.StoreHouse.FirstOrDefault(m => m.Id == FromStoreId);
+                tostore = db.StoreHouse.FirstOrDefault(m => m.UserId == apply.UserId && m.BrandId == BrandId.ToString());
 
-                StoreMachineApply storeMachineApply = db.StoreMachineApply.FirstOrDefault(m => m.Id == data.Id);
-                if (storeMachineApply != null)
-                {
-                    storeMachineApply.SeoDescription = function.CheckString(SnNo) + ',';
-                }
                 MachineForSnNo machinefor = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == SnNo) ?? new MachineForSnNo();
                 PosMachinesTwo machine = db.PosMachinesTwo.FirstOrDefault(m => m.Id == machinefor.SnId && m.BuyUserId == 0 && m.UserId == 0) ?? new PosMachinesTwo();
                 if (machine.Id > 0)
@@ -502,6 +664,7 @@ namespace MySystem.Areas.Admin.Controllers
                     StoreStockChange stockchange = db.StoreStockChange.Add(new StoreStockChange()
                     {
                         CreateDate = DateTime.Now,
+                        Sort = data.Id,//库存变动关联申请记录表
                         StoreId = FromStoreId, //出货仓库
                         BrandId = BrandId, //产品类型
                         ProductName = RelationClass.GetKqProductBrandInfo(BrandId), //产品名称
@@ -513,16 +676,16 @@ namespace MySystem.Areas.Admin.Controllers
                         DeviceVendor = machine.DeviceName, //设备厂商
                         DeviceModel = machine.DeviceKind, //设备型号
                         DeviceType = machine.DeviceType, //设备类型
-                        FromUserId = tostore.UserId, //出货人
+                        FromUserId = fromstore.UserId, //出货人
                         FromDate = DateTime.Now, //出库时间
                         FromRemark = OutNote, //出库备注
                         ToUserId = tostore.UserId, //收货人
-                        ToStoreId = tostore.Id, //退货收货仓库                        
+                        ToStoreId = fromstore.Id, //退货收货仓库                        
                         SourceStoreId = machine.SourceStoreId, //源仓库编号
                         BrandType = machine.DeviceType, //品牌类型
                     }).Entity;
-                    db.SaveChanges();
-                    string ChangeNo = "SC";
+
+                    string ChangeNo = "CS";
                     int StoreStockChangeId = stockchange.Id;
                     string StoreStockChangeIdString = StoreStockChangeId.ToString();
                     for (int j = 0; j < 18 - StoreStockChangeId.ToString().Length; j++)
@@ -536,7 +699,7 @@ namespace MySystem.Areas.Admin.Controllers
                     db.StoreChangeHistory.Add(new StoreChangeHistory()
                     {
                         CreateDate = DateTime.Now,
-                        UserId = tostore.UserId, //创客
+                        UserId = fromstore.UserId, //创客
                         BrandId = BrandId, //产品类型
                         ChangeRecordNo = ChangeNo, //变更记录单号
                         BizBatchNo = BatchNo, //业务批次号
@@ -547,78 +710,135 @@ namespace MySystem.Areas.Admin.Controllers
                         DeviceVendor = machine.DeviceName, //设备厂商
                         DeviceModel = machine.DeviceKind, //设备型号
                         DeviceType = machine.DeviceType, //设备类型
-                        FromUserId = tostore.UserId, //出货创客
+                        FromUserId = fromstore.UserId, //出货创客
                         FromDate = DateTime.Now, //出库时间
                         FromRemark = OutNote, //出库备注
                         SourceStoreId = machine.SourceStoreId, //源仓库
-                        StoreId = tostore.Id, //仓库
+                        StoreId = fromstore.Id, //仓库
+                        ToUserId = tostore.UserId,//收货创客
                     });
-                    db.SaveChanges();
+
+                    //修改机具所属仓库
+                    machine.StoreId = tostore.Id;
+                    machine.UpdateDate = DateTime.Now;
                 }
+
+                return "Warning" + error;
             }
-            db.SaveChanges();
 
-            int StoreId = FromStoreId;
-            int OpStoreNum = list.Count - 1;
-            StoreHouse store = db.StoreHouse.FirstOrDefault(m => m.Id == StoreId) ?? new StoreHouse();
-            StoreBalance balance = db.StoreBalance.Add(new StoreBalance()
+            //判断发货数和申请数
+            if (data.ApplyNum == data.SendNum)
             {
-                CreateDate = DateTime.Now,
-                StoreId = StoreId, //仓库
-                TransType = 1, //交易类型
-                BrandId = BrandId, //产品类型
-                OpStoreNum = OpStoreNum, //操作库存数
-                OpSymbol = "-", //操作符
-                BeforeTotalNum = store.TotalNum, //操作前总库存数
-                AfterTotalNum = store.TotalNum, //操作后总库存数
-                BeforeLaveNum = store.LaveNum, //操作前剩余库存数
-                AfterLaveNum = store.LaveNum - OpStoreNum, //操作后剩余库存数
-                BeforeOutNum = store.OutNum, //操作前出库数
-                AfterOutNum = store.OutNum + OpStoreNum, //操作后出库数
-            }).Entity;
-            db.SaveChanges();
-            string ChangeNo1 = "SC";
-            int StoreStockChangeId1 = balance.Id;
-            string StoreStockChangeId1String = StoreStockChangeId1.ToString();
-            for (int i = 0; i < 18 - StoreStockChangeId1.ToString().Length; i++)
+                foreach (var item in sendInfos)
+                {
+                    KqProducts kqProducts = db.KqProducts.FirstOrDefault(m => m.Id == item.BrandId);
+                    if (kqProducts.Name.Contains("大Pos"))
+                    {
+                        var Amount = Convert.ToUInt32(item.Num) * 300;
+                        apply.UseAmount += Amount;
+                    }
+                    if (kqProducts.Name.Contains("电签"))
+                    {
+                        var Amount = Convert.ToUInt32(item.Num) * 200;
+                        apply.UseAmount += Amount;
+                    }
+                }
+            }
+            if (data.ApplyNum > data.SendNum)
             {
-                StoreStockChangeId1String = "0" + StoreStockChangeId1String;
+                JsonData ApplyList = JsonMapper.ToObject(apply.SendSn);
+                for (int i = 0; i < ApplyList.Count; i++)
+                {
+                    int Id = Convert.ToInt32(ApplyList[i]["BrandId"].ToString());
+                    int num = Convert.ToInt32(ApplyList[i]["ApplyNum"].ToString());
+                    SendInfo item = sendInfos.FirstOrDefault(m => m.BrandId == Id);
+                    KqProducts kqProducts = db.KqProducts.FirstOrDefault(m => m.Id == Id);
+                    if (item != null)
+                    {
+                        if (kqProducts.Name.Contains("大Pos"))
+                        {
+                            UserAccount userAccount = db.UserAccount.FirstOrDefault(m => m.UserId == apply.UserId);
+                            var Amounts = Convert.ToUInt32(item.Num) * 300;
+                            var Amount = (num - Convert.ToUInt32(item.Num)) * 300;
+                            userAccount.FixedAmount += Amount;
+                            apply.UseAmount += Amounts;
+                        }
+                        if (kqProducts.Name.Contains("电签"))
+                        {
+                            UserAccount userAccount = db.UserAccount.FirstOrDefault(m => m.UserId == apply.UserId);
+                            var Amounts = Convert.ToUInt32(item.Num) * 200;
+                            var Amount = (num - Convert.ToUInt32(item.Num)) * 200;
+                            userAccount.FixedAmount += Amount;
+                            apply.UseAmount += Amounts;
+                        }
+                    }
+                }
             }
-            ChangeNo1 += StoreStockChangeId1String;
-            balance.TransRecordNo = ChangeNo1; //交易流水编号
-            store.LaveNum -= OpStoreNum;
-            store.OutNum += OpStoreNum;
-            db.SaveChanges();
 
-            StoreId = tostore.Id;
-            balance = db.StoreBalance.Add(new StoreBalance()
+            foreach (var item in sendInfos)
             {
-                CreateDate = DateTime.Now,
-                StoreId = StoreId, //仓库
-                TransType = 0, //交易类型
-                BrandId = BrandId, //产品类型
-                OpStoreNum = OpStoreNum, //操作库存数
-                OpSymbol = "+", //操作符
-                BeforeTotalNum = store.TotalNum, //操作前总库存数
-                AfterTotalNum = store.TotalNum + OpStoreNum, //操作后总库存数
-                BeforeLaveNum = store.LaveNum, //操作前剩余库存数
-                AfterLaveNum = store.LaveNum + OpStoreNum, //操作后剩余库存数
-                BeforeOutNum = store.OutNum, //操作前出库数
-                AfterOutNum = store.OutNum, //操作后出库数
-            }).Entity;
-            db.SaveChanges();
-            string ChangeNo2 = "SC";
-            int StoreStockChangeId2 = balance.Id;
-            string StoreStockChangeId2String = StoreStockChangeId2.ToString();
-            for (int i = 0; i < 18 - StoreStockChangeId2.ToString().Length; i++)
-            {
-                StoreStockChangeId2String = "0" + StoreStockChangeId2String;
+                //出货仓库数据调整
+                StoreHouse storeCH = db.StoreHouse.FirstOrDefault(m => m.Id == item.FromStoreId) ?? new StoreHouse();
+                StoreBalance balance = db.StoreBalance.Add(new StoreBalance()
+                {
+                    CreateDate = DateTime.Now,
+                    StoreId = storeCH.Id, //仓库
+                    TransType = 1, //交易类型
+                    BrandId = BrandId, //产品类型
+                    OpStoreNum = item.Num, //操作库存数
+                    OpSymbol = "-", //操作符
+                    BeforeTotalNum = storeCH.TotalNum, //操作前总库存数
+                    AfterTotalNum = storeCH.TotalNum, //操作后总库存数
+                    BeforeLaveNum = storeCH.LaveNum, //操作前剩余库存数
+                    AfterLaveNum = storeCH.LaveNum - item.Num, //操作后剩余库存数
+                    BeforeOutNum = storeCH.OutNum, //操作前出库数
+                    AfterOutNum = storeCH.OutNum + item.Num, //操作后出库数
+                }).Entity;
+                string ChangeNo1 = "CS";
+                int StoreStockChangeId1 = balance.Id;
+                string StoreStockChangeId1String = StoreStockChangeId1.ToString();
+                for (int i = 0; i < 18 - StoreStockChangeId1.ToString().Length; i++)
+                {
+                    StoreStockChangeId1String = "0" + StoreStockChangeId1String;
+                }
+                ChangeNo1 += StoreStockChangeId1String;
+                balance.TransRecordNo = ChangeNo1; //交易流水编号
+                storeCH.LaveNum -= item.Num;
+                storeCH.OutNum += item.Num;
+
+                //收货仓库数据调整
+                StoreHouse storeSH = db.StoreHouse.FirstOrDefault(m => m.Id == item.ToStoreId) ?? new StoreHouse();
+                balance = db.StoreBalance.Add(new StoreBalance()
+                {
+                    CreateDate = DateTime.Now,
+                    StoreId = storeSH.Id, //仓库
+                    TransType = 0, //交易类型
+                    BrandId = BrandId, //产品类型
+                    OpStoreNum = item.Num, //操作库存数
+                    OpSymbol = "+", //操作符
+                    BeforeTotalNum = storeSH.TotalNum, //操作前总库存数
+                    AfterTotalNum = storeSH.TotalNum + item.Num, //操作后总库存数
+                    BeforeLaveNum = storeSH.LaveNum, //操作前剩余库存数
+                    AfterLaveNum = storeSH.LaveNum + item.Num, //操作后剩余库存数
+                    BeforeOutNum = storeSH.OutNum, //操作前出库数
+                    AfterOutNum = storeSH.OutNum, //操作后出库数
+                }).Entity;
+                string ChangeNo2 = "CS";
+                int StoreStockChangeId2 = balance.Id;
+                string StoreStockChangeId2String = StoreStockChangeId2.ToString();
+                for (int i = 0; i < 18 - StoreStockChangeId2.ToString().Length; i++)
+                {
+                    StoreStockChangeId2String = "0" + StoreStockChangeId2String;
+                }
+                ChangeNo2 += StoreStockChangeId2String;
+                balance.TransRecordNo = ChangeNo2; //交易流水编号
+                storeSH.TotalNum += item.Num;
+                storeSH.LaveNum += item.Num;
+                storeSH.TotalNum += item.Num;
             }
-            ChangeNo2 += StoreStockChangeId2String;
-            balance.TransRecordNo = ChangeNo2; //交易流水编号
-            store.TotalNum += OpStoreNum;
-            store.LaveNum += OpStoreNum;
             db.SaveChanges();
+            new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("StoreMachineApply", Fields, data.Id);
+
             if (data.Status == 1)
             {
                 return "success";
@@ -631,5 +851,14 @@ namespace MySystem.Areas.Admin.Controllers
         }
         #endregion
 
+        //发货信息实体类
+        private class SendInfo
+        {
+            public int FromStoreId { get; set; }
+            public int ToStoreId { get; set; }
+            public int BrandId { get; set; }
+            public int Num { get; set; }
+        }
+
     }
 }

Areas/Admin/Views/MainServer/StoreMachineApply/AuditSend.cshtml

@@ -26,6 +26,7 @@
 
     <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin">
         <input type="hidden" name="Id" value="@editData.Id" />
+        <input type="hidden" name="ExcelData" id="ExcelData" value="" />
 
         <div class="layui-card">
             <div class="layui-card-body">
@@ -94,6 +95,13 @@
                                     </script>
                                 </div>
                             </div>
+                            <div class="layui-form-item layui-form-text">
+                                <label class="layui-form-label">描述</label>
+                                <div class="layui-input-block">
+                                    <textarea class="layui-textarea" id="SeoKeyword" name="SeoKeyword" maxlength="max"
+                                        lay-verify="required|" placeholder="请输入申请描述"></textarea>
+                                </div>
+                            </div>
                             <div class="layui-form-item"">
                             <div class=" layui-tab-item layui-show">
                                 <div class="layui-form-item">
@@ -153,11 +161,12 @@
         var tree;
         var element;
         var upload;
+        var excel;
         layui.config({
             base: '/layuiadmin/' //静态资源所在路径
         }).extend({
             index: 'lib/index' //主入口模块
-        }).use(['index', 'form', 'upload', 'layedit', 'laydate', 'element', 'croppers', 'transfer', 'tree', 'util'], function () {
+        }).use(['index', 'form', 'upload', 'layedit', 'laydate', 'element', 'croppers', 'transfer', 'tree', 'util', 'excel'], function () {
             var $ = layui.$
                 , form = layui.form
                 , layer = layui.layer
@@ -177,6 +186,15 @@
                 location.hash = 'test=' + $(this).attr('lay-id');
             });
 
+            //excel导入
+            excel = layui.excel;
+            $('#ExcelFile').change(function (e) {
+                var files = e.target.files;
+                excel.importExcel(files, {}, function (data) {
+                    $("#ExcelData").val(JSON.stringify(data[0].Sheet1));
+                });
+            });
+
             //日期
 
 

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

@@ -85,7 +85,7 @@
                         </div>
                     </div>
                     <div class="layui-inline">
-                        <label class="layui-form-label">创客创客编号</label>
+                        <label class="layui-form-label">创客编号</label>
                         <div class="layui-input-inline">
                             <input class="layui-input" type="text" name="UserIdMakerCode" autocomplete="off">
                         </div>

wwwroot/layuiadmin/modules_main/StoreMachineApply_Admin.js

@@ -10,6 +10,11 @@ function ConfirmImport() {
                 layer.msg("导入成功", { time: 2000 }, function () {
                     window.location.reload();
                 });
+            } else if (data.indexOf("warning") == 0) {
+                var datalist = data.split('|');
+                layer.alert(datalist[0], { time: 20000 }, function () {
+                    window.location.reload();
+                });
             } else {
                 layer.msg(data);
             }
@@ -239,6 +244,11 @@ layui.config({
                                     }, function () {
                                         table.reload('LAY-list-manage'); //数据刷新
                                     });
+                                } else if (data == "warning") {
+                                    var datalist = data.split('|');
+                                    layer.alert(datalist[0], { time: 20000 }, function () {
+                                        window.location.reload();
+                                    });
                                 } else {
                                     layer.close(index); //关闭弹层
                                     layer.msg('审核完成', {