Merge branch 'feature-dgy-更新金控入库时间' into DuGuYang

Areas/Admin/Controllers/MainServer/PosMachinesTwoController.cs

@@ -592,6 +592,61 @@ namespace MySystem.Areas.Admin.Controllers
         }
         #endregion
 
+
+        #region 导入金控入库时间数据
+        /// <summary>
+        /// 导入金控入库时间数据
+        /// </summary>
+        /// <param name="ImportCreateData"></param>
+        public string ImportCreateData(string ExcelData)
+        {
+            ExcelData = HttpUtility.UrlDecode(ExcelData);
+            JsonData list = JsonMapper.ToObject(ExcelData);
+            string error = "";
+            string info = "";
+            var brandInfo = db.KqProducts.ToList();
+            for (int i = 1; i < list.Count; i++)
+            {
+                JsonData dr = list[i];
+                string itemJson = dr.ToJson();
+                string PosSn = itemJson.Contains("\"A\"") ? dr["A"].ToString() : "";
+                string CreateDate = itemJson.Contains("\"B\"") ? dr["B"].ToString() : "";
+                var pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == PosSn && m.Status > -1) ?? new PosMachinesTwo();
+                if (pos.Id > 0)
+                {
+                    var brandName = brandInfo.FirstOrDefault(m => m.Id == pos.BrandId);
+                    if (brandName.Name.StartsWith("金控"))
+                    {
+                        info += "机具Sn：" + PosSn + "原入库时间：" + pos.CreateDate + "新入库时间：" + CreateDate;
+                        pos.CreateDate = DateTime.Parse(CreateDate);
+                    }
+                    else
+                    {
+                        error += "以下操作失败" + PosSn + ',' + "该机具号品牌不符合修改规则" + '\n';
+                    }
+                }
+                else
+                {
+                    error += "以下操作失败" + PosSn + ',' + "该机具号不存在" + '\n';
+                }
+            }
+            if (!string.IsNullOrEmpty(error))
+            {
+                return "Warning|" + error;
+            }
+            else
+            {
+                db.SaveChanges();
+                string text = string.Format("导入金控入库时间数据: '" + info + "'，操作人: '" + SysUserName + "_" + SysRealName + "'，Time'" + DateTime.Now + "'");
+                function.WriteLog(text, "导入金控入库时间数据");
+                AddSysLog("0", "ImportCreateData", "Import");
+                return "success";
+            }
+        }
+        #endregion
+
+
+
         #region 导出Excel
 
         /// <summary>

Areas/Admin/Controllers/MainServer/StoreHouseController.cs

@@ -483,7 +483,14 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 return "您输入的仓库归属创客编号不存在，请重新输入正确的仓库归属创客编号";
             }
+            var check = db.StoreHouse.Any(m => m.Sort == 0 && m.Status == 1 && m.UserId == user.UserId);
+            if (check)
+            {
+                return "创客" + MakerCode + "名下已存在分仓，不可再变更";
+            }
             Fields.Add("UserId", user.UserId); //仓库归属人
+            Fields.Add("ManagerEmail", data.ManagerEmail); //管理者邮箱
+            Fields.Add("ManageMobile", data.ManageMobile);
             Fields.Add("Areas", data.Areas); //所属地区
             Fields.Add("Address", data.Address); //仓库地址
             UserForMakerCode manage = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == ManageMakerCode);
@@ -491,7 +498,9 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 return "您输入的仓库负责人编号不存在，请重新输入正确的仓库负责人编号";
             }
-            var store = db.StoreHouse.Where(m => m.Sort == 0 && m.Status == 1 && m.UserId == user.UserId).ToList();
+            var sto = db.StoreHouse.FirstOrDefault(m => m.Id == data.Id);
+            var store = db.StoreHouse.Where(m => m.Sort == 0 && m.Status == 1 && m.UserId == sto.UserId).ToList();
+            UserAccount userAccountOld = db.UserAccount.FirstOrDefault(m => m.Id == sto.UserId);
             UserAccount userAccount = db.UserAccount.FirstOrDefault(m => m.Id == user.UserId);
             if (userAccount == null)
             {
@@ -503,11 +512,11 @@ namespace MySystem.Areas.Admin.Controllers
                 db.SaveChanges();
             }
             userAccount.StoreDeposit = data.Deposit;
+            userAccountOld.StoreDeposit = 0;
             db.SaveChanges();
             // RedisDbconn.Instance.AddList("ResetStoreReserveQueue", user.UserId.ToString());
             decimal olddeposit = 0;//旧押金
             decimal newdeposit = 0;//新押金
-            var sto = db.StoreHouse.FirstOrDefault(m => m.Id == data.Id);
             newdeposit = data.Deposit;
             olddeposit = sto.Deposit;
             if (sto.OpId > 0)
@@ -545,15 +554,35 @@ namespace MySystem.Areas.Admin.Controllers
                 amount.ValidAmount += data.Deposit;
                 opdb.SaveChanges();
             }
+            var oldUserInfo = db.Users.FirstOrDefault(m => m.Id == sto.UserId) ?? new Users();
+            var newUserInfo = db.Users.FirstOrDefault(m => m.Id == user.UserId) ?? new Users();
+            newUserInfo.CreateStoreDate = oldUserInfo.CreateStoreDate;
+            newUserInfo.StoreStock = oldUserInfo.StoreStock;
+            newUserInfo.ThisMonthSend = oldUserInfo.ThisMonthSend;
+            oldUserInfo.CreateStoreDate = null;
+            oldUserInfo.StoreStock = 0;
+            oldUserInfo.ThisMonthSend = 0;
             foreach (var item in store)
             {
                 var storeInfo = store.FirstOrDefault(m => m.Id == item.Id);
+                var storeOp = opdb.StoreForOperate.FirstOrDefault(m => m.Sort == 0 && m.StoreId == item.Id && m.Status > -1) ?? new OpModels.StoreForOperate();
                 storeInfo.Deposit = data.Deposit;
-                db.SaveChanges();
+                storeInfo.UserId = user.UserId;
+                storeInfo.ManageUserId = manage.UserId;
+                storeInfo.ManagerEmail = data.ManagerEmail;
+                storeInfo.ManageMobile = data.ManageMobile;
+                storeInfo.Address = data.Address;
+                storeInfo.Areas = data.Areas;
+                storeInfo.LimitTopUserId = data.LimitTopUserId;
+                storeInfo.FilePath = data.FilePath;
+                storeInfo.Deposit = data.Deposit;
+                storeInfo.Remark = data.Remark;
+                storeOp.UpdateDate = DateTime.Now;
+                storeOp.QueryCount = user.UserId;
             }
+            db.SaveChanges();
+            opdb.SaveChanges();
             Fields.Add("ManageUserId", manage.UserId); //仓库管理员
-            Fields.Add("ManagerEmail", data.ManagerEmail); //管理者邮箱
-            Fields.Add("ManageMobile", data.ManageMobile);
             Fields.Add("Remark", data.Remark); //备注
             Fields.Add("LimitTopUserId", data.LimitTopUserId); //限制创客特殊仓库
             Fields.Add("StoreKind", data.StoreKind); //仓库归属类型
@@ -1059,8 +1088,8 @@ namespace MySystem.Areas.Admin.Controllers
                                     AfterOutNum = toStore.OutNum, //操作后出库数
                                 }).Entity;
                                 db.SaveChanges();
-                                
-                                if(!opData.Contains(posInfo.BuyUserId + ":" + posInfo.BrandId))
+
+                                if (!opData.Contains(posInfo.BuyUserId + ":" + posInfo.BrandId))
                                 {
                                     opData.Add(posInfo.BuyUserId + ":" + posInfo.BrandId);
                                 }
@@ -1154,7 +1183,7 @@ namespace MySystem.Areas.Admin.Controllers
                                 }).Entity;
                                 db.SaveChanges();
 
-                                if(!opData.Contains(posInfo.BuyUserId + ":" + posInfo.BrandId))
+                                if (!opData.Contains(posInfo.BuyUserId + ":" + posInfo.BrandId))
                                 {
                                     opData.Add(posInfo.BuyUserId + ":" + posInfo.BrandId);
                                 }
@@ -1198,7 +1227,7 @@ namespace MySystem.Areas.Admin.Controllers
                 {
                     return "Warning|" + error;
                 }
-                foreach(string sub in opData)
+                foreach (string sub in opData)
                 {
                     string[] datalist = sub.Split(":");
                     PublicFunction.SycnMachineCount(int.Parse(datalist[0]), int.Parse(datalist[1]));

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

@@ -152,8 +152,11 @@
                             <button class="layui-btn" data-type="ExportExcel"><i
                                 class="layui-icon layui-icon-export layuiadmin-button-btn"></i>导出</button>
                         }
-                        @* <button class="layui-btn" data-type="RejectStore"><i class="layui-icon layui-icon-upload
-                            layuiadmin-button-btn"></i>机具驳回仓库</button> *@
+                        @if (RightInfo.Contains("," + right + "_import,"))
+                        {
+                            <button class="layui-btn" data-type="ImportCreateData"><i
+                                class="layui-icon layui-icon-export layuiadmin-button-btn"></i>导入金控入库时间</button>
+                        }
                     </div>
                 </div>
             </div>
@@ -176,6 +179,30 @@
             </div>
         </div>
     </div>
+    <div id="excelForm" style="display:none; padding:20px;">
+        <div class="layui-tab-item layui-show">
+            <div class="layui-form-item">
+                <label class="layui-form-label">模板下载</label>
+                <div class="layui-form-mid layui-word-aux" id="excelTemp">
+                </div>
+            </div>
+            <div class="layui-form-item">
+                <label class="layui-form-label">excel文件</label>
+                <div class="layui-form-mid layui-word-aux">
+                    <div class="layui-upload">
+                        <input type="file" id="ExcelFile" name="ExcelFile" value="">
+                    </div>
+                    <div class="mt10" id="ExcelFileList">
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="layui-form-item ml10">
+            <div class="layui-input-block">
+                <button type="button" class="layui-btn" onclick="ConfirmImport()">立即导入</button>
+            </div>
+        </div>
+    </div>
 
     <script src="/layuiadmin/layui/layui.js"></script>
     <script src="/layuiadmin/modules_main/PosMachinesTwo_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>

wwwroot/layuiadmin/modules_main/PosMachinesTwo_Admin.js

@@ -2,15 +2,15 @@ var ExcelData, ExcelKind;
 function ConfirmImport() {
     $.ajax({
         type: "POST",
-        url: "/Admin/PosMachinesTwo/Import?r=" + Math.random(1),
-        data: "Kind=" + ExcelKind + "&ExcelData=" + encodeURIComponent(JSON.stringify(ExcelData)),
+        url: "/Admin/PosMachinesTwo/ImportCreateData?r=" + Math.random(1),
+        data: "ExcelData=" + encodeURIComponent(JSON.stringify(ExcelData)),
         dataType: "text",
         success: function (data) {
             if (data == "success") {
                 layer.msg("导入成功", { time: 2000 }, function () {
                     window.location.reload();
                 });
-            } else if (data.indexOf("warning") == 0) {
+            } else if (data.indexOf("Warning") == 0) {
                 var datalist = data.split('|');
                 layer.alert(datalist[0], { time: 20000 }, function () {
                     window.location.reload();
@@ -99,7 +99,7 @@ layui.config({
     $('#ExcelFile').change(function (e) {
         var files = e.target.files;
         excel.importExcel(files, {}, function (data) {
-            ExcelData = data[0].sheet1;
+            ExcelData = data[0].Sheet1;
         });
     });
 
@@ -412,6 +412,18 @@ layui.config({
             });
             $("#excelTemp").html('<a href="/excelfile/模板文件.xlsx">点击下载模板文件</a>');
         }
+        , ImportCreateData: function () {
+            layer.open({
+                type: 1,
+                title: '导入',
+                maxmin: false,
+                area: ['460px', '280px'],
+                content: $('#excelForm'),
+                cancel: function () {
+                }
+            });
+            $("#excelTemp").html('<a href="/users/金控入库时间修改模板.xlsx">点击下载金控入库时间修改模板文件</a>');
+        }
         , ExportExcel: function () {
             var userdata = '';
             $(".layuiadmin-card-header-auto input").each(function (i) {