Merge branch 'DuGuYang' into develop

AppStart/RelationClassForConst.cs

@@ -162,6 +162,12 @@ namespace MySystem
                 case 7:
                     result = "系统扣减";
                     break;
+                case 114:
+                    result = "私董会分红";
+                    break;
+                case 115:
+                    result = "分仓奖励";
+                    break;
             }
             return result;
         }

Areas/Admin/Controllers/MainServer/HelpProfitExchangeController.cs

@@ -57,7 +57,7 @@ namespace MySystem.Areas.Admin.Controllers
             Dictionary<string, string> Fields = new Dictionary<string, string>();
 
             string condition = " and Status>-1";
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -304,7 +304,7 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -334,7 +334,7 @@ namespace MySystem.Areas.Admin.Controllers
             result.Add("Info", "Excel报表-" + DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss") + ".xlsx");
             result.Add("Obj", diclist);
             Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
-            ReturnFields.Add("UserIdMakerCode", "创客创客编号");
+            ReturnFields.Add("UserIdMakerCode", "创客编号");
             ReturnFields.Add("UserIdRealName", "创客真实姓名");
             ReturnFields.Add("ExchangeCount", "兑换数量");
 

Areas/Admin/Controllers/MainServer/HelpProfitExchangeDetailController.cs

@@ -57,7 +57,7 @@ namespace MySystem.Areas.Admin.Controllers
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
             string condition = " and Status>-1";
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -316,7 +316,7 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -353,7 +353,7 @@ namespace MySystem.Areas.Admin.Controllers
             result.Add("Info", "Excel报表-" + DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss") + ".xlsx");
             result.Add("Obj", diclist);
             Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
-            ReturnFields.Add("UserIdMakerCode", "创客创客编号");
+            ReturnFields.Add("UserIdMakerCode", "创客编号");
             ReturnFields.Add("UserIdRealName", "创客真实姓名");
             ReturnFields.Add("PosCouponId", "券码");
             ReturnFields.Add("ExchangeCode", "兑换券码");

Areas/Admin/Controllers/MainServer/HelpProfitMerchantForUserController.cs

@@ -60,7 +60,7 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -301,7 +301,7 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -336,7 +336,7 @@ namespace MySystem.Areas.Admin.Controllers
             result.Add("Info", "Excel报表-" + DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss") + ".xlsx");
             result.Add("Obj", diclist);
             Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
-            ReturnFields.Add("UserIdMakerCode", "创客创客编号");
+            ReturnFields.Add("UserIdMakerCode", "创客编号");
             ReturnFields.Add("UserIdRealName", "创客真实姓名");
             ReturnFields.Add("MerchantId", "商户");
             ReturnFields.Add("MerNo", "商户编号");

Areas/Admin/Controllers/MainServer/HelpProfitRewardController.cs

@@ -352,7 +352,7 @@ namespace MySystem.Areas.Admin.Controllers
             result.Add("Obj", diclist);
             Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
             ReturnFields.Add("TradeDate", "达标日期");
-            ReturnFields.Add("UserIdMakerCode", "创客创客编号");
+            ReturnFields.Add("UserIdMakerCode", "创客编号");
             ReturnFields.Add("UserIdRealName", "创客真实姓名");
             ReturnFields.Add("BrandId", "品牌");
             ReturnFields.Add("RewardType", "奖励类型");

Areas/Admin/Controllers/MainServer/MachineChangeController.cs

@@ -66,7 +66,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and UserId in (select UserId from UsersForRealName where RealName='" + UserIdRealName + "')";
             }
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -81,12 +81,12 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and AuditResult=" + AuditResultSelect;
             }
-            //退回仓库仓库名称
+            //退回仓库名称
             if (!string.IsNullOrEmpty(BackStoreIdStoreName))
             {
                 condition += " and BackStoreId in (select BackStoreId from StoreHouseForStoreName where StoreName='" + BackStoreIdStoreName + "')";
             }
-            //退回仓库仓库编号
+            //退回仓库编号
             if (!string.IsNullOrEmpty(BackStoreIdStoreNo))
             {
                 condition += " and BackStoreId in (select BackStoreId from StoreHouseForStoreNo where StoreNo='" + BackStoreIdStoreNo + "')";
@@ -106,12 +106,12 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and OutProductType=" + OutProductTypeSelect;
             }
-            //出库仓库仓库名称
+            //出库仓库名称
             if (!string.IsNullOrEmpty(OutStoreIdStoreName))
             {
                 condition += " and OutStoreId in (select OutStoreId from StoreHouseForStoreName where StoreName='" + OutStoreIdStoreName + "')";
             }
-            //出库仓库仓库编号
+            //出库仓库编号
             if (!string.IsNullOrEmpty(OutStoreIdStoreNo))
             {
                 condition += " and OutStoreId in (select OutStoreId from StoreHouseForStoreNo where StoreNo='" + OutStoreIdStoreNo + "')";
@@ -387,7 +387,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and UserId in (select UserId from UsersForRealName where RealName='" + UserIdRealName + "')";
             }
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -402,12 +402,12 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and AuditResult=" + AuditResultSelect;
             }
-            //退回仓库仓库名称
+            //退回仓库名称
             if (!string.IsNullOrEmpty(BackStoreIdStoreName))
             {
                 condition += " and BackStoreId in (select BackStoreId from StoreHouseForStoreName where StoreName='" + BackStoreIdStoreName + "')";
             }
-            //退回仓库仓库编号
+            //退回仓库编号
             if (!string.IsNullOrEmpty(BackStoreIdStoreNo))
             {
                 condition += " and BackStoreId in (select BackStoreId from StoreHouseForStoreNo where StoreNo='" + BackStoreIdStoreNo + "')";
@@ -427,12 +427,12 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and OutProductType=" + OutProductTypeSelect;
             }
-            //出库仓库仓库名称
+            //出库仓库名称
             if (!string.IsNullOrEmpty(OutStoreIdStoreName))
             {
                 condition += " and OutStoreId in (select OutStoreId from StoreHouseForStoreName where StoreName='" + OutStoreIdStoreName + "')";
             }
-            //出库仓库仓库编号
+            //出库仓库编号
             if (!string.IsNullOrEmpty(OutStoreIdStoreNo))
             {
                 condition += " and OutStoreId in (select OutStoreId from StoreHouseForStoreNo where StoreNo='" + OutStoreIdStoreNo + "')";
@@ -486,7 +486,7 @@ namespace MySystem.Areas.Admin.Controllers
             Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
             ReturnFields.Add("ChangeNo", "转换单号");
             ReturnFields.Add("UserIdRealName", "创客真实姓名");
-            ReturnFields.Add("UserIdMakerCode", "创客创客编号");
+            ReturnFields.Add("UserIdMakerCode", "创客编号");
             ReturnFields.Add("BackProductType", "退回产品类型");
             ReturnFields.Add("ChangeDeviceNum", "转换机具数量");
             ReturnFields.Add("ChangeTime", "转换时间");
@@ -494,14 +494,14 @@ namespace MySystem.Areas.Admin.Controllers
             ReturnFields.Add("AuditResult", "审核结果");
             ReturnFields.Add("AuditRemark", "审核备注");
             ReturnFields.Add("ChangeSnExpand", "转换机器SN来源");
-            ReturnFields.Add("BackStoreIdStoreName", "退回仓库仓库名称");
-            ReturnFields.Add("BackStoreIdStoreNo", "退回仓库仓库编号");
+            ReturnFields.Add("BackStoreIdStoreName", "退回仓库名称");
+            ReturnFields.Add("BackStoreIdStoreNo", "退回仓库编号");
             ReturnFields.Add("Remark", "订单备注");
             ReturnFields.Add("BackStoreUserIdMakerCode", "退回仓库归属人创客编号");
             ReturnFields.Add("BackStoreUserIdRealName", "退回仓库归属人真实姓名");
             ReturnFields.Add("OutProductType", "出库产品类型");
-            ReturnFields.Add("OutStoreIdStoreName", "出库仓库仓库名称");
-            ReturnFields.Add("OutStoreIdStoreNo", "出库仓库仓库编号");
+            ReturnFields.Add("OutStoreIdStoreName", "出库仓库名称");
+            ReturnFields.Add("OutStoreIdStoreNo", "出库仓库编号");
             ReturnFields.Add("OutStoreManagerMobile", "出库仓库联系人手机号");
 
             result.Add("Fields", ReturnFields);

Areas/Admin/Controllers/MainServer/MachineUnBindController.cs

@@ -386,7 +386,7 @@ namespace MySystem.Areas.Admin.Controllers
             Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
             ReturnFields.Add("ApplyNo", "解绑申请单号");
             ReturnFields.Add("UserIdRealName", "创客真实姓名");
-            ReturnFields.Add("UserIdMakerCode", "创客创客编号");
+            ReturnFields.Add("UserIdMakerCode", "创客编号");
             ReturnFields.Add("UserIdMobile", "创客手机号");
             ReturnFields.Add("BrandId", "机具产品类型");
             ReturnFields.Add("SnNo", "机具SN");

Areas/Admin/Controllers/MainServer/MerchantDepositReturnsController.cs

@@ -81,7 +81,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and UserId in (select UserId from UserForRealName where RealName='" + UserIdRealName + "')";
             }
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -342,7 +342,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and UserId in (select UserId from UsersForRealName where RealName='" + UserIdRealName + "')";
             }
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -382,7 +382,7 @@ namespace MySystem.Areas.Admin.Controllers
             ReturnFields.Add("ReturnAmount", "返还金额");
             ReturnFields.Add("OperateMan", "操作人");
             ReturnFields.Add("UserIdRealName", "创客真实姓名");
-            ReturnFields.Add("UserIdMakerCode", "创客创客编号");
+            ReturnFields.Add("UserIdMakerCode", "创客编号");
 
             result.Add("Fields", ReturnFields);
             AddSysLog("0", "MerchantDepositReturns", "ExportExcel");

Areas/Admin/Controllers/MainServer/OrdersController.cs

@@ -123,7 +123,7 @@ namespace MySystem.Areas.Admin.Controllers
                 condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
             }
 
-            //仓库归属创客创客编号
+            //仓库归属创客编号
             if (!string.IsNullOrEmpty(StoreUserIdMakerCode))
             {
                 condition += " and StoreUserId in (select StoreUserId from UserForMakerCode where MakerCode='" + StoreUserIdMakerCode + "')";
@@ -295,7 +295,7 @@ namespace MySystem.Areas.Admin.Controllers
         public JsonResult IndexDatas(string UserIdMakerCode, string UserIdRealName, string PayModeSelect, string StoreIdStoreNo, string StoreIdStoreName, string RefundStatusSelect, string DeliveryTypeSelect, string SendStatusSelect, string ProductIdSelect, string StoreTypeSelect, string StoreUserIdMakerCode, string StoreUserIdRealName, string PayStatusSelect, int page = 1, int limit = 30)
         {
             string condition = " and Status>-1";
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -310,12 +310,12 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and PayMode=" + PayModeSelect;
             }
-            //仓库仓库编号
+            //仓库编号
             if (!string.IsNullOrEmpty(StoreIdStoreNo))
             {
                 condition += " and StoreId in (select StoreId from StoreForCode where Code='" + StoreIdStoreNo + "')";
             }
-            //仓库仓库名称
+            //仓库名称
             if (!string.IsNullOrEmpty(StoreIdStoreName))
             {
                 condition += " and StoreId in (select StoreId from StoreForName where Name='" + StoreIdStoreName + "')";
@@ -345,7 +345,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and StoreType=" + StoreTypeSelect;
             }
-            //仓库归属创客创客编号
+            //仓库归属创客编号
             if (!string.IsNullOrEmpty(StoreUserIdMakerCode))
             {
                 condition += " and StoreUserId in (select StoreUserId from UserForMakerCode where MakerCode='" + StoreUserIdMakerCode + "')";
@@ -777,7 +777,7 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("TopUserId", "0");
 
             string condition = " and Status>-1";
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -792,12 +792,12 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and PayMode=" + PayModeSelect;
             }
-            //仓库仓库编号
+            //仓库编号
             if (!string.IsNullOrEmpty(StoreIdStoreNo))
             {
                 condition += " and StoreId in (select StoreId from StoreHouseForStoreNo where StoreNo='" + StoreIdStoreNo + "')";
             }
-            //仓库仓库名称
+            //仓库名称
             if (!string.IsNullOrEmpty(StoreIdStoreName))
             {
                 condition += " and StoreId in (select StoreId from StoreHouseForStoreName where StoreName='" + StoreIdStoreName + "')";
@@ -827,7 +827,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and StoreType=" + StoreTypeSelect;
             }
-            //仓库归属创客创客编号
+            //仓库归属创客编号
             if (!string.IsNullOrEmpty(StoreUserIdMakerCode))
             {
                 condition += " and StoreUserId in (select StoreUserId from UsersForMakerCode where MakerCode='" + StoreUserIdMakerCode + "')";
@@ -849,7 +849,7 @@ namespace MySystem.Areas.Admin.Controllers
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("Orders", Fields, "Id desc", "0", 1, 20000, condition, "UserId,OrderNo,RealName,Mobile,TotalPrice,Areas,Address,ErpName,ErpCode,SendDate,PayMode,TradeNo,StoreId,RefundStatus,DeliveryType,SendStatus,ProductId,StoreContact,StoreType,StoreUserId,TopUserId,PayStatus,BuyCount,Remark,Id", false);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
-            ReturnFields.Add("UserIdMakerCode", "创客创客编号");
+            ReturnFields.Add("UserIdMakerCode", "创客编号");
             ReturnFields.Add("UserIdRealName", "创客真实姓名");
             ReturnFields.Add("OrderNo", "订单号");
             ReturnFields.Add("RealName", "姓名");

Areas/Admin/Controllers/MainServer/PosCouponOrdersController.cs

@@ -60,7 +60,7 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //来源创客创客编号
+            //来源创客编号
             if (!string.IsNullOrEmpty(FromUserIdMakerCode))
             {
                 condition += " and FromUserId in (select UserId from UserForMakerCode where MakerCode='" + FromUserIdMakerCode + "')";
@@ -70,7 +70,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and FromUserId in (select UserId from UserForRealName where RealName='" + FromUserIdRealName + "')";
             }
-            //目标创客创客编号
+            //目标创客编号
             if (!string.IsNullOrEmpty(ToUserIdMakerCode))
             {
                 condition += " and ToUserId in (select UserId from UserForMakerCode where MakerCode='" + ToUserIdMakerCode + "')";
@@ -325,7 +325,7 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //来源创客创客编号
+            //来源创客编号
             if (!string.IsNullOrEmpty(FromUserIdMakerCode))
             {
                 condition += " and FromUserId in (select FromUserId from UserForMakerCode where MakerCode='" + FromUserIdMakerCode + "')";
@@ -335,7 +335,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and FromUserId in (select FromUserId from UserForRealName where RealName='" + FromUserIdRealName + "')";
             }
-            //目标创客创客编号
+            //目标创客编号
             if (!string.IsNullOrEmpty(ToUserIdMakerCode))
             {
                 condition += " and ToUserId in (select ToUserId from UserForMakerCode where MakerCode='" + ToUserIdMakerCode + "')";
@@ -376,9 +376,9 @@ namespace MySystem.Areas.Admin.Controllers
             result.Add("Info", "Excel报表-" + DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss") + ".xlsx");
             result.Add("Obj", diclist);
             Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
-            ReturnFields.Add("FromUserIdMakerCode", "来源创客创客编号");
+            ReturnFields.Add("FromUserIdMakerCode", "来源创客编号");
             ReturnFields.Add("FromUserIdRealName", "来源创客真实姓名");
-            ReturnFields.Add("ToUserIdMakerCode", "目标创客创客编号");
+            ReturnFields.Add("ToUserIdMakerCode", "目标创客编号");
             ReturnFields.Add("ToUserIdRealName", "目标创客真实姓名");
             ReturnFields.Add("OrderNo", "单号");
             ReturnFields.Add("BeforeStock", "变更前机具券库存");

Areas/Admin/Controllers/MainServer/PosCouponRecordController.cs

@@ -66,7 +66,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and PosCouponId=" + PosCouponIdSelect;
             }
-            //来源创客创客编号
+            //来源创客编号
             if (!string.IsNullOrEmpty(FromUserIdMakerCode))
             {
                 condition += " and FromUserId in (select FromUserId from UserForMakerCode where MakerCode='" + FromUserIdMakerCode + "')";
@@ -76,7 +76,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and FromUserId in (select FromUserId from UserForRealName where RealName='" + FromUserIdRealName + "')";
             }
-            //目标创客创客编号
+            //目标创客编号
             if (!string.IsNullOrEmpty(ToUserIdMakerCode))
             {
                 condition += " and ToUserId in (select ToUserId from UserForMakerCode where MakerCode='" + ToUserIdMakerCode + "')";
@@ -335,7 +335,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and PosCouponId=" + PosCouponIdSelect;
             }
-            //来源创客创客编号
+            //来源创客编号
             if (!string.IsNullOrEmpty(FromUserIdMakerCode))
             {
                 condition += " and FromUserId in (select FromUserId from UserForMakerCode where MakerCode='" + FromUserIdMakerCode + "')";
@@ -345,7 +345,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and FromUserId in (select FromUserId from UserForRealName where RealName='" + FromUserIdRealName + "')";
             }
-            //目标创客创客编号
+            //目标创客编号
             if (!string.IsNullOrEmpty(ToUserIdMakerCode))
             {
                 condition += " and ToUserId in (select ToUserId from UserForMakerCode where MakerCode='" + ToUserIdMakerCode + "')";
@@ -389,9 +389,9 @@ namespace MySystem.Areas.Admin.Controllers
             result.Add("Obj", diclist);
             Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
             ReturnFields.Add("PosCouponId", "机具券Id");
-            ReturnFields.Add("FromUserIdMakerCode", "来源创客创客编号");
+            ReturnFields.Add("FromUserIdMakerCode", "来源创客编号");
             ReturnFields.Add("FromUserIdRealName", "来源创客真实姓名");
-            ReturnFields.Add("ToUserIdMakerCode", "目标创客创客编号");
+            ReturnFields.Add("ToUserIdMakerCode", "目标创客编号");
             ReturnFields.Add("ToUserIdRealName", "目标创客真实姓名");
             ReturnFields.Add("OrderNo", "单号");
             ReturnFields.Add("ChangeKind", "变更类型");

Areas/Admin/Controllers/MainServer/PosCouponsController.cs

@@ -451,7 +451,7 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //来源创客创客编号
+            //来源创客编号
             if (!string.IsNullOrEmpty(FromUserIdMakerCode))
             {
                 condition += " and FromUserId in (select FromUserId from UserForMakerCode where MakerCode='" + FromUserIdMakerCode + "')";
@@ -461,7 +461,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and FromUserId in (select FromUserId from UserForRealName where RealName='" + FromUserIdRealName + "')";
             }
-            //目标创客创客编号
+            //目标创客编号
             if (!string.IsNullOrEmpty(ToUserIdMakerCode))
             {
                 condition += " and ToUserId in (select ToUserId from UserForMakerCode where MakerCode='" + ToUserIdMakerCode + "')";
@@ -502,9 +502,9 @@ namespace MySystem.Areas.Admin.Controllers
             result.Add("Info", "Excel报表-" + DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss") + ".xlsx");
             result.Add("Obj", diclist);
             Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
-            ReturnFields.Add("FromUserIdMakerCode", "来源创客创客编号");
+            ReturnFields.Add("FromUserIdMakerCode", "来源创客编号");
             ReturnFields.Add("FromUserIdRealName", "来源创客真实姓名");
-            ReturnFields.Add("ToUserIdMakerCode", "目标创客创客编号");
+            ReturnFields.Add("ToUserIdMakerCode", "目标创客编号");
             ReturnFields.Add("ToUserIdRealName", "目标创客真实姓名");
             ReturnFields.Add("OrderNo", "单号");
             ReturnFields.Add("BeforeStock", "变更前机具券库存");

Areas/Admin/Controllers/MainServer/PosMachinesController.cs

@@ -70,7 +70,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and ActivationState=" + ActivationStateSelect;
             }
-            //所属创客创客编号
+            //所属创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -351,7 +351,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and ActivationState=" + ActivationStateSelect;
             }
-            //所属创客创客编号
+            //所属创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";

Areas/Admin/Controllers/MainServer/PosMachinesFeeChangeRecordController.cs

@@ -63,7 +63,7 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status >=-1";
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -465,7 +465,7 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1 and Sort = " + data.Sort + "";
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -520,7 +520,7 @@ namespace MySystem.Areas.Admin.Controllers
             result.Add("Info", "Excel报表-" + DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss") + ".xlsx");
             result.Add("Obj", diclist);
             Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
-            // ReturnFields.Add("UserIdMakerCode", "创客创客编号");
+            // ReturnFields.Add("UserIdMakerCode", "创客编号");
             // ReturnFields.Add("UserIdRealName", "创客真实姓名");
             // ReturnFields.Add("ChangeFee", "调整费率");
             ReturnFields.Add("PosSn", "机具SN");

Areas/Admin/Controllers/MainServer/PosMachinesTwoChangeController.cs

@@ -821,7 +821,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and ActivationState=" + ActivationStateSelect;
             }
-            //所属创客创客编号
+            //所属创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";

Areas/Admin/Controllers/MainServer/PosMachinesTwoController.cs

@@ -559,7 +559,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and ActivationState=" + ActivationStateSelect;
             }
-            //所属创客创客编号
+            //所属创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";

Areas/Admin/Controllers/MainServer/PreSendStockDetailController.cs

@@ -64,12 +64,12 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //仓库仓库名称
+            //仓库名称
             if (!string.IsNullOrEmpty(StoreIdStoreName))
             {
                 condition += " and StoreId in (select StoreId from SmallStoreHouseForStoreName where StoreName='" + StoreIdStoreName + "')";
             }
-            //仓库仓库编号
+            //仓库编号
             if (!string.IsNullOrEmpty(StoreIdStoreNo))
             {
                 condition += " and StoreId in (select StoreId from SmallStoreHouseForStoreNo where StoreNo='" + StoreIdStoreNo + "')";
@@ -89,12 +89,12 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and ToUserId in (select ToUserId from UsersForRealName where RealName='" + ToUserIdRealName + "')";
             }
-            //收货仓库仓库编号
+            //收货仓库编号
             if (!string.IsNullOrEmpty(ToStoreIdStoreNo))
             {
                 condition += " and ToStoreId in (select ToStoreId from StoreHouseForStoreNo where StoreNo='" + ToStoreIdStoreNo + "')";
             }
-            //收货仓库仓库名称
+            //收货仓库名称
             if (!string.IsNullOrEmpty(ToStoreIdStoreName))
             {
                 condition += " and ToStoreId in (select ToStoreId from StoreHouseForStoreName where StoreName='" + ToStoreIdStoreName + "')";
@@ -109,7 +109,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and SourceStoreId in (select SourceStoreId from StoreHouseForStoreName where StoreName='" + SourceStoreIdStoreName + "')";
             }
-            //出货创客创客编号
+            //出货创客编号
             if (!string.IsNullOrEmpty(FromUserIdMakerCode))
             {
                 condition += " and FromUserId in (select FromUserId from UsersForMakerCode where MakerCode='" + FromUserIdMakerCode + "')";
@@ -119,12 +119,12 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and FromUserId in (select FromUserId from UsersForRealName where RealName='" + FromUserIdRealName + "')";
             }
-            //出货仓库仓库编号
+            //出货仓库编号
             if (!string.IsNullOrEmpty(FromStoreIdStoreNo))
             {
                 condition += " and FromStoreId in (select FromStoreId from StoreHouseForStoreNo where StoreNo='" + FromStoreIdStoreNo + "')";
             }
-            //出货仓库仓库名称
+            //出货仓库名称
             if (!string.IsNullOrEmpty(FromStoreIdStoreName))
             {
                 condition += " and FromStoreId in (select FromStoreId from StoreHouseForStoreName where StoreName='" + FromStoreIdStoreName + "')";
@@ -421,12 +421,12 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //仓库仓库名称
+            //仓库名称
             if (!string.IsNullOrEmpty(StoreIdStoreName))
             {
                 condition += " and StoreId in (select StoreId from SmallStoreHouseForStoreName where StoreName='" + StoreIdStoreName + "')";
             }
-            //仓库仓库编号
+            //仓库编号
             if (!string.IsNullOrEmpty(StoreIdStoreNo))
             {
                 condition += " and StoreId in (select StoreId from SmallStoreHouseForStoreNo where StoreNo='" + StoreIdStoreNo + "')";
@@ -446,12 +446,12 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and ToUserId in (select ToUserId from UsersForRealName where RealName='" + ToUserIdRealName + "')";
             }
-            //收货仓库仓库编号
+            //收货仓库编号
             if (!string.IsNullOrEmpty(ToStoreIdStoreNo))
             {
                 condition += " and ToStoreId in (select ToStoreId from StoreHouseForStoreNo where StoreNo='" + ToStoreIdStoreNo + "')";
             }
-            //收货仓库仓库名称
+            //收货仓库名称
             if (!string.IsNullOrEmpty(ToStoreIdStoreName))
             {
                 condition += " and ToStoreId in (select ToStoreId from StoreHouseForStoreName where StoreName='" + ToStoreIdStoreName + "')";
@@ -466,7 +466,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and SourceStoreId in (select SourceStoreId from StoreHouseForStoreName where StoreName='" + SourceStoreIdStoreName + "')";
             }
-            //出货创客创客编号
+            //出货创客编号
             if (!string.IsNullOrEmpty(FromUserIdMakerCode))
             {
                 condition += " and FromUserId in (select FromUserId from UsersForMakerCode where MakerCode='" + FromUserIdMakerCode + "')";
@@ -476,12 +476,12 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and FromUserId in (select FromUserId from UsersForRealName where RealName='" + FromUserIdRealName + "')";
             }
-            //出货仓库仓库编号
+            //出货仓库编号
             if (!string.IsNullOrEmpty(FromStoreIdStoreNo))
             {
                 condition += " and FromStoreId in (select FromStoreId from StoreHouseForStoreNo where StoreNo='" + FromStoreIdStoreNo + "')";
             }
-            //出货仓库仓库名称
+            //出货仓库名称
             if (!string.IsNullOrEmpty(FromStoreIdStoreName))
             {
                 condition += " and FromStoreId in (select FromStoreId from StoreHouseForStoreName where StoreName='" + FromStoreIdStoreName + "')";
@@ -542,23 +542,23 @@ namespace MySystem.Areas.Admin.Controllers
             result.Add("Info", "Excel报表-" + DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss") + ".xlsx");
             result.Add("Obj", diclist);
             Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
-            ReturnFields.Add("StoreIdStoreName", "仓库仓库名称");
-            ReturnFields.Add("StoreIdStoreNo", "仓库仓库编号");
+            ReturnFields.Add("StoreIdStoreName", "仓库名称");
+            ReturnFields.Add("StoreIdStoreNo", "仓库编号");
             ReturnFields.Add("BrandId", "产品类型");
             ReturnFields.Add("SnNo", "SN编号");
             ReturnFields.Add("SnId", "SNID");
             ReturnFields.Add("ToUserIdMakerCode", "收货人创客编号");
             ReturnFields.Add("ToUserIdRealName", "收货人真实姓名");
-            ReturnFields.Add("ToStoreIdStoreNo", "收货仓库仓库编号");
-            ReturnFields.Add("ToStoreIdStoreName", "收货仓库仓库名称");
+            ReturnFields.Add("ToStoreIdStoreNo", "收货仓库编号");
+            ReturnFields.Add("ToStoreIdStoreName", "收货仓库名称");
             ReturnFields.Add("SourceStoreIdStoreNo", "源仓库编号仓库编号");
             ReturnFields.Add("SourceStoreIdStoreName", "源仓库编号仓库名称");
             ReturnFields.Add("ApplyFlag", "申请标记");
             ReturnFields.Add("ApplyDate", "申请时间");
-            ReturnFields.Add("FromUserIdMakerCode", "出货创客创客编号");
+            ReturnFields.Add("FromUserIdMakerCode", "出货创客编号");
             ReturnFields.Add("FromUserIdRealName", "出货创客真实姓名");
-            ReturnFields.Add("FromStoreIdStoreNo", "出货仓库仓库编号");
-            ReturnFields.Add("FromStoreIdStoreName", "出货仓库仓库名称");
+            ReturnFields.Add("FromStoreIdStoreNo", "出货仓库编号");
+            ReturnFields.Add("FromStoreIdStoreName", "出货仓库名称");
             ReturnFields.Add("CancelFlag", "撤回标记");
             ReturnFields.Add("CancelDate", "撤回时间");
 

Areas/Admin/Controllers/MainServer/PullNewDetailController.cs

@@ -59,7 +59,7 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -324,7 +324,7 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";

Areas/Admin/Controllers/MainServer/PullnewSummaryController.cs

@@ -59,7 +59,7 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -308,7 +308,7 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";

Areas/Admin/Controllers/MainServer/SchoolSignInRecordController.cs

@@ -60,7 +60,7 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -298,7 +298,7 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -328,7 +328,7 @@ namespace MySystem.Areas.Admin.Controllers
             result.Add("Info", "Excel报表-" + DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss") + ".xlsx");
             result.Add("Obj", diclist);
             Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
-            ReturnFields.Add("UserIdMakerCode", "创客创客编号");
+            ReturnFields.Add("UserIdMakerCode", "创客编号");
             ReturnFields.Add("UserIdRealName", "创客真实姓名");
 
             result.Add("Fields", ReturnFields);

Areas/Admin/Controllers/MainServer/SchoolSignInTaskRecordController.cs

@@ -60,7 +60,7 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -307,7 +307,7 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -344,7 +344,7 @@ namespace MySystem.Areas.Admin.Controllers
             result.Add("Info", "Excel报表-" + DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss") + ".xlsx");
             result.Add("Obj", diclist);
             Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
-            ReturnFields.Add("UserIdMakerCode", "创客创客编号");
+            ReturnFields.Add("UserIdMakerCode", "创客编号");
             ReturnFields.Add("UserIdRealName", "创客真实姓名");
             ReturnFields.Add("TaskId", "任务");
 

Areas/Admin/Controllers/MainServer/SmallStoreHouseController.cs

@@ -324,12 +324,12 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and UserId=" + UserIdSelect;
             }
-            //出货仓库仓库编号
+            //出货仓库编号
             if (!string.IsNullOrEmpty(FromStoreIdStoreNo))
             {
                 condition += " and FromStoreId in (select FromStoreId from StoreHouseForStoreNo where StoreNo='" + FromStoreIdStoreNo + "')";
             }
-            //出货仓库仓库名称
+            //出货仓库名称
             if (!string.IsNullOrEmpty(FromStoreIdStoreName))
             {
                 condition += " and FromStoreId in (select FromStoreId from StoreHouseForStoreName where StoreName='" + FromStoreIdStoreName + "')";
@@ -361,8 +361,8 @@ namespace MySystem.Areas.Admin.Controllers
             ReturnFields.Add("TotalNum", "总库存数");
             ReturnFields.Add("LaveNum", "剩余库存数");
             ReturnFields.Add("Mobile", "仓库归属人手机号");
-            ReturnFields.Add("FromStoreIdStoreNo", "出货仓库仓库编号");
-            ReturnFields.Add("FromStoreIdStoreName", "出货仓库仓库名称");
+            ReturnFields.Add("FromStoreIdStoreNo", "出货仓库编号");
+            ReturnFields.Add("FromStoreIdStoreName", "出货仓库名称");
 
             result.Add("Fields", ReturnFields);
             AddSysLog("0", "SmallStoreHouse", "ExportExcel");

Areas/Admin/Controllers/MainServer/StoreBalanceController.cs

@@ -60,12 +60,12 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //仓库仓库编号
+            //仓库编号
             if (!string.IsNullOrEmpty(StoreIdStoreNo))
             {
                 condition += " and StoreId in (select StoreId from StoreForCode where Code='" + StoreIdStoreNo + "')";
             }
-            //仓库仓库名称
+            //仓库名称
             if (!string.IsNullOrEmpty(StoreIdStoreName))
             {
                 condition += " and StoreId in (select StoreId from StoreForStoreName where Name='" + StoreIdStoreName + "')";
@@ -357,12 +357,12 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //仓库仓库编号
+            //仓库编号
             if (!string.IsNullOrEmpty(StoreIdStoreNo))
             {
                 condition += " and StoreId in (select StoreId from StoreForStoreNo where StoreNo='" + StoreIdStoreNo + "')";
             }
-            //仓库仓库名称
+            //仓库名称
             if (!string.IsNullOrEmpty(StoreIdStoreName))
             {
                 condition += " and StoreId in (select StoreId from StoreForStoreName where StoreName='" + StoreIdStoreName + "')";
@@ -409,8 +409,8 @@ namespace MySystem.Areas.Admin.Controllers
             result.Add("Info", "Excel报表-" + DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss") + ".xlsx");
             result.Add("Obj", diclist);
             Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
-            ReturnFields.Add("StoreIdStoreNo", "仓库仓库编号");
-            ReturnFields.Add("StoreIdStoreName", "仓库仓库名称");
+            ReturnFields.Add("StoreIdStoreNo", "仓库编号");
+            ReturnFields.Add("StoreIdStoreName", "仓库名称");
             ReturnFields.Add("TransRecordNo", "交易流水编号");
             ReturnFields.Add("TransType", "交易类型");
             ReturnFields.Add("BrandId", "产品类型");

Areas/Admin/Controllers/MainServer/StoreHouseAmountRecordController.cs

@@ -65,7 +65,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and UserId in (select UserId from UsersForRealName where RealName='" + UserIdRealName + "')";
             }
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -336,7 +336,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and UserId in (select UserId from UsersForRealName where RealName='" + UserIdRealName + "')";
             }
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -383,7 +383,7 @@ namespace MySystem.Areas.Admin.Controllers
             result.Add("Obj", diclist);
             Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
             ReturnFields.Add("UserIdRealName", "创客真实姓名");
-            ReturnFields.Add("UserIdMakerCode", "创客创客编号");
+            ReturnFields.Add("UserIdMakerCode", "创客编号");
             ReturnFields.Add("ApplyId", "申请单");
             ReturnFields.Add("UseAmount", "使用额度");
             ReturnFields.Add("BeforeAmount", "使用前剩余额度");

Areas/Admin/Controllers/MainServer/StoreMachineApplyController.cs

@@ -73,7 +73,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and UserId in (select UserId from UsersForRealName where RealName='" + UserIdRealName + "')";
             }
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -378,7 +378,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and UserId in (select UserId from UsersForRealName where RealName='" + UserIdRealName + "')";
             }
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -414,7 +414,7 @@ namespace MySystem.Areas.Admin.Controllers
             ReturnFields.Add("SendMode", "发货方式");
             ReturnFields.Add("ErpCode", "快递单号");
             ReturnFields.Add("UserIdRealName", "创客真实姓名");
-            ReturnFields.Add("UserIdMakerCode", "创客创客编号");
+            ReturnFields.Add("UserIdMakerCode", "创客编号");
 
             result.Add("Fields", ReturnFields);
             AddSysLog("0", "StoreMachineApply", "ExportExcel");

Areas/Admin/Controllers/MainServer/StoreSnActivateSummaryController.cs

@@ -57,12 +57,12 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //仓库仓库编号
+            //仓库编号
             if (!string.IsNullOrEmpty(StoreIdStoreNo))
             {
                 condition += " and StoreId in (select StoreId from StoreForCode where Code='" + StoreIdStoreNo + "')";
             }
-            //仓库仓库名称
+            //仓库名称
             if (!string.IsNullOrEmpty(StoreIdStoreName))
             {
                 condition += " and StoreId in (select StoreId from StoreForName where Name='" + StoreIdStoreName + "')";
@@ -330,12 +330,12 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //仓库仓库编号
+            //仓库编号
             if (!string.IsNullOrEmpty(StoreIdStoreNo))
             {
                 condition += " and StoreId in (select StoreId from StoreForCode where Code='" + StoreIdStoreNo + "')";
             }
-            //仓库仓库名称
+            //仓库名称
             if (!string.IsNullOrEmpty(StoreIdStoreName))
             {
                 condition += " and StoreId in (select StoreId from StoreForName where Name='" + StoreIdStoreName + "')";
@@ -385,8 +385,8 @@ namespace MySystem.Areas.Admin.Controllers
             Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
             ReturnFields.Add("TradeDate", "交易日");
             ReturnFields.Add("TradeMonth", "交易月");
-            ReturnFields.Add("StoreIdStoreNo", "仓库仓库编号");
-            ReturnFields.Add("StoreIdStoreName", "仓库仓库名称");
+            ReturnFields.Add("StoreIdStoreNo", "仓库编号");
+            ReturnFields.Add("StoreIdStoreName", "仓库名称");
             ReturnFields.Add("AgentStoreIdStoreNo", "代理分仓仓库编号");
             ReturnFields.Add("AgentStoreIdStoreName", "代理分仓仓库名称");
             ReturnFields.Add("BrandId", "产品类型");

Areas/Admin/Controllers/MainServer/TeamApplyController.cs

@@ -91,7 +91,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and NotifyFlag=" + NotifyFlagSelect;
             }
-            //顶级创客创客编号
+            //顶级创客编号
             if (!string.IsNullOrEmpty(TopUserIdMakerCode))
             {
                 condition += " and TopUserId in (select TopUserId from UsersForMakerCode where MakerCode='" + TopUserIdMakerCode + "')";
@@ -456,7 +456,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and NotifyFlag=" + NotifyFlagSelect;
             }
-            //顶级创客创客编号
+            //顶级创客编号
             if (!string.IsNullOrEmpty(TopUserIdMakerCode))
             {
                 condition += " and TopUserId in (select TopUserId from UsersForMakerCode where MakerCode='" + TopUserIdMakerCode + "')";
@@ -516,7 +516,7 @@ namespace MySystem.Areas.Admin.Controllers
             ReturnFields.Add("TeamName", "队伍名称");
             ReturnFields.Add("UserIdMakerCode", "队长创客编号");
             ReturnFields.Add("UserIdRealName", "队长真实姓名");
-            ReturnFields.Add("TopUserIdMakerCode", "顶级创客创客编号");
+            ReturnFields.Add("TopUserIdMakerCode", "顶级创客编号");
             ReturnFields.Add("TopUserIdRealName", "顶级创客真实姓名");
             ReturnFields.Add("Areas", "特训营所在地区");
             ReturnFields.Add("EffectStartDate", "活动开始时间");

Areas/Admin/Controllers/MainServer/TeamBlackListController.cs

@@ -60,7 +60,7 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -70,7 +70,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and UserId in (select UserId from UserForRealName where RealName='" + UserIdRealName + "')";
             }
-            //顶级创客创客编号
+            //顶级创客编号
             if (!string.IsNullOrEmpty(TopUserIdMakerCode))
             {
                 condition += " and TopUserId in (select TopUserId from UserForMakerCode where MakerCode='" + TopUserIdMakerCode + "')";
@@ -321,7 +321,7 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -331,7 +331,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and UserId in (select UserId from UserForRealName where RealName='" + UserIdRealName + "')";
             }
-            //顶级创客创客编号
+            //顶级创客编号
             if (!string.IsNullOrEmpty(TopUserIdMakerCode))
             {
                 condition += " and TopUserId in (select TopUserId from UserForMakerCode where MakerCode='" + TopUserIdMakerCode + "')";

Areas/Admin/Controllers/MainServer/TeamDayTopController.cs

@@ -59,7 +59,7 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //顶级创客创客编号
+            //顶级创客编号
             if (!string.IsNullOrEmpty(TopUserIdMakerCode))
             {
                 condition += " and TopUserId in (select TopUserId from UserForMakerCode where MakerCode='" + TopUserIdMakerCode + "')";
@@ -79,7 +79,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and TeamId in (select TeamId from TeamApplyForTeamName where TeamName='" + TeamIdTeamName + "')";
             }
-            //团队长创客创客编号
+            //团队长创客编号
             if (!string.IsNullOrEmpty(TeamUserIdMakerCode))
             {
                 condition += " and TeamUserId in (select TeamUserId from UserForMakerCode where MakerCode='" + TeamUserIdMakerCode + "')";
@@ -327,7 +327,7 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //顶级创客创客编号
+            //顶级创客编号
             if (!string.IsNullOrEmpty(TopUserIdMakerCode))
             {
                 condition += " and TopUserId in (select TopUserId from UserForMakerCode where MakerCode='" + TopUserIdMakerCode + "')";
@@ -347,7 +347,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and TeamId in (select TeamId from TeamApplyForTeamName where TeamName='" + TeamIdTeamName + "')";
             }
-            //团队长创客创客编号
+            //团队长创客编号
             if (!string.IsNullOrEmpty(TeamUserIdMakerCode))
             {
                 condition += " and TeamUserId in (select TeamUserId from UserForMakerCode where MakerCode='" + TeamUserIdMakerCode + "')";

Areas/Admin/Controllers/MainServer/TeamOfferApplyController.cs

@@ -78,7 +78,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and NotifyFlag=" + NotifyFlagSelect;
             }
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -108,7 +108,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and TeamLeader in (select TeamLeader from UserForRealName where RealName='" + TeamLeaderRealName + "')";
             }
-            //顶级创客创客编号
+            //顶级创客编号
             if (!string.IsNullOrEmpty(TopUserIdMakerCode))
             {
                 condition += " and TopUserId in (select TopUserId from UserForMakerCode where MakerCode='" + TopUserIdMakerCode + "')";
@@ -455,7 +455,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and NotifyFlag=" + NotifyFlagSelect;
             }
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -485,7 +485,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and TeamLeader in (select TeamLeader from UserForRealName where RealName='" + TeamLeaderRealName + "')";
             }
-            //顶级创客创客编号
+            //顶级创客编号
             if (!string.IsNullOrEmpty(TopUserIdMakerCode))
             {
                 condition += " and TopUserId in (select TopUserId from UserForMakerCode where MakerCode='" + TopUserIdMakerCode + "')";
@@ -570,7 +570,7 @@ namespace MySystem.Areas.Admin.Controllers
             ReturnFields.Add("TeamIdTeamName", "团队队伍名称");
             ReturnFields.Add("TeamLeaderMakerCode", "队长创客编号");
             ReturnFields.Add("TeamLeaderRealName", "队长真实姓名");
-            ReturnFields.Add("TopUserIdMakerCode", "顶级创客创客编号");
+            ReturnFields.Add("TopUserIdMakerCode", "顶级创客编号");
             ReturnFields.Add("TopUserIdRealName", "顶级创客真实姓名");
             ReturnFields.Add("Areas", "特训营所在地区");
             ReturnFields.Add("EffectStartDate", "活动开始时间");

Areas/Admin/Controllers/MainServer/TeamPersonDayTopController.cs

@@ -59,7 +59,7 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -69,7 +69,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and UserId in (select UserId from UserForRealName where RealName='" + UserIdRealName + "')";
             }
-            //顶级创客创客编号
+            //顶级创客编号
             if (!string.IsNullOrEmpty(TopUserIdMakerCode))
             {
                 condition += " and TopUserId in (select TopUserId from UserForMakerCode where MakerCode='" + TopUserIdMakerCode + "')";
@@ -89,7 +89,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and TeamId in (select TeamId from TeamApplyForTeamName where TeamName='" + TeamIdTeamName + "')";
             }
-            //团队长创客创客编号
+            //团队长创客编号
             if (!string.IsNullOrEmpty(TeamUserIdMakerCode))
             {
                 condition += " and TeamUserId in (select TeamUserId from UserForMakerCode where MakerCode='" + TeamUserIdMakerCode + "')";
@@ -343,7 +343,7 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -353,7 +353,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and UserId in (select UserId from UserForRealName where RealName='" + UserIdRealName + "')";
             }
-            //顶级创客创客编号
+            //顶级创客编号
             if (!string.IsNullOrEmpty(TopUserIdMakerCode))
             {
                 condition += " and TopUserId in (select TopUserId from UserForMakerCode where MakerCode='" + TopUserIdMakerCode + "')";
@@ -373,7 +373,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and TeamId in (select TeamId from TeamApplyForTeamName where TeamName='" + TeamIdTeamName + "')";
             }
-            //团队长创客创客编号
+            //团队长创客编号
             if (!string.IsNullOrEmpty(TeamUserIdMakerCode))
             {
                 condition += " and TeamUserId in (select TeamUserId from UserForMakerCode where MakerCode='" + TeamUserIdMakerCode + "')";

Areas/Admin/Controllers/MainServer/UserSnActInfoController.cs

@@ -60,7 +60,7 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -337,7 +337,7 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -407,13 +407,13 @@ namespace MySystem.Areas.Admin.Controllers
             result.Add("Info", "Excel报表-" + DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss") + ".xlsx");
             result.Add("Obj", diclist);
             Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
-            ReturnFields.Add("UserIdMakerCode", "创客创客编号");
+            ReturnFields.Add("UserIdMakerCode", "创客编号");
             ReturnFields.Add("UserIdRealName", "创客真实姓名");
             ReturnFields.Add("BrandId", "产品类型");
             ReturnFields.Add("SnNo", "SN编号");
             ReturnFields.Add("SnType", "SN机具类型");
-            ReturnFields.Add("SnStoreIdStoreNo", "SN仓库仓库编号");
-            ReturnFields.Add("SnStoreIdStoreName", "SN仓库仓库名称");
+            ReturnFields.Add("SnStoreIdStoreNo", "SN仓库编号");
+            ReturnFields.Add("SnStoreIdStoreName", "SN仓库名称");
             ReturnFields.Add("EffectStartCycleDate", "有效开始循环时间");
             ReturnFields.Add("EffectEndCycleDate", "有效结束循环时间");
             ReturnFields.Add("ActUserId", "激活奖励创客");