调整

AppStart/SetDesposit.cs

@@ -0,0 +1,87 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Threading;
+using MySystem.Models;
+using Library;
+
+namespace MySystem
+{
+    /// <summary>
+    /// 设置预发机超过30天预发押金自动扣减
+    /// </summary>
+    public class SetDesposit
+    {
+        public readonly static SetDesposit Instance = new SetDesposit();
+        private SetDesposit()
+        { }
+
+        public void Start()
+        {
+            Thread th = new Thread(doSomething);
+            th.IsBackground = true;
+            th.Start();
+        }
+
+        public void doSomething()
+        {
+            while (true)
+            {
+                if (DateTime.Now.Hour > 0 && DateTime.Now.Hour < 4)
+                {
+                    try
+                    {
+                        string check = function.ReadInstance("/SetDesposit/check" + DateTime.Now.ToString("yyyy-MM-dd") + ".txt");
+                        if (string.IsNullOrEmpty(check))
+                        {
+                            function.WritePage("/SetDesposit/", "check" + DateTime.Now.ToString("yyyy-MM-dd") + ".txt", DateTime.Now.ToString("HH:mm:ss"));
+                            WebCMSEntities db = new WebCMSEntities();
+                            var date = DateTime.Now.AddDays(-30);
+                            bool op = true;
+                            while (op)
+                            {
+                                var smallPos = db.PreSendStockDetail.Where(m => m.Status == 1 && m.CreateDate <= date && m.ApplyFlag == 0).ToList();
+                                foreach (var item in smallPos)
+                                {
+                                    var tuserAccount = db.UserAccount.FirstOrDefault(m => m.Id == item.ToUserId) ?? new UserAccount();
+                                    var brandInfo = db.KqProducts.FirstOrDefault(m => m.Id == item.BrandId);
+                                    var amount = 0;
+                                    if (brandInfo.Name.Contains("电签"))
+                                    {
+                                        amount = 200;
+                                    }
+                                    if (brandInfo.Name.Contains("电签"))
+                                    {
+                                        amount = 300;
+                                    }
+                                    if (tuserAccount.Id > 0)
+                                    {
+                                        tuserAccount.SmallStoreDeposit += amount;//添加小分仓押金
+                                        var add = db.UserAccountRecord.Add(new UserAccountRecord()
+                                        {
+                                            Remark = "小分仓押金冻结",
+                                            ChangeType = 63,
+                                            BeforeBalanceAmount = tuserAccount.SmallStoreDeposit - amount, //变更前余额
+                                            AfterBalanceAmount = tuserAccount.SmallStoreDeposit, //变更后余额
+                                            ChangeAmount = amount, //变更金额
+                                            UserId = item.ToUserId,
+
+                                        }).Entity;
+                                        db.SaveChanges();
+                                    }
+                                }
+                            }
+                            db.Dispose();
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        function.WriteLog(DateTime.Now.ToString() + ":" + ex.ToString(), "设置预发机超过30天预发押金自动扣减异常");
+                    }
+                }
+                Thread.Sleep(800000);
+            }
+        }
+    }
+}

Areas/Admin/Controllers/MainServer/HelpProfitExchangeController.cs

@@ -60,12 +60,12 @@ namespace MySystem.Areas.Admin.Controllers
             //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
-                condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
+                condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
             }
             //创客真实姓名
             if (!string.IsNullOrEmpty(UserIdRealName))
             {
-                condition += " and UserId in (select UserId from UsersForRealName where RealName='" + UserIdRealName + "')";
+                condition += " and UserId in (select UserId from UserForRealName where RealName='" + UserIdRealName + "')";
             }
             if (!string.IsNullOrEmpty(CreateDateData))
             {
@@ -307,12 +307,12 @@ namespace MySystem.Areas.Admin.Controllers
             //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
-                condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
+                condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
             }
             //创客真实姓名
             if (!string.IsNullOrEmpty(UserIdRealName))
             {
-                condition += " and UserId in (select UserId from UsersForRealName where RealName='" + UserIdRealName + "')";
+                condition += " and UserId in (select UserId from UserForRealName where RealName='" + UserIdRealName + "')";
             }
 
 

Areas/Admin/Controllers/MainServer/HelpProfitExchangeDetailController.cs

@@ -60,12 +60,12 @@ namespace MySystem.Areas.Admin.Controllers
             //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
-                condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
+                condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
             }
             //创客真实姓名
             if (!string.IsNullOrEmpty(UserIdRealName))
             {
-                condition += " and UserId in (select UserId from UsersForRealName where RealName='" + UserIdRealName + "')";
+                condition += " and UserId in (select UserId from UserForRealName where RealName='" + UserIdRealName + "')";
             }
             //券码
             if (!string.IsNullOrEmpty(PosCouponIdSelect))
@@ -319,12 +319,12 @@ namespace MySystem.Areas.Admin.Controllers
             //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
-                condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
+                condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
             }
             //创客真实姓名
             if (!string.IsNullOrEmpty(UserIdRealName))
             {
-                condition += " and UserId in (select UserId from UsersForRealName where RealName='" + UserIdRealName + "')";
+                condition += " and UserId in (select UserId from UserForRealName where RealName='" + UserIdRealName + "')";
             }
             //券码
             if (!string.IsNullOrEmpty(PosCouponIdSelect))

Areas/Admin/Controllers/MainServer/MachineChangeController.cs

@@ -64,12 +64,12 @@ namespace MySystem.Areas.Admin.Controllers
             //创客真实姓名
             if (!string.IsNullOrEmpty(UserIdRealName))
             {
-                condition += " and UserId in (select UserId from UsersForRealName where RealName='" + UserIdRealName + "')";
+                condition += " and UserId in (select UserId from UserForRealName where RealName='" + UserIdRealName + "')";
             }
             //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
-                condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
+                condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
             }
             //退回产品类型
             if (!string.IsNullOrEmpty(BackProductTypeSelect))
@@ -94,12 +94,12 @@ namespace MySystem.Areas.Admin.Controllers
             //退回仓库归属人创客编号
             if (!string.IsNullOrEmpty(BackStoreUserIdMakerCode))
             {
-                condition += " and BackStoreUserId in (select BackStoreUserId from UsersForMakerCode where MakerCode='" + BackStoreUserIdMakerCode + "')";
+                condition += " and BackStoreUserId in (select BackStoreUserId from UserForMakerCode where MakerCode='" + BackStoreUserIdMakerCode + "')";
             }
             //退回仓库归属人真实姓名
             if (!string.IsNullOrEmpty(BackStoreUserIdRealName))
             {
-                condition += " and BackStoreUserId in (select BackStoreUserId from UsersForRealName where RealName='" + BackStoreUserIdRealName + "')";
+                condition += " and BackStoreUserId in (select BackStoreUserId from UserForRealName where RealName='" + BackStoreUserIdRealName + "')";
             }
             //出库产品类型
             if (!string.IsNullOrEmpty(OutProductTypeSelect))
@@ -385,12 +385,12 @@ namespace MySystem.Areas.Admin.Controllers
             //创客真实姓名
             if (!string.IsNullOrEmpty(UserIdRealName))
             {
-                condition += " and UserId in (select UserId from UsersForRealName where RealName='" + UserIdRealName + "')";
+                condition += " and UserId in (select UserId from UserForRealName where RealName='" + UserIdRealName + "')";
             }
             //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
-                condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
+                condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
             }
             //退回产品类型
             if (!string.IsNullOrEmpty(BackProductTypeSelect))
@@ -415,12 +415,12 @@ namespace MySystem.Areas.Admin.Controllers
             //退回仓库归属人创客编号
             if (!string.IsNullOrEmpty(BackStoreUserIdMakerCode))
             {
-                condition += " and BackStoreUserId in (select BackStoreUserId from UsersForMakerCode where MakerCode='" + BackStoreUserIdMakerCode + "')";
+                condition += " and BackStoreUserId in (select BackStoreUserId from UserForMakerCode where MakerCode='" + BackStoreUserIdMakerCode + "')";
             }
             //退回仓库归属人真实姓名
             if (!string.IsNullOrEmpty(BackStoreUserIdRealName))
             {
-                condition += " and BackStoreUserId in (select BackStoreUserId from UsersForRealName where RealName='" + BackStoreUserIdRealName + "')";
+                condition += " and BackStoreUserId in (select BackStoreUserId from UserForRealName where RealName='" + BackStoreUserIdRealName + "')";
             }
             //出库产品类型
             if (!string.IsNullOrEmpty(OutProductTypeSelect))

Areas/Admin/Controllers/MainServer/MerchantDepositReturnsController.cs

@@ -340,12 +340,12 @@ namespace MySystem.Areas.Admin.Controllers
             //创客真实姓名
             if (!string.IsNullOrEmpty(UserIdRealName))
             {
-                condition += " and UserId in (select UserId from UsersForRealName where RealName='" + UserIdRealName + "')";
+                condition += " and UserId in (select UserId from UserForRealName where RealName='" + UserIdRealName + "')";
             }
             //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
-                condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
+                condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
             }
 
 

Areas/Admin/Controllers/MainServer/OrdersController.cs

@@ -780,12 +780,12 @@ namespace MySystem.Areas.Admin.Controllers
             //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
-                condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
+                condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
             }
             //创客真实姓名
             if (!string.IsNullOrEmpty(UserIdRealName))
             {
-                condition += " and UserId in (select UserId from UsersForRealName where RealName='" + UserIdRealName + "')";
+                condition += " and UserId in (select UserId from UserForRealName where RealName='" + UserIdRealName + "')";
             }
             //支付方式
             if (!string.IsNullOrEmpty(PayModeSelect))
@@ -830,12 +830,12 @@ namespace MySystem.Areas.Admin.Controllers
             //仓库归属创客编号
             if (!string.IsNullOrEmpty(StoreUserIdMakerCode))
             {
-                condition += " and StoreUserId in (select StoreUserId from UsersForMakerCode where MakerCode='" + StoreUserIdMakerCode + "')";
+                condition += " and StoreUserId in (select StoreUserId from UserForMakerCode where MakerCode='" + StoreUserIdMakerCode + "')";
             }
             //仓库归属创客真实姓名
             if (!string.IsNullOrEmpty(StoreUserIdRealName))
             {
-                condition += " and StoreUserId in (select StoreUserId from UsersForRealName where RealName='" + StoreUserIdRealName + "')";
+                condition += " and StoreUserId in (select StoreUserId from UserForRealName where RealName='" + StoreUserIdRealName + "')";
             }
             //支付状态
             if (!string.IsNullOrEmpty(PayStatusSelect))

Areas/Admin/Controllers/MainServer/PosMachinesFeeChangeRecordController.cs

@@ -66,22 +66,22 @@ namespace MySystem.Areas.Admin.Controllers
             //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
-                condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
+                condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
             }
             //创客真实姓名
             if (!string.IsNullOrEmpty(UserIdRealName))
             {
-                condition += " and UserId in (select UserId from UsersForRealName where RealName='" + UserIdRealName + "')";
+                condition += " and UserId in (select UserId from UserForRealName where RealName='" + UserIdRealName + "')";
             }
             //机具所属人创客编号
             if (!string.IsNullOrEmpty(PosUserIdMakerCode))
             {
-                condition += " and PosUserId in (select PosUserId from UsersForMakerCode where MakerCode='" + PosUserIdMakerCode + "')";
+                condition += " and PosUserId in (select PosUserId from UserForMakerCode where MakerCode='" + PosUserIdMakerCode + "')";
             }
             //机具所属人真实姓名
             if (!string.IsNullOrEmpty(PosUserIdRealName))
             {
-                condition += " and PosUserId in (select PosUserId from UsersForRealName where RealName='" + PosUserIdRealName + "')";
+                condition += " and PosUserId in (select PosUserId from UserForRealName where RealName='" + PosUserIdRealName + "')";
             }
             //品牌
             if (!string.IsNullOrEmpty(SortSelect))
@@ -468,22 +468,22 @@ namespace MySystem.Areas.Admin.Controllers
             //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
-                condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
+                condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
             }
             //创客真实姓名
             if (!string.IsNullOrEmpty(UserIdRealName))
             {
-                condition += " and UserId in (select UserId from UsersForRealName where RealName='" + UserIdRealName + "')";
+                condition += " and UserId in (select UserId from UserForRealName where RealName='" + UserIdRealName + "')";
             }
             //机具所属人创客编号
             if (!string.IsNullOrEmpty(PosUserIdMakerCode))
             {
-                condition += " and PosUserId in (select PosUserId from UsersForMakerCode where MakerCode='" + PosUserIdMakerCode + "')";
+                condition += " and PosUserId in (select PosUserId from UserForMakerCode where MakerCode='" + PosUserIdMakerCode + "')";
             }
             //机具所属人真实姓名
             if (!string.IsNullOrEmpty(PosUserIdRealName))
             {
-                condition += " and PosUserId in (select PosUserId from UsersForRealName where RealName='" + PosUserIdRealName + "')";
+                condition += " and PosUserId in (select PosUserId from UserForRealName where RealName='" + PosUserIdRealName + "')";
             }
             //品牌
             if (!string.IsNullOrEmpty(SortSelect))

Areas/Admin/Controllers/MainServer/PreSendStockDetailController.cs

@@ -67,12 +67,12 @@ namespace MySystem.Areas.Admin.Controllers
             //仓库名称
             if (!string.IsNullOrEmpty(StoreIdStoreName))
             {
-                condition += " and StoreId in (select StoreId from SmallStoreHouseForStoreName where StoreName='" + StoreIdStoreName + "')";
+                condition += " and StoreId in (select StoreId from StoreForName where Name='" + StoreIdStoreName + "')";
             }
             //仓库编号
             if (!string.IsNullOrEmpty(StoreIdStoreNo))
             {
-                condition += " and StoreId in (select StoreId from SmallStoreHouseForStoreNo where StoreNo='" + StoreIdStoreNo + "')";
+                condition += " and StoreId in (select StoreId from StoreForCode where Code='" + StoreIdStoreNo + "')";
             }
             if (!string.IsNullOrEmpty(CreateDateData))
             {
@@ -96,52 +96,52 @@ namespace MySystem.Areas.Admin.Controllers
             //收货人创客编号
             if (!string.IsNullOrEmpty(ToUserIdMakerCode))
             {
-                condition += " and ToUserId in (select ToUserId from UsersForMakerCode where MakerCode='" + ToUserIdMakerCode + "')";
+                condition += " and ToUserId in (select UserId from UserForMakerCode where MakerCode='" + ToUserIdMakerCode + "')";
             }
             //收货人真实姓名
             if (!string.IsNullOrEmpty(ToUserIdRealName))
             {
-                condition += " and ToUserId in (select ToUserId from UsersForRealName where RealName='" + ToUserIdRealName + "')";
+                condition += " and ToUserId in (select UserId from UserForRealName where RealName='" + ToUserIdRealName + "')";
             }
             //收货仓库编号
             if (!string.IsNullOrEmpty(ToStoreIdStoreNo))
             {
-                condition += " and ToStoreId in (select ToStoreId from StoreHouseForStoreNo where StoreNo='" + ToStoreIdStoreNo + "')";
+                condition += " and ToStoreId in (select StoreId from StoreForCode where Code='" + ToStoreIdStoreNo + "')";
             }
             //收货仓库名称
             if (!string.IsNullOrEmpty(ToStoreIdStoreName))
             {
-                condition += " and ToStoreId in (select ToStoreId from StoreHouseForStoreName where StoreName='" + ToStoreIdStoreName + "')";
+                condition += " and ToStoreId in (select StoreId from StoreForName where Name='" + ToStoreIdStoreName + "')";
             }
             //源仓库编号仓库编号
             if (!string.IsNullOrEmpty(SourceStoreIdStoreNo))
             {
-                condition += " and SourceStoreId in (select SourceStoreId from StoreHouseForStoreNo where StoreNo='" + SourceStoreIdStoreNo + "')";
+                condition += " and SourceStoreId in (select StoreId from StoreForCode where Code='" + SourceStoreIdStoreNo + "')";
             }
             //源仓库编号仓库名称
             if (!string.IsNullOrEmpty(SourceStoreIdStoreName))
             {
-                condition += " and SourceStoreId in (select SourceStoreId from StoreHouseForStoreName where StoreName='" + SourceStoreIdStoreName + "')";
+                condition += " and SourceStoreId in (select StoreId from StoreForName where Name=='" + SourceStoreIdStoreName + "')";
             }
             //出货创客编号
             if (!string.IsNullOrEmpty(FromUserIdMakerCode))
             {
-                condition += " and FromUserId in (select FromUserId from UsersForMakerCode where MakerCode='" + FromUserIdMakerCode + "')";
+                condition += " and FromUserId in (select UserId from UserForMakerCode where MakerCode='" + FromUserIdMakerCode + "')";
             }
             //出货创客真实姓名
             if (!string.IsNullOrEmpty(FromUserIdRealName))
             {
-                condition += " and FromUserId in (select FromUserId from UsersForRealName where RealName='" + FromUserIdRealName + "')";
+                condition += " and FromUserId in (select UserId from UserForRealName where RealName='" + FromUserIdRealName + "')";
             }
             //出货仓库编号
             if (!string.IsNullOrEmpty(FromStoreIdStoreNo))
             {
-                condition += " and FromStoreId in (select FromStoreId from StoreHouseForStoreNo where StoreNo='" + FromStoreIdStoreNo + "')";
+                condition += " and FromStoreId in (select StoreId from StoreForCode where Code='" + FromStoreIdStoreNo + "')";
             }
             //出货仓库名称
             if (!string.IsNullOrEmpty(FromStoreIdStoreName))
             {
-                condition += " and FromStoreId in (select FromStoreId from StoreHouseForStoreName where StoreName='" + FromStoreIdStoreName + "')";
+                condition += " and FromStoreId in (select StoreId from StoreForName where Name='" + FromStoreIdStoreName + "')";
             }
 
 
@@ -457,12 +457,12 @@ namespace MySystem.Areas.Admin.Controllers
             //收货人创客编号
             if (!string.IsNullOrEmpty(ToUserIdMakerCode))
             {
-                condition += " and ToUserId in (select ToUserId from UsersForMakerCode where MakerCode='" + ToUserIdMakerCode + "')";
+                condition += " and ToUserId in (select ToUserId from UserForMakerCode where MakerCode='" + ToUserIdMakerCode + "')";
             }
             //收货人真实姓名
             if (!string.IsNullOrEmpty(ToUserIdRealName))
             {
-                condition += " and ToUserId in (select ToUserId from UsersForRealName where RealName='" + ToUserIdRealName + "')";
+                condition += " and ToUserId in (select ToUserId from UserForRealName where RealName='" + ToUserIdRealName + "')";
             }
             //收货仓库编号
             if (!string.IsNullOrEmpty(ToStoreIdStoreNo))
@@ -487,12 +487,12 @@ namespace MySystem.Areas.Admin.Controllers
             //出货创客编号
             if (!string.IsNullOrEmpty(FromUserIdMakerCode))
             {
-                condition += " and FromUserId in (select FromUserId from UsersForMakerCode where MakerCode='" + FromUserIdMakerCode + "')";
+                condition += " and FromUserId in (select FromUserId from UserForMakerCode where MakerCode='" + FromUserIdMakerCode + "')";
             }
             //出货创客真实姓名
             if (!string.IsNullOrEmpty(FromUserIdRealName))
             {
-                condition += " and FromUserId in (select FromUserId from UsersForRealName where RealName='" + FromUserIdRealName + "')";
+                condition += " and FromUserId in (select FromUserId from UserForRealName where RealName='" + FromUserIdRealName + "')";
             }
             //出货仓库编号
             if (!string.IsNullOrEmpty(FromStoreIdStoreNo))
@@ -623,16 +623,17 @@ namespace MySystem.Areas.Admin.Controllers
             // Fields.Add("ApplyDate", "3"); //申请时间
 
 
-            string condition = " and Status>-1 and DATE_SUB(CURDATE(), INTERVAL 30 DAY) >= date(CreateDate) and ApplyFlag =0 and AuthFlag =1";
+            // string condition = " and Status>-1 and DATE_SUB(CURDATE(), INTERVAL 30 DAY) >= date(CreateDate) and ApplyFlag =0 and AuthFlag =1";
+            string condition = " and Status>-1 and DATE_SUB(CURDATE(), INTERVAL 30 DAY) >= date(CreateDate) and ApplyFlag =0";
             //仓库名称
             if (!string.IsNullOrEmpty(StoreIdStoreName))
             {
-                condition += " and StoreId in (select StoreId from SmallStoreHouseForStoreName where StoreName='" + StoreIdStoreName + "')";
+                condition += " and StoreId in (select StoreId from StoreForName where Name='" + StoreIdStoreName + "')";
             }
             //仓库编号
             if (!string.IsNullOrEmpty(StoreIdStoreNo))
             {
-                condition += " and StoreId in (select StoreId from SmallStoreHouseForStoreNo where StoreNo='" + StoreIdStoreNo + "')";
+                condition += " and StoreId in (select StoreId from StoreForCode where Code='" + StoreIdStoreNo + "')";
             }
             if (!string.IsNullOrEmpty(CreateDateData))
             {
@@ -656,52 +657,52 @@ namespace MySystem.Areas.Admin.Controllers
             //收货人创客编号
             if (!string.IsNullOrEmpty(ToUserIdMakerCode))
             {
-                condition += " and ToUserId in (select ToUserId from UsersForMakerCode where MakerCode='" + ToUserIdMakerCode + "')";
+                condition += " and ToUserId in (select UserId from UserForMakerCode where MakerCode='" + ToUserIdMakerCode + "')";
             }
             //收货人真实姓名
             if (!string.IsNullOrEmpty(ToUserIdRealName))
             {
-                condition += " and ToUserId in (select ToUserId from UsersForRealName where RealName='" + ToUserIdRealName + "')";
+                condition += " and ToUserId in (select UserId from UserForRealName where RealName='" + ToUserIdRealName + "')";
             }
             //收货仓库编号
             if (!string.IsNullOrEmpty(ToStoreIdStoreNo))
             {
-                condition += " and ToStoreId in (select ToStoreId from StoreHouseForStoreNo where StoreNo='" + ToStoreIdStoreNo + "')";
+                condition += " and ToStoreId in (select StoreId from StoreForCode where Code='" + ToStoreIdStoreNo + "')";
             }
             //收货仓库名称
             if (!string.IsNullOrEmpty(ToStoreIdStoreName))
             {
-                condition += " and ToStoreId in (select ToStoreId from StoreHouseForStoreName where StoreName='" + ToStoreIdStoreName + "')";
+                condition += " and ToStoreId in (select StoreId from StoreForName where Name='" + ToStoreIdStoreName + "')";
             }
             //源仓库编号仓库编号
             if (!string.IsNullOrEmpty(SourceStoreIdStoreNo))
             {
-                condition += " and SourceStoreId in (select SourceStoreId from StoreHouseForStoreNo where StoreNo='" + SourceStoreIdStoreNo + "')";
+                condition += " and SourceStoreId in (select StoreId from StoreForCode where Code='" + SourceStoreIdStoreNo + "')";
             }
             //源仓库编号仓库名称
             if (!string.IsNullOrEmpty(SourceStoreIdStoreName))
             {
-                condition += " and SourceStoreId in (select SourceStoreId from StoreHouseForStoreName where StoreName='" + SourceStoreIdStoreName + "')";
+                condition += " and SourceStoreId in (select StoreId from StoreForName where Name=='" + SourceStoreIdStoreName + "')";
             }
             //出货创客编号
             if (!string.IsNullOrEmpty(FromUserIdMakerCode))
             {
-                condition += " and FromUserId in (select FromUserId from UsersForMakerCode where MakerCode='" + FromUserIdMakerCode + "')";
+                condition += " and FromUserId in (select UserId from UserForMakerCode where MakerCode='" + FromUserIdMakerCode + "')";
             }
             //出货创客真实姓名
             if (!string.IsNullOrEmpty(FromUserIdRealName))
             {
-                condition += " and FromUserId in (select FromUserId from UsersForRealName where RealName='" + FromUserIdRealName + "')";
+                condition += " and FromUserId in (select UserId from UserForRealName where RealName='" + FromUserIdRealName + "')";
             }
             //出货仓库编号
             if (!string.IsNullOrEmpty(FromStoreIdStoreNo))
             {
-                condition += " and FromStoreId in (select FromStoreId from StoreHouseForStoreNo where StoreNo='" + FromStoreIdStoreNo + "')";
+                condition += " and FromStoreId in (select StoreId from StoreForCode where Code='" + FromStoreIdStoreNo + "')";
             }
             //出货仓库名称
             if (!string.IsNullOrEmpty(FromStoreIdStoreName))
             {
-                condition += " and FromStoreId in (select FromStoreId from StoreHouseForStoreName where StoreName='" + FromStoreIdStoreName + "')";
+                condition += " and FromStoreId in (select StoreId from StoreForName where Name='" + FromStoreIdStoreName + "')";
             }
 
 
@@ -717,8 +718,6 @@ namespace MySystem.Areas.Admin.Controllers
                 dic.Remove("StoreId");
                 //产品类型
                 dic["BrandId"] = RelationClass.GetKqProductBrandInfo(int.Parse(dic["BrandId"].ToString()));
-                //SNID
-                dic["SnId"] = RelationClass.GetPosMachinesTwoInfo(int.Parse(dic["SnId"].ToString()));
                 //收货人
                 int ToUserId = int.Parse(function.CheckInt(dic["ToUserId"].ToString()));
                 Users touserid_Users = db.Users.FirstOrDefault(m => m.Id == ToUserId) ?? new Users();

Areas/Admin/Controllers/MainServer/SchoolSignInRecordController.cs

@@ -63,12 +63,12 @@ namespace MySystem.Areas.Admin.Controllers
             //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
-                condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
+                condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
             }
             //创客真实姓名
             if (!string.IsNullOrEmpty(UserIdRealName))
             {
-                condition += " and UserId in (select UserId from UsersForRealName where RealName='" + UserIdRealName + "')";
+                condition += " and UserId in (select UserId from UserForRealName where RealName='" + UserIdRealName + "')";
             }
 
 
@@ -301,12 +301,12 @@ namespace MySystem.Areas.Admin.Controllers
             //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
-                condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
+                condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
             }
             //创客真实姓名
             if (!string.IsNullOrEmpty(UserIdRealName))
             {
-                condition += " and UserId in (select UserId from UsersForRealName where RealName='" + UserIdRealName + "')";
+                condition += " and UserId in (select UserId from UserForRealName where RealName='" + UserIdRealName + "')";
             }
 
 

Areas/Admin/Controllers/MainServer/SchoolSignInTaskRecordController.cs

@@ -63,12 +63,12 @@ namespace MySystem.Areas.Admin.Controllers
             //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
-                condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
+                condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
             }
             //创客真实姓名
             if (!string.IsNullOrEmpty(UserIdRealName))
             {
-                condition += " and UserId in (select UserId from UsersForRealName where RealName='" + UserIdRealName + "')";
+                condition += " and UserId in (select UserId from UserForRealName where RealName='" + UserIdRealName + "')";
             }
             //任务
             if (!string.IsNullOrEmpty(TaskIdSelect))
@@ -310,12 +310,12 @@ namespace MySystem.Areas.Admin.Controllers
             //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
-                condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
+                condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
             }
             //创客真实姓名
             if (!string.IsNullOrEmpty(UserIdRealName))
             {
-                condition += " and UserId in (select UserId from UsersForRealName where RealName='" + UserIdRealName + "')";
+                condition += " and UserId in (select UserId from UserForRealName where RealName='" + UserIdRealName + "')";
             }
             //任务
             if (!string.IsNullOrEmpty(TaskIdSelect))

Areas/Admin/Controllers/MainServer/StoreMachineApplyController.cs

@@ -71,12 +71,12 @@ namespace MySystem.Areas.Admin.Controllers
             //创客真实姓名
             if (!string.IsNullOrEmpty(UserIdRealName))
             {
-                condition += " and UserId in (select UserId from UsersForRealName where RealName='" + UserIdRealName + "')";
+                condition += " and UserId in (select UserId from UserForRealName where RealName='" + UserIdRealName + "')";
             }
             //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
-                condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
+                condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
             }
 
             if (!string.IsNullOrEmpty(StatusSelect))
@@ -376,12 +376,12 @@ namespace MySystem.Areas.Admin.Controllers
             //创客真实姓名
             if (!string.IsNullOrEmpty(UserIdRealName))
             {
-                condition += " and UserId in (select UserId from UsersForRealName where RealName='" + UserIdRealName + "')";
+                condition += " and UserId in (select UserId from UserForRealName where RealName='" + UserIdRealName + "')";
             }
             //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
-                condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
+                condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
             }
 
 

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -355,6 +355,55 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 pos.BindMerchantId = merchant.Id;
             }
+            var makerCode = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == MakerCode) ?? new UserForMakerCode();
+            var prePos = db.PreSendStockDetail.FirstOrDefault(m => m.ToUserId == makerCode.UserId && m.SnId == pos.Id && m.CreateDate < DateTime.Now.AddDays(-30) && m.AuthFlag == 1 && m.ApplyFlag == 0) ?? new PreSendStockDetail();
+            if (makerCode.UserId > 0 && prePos.Id > 0)
+            {
+                var brandInfo = db.KqProducts.FirstOrDefault(m => m.Id == prePos.BrandId);
+                var amount = 0;
+                if (brandInfo.Name.Contains("电签"))
+                {
+                    amount = 200;
+                }
+                if (brandInfo.Name.Contains("大POS"))
+                {
+                    amount = 300;
+                }
+                var userAccount = db.UserAccount.FirstOrDefault(m => m.Id == makerCode.UserId) ?? new UserAccount();
+                if (userAccount.Id > 0)
+                {
+                    if (userAccount.SmallStoreDeposit - amount >= 0)
+                    {
+                        userAccount.BalanceAmount += amount;
+                        userAccount.SmallStoreDeposit -= amount;
+                        var add = db.UserAccountRecord.Add(new UserAccountRecord()
+                        {
+                            Remark = "小分仓押金解冻",
+                            ChangeType = 62,
+                            BeforeBalanceAmount = userAccount.BalanceAmount - amount, //变更前余额
+                            AfterBalanceAmount = userAccount.BalanceAmount, //变更后余额
+                            UserId = userAccount.Id,
+
+                        }).Entity;
+                        db.SaveChanges();
+                    }
+                    else
+                    {
+                        userAccount.BalanceAmount += userAccount.SmallStoreDeposit;
+                        userAccount.SmallStoreDeposit -= userAccount.SmallStoreDeposit;
+                        var add = db.UserAccountRecord.Add(new UserAccountRecord()
+                        {
+                            Remark = "小分仓押金解冻",
+                            ChangeType = 62,
+                            BeforeBalanceAmount = userAccount.BalanceAmount, //变更前余额
+                            AfterBalanceAmount = userAccount.BalanceAmount + userAccount.SmallStoreDeposit, //变更后余额
+                            UserId = userAccount.Id,
+
+                        }).Entity;
+                        db.SaveChanges();
+                    }
+                }
+            }
             db.SaveChanges();
             function.WriteLog(DateTime.Now.ToString() + "\n" + SysUserName + "\nMakerCode:" + MakerCode + ", PosSn:" + PosSn + ", MerNo:" + MerNo + ", AddActPrize:" + AddActPrize + ", IsPre:" + IsPre, "机具补录日志");
             return "success";
@@ -408,31 +457,31 @@ namespace MySystem.Areas.Admin.Controllers
                 int StartId = int.Parse(function.CheckInt(SpTradeRecordId));
                 if (pos.BrandId == 1)
                 {
-                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId &&m.TradeSnNo == pos.PosSn && m.ProductType == "1" && m.SerEntryMode != "N" && m.MerNo.StartsWith("M700")).Sum(m => m.TradeAmount) / 100;
+                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "1" && m.SerEntryMode != "N" && m.MerNo.StartsWith("M700")).Sum(m => m.TradeAmount) / 100;
                 }
                 else if (pos.BrandId == 2)
                 {
-                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId &&m.TradeSnNo == pos.PosSn && m.ProductType == "2").Sum(m => m.TradeAmount);
+                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "2").Sum(m => m.TradeAmount);
                 }
                 else if (pos.BrandId == 3)
                 {
-                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId &&m.TradeSnNo == pos.PosSn && m.ProductType == "1" && m.SerEntryMode != "N" && m.MerNo.StartsWith("M900")).Sum(m => m.TradeAmount) / 100;
+                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "1" && m.SerEntryMode != "N" && m.MerNo.StartsWith("M900")).Sum(m => m.TradeAmount) / 100;
                 }
                 else if (pos.BrandId == 4 || pos.BrandId == 5)
                 {
-                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId &&m.TradeSnNo == pos.PosSn && m.ProductType == "4").Sum(m => m.TradeAmount) / 100;
+                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "4").Sum(m => m.TradeAmount) / 100;
                 }
                 else if (pos.BrandId == 6)
                 {
-                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId &&m.TradeSnNo == pos.PosSn && m.ProductType == "6").Sum(m => m.TradeAmount) / 100;
+                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "6").Sum(m => m.TradeAmount) / 100;
                 }
                 else if (pos.BrandId == 8)
                 {
-                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId &&m.TradeSnNo == pos.PosSn && m.ProductType == "8").Sum(m => m.TradeAmount) / 100;
+                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "8").Sum(m => m.TradeAmount) / 100;
                 }
                 else if (pos.BrandId == 9)
                 {
-                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId &&m.TradeSnNo == pos.PosSn && m.ProductType == "9").Sum(m => m.TradeAmount) / 100;
+                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "9").Sum(m => m.TradeAmount) / 100;
                 }
                 pos.CreditTrade = CreditTrade;
                 db.SaveChanges();
@@ -1065,7 +1114,7 @@ namespace MySystem.Areas.Admin.Controllers
                 Users user = db.Users.FirstOrDefault(m => m.Id == reward.UserId) ?? new Users();
                 DepositGet = "已领取";
                 DepositUser = "创客编号：" + user.MakerCode + "，姓名：" + user.RealName + "，手机号：" + user.Mobile;
-                var fAmount = db.ActiveReward.FirstOrDefault(m => m.KqSnNo == pos.PosSn && m.ActType == 0);                
+                var fAmount = db.ActiveReward.FirstOrDefault(m => m.KqSnNo == pos.PosSn && m.ActType == 0);
                 if (fAmount != null)
                 {
                     headAmount = fAmount.RewardAmount;
@@ -2198,27 +2247,27 @@ namespace MySystem.Areas.Admin.Controllers
                     data["OrderNo"] = order.OrderNo;
                     data["MakerCode"] = user.MakerCode;
                     data["RealName"] = user.RealName;
-                    if(SnNoList.Length > i)
+                    if (SnNoList.Length > i)
                     {
                         string SourceSn = SnNoList[i].Split(':')[0];
                         data["ComeSn"] = SnNoList[i];
                         data["ComeSnParam"] = SourceSn;
                         MachineForSnNo machineFor = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == SourceSn) ?? new MachineForSnNo();
                         PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == machineFor.SnId) ?? new PosMachinesTwo();
-                        if(pos.LeaderUserId > 0)
+                        if (pos.LeaderUserId > 0)
                         {
                             Users leader = db.Users.FirstOrDefault(m => m.Id == pos.LeaderUserId) ?? new Users();
                             data["ComeSnMakerCode"] = leader.MakerCode;
                             data["ComeSnRealName"] = leader.RealName;
                         }
                     }
-                    if(OrderSnNo.Length > i)
+                    if (OrderSnNo.Length > i)
                     {
                         string SendSn = OrderSnNo[i];
                         data["SendSn"] = OrderSnNo[i];
                         MachineForSnNo machineFor = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == SendSn) ?? new MachineForSnNo();
                         PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == machineFor.SnId) ?? new PosMachinesTwo();
-                        if(pos.LeaderUserId > 0)
+                        if (pos.LeaderUserId > 0)
                         {
                             Users leader = db.Users.FirstOrDefault(m => m.Id == pos.LeaderUserId) ?? new Users();
                             data["SendSnMakerCode"] = leader.MakerCode;
@@ -2244,27 +2293,27 @@ namespace MySystem.Areas.Admin.Controllers
                     data["OrderNo"] = order.OrderNo;
                     data["MakerCode"] = user.MakerCode;
                     data["RealName"] = user.RealName;
-                    if(SnNoList.Length > i)
+                    if (SnNoList.Length > i)
                     {
                         string SourceSn = SnNoList[i].Split(':')[0];
                         data["ComeSn"] = SnNoList[i];
                         data["ComeSnParam"] = SourceSn;
                         MachineForSnNo machineFor = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == SourceSn) ?? new MachineForSnNo();
                         PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == machineFor.SnId) ?? new PosMachinesTwo();
-                        if(pos.LeaderUserId > 0)
+                        if (pos.LeaderUserId > 0)
                         {
                             Users leader = db.Users.FirstOrDefault(m => m.Id == pos.LeaderUserId) ?? new Users();
                             data["ComeSnMakerCode"] = leader.MakerCode;
                             data["ComeSnRealName"] = leader.RealName;
                         }
                     }
-                    if(OrderSnNo.Length > i)
+                    if (OrderSnNo.Length > i)
                     {
                         string SendSn = OrderSnNo[i];
                         data["SendSn"] = OrderSnNo[i];
                         MachineForSnNo machineFor = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == SendSn) ?? new MachineForSnNo();
                         PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == machineFor.SnId) ?? new PosMachinesTwo();
-                        if(pos.LeaderUserId > 0)
+                        if (pos.LeaderUserId > 0)
                         {
                             Users leader = db.Users.FirstOrDefault(m => m.Id == pos.LeaderUserId) ?? new Users();
                             data["SendSnMakerCode"] = leader.MakerCode;
@@ -2476,7 +2525,7 @@ namespace MySystem.Areas.Admin.Controllers
         {
             Dictionary<string, string> dic = new Dictionary<string, string>();
             string result = "";
-            PosMachinesTwo pos = db.PosMachinesTwo .FirstOrDefault(m => m.PosSn == PosSn);
+            PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == PosSn);
             if (pos == null)
             {
                 result += "机具SN号不存在\n";
@@ -2484,14 +2533,14 @@ namespace MySystem.Areas.Admin.Controllers
                 dic.Add("result", result);
                 return dic;
             }
-            if(pos.BindingState == 0)
+            if (pos.BindingState == 0)
             {
                 result += "机具未绑定\n";
                 dic.Add("code", "1");
                 dic.Add("result", result);
                 return dic;
             }
-            if(pos.ActivationState == 0)
+            if (pos.ActivationState == 0)
             {
                 result += "机具未激活\n";
                 dic.Add("code", "1");
@@ -2554,7 +2603,7 @@ namespace MySystem.Areas.Admin.Controllers
                 return "商户不存在";
             }
             bool check = db.OpenRewardDetail.Any(m => m.SnNo == pos.PosSn);
-            if(check)
+            if (check)
             {
                 return "开机奖励已发放，请勿重复操作";
             }
@@ -2705,15 +2754,15 @@ namespace MySystem.Areas.Admin.Controllers
                         }
                     }
                     string result = "";
-                    if(!PrizeFlag.Contains("20"))
+                    if (!PrizeFlag.Contains("20"))
                     {
                         result += "20元奖励未发，请检查上级是否满足条件\n";
                     }
-                    if(!PrizeFlag.Contains("10"))
+                    if (!PrizeFlag.Contains("10"))
                     {
                         result += "10元奖励未发，请检查上级是否满足条件\n";
                     }
-                    if(string.IsNullOrEmpty(result))
+                    if (string.IsNullOrEmpty(result))
                     {
                         return "发放成功";
                     }
@@ -2723,7 +2772,7 @@ namespace MySystem.Areas.Admin.Controllers
             db.Dispose();
             return "操作失败";
         }
-        
+
         #endregion
 
         #region 查询机具流量费分佣
@@ -2741,7 +2790,7 @@ namespace MySystem.Areas.Admin.Controllers
         {
             Dictionary<string, string> dic = new Dictionary<string, string>();
             string result = "";
-            PosMachinesTwo pos = db.PosMachinesTwo .FirstOrDefault(m => m.PosSn == PosSn);
+            PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == PosSn);
             if (pos == null)
             {
                 result += "机具SN号不存在\n";
@@ -2749,14 +2798,14 @@ namespace MySystem.Areas.Admin.Controllers
                 dic.Add("result", result);
                 return dic;
             }
-            if(pos.BindingState == 0)
+            if (pos.BindingState == 0)
             {
                 result += "机具未绑定\n";
                 dic.Add("code", "1");
                 dic.Add("result", result);
                 return dic;
             }
-            if(pos.ActivationState == 0)
+            if (pos.ActivationState == 0)
             {
                 result += "机具未激活\n";
                 dic.Add("code", "1");
@@ -2812,21 +2861,21 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 return "商户不存在";
             }
-            if(pos.BrandId == 6)
+            if (pos.BrandId == 6)
             {
                 return "立刷不支持流量费分佣";
             }
-            if(decimal.Parse(function.CheckNum(pos.SeoKeyword)) <= 0)
+            if (decimal.Parse(function.CheckNum(pos.SeoKeyword)) <= 0)
             {
                 return "无押金机，不支持流量费分佣";
             }
             bool check = db.FluxProfitDetail.Any(m => m.MerNo == merchant.KqMerNo);
-            if(check)
+            if (check)
             {
                 return "开机奖励已发放，请勿重复操作";
             }
             SpModels.TradeFluxRecord trade = spdb.TradeFluxRecord.FirstOrDefault(m => m.TradeSnNo == pos.PosSn);
-            if(trade != null)
+            if (trade != null)
             {
                 try
                 {
@@ -2971,7 +3020,7 @@ namespace MySystem.Areas.Admin.Controllers
             db.Dispose();
             return "操作失败";
         }
-        
+
         #endregion
 
         #region 设置立刷费率

Areas/Admin/Controllers/MainServer/TeamApplyController.cs

@@ -74,12 +74,12 @@ namespace MySystem.Areas.Admin.Controllers
             //队长创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
-                condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
+                condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
             }
             //队长真实姓名
             if (!string.IsNullOrEmpty(UserIdRealName))
             {
-                condition += " and UserId in (select UserId from UsersForRealName where RealName='" + UserIdRealName + "')";
+                condition += " and UserId in (select UserId from UserForRealName where RealName='" + UserIdRealName + "')";
             }
             //审核结果
             if (!string.IsNullOrEmpty(AuditResultSelect))
@@ -94,12 +94,12 @@ namespace MySystem.Areas.Admin.Controllers
             //顶级创客编号
             if (!string.IsNullOrEmpty(TopUserIdMakerCode))
             {
-                condition += " and TopUserId in (select TopUserId from UsersForMakerCode where MakerCode='" + TopUserIdMakerCode + "')";
+                condition += " and TopUserId in (select TopUserId from UserForMakerCode where MakerCode='" + TopUserIdMakerCode + "')";
             }
             //顶级创客真实姓名
             if (!string.IsNullOrEmpty(TopUserIdRealName))
             {
-                condition += " and TopUserId in (select TopUserId from UsersForRealName where RealName='" + TopUserIdRealName + "')";
+                condition += " and TopUserId in (select TopUserId from UserForRealName where RealName='" + TopUserIdRealName + "')";
             }
             //组队状态
             if (!string.IsNullOrEmpty(TeamStatusSelect))
@@ -439,12 +439,12 @@ namespace MySystem.Areas.Admin.Controllers
             //队长创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
-                condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
+                condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
             }
             //队长真实姓名
             if (!string.IsNullOrEmpty(UserIdRealName))
             {
-                condition += " and UserId in (select UserId from UsersForRealName where RealName='" + UserIdRealName + "')";
+                condition += " and UserId in (select UserId from UserForRealName where RealName='" + UserIdRealName + "')";
             }
             //审核结果
             if (!string.IsNullOrEmpty(AuditResultSelect))
@@ -459,12 +459,12 @@ namespace MySystem.Areas.Admin.Controllers
             //顶级创客编号
             if (!string.IsNullOrEmpty(TopUserIdMakerCode))
             {
-                condition += " and TopUserId in (select TopUserId from UsersForMakerCode where MakerCode='" + TopUserIdMakerCode + "')";
+                condition += " and TopUserId in (select TopUserId from UserForMakerCode where MakerCode='" + TopUserIdMakerCode + "')";
             }
             //顶级创客真实姓名
             if (!string.IsNullOrEmpty(TopUserIdRealName))
             {
-                condition += " and TopUserId in (select TopUserId from UsersForRealName where RealName='" + TopUserIdRealName + "')";
+                condition += " and TopUserId in (select TopUserId from UserForRealName where RealName='" + TopUserIdRealName + "')";
             }
             //组队状态
             if (!string.IsNullOrEmpty(TeamStatusSelect))

Areas/Admin/Controllers/MainServer/TeamDayTopController.cs

@@ -67,7 +67,7 @@ namespace MySystem.Areas.Admin.Controllers
             //顶级创客真实姓名
             if (!string.IsNullOrEmpty(TopUserIdRealName))
             {
-                condition += " and TopUserId in (select TopUserId from UsersForRealName where RealName='" + TopUserIdRealName + "')";
+                condition += " and TopUserId in (select TopUserId from UserForRealName where RealName='" + TopUserIdRealName + "')";
             }
             //队伍队伍编码
             if (!string.IsNullOrEmpty(TeamIdTeamNo))
@@ -87,7 +87,7 @@ namespace MySystem.Areas.Admin.Controllers
             //团队长创客真实姓名
             if (!string.IsNullOrEmpty(TeamUserIdRealName))
             {
-                condition += " and TeamUserId in (select TeamUserId from UsersForRealName where RealName='" + TeamUserIdRealName + "')";
+                condition += " and TeamUserId in (select TeamUserId from UserForRealName where RealName='" + TeamUserIdRealName + "')";
             }
 
 
@@ -335,7 +335,7 @@ namespace MySystem.Areas.Admin.Controllers
             //顶级创客真实姓名
             if (!string.IsNullOrEmpty(TopUserIdRealName))
             {
-                condition += " and TopUserId in (select TopUserId from UsersForRealName where RealName='" + TopUserIdRealName + "')";
+                condition += " and TopUserId in (select TopUserId from UserForRealName where RealName='" + TopUserIdRealName + "')";
             }
             //队伍队伍编码
             if (!string.IsNullOrEmpty(TeamIdTeamNo))
@@ -355,7 +355,7 @@ namespace MySystem.Areas.Admin.Controllers
             //团队长创客真实姓名
             if (!string.IsNullOrEmpty(TeamUserIdRealName))
             {
-                condition += " and TeamUserId in (select TeamUserId from UsersForRealName where RealName='" + TeamUserIdRealName + "')";
+                condition += " and TeamUserId in (select TeamUserId from UserForRealName where RealName='" + TeamUserIdRealName + "')";
             }
 
 

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

@@ -45,7 +45,7 @@
         <div class="layui-card">
             <div class="layui-form layui-card-header layuiadmin-card-header-auto">
                 <div class="layui-form-item">
-                    <div class="layui-inline">
+                    @* <div class="layui-inline">
                         <label class="layui-form-label">仓库名称</label>
                         <div class="layui-input-inline">
                             <input class="layui-input" type="text" name="StoreIdStoreName" autocomplete="off">
@@ -56,7 +56,7 @@
                         <div class="layui-input-inline">
                             <input class="layui-input" type="text" name="StoreIdStoreNo" autocomplete="off">
                         </div>
-                    </div>
+                    </div> *@
                     <div class="layui-inline">
                         <label class="layui-form-label">创建时间</label>
                         <div class="layui-input-inline">
@@ -95,7 +95,7 @@
                             <input class="layui-input" type="text" name="ToUserIdRealName" autocomplete="off">
                         </div>
                     </div>
-                    <div class="layui-inline">
+                    @* <div class="layui-inline">
                         <label class="layui-form-label">收货仓库编号</label>
                         <div class="layui-input-inline">
                             <input class="layui-input" type="text" name="ToStoreIdStoreNo" autocomplete="off">
@@ -106,7 +106,7 @@
                         <div class="layui-input-inline">
                             <input class="layui-input" type="text" name="ToStoreIdStoreName" autocomplete="off">
                         </div>
-                    </div>
+                    </div> *@
                     @* <div class="layui-inline">
                         <label class="layui-form-label">源仓库编号</label>
                         <div class="layui-input-inline">

Areas/Admin/Views/MainServer/PreSendStockDetail/Indexs.cshtml

@@ -45,7 +45,7 @@
         <div class="layui-card">
             <div class="layui-form layui-card-header layuiadmin-card-header-auto">
                 <div class="layui-form-item">
-                    <div class="layui-inline">
+                    @* <div class="layui-inline">
                         <label class="layui-form-label">仓库名称</label>
                         <div class="layui-input-inline">
                             <input class="layui-input" type="text" name="StoreIdStoreName" autocomplete="off">
@@ -56,7 +56,7 @@
                         <div class="layui-input-inline">
                             <input class="layui-input" type="text" name="StoreIdStoreNo" autocomplete="off">
                         </div>
-                    </div>
+                    </div> *@
                     <div class="layui-inline">
                         <label class="layui-form-label">创建时间</label>
                         <div class="layui-input-inline">
@@ -95,7 +95,7 @@
                             <input class="layui-input" type="text" name="ToUserIdRealName" autocomplete="off">
                         </div>
                     </div>
-                    <div class="layui-inline">
+                    @* <div class="layui-inline">
                         <label class="layui-form-label">收货仓库编号</label>
                         <div class="layui-input-inline">
                             <input class="layui-input" type="text" name="ToStoreIdStoreNo" autocomplete="off">
@@ -106,7 +106,7 @@
                         <div class="layui-input-inline">
                             <input class="layui-input" type="text" name="ToStoreIdStoreName" autocomplete="off">
                         </div>
-                    </div>
+                    </div> *@
                     @* <div class="layui-inline">
                         <label class="layui-form-label">源仓库编号</label>
                         <div class="layui-input-inline">

Areas/Admin/Views/MainServer/StoreHouseAmountRecord/Indexs.cshtml

@@ -115,11 +115,6 @@
     </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">

wwwroot/layuiadmin/modules_main/PreSendStockDetail_Admin.js

@@ -119,16 +119,16 @@ layui.config({
         , cols: [[
             { type: 'checkbox', fixed: 'left' }
             , { field: 'Id', fixed: 'left', title: 'ID', width: 80, sort: true, unresize: true }
-            , { field: 'StoreIdStoreName', width: 200, title: '仓库名称', sort: true }
-            , { field: 'StoreIdStoreNo', width: 200, title: '仓库编号', sort: true }
+            // , { field: 'StoreIdStoreName', width: 200, title: '仓库名称', sort: true }
+            // , { field: 'StoreIdStoreNo', width: 200, title: '仓库编号', sort: true }
             , { field: 'CreateDate', width: 200, title: '创建时间', sort: true }
             , { field: 'BrandId', width: 200, title: '产品类型', sort: true }
             , { field: 'SnNo', width: 200, title: 'SN编号', sort: true }
-            , { field: 'SnId', width: 200, title: 'SNID', sort: true }
+            // , { field: 'SnId', width: 200, title: 'SNID', sort: true }
             , { field: 'ToUserIdMakerCode', width: 200, title: '收货人创客编号', sort: true }
             , { field: 'ToUserIdRealName', width: 200, title: '收货人真实姓名', sort: true }
-            , { field: 'ToStoreIdStoreNo', width: 200, title: '收货仓库编号', sort: true }
-            , { field: 'ToStoreIdStoreName', width: 200, title: '收货仓库名称', sort: true }
+            // , { field: 'ToStoreIdStoreNo', width: 200, title: '收货仓库编号', sort: true }
+            // , { field: 'ToStoreIdStoreName', width: 200, title: '收货仓库名称', sort: true }
             // , { field: 'SourceStoreIdStoreNo', width: 200, title: '源仓库编号', sort: true }
             // , { field: 'SourceStoreIdStoreName', width: 200, title: '源仓库名称', sort: true }
             , { field: 'ApplyFlagName', width: 200, title: '申请标记', sort: true }

wwwroot/layuiadmin/modules_main/PreSendStockDetails_Admin.js

@@ -119,16 +119,16 @@ layui.config({
         , cols: [[
             { type: 'checkbox', fixed: 'left' }
             , { field: 'Id', fixed: 'left', title: 'ID', width: 80, sort: true, unresize: true }
-            , { field: 'StoreIdStoreName', width: 200, title: '仓库名称', sort: true }
-            , { field: 'StoreIdStoreNo', width: 200, title: '仓库编号', sort: true }
+            // , { field: 'StoreIdStoreName', width: 200, title: '仓库名称', sort: true }
+            // , { field: 'StoreIdStoreNo', width: 200, title: '仓库编号', sort: true }
             , { field: 'CreateDate', width: 200, title: '创建时间', sort: true }
             , { field: 'BrandId', width: 200, title: '产品类型', sort: true }
             , { field: 'SnNo', width: 200, title: 'SN编号', sort: true }
-            , { field: 'SnId', width: 200, title: 'SNID', sort: true }
+            // , { field: 'SnId', width: 200, title: 'SNID', sort: true }
             , { field: 'ToUserIdMakerCode', width: 200, title: '收货人创客编号', sort: true }
             , { field: 'ToUserIdRealName', width: 200, title: '收货人真实姓名', sort: true }
-            , { field: 'ToStoreIdStoreNo', width: 200, title: '收货仓库编号', sort: true }
-            , { field: 'ToStoreIdStoreName', width: 200, title: '收货仓库名称', sort: true }
+            // , { field: 'ToStoreIdStoreNo', width: 200, title: '收货仓库编号', sort: true }
+            // , { field: 'ToStoreIdStoreName', width: 200, title: '收货仓库名称', sort: true }
             // , { field: 'SourceStoreIdStoreNo', width: 200, title: '源仓库编号', sort: true }
             // , { field: 'SourceStoreIdStoreName', width: 200, title: '源仓库名称', sort: true }
             , { field: 'ApplyFlagName', width: 200, title: '申请标记', sort: true }

wwwroot/layuiadmin/modules_main/StoreHouseCardAmountRecord_Admin.js

@@ -2,12 +2,17 @@ var ExcelData, ExcelKind;
 function ConfirmImport() {
     $.ajax({
         type: "POST",
-        url: "/Admin/StoreHouseAmountRecord/Import?r=" + Math.random(1),
+        url: "/Admin/StoreHouseAmountRecord/Imports?r=" + Math.random(1),
         data: "ExcelData=" + encodeURIComponent(JSON.stringify(ExcelData)),
         dataType: "text",
         success: function (data) {
             if (data == "success") {
-                layer.msg("导入成功", { time: 2000 }, function () {
+                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 {