diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs index 9f43848..27181f0 100644 --- a/AllBase/BaseClass.cs +++ b/AllBase/BaseClass.cs @@ -27,7 +27,7 @@ namespace AllBase /// /// 版本ID /// - public static int VersionCount = 1067; + public static int VersionCount = 1071; //public static int VersionCount = 613; /// diff --git a/AllBase/Helper/GlobalConfig.cs b/AllBase/Helper/GlobalConfig.cs index 7e814ce..8150f9f 100644 --- a/AllBase/Helper/GlobalConfig.cs +++ b/AllBase/Helper/GlobalConfig.cs @@ -1,4 +1,5 @@ -using AllBase.Model.Param.CollectManage; +using AllBase.Model.Config; +using AllBase.Model.Param.CollectManage; using AllBase.Model.Param.ProductManage; using AllBase.Model.Param.ShopManage; using AllBase.Model.Param.TemuProductManage; @@ -32,11 +33,21 @@ namespace AllBase.Helper /// 拼多多买手列表 /// public static ConcurrentList BuyerLoginList { get; set; } = new ConcurrentList(); + /// + /// 微信店铺授权信息 + /// + public static ConcurrentList lstWxShopAuthInfo { get; set; } = new ConcurrentList(); + /// + /// 微信全局token（上传图片用） + /// + public static ConcurrentList WxGlobalTokenList { get; set; } = new ConcurrentList(); + + public static Dictionary dicWxShopUploadInfo { get; set; } = new Dictionary(); - public static ConcurrentList WxTokenList { get; set; } = new ConcurrentList(); public static ConcurrentList PddCatList { get; set; } = new ConcurrentList(); public static ConcurrentList WxCatList { get; set; } = new ConcurrentList(); public static ConcurrentList WxCatBoundList { get; set; } = new ConcurrentList(); + /// /// 店铺设置参数 /// @@ -48,11 +59,9 @@ namespace AllBase.Helper public static List SameProductCheckParamList { get; set; } - //public static string UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.131 Safari/537.36"; public static string UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/138.0.0.0 Safari/537.36"; - /// /// 微店店铺列表 /// diff --git a/AllBase/Model/Config/WxShopUploadInfo.cs b/AllBase/Model/Config/WxShopUploadInfo.cs index ebd2c50..4c9ea81 100644 --- a/AllBase/Model/Config/WxShopUploadInfo.cs +++ b/AllBase/Model/Config/WxShopUploadInfo.cs @@ -1,4 +1,5 @@ -using System; +using NaiBa.Util.Extension; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -15,12 +16,23 @@ namespace AllBase.Model.Config /// /// 日上货数量 /// - public Dictionary DicDayUploadCount { get; set; } = new Dictionary(); + public Dictionary DicDayUploadCount + { + get + { + if (!dicDayUploadCount.ContainsKey(DateTime.Now.ToString("yyyyMMdd").ParseToInt())) + dicDayUploadCount[DateTime.Now.ToString("yyyyMMdd").ParseToInt()] = 0; + return dicDayUploadCount; + } + set { dicDayUploadCount = value; } + } + Dictionary dicDayUploadCount = new Dictionary(); /// /// 在售商品数 /// - public int OnSaleCount { get; set; } + public int OnSaleCount { get { return OnSaleRefreshDay == DateTime.Now.ToString("yyyyMMdd").ParseToInt() ? onSaleCount : 0; } set { onSaleCount = value; } } + int onSaleCount = 0; /// /// 刷新在售商品时间 /// diff --git a/AllBase/Model/Result/PDDResult/PddBuyerOrderInfoLite.cs b/AllBase/Model/Result/PDDResult/PddBuyerOrderInfoLite.cs index cb93ad2..75ee3bf 100644 --- a/AllBase/Model/Result/PDDResult/PddBuyerOrderInfoLite.cs +++ b/AllBase/Model/Result/PDDResult/PddBuyerOrderInfoLite.cs @@ -57,6 +57,7 @@ namespace AllBase.Model.Result.PDDResult if (expressCompanyName.Contains("顺丰速运")) return "SF"; if (expressCompanyName.Contains("京东快递")) return "JD"; if (expressCompanyName.Contains("京东快运")) return "JDKY"; + if (expressCompanyName.Contains("其他快递")) return "OTHER"; return ""; } @@ -89,6 +90,7 @@ namespace AllBase.Model.Result.PDDResult if (outExpressCompanyMsg.Contains("京东快递")) return "京东快递"; if (outExpressCompanyMsg.Contains("京东快运")) return "京东快运"; if (outExpressCompanyMsg.Contains("京东大件物流")) return "京东大件物流"; + if (outExpressCompanyMsg.Contains("其他快递")) return "其他快递"; return "物流名称获取失败"; } } diff --git a/TEMUKJD/BLL/Pdd/PddApiHelper.cs b/TEMUKJD/BLL/Pdd/PddApiHelper.cs index 6b56222..5c882e5 100644 --- a/TEMUKJD/BLL/Pdd/PddApiHelper.cs +++ b/TEMUKJD/BLL/Pdd/PddApiHelper.cs @@ -15,6 +15,20 @@ namespace TemuKJD.BLL.PddApi { public class PddApiHelper { + public static AuthInfo RefreshOrderApi(AuthInfo _authInfo, bool isForceRefresh = false) + { + if (isForceRefresh || (_authInfo.UpdateTime <= DateTime.Now.AddDays(-1) && _authInfo.ExpiresTime <= DateTime.Now)) + { + string errStr = ""; + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == _authInfo.ShopId); + if (shop == null) + shop = new ShopLoginInfo() { ShopId = _authInfo.ShopId }; + var authInfo = PddApiHelper.GetE57ShopPddToken(shop, out errStr); + return authInfo; + } + return _authInfo; + } + public static void RefreshApi(ShopLoginInfo shop, bool isForceRefresh = false) { if (isForceRefresh || (shop.AuthUpdateTime <= DateTime.Now.AddDays(-1) && shop.AuthExpiresTime <= DateTime.Now)) diff --git a/TEMUKJD/BLL/WxApiBLL.cs b/TEMUKJD/BLL/WxApiBLL.cs index 98be5d7..cb9947a 100644 --- a/TEMUKJD/BLL/WxApiBLL.cs +++ b/TEMUKJD/BLL/WxApiBLL.cs @@ -17,7 +17,7 @@ namespace TemuKJD.BLL { public WXShopTokenInfo GetRandomWxToken(bool isShowErrorDlg = true) { - if (GlobalConfig.WxTokenList.Count == 0 || GlobalConfig.WxTokenList.All(t => t.isExpire == true)) + if (GlobalConfig.WxGlobalTokenList.Count == 0 || GlobalConfig.WxGlobalTokenList.All(t => t.isExpire == true)) { var url = BaseClass.BuildObjString("shop/e57_get_wx_tokens"); var data = UserLogin.GetSignaturex(); @@ -30,17 +30,17 @@ namespace TemuKJD.BLL return new WXShopTokenInfo(); } var tokenStr = JsonHelper.SerializeObject(JsonHelper.JObjectParse(html)["tokens"].FirstOrDefault()); - GlobalConfig.WxTokenList = new ConcurrentList(); - GlobalConfig.WxTokenList.AddRange(JsonHelper.DeserializeJsonToList(tokenStr)); - foreach (var token in GlobalConfig.WxTokenList) + GlobalConfig.WxGlobalTokenList = new ConcurrentList(); + GlobalConfig.WxGlobalTokenList.AddRange(JsonHelper.DeserializeJsonToList(tokenStr)); + foreach (var token in GlobalConfig.WxGlobalTokenList) { token.mdyTime = Convert.ToDateTime(BaseRegex.GetStringJson(ref html, "mdy_time")); } } - var tokenCount = GlobalConfig.WxTokenList.Where(t => t.isExpire != true).Count(); + var tokenCount = GlobalConfig.WxGlobalTokenList.Where(t => t.isExpire != true).Count(); - return GlobalConfig.WxTokenList.Where(t => t.isExpire != true).OrderBy(x => Guid.NewGuid()).FirstOrDefault(); + return GlobalConfig.WxGlobalTokenList.Where(t => t.isExpire != true).OrderBy(x => Guid.NewGuid()).FirstOrDefault(); } public WXShopTokenInfo GetShopWxToken(ShopLoginInfo shop) diff --git a/TEMUKJD/BLL/YkdHttpResponseBLL.cs b/TEMUKJD/BLL/YkdHttpResponseBLL.cs index a6fef9e..806dc83 100644 --- a/TEMUKJD/BLL/YkdHttpResponseBLL.cs +++ b/TEMUKJD/BLL/YkdHttpResponseBLL.cs @@ -175,6 +175,69 @@ namespace TemuKJD.BLL request.Headers.Add("Sec-Fetch-Mode", @"navigate"); request.Headers.Add("Sec-Fetch-User", @"?1"); request.Headers.Add("Sec-Fetch-Dest", @"document"); + if (!string.IsNullOrEmpty(referer)) + request.Referer = referer; + //request.Headers.Set(HttpRequestHeader.AcceptEncoding, "gzip, deflate, br, zstd"); + request.Headers.Set(HttpRequestHeader.AcceptEncoding, "gzip, deflate"); + request.Headers.Set(HttpRequestHeader.AcceptLanguage, "zh-CN,zh;q=0.9"); + + response = (HttpWebResponse)request.GetResponse(); + } + catch (WebException ex) + { + if (ex.Status == WebExceptionStatus.ProtocolError) + { + response = (HttpWebResponse)ex.Response; + result = GetProxyHtml.ReadResponse(response); + return result; + } + else return ex.Message; + } + catch (Exception e) + { + if (response != null) response.Close(); + return e.Message; + } + result = GetProxyHtml.ReadResponse(response); + return result; + } + + public static string YangkeduoGetSearchOrderResponse(BuyerLoginInfo buyer, string _url, string referer = "") + { + string cookies = ""; + try + { + var cookieLst = JsonHelper.DeserializeJsonToList(buyer?.cookie.ParseToString()); + if (cookieLst == null) + cookieLst = new List(); + foreach (var cook in cookieLst) + { + cookies += cook.Name + "=" + cook.Value + ";"; + } + } + catch { } + + HttpWebResponse response = null; + string result; + try + { + string url = _url; + HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url); + + request.KeepAlive = true; + request.Headers.Add("sec-ch-ua", @"""Not)A;Brand"";v=""8"", ""Chromium"";v=""138"""); + request.Headers.Add("sec-ch-ua-mobile", @"?0"); + request.Headers.Add("sec-ch-ua-platform", @"""Windows"""); + request.Headers.Add("Upgrade-Insecure-Requests", @"1"); + request.UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/138.0.0.0 Safari/537.36"; + request.Accept = "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7"; + request.Headers.Set(HttpRequestHeader.Cookie, cookies); + request.Headers.Add("Sec-Fetch-Site", @"same-origin"); + request.Headers.Add("Sec-Fetch-Mode", @"navigate"); + request.Headers.Add("Sec-Fetch-User", @"?1"); + request.Headers.Add("Sec-Fetch-Dest", @"document"); + if (!string.IsNullOrEmpty(referer)) + request.Referer = referer; //request.Headers.Set(HttpRequestHeader.AcceptEncoding, "gzip, deflate, br, zstd"); request.Headers.Set(HttpRequestHeader.AcceptEncoding, "gzip, deflate"); request.Headers.Set(HttpRequestHeader.AcceptLanguage, "zh-CN,zh;q=0.9"); diff --git a/TEMUKJD/KJD.csproj b/TEMUKJD/KJD.csproj index 4fbb0fc..9ac64bf 100644 --- a/TEMUKJD/KJD.csproj +++ b/TEMUKJD/KJD.csproj @@ -361,12 +361,6 @@ WXAdminShopLoginForm.cs - - Form - - - WXProdComplateForm.cs - Form @@ -1240,6 +1234,12 @@ SupportQrCodeForm.cs + + Form + + + OtherBuyerOrderListForm.cs + Form @@ -1261,11 +1261,11 @@ WxTalkForm.cs - + Form - - BuyerOrderListForm.cs + + PDDBuyerOrderListForm.cs BaseTalkForm.cs @@ -1354,9 +1354,6 @@ WXAdminShopLoginForm.cs - - WXProdComplateForm.cs - WXWaybillManageForm.cs @@ -1788,6 +1785,9 @@ SupportQrCodeForm.cs + + OtherBuyerOrderListForm.cs + TalkAutoReplyConfigForm.cs @@ -1797,8 +1797,8 @@ WxTalkForm.cs - - BuyerOrderListForm.cs + + PDDBuyerOrderListForm.cs diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs index 39cbb19..5d6fa35 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs @@ -802,7 +802,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms "", "是", "否"}); - this.cmbPddRelation.Location = new System.Drawing.Point(777, 7); + this.cmbPddRelation.Location = new System.Drawing.Point(777, 5); this.cmbPddRelation.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbPddRelation.Name = "cmbPddRelation"; this.cmbPddRelation.Size = new System.Drawing.Size(52, 25); @@ -857,7 +857,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.cmbCat2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.cmbCat2.FormattingEnabled = true; - this.cmbCat2.Location = new System.Drawing.Point(290, 75); + this.cmbCat2.Location = new System.Drawing.Point(290, 77); this.cmbCat2.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbCat2.Name = "cmbCat2"; this.cmbCat2.Size = new System.Drawing.Size(52, 25); @@ -894,7 +894,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms "", "普通商品", "爆款数据"}); - this.cmbSpProdType.Location = new System.Drawing.Point(777, 42); + this.cmbSpProdType.Location = new System.Drawing.Point(777, 40); this.cmbSpProdType.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbSpProdType.Name = "cmbSpProdType"; this.cmbSpProdType.Size = new System.Drawing.Size(52, 25); @@ -956,7 +956,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms "机会商品", "以图搜品", "外部数据"}); - this.cmbSourceType.Location = new System.Drawing.Point(290, 40); + this.cmbSourceType.Location = new System.Drawing.Point(290, 42); this.cmbSourceType.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbSourceType.Name = "cmbSourceType"; this.cmbSourceType.Size = new System.Drawing.Size(52, 25); @@ -1013,7 +1013,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms "", "是", "否"}); - this.cmbWxCat.Location = new System.Drawing.Point(651, 5); + this.cmbWxCat.Location = new System.Drawing.Point(651, 7); this.cmbWxCat.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbWxCat.Name = "cmbWxCat"; this.cmbWxCat.Size = new System.Drawing.Size(52, 25); @@ -1035,7 +1035,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.cmbSort.Items.AddRange(new object[] { "入库时间", "曝光量"}); - this.cmbSort.Location = new System.Drawing.Point(399, 40); + this.cmbSort.Location = new System.Drawing.Point(399, 42); this.cmbSort.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbSort.Name = "cmbSort"; this.cmbSort.Size = new System.Drawing.Size(52, 25); @@ -1111,7 +1111,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.cmbGroupFilter.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.cmbGroupFilter.FormattingEnabled = true; - this.cmbGroupFilter.Location = new System.Drawing.Point(181, 40); + this.cmbGroupFilter.Location = new System.Drawing.Point(181, 42); this.cmbGroupFilter.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbGroupFilter.Name = "cmbGroupFilter"; this.cmbGroupFilter.Size = new System.Drawing.Size(52, 25); @@ -1126,7 +1126,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms "是", "否", "导出未拉回"}); - this.cmbExportToOutServer.Location = new System.Drawing.Point(651, 40); + this.cmbExportToOutServer.Location = new System.Drawing.Point(651, 42); this.cmbExportToOutServer.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbExportToOutServer.Name = "cmbExportToOutServer"; this.cmbExportToOutServer.Size = new System.Drawing.Size(52, 25); @@ -1162,7 +1162,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms "安全商品", "违规商品", "未校验"}); - this.cmbWxSafe.Location = new System.Drawing.Point(525, 40); + this.cmbWxSafe.Location = new System.Drawing.Point(525, 42); this.cmbWxSafe.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbWxSafe.Name = "cmbWxSafe"; this.cmbWxSafe.Size = new System.Drawing.Size(52, 25); @@ -1204,7 +1204,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.cmbCat1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.cmbCat1.FormattingEnabled = true; - this.cmbCat1.Location = new System.Drawing.Point(181, 75); + this.cmbCat1.Location = new System.Drawing.Point(181, 77); this.cmbCat1.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbCat1.Name = "cmbCat1"; this.cmbCat1.Size = new System.Drawing.Size(52, 25); @@ -1226,7 +1226,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.cmbCat3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.cmbCat3.FormattingEnabled = true; - this.cmbCat3.Location = new System.Drawing.Point(399, 75); + this.cmbCat3.Location = new System.Drawing.Point(399, 77); this.cmbCat3.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbCat3.Name = "cmbCat3"; this.cmbCat3.Size = new System.Drawing.Size(52, 25); @@ -1603,7 +1603,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // // col_db_id // - this.col_db_id.FillWeight = 50F; + this.col_db_id.FillWeight = 60F; this.col_db_id.HeaderText = "数据库Id"; this.col_db_id.Name = "col_db_id"; this.col_db_id.ReadOnly = true; @@ -1829,7 +1829,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.colSpProdType.HeaderText = "商品类型"; this.colSpProdType.Name = "colSpProdType"; this.colSpProdType.ReadOnly = true; - this.colSpProdType.Visible = false; // // colWxSafe // @@ -1858,7 +1857,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // // col_edit // - this.col_edit.FillWeight = 42F; + this.col_edit.FillWeight = 40F; this.col_edit.HeaderText = "详情"; this.col_edit.Name = "col_edit"; this.col_edit.ReadOnly = true; @@ -1867,7 +1866,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // // col_delete // - this.col_delete.FillWeight = 42F; + this.col_delete.FillWeight = 40F; this.col_delete.HeaderText = "删除"; this.col_delete.Name = "col_delete"; this.col_delete.ReadOnly = true; diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs index 4490606..69c14d1 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs @@ -243,7 +243,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms prod.end_words, prod.fission_words, prod.product_get_type_text == "厂商直采" ? (prod.product_get_type_text + " " + prod.skc_id).Trim() : prod.product_get_type_text, - prod.special_prod_type, + prod.special_prod_type == "爆款数据" ? "爆款数据" : "普通商品", prod.wx_safe_status, prod.add_time.ToString("yy-MM-dd HH:mm"), prod.mdy_time.ToString("yy-MM-dd HH:mm"), @@ -251,7 +251,14 @@ namespace TemuKJD.PDDForms.ProductSelectForms "删除", "认领"); - dgvDbProduct.Rows[rowIndex].Height = dgvDbProduct.Columns["colMainImg"].Width; + var row = dgvDbProduct.Rows[rowIndex]; + row.Height = dgvDbProduct.Columns["colMainImg"].Width; + if (prod.special_prod_type == "爆款数据") + row.Cells["colSpProdType"].Style.ForeColor = Color.Orange; + if (prod.wx_safe_status == "违规商品") + row.Cells["colWxSafe"].Style.ForeColor = Color.Red; + if (prod.wx_safe_status == "安全商品") + row.Cells["colWxSafe"].Style.ForeColor = Color.Green; })); } @@ -1199,7 +1206,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms var url1 = BaseClass.BuildPDDObjString("product/wx_api_get_all_cate"); var data1 = UserLogin.GetSignaturex(); - data1 += "&token=" + GlobalConfig.WxTokenList.OrderBy(x => Guid.NewGuid()).FirstOrDefault()?.accessToken; + data1 += "&token=" + GlobalConfig.WxGlobalTokenList.OrderBy(x => Guid.NewGuid()).FirstOrDefault()?.accessToken; var html1 = GetHtml.PostUtf8(url1, data1); var catDataObj = JsonHelper.JObjectParse(html1)["cats_v2"]; diff --git a/TEMUKJD/PDDForms/ShopForms/PDDShopListForm.Designer.cs b/TEMUKJD/PDDForms/ShopForms/PDDShopListForm.Designer.cs index 77f4c2f..5a702ba 100644 --- a/TEMUKJD/PDDForms/ShopForms/PDDShopListForm.Designer.cs +++ b/TEMUKJD/PDDForms/ShopForms/PDDShopListForm.Designer.cs @@ -86,6 +86,7 @@ this.colDelete = new System.Windows.Forms.DataGridViewLinkColumn(); this.chkAutoDrag = new System.Windows.Forms.CheckBox(); this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); + this.btnRefreshOrderApi = new TemuKJD.UserControls.ButtonEx(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -153,7 +154,7 @@ this.panel5.Controls.Add(this.btnCheck); this.panel5.Location = new System.Drawing.Point(1044, 3); this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(217, 40); + this.panel5.Size = new System.Drawing.Size(217, 52); this.panel5.TabIndex = 1; // // btnRefreshShop @@ -163,14 +164,14 @@ this.btnRefreshShop.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnRefreshShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnRefreshShop.ForeColor = System.Drawing.Color.White; - this.btnRefreshShop.Location = new System.Drawing.Point(7, 9); + this.btnRefreshShop.Location = new System.Drawing.Point(5, 8); this.btnRefreshShop.Margin = new System.Windows.Forms.Padding(2); this.btnRefreshShop.Name = "btnRefreshShop"; this.btnRefreshShop.Size = new System.Drawing.Size(66, 26); this.btnRefreshShop.TabIndex = 375; this.btnRefreshShop.Text = "刷新店铺"; this.btnRefreshShop.UseVisualStyleBackColor = false; - this.btnRefreshShop.Click += new System.EventHandler(this.btnRefreshCookie_Click); + this.btnRefreshShop.Click += new System.EventHandler(this.btnRefreshShop_Click); // // btnLoginSelect // @@ -179,7 +180,7 @@ this.btnLoginSelect.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnLoginSelect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnLoginSelect.ForeColor = System.Drawing.Color.White; - this.btnLoginSelect.Location = new System.Drawing.Point(148, 9); + this.btnLoginSelect.Location = new System.Drawing.Point(148, 8); this.btnLoginSelect.Margin = new System.Windows.Forms.Padding(2); this.btnLoginSelect.Name = "btnLoginSelect"; this.btnLoginSelect.Size = new System.Drawing.Size(66, 26); @@ -195,7 +196,7 @@ this.btnCheck.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnCheck.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnCheck.ForeColor = System.Drawing.Color.White; - this.btnCheck.Location = new System.Drawing.Point(78, 9); + this.btnCheck.Location = new System.Drawing.Point(77, 8); this.btnCheck.Margin = new System.Windows.Forms.Padding(2); this.btnCheck.Name = "btnCheck"; this.btnCheck.Size = new System.Drawing.Size(66, 26); @@ -206,6 +207,7 @@ // // panel4 // + this.panel4.Controls.Add(this.btnRefreshOrderApi); this.panel4.Controls.Add(this.label5); this.panel4.Controls.Add(this.btnImport); this.panel4.Controls.Add(this.btnAddShop); @@ -241,7 +243,7 @@ this.btnImport.Cursor = System.Windows.Forms.Cursors.Hand; this.btnImport.DisabledBackColor = System.Drawing.Color.Empty; this.btnImport.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnImport.Location = new System.Drawing.Point(72, 9); + this.btnImport.Location = new System.Drawing.Point(72, 8); this.btnImport.Name = "btnImport"; this.btnImport.Size = new System.Drawing.Size(66, 26); this.btnImport.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -265,7 +267,7 @@ this.btnAddShop.Cursor = System.Windows.Forms.Cursors.Hand; this.btnAddShop.DisabledBackColor = System.Drawing.Color.Empty; this.btnAddShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnAddShop.Location = new System.Drawing.Point(3, 9); + this.btnAddShop.Location = new System.Drawing.Point(3, 8); this.btnAddShop.Name = "btnAddShop"; this.btnAddShop.Size = new System.Drawing.Size(66, 26); this.btnAddShop.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -291,10 +293,10 @@ this.btnOpenOrder.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnOpenOrder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnOpenOrder.ForeColor = System.Drawing.Color.White; - this.btnOpenOrder.Location = new System.Drawing.Point(933, 9); + this.btnOpenOrder.Location = new System.Drawing.Point(924, 8); this.btnOpenOrder.Margin = new System.Windows.Forms.Padding(2); this.btnOpenOrder.Name = "btnOpenOrder"; - this.btnOpenOrder.Size = new System.Drawing.Size(100, 25); + this.btnOpenOrder.Size = new System.Drawing.Size(93, 25); this.btnOpenOrder.TabIndex = 466; this.btnOpenOrder.Text = "登录订单系统"; this.btnOpenOrder.UseVisualStyleBackColor = false; @@ -303,7 +305,7 @@ // chkUsePddWorkbanch // this.chkUsePddWorkbanch.AutoSize = true; - this.chkUsePddWorkbanch.Location = new System.Drawing.Point(800, 11); + this.chkUsePddWorkbanch.Location = new System.Drawing.Point(796, 10); this.chkUsePddWorkbanch.Name = "chkUsePddWorkbanch"; this.chkUsePddWorkbanch.Size = new System.Drawing.Size(128, 21); this.chkUsePddWorkbanch.TabIndex = 417; @@ -315,7 +317,7 @@ // cmbNotes // this.cmbNotes.FormattingEnabled = true; - this.cmbNotes.Location = new System.Drawing.Point(522, 10); + this.cmbNotes.Location = new System.Drawing.Point(522, 9); this.cmbNotes.Name = "cmbNotes"; this.cmbNotes.Size = new System.Drawing.Size(120, 25); this.cmbNotes.TabIndex = 413; @@ -326,7 +328,7 @@ this.btnEmpty.CanvasColor = System.Drawing.SystemColors.Control; this.btnEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnEmpty.DisabledBackColor = System.Drawing.Color.Empty; - this.btnEmpty.Location = new System.Drawing.Point(718, 9); + this.btnEmpty.Location = new System.Drawing.Point(718, 8); this.btnEmpty.Name = "btnEmpty"; this.btnEmpty.Size = new System.Drawing.Size(66, 26); this.btnEmpty.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -352,7 +354,7 @@ this.btnSearch.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnSearch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSearch.ForeColor = System.Drawing.Color.White; - this.btnSearch.Location = new System.Drawing.Point(647, 9); + this.btnSearch.Location = new System.Drawing.Point(647, 8); this.btnSearch.Margin = new System.Windows.Forms.Padding(2); this.btnSearch.Name = "btnSearch"; this.btnSearch.Size = new System.Drawing.Size(66, 26); @@ -364,7 +366,7 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(462, 14); + this.label4.Location = new System.Drawing.Point(462, 13); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(68, 17); this.label4.TabIndex = 377; @@ -372,7 +374,7 @@ // // txtShopName // - this.txtShopName.Location = new System.Drawing.Point(352, 11); + this.txtShopName.Location = new System.Drawing.Point(352, 10); this.txtShopName.Name = "txtShopName"; this.txtShopName.Size = new System.Drawing.Size(110, 23); this.txtShopName.TabIndex = 374; @@ -380,7 +382,7 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(304, 14); + this.label3.Location = new System.Drawing.Point(304, 13); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(56, 17); this.label3.TabIndex = 375; @@ -388,7 +390,7 @@ // // txtShopId // - this.txtShopId.Location = new System.Drawing.Point(194, 11); + this.txtShopId.Location = new System.Drawing.Point(194, 10); this.txtShopId.Name = "txtShopId"; this.txtShopId.Size = new System.Drawing.Size(110, 23); this.txtShopId.TabIndex = 372; @@ -396,7 +398,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(146, 14); + this.label2.Location = new System.Drawing.Point(146, 13); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(55, 17); this.label2.TabIndex = 373; @@ -764,6 +766,23 @@ this.statusBar.Size = new System.Drawing.Size(1264, 29); this.statusBar.TabIndex = 1; // + // btnRefreshOrderApi + // + this.btnRefreshOrderApi.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnRefreshOrderApi.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnRefreshOrderApi.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnRefreshOrderApi.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnRefreshOrderApi.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnRefreshOrderApi.ForeColor = System.Drawing.Color.White; + this.btnRefreshOrderApi.Location = new System.Drawing.Point(924, 35); + this.btnRefreshOrderApi.Margin = new System.Windows.Forms.Padding(2); + this.btnRefreshOrderApi.Name = "btnRefreshOrderApi"; + this.btnRefreshOrderApi.Size = new System.Drawing.Size(93, 25); + this.btnRefreshOrderApi.TabIndex = 832; + this.btnRefreshOrderApi.Text = "刷新订单Api"; + this.btnRefreshOrderApi.UseVisualStyleBackColor = false; + this.btnRefreshOrderApi.Click += new System.EventHandler(this.btnRefreshOrderApi_Click); + // // PDDShopListForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -855,5 +874,6 @@ private System.Windows.Forms.DataGridViewLinkColumn colEdit; private System.Windows.Forms.DataGridViewLinkColumn colDelete; private System.Windows.Forms.Label label5; + public UserControls.ButtonEx btnRefreshOrderApi; } } \ No newline at end of file diff --git a/TEMUKJD/PDDForms/ShopForms/PDDShopListForm.cs b/TEMUKJD/PDDForms/ShopForms/PDDShopListForm.cs index c34351a..141ba07 100644 --- a/TEMUKJD/PDDForms/ShopForms/PDDShopListForm.cs +++ b/TEMUKJD/PDDForms/ShopForms/PDDShopListForm.cs @@ -34,6 +34,7 @@ namespace TemuKJD.PDDForms.ShopForms public static PDDShopListForm Instance { get { if (_instance == null) { _instance = new PDDShopListForm(); } return _instance; } set { _instance = value; } } public static bool IsOperate { get; set; } = false; private bool isLoading { get; set; } = false; + public ConcurrentList lstPddOrderAuthInfo = new ConcurrentList(); #region 服务端店铺管理 public static void UpdateShop() @@ -265,13 +266,13 @@ namespace TemuKJD.PDDForms.ShopForms else { ShopBLL.AddServerShop(shopInfo); - btnRefreshCookie_Click(null, null); + btnRefreshShop_Click(null, null); } } else { ShopBLL.MdyPDDWXServerShopSubInfo(shopInfo); - btnRefreshCookie_Click(null, null); + btnRefreshShop_Click(null, null); } } } @@ -292,7 +293,7 @@ namespace TemuKJD.PDDForms.ShopForms StartUp.SaveLocalShopLoginInfo(); Invoke(new Action(() => { - btnRefreshCookie_Click(null, null); + btnRefreshShop_Click(null, null); })); }); } @@ -301,7 +302,7 @@ namespace TemuKJD.PDDForms.ShopForms { IsOperate = true; ImportShop(); - btnRefreshCookie_Click(null, null); + btnRefreshShop_Click(null, null); } void ImportShop() @@ -469,6 +470,9 @@ namespace TemuKJD.PDDForms.ShopForms } else { + var auth = lstPddOrderAuthInfo.FirstOrDefault(a => a.ShopId == param.ShopId); + if (auth == null) + auth = new AuthInfo() { ShopId = param.ShopId }; int rowIndex = this.dgvShop.Rows.Add( isRowCheck, param.LoginName, @@ -486,7 +490,7 @@ namespace TemuKJD.PDDForms.ShopForms "购买授权", "绑定授权" + (param.AuthExpiresTime < DateTime.Now ? " (已过期)" : param.AuthExpiresTime.ToString(" MM-dd")), "购买授权", - "绑定授权", + "绑定授权" + (auth.ExpiresTime < DateTime.Now ? " (已过期)" : auth.ExpiresTime.ToString(" MM-dd")), "进入", "检测", string.IsNullOrWhiteSpace(param.LoginStatus) ? "未登录" : param.LoginStatus.Trim(), @@ -512,6 +516,11 @@ namespace TemuKJD.PDDForms.ShopForms { if (dgvr == null || param == null) return; + + var auth = lstPddOrderAuthInfo.FirstOrDefault(a => a.ShopId == param.ShopId); + if (auth == null) + auth = new AuthInfo() { ShopId = param.ShopId }; + dgvr.Cells["colCookie"].Value = param.Cookies; dgvr.Cells["colApiAuth"].Value = param.ApiAuthStatus; dgvr.Cells["colBuyApiAuth"].Value = param.BuyApiAuth.ApiAuthStatus; @@ -525,12 +534,19 @@ namespace TemuKJD.PDDForms.ShopForms dgvr.Cells["colChatAccount"].Value = param.ChatAccount; dgvr.Cells["colRelogin"].Value = string.IsNullOrWhiteSpace(param.LoginStatus) ? "未登录" : param.LoginStatus.Trim(); dgvr.Cells["colBindApi"].Value = "绑定授权" + (param.AuthExpiresTime < DateTime.Now ? " (已过期)" : param.AuthExpiresTime.ToString(" MM-dd")); + dgvr.Cells["colBindOrderApi"].Value = "绑定授权" + (auth.ExpiresTime < DateTime.Now ? " (已过期)" : auth.ExpiresTime.ToString(" MM-dd")); } void displayShopStatus(ShopLoginInfo shop) { bool canUse = shop.LoginStatus == "登录成功"; bool apiAuth = shop.AuthExpiresTime > DateTime.Now; + + var orderApiAuthInfo = lstPddOrderAuthInfo.FirstOrDefault(a => a.ShopId == shop.ShopId); + if (orderApiAuthInfo == null) + orderApiAuthInfo = new AuthInfo() { ShopId = shop.ShopId }; + bool orderApiAuth = orderApiAuthInfo.ExpiresTime > DateTime.Now; + var rows = this.dgvShop.Rows.Cast().Where(r => r.Cells["colShopId"].Value.ParseToString() == shop?.ShopId); foreach (var row in rows) { @@ -543,6 +559,11 @@ namespace TemuKJD.PDDForms.ShopForms (row.Cells["colBindApi"] as DataGridViewLinkCell).LinkColor = apiAuth ? Color.Blue : Color.Red; (row.Cells["colBindApi"] as DataGridViewLinkCell).ActiveLinkColor = apiAuth ? Color.LightBlue : Color.OrangeRed; (row.Cells["colBindApi"] as DataGridViewLinkCell).VisitedLinkColor = apiAuth ? Color.DarkBlue : Color.DarkRed; + + (row.Cells["colBindOrderApi"] as DataGridViewLinkCell).Style.ForeColor = orderApiAuth ? Color.Blue : Color.Red; + (row.Cells["colBindOrderApi"] as DataGridViewLinkCell).LinkColor = orderApiAuth ? Color.Blue : Color.Red; + (row.Cells["colBindOrderApi"] as DataGridViewLinkCell).ActiveLinkColor = orderApiAuth ? Color.LightBlue : Color.OrangeRed; + (row.Cells["colBindOrderApi"] as DataGridViewLinkCell).VisitedLinkColor = orderApiAuth ? Color.DarkBlue : Color.DarkRed; } } @@ -675,12 +696,26 @@ namespace TemuKJD.PDDForms.ShopForms return ""; } + bool isFirst = true; private void ShopListForm_VisibleChanged(object sender, EventArgs e) { if (this.Visible == true) { this.pbLoading.Visible = true; - RefreshDataGridView(true); + Task.Run(() => + { + RefreshDataGridView(true); + + if (isFirst) + { + isFirst = false; + while (isLoading) + Thread.Sleep(1000); + + RefreshOrderApi(); + RefreshDataGridView(true); + } + }); } } @@ -717,6 +752,11 @@ namespace TemuKJD.PDDForms.ShopForms // shop.ShopSubAccountList.AddRange(shopSubAccountList.Where(s => s.shop_login_name == shop.LoginName)); // } //} + + lstPddOrderAuthInfo = NaiBa.Util.Helper.ConfigHelper.LoadConfig>("pdd_order_api_auth_lst"); + if (lstPddOrderAuthInfo == null) + lstPddOrderAuthInfo = new ConcurrentList(); + foreach (var shop in GlobalConfig.ShopLoginList) { shop.ShopSubAccountList.Clear(); @@ -859,7 +899,7 @@ namespace TemuKJD.PDDForms.ShopForms shopLoginForm.openType = EnumOpenType.login; shopLoginForm.SaveComplete += shopLoginForm_SaveComplete; shopLoginForm.ShowDialog(); - btnRefreshCookie_Click(null, null); + btnRefreshShop_Click(null, null); } IsOperate = false; break; @@ -875,7 +915,7 @@ namespace TemuKJD.PDDForms.ShopForms shopLoginForm.openType = EnumOpenType.manage; shopLoginForm.SaveComplete += shopLoginForm_SaveComplete; shopLoginForm.ShowDialog(); - btnRefreshCookie_Click(null, null); + btnRefreshShop_Click(null, null); } } break; @@ -894,7 +934,7 @@ namespace TemuKJD.PDDForms.ShopForms shopLoginForm.AuthClientId = currentPddClient.client_id; shopLoginForm.SaveComplete += shopLoginForm_SaveComplete; shopLoginForm.ShowDialog(); - btnRefreshCookie_Click(null, null); + btnRefreshShop_Click(null, null); } } break; @@ -909,7 +949,7 @@ namespace TemuKJD.PDDForms.ShopForms shopLoginForm.openType = EnumOpenType.manage; shopLoginForm.SaveComplete += shopLoginForm_SaveComplete; shopLoginForm.ShowDialog(); - btnRefreshCookie_Click(null, null); + btnRefreshShop_Click(null, null); } } break; @@ -926,7 +966,7 @@ namespace TemuKJD.PDDForms.ShopForms //shopLoginForm.AuthClientId = currentPddClient.client_id; shopLoginForm.SaveComplete += shopLoginForm_SaveComplete; shopLoginForm.ShowDialog(); - btnRefreshCookie_Click(null, null); + btnRefreshShop_Click(null, null); } } break; @@ -1011,7 +1051,7 @@ namespace TemuKJD.PDDForms.ShopForms } } - private void btnRefreshCookie_Click(object sender, EventArgs e) + private void btnRefreshShop_Click(object sender, EventArgs e) { this.pbLoading.Visible = true; this.splitContainer1.Panel1.Enabled = false; @@ -1098,7 +1138,7 @@ namespace TemuKJD.PDDForms.ShopForms shopLoginForm.ShowDialog(); } } - btnRefreshCookie_Click(null, null); + btnRefreshShop_Click(null, null); } PDDShopListForm.IsOperate = false; } @@ -1245,5 +1285,50 @@ function setCookie(name, value, daysToLive, path, domain, secure, httpOnly, same shopLoginForm.InitUrl = "https://po.e57.cn/login?redirect=%2Findex"; shopLoginForm.Show(); } + + public void RefreshOrderApi(bool isForceRefresh = false) + { + foreach (var shop in GlobalConfig.ShopLoginList) + { + var authExist = lstPddOrderAuthInfo.FirstOrDefault(s => s.ShopId == shop.ShopId); + if (authExist == null) + authExist = new AuthInfo() { ShopId = shop.ShopId }; + var auth = PddApiHelper.RefreshOrderApi(authExist, isForceRefresh); + lstPddOrderAuthInfo.RemoveAll(a => a.ShopId == auth.ShopId); + lstPddOrderAuthInfo.Add(auth); + } + NaiBa.Util.Helper.ConfigHelper.SaveConfig("pdd_order_api_auth_lst", lstPddOrderAuthInfo); + } + + private void btnRefreshOrderApi_Click(object sender, EventArgs e) + { + this.pbLoading.Visible = true; + this.splitContainer1.Panel1.Enabled = false; + var t = Task.Run(() => + { + try + { + RefreshOrderApi(true); + RefreshDataGridView(false); + } + catch (Exception ex) { BaseMsgForm.ShowError(ex.Message); } + }); + Task.Run(() => + { + while (true) + { + Thread.Sleep(1000); + if (t.IsCompleted || t.IsCanceled || t.IsFaulted) + { + Invoke(new Action(() => + { + this.pbLoading.Visible = false; + this.splitContainer1.Panel1.Enabled = true; + })); + break; + } + } + }); + } } } diff --git a/TEMUKJD/WXForms/AdminForms/WXProdComplateForm.cs b/TEMUKJD/WXForms/AdminForms/WXProdComplateForm.cs index e1b1f98..ec592d2 100644 --- a/TEMUKJD/WXForms/AdminForms/WXProdComplateForm.cs +++ b/TEMUKJD/WXForms/AdminForms/WXProdComplateForm.cs @@ -185,7 +185,7 @@ namespace TemuKJD.WXForms.AdminForms while (tList.Where(ta => !ta.IsFaulted && !ta.IsCompleted).Count() >= 20) { Thread.Sleep(100); } } while (tList.Where(ta => !ta.IsFaulted && !ta.IsCompleted).Count() >= 1) { Thread.Sleep(100); } - NaiBa.Util.Helper.ConfigHelper.SaveConfig( "wx_shop_auth_list", lstShopAuthInfo); + NaiBa.Util.Helper.ConfigHelper.SaveConfig("wx_shop_auth_list", lstShopAuthInfo); Invoke(new Action(() => { pbLoadingShop.Visible = false; })); }); } diff --git a/TEMUKJD/WXForms/AdminForms/WXSaleAssistantForm.Designer.cs b/TEMUKJD/WXForms/AdminForms/WXSaleAssistantForm.Designer.cs index b4fdb19..25cfd18 100644 --- a/TEMUKJD/WXForms/AdminForms/WXSaleAssistantForm.Designer.cs +++ b/TEMUKJD/WXForms/AdminForms/WXSaleAssistantForm.Designer.cs @@ -30,12 +30,12 @@ namespace TemuKJD.ToolForms private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.ucTabControlMetro1 = new TemuKJD.UserControls.UcTabControlMetro(); this.tabPage1 = new System.Windows.Forms.TabPage(); @@ -63,6 +63,9 @@ namespace TemuKJD.ToolForms this.cmbMultiCookieName = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.btnMultiLogin = new DevComponents.DotNetBar.PanelEx(); this.btnDel = new DevComponents.DotNetBar.PanelEx(); + this.label6 = new System.Windows.Forms.Label(); + this.txtRetryTimes = new System.Windows.Forms.TextBox(); + this.label5 = new System.Windows.Forms.Label(); this.chkKeepOldData = new TemuKJD.UserComponent.UcCheckBox(this.components); this.btnClear = new DevComponents.DotNetBar.PanelEx(); this.label2 = new System.Windows.Forms.Label(); @@ -88,6 +91,7 @@ namespace TemuKJD.ToolForms this.btnSaveCookie = new DevComponents.DotNetBar.PanelEx(); this.btnImportCookie = new DevComponents.DotNetBar.PanelEx(); this.line1 = new DevComponents.DotNetBar.Controls.Line(); + this.btnReload = new DevComponents.DotNetBar.PanelEx(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -121,6 +125,10 @@ namespace TemuKJD.ToolForms // splitContainer1.Panel2 // this.splitContainer1.Panel2.BackColor = System.Drawing.Color.White; + this.splitContainer1.Panel2.Controls.Add(this.btnReload); + this.splitContainer1.Panel2.Controls.Add(this.label6); + this.splitContainer1.Panel2.Controls.Add(this.txtRetryTimes); + this.splitContainer1.Panel2.Controls.Add(this.label5); this.splitContainer1.Panel2.Controls.Add(this.chkKeepOldData); this.splitContainer1.Panel2.Controls.Add(this.btnClear); this.splitContainer1.Panel2.Controls.Add(this.label2); @@ -256,20 +264,20 @@ namespace TemuKJD.ToolForms // this.dgvProduct.AllowUserToAddRows = false; this.dgvProduct.AllowUserToDeleteRows = false; - dataGridViewCellStyle7.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle7; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; this.dgvProduct.AutoRowNumber = true; this.dgvProduct.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.dgvProduct.BackgroundColor = System.Drawing.Color.White; this.dgvProduct.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle8; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; this.dgvProduct.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colCheck, @@ -345,8 +353,8 @@ namespace TemuKJD.ToolForms // // colGoodsName // - dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colGoodsName.DefaultCellStyle = dataGridViewCellStyle9; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colGoodsName.DefaultCellStyle = dataGridViewCellStyle3; this.colGoodsName.HeaderText = "商品名称"; this.colGoodsName.Name = "colGoodsName"; this.colGoodsName.ReadOnly = true; @@ -367,8 +375,8 @@ namespace TemuKJD.ToolForms // // colCate // - dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colCate.DefaultCellStyle = dataGridViewCellStyle10; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colCate.DefaultCellStyle = dataGridViewCellStyle4; this.colCate.FillWeight = 80F; this.colCate.HeaderText = "类目"; this.colCate.Name = "colCate"; @@ -377,8 +385,8 @@ namespace TemuKJD.ToolForms // // colPrice // - dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colPrice.DefaultCellStyle = dataGridViewCellStyle11; + dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colPrice.DefaultCellStyle = dataGridViewCellStyle5; this.colPrice.FillWeight = 70F; this.colPrice.HeaderText = "价格"; this.colPrice.Name = "colPrice"; @@ -393,8 +401,8 @@ namespace TemuKJD.ToolForms // // colMsg // - dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colMsg.DefaultCellStyle = dataGridViewCellStyle12; + dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colMsg.DefaultCellStyle = dataGridViewCellStyle6; this.colMsg.FillWeight = 190F; this.colMsg.HeaderText = "操作结果"; this.colMsg.Name = "colMsg"; @@ -472,13 +480,46 @@ namespace TemuKJD.ToolForms this.btnDel.TabIndex = 409; this.btnDel.Text = "删"; // + // label6 + // + this.label6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(1377, 8); + this.label6.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(20, 17); + this.label6.TabIndex = 1223; + this.label6.Text = "次"; + // + // txtRetryTimes + // + this.txtRetryTimes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.txtRetryTimes.Location = new System.Drawing.Point(1345, 5); + this.txtRetryTimes.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtRetryTimes.Name = "txtRetryTimes"; + this.txtRetryTimes.Size = new System.Drawing.Size(32, 23); + this.txtRetryTimes.TabIndex = 1222; + this.txtRetryTimes.Text = "50"; + this.txtRetryTimes.TextChanged += new System.EventHandler(this.txtRetryTimes_TextChanged); + // + // label5 + // + this.label5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(1193, 8); + this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(152, 17); + this.label5.TabIndex = 1221; + this.label5.Text = "下一页查询失败后重试次数"; + // // chkKeepOldData // this.chkKeepOldData.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.chkKeepOldData.AutoSize = true; this.chkKeepOldData.Checked = true; this.chkKeepOldData.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkKeepOldData.Location = new System.Drawing.Point(1163, 26); + this.chkKeepOldData.Location = new System.Drawing.Point(1163, 31); this.chkKeepOldData.Name = "chkKeepOldData"; this.chkKeepOldData.Size = new System.Drawing.Size(123, 21); this.chkKeepOldData.TabIndex = 1196; @@ -607,7 +648,7 @@ namespace TemuKJD.ToolForms // this.label7.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(1289, 28); + this.label7.Location = new System.Drawing.Point(1289, 33); this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(56, 17); @@ -617,7 +658,7 @@ namespace TemuKJD.ToolForms // txtWaitSeconds // this.txtWaitSeconds.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.txtWaitSeconds.Location = new System.Drawing.Point(1345, 25); + this.txtWaitSeconds.Location = new System.Drawing.Point(1345, 30); this.txtWaitSeconds.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtWaitSeconds.Name = "txtWaitSeconds"; this.txtWaitSeconds.Size = new System.Drawing.Size(32, 23); @@ -629,7 +670,7 @@ namespace TemuKJD.ToolForms // this.label8.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(1377, 28); + this.label8.Location = new System.Drawing.Point(1377, 33); this.label8.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(20, 17); @@ -643,7 +684,6 @@ namespace TemuKJD.ToolForms this.txtTitle.Name = "txtTitle"; this.txtTitle.Size = new System.Drawing.Size(202, 23); this.txtTitle.TabIndex = 968; - this.txtTitle.Visible = false; // // btnSearchTitle // @@ -668,7 +708,6 @@ namespace TemuKJD.ToolForms this.btnSearchTitle.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); this.btnSearchTitle.TabIndex = 967; this.btnSearchTitle.Text = "搜索标题"; - this.btnSearchTitle.Visible = false; this.btnSearchTitle.Click += new System.EventHandler(this.btnSearchTitle_Click); // // btnStopStop @@ -790,7 +829,7 @@ namespace TemuKJD.ToolForms this.txtCookie.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.txtCookie.Multiline = true; this.txtCookie.Name = "txtCookie"; - this.txtCookie.Size = new System.Drawing.Size(145, 78); + this.txtCookie.Size = new System.Drawing.Size(145, 51); this.txtCookie.TabIndex = 766; this.txtCookie.Text = "填写cookie后点击导入cookie并刷新"; // @@ -855,6 +894,31 @@ namespace TemuKJD.ToolForms this.line1.Text = "line1"; this.line1.VerticalLine = true; // + // btnReload + // + this.btnReload.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnReload.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnReload.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnReload.DisabledBackColor = System.Drawing.Color.Empty; + this.btnReload.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnReload.Location = new System.Drawing.Point(77, 57); + this.btnReload.Name = "btnReload"; + this.btnReload.Size = new System.Drawing.Size(72, 25); + this.btnReload.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnReload.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnReload.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnReload.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnReload.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnReload.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnReload.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnReload.Style.GradientAngle = 90; + this.btnReload.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnReload.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnReload.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnReload.TabIndex = 1251; + this.btnReload.Text = "重新登录"; + this.btnReload.Click += new System.EventHandler(this.btnReload_Click); + // // WXSaleAssistantForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -937,5 +1001,9 @@ namespace TemuKJD.ToolForms private System.Windows.Forms.DataGridViewTextBoxColumn colMsg; private DevComponents.DotNetBar.PanelEx btnClear; private UserComponent.UcCheckBox chkKeepOldData; + private System.Windows.Forms.Label label6; + private System.Windows.Forms.TextBox txtRetryTimes; + private System.Windows.Forms.Label label5; + private DevComponents.DotNetBar.PanelEx btnReload; } } \ No newline at end of file diff --git a/TEMUKJD/WXForms/AdminForms/WXSaleAssistantForm.cs b/TEMUKJD/WXForms/AdminForms/WXSaleAssistantForm.cs index 641bb4b..29cee14 100644 --- a/TEMUKJD/WXForms/AdminForms/WXSaleAssistantForm.cs +++ b/TEMUKJD/WXForms/AdminForms/WXSaleAssistantForm.cs @@ -43,6 +43,7 @@ namespace TemuKJD.ToolForms int filterMonthSaleCount = 100; int filterTotalSaleCount = 500; int searchPageCount = 0; + int noNextPageRetryTimes = 50; public WXSaleAssistantForm() { @@ -425,6 +426,8 @@ namespace TemuKJD.ToolForms pbLoading.Visible = true; Task.Run(() => { + var rowLst = dgvProduct.Rows.Cast().ToList(); + rowLst.Reverse(); foreach (DataGridViewRow row in dgvProduct.Rows) { Invoke(new Action(() => @@ -559,7 +562,7 @@ namespace TemuKJD.ToolForms var cookieShop = new ShopLoginInfo(); cookieShop.Cookies = JsonHelper.SerializeObject(cookieList); getSpuItemsParams["pageContext"]["pageContext"] = pageContext; - getSpuItemsParams["requestContext"]["requestId"] = requestId; + getSpuItemsParams["requestContext"]["requestId"] = BaseClass.DateTimeToTimestampMilliseconds(DateTime.Now).ToString(); // requestId; foreach (var item in spuItemsBase) { JObject jObjDisplaySpu = new JObject(); @@ -569,8 +572,9 @@ namespace TemuKJD.ToolForms //{"code":0,"pageContextResp":{"hasNext":false},"requestId":"1778688044492"} int errorCnt = 0; + int nomoreCnt = 0; var spuItemsData = GetAssistant.wxGetAssistant(cookieShop, getSpuItemsParams); - for (int i = 1; i <= 50; i++) // 重试50次 + for (int i = 1; i <= noNextPageRetryTimes; i++) // 重试50次 { if (!spuItemsData.Contains("\"code\":0") || spuItemsData.Contains("\"hasNext\":false")) { @@ -579,6 +583,28 @@ namespace TemuKJD.ToolForms if (errorCnt > 5) break; + if (spuItemsData.Contains("\"hasNext\":false")) + nomoreCnt++; + + if (nomoreCnt > 7) + { + } + else if (nomoreCnt > 6) + { + } + else if (nomoreCnt > 5) + { + } + else if (nomoreCnt > 4) + { + } + else if (nomoreCnt > 3) + { + } + else if (nomoreCnt > 2) + { + } + sleepTime = (int)(getDetailWaitSeconds * 1000) - 100 + Randomx.GetId(101, 501); Thread.Sleep(Math.Max(100, sleepTime)); @@ -586,8 +612,8 @@ namespace TemuKJD.ToolForms } if (i % 10 == 0 && spuItemsData.Contains("\"hasNext\":false")) { - if (BaseMsgForm.ShowConfirm("已连续" + i + "次未查询到下一页商品，是否继续？").DialogResult != DialogResult.OK) - break; + //if (BaseMsgForm.ShowConfirm("已连续" + i + "次未查询到下一页商品，是否继续？").DialogResult != DialogResult.OK) + // break; } } if (!spuItemsData.Contains("\"code\":0")) @@ -671,6 +697,17 @@ namespace TemuKJD.ToolForms } NaiBa.Util.Helper.ConfigHelper.SaveConfig("wx_sale_assistant_list_" + MainForm.ProcessCount, lstWxSaleAssistantSpuItemInfo); } + + private void txtRetryTimes_TextChanged(object sender, EventArgs e) + { + noNextPageRetryTimes = Math.Max(20, txtRetryTimes.Text.ParseToInt()); + } + + private void btnReload_Click(object sender, EventArgs e) + { + CEFBrowser.DeleteCookie(cefWebBrowser.GetCookieManager(null)); + cefWebBrowser.Load(InitUrl); + } } public class WXSaleAssistantSpuItemInfo diff --git a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.Designer.cs b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.Designer.cs index fb48945..2bba0d1 100644 --- a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.Designer.cs +++ b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.Designer.cs @@ -32,13 +32,14 @@ namespace TemuKJD.WXForms.ProductForms private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.ucGroupBoxEx2 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.chkRandomCompanyProd = new TemuKJD.UserComponent.UcCheckBox(this.components); @@ -122,6 +123,8 @@ namespace TemuKJD.WXForms.ProductForms this.lblIdFilter = new System.Windows.Forms.Label(); this.lblHot = new System.Windows.Forms.Label(); this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); + this.cmbFilterShopGroup = new TemuKJD.UserComponent.UcComboBoxMutiSelect(); + this.label24 = new System.Windows.Forms.Label(); this.btnRefreshAuthor = new DevComponents.DotNetBar.PanelEx(); this.btnSelectOffline = new DevComponents.DotNetBar.PanelEx(); this.btnSelectOnline = new DevComponents.DotNetBar.PanelEx(); @@ -142,11 +145,23 @@ namespace TemuKJD.WXForms.ProductForms this.pbLoadingShop = new System.Windows.Forms.PictureBox(); this.lblExtCodeFilter = new System.Windows.Forms.Label(); this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx(); + this.pbLoading = new System.Windows.Forms.PictureBox(); + this.并发上传 = new DevComponents.DotNetBar.PanelEx(); + this.chkImgRandomBlock = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.label11 = new System.Windows.Forms.Label(); + this.txtSinglePriceAdd = new System.Windows.Forms.TextBox(); + this.chkTestNoAuditUpload = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.dgvSelectProduct = new TemuKJD.UserComponent.DataGridViewEx(); + this.splitContainer4 = new System.Windows.Forms.SplitContainer(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); + this.btnClear = new DevComponents.DotNetBar.PanelEx(); + this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colShopLoginName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colShopNotes = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colGroup = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colSelectProduct = new System.Windows.Forms.DataGridViewLinkColumn(); this.colLoginStatus = new System.Windows.Forms.DataGridViewLinkColumn(); this.colApi = new System.Windows.Forms.DataGridViewLinkColumn(); @@ -155,13 +170,6 @@ namespace TemuKJD.WXForms.ProductForms this.colOnSaleNum = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colRemaining = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.pbLoading = new System.Windows.Forms.PictureBox(); - this.并发上传 = new DevComponents.DotNetBar.PanelEx(); - this.chkImgRandomBlock = new TemuKJD.UserComponent.UcCheckBox(this.components); - this.label11 = new System.Windows.Forms.Label(); - this.txtSinglePriceAdd = new System.Windows.Forms.TextBox(); - this.chkTestNoAuditUpload = new TemuKJD.UserComponent.UcCheckBox(this.components); - this.dgvSelectProduct = new TemuKJD.UserComponent.DataGridViewEx(); this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colSelectId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colSupplierId = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -184,11 +192,6 @@ namespace TemuKJD.WXForms.ProductForms this.ColDelete = new System.Windows.Forms.DataGridViewLinkColumn(); this.colAddTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colOpResult = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.splitContainer4 = new System.Windows.Forms.SplitContainer(); - this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); - this.btnClear = new DevComponents.DotNetBar.PanelEx(); - this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); - this.panel1 = new System.Windows.Forms.Panel(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -220,6 +223,7 @@ namespace TemuKJD.WXForms.ProductForms // // splitContainer1 // + this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; this.splitContainer1.Location = new System.Drawing.Point(0, 0); this.splitContainer1.Name = "splitContainer1"; @@ -234,7 +238,7 @@ namespace TemuKJD.WXForms.ProductForms // splitContainer1.Panel2 // this.splitContainer1.Panel2.Controls.Add(this.splitContainer3); - this.splitContainer1.Size = new System.Drawing.Size(1499, 546); + this.splitContainer1.Size = new System.Drawing.Size(1524, 641); this.splitContainer1.SplitterDistance = 165; this.splitContainer1.TabIndex = 11; // @@ -290,7 +294,7 @@ namespace TemuKJD.WXForms.ProductForms this.ucGroupBoxEx2.Controls.Add(this.label4); this.ucGroupBoxEx2.Controls.Add(this.label9); this.ucGroupBoxEx2.Controls.Add(this.chkStepAddPrice); - this.ucGroupBoxEx2.Location = new System.Drawing.Point(570, 2); + this.ucGroupBoxEx2.Location = new System.Drawing.Point(595, 2); this.ucGroupBoxEx2.Name = "ucGroupBoxEx2"; this.ucGroupBoxEx2.Size = new System.Drawing.Size(927, 165); this.ucGroupBoxEx2.TabIndex = 667; @@ -981,7 +985,7 @@ namespace TemuKJD.WXForms.ProductForms this.ucGroupBoxEx4.Controls.Add(this.label20); this.ucGroupBoxEx4.Controls.Add(this.lblIdFilter); this.ucGroupBoxEx4.Controls.Add(this.lblHot); - this.ucGroupBoxEx4.Location = new System.Drawing.Point(161, 2); + this.ucGroupBoxEx4.Location = new System.Drawing.Point(186, 2); this.ucGroupBoxEx4.Name = "ucGroupBoxEx4"; this.ucGroupBoxEx4.Size = new System.Drawing.Size(410, 165); this.ucGroupBoxEx4.TabIndex = 666; @@ -1411,6 +1415,8 @@ namespace TemuKJD.WXForms.ProductForms | System.Windows.Forms.AnchorStyles.Left))); this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx1.Controls.Add(this.cmbFilterShopGroup); + this.ucGroupBoxEx1.Controls.Add(this.label24); this.ucGroupBoxEx1.Controls.Add(this.btnRefreshAuthor); this.ucGroupBoxEx1.Controls.Add(this.btnSelectOffline); this.ucGroupBoxEx1.Controls.Add(this.btnSelectOnline); @@ -1426,20 +1432,43 @@ namespace TemuKJD.WXForms.ProductForms this.ucGroupBoxEx1.Controls.Add(this.label17); this.ucGroupBoxEx1.Location = new System.Drawing.Point(2, 2); this.ucGroupBoxEx1.Name = "ucGroupBoxEx1"; - this.ucGroupBoxEx1.Size = new System.Drawing.Size(160, 165); + this.ucGroupBoxEx1.Size = new System.Drawing.Size(185, 165); this.ucGroupBoxEx1.TabIndex = 399; this.ucGroupBoxEx1.TabStop = false; this.ucGroupBoxEx1.Text = "店铺筛选"; // + // cmbFilterShopGroup + // + this.cmbFilterShopGroup.DefaultText = "全部"; + this.cmbFilterShopGroup.DropDownHeight = 1; + this.cmbFilterShopGroup.DropDownWidth = 1; + this.cmbFilterShopGroup.FormattingEnabled = true; + this.cmbFilterShopGroup.IntegralHeight = false; + this.cmbFilterShopGroup.Location = new System.Drawing.Point(38, 92); + this.cmbFilterShopGroup.Name = "cmbFilterShopGroup"; + this.cmbFilterShopGroup.Size = new System.Drawing.Size(137, 25); + this.cmbFilterShopGroup.TabIndex = 832; + this.cmbFilterShopGroup.Text = "全部"; + // + // label24 + // + this.label24.AutoSize = true; + this.label24.Location = new System.Drawing.Point(7, 96); + this.label24.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label24.Name = "label24"; + this.label24.Size = new System.Drawing.Size(32, 17); + this.label24.TabIndex = 833; + this.label24.Text = "分组"; + // // btnRefreshAuthor // this.btnRefreshAuthor.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnRefreshAuthor.Cursor = System.Windows.Forms.Cursors.Hand; this.btnRefreshAuthor.DisabledBackColor = System.Drawing.Color.Empty; this.btnRefreshAuthor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnRefreshAuthor.Location = new System.Drawing.Point(81, 17); + this.btnRefreshAuthor.Location = new System.Drawing.Point(93, 18); this.btnRefreshAuthor.Name = "btnRefreshAuthor"; - this.btnRefreshAuthor.Size = new System.Drawing.Size(70, 20); + this.btnRefreshAuthor.Size = new System.Drawing.Size(82, 18); this.btnRefreshAuthor.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnRefreshAuthor.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnRefreshAuthor.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -1461,9 +1490,9 @@ namespace TemuKJD.WXForms.ProductForms this.btnSelectOffline.Cursor = System.Windows.Forms.Cursors.Hand; this.btnSelectOffline.DisabledBackColor = System.Drawing.Color.Empty; this.btnSelectOffline.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSelectOffline.Location = new System.Drawing.Point(61, 137); + this.btnSelectOffline.Location = new System.Drawing.Point(59, 139); this.btnSelectOffline.Name = "btnSelectOffline"; - this.btnSelectOffline.Size = new System.Drawing.Size(50, 20); + this.btnSelectOffline.Size = new System.Drawing.Size(48, 18); this.btnSelectOffline.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnSelectOffline.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnSelectOffline.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -1485,9 +1514,9 @@ namespace TemuKJD.WXForms.ProductForms this.btnSelectOnline.Cursor = System.Windows.Forms.Cursors.Hand; this.btnSelectOnline.DisabledBackColor = System.Drawing.Color.Empty; this.btnSelectOnline.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSelectOnline.Location = new System.Drawing.Point(9, 137); + this.btnSelectOnline.Location = new System.Drawing.Point(9, 139); this.btnSelectOnline.Name = "btnSelectOnline"; - this.btnSelectOnline.Size = new System.Drawing.Size(50, 20); + this.btnSelectOnline.Size = new System.Drawing.Size(48, 18); this.btnSelectOnline.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnSelectOnline.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnSelectOnline.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -1509,9 +1538,9 @@ namespace TemuKJD.WXForms.ProductForms this.btnAddUnSelect.Cursor = System.Windows.Forms.Cursors.Hand; this.btnAddUnSelect.DisabledBackColor = System.Drawing.Color.Empty; this.btnAddUnSelect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnAddUnSelect.Location = new System.Drawing.Point(81, 115); + this.btnAddUnSelect.Location = new System.Drawing.Point(76, 119); this.btnAddUnSelect.Name = "btnAddUnSelect"; - this.btnAddUnSelect.Size = new System.Drawing.Size(70, 20); + this.btnAddUnSelect.Size = new System.Drawing.Size(65, 18); this.btnAddUnSelect.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnAddUnSelect.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnAddUnSelect.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -1533,9 +1562,9 @@ namespace TemuKJD.WXForms.ProductForms this.btnReverse.Cursor = System.Windows.Forms.Cursors.Hand; this.btnReverse.DisabledBackColor = System.Drawing.Color.Empty; this.btnReverse.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnReverse.Location = new System.Drawing.Point(113, 137); + this.btnReverse.Location = new System.Drawing.Point(109, 139); this.btnReverse.Name = "btnReverse"; - this.btnReverse.Size = new System.Drawing.Size(38, 20); + this.btnReverse.Size = new System.Drawing.Size(32, 18); this.btnReverse.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnReverse.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnReverse.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -1558,9 +1587,9 @@ namespace TemuKJD.WXForms.ProductForms this.cmbFilterShopNotes.DropDownWidth = 1; this.cmbFilterShopNotes.FormattingEnabled = true; this.cmbFilterShopNotes.IntegralHeight = false; - this.cmbFilterShopNotes.Location = new System.Drawing.Point(38, 66); + this.cmbFilterShopNotes.Location = new System.Drawing.Point(38, 65); this.cmbFilterShopNotes.Name = "cmbFilterShopNotes"; - this.cmbFilterShopNotes.Size = new System.Drawing.Size(113, 25); + this.cmbFilterShopNotes.Size = new System.Drawing.Size(137, 25); this.cmbFilterShopNotes.TabIndex = 442; this.cmbFilterShopNotes.Text = "全部"; // @@ -1570,9 +1599,9 @@ namespace TemuKJD.WXForms.ProductForms this.btnAddSelect.Cursor = System.Windows.Forms.Cursors.Hand; this.btnAddSelect.DisabledBackColor = System.Drawing.Color.Empty; this.btnAddSelect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnAddSelect.Location = new System.Drawing.Point(9, 115); + this.btnAddSelect.Location = new System.Drawing.Point(9, 119); this.btnAddSelect.Name = "btnAddSelect"; - this.btnAddSelect.Size = new System.Drawing.Size(70, 20); + this.btnAddSelect.Size = new System.Drawing.Size(65, 18); this.btnAddSelect.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnAddSelect.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnAddSelect.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -1593,10 +1622,10 @@ namespace TemuKJD.WXForms.ProductForms this.btnEmptyShop.CanvasColor = System.Drawing.SystemColors.Control; this.btnEmptyShop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnEmptyShop.DisabledBackColor = System.Drawing.Color.Empty; - this.btnEmptyShop.Location = new System.Drawing.Point(113, 93); + this.btnEmptyShop.Location = new System.Drawing.Point(143, 139); this.btnEmptyShop.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); this.btnEmptyShop.Name = "btnEmptyShop"; - this.btnEmptyShop.Size = new System.Drawing.Size(38, 20); + this.btnEmptyShop.Size = new System.Drawing.Size(32, 18); this.btnEmptyShop.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnEmptyShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); this.btnEmptyShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); @@ -1619,9 +1648,9 @@ namespace TemuKJD.WXForms.ProductForms this.btnFilterShop.Cursor = System.Windows.Forms.Cursors.Hand; this.btnFilterShop.DisabledBackColor = System.Drawing.Color.Empty; this.btnFilterShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnFilterShop.Location = new System.Drawing.Point(9, 93); + this.btnFilterShop.Location = new System.Drawing.Point(143, 119); this.btnFilterShop.Name = "btnFilterShop"; - this.btnFilterShop.Size = new System.Drawing.Size(102, 20); + this.btnFilterShop.Size = new System.Drawing.Size(32, 18); this.btnFilterShop.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnFilterShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnFilterShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -1634,13 +1663,13 @@ namespace TemuKJD.WXForms.ProductForms this.btnFilterShop.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); this.btnFilterShop.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); this.btnFilterShop.TabIndex = 703; - this.btnFilterShop.Text = "过滤店铺"; + this.btnFilterShop.Text = "过滤"; this.btnFilterShop.Click += new System.EventHandler(this.btnFilterShop_Click); // // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(7, 70); + this.label16.Location = new System.Drawing.Point(7, 69); this.label16.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(32, 17); @@ -1650,10 +1679,10 @@ namespace TemuKJD.WXForms.ProductForms // txtFilterShopName // this.txtFilterShopName.Font = new System.Drawing.Font("微软雅黑", 10F); - this.txtFilterShopName.Location = new System.Drawing.Point(38, 39); + this.txtFilterShopName.Location = new System.Drawing.Point(38, 38); this.txtFilterShopName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtFilterShopName.Name = "txtFilterShopName"; - this.txtFilterShopName.Size = new System.Drawing.Size(113, 25); + this.txtFilterShopName.Size = new System.Drawing.Size(137, 25); this.txtFilterShopName.TabIndex = 653; // // btnRefreshShop @@ -1662,9 +1691,9 @@ namespace TemuKJD.WXForms.ProductForms this.btnRefreshShop.Cursor = System.Windows.Forms.Cursors.Hand; this.btnRefreshShop.DisabledBackColor = System.Drawing.Color.Empty; this.btnRefreshShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnRefreshShop.Location = new System.Drawing.Point(9, 17); + this.btnRefreshShop.Location = new System.Drawing.Point(9, 18); this.btnRefreshShop.Name = "btnRefreshShop"; - this.btnRefreshShop.Size = new System.Drawing.Size(70, 20); + this.btnRefreshShop.Size = new System.Drawing.Size(82, 18); this.btnRefreshShop.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnRefreshShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnRefreshShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -1683,7 +1712,7 @@ namespace TemuKJD.WXForms.ProductForms // label17 // this.label17.AutoSize = true; - this.label17.Location = new System.Drawing.Point(7, 43); + this.label17.Location = new System.Drawing.Point(7, 42); this.label17.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label17.Name = "label17"; this.label17.Size = new System.Drawing.Size(32, 17); @@ -1705,8 +1734,8 @@ namespace TemuKJD.WXForms.ProductForms // splitContainer3.Panel2 // this.splitContainer3.Panel2.Controls.Add(this.splitContainer4); - this.splitContainer3.Size = new System.Drawing.Size(1499, 377); - this.splitContainer3.SplitterDistance = 347; + this.splitContainer3.Size = new System.Drawing.Size(1524, 472); + this.splitContainer3.SplitterDistance = 442; this.splitContainer3.TabIndex = 1; // // splitContainer2 @@ -1735,8 +1764,8 @@ namespace TemuKJD.WXForms.ProductForms this.splitContainer2.Panel2.Controls.Add(this.chkTestNoAuditUpload); this.splitContainer2.Panel2.Controls.Add(this.dgvSelectProduct); this.splitContainer2.Panel2.Padding = new System.Windows.Forms.Padding(0, 0, 4, 0); - this.splitContainer2.Size = new System.Drawing.Size(1499, 347); - this.splitContainer2.SplitterDistance = 350; + this.splitContainer2.Size = new System.Drawing.Size(1524, 442); + this.splitContainer2.SplitterDistance = 410; this.splitContainer2.TabIndex = 0; // // btnRefreshNum @@ -1746,7 +1775,7 @@ namespace TemuKJD.WXForms.ProductForms this.btnRefreshNum.Cursor = System.Windows.Forms.Cursors.Hand; this.btnRefreshNum.DisabledBackColor = System.Drawing.Color.Empty; this.btnRefreshNum.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnRefreshNum.Location = new System.Drawing.Point(12, 33); + this.btnRefreshNum.Location = new System.Drawing.Point(29, 33); this.btnRefreshNum.Name = "btnRefreshNum"; this.btnRefreshNum.Size = new System.Drawing.Size(102, 24); this.btnRefreshNum.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -1768,7 +1797,7 @@ namespace TemuKJD.WXForms.ProductForms // txtExtCodeFilter // this.txtExtCodeFilter.Font = new System.Drawing.Font("微软雅黑", 10F); - this.txtExtCodeFilter.Location = new System.Drawing.Point(249, 34); + this.txtExtCodeFilter.Location = new System.Drawing.Point(291, 34); this.txtExtCodeFilter.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtExtCodeFilter.Name = "txtExtCodeFilter"; this.txtExtCodeFilter.Size = new System.Drawing.Size(92, 25); @@ -1779,7 +1808,7 @@ namespace TemuKJD.WXForms.ProductForms // this.pbLoadingShop.Anchor = System.Windows.Forms.AnchorStyles.None; this.pbLoadingShop.Image = global::TemuKJD.Properties.Resources.loading_blue; - this.pbLoadingShop.Location = new System.Drawing.Point(150, 148); + this.pbLoadingShop.Location = new System.Drawing.Point(180, 196); this.pbLoadingShop.Name = "pbLoadingShop"; this.pbLoadingShop.Size = new System.Drawing.Size(50, 50); this.pbLoadingShop.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -1790,7 +1819,7 @@ namespace TemuKJD.WXForms.ProductForms // lblExtCodeFilter // this.lblExtCodeFilter.AutoSize = true; - this.lblExtCodeFilter.Location = new System.Drawing.Point(218, 38); + this.lblExtCodeFilter.Location = new System.Drawing.Point(260, 38); this.lblExtCodeFilter.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.lblExtCodeFilter.Name = "lblExtCodeFilter"; this.lblExtCodeFilter.Size = new System.Drawing.Size(32, 17); @@ -1802,19 +1831,19 @@ namespace TemuKJD.WXForms.ProductForms // this.dgvShop.AllowUserToAddRows = false; this.dgvShop.AllowUserToDeleteRows = false; - dataGridViewCellStyle22.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle22; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; this.dgvShop.AutoRowNumber = true; this.dgvShop.BackgroundColor = System.Drawing.Color.White; this.dgvShop.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle23.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle23.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle23.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle23.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle23.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle23; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colSelect, @@ -1822,6 +1851,7 @@ namespace TemuKJD.WXForms.ProductForms this.colShopId, this.colShopName, this.colShopNotes, + this.colGroup, this.colSelectProduct, this.colLoginStatus, this.colApi, @@ -1837,12 +1867,228 @@ namespace TemuKJD.WXForms.ProductForms this.dgvShop.ReadOnly = true; this.dgvShop.RowHeadersWidth = 25; this.dgvShop.RowTemplate.Height = 23; - this.dgvShop.Size = new System.Drawing.Size(346, 347); + this.dgvShop.Size = new System.Drawing.Size(406, 442); this.dgvShop.TabIndex = 6; this.dgvShop.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellContentClick); // + // pbLoading + // + this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None; + this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue; + this.pbLoading.Location = new System.Drawing.Point(530, 196); + this.pbLoading.Name = "pbLoading"; + this.pbLoading.Size = new System.Drawing.Size(50, 50); + this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pbLoading.TabIndex = 780; + this.pbLoading.TabStop = false; + this.pbLoading.Visible = false; + // + // 并发上传 + // + this.并发上传.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.并发上传.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.并发上传.Cursor = System.Windows.Forms.Cursors.Hand; + this.并发上传.DisabledBackColor = System.Drawing.Color.Empty; + this.并发上传.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.并发上传.Location = new System.Drawing.Point(984, 30); + this.并发上传.Name = "并发上传"; + this.并发上传.Size = new System.Drawing.Size(118, 23); + this.并发上传.Style.Alignment = System.Drawing.StringAlignment.Center; + this.并发上传.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.并发上传.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.并发上传.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.并发上传.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.并发上传.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.并发上传.Style.ForeColor.Color = System.Drawing.Color.White; + this.并发上传.Style.GradientAngle = 90; + this.并发上传.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.并发上传.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.并发上传.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.并发上传.TabIndex = 768; + this.并发上传.Text = "测试并发上传"; + this.并发上传.Visible = false; + this.并发上传.Click += new System.EventHandler(this.并发上传_Click); + // + // chkImgRandomBlock + // + this.chkImgRandomBlock.AutoSize = true; + this.chkImgRandomBlock.Location = new System.Drawing.Point(11, 32); + this.chkImgRandomBlock.Name = "chkImgRandomBlock"; + this.chkImgRandomBlock.Size = new System.Drawing.Size(123, 21); + this.chkImgRandomBlock.TabIndex = 821; + this.chkImgRandomBlock.Text = "图书图片随机打码"; + this.chkImgRandomBlock.UseVisualStyleBackColor = true; + this.chkImgRandomBlock.Visible = false; + // + // label11 + // + this.label11.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.label11.AutoSize = true; + this.label11.Location = new System.Drawing.Point(8, 129); + this.label11.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label11.Name = "label11"; + this.label11.Size = new System.Drawing.Size(68, 17); + this.label11.TabIndex = 536; + this.label11.Text = "元，单买加"; + this.label11.Visible = false; + // + // txtSinglePriceAdd + // + this.txtSinglePriceAdd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.txtSinglePriceAdd.Location = new System.Drawing.Point(76, 126); + this.txtSinglePriceAdd.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtSinglePriceAdd.Name = "txtSinglePriceAdd"; + this.txtSinglePriceAdd.Size = new System.Drawing.Size(31, 23); + this.txtSinglePriceAdd.TabIndex = 587; + this.txtSinglePriceAdd.Text = "1.0"; + this.txtSinglePriceAdd.Visible = false; + this.txtSinglePriceAdd.TextChanged += new System.EventHandler(this.txtAddPrice_TextChanged); + // + // chkTestNoAuditUpload + // + this.chkTestNoAuditUpload.AutoSize = true; + this.chkTestNoAuditUpload.Location = new System.Drawing.Point(11, 59); + this.chkTestNoAuditUpload.Name = "chkTestNoAuditUpload"; + this.chkTestNoAuditUpload.Size = new System.Drawing.Size(123, 21); + this.chkTestNoAuditUpload.TabIndex = 779; + this.chkTestNoAuditUpload.Text = "测试免审提交商品"; + this.chkTestNoAuditUpload.UseVisualStyleBackColor = true; + this.chkTestNoAuditUpload.Visible = false; + // + // dgvSelectProduct + // + this.dgvSelectProduct.AllowUserToAddRows = false; + this.dgvSelectProduct.AllowUserToDeleteRows = false; + dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3; + this.dgvSelectProduct.AutoRowNumber = true; + this.dgvSelectProduct.BackgroundColor = System.Drawing.Color.White; + this.dgvSelectProduct.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvSelectProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4; + this.dgvSelectProduct.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dgvSelectProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.colCheck, + this.colSelectId, + this.colSupplierId, + this.colSupplierName, + this.colLogin, + this.colInShop, + this.colSpuId, + this.colSkcId, + this.colImgUrl, + this.colProductSkcPic, + this.colSkuFakeImgUrl, + this.colSkuFakeImg, + this.colProductName, + this.colProductCat, + this.colExtCode, + this.colMsg, + this.colDraftId, + this.colNotes, + this.colUserNotes, + this.ColDelete, + this.colAddTime, + this.colOpResult}); + this.dgvSelectProduct.Dock = System.Windows.Forms.DockStyle.Fill; + this.dgvSelectProduct.Location = new System.Drawing.Point(0, 0); + this.dgvSelectProduct.MultiSelectCheckBox = true; + this.dgvSelectProduct.Name = "dgvSelectProduct"; + this.dgvSelectProduct.ReadOnly = true; + this.dgvSelectProduct.RowTemplate.Height = 23; + this.dgvSelectProduct.Size = new System.Drawing.Size(1106, 442); + this.dgvSelectProduct.TabIndex = 187; + this.dgvSelectProduct.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvSelectProduct_CellContentClick); + // + // splitContainer4 + // + this.splitContainer4.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer4.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; + this.splitContainer4.Location = new System.Drawing.Point(0, 0); + this.splitContainer4.Name = "splitContainer4"; + // + // splitContainer4.Panel1 + // + this.splitContainer4.Panel1.Controls.Add(this.statusBar); + // + // splitContainer4.Panel2 + // + this.splitContainer4.Panel2.Controls.Add(this.btnClear); + this.splitContainer4.Panel2.Controls.Add(this.panelEx1); + this.splitContainer4.Size = new System.Drawing.Size(1524, 26); + this.splitContainer4.SplitterDistance = 833; + this.splitContainer4.TabIndex = 3; + // + // statusBar + // + this.statusBar.BackColor = System.Drawing.Color.White; + this.statusBar.Dock = System.Windows.Forms.DockStyle.Fill; + this.statusBar.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.statusBar.Location = new System.Drawing.Point(0, 0); + this.statusBar.Margin = new System.Windows.Forms.Padding(0); + this.statusBar.Name = "statusBar"; + this.statusBar.Size = new System.Drawing.Size(833, 26); + this.statusBar.TabIndex = 2; + // + // btnClear + // + this.btnClear.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.btnClear.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnClear.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnClear.DisabledBackColor = System.Drawing.Color.Empty; + this.btnClear.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnClear.Location = new System.Drawing.Point(475, 2); + this.btnClear.Name = "btnClear"; + this.btnClear.Size = new System.Drawing.Size(90, 21); + this.btnClear.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnClear.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnClear.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnClear.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnClear.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnClear.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnClear.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnClear.Style.GradientAngle = 90; + this.btnClear.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnClear.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnClear.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnClear.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.btnClear.TabIndex = 440; + this.btnClear.Text = "清空结果"; + this.btnClear.Visible = false; + // + // panelEx1 + // + this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; + this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty; + this.panelEx1.Location = new System.Drawing.Point(568, 2); + this.panelEx1.Name = "panelEx1"; + this.panelEx1.Size = new System.Drawing.Size(115, 21); + this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; + this.panelEx1.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.panelEx1.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.panelEx1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.panelEx1.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.panelEx1.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.panelEx1.Style.GradientAngle = 90; + this.panelEx1.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; + this.panelEx1.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.panelEx1.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.panelEx1.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.panelEx1.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.panelEx1.TabIndex = 668; + this.panelEx1.Text = "停止当前操作"; + this.panelEx1.Visible = false; + // // colSelect // + this.colSelect.Frozen = true; this.colSelect.HeaderText = "全选"; this.colSelect.Name = "colSelect"; this.colSelect.ReadOnly = true; @@ -1852,6 +2098,7 @@ namespace TemuKJD.WXForms.ProductForms // // colShopLoginName // + this.colShopLoginName.Frozen = true; this.colShopLoginName.HeaderText = "店铺登录名"; this.colShopLoginName.Name = "colShopLoginName"; this.colShopLoginName.ReadOnly = true; @@ -1859,6 +2106,7 @@ namespace TemuKJD.WXForms.ProductForms // // colShopId // + this.colShopId.Frozen = true; this.colShopId.HeaderText = "店铺Id"; this.colShopId.Name = "colShopId"; this.colShopId.ReadOnly = true; @@ -1868,6 +2116,7 @@ namespace TemuKJD.WXForms.ProductForms // colShopName // this.colShopName.FillWeight = 150F; + this.colShopName.Frozen = true; this.colShopName.HeaderText = "店铺名称"; this.colShopName.Name = "colShopName"; this.colShopName.ReadOnly = true; @@ -1881,6 +2130,13 @@ namespace TemuKJD.WXForms.ProductForms this.colShopNotes.ReadOnly = true; this.colShopNotes.Width = 66; // + // colGroup + // + this.colGroup.HeaderText = "分组"; + this.colGroup.Name = "colGroup"; + this.colGroup.ReadOnly = true; + this.colGroup.Width = 66; + // // colSelectProduct // this.colSelectProduct.HeaderText = "选择商品"; @@ -1946,141 +2202,6 @@ namespace TemuKJD.WXForms.ProductForms this.colMessage.Name = "colMessage"; this.colMessage.ReadOnly = true; // - // pbLoading - // - this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None; - this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue; - this.pbLoading.Location = new System.Drawing.Point(547, 148); - this.pbLoading.Name = "pbLoading"; - this.pbLoading.Size = new System.Drawing.Size(50, 50); - this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.pbLoading.TabIndex = 780; - this.pbLoading.TabStop = false; - this.pbLoading.Visible = false; - // - // 并发上传 - // - this.并发上传.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.并发上传.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.并发上传.Cursor = System.Windows.Forms.Cursors.Hand; - this.并发上传.DisabledBackColor = System.Drawing.Color.Empty; - this.并发上传.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.并发上传.Location = new System.Drawing.Point(1019, 30); - this.并发上传.Name = "并发上传"; - this.并发上传.Size = new System.Drawing.Size(118, 23); - this.并发上传.Style.Alignment = System.Drawing.StringAlignment.Center; - this.并发上传.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.并发上传.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.并发上传.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.并发上传.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.并发上传.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.并发上传.Style.ForeColor.Color = System.Drawing.Color.White; - this.并发上传.Style.GradientAngle = 90; - this.并发上传.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.并发上传.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.并发上传.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.并发上传.TabIndex = 768; - this.并发上传.Text = "测试并发上传"; - this.并发上传.Visible = false; - this.并发上传.Click += new System.EventHandler(this.并发上传_Click); - // - // chkImgRandomBlock - // - this.chkImgRandomBlock.AutoSize = true; - this.chkImgRandomBlock.Location = new System.Drawing.Point(117, 32); - this.chkImgRandomBlock.Name = "chkImgRandomBlock"; - this.chkImgRandomBlock.Size = new System.Drawing.Size(123, 21); - this.chkImgRandomBlock.TabIndex = 821; - this.chkImgRandomBlock.Text = "图书图片随机打码"; - this.chkImgRandomBlock.UseVisualStyleBackColor = true; - this.chkImgRandomBlock.Visible = false; - // - // label11 - // - this.label11.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(8, 34); - this.label11.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(68, 17); - this.label11.TabIndex = 536; - this.label11.Text = "元，单买加"; - this.label11.Visible = false; - // - // txtSinglePriceAdd - // - this.txtSinglePriceAdd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.txtSinglePriceAdd.Location = new System.Drawing.Point(76, 31); - this.txtSinglePriceAdd.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); - this.txtSinglePriceAdd.Name = "txtSinglePriceAdd"; - this.txtSinglePriceAdd.Size = new System.Drawing.Size(31, 23); - this.txtSinglePriceAdd.TabIndex = 587; - this.txtSinglePriceAdd.Text = "1.0"; - this.txtSinglePriceAdd.Visible = false; - this.txtSinglePriceAdd.TextChanged += new System.EventHandler(this.txtAddPrice_TextChanged); - // - // chkTestNoAuditUpload - // - this.chkTestNoAuditUpload.AutoSize = true; - this.chkTestNoAuditUpload.Location = new System.Drawing.Point(11, 59); - this.chkTestNoAuditUpload.Name = "chkTestNoAuditUpload"; - this.chkTestNoAuditUpload.Size = new System.Drawing.Size(123, 21); - this.chkTestNoAuditUpload.TabIndex = 779; - this.chkTestNoAuditUpload.Text = "测试免审提交商品"; - this.chkTestNoAuditUpload.UseVisualStyleBackColor = true; - this.chkTestNoAuditUpload.Visible = false; - // - // dgvSelectProduct - // - this.dgvSelectProduct.AllowUserToAddRows = false; - this.dgvSelectProduct.AllowUserToDeleteRows = false; - dataGridViewCellStyle24.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle24; - this.dgvSelectProduct.AutoRowNumber = true; - this.dgvSelectProduct.BackgroundColor = System.Drawing.Color.White; - this.dgvSelectProduct.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle25.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle25.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle25.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle25.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle25.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvSelectProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle25; - this.dgvSelectProduct.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dgvSelectProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.colCheck, - this.colSelectId, - this.colSupplierId, - this.colSupplierName, - this.colLogin, - this.colInShop, - this.colSpuId, - this.colSkcId, - this.colImgUrl, - this.colProductSkcPic, - this.colSkuFakeImgUrl, - this.colSkuFakeImg, - this.colProductName, - this.colProductCat, - this.colExtCode, - this.colMsg, - this.colDraftId, - this.colNotes, - this.colUserNotes, - this.ColDelete, - this.colAddTime, - this.colOpResult}); - this.dgvSelectProduct.Dock = System.Windows.Forms.DockStyle.Fill; - this.dgvSelectProduct.Location = new System.Drawing.Point(0, 0); - this.dgvSelectProduct.MultiSelectCheckBox = true; - this.dgvSelectProduct.Name = "dgvSelectProduct"; - this.dgvSelectProduct.ReadOnly = true; - this.dgvSelectProduct.RowTemplate.Height = 23; - this.dgvSelectProduct.Size = new System.Drawing.Size(1141, 347); - this.dgvSelectProduct.TabIndex = 187; - this.dgvSelectProduct.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvSelectProduct_CellContentClick); - // // colCheck // this.colCheck.Frozen = true; @@ -2104,15 +2225,17 @@ namespace TemuKJD.WXForms.ProductForms this.colSupplierId.HeaderText = "店铺Id"; this.colSupplierId.Name = "colSupplierId"; this.colSupplierId.ReadOnly = true; + this.colSupplierId.Visible = false; // // colSupplierName // - dataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle26; + dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle5; this.colSupplierName.Frozen = true; this.colSupplierName.HeaderText = "店铺名称"; this.colSupplierName.Name = "colSupplierName"; this.colSupplierName.ReadOnly = true; + this.colSupplierName.Width = 90; // // colLogin // @@ -2139,6 +2262,7 @@ namespace TemuKJD.WXForms.ProductForms this.colSpuId.ReadOnly = true; this.colSpuId.Resizable = System.Windows.Forms.DataGridViewTriState.True; this.colSpuId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colSpuId.Width = 120; // // colSkcId // @@ -2186,8 +2310,8 @@ namespace TemuKJD.WXForms.ProductForms // // colProductName // - dataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colProductName.DefaultCellStyle = dataGridViewCellStyle27; + dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colProductName.DefaultCellStyle = dataGridViewCellStyle6; this.colProductName.HeaderText = "商品标题"; this.colProductName.Name = "colProductName"; this.colProductName.ReadOnly = true; @@ -2195,22 +2319,26 @@ namespace TemuKJD.WXForms.ProductForms // // colProductCat // + dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colProductCat.DefaultCellStyle = dataGridViewCellStyle7; this.colProductCat.HeaderText = "商品类目"; this.colProductCat.Name = "colProductCat"; this.colProductCat.ReadOnly = true; - this.colProductCat.Width = 90; + this.colProductCat.Width = 80; // // colExtCode // this.colExtCode.HeaderText = "商品货号"; this.colExtCode.Name = "colExtCode"; this.colExtCode.ReadOnly = true; + this.colExtCode.Width = 120; // // colMsg // this.colMsg.HeaderText = "状态"; this.colMsg.Name = "colMsg"; this.colMsg.ReadOnly = true; + this.colMsg.Width = 75; // // colDraftId // @@ -2219,7 +2347,7 @@ namespace TemuKJD.WXForms.ProductForms this.colDraftId.ReadOnly = true; this.colDraftId.Resizable = System.Windows.Forms.DataGridViewTriState.True; this.colDraftId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.colDraftId.Width = 80; + this.colDraftId.Width = 130; // // colNotes // @@ -2247,117 +2375,26 @@ namespace TemuKJD.WXForms.ProductForms // // colAddTime // - dataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colAddTime.DefaultCellStyle = dataGridViewCellStyle28; + dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colAddTime.DefaultCellStyle = dataGridViewCellStyle8; this.colAddTime.HeaderText = "上传时间"; this.colAddTime.Name = "colAddTime"; this.colAddTime.ReadOnly = true; - this.colAddTime.Width = 80; + this.colAddTime.Width = 66; // // colOpResult // this.colOpResult.HeaderText = "操作结果"; this.colOpResult.Name = "colOpResult"; this.colOpResult.ReadOnly = true; - this.colOpResult.Width = 290; - // - // splitContainer4 - // - this.splitContainer4.Dock = System.Windows.Forms.DockStyle.Fill; - this.splitContainer4.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; - this.splitContainer4.Location = new System.Drawing.Point(0, 0); - this.splitContainer4.Name = "splitContainer4"; - // - // splitContainer4.Panel1 - // - this.splitContainer4.Panel1.Controls.Add(this.statusBar); - // - // splitContainer4.Panel2 - // - this.splitContainer4.Panel2.Controls.Add(this.btnClear); - this.splitContainer4.Panel2.Controls.Add(this.panelEx1); - this.splitContainer4.Size = new System.Drawing.Size(1499, 26); - this.splitContainer4.SplitterDistance = 808; - this.splitContainer4.TabIndex = 3; - // - // statusBar - // - this.statusBar.BackColor = System.Drawing.Color.White; - this.statusBar.Dock = System.Windows.Forms.DockStyle.Fill; - this.statusBar.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.statusBar.Location = new System.Drawing.Point(0, 0); - this.statusBar.Margin = new System.Windows.Forms.Padding(0); - this.statusBar.Name = "statusBar"; - this.statusBar.Size = new System.Drawing.Size(808, 26); - this.statusBar.TabIndex = 2; - // - // btnClear - // - this.btnClear.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.btnClear.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnClear.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnClear.DisabledBackColor = System.Drawing.Color.Empty; - this.btnClear.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnClear.Location = new System.Drawing.Point(475, 2); - this.btnClear.Name = "btnClear"; - this.btnClear.Size = new System.Drawing.Size(90, 21); - this.btnClear.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnClear.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnClear.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnClear.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.btnClear.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.btnClear.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.btnClear.Style.ForeColor.Color = System.Drawing.Color.White; - this.btnClear.Style.GradientAngle = 90; - this.btnClear.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnClear.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnClear.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnClear.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; - this.btnClear.TabIndex = 440; - this.btnClear.Text = "清空结果"; - this.btnClear.Visible = false; - // - // panelEx1 - // - this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; - this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty; - this.panelEx1.Location = new System.Drawing.Point(568, 2); - this.panelEx1.Name = "panelEx1"; - this.panelEx1.Size = new System.Drawing.Size(115, 21); - this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; - this.panelEx1.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); - this.panelEx1.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); - this.panelEx1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.panelEx1.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.panelEx1.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.panelEx1.Style.GradientAngle = 90; - this.panelEx1.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; - this.panelEx1.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.panelEx1.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.panelEx1.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.panelEx1.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; - this.panelEx1.TabIndex = 668; - this.panelEx1.Text = "停止当前操作"; - this.panelEx1.Visible = false; - // - // panel1 - // - this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.panel1.Location = new System.Drawing.Point(699, 552); - this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(873, 86); - this.panel1.TabIndex = 189; + this.colOpResult.Width = 280; // // WXDBProdUploadForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.BackColor = System.Drawing.Color.White; - this.ClientSize = new System.Drawing.Size(1575, 641); + this.ClientSize = new System.Drawing.Size(1524, 641); this.Controls.Add(this.splitContainer1); - this.Controls.Add(this.panel1); this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.KeyPreview = true; this.Name = "WXDBProdUploadForm"; @@ -2415,7 +2452,6 @@ namespace TemuKJD.WXForms.ProductForms private System.Windows.Forms.SplitContainer splitContainer4; private UserControls.StatusBarUserControl statusBar; private DevComponents.DotNetBar.PanelEx btnUpload; - private System.Windows.Forms.Panel panel1; private UserComponent.UcGroupBoxEx ucGroupBoxEx2; private System.Windows.Forms.Label label11; private System.Windows.Forms.TextBox txtAddMorePrice; @@ -2499,11 +2535,34 @@ namespace TemuKJD.WXForms.ProductForms private DevComponents.DotNetBar.PanelEx btnSelectOffline; private DevComponents.DotNetBar.PanelEx btnSelectOnline; private DevComponents.DotNetBar.PanelEx btnRefreshAuthor; + private System.Windows.Forms.PictureBox pbSelectProd; + private System.Windows.Forms.TextBox txtSearchGoodsName; + private System.Windows.Forms.Label label20; + private System.Windows.Forms.TextBox txtTitleHeadWord; + private System.Windows.Forms.Label label22; + private System.Windows.Forms.Label label23; + private System.Windows.Forms.TextBox txtFilterBoundMin; + private UserComponent.UcCheckBox chkSevenDays; + private UserComponent.UcCheckBox chkSaveBound; + private UserComponent.UcCheckBox chkAiShortTitle; + private UserComponent.UcCheckBox chkSkipQualification; + private UserComponent.UcCheckBox chkWXComplateProd; + private UserComponent.UcCheckBox chkUseWXComplateProd; + private DevComponents.DotNetBar.PanelEx btnProdDb; + private UserComponent.UcCheckBox chkRandomCompanyProd; + private UserComponent.UcComboBoxMutiSelect cmbCateFilter1; + private UserComponent.UcComboBoxMutiSelect cmbCateFilter3; + private UserComponent.UcComboBoxMutiSelect cmbCateFilter2; + private System.Windows.Forms.ComboBox cmbHot; + private System.Windows.Forms.Label lblHot; + private UserComponent.UcComboBoxMutiSelect cmbFilterShopGroup; + private System.Windows.Forms.Label label24; private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect; private System.Windows.Forms.DataGridViewTextBoxColumn colShopLoginName; private System.Windows.Forms.DataGridViewTextBoxColumn colShopId; private System.Windows.Forms.DataGridViewTextBoxColumn colShopName; private System.Windows.Forms.DataGridViewTextBoxColumn colShopNotes; + private System.Windows.Forms.DataGridViewTextBoxColumn colGroup; private System.Windows.Forms.DataGridViewLinkColumn colSelectProduct; private System.Windows.Forms.DataGridViewLinkColumn colLoginStatus; private System.Windows.Forms.DataGridViewLinkColumn colApi; @@ -2512,13 +2571,6 @@ namespace TemuKJD.WXForms.ProductForms private System.Windows.Forms.DataGridViewTextBoxColumn colOnSaleNum; private System.Windows.Forms.DataGridViewTextBoxColumn colRemaining; private System.Windows.Forms.DataGridViewTextBoxColumn colMessage; - private System.Windows.Forms.PictureBox pbSelectProd; - private System.Windows.Forms.TextBox txtSearchGoodsName; - private System.Windows.Forms.Label label20; - private System.Windows.Forms.TextBox txtTitleHeadWord; - private System.Windows.Forms.Label label22; - private System.Windows.Forms.Label label23; - private System.Windows.Forms.TextBox txtFilterBoundMin; private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck; private System.Windows.Forms.DataGridViewTextBoxColumn colSelectId; private System.Windows.Forms.DataGridViewTextBoxColumn colSupplierId; @@ -2541,18 +2593,5 @@ namespace TemuKJD.WXForms.ProductForms private System.Windows.Forms.DataGridViewLinkColumn ColDelete; private System.Windows.Forms.DataGridViewTextBoxColumn colAddTime; private System.Windows.Forms.DataGridViewTextBoxColumn colOpResult; - private UserComponent.UcCheckBox chkSevenDays; - private UserComponent.UcCheckBox chkSaveBound; - private UserComponent.UcCheckBox chkAiShortTitle; - private UserComponent.UcCheckBox chkSkipQualification; - private UserComponent.UcCheckBox chkWXComplateProd; - private UserComponent.UcCheckBox chkUseWXComplateProd; - private DevComponents.DotNetBar.PanelEx btnProdDb; - private UserComponent.UcCheckBox chkRandomCompanyProd; - private UserComponent.UcComboBoxMutiSelect cmbCateFilter1; - private UserComponent.UcComboBoxMutiSelect cmbCateFilter3; - private UserComponent.UcComboBoxMutiSelect cmbCateFilter2; - private System.Windows.Forms.ComboBox cmbHot; - private System.Windows.Forms.Label lblHot; } } \ No newline at end of file diff --git a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs index 91953b5..415e7c8 100644 --- a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs +++ b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs @@ -40,15 +40,12 @@ namespace TemuKJD.WXForms.ProductForms bool isInit = false; CheckBox chkSelectAll = null; - ConcurrentList lstShopAuthInfo = new ConcurrentList(); ConcurrentList lstWXShopTokenInfo = new ConcurrentList(); - public NaiBa.Util.ConcurrentList lstTemuDBProductSelect = new NaiBa.Util.ConcurrentList(); - NaiBa.Util.ConcurrentList lstAddPriceRule = new NaiBa.Util.ConcurrentList(); + ConcurrentList lstTemuDBProductSelect = new ConcurrentList(); + ConcurrentList lstAddPriceRule = new ConcurrentList(); AddPriceRule defaultAddPriceRule = null; WXUploadRule wxUploadRule = null; - //public Dictionary> dicCheckedShopIdList = new Dictionary>(); public Dictionary dicCheckedShopId = new Dictionary(); - public Dictionary dicShopUpload = new Dictionary(); public string pdd_product_cates = ""; public List forceFilteKeyWords = new List() { @@ -64,15 +61,9 @@ namespace TemuKJD.WXForms.ProductForms private void UserSelectDbProductForm_Load(object sender, EventArgs e) { - this.splitContainer1.Dock = DockStyle.Fill; - this.panel1.Location = new Point(40, 30); - this.panel1.Width = this.Width - 80; - this.panel1.Height = this.Height - 60; - this.panel1.SendToBack(); - - lstShopAuthInfo = NaiBa.Util.Helper.ConfigHelper.LoadConfig>("wx_shop_auth_list"); - if (lstShopAuthInfo == null) - lstShopAuthInfo = new ConcurrentList(); + GlobalConfig.lstWxShopAuthInfo = NaiBa.Util.Helper.ConfigHelper.LoadConfig>("wx_shop_auth_list"); + if (GlobalConfig.lstWxShopAuthInfo == null) + GlobalConfig.lstWxShopAuthInfo = new ConcurrentList(); lstWXShopTokenInfo = NaiBa.Util.Helper.ConfigHelper.LoadConfig>("wx_shop_token_list"); if (lstWXShopTokenInfo == null) @@ -117,9 +108,10 @@ namespace TemuKJD.WXForms.ProductForms dicCheckedShopId = NaiBa.Util.Helper.ConfigHelper.LoadConfig>("wx_checked_shop_dic"); if (dicCheckedShopId == null) dicCheckedShopId = new Dictionary(); - dicShopUpload = NaiBa.Util.Helper.ConfigHelper.LoadConfig>("wx_shop_upload_info"); - if (dicShopUpload == null) - dicShopUpload = new Dictionary(); + + GlobalConfig.dicWxShopUploadInfo = NaiBa.Util.Helper.ConfigHelper.LoadConfig>("wx_shop_upload_info"); + if (GlobalConfig.dicWxShopUploadInfo == null) + GlobalConfig.dicWxShopUploadInfo = new Dictionary(); defaultAddPriceRule = NaiBa.Util.Helper.ConfigHelper.LoadConfig("wx_default_add_price_rule"); if (defaultAddPriceRule == null) @@ -222,7 +214,6 @@ namespace TemuKJD.WXForms.ProductForms })); }); - this.panel1.SendToBack(); chkSelectAll = dgvShop.Columns["colSelect"].AddHeaderCheckBox(HorizontalAlignment.Center, 0, 0, null, null, false); dgvShop.Columns["colSelect"].HeaderText = ""; //chkSelectAll.Width = chkSelectAll.Height = 13; @@ -357,7 +348,7 @@ namespace TemuKJD.WXForms.ProductForms List tList = new List(); if (idRefreshTodayHasGet) - lstShopAuthInfo.RemoveAll(s => updateIds.Contains(s.ShopId)); + GlobalConfig.lstWxShopAuthInfo.RemoveAll(s => updateIds.Contains(s.ShopId)); foreach (var shop in GlobalConfig.ShopLoginList.Where(s => updateIds.Contains(s.ShopId))) { Invoke(new Action(() => { BindShop(shop, selectIds, ""); })); @@ -371,10 +362,10 @@ namespace TemuKJD.WXForms.ProductForms return; } - var authInfo = lstShopAuthInfo.FirstOrDefault(sa => sa.ShopId == shop.ShopId); + var authInfo = GlobalConfig.lstWxShopAuthInfo.FirstOrDefault(sa => sa.ShopId == shop.ShopId); if (idRefreshTodayHasGet || authInfo == null || authInfo?.UpdateTime.Date != DateTime.Now.Date) { - lstShopAuthInfo.RemoveAll(sa => sa.ShopId == shop.ShopId); + GlobalConfig.lstWxShopAuthInfo.RemoveAll(sa => sa.ShopId == shop.ShopId); var rst = WXUpload.GetApiServiceList(shop); if (!rst.Contains("\"code\":0")) { @@ -385,7 +376,7 @@ namespace TemuKJD.WXForms.ProductForms return; } - lstShopAuthInfo.Add(new AuthInfo() { ShopId = shop.ShopId, UpdateTime = DateTime.Now, ExpiresTime = DateTime.Now }); + GlobalConfig.lstWxShopAuthInfo.Add(new AuthInfo() { ShopId = shop.ShopId, UpdateTime = DateTime.Now, ExpiresTime = DateTime.Now }); Invoke(new Action(() => { BindShop(shop, selectIds, "授权查询失败"); })); return; } @@ -396,13 +387,13 @@ namespace TemuKJD.WXForms.ProductForms if (itemObj["serviceName"].ParseToString() == "店统领供应链-商品管理") { var expiresTick = itemObj["expireTime"].ParseToLong(); - lstShopAuthInfo.Add(new AuthInfo() { ShopId = shop.ShopId, UpdateTime = DateTime.Now, ExpiresTime = BaseClass.StampToDateTime(expiresTick.ParseToInt()) }); + GlobalConfig.lstWxShopAuthInfo.Add(new AuthInfo() { ShopId = shop.ShopId, UpdateTime = DateTime.Now, ExpiresTime = BaseClass.StampToDateTime(expiresTick.ParseToInt()) }); Invoke(new Action(() => { BindShop(shop, selectIds, "已查询"); })); return; } } // 没找到指定服务 - lstShopAuthInfo.Add(new AuthInfo() { ShopId = shop.ShopId, UpdateTime = DateTime.Now, ExpiresTime = DateTime.Now }); + GlobalConfig.lstWxShopAuthInfo.Add(new AuthInfo() { ShopId = shop.ShopId, UpdateTime = DateTime.Now, ExpiresTime = DateTime.Now }); Invoke(new Action(() => { BindShop(shop, selectIds, "已查询"); })); } } @@ -414,7 +405,7 @@ namespace TemuKJD.WXForms.ProductForms while (tList.Where(ta => !ta.IsFaulted && !ta.IsCompleted).Count() >= 20) { Thread.Sleep(100); } } while (tList.Where(ta => !ta.IsFaulted && !ta.IsCompleted).Count() >= 1) { Thread.Sleep(100); } - NaiBa.Util.Helper.ConfigHelper.SaveConfig( "wx_shop_auth_list", lstShopAuthInfo); + NaiBa.Util.Helper.ConfigHelper.SaveConfig("wx_shop_auth_list", GlobalConfig.lstWxShopAuthInfo); Invoke(new Action(() => { pbLoadingShop.Visible = false; })); }); } @@ -583,11 +574,15 @@ namespace TemuKJD.WXForms.ProductForms BindShop(shopEntity, selectIds); } cmbFilterShopNotes.Items.Clear(); - //cmbFilterShopNotes.Items.Add(""); foreach (var note in GlobalConfig.ShopLoginList.Select(s => s.Notes).Where(s => !s.IsNullOrEmpty()).Distinct()) { cmbFilterShopNotes.Items.Add(note); } + cmbFilterShopGroup.Items.Clear(); + foreach (var note in GlobalConfig.ShopLoginList.Select(s => s.GroupName).Where(s => !s.IsNullOrEmpty()).Distinct()) + { + cmbFilterShopGroup.Items.Add(note); + } } private void BindShop(ShopLoginInfo shopEntity, List selectShopId = null, string msg = "") @@ -612,14 +607,15 @@ namespace TemuKJD.WXForms.ProductForms shopEntity.ShopId, shopEntity.ShopAccount, shopEntity.Notes, + shopEntity.GroupName, "选择商品", canUse ? "在线" : "掉线", - lstShopAuthInfo.FirstOrDefault(sa => sa.ShopId == shopEntity.ShopId)?.ExpiresTime > DateTime.Now.AddMinutes(5) ? "可用" : "过期", + GlobalConfig.lstWxShopAuthInfo.FirstOrDefault(sa => sa.ShopId == shopEntity.ShopId)?.ExpiresTime > DateTime.Now.AddMinutes(5) ? "可用" : "过期", canUse, - dicShopUpload.ContainsKey(shopEntity.ShopId) && dicShopUpload[shopEntity.ShopId].DicDayUploadCount.ContainsKey(day) ? - dicShopUpload[shopEntity.ShopId].DicDayUploadCount[day] : 0, - dicShopUpload.ContainsKey(shopEntity.ShopId) && dicShopUpload[shopEntity.ShopId].OnSaleRefreshDay == DateTime.Now.ToString("yyyyMMdd").ParseToInt() ? - dicShopUpload[shopEntity.ShopId].OnSaleCount : 0, + GlobalConfig.dicWxShopUploadInfo.ContainsKey(shopEntity.ShopId) && GlobalConfig.dicWxShopUploadInfo[shopEntity.ShopId].DicDayUploadCount.ContainsKey(day) ? + GlobalConfig.dicWxShopUploadInfo[shopEntity.ShopId].DicDayUploadCount[day] : 0, + GlobalConfig.dicWxShopUploadInfo.ContainsKey(shopEntity.ShopId) && GlobalConfig.dicWxShopUploadInfo[shopEntity.ShopId].OnSaleRefreshDay == DateTime.Now.ToString("yyyyMMdd").ParseToInt() ? + GlobalConfig.dicWxShopUploadInfo[shopEntity.ShopId].OnSaleCount : 0, shopEntity.AddProductRemaining, msg ); @@ -633,12 +629,10 @@ namespace TemuKJD.WXForms.ProductForms row.Cells["colLoginStatus"].Value = canUse ? "在线" : "掉线"; row.Cells["colLoginStatus"].Style.ForeColor = canUse ? Color.Green : Color.Red; row.Cells["colCanUse"].Value = canUse; - row.Cells["colApi"].Value = lstShopAuthInfo.FirstOrDefault(sa => sa.ShopId == shopEntity.ShopId)?.ExpiresTime > DateTime.Now.AddMinutes(5) ? "可用" : "过期"; + row.Cells["colApi"].Value = GlobalConfig.lstWxShopAuthInfo.FirstOrDefault(sa => sa.ShopId == shopEntity.ShopId)?.ExpiresTime > DateTime.Now.AddMinutes(5) ? "可用" : "过期"; row.Cells["colRemaining"].Value = shopEntity.AddProductRemaining; - row.Cells["colUploadCount"].Value = dicShopUpload.ContainsKey(shopEntity.ShopId) && dicShopUpload[shopEntity.ShopId].DicDayUploadCount.ContainsKey(day) ? - dicShopUpload[shopEntity.ShopId].DicDayUploadCount[day] : 0; - row.Cells["colOnSaleNum"].Value = dicShopUpload.ContainsKey(shopEntity.ShopId) && dicShopUpload[shopEntity.ShopId].OnSaleRefreshDay == DateTime.Now.ToString("yyyyMMdd").ParseToInt() ? - dicShopUpload[shopEntity.ShopId].OnSaleCount : 0; + row.Cells["colUploadCount"].Value = GlobalConfig.dicWxShopUploadInfo.ContainsKey(shopEntity.ShopId) ? GlobalConfig.dicWxShopUploadInfo[shopEntity.ShopId].DicDayUploadCount[day] : 0; + row.Cells["colOnSaleNum"].Value = GlobalConfig.dicWxShopUploadInfo.ContainsKey(shopEntity.ShopId) ? GlobalConfig.dicWxShopUploadInfo[shopEntity.ShopId].OnSaleCount : 0; row.Cells["colMessage"].Value = msg; } @@ -1798,7 +1792,7 @@ namespace TemuKJD.WXForms.ProductForms token = new WXShopTokenInfo(); if (token.isExpire || string.IsNullOrEmpty(token.accessToken)) { - AuthInfo auth = lstShopAuthInfo.FirstOrDefault(sa => sa.ShopId == shop.ShopId); + AuthInfo auth = GlobalConfig.lstWxShopAuthInfo.FirstOrDefault(sa => sa.ShopId == shop.ShopId); if (auth != null && auth.ExpiresTime > DateTime.Now.AddMinutes(5)) { token = new WxApiBLL().GetShopWxToken(shop); @@ -2635,6 +2629,7 @@ namespace TemuKJD.WXForms.ProductForms var addressArr = JsonHelper.JObjectParse(expressRst)["freightTemplateList"]; foreach (var addressObj in addressArr) { + var addressStr = JsonHelper.SerializeObject(addressObj); if (addressObj["isDefault"].ParseToInt() == 1) { string templateId = addressObj["templateId"].ParseToString(); @@ -2643,6 +2638,11 @@ namespace TemuKJD.WXForms.ProductForms break; } } + if (upProdParam.product.info.expressInfo == null) + { + upProdParam.product.info.expressInfo = new expressInfoParam(); + upProdParam.product.info.expressInfo.templateId = BaseRegex.GetStringJson(ref expressRst, "templateId"); + } } catch (Exception ex) { @@ -4238,22 +4238,22 @@ namespace TemuKJD.WXForms.ProductForms if (dgvShopRow != null) { var day = DateTime.Now.ToString("yyyyMMdd").ParseToInt(); - if (!dicShopUpload.ContainsKey(shop.ShopId)) - dicShopUpload[shop.ShopId] = new WxShopUploadInfo(); - if (!dicShopUpload[shop.ShopId].DicDayUploadCount.ContainsKey(day)) - dicShopUpload[shop.ShopId].DicDayUploadCount[day] = 0; - dicShopUpload[shop.ShopId].DicDayUploadCount[day] += 1; + if (!GlobalConfig.dicWxShopUploadInfo.ContainsKey(shop.ShopId)) + GlobalConfig.dicWxShopUploadInfo[shop.ShopId] = new WxShopUploadInfo(); + if (!GlobalConfig.dicWxShopUploadInfo[shop.ShopId].DicDayUploadCount.ContainsKey(day)) + GlobalConfig.dicWxShopUploadInfo[shop.ShopId].DicDayUploadCount[day] = 0; + GlobalConfig.dicWxShopUploadInfo[shop.ShopId].DicDayUploadCount[day] += 1; // 删除45天前的记录 - var removeKeys = dicShopUpload[shop.ShopId].DicDayUploadCount.Keys.Where(s => s < DateTime.Now.AddDays(-45).ToString("yyyyMMdd").ParseToInt()).ToList(); + var removeKeys = GlobalConfig.dicWxShopUploadInfo[shop.ShopId].DicDayUploadCount.Keys.Where(s => s < DateTime.Now.AddDays(-45).ToString("yyyyMMdd").ParseToInt()).ToList(); foreach (var key in removeKeys) { - dicShopUpload[shop.ShopId].DicDayUploadCount.Remove(key); + GlobalConfig.dicWxShopUploadInfo[shop.ShopId].DicDayUploadCount.Remove(key); } - NaiBa.Util.Helper.ConfigHelper.SaveConfig("wx_shop_upload_info", dicShopUpload); + NaiBa.Util.Helper.ConfigHelper.SaveConfig("wx_shop_upload_info", GlobalConfig.dicWxShopUploadInfo); Invoke(new Action(() => { - dgvShopRow.Cells["colUploadCount"].Value = dicShopUpload[shop.ShopId].DicDayUploadCount[day]; + dgvShopRow.Cells["colUploadCount"].Value = GlobalConfig.dicWxShopUploadInfo[shop.ShopId].DicDayUploadCount[day]; })); } @@ -4902,22 +4902,22 @@ namespace TemuKJD.WXForms.ProductForms if (dgvShopRow != null) { var day = DateTime.Now.ToString("yyyyMMdd").ParseToInt(); - if (!dicShopUpload.ContainsKey(shop.ShopId)) - dicShopUpload[shop.ShopId] = new WxShopUploadInfo(); - if (!dicShopUpload[shop.ShopId].DicDayUploadCount.ContainsKey(day)) - dicShopUpload[shop.ShopId].DicDayUploadCount[day] = 0; - dicShopUpload[shop.ShopId].DicDayUploadCount[day] += 1; + if (!GlobalConfig.dicWxShopUploadInfo.ContainsKey(shop.ShopId)) + GlobalConfig.dicWxShopUploadInfo[shop.ShopId] = new WxShopUploadInfo(); + if (!GlobalConfig.dicWxShopUploadInfo[shop.ShopId].DicDayUploadCount.ContainsKey(day)) + GlobalConfig.dicWxShopUploadInfo[shop.ShopId].DicDayUploadCount[day] = 0; + GlobalConfig.dicWxShopUploadInfo[shop.ShopId].DicDayUploadCount[day] += 1; // 删除45天前的记录 - var removeKeys = dicShopUpload[shop.ShopId].DicDayUploadCount.Keys.Where(s => s < DateTime.Now.AddDays(-45).ToString("yyyyMMdd").ParseToInt()); + var removeKeys = GlobalConfig.dicWxShopUploadInfo[shop.ShopId].DicDayUploadCount.Keys.Where(s => s < DateTime.Now.AddDays(-45).ToString("yyyyMMdd").ParseToInt()); foreach (var key in removeKeys) { - dicShopUpload[shop.ShopId].DicDayUploadCount.Remove(key); + GlobalConfig.dicWxShopUploadInfo[shop.ShopId].DicDayUploadCount.Remove(key); } - NaiBa.Util.Helper.ConfigHelper.SaveConfig("wx_shop_upload_info", dicShopUpload); + NaiBa.Util.Helper.ConfigHelper.SaveConfig("wx_shop_upload_info", GlobalConfig.dicWxShopUploadInfo); Invoke(new Action(() => { - dgvShopRow.Cells["colUploadCount"].Value = dicShopUpload[shop.ShopId].DicDayUploadCount[day]; + dgvShopRow.Cells["colUploadCount"].Value = GlobalConfig.dicWxShopUploadInfo[shop.ShopId].DicDayUploadCount[day]; })); } } @@ -5135,13 +5135,18 @@ namespace TemuKJD.WXForms.ProductForms private void btnFilterShop_Click(object sender, EventArgs e) { - foreach(DataGridViewRow row in dgvShop.Rows) - { - string notes = cmbFilterShopNotes.Text.Trim().Trim(';'); - if (notes == "全部") - notes = ""; - List notesLst = notes.Split(new string[] { ";", "；", ",", "，" }, StringSplitOptions.RemoveEmptyEntries).ToList(); + string notes = cmbFilterShopNotes.Text.Trim().Trim(';'); + if (notes == "全部") + notes = ""; + List notesLst = notes.Split(new string[] { ";", "；", ",", "，" }, StringSplitOptions.RemoveEmptyEntries).ToList(); + string group = cmbFilterShopGroup.Text.Trim().Trim(';'); + if (group == "全部") + group = ""; + List groupLst = group.Split(new string[] { ";", "；", ",", "，" }, StringSplitOptions.RemoveEmptyEntries).ToList(); + + foreach (DataGridViewRow row in dgvShop.Rows) + { if (!row.Cells["colShopName"].Value.ParseToString().Contains(txtFilterShopName.Text.Trim())) { row.Visible = false; @@ -5154,6 +5159,12 @@ namespace TemuKJD.WXForms.ProductForms row.Cells["colSelect"].Value = false; continue; } + if (!string.IsNullOrWhiteSpace(group) && !groupLst.Contains(row.Cells["colGroup"].Value.ParseToString())) + { + row.Visible = false; + row.Cells["colSelect"].Value = false; + continue; + } row.Visible = true; } } @@ -5162,6 +5173,7 @@ namespace TemuKJD.WXForms.ProductForms { txtFilterShopName.Text = ""; cmbFilterShopNotes.Text = "全部"; + cmbFilterShopGroup.Text = "全部"; btnFilterShop_Click(null, null); } @@ -5181,16 +5193,24 @@ namespace TemuKJD.WXForms.ProductForms notes = ""; List notesLst = notes.Split(new string[] { ";", "；", ",", "，" }, StringSplitOptions.RemoveEmptyEntries).ToList(); + string group = cmbFilterShopGroup.Text.Trim().Trim(';'); + if (group == "全部") + group = ""; + List groupLst = group.Split(new string[] { ";", "；", ",", "，" }, StringSplitOptions.RemoveEmptyEntries).ToList(); + foreach (DataGridViewRow row in dgvShop.Rows) { - if (row.Visible == true) - { - if (row.Cells["colShopName"].Value.ParseToString().Contains(txtFilterShopName.Text.Trim()) && - (string.IsNullOrWhiteSpace(notes) || notesLst.Contains(row.Cells["colShopNotes"].Value.ParseToString()))) - { - row.Cells["colSelect"].Value = true; - } - } + if (row.Visible == false) + continue; + + if (!row.Cells["colShopName"].Value.ParseToString().Contains(txtFilterShopName.Text.Trim())) + continue; + if (!string.IsNullOrWhiteSpace(notes) && !notesLst.Contains(row.Cells["colShopNotes"].Value.ParseToString())) + continue; + if (!string.IsNullOrWhiteSpace(group) && !groupLst.Contains(row.Cells["colGroup"].Value.ParseToString())) + continue; + + row.Cells["colSelect"].Value = true; } } @@ -5201,16 +5221,24 @@ namespace TemuKJD.WXForms.ProductForms notes = ""; List notesLst = notes.Split(new string[] { ";", "；", ",", "，" }, StringSplitOptions.RemoveEmptyEntries).ToList(); + string group = cmbFilterShopGroup.Text.Trim().Trim(';'); + if (group == "全部") + group = ""; + List groupLst = group.Split(new string[] { ";", "；", ",", "，" }, StringSplitOptions.RemoveEmptyEntries).ToList(); + foreach (DataGridViewRow row in dgvShop.Rows) { - if (row.Visible == true) - { - if (row.Cells["colShopName"].Value.ParseToString().Contains(txtFilterShopName.Text.Trim()) && - (string.IsNullOrWhiteSpace(notes) || notesLst.Contains(row.Cells["colShopNotes"].Value.ParseToString()))) - { - row.Cells["colSelect"].Value = false; - } - } + if (row.Visible == false) + continue; + + if (!row.Cells["colShopName"].Value.ParseToString().Contains(txtFilterShopName.Text.Trim())) + continue; + if (!string.IsNullOrWhiteSpace(notes) && !notesLst.Contains(row.Cells["colShopNotes"].Value.ParseToString())) + continue; + if (!string.IsNullOrWhiteSpace(group) && !groupLst.Contains(row.Cells["colGroup"].Value.ParseToString())) + continue; + + row.Cells["colSelect"].Value = false; } } diff --git a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.resx b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.resx index 22f2cf1..4a10eec 100644 --- a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.resx +++ b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.resx @@ -129,6 +129,9 @@ True + + True + True diff --git a/TEMUKJD/WXForms/ProductForms/WXFinderSquareForm.Designer.cs b/TEMUKJD/WXForms/ProductForms/WXFinderSquareForm.Designer.cs index a9ad7c0..b397bb5 100644 --- a/TEMUKJD/WXForms/ProductForms/WXFinderSquareForm.Designer.cs +++ b/TEMUKJD/WXForms/ProductForms/WXFinderSquareForm.Designer.cs @@ -51,7 +51,6 @@ namespace TemuKJD.WXForms.ProductForms this.btnClearFilter = new DevComponents.DotNetBar.PanelEx(); this.btnSearchTalent = new DevComponents.DotNetBar.PanelEx(); this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); - this.btnRefreshAuthor = new DevComponents.DotNetBar.PanelEx(); this.btnSelectOffline = new DevComponents.DotNetBar.PanelEx(); this.btnSelectOnline = new DevComponents.DotNetBar.PanelEx(); this.btnAddUnSelect = new DevComponents.DotNetBar.PanelEx(); @@ -345,7 +344,6 @@ namespace TemuKJD.WXForms.ProductForms | System.Windows.Forms.AnchorStyles.Left))); this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; - this.ucGroupBoxEx1.Controls.Add(this.btnRefreshAuthor); this.ucGroupBoxEx1.Controls.Add(this.btnSelectOffline); this.ucGroupBoxEx1.Controls.Add(this.btnSelectOnline); this.ucGroupBoxEx1.Controls.Add(this.btnAddUnSelect); @@ -365,30 +363,6 @@ namespace TemuKJD.WXForms.ProductForms this.ucGroupBoxEx1.TabStop = false; this.ucGroupBoxEx1.Text = "基础"; // - // btnRefreshAuthor - // - this.btnRefreshAuthor.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnRefreshAuthor.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnRefreshAuthor.DisabledBackColor = System.Drawing.Color.Empty; - this.btnRefreshAuthor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnRefreshAuthor.Location = new System.Drawing.Point(81, 17); - this.btnRefreshAuthor.Name = "btnRefreshAuthor"; - this.btnRefreshAuthor.Size = new System.Drawing.Size(70, 20); - this.btnRefreshAuthor.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnRefreshAuthor.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnRefreshAuthor.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnRefreshAuthor.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.btnRefreshAuthor.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.btnRefreshAuthor.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.btnRefreshAuthor.Style.ForeColor.Color = System.Drawing.Color.White; - this.btnRefreshAuthor.Style.GradientAngle = 90; - this.btnRefreshAuthor.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnRefreshAuthor.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnRefreshAuthor.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnRefreshAuthor.TabIndex = 800; - this.btnRefreshAuthor.Text = "刷新授权"; - this.btnRefreshAuthor.Click += new System.EventHandler(this.btnRefreshAuthor_Click); - // // btnSelectOffline // this.btnSelectOffline.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -598,7 +572,7 @@ namespace TemuKJD.WXForms.ProductForms this.btnRefreshShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnRefreshShop.Location = new System.Drawing.Point(9, 17); this.btnRefreshShop.Name = "btnRefreshShop"; - this.btnRefreshShop.Size = new System.Drawing.Size(70, 20); + this.btnRefreshShop.Size = new System.Drawing.Size(142, 20); this.btnRefreshShop.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnRefreshShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnRefreshShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -1394,7 +1368,6 @@ namespace TemuKJD.WXForms.ProductForms private DevComponents.DotNetBar.PanelEx btnAddSelect; private DevComponents.DotNetBar.PanelEx btnSelectOffline; private DevComponents.DotNetBar.PanelEx btnSelectOnline; - private DevComponents.DotNetBar.PanelEx btnRefreshAuthor; private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect; private System.Windows.Forms.DataGridViewTextBoxColumn colShopLoginName; private System.Windows.Forms.DataGridViewTextBoxColumn colShopId; diff --git a/TEMUKJD/WXForms/ProductForms/WXFinderSquareForm.cs b/TEMUKJD/WXForms/ProductForms/WXFinderSquareForm.cs index 4d1cbb9..8033d54 100644 --- a/TEMUKJD/WXForms/ProductForms/WXFinderSquareForm.cs +++ b/TEMUKJD/WXForms/ProductForms/WXFinderSquareForm.cs @@ -42,9 +42,7 @@ namespace TemuKJD.WXForms.ProductForms public CancellationTokenSource cancellationTokenSource { get; set; } = null; public bool IsLoadComplate { get; set; } = false; - public ConcurrentList lstShopAuthInfo = new ConcurrentList(); public ConcurrentList lstWXShopTokenInfo = new ConcurrentList(); - //public Dictionary dicCheckedShopId = new Dictionary(); public Dictionary dicShopUpload = new Dictionary(); WXAddFinderParam wxAddFinderParam = new WXAddFinderParam(); @@ -67,11 +65,6 @@ namespace TemuKJD.WXForms.ProductForms { this.splitContainer1.Dock = DockStyle.Fill; - // 授权状态信息 - lstShopAuthInfo = NaiBa.Util.Helper.ConfigHelper.LoadConfig>("wx_shop_auth_list"); - if (lstShopAuthInfo == null) - lstShopAuthInfo = new ConcurrentList(); - // 授权Token lstWXShopTokenInfo = NaiBa.Util.Helper.ConfigHelper.LoadConfig>("wx_shop_token_list"); if (lstWXShopTokenInfo == null) @@ -82,11 +75,6 @@ namespace TemuKJD.WXForms.ProductForms //if (dicCheckedShopId == null) // dicCheckedShopId = new Dictionary(); - // 上货信息 - dicShopUpload = NaiBa.Util.Helper.ConfigHelper.LoadConfig>("wx_shop_upload_info"); - if (dicShopUpload == null) - dicShopUpload = new Dictionary(); - // 邀约参数 wxAddFinderParam = NaiBa.Util.Helper.ConfigHelper.LoadConfig("wx_add_finder_param"); if (wxAddFinderParam == null) @@ -193,91 +181,6 @@ namespace TemuKJD.WXForms.ProductForms }); } - private void btnRefreshAuthor_Click(object sender, EventArgs e) - { - updateAuthor(true); - } - - /// - /// 更新授权状态 - /// - /// 今日取过的也取 - private void updateAuthor(bool idRefreshTodayHasGet = false) - { - this.pbLoadingShop.Visible = true; - Task.Run(() => - { - // 店铺Id - var updateIds = dgvShop.Rows.Cast().Select(r => r.Cells["colShopId"]?.Value.ToString()).ToList(); - var selectIds = dgvShop.Rows.Cast().Where(row - => row.Cells["colSelect"]?.Value.ParseToBool() == true).Select(r => r.Cells["colShopId"]?.Value.ToString()).ToList(); - if (idRefreshTodayHasGet == true) - updateIds = selectIds; - - List tList = new List(); - if (idRefreshTodayHasGet) - lstShopAuthInfo.RemoveAll(s => updateIds.Contains(s.ShopId)); - foreach (var shop in GlobalConfig.ShopLoginList.Where(s => updateIds.Contains(s.ShopId))) - { - Invoke(new Action(() => { BindShop(shop, selectIds, ""); })); - var t = Task.Run(() => - { - try - { - if (shop.LoginStatus != "登录成功") - { - Invoke(new Action(() => { BindShop(shop, selectIds, "店铺掉线"); })); - return; - } - - var authInfo = lstShopAuthInfo.FirstOrDefault(sa => sa.ShopId == shop.ShopId); - if (idRefreshTodayHasGet || authInfo == null || authInfo?.UpdateTime.Date != DateTime.Now.Date) - { - lstShopAuthInfo.RemoveAll(sa => sa.ShopId == shop.ShopId); - var rst = WXUpload.GetApiServiceList(shop); - if (!rst.Contains("\"code\":0")) - { - WXShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false); - if (shop.LoginStatus != "登录成功") - { - Invoke(new Action(() => { BindShop(shop, selectIds, "店铺掉线"); })); - return; - } - - lstShopAuthInfo.Add(new AuthInfo() { ShopId = shop.ShopId, UpdateTime = DateTime.Now, ExpiresTime = DateTime.Now }); - Invoke(new Action(() => { BindShop(shop, selectIds, "授权查询失败"); })); - return; - } - - foreach (var itemObj in JsonHelper.JObjectParse(rst)["itemList"]) - { - // 找到了指定服务 - if (itemObj["serviceName"].ParseToString() == "店统领供应链-商品管理") - { - var expiresTick = itemObj["expireTime"].ParseToLong(); - lstShopAuthInfo.Add(new AuthInfo() { ShopId = shop.ShopId, UpdateTime = DateTime.Now, ExpiresTime = BaseClass.StampToDateTime(expiresTick.ParseToInt()) }); - Invoke(new Action(() => { BindShop(shop, selectIds, "已查询"); })); - return; - } - } - // 没找到指定服务 - lstShopAuthInfo.Add(new AuthInfo() { ShopId = shop.ShopId, UpdateTime = DateTime.Now, ExpiresTime = DateTime.Now }); - Invoke(new Action(() => { BindShop(shop, selectIds, "已查询"); })); - } - } - catch (Exception ex) - { - } - }); - tList.Add(t); - while (tList.Where(ta => !ta.IsFaulted && !ta.IsCompleted).Count() >= 20) { Thread.Sleep(100); } - } - while (tList.Where(ta => !ta.IsFaulted && !ta.IsCompleted).Count() >= 1) { Thread.Sleep(100); } - NaiBa.Util.Helper.ConfigHelper.SaveConfig("wx_shop_auth_list", lstShopAuthInfo); - Invoke(new Action(() => { pbLoadingShop.Visible = false; })); - }); - } - private void chkSelectAll_CheckedChanged(object sender, EventArgs e) { if (!chkSelectAll.Checked) @@ -316,7 +219,6 @@ namespace TemuKJD.WXForms.ProductForms if (Visible == true) { RefreshShopLogin(); - updateAuthor(); } } @@ -370,7 +272,7 @@ namespace TemuKJD.WXForms.ProductForms shopEntity.Notes, "选择商品", canUse ? "在线" : "掉线", - lstShopAuthInfo.FirstOrDefault(sa => sa.ShopId == shopEntity.ShopId)?.ExpiresTime > DateTime.Now.AddMinutes(5) ? "可用" : "过期", + GlobalConfig.lstWxShopAuthInfo.FirstOrDefault(sa => sa.ShopId == shopEntity.ShopId)?.ExpiresTime > DateTime.Now.AddMinutes(5) ? "可用" : "过期", canUse, dicShopUpload.ContainsKey(shopEntity.ShopId) && dicShopUpload[shopEntity.ShopId].DicDayUploadCount.ContainsKey(day) ? dicShopUpload[shopEntity.ShopId].DicDayUploadCount[day] : 0, @@ -389,7 +291,7 @@ namespace TemuKJD.WXForms.ProductForms row.Cells["colLoginStatus"].Value = canUse ? "在线" : "掉线"; row.Cells["colLoginStatus"].Style.ForeColor = canUse ? Color.Green : Color.Red; row.Cells["colCanUse"].Value = canUse; - row.Cells["colApi"].Value = lstShopAuthInfo.FirstOrDefault(sa => sa.ShopId == shopEntity.ShopId)?.ExpiresTime > DateTime.Now.AddMinutes(5) ? "可用" : "过期"; + row.Cells["colApi"].Value = GlobalConfig.lstWxShopAuthInfo.FirstOrDefault(sa => sa.ShopId == shopEntity.ShopId)?.ExpiresTime > DateTime.Now.AddMinutes(5) ? "可用" : "过期"; row.Cells["colRemaining"].Value = shopEntity.AddProductRemaining; row.Cells["colUploadCount"].Value = dicShopUpload.ContainsKey(shopEntity.ShopId) && dicShopUpload[shopEntity.ShopId].DicDayUploadCount.ContainsKey(day) ? dicShopUpload[shopEntity.ShopId].DicDayUploadCount[day] : 0; diff --git a/TEMUKJD/WXForms/ProductForms/WXProdClearNoVisitForm.Designer.cs b/TEMUKJD/WXForms/ProductForms/WXProdClearNoVisitForm.Designer.cs index 876ee13..cea757c 100644 --- a/TEMUKJD/WXForms/ProductForms/WXProdClearNoVisitForm.Designer.cs +++ b/TEMUKJD/WXForms/ProductForms/WXProdClearNoVisitForm.Designer.cs @@ -43,8 +43,11 @@ namespace TemuKJD.WXForms.ProductForms System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.ucGroupBoxEx3 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); + this.label8 = new System.Windows.Forms.Label(); + this.txtAddDays = new System.Windows.Forms.TextBox(); + this.label7 = new System.Windows.Forms.Label(); this.label6 = new System.Windows.Forms.Label(); - this.textBox1 = new System.Windows.Forms.TextBox(); + this.txtViewUv = new System.Windows.Forms.TextBox(); this.btnBatchRealDel = new DevComponents.DotNetBar.PanelEx(); this.btnBatchDel = new DevComponents.DotNetBar.PanelEx(); this.label4 = new System.Windows.Forms.Label(); @@ -65,19 +68,20 @@ namespace TemuKJD.WXForms.ProductForms this.btnSearchProd = new DevComponents.DotNetBar.PanelEx(); this.label5 = new System.Windows.Forms.Label(); this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); - this.btnRefreshAuthor = new DevComponents.DotNetBar.PanelEx(); this.btnSelectOffline = new DevComponents.DotNetBar.PanelEx(); this.btnSelectOnline = new DevComponents.DotNetBar.PanelEx(); - this.btnAddUnSelect = new DevComponents.DotNetBar.PanelEx(); - this.btnReverse = new DevComponents.DotNetBar.PanelEx(); - this.cmbFilterShopNotes = new TemuKJD.UserComponent.UcComboBoxMutiSelect(); - this.btnAddSelect = new DevComponents.DotNetBar.PanelEx(); + this.cmbFilterShopGroup = new TemuKJD.UserComponent.UcComboBoxMutiSelect(); this.btnEmptyShop = new DevComponents.DotNetBar.PanelEx(); this.btnFilterShop = new DevComponents.DotNetBar.PanelEx(); + this.btnRefreshShop = new DevComponents.DotNetBar.PanelEx(); + this.btnReverse = new DevComponents.DotNetBar.PanelEx(); + this.btnAddUnSelect = new DevComponents.DotNetBar.PanelEx(); + this.cmbFilterShopNotes = new TemuKJD.UserComponent.UcComboBoxMutiSelect(); + this.btnAddSelect = new DevComponents.DotNetBar.PanelEx(); this.label16 = new System.Windows.Forms.Label(); this.txtFilterShopName = new System.Windows.Forms.TextBox(); - this.btnRefreshShop = new DevComponents.DotNetBar.PanelEx(); this.label17 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); this.splitContainer3 = new System.Windows.Forms.SplitContainer(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); this.pbLoadingShop = new System.Windows.Forms.PictureBox(); @@ -87,6 +91,7 @@ namespace TemuKJD.WXForms.ProductForms this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colShopNotes = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colGroup = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colSelectProduct = new System.Windows.Forms.DataGridViewLinkColumn(); this.colLoginStatus = new System.Windows.Forms.DataGridViewLinkColumn(); this.colApi = new System.Windows.Forms.DataGridViewLinkColumn(); @@ -96,7 +101,6 @@ namespace TemuKJD.WXForms.ProductForms this.colRemaining = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.pbLoading = new System.Windows.Forms.PictureBox(); - this.chkTestNoAuditUpload = new TemuKJD.UserComponent.UcCheckBox(this.components); this.dgvSelectProduct = new TemuKJD.UserComponent.DataGridViewEx(); this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colSelectId = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -116,6 +120,8 @@ namespace TemuKJD.WXForms.ProductForms this.colExtCode = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colPrice = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colSoldNum = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colViewUv = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colPayOrderCnt = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colMsg = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colPreSale = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colNotes = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -169,7 +175,7 @@ namespace TemuKJD.WXForms.ProductForms // splitContainer1.Panel2 // this.splitContainer1.Panel2.Controls.Add(this.splitContainer3); - this.splitContainer1.Size = new System.Drawing.Size(1346, 641); + this.splitContainer1.Size = new System.Drawing.Size(1507, 641); this.splitContainer1.SplitterDistance = 165; this.splitContainer1.TabIndex = 11; // @@ -181,8 +187,11 @@ namespace TemuKJD.WXForms.ProductForms this.ucGroupBoxEx3.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.ucGroupBoxEx3.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.ucGroupBoxEx3.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx3.Controls.Add(this.label8); + this.ucGroupBoxEx3.Controls.Add(this.txtAddDays); + this.ucGroupBoxEx3.Controls.Add(this.label7); this.ucGroupBoxEx3.Controls.Add(this.label6); - this.ucGroupBoxEx3.Controls.Add(this.textBox1); + this.ucGroupBoxEx3.Controls.Add(this.txtViewUv); this.ucGroupBoxEx3.Controls.Add(this.btnBatchRealDel); this.ucGroupBoxEx3.Controls.Add(this.btnBatchDel); this.ucGroupBoxEx3.Controls.Add(this.label4); @@ -191,31 +200,60 @@ namespace TemuKJD.WXForms.ProductForms this.ucGroupBoxEx3.Controls.Add(this.btnStopUpDownOrDel); this.ucGroupBoxEx3.Controls.Add(this.btnClearList); this.ucGroupBoxEx3.Controls.Add(this.btnDown); - this.ucGroupBoxEx3.Location = new System.Drawing.Point(570, 2); + this.ucGroupBoxEx3.Location = new System.Drawing.Point(595, 2); this.ucGroupBoxEx3.Name = "ucGroupBoxEx3"; - this.ucGroupBoxEx3.Size = new System.Drawing.Size(774, 165); + this.ucGroupBoxEx3.Size = new System.Drawing.Size(910, 165); this.ucGroupBoxEx3.TabIndex = 668; this.ucGroupBoxEx3.TabStop = false; this.ucGroupBoxEx3.Text = "商品下架"; // + // label8 + // + this.label8.AutoSize = true; + this.label8.Location = new System.Drawing.Point(426, 34); + this.label8.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(20, 17); + this.label8.TabIndex = 912; + this.label8.Text = "天"; + // + // txtAddDays + // + this.txtAddDays.Location = new System.Drawing.Point(393, 31); + this.txtAddDays.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); + this.txtAddDays.Name = "txtAddDays"; + this.txtAddDays.Size = new System.Drawing.Size(33, 23); + this.txtAddDays.TabIndex = 911; + this.txtAddDays.Text = "7"; + // + // label7 + // + this.label7.AutoSize = true; + this.label7.Location = new System.Drawing.Point(313, 34); + this.label7.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(80, 17); + this.label7.TabIndex = 910; + this.label7.Text = "上架时间大于"; + // // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(191, 34); + this.label6.Location = new System.Drawing.Point(203, 34); this.label6.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(68, 17); this.label6.TabIndex = 891; this.label6.Text = "曝光量低于"; // - // textBox1 + // txtViewUv // - this.textBox1.Location = new System.Drawing.Point(259, 31); - this.textBox1.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); - this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(33, 23); - this.textBox1.TabIndex = 890; - this.textBox1.Text = "100"; + this.txtViewUv.Location = new System.Drawing.Point(271, 31); + this.txtViewUv.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); + this.txtViewUv.Name = "txtViewUv"; + this.txtViewUv.Size = new System.Drawing.Size(33, 23); + this.txtViewUv.TabIndex = 890; + this.txtViewUv.Text = "100"; // // btnBatchRealDel // @@ -224,7 +262,7 @@ namespace TemuKJD.WXForms.ProductForms this.btnBatchRealDel.Cursor = System.Windows.Forms.Cursors.Hand; this.btnBatchRealDel.DisabledBackColor = System.Drawing.Color.Empty; this.btnBatchRealDel.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnBatchRealDel.Location = new System.Drawing.Point(668, 91); + this.btnBatchRealDel.Location = new System.Drawing.Point(804, 91); this.btnBatchRealDel.Name = "btnBatchRealDel"; this.btnBatchRealDel.Size = new System.Drawing.Size(84, 23); this.btnBatchRealDel.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -249,7 +287,7 @@ namespace TemuKJD.WXForms.ProductForms this.btnBatchDel.Cursor = System.Windows.Forms.Cursors.Hand; this.btnBatchDel.DisabledBackColor = System.Drawing.Color.Empty; this.btnBatchDel.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnBatchDel.Location = new System.Drawing.Point(668, 61); + this.btnBatchDel.Location = new System.Drawing.Point(804, 61); this.btnBatchDel.Name = "btnBatchDel"; this.btnBatchDel.Size = new System.Drawing.Size(84, 23); this.btnBatchDel.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -273,13 +311,13 @@ namespace TemuKJD.WXForms.ProductForms this.label4.Location = new System.Drawing.Point(96, 34); this.label4.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(56, 17); + this.label4.Size = new System.Drawing.Size(68, 17); this.label4.TabIndex = 801; - this.label4.Text = "销量低于"; + this.label4.Text = "订单数低于"; // // txtFiltSaleNum // - this.txtFiltSaleNum.Location = new System.Drawing.Point(152, 31); + this.txtFiltSaleNum.Location = new System.Drawing.Point(164, 31); this.txtFiltSaleNum.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.txtFiltSaleNum.Name = "txtFiltSaleNum"; this.txtFiltSaleNum.Size = new System.Drawing.Size(33, 23); @@ -316,7 +354,7 @@ namespace TemuKJD.WXForms.ProductForms this.btnStopUpDownOrDel.CanvasColor = System.Drawing.SystemColors.Control; this.btnStopUpDownOrDel.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnStopUpDownOrDel.DisabledBackColor = System.Drawing.Color.Empty; - this.btnStopUpDownOrDel.Location = new System.Drawing.Point(668, 121); + this.btnStopUpDownOrDel.Location = new System.Drawing.Point(804, 121); this.btnStopUpDownOrDel.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); this.btnStopUpDownOrDel.Name = "btnStopUpDownOrDel"; this.btnStopUpDownOrDel.Size = new System.Drawing.Size(84, 23); @@ -368,7 +406,7 @@ namespace TemuKJD.WXForms.ProductForms this.btnDown.Cursor = System.Windows.Forms.Cursors.Hand; this.btnDown.DisabledBackColor = System.Drawing.Color.Empty; this.btnDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnDown.Location = new System.Drawing.Point(668, 31); + this.btnDown.Location = new System.Drawing.Point(804, 31); this.btnDown.Name = "btnDown"; this.btnDown.Size = new System.Drawing.Size(84, 23); this.btnDown.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -402,7 +440,7 @@ namespace TemuKJD.WXForms.ProductForms this.ucGroupBoxEx4.Controls.Add(this.btnClearFilter); this.ucGroupBoxEx4.Controls.Add(this.btnSearchProd); this.ucGroupBoxEx4.Controls.Add(this.label5); - this.ucGroupBoxEx4.Location = new System.Drawing.Point(161, 2); + this.ucGroupBoxEx4.Location = new System.Drawing.Point(186, 2); this.ucGroupBoxEx4.Name = "ucGroupBoxEx4"; this.ucGroupBoxEx4.Size = new System.Drawing.Size(410, 165); this.ucGroupBoxEx4.TabIndex = 666; @@ -422,6 +460,7 @@ namespace TemuKJD.WXForms.ProductForms // rb30 // this.rb30.AutoSize = true; + this.rb30.Checked = true; this.rb30.Location = new System.Drawing.Point(338, 27); this.rb30.Name = "rb30"; this.rb30.Size = new System.Drawing.Size(52, 21); @@ -437,7 +476,6 @@ namespace TemuKJD.WXForms.ProductForms this.rb7.Name = "rb7"; this.rb7.Size = new System.Drawing.Size(45, 21); this.rb7.TabIndex = 827; - this.rb7.TabStop = true; this.rb7.Text = "7天"; this.rb7.UseVisualStyleBackColor = true; // @@ -455,7 +493,7 @@ namespace TemuKJD.WXForms.ProductForms this.cmbOnSaleStatus.Name = "cmbOnSaleStatus"; this.cmbOnSaleStatus.Size = new System.Drawing.Size(134, 25); this.cmbOnSaleStatus.TabIndex = 817; - this.cmbOnSaleStatus.Text = "在售"; + this.cmbOnSaleStatus.Text = "全部（在售和下架）"; this.cmbOnSaleStatus.SelectedIndexChanged += new System.EventHandler(this.cmbOnSaleStatus_SelectedIndexChanged); this.cmbOnSaleStatus.TextChanged += new System.EventHandler(this.cmbOnSaleStatus_TextChanged); // @@ -574,59 +612,36 @@ namespace TemuKJD.WXForms.ProductForms | System.Windows.Forms.AnchorStyles.Left))); this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; - this.ucGroupBoxEx1.Controls.Add(this.btnRefreshAuthor); this.ucGroupBoxEx1.Controls.Add(this.btnSelectOffline); this.ucGroupBoxEx1.Controls.Add(this.btnSelectOnline); - this.ucGroupBoxEx1.Controls.Add(this.btnAddUnSelect); - this.ucGroupBoxEx1.Controls.Add(this.btnReverse); - this.ucGroupBoxEx1.Controls.Add(this.cmbFilterShopNotes); - this.ucGroupBoxEx1.Controls.Add(this.btnAddSelect); + this.ucGroupBoxEx1.Controls.Add(this.cmbFilterShopGroup); this.ucGroupBoxEx1.Controls.Add(this.btnEmptyShop); this.ucGroupBoxEx1.Controls.Add(this.btnFilterShop); + this.ucGroupBoxEx1.Controls.Add(this.btnRefreshShop); + this.ucGroupBoxEx1.Controls.Add(this.btnReverse); + this.ucGroupBoxEx1.Controls.Add(this.btnAddUnSelect); + this.ucGroupBoxEx1.Controls.Add(this.cmbFilterShopNotes); + this.ucGroupBoxEx1.Controls.Add(this.btnAddSelect); this.ucGroupBoxEx1.Controls.Add(this.label16); this.ucGroupBoxEx1.Controls.Add(this.txtFilterShopName); - this.ucGroupBoxEx1.Controls.Add(this.btnRefreshShop); this.ucGroupBoxEx1.Controls.Add(this.label17); + this.ucGroupBoxEx1.Controls.Add(this.label3); this.ucGroupBoxEx1.Location = new System.Drawing.Point(2, 2); this.ucGroupBoxEx1.Name = "ucGroupBoxEx1"; - this.ucGroupBoxEx1.Size = new System.Drawing.Size(160, 165); + this.ucGroupBoxEx1.Size = new System.Drawing.Size(185, 165); this.ucGroupBoxEx1.TabIndex = 399; this.ucGroupBoxEx1.TabStop = false; this.ucGroupBoxEx1.Text = "店铺筛选"; // - // btnRefreshAuthor - // - this.btnRefreshAuthor.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnRefreshAuthor.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnRefreshAuthor.DisabledBackColor = System.Drawing.Color.Empty; - this.btnRefreshAuthor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnRefreshAuthor.Location = new System.Drawing.Point(81, 17); - this.btnRefreshAuthor.Name = "btnRefreshAuthor"; - this.btnRefreshAuthor.Size = new System.Drawing.Size(70, 20); - this.btnRefreshAuthor.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnRefreshAuthor.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnRefreshAuthor.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnRefreshAuthor.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.btnRefreshAuthor.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.btnRefreshAuthor.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.btnRefreshAuthor.Style.ForeColor.Color = System.Drawing.Color.White; - this.btnRefreshAuthor.Style.GradientAngle = 90; - this.btnRefreshAuthor.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnRefreshAuthor.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnRefreshAuthor.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnRefreshAuthor.TabIndex = 800; - this.btnRefreshAuthor.Text = "刷新授权"; - this.btnRefreshAuthor.Click += new System.EventHandler(this.btnRefreshAuthor_Click); - // // btnSelectOffline // this.btnSelectOffline.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnSelectOffline.Cursor = System.Windows.Forms.Cursors.Hand; this.btnSelectOffline.DisabledBackColor = System.Drawing.Color.Empty; this.btnSelectOffline.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSelectOffline.Location = new System.Drawing.Point(61, 137); + this.btnSelectOffline.Location = new System.Drawing.Point(59, 139); this.btnSelectOffline.Name = "btnSelectOffline"; - this.btnSelectOffline.Size = new System.Drawing.Size(50, 20); + this.btnSelectOffline.Size = new System.Drawing.Size(48, 18); this.btnSelectOffline.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnSelectOffline.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnSelectOffline.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -648,9 +663,9 @@ namespace TemuKJD.WXForms.ProductForms this.btnSelectOnline.Cursor = System.Windows.Forms.Cursors.Hand; this.btnSelectOnline.DisabledBackColor = System.Drawing.Color.Empty; this.btnSelectOnline.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSelectOnline.Location = new System.Drawing.Point(9, 137); + this.btnSelectOnline.Location = new System.Drawing.Point(9, 139); this.btnSelectOnline.Name = "btnSelectOnline"; - this.btnSelectOnline.Size = new System.Drawing.Size(50, 20); + this.btnSelectOnline.Size = new System.Drawing.Size(48, 18); this.btnSelectOnline.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnSelectOnline.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnSelectOnline.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -666,100 +681,28 @@ namespace TemuKJD.WXForms.ProductForms this.btnSelectOnline.Text = "选在线"; this.btnSelectOnline.Click += new System.EventHandler(this.btnSelectOnline_Click); // - // btnAddUnSelect + // cmbFilterShopGroup // - this.btnAddUnSelect.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnAddUnSelect.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnAddUnSelect.DisabledBackColor = System.Drawing.Color.Empty; - this.btnAddUnSelect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnAddUnSelect.Location = new System.Drawing.Point(81, 115); - this.btnAddUnSelect.Name = "btnAddUnSelect"; - this.btnAddUnSelect.Size = new System.Drawing.Size(70, 20); - this.btnAddUnSelect.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnAddUnSelect.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnAddUnSelect.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnAddUnSelect.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.btnAddUnSelect.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.btnAddUnSelect.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.btnAddUnSelect.Style.ForeColor.Color = System.Drawing.Color.White; - this.btnAddUnSelect.Style.GradientAngle = 90; - this.btnAddUnSelect.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnAddUnSelect.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnAddUnSelect.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnAddUnSelect.TabIndex = 746; - this.btnAddUnSelect.Text = "弃选条件"; - this.btnAddUnSelect.Click += new System.EventHandler(this.btnAddUnSelect_Click); - // - // btnReverse - // - this.btnReverse.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnReverse.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnReverse.DisabledBackColor = System.Drawing.Color.Empty; - this.btnReverse.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnReverse.Location = new System.Drawing.Point(113, 137); - this.btnReverse.Name = "btnReverse"; - this.btnReverse.Size = new System.Drawing.Size(38, 20); - this.btnReverse.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnReverse.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnReverse.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnReverse.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.btnReverse.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.btnReverse.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.btnReverse.Style.ForeColor.Color = System.Drawing.Color.White; - this.btnReverse.Style.GradientAngle = 90; - this.btnReverse.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnReverse.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnReverse.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnReverse.TabIndex = 726; - this.btnReverse.Text = "反选"; - this.btnReverse.Click += new System.EventHandler(this.btnReverse_Click); - // - // cmbFilterShopNotes - // - this.cmbFilterShopNotes.DefaultText = "全部"; - this.cmbFilterShopNotes.DropDownHeight = 1; - this.cmbFilterShopNotes.DropDownWidth = 1; - this.cmbFilterShopNotes.FormattingEnabled = true; - this.cmbFilterShopNotes.IntegralHeight = false; - this.cmbFilterShopNotes.Location = new System.Drawing.Point(38, 66); - this.cmbFilterShopNotes.Name = "cmbFilterShopNotes"; - this.cmbFilterShopNotes.Size = new System.Drawing.Size(113, 25); - this.cmbFilterShopNotes.TabIndex = 442; - this.cmbFilterShopNotes.Text = "全部"; - // - // btnAddSelect - // - this.btnAddSelect.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnAddSelect.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnAddSelect.DisabledBackColor = System.Drawing.Color.Empty; - this.btnAddSelect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnAddSelect.Location = new System.Drawing.Point(9, 115); - this.btnAddSelect.Name = "btnAddSelect"; - this.btnAddSelect.Size = new System.Drawing.Size(70, 20); - this.btnAddSelect.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnAddSelect.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnAddSelect.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnAddSelect.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.btnAddSelect.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.btnAddSelect.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.btnAddSelect.Style.ForeColor.Color = System.Drawing.Color.White; - this.btnAddSelect.Style.GradientAngle = 90; - this.btnAddSelect.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnAddSelect.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnAddSelect.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnAddSelect.TabIndex = 742; - this.btnAddSelect.Text = "选中条件"; - this.btnAddSelect.Click += new System.EventHandler(this.btnAddSelect_Click); + this.cmbFilterShopGroup.DefaultText = "全部"; + this.cmbFilterShopGroup.DropDownHeight = 1; + this.cmbFilterShopGroup.DropDownWidth = 1; + this.cmbFilterShopGroup.FormattingEnabled = true; + this.cmbFilterShopGroup.IntegralHeight = false; + this.cmbFilterShopGroup.Location = new System.Drawing.Point(38, 92); + this.cmbFilterShopGroup.Name = "cmbFilterShopGroup"; + this.cmbFilterShopGroup.Size = new System.Drawing.Size(137, 25); + this.cmbFilterShopGroup.TabIndex = 829; + this.cmbFilterShopGroup.Text = "全部"; // // btnEmptyShop // this.btnEmptyShop.CanvasColor = System.Drawing.SystemColors.Control; this.btnEmptyShop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnEmptyShop.DisabledBackColor = System.Drawing.Color.Empty; - this.btnEmptyShop.Location = new System.Drawing.Point(113, 93); + this.btnEmptyShop.Location = new System.Drawing.Point(143, 139); this.btnEmptyShop.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); this.btnEmptyShop.Name = "btnEmptyShop"; - this.btnEmptyShop.Size = new System.Drawing.Size(38, 20); + this.btnEmptyShop.Size = new System.Drawing.Size(32, 18); this.btnEmptyShop.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnEmptyShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); this.btnEmptyShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); @@ -782,9 +725,9 @@ namespace TemuKJD.WXForms.ProductForms this.btnFilterShop.Cursor = System.Windows.Forms.Cursors.Hand; this.btnFilterShop.DisabledBackColor = System.Drawing.Color.Empty; this.btnFilterShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnFilterShop.Location = new System.Drawing.Point(9, 93); + this.btnFilterShop.Location = new System.Drawing.Point(143, 119); this.btnFilterShop.Name = "btnFilterShop"; - this.btnFilterShop.Size = new System.Drawing.Size(102, 20); + this.btnFilterShop.Size = new System.Drawing.Size(32, 18); this.btnFilterShop.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnFilterShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnFilterShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -797,37 +740,18 @@ namespace TemuKJD.WXForms.ProductForms this.btnFilterShop.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); this.btnFilterShop.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); this.btnFilterShop.TabIndex = 703; - this.btnFilterShop.Text = "过滤店铺"; + this.btnFilterShop.Text = "过滤"; this.btnFilterShop.Click += new System.EventHandler(this.btnFilterShop_Click); // - // label16 - // - this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(7, 70); - this.label16.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(32, 17); - this.label16.TabIndex = 697; - this.label16.Text = "备注"; - // - // txtFilterShopName - // - this.txtFilterShopName.Font = new System.Drawing.Font("微软雅黑", 10F); - this.txtFilterShopName.Location = new System.Drawing.Point(38, 39); - this.txtFilterShopName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); - this.txtFilterShopName.Name = "txtFilterShopName"; - this.txtFilterShopName.Size = new System.Drawing.Size(113, 25); - this.txtFilterShopName.TabIndex = 653; - // // btnRefreshShop // this.btnRefreshShop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnRefreshShop.Cursor = System.Windows.Forms.Cursors.Hand; this.btnRefreshShop.DisabledBackColor = System.Drawing.Color.Empty; this.btnRefreshShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnRefreshShop.Location = new System.Drawing.Point(9, 17); + this.btnRefreshShop.Location = new System.Drawing.Point(10, 18); this.btnRefreshShop.Name = "btnRefreshShop"; - this.btnRefreshShop.Size = new System.Drawing.Size(70, 20); + this.btnRefreshShop.Size = new System.Drawing.Size(165, 18); this.btnRefreshShop.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnRefreshShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnRefreshShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -843,16 +767,130 @@ namespace TemuKJD.WXForms.ProductForms this.btnRefreshShop.Text = "刷新店铺"; this.btnRefreshShop.Click += new System.EventHandler(this.btnRefreshShop_Click); // + // btnReverse + // + this.btnReverse.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnReverse.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnReverse.DisabledBackColor = System.Drawing.Color.Empty; + this.btnReverse.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnReverse.Location = new System.Drawing.Point(109, 139); + this.btnReverse.Name = "btnReverse"; + this.btnReverse.Size = new System.Drawing.Size(32, 18); + this.btnReverse.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnReverse.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnReverse.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnReverse.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnReverse.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnReverse.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnReverse.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnReverse.Style.GradientAngle = 90; + this.btnReverse.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnReverse.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnReverse.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnReverse.TabIndex = 726; + this.btnReverse.Text = "反选"; + this.btnReverse.Click += new System.EventHandler(this.btnReverse_Click); + // + // btnAddUnSelect + // + this.btnAddUnSelect.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnAddUnSelect.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnAddUnSelect.DisabledBackColor = System.Drawing.Color.Empty; + this.btnAddUnSelect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnAddUnSelect.Location = new System.Drawing.Point(76, 119); + this.btnAddUnSelect.Name = "btnAddUnSelect"; + this.btnAddUnSelect.Size = new System.Drawing.Size(65, 18); + this.btnAddUnSelect.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnAddUnSelect.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnAddUnSelect.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnAddUnSelect.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnAddUnSelect.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnAddUnSelect.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnAddUnSelect.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnAddUnSelect.Style.GradientAngle = 90; + this.btnAddUnSelect.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnAddUnSelect.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnAddUnSelect.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnAddUnSelect.TabIndex = 746; + this.btnAddUnSelect.Text = "弃选条件"; + this.btnAddUnSelect.Click += new System.EventHandler(this.btnAddUnSelect_Click); + // + // cmbFilterShopNotes + // + this.cmbFilterShopNotes.DefaultText = "全部"; + this.cmbFilterShopNotes.DropDownHeight = 1; + this.cmbFilterShopNotes.DropDownWidth = 1; + this.cmbFilterShopNotes.FormattingEnabled = true; + this.cmbFilterShopNotes.IntegralHeight = false; + this.cmbFilterShopNotes.Location = new System.Drawing.Point(38, 65); + this.cmbFilterShopNotes.Name = "cmbFilterShopNotes"; + this.cmbFilterShopNotes.Size = new System.Drawing.Size(137, 25); + this.cmbFilterShopNotes.TabIndex = 442; + this.cmbFilterShopNotes.Text = "全部"; + // + // btnAddSelect + // + this.btnAddSelect.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnAddSelect.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnAddSelect.DisabledBackColor = System.Drawing.Color.Empty; + this.btnAddSelect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnAddSelect.Location = new System.Drawing.Point(9, 119); + this.btnAddSelect.Name = "btnAddSelect"; + this.btnAddSelect.Size = new System.Drawing.Size(65, 18); + this.btnAddSelect.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnAddSelect.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnAddSelect.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnAddSelect.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnAddSelect.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnAddSelect.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnAddSelect.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnAddSelect.Style.GradientAngle = 90; + this.btnAddSelect.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnAddSelect.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnAddSelect.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnAddSelect.TabIndex = 742; + this.btnAddSelect.Text = "加选条件"; + this.btnAddSelect.Click += new System.EventHandler(this.btnAddSelect_Click); + // + // label16 + // + this.label16.AutoSize = true; + this.label16.Location = new System.Drawing.Point(7, 69); + this.label16.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label16.Name = "label16"; + this.label16.Size = new System.Drawing.Size(32, 17); + this.label16.TabIndex = 697; + this.label16.Text = "备注"; + // + // txtFilterShopName + // + this.txtFilterShopName.Font = new System.Drawing.Font("微软雅黑", 10F); + this.txtFilterShopName.Location = new System.Drawing.Point(38, 38); + this.txtFilterShopName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtFilterShopName.Name = "txtFilterShopName"; + this.txtFilterShopName.Size = new System.Drawing.Size(137, 25); + this.txtFilterShopName.TabIndex = 653; + // // label17 // this.label17.AutoSize = true; - this.label17.Location = new System.Drawing.Point(7, 43); + this.label17.Location = new System.Drawing.Point(7, 42); this.label17.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label17.Name = "label17"; this.label17.Size = new System.Drawing.Size(32, 17); this.label17.TabIndex = 699; this.label17.Text = "名称"; // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(7, 96); + this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(32, 17); + this.label3.TabIndex = 831; + this.label3.Text = "分组"; + // // splitContainer3 // this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill; @@ -868,7 +906,7 @@ namespace TemuKJD.WXForms.ProductForms // splitContainer3.Panel2 // this.splitContainer3.Panel2.Controls.Add(this.splitContainer4); - this.splitContainer3.Size = new System.Drawing.Size(1346, 472); + this.splitContainer3.Size = new System.Drawing.Size(1507, 472); this.splitContainer3.SplitterDistance = 442; this.splitContainer3.TabIndex = 1; // @@ -888,10 +926,9 @@ namespace TemuKJD.WXForms.ProductForms // splitContainer2.Panel2 // this.splitContainer2.Panel2.Controls.Add(this.pbLoading); - this.splitContainer2.Panel2.Controls.Add(this.chkTestNoAuditUpload); this.splitContainer2.Panel2.Controls.Add(this.dgvSelectProduct); this.splitContainer2.Panel2.Padding = new System.Windows.Forms.Padding(0, 0, 4, 0); - this.splitContainer2.Size = new System.Drawing.Size(1346, 442); + this.splitContainer2.Size = new System.Drawing.Size(1507, 442); this.splitContainer2.SplitterDistance = 350; this.splitContainer2.TabIndex = 0; // @@ -931,6 +968,7 @@ namespace TemuKJD.WXForms.ProductForms this.colShopId, this.colShopName, this.colShopNotes, + this.colGroup, this.colSelectProduct, this.colLoginStatus, this.colApi, @@ -952,6 +990,7 @@ namespace TemuKJD.WXForms.ProductForms // // colSelect // + this.colSelect.Frozen = true; this.colSelect.HeaderText = "全选"; this.colSelect.Name = "colSelect"; this.colSelect.ReadOnly = true; @@ -961,6 +1000,7 @@ namespace TemuKJD.WXForms.ProductForms // // colShopLoginName // + this.colShopLoginName.Frozen = true; this.colShopLoginName.HeaderText = "店铺登录名"; this.colShopLoginName.Name = "colShopLoginName"; this.colShopLoginName.ReadOnly = true; @@ -968,6 +1008,7 @@ namespace TemuKJD.WXForms.ProductForms // // colShopId // + this.colShopId.Frozen = true; this.colShopId.HeaderText = "店铺Id"; this.colShopId.Name = "colShopId"; this.colShopId.ReadOnly = true; @@ -977,6 +1018,7 @@ namespace TemuKJD.WXForms.ProductForms // colShopName // this.colShopName.FillWeight = 150F; + this.colShopName.Frozen = true; this.colShopName.HeaderText = "店铺名称"; this.colShopName.Name = "colShopName"; this.colShopName.ReadOnly = true; @@ -988,7 +1030,14 @@ namespace TemuKJD.WXForms.ProductForms this.colShopNotes.HeaderText = "备注"; this.colShopNotes.Name = "colShopNotes"; this.colShopNotes.ReadOnly = true; - this.colShopNotes.Width = 75; + this.colShopNotes.Width = 66; + // + // colGroup + // + this.colGroup.HeaderText = "分组"; + this.colGroup.Name = "colGroup"; + this.colGroup.ReadOnly = true; + this.colGroup.Width = 66; // // colSelectProduct // @@ -1061,7 +1110,7 @@ namespace TemuKJD.WXForms.ProductForms // this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None; this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue; - this.pbLoading.Location = new System.Drawing.Point(471, 196); + this.pbLoading.Location = new System.Drawing.Point(551, 196); this.pbLoading.Name = "pbLoading"; this.pbLoading.Size = new System.Drawing.Size(50, 50); this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -1069,17 +1118,6 @@ namespace TemuKJD.WXForms.ProductForms this.pbLoading.TabStop = false; this.pbLoading.Visible = false; // - // chkTestNoAuditUpload - // - this.chkTestNoAuditUpload.AutoSize = true; - this.chkTestNoAuditUpload.Location = new System.Drawing.Point(1094, 35); - this.chkTestNoAuditUpload.Name = "chkTestNoAuditUpload"; - this.chkTestNoAuditUpload.Size = new System.Drawing.Size(123, 21); - this.chkTestNoAuditUpload.TabIndex = 779; - this.chkTestNoAuditUpload.Text = "测试免审提交商品"; - this.chkTestNoAuditUpload.UseVisualStyleBackColor = true; - this.chkTestNoAuditUpload.Visible = false; - // // dgvSelectProduct // this.dgvSelectProduct.AllowUserToAddRows = false; @@ -1117,6 +1155,8 @@ namespace TemuKJD.WXForms.ProductForms this.colExtCode, this.colPrice, this.colSoldNum, + this.colViewUv, + this.colPayOrderCnt, this.colMsg, this.colPreSale, this.colNotes, @@ -1130,7 +1170,7 @@ namespace TemuKJD.WXForms.ProductForms this.dgvSelectProduct.Name = "dgvSelectProduct"; this.dgvSelectProduct.ReadOnly = true; this.dgvSelectProduct.RowTemplate.Height = 23; - this.dgvSelectProduct.Size = new System.Drawing.Size(988, 442); + this.dgvSelectProduct.Size = new System.Drawing.Size(1149, 442); this.dgvSelectProduct.TabIndex = 187; this.dgvSelectProduct.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvSelectProduct_CellContentClick); // @@ -1157,6 +1197,7 @@ namespace TemuKJD.WXForms.ProductForms this.colSupplierId.HeaderText = "店铺Id"; this.colSupplierId.Name = "colSupplierId"; this.colSupplierId.ReadOnly = true; + this.colSupplierId.Visible = false; // // colSupplierName // @@ -1254,7 +1295,7 @@ namespace TemuKJD.WXForms.ProductForms this.colProductName.HeaderText = "商品标题"; this.colProductName.Name = "colProductName"; this.colProductName.ReadOnly = true; - this.colProductName.Width = 140; + this.colProductName.Width = 120; // // colProductCat // @@ -1270,7 +1311,7 @@ namespace TemuKJD.WXForms.ProductForms this.colExtCode.HeaderText = "商品货号"; this.colExtCode.Name = "colExtCode"; this.colExtCode.ReadOnly = true; - this.colExtCode.Width = 145; + this.colExtCode.Width = 140; // // colPrice // @@ -1284,8 +1325,23 @@ namespace TemuKJD.WXForms.ProductForms this.colSoldNum.HeaderText = "销量"; this.colSoldNum.Name = "colSoldNum"; this.colSoldNum.ReadOnly = true; + this.colSoldNum.Visible = false; this.colSoldNum.Width = 50; // + // colViewUv + // + this.colViewUv.HeaderText = "曝光人数"; + this.colViewUv.Name = "colViewUv"; + this.colViewUv.ReadOnly = true; + this.colViewUv.Width = 80; + // + // colPayOrderCnt + // + this.colPayOrderCnt.HeaderText = "支付订单数"; + this.colPayOrderCnt.Name = "colPayOrderCnt"; + this.colPayOrderCnt.ReadOnly = true; + this.colPayOrderCnt.Width = 90; + // // colMsg // dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True; @@ -1299,6 +1355,7 @@ namespace TemuKJD.WXForms.ProductForms this.colPreSale.HeaderText = "预售"; this.colPreSale.Name = "colPreSale"; this.colPreSale.ReadOnly = true; + this.colPreSale.Visible = false; this.colPreSale.Width = 50; // // colNotes @@ -1356,8 +1413,8 @@ namespace TemuKJD.WXForms.ProductForms // this.splitContainer4.Panel2.Controls.Add(this.btnClear); this.splitContainer4.Panel2.Controls.Add(this.panelEx1); - this.splitContainer4.Size = new System.Drawing.Size(1346, 26); - this.splitContainer4.SplitterDistance = 655; + this.splitContainer4.Size = new System.Drawing.Size(1507, 26); + this.splitContainer4.SplitterDistance = 816; this.splitContainer4.TabIndex = 3; // // statusBar @@ -1368,7 +1425,7 @@ namespace TemuKJD.WXForms.ProductForms this.statusBar.Location = new System.Drawing.Point(0, 0); this.statusBar.Margin = new System.Windows.Forms.Padding(0); this.statusBar.Name = "statusBar"; - this.statusBar.Size = new System.Drawing.Size(655, 26); + this.statusBar.Size = new System.Drawing.Size(816, 26); this.statusBar.TabIndex = 2; // // btnClear @@ -1425,12 +1482,12 @@ namespace TemuKJD.WXForms.ProductForms // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.BackColor = System.Drawing.Color.White; - this.ClientSize = new System.Drawing.Size(1346, 641); + this.ClientSize = new System.Drawing.Size(1507, 641); this.Controls.Add(this.splitContainer1); this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.KeyPreview = true; this.Name = "WXProdClearNoVisitForm"; - this.Text = "微信小店 - 爆单神器"; + this.Text = "微信小店 - 清理无流量"; this.Load += new System.EventHandler(this.UserSelectDbProductForm_Load); this.VisibleChanged += new System.EventHandler(this.UserSelectDbProductForm_VisibleChanged); this.splitContainer1.Panel1.ResumeLayout(false); @@ -1449,7 +1506,6 @@ namespace TemuKJD.WXForms.ProductForms this.splitContainer3.ResumeLayout(false); this.splitContainer2.Panel1.ResumeLayout(false); this.splitContainer2.Panel2.ResumeLayout(false); - this.splitContainer2.Panel2.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit(); this.splitContainer2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pbLoadingShop)).EndInit(); @@ -1480,7 +1536,6 @@ namespace TemuKJD.WXForms.ProductForms private DevComponents.DotNetBar.PanelEx btnClearFilter; private DevComponents.DotNetBar.PanelEx btnClear; private DevComponents.DotNetBar.PanelEx panelEx1; - private UserComponent.UcCheckBox chkTestNoAuditUpload; private System.Windows.Forms.PictureBox pbLoadingShop; private System.Windows.Forms.PictureBox pbLoading; private System.Windows.Forms.TextBox txtFilterShopName; @@ -1494,20 +1549,6 @@ namespace TemuKJD.WXForms.ProductForms private DevComponents.DotNetBar.PanelEx btnAddSelect; private DevComponents.DotNetBar.PanelEx btnSelectOffline; private DevComponents.DotNetBar.PanelEx btnSelectOnline; - private DevComponents.DotNetBar.PanelEx btnRefreshAuthor; - private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect; - private System.Windows.Forms.DataGridViewTextBoxColumn colShopLoginName; - private System.Windows.Forms.DataGridViewTextBoxColumn colShopId; - private System.Windows.Forms.DataGridViewTextBoxColumn colShopName; - private System.Windows.Forms.DataGridViewTextBoxColumn colShopNotes; - private System.Windows.Forms.DataGridViewLinkColumn colSelectProduct; - private System.Windows.Forms.DataGridViewLinkColumn colLoginStatus; - private System.Windows.Forms.DataGridViewLinkColumn colApi; - private System.Windows.Forms.DataGridViewCheckBoxColumn colCanUse; - private System.Windows.Forms.DataGridViewTextBoxColumn colUploadCount; - private System.Windows.Forms.DataGridViewTextBoxColumn colOnSaleNum; - private System.Windows.Forms.DataGridViewTextBoxColumn colRemaining; - private System.Windows.Forms.DataGridViewTextBoxColumn colMessage; private System.Windows.Forms.TextBox txtPageEnd; private System.Windows.Forms.Label label2; private DevComponents.DotNetBar.PanelEx btnStopSearch; @@ -1521,6 +1562,31 @@ namespace TemuKJD.WXForms.ProductForms private DevComponents.DotNetBar.PanelEx btnBatchDel; private System.Windows.Forms.ComboBox cmbOnSaleStatus; private System.Windows.Forms.Label label5; + private DevComponents.DotNetBar.PanelEx btnBatchRealDel; + private System.Windows.Forms.Label label6; + private System.Windows.Forms.TextBox txtViewUv; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.RadioButton rb30; + private System.Windows.Forms.RadioButton rb7; + private UserComponent.UcComboBoxMutiSelect cmbFilterShopGroup; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect; + private System.Windows.Forms.DataGridViewTextBoxColumn colShopLoginName; + private System.Windows.Forms.DataGridViewTextBoxColumn colShopId; + private System.Windows.Forms.DataGridViewTextBoxColumn colShopName; + private System.Windows.Forms.DataGridViewTextBoxColumn colShopNotes; + private System.Windows.Forms.DataGridViewTextBoxColumn colGroup; + private System.Windows.Forms.DataGridViewLinkColumn colSelectProduct; + private System.Windows.Forms.DataGridViewLinkColumn colLoginStatus; + private System.Windows.Forms.DataGridViewLinkColumn colApi; + private System.Windows.Forms.DataGridViewCheckBoxColumn colCanUse; + private System.Windows.Forms.DataGridViewTextBoxColumn colUploadCount; + private System.Windows.Forms.DataGridViewTextBoxColumn colOnSaleNum; + private System.Windows.Forms.DataGridViewTextBoxColumn colRemaining; + private System.Windows.Forms.DataGridViewTextBoxColumn colMessage; + private System.Windows.Forms.Label label7; + private System.Windows.Forms.Label label8; + private System.Windows.Forms.TextBox txtAddDays; private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck; private System.Windows.Forms.DataGridViewTextBoxColumn colSelectId; private System.Windows.Forms.DataGridViewTextBoxColumn colSupplierId; @@ -1539,6 +1605,8 @@ namespace TemuKJD.WXForms.ProductForms private System.Windows.Forms.DataGridViewTextBoxColumn colExtCode; private System.Windows.Forms.DataGridViewTextBoxColumn colPrice; private System.Windows.Forms.DataGridViewTextBoxColumn colSoldNum; + private System.Windows.Forms.DataGridViewTextBoxColumn colViewUv; + private System.Windows.Forms.DataGridViewTextBoxColumn colPayOrderCnt; private System.Windows.Forms.DataGridViewTextBoxColumn colMsg; private System.Windows.Forms.DataGridViewTextBoxColumn colPreSale; private System.Windows.Forms.DataGridViewTextBoxColumn colNotes; @@ -1546,11 +1614,5 @@ namespace TemuKJD.WXForms.ProductForms private System.Windows.Forms.DataGridViewLinkColumn ColDelete; private System.Windows.Forms.DataGridViewTextBoxColumn colAddTime; private System.Windows.Forms.DataGridViewTextBoxColumn colOpResult; - private DevComponents.DotNetBar.PanelEx btnBatchRealDel; - private System.Windows.Forms.Label label6; - private System.Windows.Forms.TextBox textBox1; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.RadioButton rb30; - private System.Windows.Forms.RadioButton rb7; } } \ No newline at end of file diff --git a/TEMUKJD/WXForms/ProductForms/WXProdClearNoVisitForm.cs b/TEMUKJD/WXForms/ProductForms/WXProdClearNoVisitForm.cs index 7bd4a64..fce239f 100644 --- a/TEMUKJD/WXForms/ProductForms/WXProdClearNoVisitForm.cs +++ b/TEMUKJD/WXForms/ProductForms/WXProdClearNoVisitForm.cs @@ -37,7 +37,6 @@ namespace TemuKJD.WXForms.ProductForms { int PageBegin = 1; int PageEnd = 1000; - string PreType = ""; string OnSaleStatus = "在售"; public CancellationTokenSource cancellationTokenSource { get; set; } = null; @@ -45,13 +44,7 @@ namespace TemuKJD.WXForms.ProductForms bool isInit = false; CheckBox chkSelectAll = null; - ConcurrentList lstShopAuthInfo = new ConcurrentList(); ConcurrentList lstWXShopTokenInfo = new ConcurrentList(); - public NaiBa.Util.ConcurrentList lstTemuDBProductSelect = new NaiBa.Util.ConcurrentList(); - NaiBa.Util.ConcurrentList lstAddPriceRule = new NaiBa.Util.ConcurrentList(); - AddPriceRule defaultAddPriceRule = null; - WXUploadRule wxUploadRule = null; - //public Dictionary> dicCheckedShopIdList = new Dictionary>(); public Dictionary dicCheckedShopId = new Dictionary(); public Dictionary dicShopUpload = new Dictionary(); public WXProdClearNoVisitForm() @@ -63,49 +56,17 @@ namespace TemuKJD.WXForms.ProductForms { this.splitContainer1.Dock = DockStyle.Fill; - lstShopAuthInfo = NaiBa.Util.Helper.ConfigHelper.LoadConfig>("wx_shop_auth_list"); - if (lstShopAuthInfo == null) - lstShopAuthInfo = new ConcurrentList(); - lstWXShopTokenInfo = NaiBa.Util.Helper.ConfigHelper.LoadConfig>("wx_shop_token_list"); if (lstWXShopTokenInfo == null) lstWXShopTokenInfo = new ConcurrentList(); - lstTemuDBProductSelect = NaiBa.Util.Helper.ConfigHelper.LoadConfig>("wx_db_prod_upload_list"); - if (lstTemuDBProductSelect == null) - lstTemuDBProductSelect = new NaiBa.Util.ConcurrentList(); - - lstAddPriceRule = NaiBa.Util.Helper.ConfigHelper.LoadConfig>("wx_add_price_rules"); - if (lstAddPriceRule == null) - { - lstAddPriceRule = new NaiBa.Util.ConcurrentList(); - lstAddPriceRule.Add(new AddPriceRule() { MoreThanPrice = 0, LessThanPrice = 10, AddPriceTimes = 2, AddMorePrice = 10, SinglePriceAdd = 1 }); - lstAddPriceRule.Add(new AddPriceRule() { MoreThanPrice = 10, LessThanPrice = 20, AddPriceTimes = 2, AddMorePrice = 10, SinglePriceAdd = 1 }); - lstAddPriceRule.Add(new AddPriceRule() { MoreThanPrice = 20, LessThanPrice = 999, AddPriceTimes = 2, AddMorePrice = 10, SinglePriceAdd = 1 }); - } - dicCheckedShopId = NaiBa.Util.Helper.ConfigHelper.LoadConfig>("wx_checked_shop_dic"); if (dicCheckedShopId == null) dicCheckedShopId = new Dictionary(); - dicShopUpload = NaiBa.Util.Helper.ConfigHelper.LoadConfig>("wx_shop_upload_info"); - if (dicShopUpload == null) - dicShopUpload = new Dictionary(); - - defaultAddPriceRule = NaiBa.Util.Helper.ConfigHelper.LoadConfig("wx_default_add_price_rule"); - if (defaultAddPriceRule == null) - { - defaultAddPriceRule = new AddPriceRule() { AddPriceTimes = 1.3m, AddMorePrice = 1, SinglePriceAdd = 1 }; - } - - wxUploadRule = NaiBa.Util.Helper.ConfigHelper.LoadConfig("wx_upload_rule"); - if (wxUploadRule == null) - wxUploadRule = new WXUploadRule(); chkSelectAll = dgvShop.Columns["colSelect"].AddHeaderCheckBox(HorizontalAlignment.Center, 0, 0, null, null, false); dgvShop.Columns["colSelect"].HeaderText = ""; - //chkSelectAll.Width = chkSelectAll.Height = 13; chkSelectAll.CheckedChanged += chkSelectAll_CheckedChanged; - //chkSelectAll.Checked = true; this.dgvSelectProduct.AddSelectorColumn("colCheck"); @@ -114,139 +75,9 @@ namespace TemuKJD.WXForms.ProductForms dgvSelectProduct.Columns["colSkuFakeImg"].Visible = false; - //foreach (var selectProd in upload_draft_product_lst) - //{ - // int rowIndex = 0; - // this.dgvSelectProduct.Rows.Insert(rowIndex, - // true, - // selectProd.id, - // selectProd.shop_id, - // selectProd.shop_account, - // "登录", - // "进店", - // BaseClass.SaLevel > 0 ? selectProd.spu_id : selectProd.spu_id.ParseToString().GetHashCode().ParseToString().Trim('-'), - // selectProd.skc_id, - // selectProd.main_img, - // DataGridViewExtension.defaultBitmap, - // "", - // null, - // selectProd.product_name, // 用户端显示商品原名 - // selectProd.cat_name, - // BaseClass.SaLevel > 0 ? selectProd.ext_code : selectProd.ext_code.ParseToString().GetHashCode().ParseToString().Trim('-'), - // selectProd.status, - // selectProd.draft_id, - // selectProd.notes, - // (selectProd.user_notes + " 编辑").Trim(), - // "删除", - // selectProd.add_time.ToString("yy-MM-dd HH:mm:ss"), - // ""); - - // dgvSelectProduct.Rows[rowIndex].Height = 60; - - // int maxRowCount = 10000; - // while (dgvSelectProduct.Rows.Count > maxRowCount) - // { - // dgvSelectProduct.Rows.RemoveAt(maxRowCount); - // } - //} - - //#if DEBUG - if (BaseClass.SaLevel == 1) - { - //txtIdFilter.Visible = true; - //txtExtCodeFilter.Visible = true; - //lblIdFilter.Visible = true; - //lblExtCodeFilter.Visible = true; - } - //#endif IsLoadComplate = true; } - private void btnRefreshAuthor_Click(object sender, EventArgs e) - { - updateAuthor(true); - } - - /// - /// 升级授权 - /// - /// 今日取过的也取 - private void updateAuthor(bool idRefreshTodayHasGet = false) - { - this.pbLoadingShop.Visible = true; - Task.Run(() => - { - // 店铺Id - var updateIds = dgvShop.Rows.Cast().Select(r => r.Cells["colShopId"]?.Value.ToString()).ToList(); - var selectIds = dgvShop.Rows.Cast().Where(row - => row.Cells["colSelect"]?.Value.ParseToBool() == true).Select(r => r.Cells["colShopId"]?.Value.ToString()).ToList(); - if (idRefreshTodayHasGet == true) - updateIds = selectIds; - - List tList = new List(); - if (idRefreshTodayHasGet) - lstShopAuthInfo.RemoveAll(s => updateIds.Contains(s.ShopId)); - foreach (var shop in GlobalConfig.ShopLoginList.Where(s => updateIds.Contains(s.ShopId))) - { - Invoke(new Action(() => { BindShop(shop, selectIds, ""); })); - var t = Task.Run(() => - { - try - { - if (shop.LoginStatus != "登录成功") - { - Invoke(new Action(() => { BindShop(shop, selectIds, "店铺掉线"); })); - return; - } - - var authInfo = lstShopAuthInfo.FirstOrDefault(sa => sa.ShopId == shop.ShopId); - if (idRefreshTodayHasGet || authInfo == null || authInfo?.UpdateTime.Date != DateTime.Now.Date) - { - lstShopAuthInfo.RemoveAll(sa => sa.ShopId == shop.ShopId); - var rst = WXUpload.GetApiServiceList(shop); - if (!rst.Contains("\"code\":0")) - { - WXShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false); - if (shop.LoginStatus != "登录成功") - { - Invoke(new Action(() => { BindShop(shop, selectIds, "店铺掉线"); })); - return; - } - - lstShopAuthInfo.Add(new AuthInfo() { ShopId = shop.ShopId, UpdateTime = DateTime.Now, ExpiresTime = DateTime.Now }); - Invoke(new Action(() => { BindShop(shop, selectIds, "授权查询失败"); })); - return; - } - - foreach (var itemObj in JsonHelper.JObjectParse(rst)["itemList"]) - { - // 找到了指定服务 - if (itemObj["serviceName"].ParseToString() == "店统领供应链-商品管理") - { - var expiresTick = itemObj["expireTime"].ParseToLong(); - lstShopAuthInfo.Add(new AuthInfo() { ShopId = shop.ShopId, UpdateTime = DateTime.Now, ExpiresTime = BaseClass.StampToDateTime(expiresTick.ParseToInt()) }); - Invoke(new Action(() => { BindShop(shop, selectIds, "已查询"); })); - return; - } - } - // 没找到指定服务 - lstShopAuthInfo.Add(new AuthInfo() { ShopId = shop.ShopId, UpdateTime = DateTime.Now, ExpiresTime = DateTime.Now }); - Invoke(new Action(() => { BindShop(shop, selectIds, "已查询"); })); - } - } - catch (Exception ex) - { - } - }); - tList.Add(t); - while (tList.Where(ta => !ta.IsFaulted && !ta.IsCompleted).Count() >= 20) { Thread.Sleep(100); } - } - while (tList.Where(ta => !ta.IsFaulted && !ta.IsCompleted).Count() >= 1) { Thread.Sleep(100); } - NaiBa.Util.Helper.ConfigHelper.SaveConfig("wx_shop_auth_list", lstShopAuthInfo); - Invoke(new Action(() => { pbLoadingShop.Visible = false; })); - }); - } - private void chkSelectAll_CheckedChanged(object sender, EventArgs e) { if (!chkSelectAll.Checked) @@ -278,6 +109,7 @@ namespace TemuKJD.WXForms.ProductForms { pbLoadingShop.Visible = true; RefreshShopLogin(); + pbLoadingShop.Visible = false; } private void UserSelectDbProductForm_VisibleChanged(object sender, EventArgs e) @@ -285,7 +117,7 @@ namespace TemuKJD.WXForms.ProductForms if (Visible == true) { RefreshShopLogin(); - updateAuthor(); + //updateAuthor(); if (!isInit) { @@ -330,11 +162,15 @@ namespace TemuKJD.WXForms.ProductForms BindShop(shopEntity, selectIds); } cmbFilterShopNotes.Items.Clear(); - //cmbFilterShopNotes.Items.Add(""); foreach (var note in GlobalConfig.ShopLoginList.Select(s => s.Notes).Where(s => !s.IsNullOrEmpty()).Distinct()) { cmbFilterShopNotes.Items.Add(note); } + cmbFilterShopGroup.Items.Clear(); + foreach (var note in GlobalConfig.ShopLoginList.Select(s => s.GroupName).Where(s => !s.IsNullOrEmpty()).Distinct()) + { + cmbFilterShopGroup.Items.Add(note); + } } private void BindShop(ShopLoginInfo shopEntity, List selectShopId = null, string msg = "") @@ -359,9 +195,10 @@ namespace TemuKJD.WXForms.ProductForms shopEntity.ShopId, shopEntity.ShopAccount, shopEntity.Notes, + shopEntity.GroupName, "选择商品", canUse ? "在线" : "掉线", - lstShopAuthInfo.FirstOrDefault(sa => sa.ShopId == shopEntity.ShopId)?.ExpiresTime > DateTime.Now.AddMinutes(5) ? "可用" : "过期", + GlobalConfig.lstWxShopAuthInfo.FirstOrDefault(sa => sa.ShopId == shopEntity.ShopId)?.ExpiresTime > DateTime.Now.AddMinutes(5) ? "可用" : "过期", canUse, dicShopUpload.ContainsKey(shopEntity.ShopId) && dicShopUpload[shopEntity.ShopId].DicDayUploadCount.ContainsKey(day) ? dicShopUpload[shopEntity.ShopId].DicDayUploadCount[day] : 0, @@ -379,10 +216,11 @@ namespace TemuKJD.WXForms.ProductForms row.Cells["colShopLoginName"].Value = shopEntity.LoginName; row.Cells["colShopName"].Value = shopEntity.ShopAccount; row.Cells["colShopNotes"].Value = shopEntity.Notes; + row.Cells["colGroup"].Value = shopEntity.GroupName; row.Cells["colLoginStatus"].Value = canUse ? "在线" : "掉线"; row.Cells["colLoginStatus"].Style.ForeColor = canUse ? Color.Green : Color.Red; row.Cells["colCanUse"].Value = canUse; - row.Cells["colApi"].Value = lstShopAuthInfo.FirstOrDefault(sa => sa.ShopId == shopEntity.ShopId)?.ExpiresTime > DateTime.Now.AddMinutes(5) ? "可用" : "过期"; + row.Cells["colApi"].Value = GlobalConfig.lstWxShopAuthInfo.FirstOrDefault(sa => sa.ShopId == shopEntity.ShopId)?.ExpiresTime > DateTime.Now.AddMinutes(5) ? "可用" : "过期"; row.Cells["colRemaining"].Value = shopEntity.AddProductRemaining; row.Cells["colUploadCount"].Value = dicShopUpload.ContainsKey(shopEntity.ShopId) && dicShopUpload[shopEntity.ShopId].DicDayUploadCount.ContainsKey(day) ? dicShopUpload[shopEntity.ShopId].DicDayUploadCount[day] : 0; @@ -495,7 +333,6 @@ namespace TemuKJD.WXForms.ProductForms return; string headerText = dgvSelectProduct.Columns[e.ColumnIndex].HeaderText; var dbId = dgvSelectProduct.Rows[e.RowIndex].Cells["colSelectId"].Value.ParseToString(); - var dbProduct = lstTemuDBProductSelect.FirstOrDefault(p => p.id.ToString() == dbId); var shopId = dgvSelectProduct.Rows[e.RowIndex].Cells["colSupplierId"].Value.ParseToString(); var draftId = dgvSelectProduct.Rows[e.RowIndex].Cells["colDraftId"].Value.ParseToString(); var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId); @@ -532,17 +369,6 @@ namespace TemuKJD.WXForms.ProductForms } } break; - case "上传商品Id": - //if (!string.IsNullOrEmpty(draftId) && shop != null) - //{ - // ShopLoginForm shopLoginForm = new ShopLoginForm(shop); - // shopLoginForm.InitUrl = "https://seller.kuajingmaihuo.com/goods/product-create/product-edit?productDraftId=" + - // draftId + "&from=productDraftList"; - // shopLoginForm.openType = EnumOpenType.manage; - // shopLoginForm.WindowState = FormWindowState.Maximized; - // shopLoginForm.ShowDialog(); - //} - break; case "图片": { ShowImgForm imgFrom = new ShowImgForm(dgvSelectProduct.Rows[e.RowIndex].Cells["colImgUrl"].Value.ParseToString()); @@ -575,7 +401,7 @@ namespace TemuKJD.WXForms.ProductForms => row.Cells["colSelect"]?.Value.ParseToBool() == true).Select(r => r.Cells["colShopId"]?.Value.ToString()).ToList(); if (shopIdLst.Count <= 0) { - BaseMsgForm.ShowError("未勾选上传店铺！"); + BaseMsgForm.ShowError("未勾选查询店铺！"); return; } btnSearchProd.Enabled = false; @@ -627,15 +453,17 @@ namespace TemuKJD.WXForms.ProductForms if (rb7.Checked) { endMs = BaseClass.DateTimeToTimestampMilliseconds(DateTime.Now.Date) - 1; - startMs = BaseClass.DateTimeToTimestampMilliseconds(DateTime.Now.Date.AddDays(-30)); + startMs = BaseClass.DateTimeToTimestampMilliseconds(DateTime.Now.Date.AddDays(-7)); dateRange = 7; } - var result = WxPlatformRecommendProdManage.getPlatformRecommend(shop, startMs, endMs, page, dateRange); + pageSize = 10; + var result = WxPlatformRecommendProdManage.getPlatformRecommend(shop, startMs, endMs, page, pageSize, dateRange); if (!result.Contains("\"code\":0")) { ShowShopError(shop, result); break; } + totalPage = Math.Ceiling(BaseRegex.GetIntJson(ref result, "list_total") * 1m / pageSize).ParseToInt(); List recommendProds = new List(); try { @@ -663,7 +491,9 @@ namespace TemuKJD.WXForms.ProductForms else if (OnSaleStatus == "回收站") onSaleStatusCode = 6; - getProdOnSaleRst = WXClearNoVisit.searchProduct(shop, page, pageSize, "", onSaleStatusCode); + pageSize = 20; + string spuIds = string.Join(",", recommendProds.Select(s => s.product_id).ToList()); + getProdOnSaleRst = WXClearNoVisit.searchProduct(shop, 1, pageSize, spuIds, onSaleStatusCode); Thread.Sleep(Randomx.GetId(50, 100)); if (!getProdOnSaleRst.Contains("\"success\":true")) { @@ -674,18 +504,17 @@ namespace TemuKJD.WXForms.ProductForms try { var prodObjs = JsonHelper.JObjectParse(getProdOnSaleRst); - if (page == 1 || 1 == 1) - { - var totalNum = prodObjs["totalNum"].ParseToInt(); - totalPage = Math.Ceiling(1m * totalNum / pageSize).ParseToInt(); - } - nextKey = prodObjs["nextKey"].ParseToString(); + // 按商品id查询不需要 + //if (page == 1 || 1 == 1) + //{ + // var totalNum = prodObjs["totalNum"].ParseToInt(); + // totalPage = Math.Ceiling(1m * totalNum / pageSize).ParseToInt(); + //} + //nextKey = prodObjs["nextKey"].ParseToString(); Invoke(new Action(() => { this.pbLoading.Visible = true; this.statusBar.lblTaskStatus.Text = "正在查询店铺：" + shop.ShopAccount + " " + page + "/" + Math.Min(PageEnd, totalPage); - //this.statusBar.pgbTaskProgress.Maximum = lstTemuDBProductSelect.Count; - //this.statusBar.UpdateProgressBar(0); })); foreach (JObject prod in prodObjs["productList"]) { @@ -717,6 +546,11 @@ namespace TemuKJD.WXForms.ProductForms var Limit2 = BaseRegex.GetStringJson(ref pStr, "secondLevelLabelName").ParseToString().Length > 0 ? "\r\n低风险规则上架" : ""; StatusStr += Limit1 + Limit2; + var spuId = prod["productId"].ParseToString(); + var recommendProd = recommendProds.FirstOrDefault(r => r.product_id == prod["productId"].ParseToString()); + if (recommendProd == null) + recommendProd = new WXPlatformRecommendProdInfo(); + var rowIndex = this.dgvSelectProduct.Rows.Add( false, "", @@ -735,13 +569,14 @@ namespace TemuKJD.WXForms.ProductForms (prod["recommendCategory"].IsJTokenNullOrEmpty() || prod["recommendCategory"]["categoryNames"].IsJTokenNullOrEmpty()) ? "" : string.Join(" >> ", prod["recommendCategory"]["categoryNames"].Select(s => s.ParseToString())), // 类目名称 prod["spuCode"].ParseToString(), - //price, - prod["price"].ParseToDecimal() * 0.01m, - prod["soldNum"].ParseToInt(), + prod["price"].ParseToDecimal() * 0.01m, // 价格 + prod["soldNum"].ParseToInt(), // 销量 + recommendProd.product_view_uv, + recommendProd.pay_order_cnt, StatusStr, - prod["presaleTag"].ParseToInt() == 1 ? "[预售]" : "", + prod["presaleTag"].ParseToInt() == 1 ? "[预售]" : "", // 预售 "", // 备注 - "", + "", // 操作结果 "删除", BaseClass.StampToDateTime(prod["lastEditDraftTime"].ParseToInt()).ToString("yy-MM-dd HH:mm"), ""); @@ -793,13 +628,18 @@ namespace TemuKJD.WXForms.ProductForms private void btnFilterShop_Click(object sender, EventArgs e) { + string notes = cmbFilterShopNotes.Text.Trim().Trim(';'); + if (notes == "全部") + notes = ""; + List notesLst = notes.Split(new string[] { ";", "；", ",", "，" }, StringSplitOptions.RemoveEmptyEntries).ToList(); + + string group = cmbFilterShopGroup.Text.Trim().Trim(';'); + if (group == "全部") + group = ""; + List groupLst = group.Split(new string[] { ";", "；", ",", "，" }, StringSplitOptions.RemoveEmptyEntries).ToList(); + foreach (DataGridViewRow row in dgvShop.Rows) { - string notes = cmbFilterShopNotes.Text.Trim().Trim(';'); - if (notes == "全部") - notes = ""; - List notesLst = notes.Split(new string[] { ";", "；", ",", "，" }, StringSplitOptions.RemoveEmptyEntries).ToList(); - if (!row.Cells["colShopName"].Value.ParseToString().Contains(txtFilterShopName.Text.Trim())) { row.Visible = false; @@ -812,6 +652,12 @@ namespace TemuKJD.WXForms.ProductForms row.Cells["colSelect"].Value = false; continue; } + if (!string.IsNullOrWhiteSpace(group) && !groupLst.Contains(row.Cells["colGroup"].Value.ParseToString())) + { + row.Visible = false; + row.Cells["colSelect"].Value = false; + continue; + } row.Visible = true; } } @@ -820,6 +666,7 @@ namespace TemuKJD.WXForms.ProductForms { txtFilterShopName.Text = ""; cmbFilterShopNotes.Text = "全部"; + cmbFilterShopGroup.Text = "全部"; btnFilterShop_Click(null, null); } @@ -839,16 +686,24 @@ namespace TemuKJD.WXForms.ProductForms notes = ""; List notesLst = notes.Split(new string[] { ";", "；", ",", "，" }, StringSplitOptions.RemoveEmptyEntries).ToList(); + string group = cmbFilterShopGroup.Text.Trim().Trim(';'); + if (group == "全部") + group = ""; + List groupLst = group.Split(new string[] { ";", "；", ",", "，" }, StringSplitOptions.RemoveEmptyEntries).ToList(); + foreach (DataGridViewRow row in dgvShop.Rows) { - if (row.Visible == true) - { - if (row.Cells["colShopName"].Value.ParseToString().Contains(txtFilterShopName.Text.Trim()) && - (string.IsNullOrWhiteSpace(notes) || notesLst.Contains(row.Cells["colShopNotes"].Value.ParseToString()))) - { - row.Cells["colSelect"].Value = true; - } - } + if (row.Visible == false) + continue; + + if (!row.Cells["colShopName"].Value.ParseToString().Contains(txtFilterShopName.Text.Trim())) + continue; + if (!string.IsNullOrWhiteSpace(notes) && !notesLst.Contains(row.Cells["colShopNotes"].Value.ParseToString())) + continue; + if (!string.IsNullOrWhiteSpace(group) && !groupLst.Contains(row.Cells["colGroup"].Value.ParseToString())) + continue; + + row.Cells["colSelect"].Value = true; } } @@ -859,16 +714,24 @@ namespace TemuKJD.WXForms.ProductForms notes = ""; List notesLst = notes.Split(new string[] { ";", "；", ",", "，" }, StringSplitOptions.RemoveEmptyEntries).ToList(); + string group = cmbFilterShopGroup.Text.Trim().Trim(';'); + if (group == "全部") + group = ""; + List groupLst = group.Split(new string[] { ";", "；", ",", "，" }, StringSplitOptions.RemoveEmptyEntries).ToList(); + foreach (DataGridViewRow row in dgvShop.Rows) { - if (row.Visible == true) - { - if (row.Cells["colShopName"].Value.ParseToString().Contains(txtFilterShopName.Text.Trim()) && - (string.IsNullOrWhiteSpace(notes) || notesLst.Contains(row.Cells["colShopNotes"].Value.ParseToString()))) - { - row.Cells["colSelect"].Value = false; - } - } + if (row.Visible == false) + continue; + + if (!row.Cells["colShopName"].Value.ParseToString().Contains(txtFilterShopName.Text.Trim())) + continue; + if (!string.IsNullOrWhiteSpace(notes) && !notesLst.Contains(row.Cells["colShopNotes"].Value.ParseToString())) + continue; + if (!string.IsNullOrWhiteSpace(group) && !groupLst.Contains(row.Cells["colGroup"].Value.ParseToString())) + continue; + + row.Cells["colSelect"].Value = false; } } @@ -1076,10 +939,16 @@ namespace TemuKJD.WXForms.ProductForms { foreach (DataGridViewRow row in dgvSelectProduct.Rows) { - if (row.Cells["colSoldNum"].Value.ParseToInt() >= txtFiltSaleNum.Text.Trim().ParseToInt()) + row.Cells["colCheck"].Value = true; + + if (row.Cells["colViewUv"].Value.ParseToInt() >= txtViewUv.Text.Trim().ParseToInt()) + row.Cells["colCheck"].Value = false; + + if (row.Cells["colPayOrderCnt"].Value.ParseToInt() >= txtFiltSaleNum.Text.Trim().ParseToInt()) + row.Cells["colCheck"].Value = false; + + if (row.Cells["colAddTime"].Value.ParseToString().ParseToDateTime() >= DateTime.Now.AddDays(-txtAddDays.Text.Trim().ParseToInt())) row.Cells["colCheck"].Value = false; - else - row.Cells["colCheck"].Value = true; } } @@ -1465,7 +1334,7 @@ namespace TemuKJD.WXForms.ProductForms string url = "https://store.weixin.qq.com/shop-faas/mmchannelstradeproductcore/cgi/goods/searchProduct?token=&lang=zh_CN&" + "pageSize=" + pageSize + "&productStatus[]=-1&productSource=[1,16,32]&searchSource=1&useNew=true&pageNum=" + pageNum + "&status[]=" + status; if (prodIds != null) - url += "&presaleType[]=" + prodIds; + url += "&spuId=" + prodIds; if (sortType != null) url += "&sortType=" + sortType; diff --git a/TEMUKJD/WXForms/ProductForms/WXProdClearNoVisitForm.resx b/TEMUKJD/WXForms/ProductForms/WXProdClearNoVisitForm.resx index 438e4c9..ddb9faf 100644 --- a/TEMUKJD/WXForms/ProductForms/WXProdClearNoVisitForm.resx +++ b/TEMUKJD/WXForms/ProductForms/WXProdClearNoVisitForm.resx @@ -129,6 +129,9 @@ True + + True + True @@ -204,6 +207,12 @@ True + + True + + + True + True diff --git a/TEMUKJD/WXForms/ProductForms/WXProdCouponOrderBoomForm.Designer.cs b/TEMUKJD/WXForms/ProductForms/WXProdCouponOrderBoomForm.Designer.cs index bf0c046..8c97a21 100644 --- a/TEMUKJD/WXForms/ProductForms/WXProdCouponOrderBoomForm.Designer.cs +++ b/TEMUKJD/WXForms/ProductForms/WXProdCouponOrderBoomForm.Designer.cs @@ -93,7 +93,6 @@ namespace TemuKJD.WXForms.ProductForms this.btnStopOp = new DevComponents.DotNetBar.PanelEx(); this.btnEndPromotion = new DevComponents.DotNetBar.PanelEx(); this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); - this.btnRefreshAuthor = new DevComponents.DotNetBar.PanelEx(); this.btnSelectOffline = new DevComponents.DotNetBar.PanelEx(); this.btnSelectOnline = new DevComponents.DotNetBar.PanelEx(); this.btnAddUnSelect = new DevComponents.DotNetBar.PanelEx(); @@ -1008,7 +1007,6 @@ namespace TemuKJD.WXForms.ProductForms | System.Windows.Forms.AnchorStyles.Left))); this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; - this.ucGroupBoxEx1.Controls.Add(this.btnRefreshAuthor); this.ucGroupBoxEx1.Controls.Add(this.btnSelectOffline); this.ucGroupBoxEx1.Controls.Add(this.btnSelectOnline); this.ucGroupBoxEx1.Controls.Add(this.btnAddUnSelect); @@ -1028,30 +1026,6 @@ namespace TemuKJD.WXForms.ProductForms this.ucGroupBoxEx1.TabStop = false; this.ucGroupBoxEx1.Text = "店铺筛选"; // - // btnRefreshAuthor - // - this.btnRefreshAuthor.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnRefreshAuthor.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnRefreshAuthor.DisabledBackColor = System.Drawing.Color.Empty; - this.btnRefreshAuthor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnRefreshAuthor.Location = new System.Drawing.Point(81, 17); - this.btnRefreshAuthor.Name = "btnRefreshAuthor"; - this.btnRefreshAuthor.Size = new System.Drawing.Size(70, 20); - this.btnRefreshAuthor.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnRefreshAuthor.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnRefreshAuthor.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnRefreshAuthor.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.btnRefreshAuthor.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.btnRefreshAuthor.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.btnRefreshAuthor.Style.ForeColor.Color = System.Drawing.Color.White; - this.btnRefreshAuthor.Style.GradientAngle = 90; - this.btnRefreshAuthor.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnRefreshAuthor.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnRefreshAuthor.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnRefreshAuthor.TabIndex = 800; - this.btnRefreshAuthor.Text = "刷新授权"; - this.btnRefreshAuthor.Click += new System.EventHandler(this.btnRefreshAuthor_Click); - // // btnSelectOffline // this.btnSelectOffline.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -1261,7 +1235,7 @@ namespace TemuKJD.WXForms.ProductForms this.btnRefreshShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnRefreshShop.Location = new System.Drawing.Point(9, 17); this.btnRefreshShop.Name = "btnRefreshShop"; - this.btnRefreshShop.Size = new System.Drawing.Size(70, 20); + this.btnRefreshShop.Size = new System.Drawing.Size(142, 20); this.btnRefreshShop.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnRefreshShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnRefreshShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -1962,7 +1936,6 @@ namespace TemuKJD.WXForms.ProductForms private DevComponents.DotNetBar.PanelEx btnAddSelect; private DevComponents.DotNetBar.PanelEx btnSelectOffline; private DevComponents.DotNetBar.PanelEx btnSelectOnline; - private DevComponents.DotNetBar.PanelEx btnRefreshAuthor; private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect; private System.Windows.Forms.DataGridViewTextBoxColumn colShopLoginName; private System.Windows.Forms.DataGridViewTextBoxColumn colShopId; diff --git a/TEMUKJD/WXForms/ProductForms/WXProdCouponOrderBoomForm.cs b/TEMUKJD/WXForms/ProductForms/WXProdCouponOrderBoomForm.cs index 6a01392..2ce715f 100644 --- a/TEMUKJD/WXForms/ProductForms/WXProdCouponOrderBoomForm.cs +++ b/TEMUKJD/WXForms/ProductForms/WXProdCouponOrderBoomForm.cs @@ -42,14 +42,7 @@ namespace TemuKJD.WXForms.ProductForms bool isInit = false; CheckBox chkSelectAll = null; - ConcurrentList lstShopAuthInfo = new ConcurrentList(); - ConcurrentList lstWXShopTokenInfo = new ConcurrentList(); - public NaiBa.Util.ConcurrentList lstTemuDBProductSelect = new NaiBa.Util.ConcurrentList(); - NaiBa.Util.ConcurrentList lstAddPriceRule = new NaiBa.Util.ConcurrentList(); - //public Dictionary> dicCheckedShopIdList = new Dictionary>(); public Dictionary dicCheckedShopId = new Dictionary(); - public Dictionary dicShopUpload = new Dictionary(); - public string pdd_product_cates = ""; public WXProdCouponOrderBoomForm() { InitializeComponent(); @@ -61,35 +54,9 @@ namespace TemuKJD.WXForms.ProductForms btnClearCoupon_Click(null, null); - lstShopAuthInfo = NaiBa.Util.Helper.ConfigHelper.LoadConfig>("wx_shop_auth_list"); - if (lstShopAuthInfo == null) - lstShopAuthInfo = new ConcurrentList(); - - lstWXShopTokenInfo = NaiBa.Util.Helper.ConfigHelper.LoadConfig>("wx_shop_token_list"); - if (lstWXShopTokenInfo == null) - lstWXShopTokenInfo = new ConcurrentList(); - - lstTemuDBProductSelect = NaiBa.Util.Helper.ConfigHelper.LoadConfig>("wx_db_prod_upload_list"); - if (lstTemuDBProductSelect == null) - lstTemuDBProductSelect = new NaiBa.Util.ConcurrentList(); - - lstAddPriceRule = NaiBa.Util.Helper.ConfigHelper.LoadConfig>("wx_add_price_rules"); - if (lstAddPriceRule == null) - { - lstAddPriceRule = new NaiBa.Util.ConcurrentList(); - lstAddPriceRule.Add(new AddPriceRule() { MoreThanPrice = 0, LessThanPrice = 10, AddPriceTimes = 2, AddMorePrice = 10, SinglePriceAdd = 1 }); - lstAddPriceRule.Add(new AddPriceRule() { MoreThanPrice = 10, LessThanPrice = 20, AddPriceTimes = 2, AddMorePrice = 10, SinglePriceAdd = 1 }); - lstAddPriceRule.Add(new AddPriceRule() { MoreThanPrice = 20, LessThanPrice = 999, AddPriceTimes = 2, AddMorePrice = 10, SinglePriceAdd = 1 }); - } - dicCheckedShopId = NaiBa.Util.Helper.ConfigHelper.LoadConfig>("wx_checked_shop_dic"); if (dicCheckedShopId == null) dicCheckedShopId = new Dictionary(); - dicShopUpload = NaiBa.Util.Helper.ConfigHelper.LoadConfig>("wx_shop_upload_info"); - if (dicShopUpload == null) - dicShopUpload = new Dictionary(); - - chkSelectAll = dgvShop.Columns["colSelect"].AddHeaderCheckBox(HorizontalAlignment.Center, 0, 0, null, null, false); dgvShop.Columns["colSelect"].HeaderText = ""; @@ -116,91 +83,6 @@ namespace TemuKJD.WXForms.ProductForms IsLoadComplate = true; } - private void btnRefreshAuthor_Click(object sender, EventArgs e) - { - updateAuthor(true); - } - - /// - /// 升级授权 - /// - /// 今日取过的也取 - private void updateAuthor(bool idRefreshTodayHasGet = false) - { - this.pbLoadingShop.Visible = true; - Task.Run(() => - { - // 店铺Id - var updateIds = dgvShop.Rows.Cast().Select(r => r.Cells["colShopId"]?.Value.ToString()).ToList(); - var selectIds = dgvShop.Rows.Cast().Where(row - => row.Cells["colSelect"]?.Value.ParseToBool() == true).Select(r => r.Cells["colShopId"]?.Value.ToString()).ToList(); - if (idRefreshTodayHasGet == true) - updateIds = selectIds; - - List tList = new List(); - if (idRefreshTodayHasGet) - lstShopAuthInfo.RemoveAll(s => updateIds.Contains(s.ShopId)); - foreach (var shop in GlobalConfig.ShopLoginList.Where(s => updateIds.Contains(s.ShopId))) - { - Invoke(new Action(() => { BindShop(shop, selectIds, ""); })); - var t = Task.Run(() => - { - try - { - if (shop.LoginStatus != "登录成功") - { - Invoke(new Action(() => { BindShop(shop, selectIds, "店铺掉线"); })); - return; - } - - var authInfo = lstShopAuthInfo.FirstOrDefault(sa => sa.ShopId == shop.ShopId); - if (idRefreshTodayHasGet || authInfo == null || authInfo?.UpdateTime.Date != DateTime.Now.Date) - { - lstShopAuthInfo.RemoveAll(sa => sa.ShopId == shop.ShopId); - var rst = WXUpload.GetApiServiceList(shop); - if (!rst.Contains("\"code\":0")) - { - WXShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false); - if (shop.LoginStatus != "登录成功") - { - Invoke(new Action(() => { BindShop(shop, selectIds, "店铺掉线"); })); - return; - } - - lstShopAuthInfo.Add(new AuthInfo() { ShopId = shop.ShopId, UpdateTime = DateTime.Now, ExpiresTime = DateTime.Now }); - Invoke(new Action(() => { BindShop(shop, selectIds, "授权查询失败"); })); - return; - } - - foreach (var itemObj in JsonHelper.JObjectParse(rst)["itemList"]) - { - // 找到了指定服务 - if (itemObj["serviceName"].ParseToString() == "店统领供应链-商品管理") - { - var expiresTick = itemObj["expireTime"].ParseToLong(); - lstShopAuthInfo.Add(new AuthInfo() { ShopId = shop.ShopId, UpdateTime = DateTime.Now, ExpiresTime = BaseClass.StampToDateTime(expiresTick.ParseToInt()) }); - Invoke(new Action(() => { BindShop(shop, selectIds, "已查询"); })); - return; - } - } - // 没找到指定服务 - lstShopAuthInfo.Add(new AuthInfo() { ShopId = shop.ShopId, UpdateTime = DateTime.Now, ExpiresTime = DateTime.Now }); - Invoke(new Action(() => { BindShop(shop, selectIds, "已查询"); })); - } - } - catch (Exception ex) - { - } - }); - tList.Add(t); - while (tList.Where(ta => !ta.IsFaulted && !ta.IsCompleted).Count() >= 20) { Thread.Sleep(100); } - } - while (tList.Where(ta => !ta.IsFaulted && !ta.IsCompleted).Count() >= 1) { Thread.Sleep(100); } - NaiBa.Util.Helper.ConfigHelper.SaveConfig( "wx_shop_auth_list", lstShopAuthInfo); - Invoke(new Action(() => { pbLoadingShop.Visible = false; })); - }); - } - private void chkSelectAll_CheckedChanged(object sender, EventArgs e) { if (!chkSelectAll.Checked) @@ -239,7 +121,6 @@ namespace TemuKJD.WXForms.ProductForms if (Visible == true) { RefreshShopLogin(); - updateAuthor(); if (!isInit) { @@ -315,12 +196,10 @@ namespace TemuKJD.WXForms.ProductForms shopEntity.Notes, "选择商品", canUse ? "在线" : "掉线", - lstShopAuthInfo.FirstOrDefault(sa => sa.ShopId == shopEntity.ShopId)?.ExpiresTime > DateTime.Now.AddMinutes(5) ? "可用" : "过期", + GlobalConfig.lstWxShopAuthInfo.FirstOrDefault(sa => sa.ShopId == shopEntity.ShopId)?.ExpiresTime > DateTime.Now.AddMinutes(5) ? "可用" : "过期", canUse, - dicShopUpload.ContainsKey(shopEntity.ShopId) && dicShopUpload[shopEntity.ShopId].DicDayUploadCount.ContainsKey(day) ? - dicShopUpload[shopEntity.ShopId].DicDayUploadCount[day] : 0, - dicShopUpload.ContainsKey(shopEntity.ShopId) && dicShopUpload[shopEntity.ShopId].OnSaleRefreshDay == DateTime.Now.ToString("yyyyMMdd").ParseToInt() ? - dicShopUpload[shopEntity.ShopId].OnSaleCount : 0, + GlobalConfig.dicWxShopUploadInfo.ContainsKey(shopEntity.ShopId) ? GlobalConfig.dicWxShopUploadInfo[shopEntity.ShopId].DicDayUploadCount[day] : 0, + GlobalConfig.dicWxShopUploadInfo.ContainsKey(shopEntity.ShopId) ? GlobalConfig.dicWxShopUploadInfo[shopEntity.ShopId].OnSaleCount : 0, shopEntity.AddProductRemaining, "", msg @@ -335,12 +214,10 @@ namespace TemuKJD.WXForms.ProductForms row.Cells["colLoginStatus"].Value = canUse ? "在线" : "掉线"; row.Cells["colLoginStatus"].Style.ForeColor = canUse ? Color.Green : Color.Red; row.Cells["colCanUse"].Value = canUse; - row.Cells["colApi"].Value = lstShopAuthInfo.FirstOrDefault(sa => sa.ShopId == shopEntity.ShopId)?.ExpiresTime > DateTime.Now.AddMinutes(5) ? "可用" : "过期"; + row.Cells["colApi"].Value = GlobalConfig.lstWxShopAuthInfo.FirstOrDefault(sa => sa.ShopId == shopEntity.ShopId)?.ExpiresTime > DateTime.Now.AddMinutes(5) ? "可用" : "过期"; row.Cells["colRemaining"].Value = shopEntity.AddProductRemaining; - row.Cells["colUploadCount"].Value = dicShopUpload.ContainsKey(shopEntity.ShopId) && dicShopUpload[shopEntity.ShopId].DicDayUploadCount.ContainsKey(day) ? - dicShopUpload[shopEntity.ShopId].DicDayUploadCount[day] : 0; - row.Cells["colOnSaleNum"].Value = dicShopUpload.ContainsKey(shopEntity.ShopId) && dicShopUpload[shopEntity.ShopId].OnSaleRefreshDay == DateTime.Now.ToString("yyyyMMdd").ParseToInt() ? - dicShopUpload[shopEntity.ShopId].OnSaleCount : 0; + row.Cells["colUploadCount"].Value = GlobalConfig.dicWxShopUploadInfo.ContainsKey(shopEntity.ShopId) ? GlobalConfig.dicWxShopUploadInfo[shopEntity.ShopId].DicDayUploadCount[day] : 0; + row.Cells["colOnSaleNum"].Value = GlobalConfig.dicWxShopUploadInfo.ContainsKey(shopEntity.ShopId) ? GlobalConfig.dicWxShopUploadInfo[shopEntity.ShopId].OnSaleCount : 0; row.Cells["colMessage"].Value = msg; } @@ -447,7 +324,6 @@ namespace TemuKJD.WXForms.ProductForms return; string headerText = dgvSelectProduct.Columns[e.ColumnIndex].HeaderText; var dbId = dgvSelectProduct.Rows[e.RowIndex].Cells["colSelectId"].Value.ParseToString(); - var dbProduct = lstTemuDBProductSelect.FirstOrDefault(p => p.id.ToString() == dbId); var shopId = dgvSelectProduct.Rows[e.RowIndex].Cells["colSupplierId"].Value.ParseToString(); var draftId = dgvSelectProduct.Rows[e.RowIndex].Cells["colDraftId"].Value.ParseToString(); var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId); @@ -484,17 +360,6 @@ namespace TemuKJD.WXForms.ProductForms } } break; - case "上传商品Id": - //if (!string.IsNullOrEmpty(draftId) && shop != null) - //{ - // ShopLoginForm shopLoginForm = new ShopLoginForm(shop); - // shopLoginForm.InitUrl = "https://seller.kuajingmaihuo.com/goods/product-create/product-edit?productDraftId=" + - // draftId + "&from=productDraftList"; - // shopLoginForm.openType = EnumOpenType.manage; - // shopLoginForm.WindowState = FormWindowState.Maximized; - // shopLoginForm.ShowDialog(); - //} - break; case "图片": { ShowImgForm imgFrom = new ShowImgForm(dgvSelectProduct.Rows[e.RowIndex].Cells["colImgUrl"].Value.ParseToString()); diff --git a/TEMUKJD/WXForms/ProductForms/WXProdPreSaleForm.Designer.cs b/TEMUKJD/WXForms/ProductForms/WXProdPreSaleForm.Designer.cs index 2e91831..6f8eec8 100644 --- a/TEMUKJD/WXForms/ProductForms/WXProdPreSaleForm.Designer.cs +++ b/TEMUKJD/WXForms/ProductForms/WXProdPreSaleForm.Designer.cs @@ -79,7 +79,9 @@ namespace TemuKJD.WXForms.ProductForms this.btnSearchProd = new DevComponents.DotNetBar.PanelEx(); this.label5 = new System.Windows.Forms.Label(); this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); - this.btnRefreshAuthor = new DevComponents.DotNetBar.PanelEx(); + this.cmbFilterShopGroup = new TemuKJD.UserComponent.UcComboBoxMutiSelect(); + this.label24 = new System.Windows.Forms.Label(); + this.btnFilterShop = new DevComponents.DotNetBar.PanelEx(); this.btnSelectOffline = new DevComponents.DotNetBar.PanelEx(); this.btnSelectOnline = new DevComponents.DotNetBar.PanelEx(); this.btnAddUnSelect = new DevComponents.DotNetBar.PanelEx(); @@ -87,7 +89,6 @@ namespace TemuKJD.WXForms.ProductForms this.cmbFilterShopNotes = new TemuKJD.UserComponent.UcComboBoxMutiSelect(); this.btnAddSelect = new DevComponents.DotNetBar.PanelEx(); this.btnEmptyShop = new DevComponents.DotNetBar.PanelEx(); - this.btnFilterShop = new DevComponents.DotNetBar.PanelEx(); this.label16 = new System.Windows.Forms.Label(); this.txtFilterShopName = new System.Windows.Forms.TextBox(); this.btnRefreshShop = new DevComponents.DotNetBar.PanelEx(); @@ -103,6 +104,7 @@ namespace TemuKJD.WXForms.ProductForms this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colShopNotes = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colGroup = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colSelectProduct = new System.Windows.Forms.DataGridViewLinkColumn(); this.colLoginStatus = new System.Windows.Forms.DataGridViewLinkColumn(); this.colApi = new System.Windows.Forms.DataGridViewLinkColumn(); @@ -111,7 +113,6 @@ namespace TemuKJD.WXForms.ProductForms this.colOnSaleNum = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colRemaining = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.chkUpDraft = new TemuKJD.UserComponent.UcCheckBox(this.components); this.pbLoading = new System.Windows.Forms.PictureBox(); this.chkTestNoAuditUpload = new TemuKJD.UserComponent.UcCheckBox(this.components); this.dgvSelectProduct = new TemuKJD.UserComponent.DataGridViewEx(); @@ -142,8 +143,6 @@ namespace TemuKJD.WXForms.ProductForms this.colOpResult = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.splitContainer4 = new System.Windows.Forms.SplitContainer(); this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); - this.btnClear = new DevComponents.DotNetBar.PanelEx(); - this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -166,7 +165,6 @@ namespace TemuKJD.WXForms.ProductForms ((System.ComponentModel.ISupportInitialize)(this.dgvSelectProduct)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer4)).BeginInit(); this.splitContainer4.Panel1.SuspendLayout(); - this.splitContainer4.Panel2.SuspendLayout(); this.splitContainer4.SuspendLayout(); this.SuspendLayout(); // @@ -209,9 +207,9 @@ namespace TemuKJD.WXForms.ProductForms this.ucGroupBoxEx3.Controls.Add(this.btnStopUpDownOrDel); this.ucGroupBoxEx3.Controls.Add(this.btnClearList); this.ucGroupBoxEx3.Controls.Add(this.btnDown); - this.ucGroupBoxEx3.Location = new System.Drawing.Point(994, 2); + this.ucGroupBoxEx3.Location = new System.Drawing.Point(1004, 2); this.ucGroupBoxEx3.Name = "ucGroupBoxEx3"; - this.ucGroupBoxEx3.Size = new System.Drawing.Size(350, 165); + this.ucGroupBoxEx3.Size = new System.Drawing.Size(340, 165); this.ucGroupBoxEx3.TabIndex = 668; this.ucGroupBoxEx3.TabStop = false; this.ucGroupBoxEx3.Text = "商品下架"; @@ -223,7 +221,7 @@ namespace TemuKJD.WXForms.ProductForms this.btnBatchRealDel.Cursor = System.Windows.Forms.Cursors.Hand; this.btnBatchRealDel.DisabledBackColor = System.Drawing.Color.Empty; this.btnBatchRealDel.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnBatchRealDel.Location = new System.Drawing.Point(244, 91); + this.btnBatchRealDel.Location = new System.Drawing.Point(234, 91); this.btnBatchRealDel.Name = "btnBatchRealDel"; this.btnBatchRealDel.Size = new System.Drawing.Size(84, 23); this.btnBatchRealDel.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -296,7 +294,7 @@ namespace TemuKJD.WXForms.ProductForms this.btnBatchDel.Cursor = System.Windows.Forms.Cursors.Hand; this.btnBatchDel.DisabledBackColor = System.Drawing.Color.Empty; this.btnBatchDel.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnBatchDel.Location = new System.Drawing.Point(244, 61); + this.btnBatchDel.Location = new System.Drawing.Point(234, 61); this.btnBatchDel.Name = "btnBatchDel"; this.btnBatchDel.Size = new System.Drawing.Size(84, 23); this.btnBatchDel.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -363,7 +361,7 @@ namespace TemuKJD.WXForms.ProductForms this.btnStopUpDownOrDel.CanvasColor = System.Drawing.SystemColors.Control; this.btnStopUpDownOrDel.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnStopUpDownOrDel.DisabledBackColor = System.Drawing.Color.Empty; - this.btnStopUpDownOrDel.Location = new System.Drawing.Point(244, 121); + this.btnStopUpDownOrDel.Location = new System.Drawing.Point(234, 121); this.btnStopUpDownOrDel.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); this.btnStopUpDownOrDel.Name = "btnStopUpDownOrDel"; this.btnStopUpDownOrDel.Size = new System.Drawing.Size(84, 23); @@ -385,7 +383,6 @@ namespace TemuKJD.WXForms.ProductForms // // btnClearList // - this.btnClearList.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.btnClearList.CanvasColor = System.Drawing.SystemColors.Control; this.btnClearList.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnClearList.DisabledBackColor = System.Drawing.Color.Empty; @@ -416,7 +413,7 @@ namespace TemuKJD.WXForms.ProductForms this.btnDown.Cursor = System.Windows.Forms.Cursors.Hand; this.btnDown.DisabledBackColor = System.Drawing.Color.Empty; this.btnDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnDown.Location = new System.Drawing.Point(244, 31); + this.btnDown.Location = new System.Drawing.Point(234, 31); this.btnDown.Name = "btnDown"; this.btnDown.Size = new System.Drawing.Size(84, 23); this.btnDown.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -450,9 +447,9 @@ namespace TemuKJD.WXForms.ProductForms this.ucGroupBoxEx2.Controls.Add(this.btnStop); this.ucGroupBoxEx2.Controls.Add(this.btnClearDgv); this.ucGroupBoxEx2.Controls.Add(this.btnSetPreSale); - this.ucGroupBoxEx2.Location = new System.Drawing.Point(570, 2); + this.ucGroupBoxEx2.Location = new System.Drawing.Point(595, 2); this.ucGroupBoxEx2.Name = "ucGroupBoxEx2"; - this.ucGroupBoxEx2.Size = new System.Drawing.Size(425, 165); + this.ucGroupBoxEx2.Size = new System.Drawing.Size(410, 165); this.ucGroupBoxEx2.TabIndex = 667; this.ucGroupBoxEx2.TabStop = false; this.ucGroupBoxEx2.Text = "设置预售"; @@ -460,7 +457,7 @@ namespace TemuKJD.WXForms.ProductForms // chkFailDownProd // this.chkFailDownProd.AutoSize = true; - this.chkFailDownProd.Location = new System.Drawing.Point(35, 64); + this.chkFailDownProd.Location = new System.Drawing.Point(21, 64); this.chkFailDownProd.Name = "chkFailDownProd"; this.chkFailDownProd.Size = new System.Drawing.Size(183, 21); this.chkFailDownProd.TabIndex = 820; @@ -472,7 +469,7 @@ namespace TemuKJD.WXForms.ProductForms this.chkNoPreSale.AutoSize = true; this.chkNoPreSale.Checked = true; this.chkNoPreSale.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkNoPreSale.Location = new System.Drawing.Point(35, 30); + this.chkNoPreSale.Location = new System.Drawing.Point(21, 30); this.chkNoPreSale.Name = "chkNoPreSale"; this.chkNoPreSale.Size = new System.Drawing.Size(75, 21); this.chkNoPreSale.TabIndex = 810; @@ -483,7 +480,7 @@ namespace TemuKJD.WXForms.ProductForms // label18 // this.label18.AutoSize = true; - this.label18.Location = new System.Drawing.Point(255, 32); + this.label18.Location = new System.Drawing.Point(236, 32); this.label18.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label18.Name = "label18"; this.label18.Size = new System.Drawing.Size(54, 17); @@ -492,7 +489,7 @@ namespace TemuKJD.WXForms.ProductForms // // txtPreDays // - this.txtPreDays.Location = new System.Drawing.Point(222, 29); + this.txtPreDays.Location = new System.Drawing.Point(203, 29); this.txtPreDays.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.txtPreDays.Name = "txtPreDays"; this.txtPreDays.Size = new System.Drawing.Size(33, 23); @@ -503,7 +500,7 @@ namespace TemuKJD.WXForms.ProductForms // chkPreSale // this.chkPreSale.AutoSize = true; - this.chkPreSale.Location = new System.Drawing.Point(130, 30); + this.chkPreSale.Location = new System.Drawing.Point(111, 30); this.chkPreSale.Name = "chkPreSale"; this.chkPreSale.Size = new System.Drawing.Size(99, 21); this.chkPreSale.TabIndex = 789; @@ -517,7 +514,7 @@ namespace TemuKJD.WXForms.ProductForms this.btnStop.CanvasColor = System.Drawing.SystemColors.Control; this.btnStop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnStop.DisabledBackColor = System.Drawing.Color.Empty; - this.btnStop.Location = new System.Drawing.Point(319, 62); + this.btnStop.Location = new System.Drawing.Point(304, 62); this.btnStop.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); this.btnStop.Name = "btnStop"; this.btnStop.Size = new System.Drawing.Size(84, 23); @@ -543,7 +540,7 @@ namespace TemuKJD.WXForms.ProductForms this.btnClearDgv.CanvasColor = System.Drawing.SystemColors.Control; this.btnClearDgv.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnClearDgv.DisabledBackColor = System.Drawing.Color.Empty; - this.btnClearDgv.Location = new System.Drawing.Point(319, 93); + this.btnClearDgv.Location = new System.Drawing.Point(304, 93); this.btnClearDgv.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); this.btnClearDgv.Name = "btnClearDgv"; this.btnClearDgv.Size = new System.Drawing.Size(84, 23); @@ -570,7 +567,7 @@ namespace TemuKJD.WXForms.ProductForms this.btnSetPreSale.Cursor = System.Windows.Forms.Cursors.Hand; this.btnSetPreSale.DisabledBackColor = System.Drawing.Color.Empty; this.btnSetPreSale.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSetPreSale.Location = new System.Drawing.Point(319, 31); + this.btnSetPreSale.Location = new System.Drawing.Point(304, 31); this.btnSetPreSale.Name = "btnSetPreSale"; this.btnSetPreSale.Size = new System.Drawing.Size(84, 23); this.btnSetPreSale.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -609,7 +606,7 @@ namespace TemuKJD.WXForms.ProductForms this.ucGroupBoxEx4.Controls.Add(this.lblExtCodeFilter); this.ucGroupBoxEx4.Controls.Add(this.btnSearchProd); this.ucGroupBoxEx4.Controls.Add(this.label5); - this.ucGroupBoxEx4.Location = new System.Drawing.Point(161, 2); + this.ucGroupBoxEx4.Location = new System.Drawing.Point(186, 2); this.ucGroupBoxEx4.Name = "ucGroupBoxEx4"; this.ucGroupBoxEx4.Size = new System.Drawing.Size(410, 165); this.ucGroupBoxEx4.TabIndex = 666; @@ -836,7 +833,9 @@ namespace TemuKJD.WXForms.ProductForms | System.Windows.Forms.AnchorStyles.Left))); this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; - this.ucGroupBoxEx1.Controls.Add(this.btnRefreshAuthor); + this.ucGroupBoxEx1.Controls.Add(this.cmbFilterShopGroup); + this.ucGroupBoxEx1.Controls.Add(this.label24); + this.ucGroupBoxEx1.Controls.Add(this.btnFilterShop); this.ucGroupBoxEx1.Controls.Add(this.btnSelectOffline); this.ucGroupBoxEx1.Controls.Add(this.btnSelectOnline); this.ucGroupBoxEx1.Controls.Add(this.btnAddUnSelect); @@ -844,41 +843,63 @@ namespace TemuKJD.WXForms.ProductForms this.ucGroupBoxEx1.Controls.Add(this.cmbFilterShopNotes); this.ucGroupBoxEx1.Controls.Add(this.btnAddSelect); this.ucGroupBoxEx1.Controls.Add(this.btnEmptyShop); - this.ucGroupBoxEx1.Controls.Add(this.btnFilterShop); this.ucGroupBoxEx1.Controls.Add(this.label16); this.ucGroupBoxEx1.Controls.Add(this.txtFilterShopName); this.ucGroupBoxEx1.Controls.Add(this.btnRefreshShop); this.ucGroupBoxEx1.Controls.Add(this.label17); this.ucGroupBoxEx1.Location = new System.Drawing.Point(2, 2); this.ucGroupBoxEx1.Name = "ucGroupBoxEx1"; - this.ucGroupBoxEx1.Size = new System.Drawing.Size(160, 165); + this.ucGroupBoxEx1.Size = new System.Drawing.Size(185, 165); this.ucGroupBoxEx1.TabIndex = 399; this.ucGroupBoxEx1.TabStop = false; this.ucGroupBoxEx1.Text = "店铺筛选"; // - // btnRefreshAuthor + // cmbFilterShopGroup // - this.btnRefreshAuthor.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnRefreshAuthor.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnRefreshAuthor.DisabledBackColor = System.Drawing.Color.Empty; - this.btnRefreshAuthor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnRefreshAuthor.Location = new System.Drawing.Point(81, 17); - this.btnRefreshAuthor.Name = "btnRefreshAuthor"; - this.btnRefreshAuthor.Size = new System.Drawing.Size(70, 20); - this.btnRefreshAuthor.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnRefreshAuthor.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnRefreshAuthor.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnRefreshAuthor.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.btnRefreshAuthor.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.btnRefreshAuthor.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.btnRefreshAuthor.Style.ForeColor.Color = System.Drawing.Color.White; - this.btnRefreshAuthor.Style.GradientAngle = 90; - this.btnRefreshAuthor.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnRefreshAuthor.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnRefreshAuthor.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnRefreshAuthor.TabIndex = 800; - this.btnRefreshAuthor.Text = "刷新授权"; - this.btnRefreshAuthor.Click += new System.EventHandler(this.btnRefreshAuthor_Click); + this.cmbFilterShopGroup.DefaultText = "全部"; + this.cmbFilterShopGroup.DropDownHeight = 1; + this.cmbFilterShopGroup.DropDownWidth = 1; + this.cmbFilterShopGroup.FormattingEnabled = true; + this.cmbFilterShopGroup.IntegralHeight = false; + this.cmbFilterShopGroup.Location = new System.Drawing.Point(38, 92); + this.cmbFilterShopGroup.Name = "cmbFilterShopGroup"; + this.cmbFilterShopGroup.Size = new System.Drawing.Size(137, 25); + this.cmbFilterShopGroup.TabIndex = 834; + this.cmbFilterShopGroup.Text = "全部"; + // + // label24 + // + this.label24.AutoSize = true; + this.label24.Location = new System.Drawing.Point(7, 96); + this.label24.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label24.Name = "label24"; + this.label24.Size = new System.Drawing.Size(32, 17); + this.label24.TabIndex = 835; + this.label24.Text = "分组"; + // + // btnFilterShop + // + this.btnFilterShop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnFilterShop.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnFilterShop.DisabledBackColor = System.Drawing.Color.Empty; + this.btnFilterShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnFilterShop.Location = new System.Drawing.Point(143, 119); + this.btnFilterShop.Name = "btnFilterShop"; + this.btnFilterShop.Size = new System.Drawing.Size(32, 18); + this.btnFilterShop.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnFilterShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnFilterShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnFilterShop.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnFilterShop.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnFilterShop.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnFilterShop.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnFilterShop.Style.GradientAngle = 90; + this.btnFilterShop.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnFilterShop.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnFilterShop.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnFilterShop.TabIndex = 703; + this.btnFilterShop.Text = "过滤"; + this.btnFilterShop.Click += new System.EventHandler(this.btnFilterShop_Click); // // btnSelectOffline // @@ -886,9 +907,9 @@ namespace TemuKJD.WXForms.ProductForms this.btnSelectOffline.Cursor = System.Windows.Forms.Cursors.Hand; this.btnSelectOffline.DisabledBackColor = System.Drawing.Color.Empty; this.btnSelectOffline.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSelectOffline.Location = new System.Drawing.Point(61, 137); + this.btnSelectOffline.Location = new System.Drawing.Point(59, 139); this.btnSelectOffline.Name = "btnSelectOffline"; - this.btnSelectOffline.Size = new System.Drawing.Size(50, 20); + this.btnSelectOffline.Size = new System.Drawing.Size(48, 18); this.btnSelectOffline.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnSelectOffline.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnSelectOffline.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -910,9 +931,9 @@ namespace TemuKJD.WXForms.ProductForms this.btnSelectOnline.Cursor = System.Windows.Forms.Cursors.Hand; this.btnSelectOnline.DisabledBackColor = System.Drawing.Color.Empty; this.btnSelectOnline.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSelectOnline.Location = new System.Drawing.Point(9, 137); + this.btnSelectOnline.Location = new System.Drawing.Point(9, 139); this.btnSelectOnline.Name = "btnSelectOnline"; - this.btnSelectOnline.Size = new System.Drawing.Size(50, 20); + this.btnSelectOnline.Size = new System.Drawing.Size(48, 18); this.btnSelectOnline.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnSelectOnline.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnSelectOnline.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -934,9 +955,9 @@ namespace TemuKJD.WXForms.ProductForms this.btnAddUnSelect.Cursor = System.Windows.Forms.Cursors.Hand; this.btnAddUnSelect.DisabledBackColor = System.Drawing.Color.Empty; this.btnAddUnSelect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnAddUnSelect.Location = new System.Drawing.Point(81, 115); + this.btnAddUnSelect.Location = new System.Drawing.Point(76, 119); this.btnAddUnSelect.Name = "btnAddUnSelect"; - this.btnAddUnSelect.Size = new System.Drawing.Size(70, 20); + this.btnAddUnSelect.Size = new System.Drawing.Size(65, 18); this.btnAddUnSelect.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnAddUnSelect.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnAddUnSelect.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -958,9 +979,9 @@ namespace TemuKJD.WXForms.ProductForms this.btnReverse.Cursor = System.Windows.Forms.Cursors.Hand; this.btnReverse.DisabledBackColor = System.Drawing.Color.Empty; this.btnReverse.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnReverse.Location = new System.Drawing.Point(113, 137); + this.btnReverse.Location = new System.Drawing.Point(109, 139); this.btnReverse.Name = "btnReverse"; - this.btnReverse.Size = new System.Drawing.Size(38, 20); + this.btnReverse.Size = new System.Drawing.Size(32, 18); this.btnReverse.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnReverse.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnReverse.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -983,9 +1004,9 @@ namespace TemuKJD.WXForms.ProductForms this.cmbFilterShopNotes.DropDownWidth = 1; this.cmbFilterShopNotes.FormattingEnabled = true; this.cmbFilterShopNotes.IntegralHeight = false; - this.cmbFilterShopNotes.Location = new System.Drawing.Point(38, 66); + this.cmbFilterShopNotes.Location = new System.Drawing.Point(38, 65); this.cmbFilterShopNotes.Name = "cmbFilterShopNotes"; - this.cmbFilterShopNotes.Size = new System.Drawing.Size(113, 25); + this.cmbFilterShopNotes.Size = new System.Drawing.Size(137, 25); this.cmbFilterShopNotes.TabIndex = 442; this.cmbFilterShopNotes.Text = "全部"; // @@ -995,9 +1016,9 @@ namespace TemuKJD.WXForms.ProductForms this.btnAddSelect.Cursor = System.Windows.Forms.Cursors.Hand; this.btnAddSelect.DisabledBackColor = System.Drawing.Color.Empty; this.btnAddSelect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnAddSelect.Location = new System.Drawing.Point(9, 115); + this.btnAddSelect.Location = new System.Drawing.Point(9, 119); this.btnAddSelect.Name = "btnAddSelect"; - this.btnAddSelect.Size = new System.Drawing.Size(70, 20); + this.btnAddSelect.Size = new System.Drawing.Size(65, 18); this.btnAddSelect.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnAddSelect.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnAddSelect.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -1010,7 +1031,7 @@ namespace TemuKJD.WXForms.ProductForms this.btnAddSelect.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); this.btnAddSelect.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); this.btnAddSelect.TabIndex = 742; - this.btnAddSelect.Text = "选中条件"; + this.btnAddSelect.Text = "加选条件"; this.btnAddSelect.Click += new System.EventHandler(this.btnAddSelect_Click); // // btnEmptyShop @@ -1018,10 +1039,10 @@ namespace TemuKJD.WXForms.ProductForms this.btnEmptyShop.CanvasColor = System.Drawing.SystemColors.Control; this.btnEmptyShop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnEmptyShop.DisabledBackColor = System.Drawing.Color.Empty; - this.btnEmptyShop.Location = new System.Drawing.Point(113, 93); + this.btnEmptyShop.Location = new System.Drawing.Point(143, 139); this.btnEmptyShop.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); this.btnEmptyShop.Name = "btnEmptyShop"; - this.btnEmptyShop.Size = new System.Drawing.Size(38, 20); + this.btnEmptyShop.Size = new System.Drawing.Size(32, 18); this.btnEmptyShop.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnEmptyShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); this.btnEmptyShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); @@ -1038,34 +1059,10 @@ namespace TemuKJD.WXForms.ProductForms this.btnEmptyShop.Text = "清空"; this.btnEmptyShop.Click += new System.EventHandler(this.btnEmptyShop_Click); // - // btnFilterShop - // - this.btnFilterShop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnFilterShop.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnFilterShop.DisabledBackColor = System.Drawing.Color.Empty; - this.btnFilterShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnFilterShop.Location = new System.Drawing.Point(9, 93); - this.btnFilterShop.Name = "btnFilterShop"; - this.btnFilterShop.Size = new System.Drawing.Size(102, 20); - this.btnFilterShop.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnFilterShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnFilterShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnFilterShop.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.btnFilterShop.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.btnFilterShop.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.btnFilterShop.Style.ForeColor.Color = System.Drawing.Color.White; - this.btnFilterShop.Style.GradientAngle = 90; - this.btnFilterShop.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnFilterShop.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnFilterShop.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnFilterShop.TabIndex = 703; - this.btnFilterShop.Text = "过滤店铺"; - this.btnFilterShop.Click += new System.EventHandler(this.btnFilterShop_Click); - // // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(7, 70); + this.label16.Location = new System.Drawing.Point(7, 69); this.label16.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(32, 17); @@ -1075,10 +1072,10 @@ namespace TemuKJD.WXForms.ProductForms // txtFilterShopName // this.txtFilterShopName.Font = new System.Drawing.Font("微软雅黑", 10F); - this.txtFilterShopName.Location = new System.Drawing.Point(38, 39); + this.txtFilterShopName.Location = new System.Drawing.Point(38, 38); this.txtFilterShopName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtFilterShopName.Name = "txtFilterShopName"; - this.txtFilterShopName.Size = new System.Drawing.Size(113, 25); + this.txtFilterShopName.Size = new System.Drawing.Size(137, 25); this.txtFilterShopName.TabIndex = 653; // // btnRefreshShop @@ -1087,9 +1084,9 @@ namespace TemuKJD.WXForms.ProductForms this.btnRefreshShop.Cursor = System.Windows.Forms.Cursors.Hand; this.btnRefreshShop.DisabledBackColor = System.Drawing.Color.Empty; this.btnRefreshShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnRefreshShop.Location = new System.Drawing.Point(9, 17); + this.btnRefreshShop.Location = new System.Drawing.Point(9, 18); this.btnRefreshShop.Name = "btnRefreshShop"; - this.btnRefreshShop.Size = new System.Drawing.Size(70, 20); + this.btnRefreshShop.Size = new System.Drawing.Size(166, 18); this.btnRefreshShop.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnRefreshShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnRefreshShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -1108,7 +1105,7 @@ namespace TemuKJD.WXForms.ProductForms // label17 // this.label17.AutoSize = true; - this.label17.Location = new System.Drawing.Point(7, 43); + this.label17.Location = new System.Drawing.Point(7, 42); this.label17.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label17.Name = "label17"; this.label17.Size = new System.Drawing.Size(32, 17); @@ -1151,7 +1148,6 @@ namespace TemuKJD.WXForms.ProductForms // // splitContainer2.Panel2 // - this.splitContainer2.Panel2.Controls.Add(this.chkUpDraft); this.splitContainer2.Panel2.Controls.Add(this.pbLoading); this.splitContainer2.Panel2.Controls.Add(this.chkTestNoAuditUpload); this.splitContainer2.Panel2.Controls.Add(this.dgvSelectProduct); @@ -1220,6 +1216,7 @@ namespace TemuKJD.WXForms.ProductForms this.colShopId, this.colShopName, this.colShopNotes, + this.colGroup, this.colSelectProduct, this.colLoginStatus, this.colApi, @@ -1277,7 +1274,14 @@ namespace TemuKJD.WXForms.ProductForms this.colShopNotes.HeaderText = "备注"; this.colShopNotes.Name = "colShopNotes"; this.colShopNotes.ReadOnly = true; - this.colShopNotes.Width = 75; + this.colShopNotes.Width = 66; + // + // colGroup + // + this.colGroup.HeaderText = "分组"; + this.colGroup.Name = "colGroup"; + this.colGroup.ReadOnly = true; + this.colGroup.Width = 66; // // colSelectProduct // @@ -1346,17 +1350,6 @@ namespace TemuKJD.WXForms.ProductForms this.colMessage.Name = "colMessage"; this.colMessage.ReadOnly = true; // - // chkUpDraft - // - this.chkUpDraft.AutoSize = true; - this.chkUpDraft.Location = new System.Drawing.Point(16, 39); - this.chkUpDraft.Name = "chkUpDraft"; - this.chkUpDraft.Size = new System.Drawing.Size(87, 21); - this.chkUpDraft.TabIndex = 790; - this.chkUpDraft.Text = "上传草稿箱"; - this.chkUpDraft.UseVisualStyleBackColor = true; - this.chkUpDraft.Visible = false; - // // pbLoading // this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None; @@ -1651,13 +1644,8 @@ namespace TemuKJD.WXForms.ProductForms // splitContainer4.Panel1 // this.splitContainer4.Panel1.Controls.Add(this.statusBar); - // - // splitContainer4.Panel2 - // - this.splitContainer4.Panel2.Controls.Add(this.btnClear); - this.splitContainer4.Panel2.Controls.Add(this.panelEx1); this.splitContainer4.Size = new System.Drawing.Size(1346, 26); - this.splitContainer4.SplitterDistance = 655; + this.splitContainer4.SplitterDistance = 1165; this.splitContainer4.TabIndex = 3; // // statusBar @@ -1668,59 +1656,9 @@ namespace TemuKJD.WXForms.ProductForms this.statusBar.Location = new System.Drawing.Point(0, 0); this.statusBar.Margin = new System.Windows.Forms.Padding(0); this.statusBar.Name = "statusBar"; - this.statusBar.Size = new System.Drawing.Size(655, 26); + this.statusBar.Size = new System.Drawing.Size(1165, 26); this.statusBar.TabIndex = 2; // - // btnClear - // - this.btnClear.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.btnClear.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnClear.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnClear.DisabledBackColor = System.Drawing.Color.Empty; - this.btnClear.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnClear.Location = new System.Drawing.Point(475, 2); - this.btnClear.Name = "btnClear"; - this.btnClear.Size = new System.Drawing.Size(90, 21); - this.btnClear.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnClear.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnClear.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnClear.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.btnClear.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.btnClear.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.btnClear.Style.ForeColor.Color = System.Drawing.Color.White; - this.btnClear.Style.GradientAngle = 90; - this.btnClear.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnClear.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnClear.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnClear.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; - this.btnClear.TabIndex = 440; - this.btnClear.Text = "清空结果"; - this.btnClear.Visible = false; - // - // panelEx1 - // - this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; - this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty; - this.panelEx1.Location = new System.Drawing.Point(568, 2); - this.panelEx1.Name = "panelEx1"; - this.panelEx1.Size = new System.Drawing.Size(115, 21); - this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; - this.panelEx1.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); - this.panelEx1.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); - this.panelEx1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.panelEx1.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.panelEx1.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.panelEx1.Style.GradientAngle = 90; - this.panelEx1.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; - this.panelEx1.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.panelEx1.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.panelEx1.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.panelEx1.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; - this.panelEx1.TabIndex = 668; - this.panelEx1.Text = "停止当前操作"; - this.panelEx1.Visible = false; - // // WXProdPreSaleForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -1760,7 +1698,6 @@ namespace TemuKJD.WXForms.ProductForms ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dgvSelectProduct)).EndInit(); this.splitContainer4.Panel1.ResumeLayout(false); - this.splitContainer4.Panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splitContainer4)).EndInit(); this.splitContainer4.ResumeLayout(false); this.ResumeLayout(false); @@ -1787,8 +1724,6 @@ namespace TemuKJD.WXForms.ProductForms private DevComponents.DotNetBar.PanelEx btnClearDgv; private System.Windows.Forms.TextBox txtExtCodeFilter; private System.Windows.Forms.Label lblExtCodeFilter; - private DevComponents.DotNetBar.PanelEx btnClear; - private DevComponents.DotNetBar.PanelEx panelEx1; private System.Windows.Forms.TextBox txtIdFilter; private System.Windows.Forms.Label lblIdFilter; private UserComponent.UcCheckBox chkTestNoAuditUpload; @@ -1808,23 +1743,8 @@ namespace TemuKJD.WXForms.ProductForms private DevComponents.DotNetBar.PanelEx btnAddSelect; private DevComponents.DotNetBar.PanelEx btnSelectOffline; private DevComponents.DotNetBar.PanelEx btnSelectOnline; - private DevComponents.DotNetBar.PanelEx btnRefreshAuthor; private System.Windows.Forms.TextBox txtProductName; private System.Windows.Forms.Label label11; - private UserComponent.UcCheckBox chkUpDraft; - private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect; - private System.Windows.Forms.DataGridViewTextBoxColumn colShopLoginName; - private System.Windows.Forms.DataGridViewTextBoxColumn colShopId; - private System.Windows.Forms.DataGridViewTextBoxColumn colShopName; - private System.Windows.Forms.DataGridViewTextBoxColumn colShopNotes; - private System.Windows.Forms.DataGridViewLinkColumn colSelectProduct; - private System.Windows.Forms.DataGridViewLinkColumn colLoginStatus; - private System.Windows.Forms.DataGridViewLinkColumn colApi; - private System.Windows.Forms.DataGridViewCheckBoxColumn colCanUse; - private System.Windows.Forms.DataGridViewTextBoxColumn colUploadCount; - private System.Windows.Forms.DataGridViewTextBoxColumn colOnSaleNum; - private System.Windows.Forms.DataGridViewTextBoxColumn colRemaining; - private System.Windows.Forms.DataGridViewTextBoxColumn colMessage; private System.Windows.Forms.TextBox txtPageBegin; private System.Windows.Forms.TextBox txtPageEnd; private System.Windows.Forms.Label label1; @@ -1872,5 +1792,21 @@ namespace TemuKJD.WXForms.ProductForms private DevComponents.DotNetBar.PanelEx btnSelectLimit2; private DevComponents.DotNetBar.PanelEx btnSelectLimit1; private DevComponents.DotNetBar.PanelEx btnBatchRealDel; + private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect; + private System.Windows.Forms.DataGridViewTextBoxColumn colShopLoginName; + private System.Windows.Forms.DataGridViewTextBoxColumn colShopId; + private System.Windows.Forms.DataGridViewTextBoxColumn colShopName; + private System.Windows.Forms.DataGridViewTextBoxColumn colShopNotes; + private System.Windows.Forms.DataGridViewTextBoxColumn colGroup; + private System.Windows.Forms.DataGridViewLinkColumn colSelectProduct; + private System.Windows.Forms.DataGridViewLinkColumn colLoginStatus; + private System.Windows.Forms.DataGridViewLinkColumn colApi; + private System.Windows.Forms.DataGridViewCheckBoxColumn colCanUse; + private System.Windows.Forms.DataGridViewTextBoxColumn colUploadCount; + private System.Windows.Forms.DataGridViewTextBoxColumn colOnSaleNum; + private System.Windows.Forms.DataGridViewTextBoxColumn colRemaining; + private System.Windows.Forms.DataGridViewTextBoxColumn colMessage; + private UserComponent.UcComboBoxMutiSelect cmbFilterShopGroup; + private System.Windows.Forms.Label label24; } } \ No newline at end of file diff --git a/TEMUKJD/WXForms/ProductForms/WXProdPreSaleForm.cs b/TEMUKJD/WXForms/ProductForms/WXProdPreSaleForm.cs index e0917b9..d4b630b 100644 --- a/TEMUKJD/WXForms/ProductForms/WXProdPreSaleForm.cs +++ b/TEMUKJD/WXForms/ProductForms/WXProdPreSaleForm.cs @@ -44,7 +44,6 @@ namespace TemuKJD.WXForms.ProductForms bool isInit = false; CheckBox chkSelectAll = null; - ConcurrentList lstShopAuthInfo = new ConcurrentList(); ConcurrentList lstWXShopTokenInfo = new ConcurrentList(); public NaiBa.Util.ConcurrentList lstTemuDBProductSelect = new NaiBa.Util.ConcurrentList(); NaiBa.Util.ConcurrentList lstAddPriceRule = new NaiBa.Util.ConcurrentList(); @@ -62,10 +61,6 @@ namespace TemuKJD.WXForms.ProductForms { this.splitContainer1.Dock = DockStyle.Fill; - lstShopAuthInfo = NaiBa.Util.Helper.ConfigHelper.LoadConfig>("wx_shop_auth_list"); - if (lstShopAuthInfo == null) - lstShopAuthInfo = new ConcurrentList(); - lstWXShopTokenInfo = NaiBa.Util.Helper.ConfigHelper.LoadConfig>("wx_shop_token_list"); if (lstWXShopTokenInfo == null) lstWXShopTokenInfo = new ConcurrentList(); @@ -86,9 +81,6 @@ namespace TemuKJD.WXForms.ProductForms dicCheckedShopId = NaiBa.Util.Helper.ConfigHelper.LoadConfig>("wx_checked_shop_dic"); if (dicCheckedShopId == null) dicCheckedShopId = new Dictionary(); - dicShopUpload = NaiBa.Util.Helper.ConfigHelper.LoadConfig>("wx_shop_upload_info"); - if (dicShopUpload == null) - dicShopUpload = new Dictionary(); defaultAddPriceRule = NaiBa.Util.Helper.ConfigHelper.LoadConfig("wx_default_add_price_rule"); if (defaultAddPriceRule == null) @@ -112,7 +104,6 @@ namespace TemuKJD.WXForms.ProductForms this.chkPreSale.CheckedChanged += chkPreSale_CheckedChanged; this.chkNoPreSale.CheckedChanged += chkNoPreSale_CheckedChanged; - int prodCount = 0; chkSelectAll = dgvShop.Columns["colSelect"].AddHeaderCheckBox(HorizontalAlignment.Center, 0, 0, null, null, false); dgvShop.Columns["colSelect"].HeaderText = ""; @@ -177,87 +168,6 @@ namespace TemuKJD.WXForms.ProductForms private void btnRefreshAuthor_Click(object sender, EventArgs e) { - updateAuthor(true); - } - - /// - /// 升级授权 - /// - /// 今日取过的也取 - private void updateAuthor(bool idRefreshTodayHasGet = false) - { - this.pbLoadingShop.Visible = true; - Task.Run(() => - { - // 店铺Id - var updateIds = dgvShop.Rows.Cast().Select(r => r.Cells["colShopId"]?.Value.ToString()).ToList(); - var selectIds = dgvShop.Rows.Cast().Where(row - => row.Cells["colSelect"]?.Value.ParseToBool() == true).Select(r => r.Cells["colShopId"]?.Value.ToString()).ToList(); - if (idRefreshTodayHasGet == true) - updateIds = selectIds; - - List tList = new List(); - if (idRefreshTodayHasGet) - lstShopAuthInfo.RemoveAll(s => updateIds.Contains(s.ShopId)); - foreach (var shop in GlobalConfig.ShopLoginList.Where(s => updateIds.Contains(s.ShopId))) - { - Invoke(new Action(() => { BindShop(shop, selectIds, ""); })); - var t = Task.Run(() => - { - try - { - if (shop.LoginStatus != "登录成功") - { - Invoke(new Action(() => { BindShop(shop, selectIds, "店铺掉线"); })); - return; - } - - var authInfo = lstShopAuthInfo.FirstOrDefault(sa => sa.ShopId == shop.ShopId); - if (idRefreshTodayHasGet || authInfo == null || authInfo?.UpdateTime.Date != DateTime.Now.Date) - { - lstShopAuthInfo.RemoveAll(sa => sa.ShopId == shop.ShopId); - var rst = WXUpload.GetApiServiceList(shop); - if (!rst.Contains("\"code\":0")) - { - WXShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false); - if (shop.LoginStatus != "登录成功") - { - Invoke(new Action(() => { BindShop(shop, selectIds, "店铺掉线"); })); - return; - } - - lstShopAuthInfo.Add(new AuthInfo() { ShopId = shop.ShopId, UpdateTime = DateTime.Now, ExpiresTime = DateTime.Now }); - Invoke(new Action(() => { BindShop(shop, selectIds, "授权查询失败"); })); - return; - } - - foreach (var itemObj in JsonHelper.JObjectParse(rst)["itemList"]) - { - // 找到了指定服务 - if (itemObj["serviceName"].ParseToString() == "店统领供应链-商品管理") - { - var expiresTick = itemObj["expireTime"].ParseToLong(); - lstShopAuthInfo.Add(new AuthInfo() { ShopId = shop.ShopId, UpdateTime = DateTime.Now, ExpiresTime = BaseClass.StampToDateTime(expiresTick.ParseToInt()) }); - Invoke(new Action(() => { BindShop(shop, selectIds, "已查询"); })); - return; - } - } - // 没找到指定服务 - lstShopAuthInfo.Add(new AuthInfo() { ShopId = shop.ShopId, UpdateTime = DateTime.Now, ExpiresTime = DateTime.Now }); - Invoke(new Action(() => { BindShop(shop, selectIds, "已查询"); })); - } - } - catch (Exception ex) - { - } - }); - tList.Add(t); - while (tList.Where(ta => !ta.IsFaulted && !ta.IsCompleted).Count() >= 20) { Thread.Sleep(100); } - } - while (tList.Where(ta => !ta.IsFaulted && !ta.IsCompleted).Count() >= 1) { Thread.Sleep(100); } - NaiBa.Util.Helper.ConfigHelper.SaveConfig("wx_shop_auth_list", lstShopAuthInfo); - Invoke(new Action(() => { pbLoadingShop.Visible = false; })); - }); } private void chkSelectAll_CheckedChanged(object sender, EventArgs e) @@ -298,7 +208,6 @@ namespace TemuKJD.WXForms.ProductForms if (Visible == true) { RefreshShopLogin(); - updateAuthor(); if (!isInit) { @@ -343,11 +252,15 @@ namespace TemuKJD.WXForms.ProductForms BindShop(shopEntity, selectIds); } cmbFilterShopNotes.Items.Clear(); - //cmbFilterShopNotes.Items.Add(""); foreach (var note in GlobalConfig.ShopLoginList.Select(s => s.Notes).Where(s => !s.IsNullOrEmpty()).Distinct()) { cmbFilterShopNotes.Items.Add(note); } + cmbFilterShopGroup.Items.Clear(); + foreach (var note in GlobalConfig.ShopLoginList.Select(s => s.GroupName).Where(s => !s.IsNullOrEmpty()).Distinct()) + { + cmbFilterShopGroup.Items.Add(note); + } } private void BindShop(ShopLoginInfo shopEntity, List selectShopId = null, string msg = "") @@ -372,9 +285,10 @@ namespace TemuKJD.WXForms.ProductForms shopEntity.ShopId, shopEntity.ShopAccount, shopEntity.Notes, + shopEntity.GroupName, "选择商品", canUse ? "在线" : "掉线", - lstShopAuthInfo.FirstOrDefault(sa => sa.ShopId == shopEntity.ShopId)?.ExpiresTime > DateTime.Now.AddMinutes(5) ? "可用" : "过期", + GlobalConfig.lstWxShopAuthInfo.FirstOrDefault(sa => sa.ShopId == shopEntity.ShopId)?.ExpiresTime > DateTime.Now.AddMinutes(5) ? "可用" : "过期", canUse, dicShopUpload.ContainsKey(shopEntity.ShopId) && dicShopUpload[shopEntity.ShopId].DicDayUploadCount.ContainsKey(day) ? dicShopUpload[shopEntity.ShopId].DicDayUploadCount[day] : 0, @@ -390,10 +304,11 @@ namespace TemuKJD.WXForms.ProductForms row.Cells["colShopLoginName"].Value = shopEntity.LoginName; row.Cells["colShopName"].Value = shopEntity.ShopAccount; row.Cells["colShopNotes"].Value = shopEntity.Notes; + row.Cells["colGroup"].Value = shopEntity.GroupName; row.Cells["colLoginStatus"].Value = canUse ? "在线" : "掉线"; row.Cells["colLoginStatus"].Style.ForeColor = canUse ? Color.Green : Color.Red; row.Cells["colCanUse"].Value = canUse; - row.Cells["colApi"].Value = lstShopAuthInfo.FirstOrDefault(sa => sa.ShopId == shopEntity.ShopId)?.ExpiresTime > DateTime.Now.AddMinutes(5) ? "可用" : "过期"; + row.Cells["colApi"].Value = GlobalConfig.lstWxShopAuthInfo.FirstOrDefault(sa => sa.ShopId == shopEntity.ShopId)?.ExpiresTime > DateTime.Now.AddMinutes(5) ? "可用" : "过期"; row.Cells["colRemaining"].Value = shopEntity.AddProductRemaining; row.Cells["colUploadCount"].Value = dicShopUpload.ContainsKey(shopEntity.ShopId) && dicShopUpload[shopEntity.ShopId].DicDayUploadCount.ContainsKey(day) ? dicShopUpload[shopEntity.ShopId].DicDayUploadCount[day] : 0; @@ -969,13 +884,18 @@ namespace TemuKJD.WXForms.ProductForms private void btnFilterShop_Click(object sender, EventArgs e) { + string notes = cmbFilterShopNotes.Text.Trim().Trim(';'); + if (notes == "全部") + notes = ""; + List notesLst = notes.Split(new string[] { ";", "；", ",", "，" }, StringSplitOptions.RemoveEmptyEntries).ToList(); + + string group = cmbFilterShopGroup.Text.Trim().Trim(';'); + if (group == "全部") + group = ""; + List groupLst = group.Split(new string[] { ";", "；", ",", "，" }, StringSplitOptions.RemoveEmptyEntries).ToList(); + foreach (DataGridViewRow row in dgvShop.Rows) { - string notes = cmbFilterShopNotes.Text.Trim().Trim(';'); - if (notes == "全部") - notes = ""; - List notesLst = notes.Split(new string[] { ";", "；", ",", "，" }, StringSplitOptions.RemoveEmptyEntries).ToList(); - if (!row.Cells["colShopName"].Value.ParseToString().Contains(txtFilterShopName.Text.Trim())) { row.Visible = false; @@ -988,6 +908,12 @@ namespace TemuKJD.WXForms.ProductForms row.Cells["colSelect"].Value = false; continue; } + if (!string.IsNullOrWhiteSpace(group) && !groupLst.Contains(row.Cells["colGroup"].Value.ParseToString())) + { + row.Visible = false; + row.Cells["colSelect"].Value = false; + continue; + } row.Visible = true; } } @@ -996,6 +922,7 @@ namespace TemuKJD.WXForms.ProductForms { txtFilterShopName.Text = ""; cmbFilterShopNotes.Text = "全部"; + cmbFilterShopGroup.Text = "全部"; btnFilterShop_Click(null, null); } @@ -1015,16 +942,24 @@ namespace TemuKJD.WXForms.ProductForms notes = ""; List notesLst = notes.Split(new string[] { ";", "；", ",", "，" }, StringSplitOptions.RemoveEmptyEntries).ToList(); + string group = cmbFilterShopGroup.Text.Trim().Trim(';'); + if (group == "全部") + group = ""; + List groupLst = group.Split(new string[] { ";", "；", ",", "，" }, StringSplitOptions.RemoveEmptyEntries).ToList(); + foreach (DataGridViewRow row in dgvShop.Rows) { - if (row.Visible == true) - { - if (row.Cells["colShopName"].Value.ParseToString().Contains(txtFilterShopName.Text.Trim()) && - (string.IsNullOrWhiteSpace(notes) || notesLst.Contains(row.Cells["colShopNotes"].Value.ParseToString()))) - { - row.Cells["colSelect"].Value = true; - } - } + if (row.Visible == false) + continue; + + if (!row.Cells["colShopName"].Value.ParseToString().Contains(txtFilterShopName.Text.Trim())) + continue; + if (!string.IsNullOrWhiteSpace(notes) && !notesLst.Contains(row.Cells["colShopNotes"].Value.ParseToString())) + continue; + if (!string.IsNullOrWhiteSpace(group) && !groupLst.Contains(row.Cells["colGroup"].Value.ParseToString())) + continue; + + row.Cells["colSelect"].Value = true; } } @@ -1035,16 +970,24 @@ namespace TemuKJD.WXForms.ProductForms notes = ""; List notesLst = notes.Split(new string[] { ";", "；", ",", "，" }, StringSplitOptions.RemoveEmptyEntries).ToList(); + string group = cmbFilterShopGroup.Text.Trim().Trim(';'); + if (group == "全部") + group = ""; + List groupLst = group.Split(new string[] { ";", "；", ",", "，" }, StringSplitOptions.RemoveEmptyEntries).ToList(); + foreach (DataGridViewRow row in dgvShop.Rows) { - if (row.Visible == true) - { - if (row.Cells["colShopName"].Value.ParseToString().Contains(txtFilterShopName.Text.Trim()) && - (string.IsNullOrWhiteSpace(notes) || notesLst.Contains(row.Cells["colShopNotes"].Value.ParseToString()))) - { - row.Cells["colSelect"].Value = false; - } - } + if (row.Visible == false) + continue; + + if (!row.Cells["colShopName"].Value.ParseToString().Contains(txtFilterShopName.Text.Trim())) + continue; + if (!string.IsNullOrWhiteSpace(notes) && !notesLst.Contains(row.Cells["colShopNotes"].Value.ParseToString())) + continue; + if (!string.IsNullOrWhiteSpace(group) && !groupLst.Contains(row.Cells["colGroup"].Value.ParseToString())) + continue; + + row.Cells["colSelect"].Value = false; } } diff --git a/TEMUKJD/WXForms/ProductForms/WXProdPreSaleForm.resx b/TEMUKJD/WXForms/ProductForms/WXProdPreSaleForm.resx index 438e4c9..fd17c3b 100644 --- a/TEMUKJD/WXForms/ProductForms/WXProdPreSaleForm.resx +++ b/TEMUKJD/WXForms/ProductForms/WXProdPreSaleForm.resx @@ -129,6 +129,9 @@ True + + True + True diff --git a/TEMUKJD/WXForms/ProductForms/WXProdSyncForm.Designer.cs b/TEMUKJD/WXForms/ProductForms/WXProdSyncForm.Designer.cs index 381a431..34cefb3 100644 --- a/TEMUKJD/WXForms/ProductForms/WXProdSyncForm.Designer.cs +++ b/TEMUKJD/WXForms/ProductForms/WXProdSyncForm.Designer.cs @@ -63,7 +63,6 @@ namespace TemuKJD.WXForms.ProductForms this.btnPromotion = new DevComponents.DotNetBar.PanelEx(); this.btnStopOp = new DevComponents.DotNetBar.PanelEx(); this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); - this.btnRefreshAuthor = new DevComponents.DotNetBar.PanelEx(); this.btnSelectOffline = new DevComponents.DotNetBar.PanelEx(); this.btnSelectOnline = new DevComponents.DotNetBar.PanelEx(); this.btnAddUnSelect = new DevComponents.DotNetBar.PanelEx(); @@ -549,7 +548,6 @@ namespace TemuKJD.WXForms.ProductForms | System.Windows.Forms.AnchorStyles.Left))); this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; - this.ucGroupBoxEx1.Controls.Add(this.btnRefreshAuthor); this.ucGroupBoxEx1.Controls.Add(this.btnSelectOffline); this.ucGroupBoxEx1.Controls.Add(this.btnSelectOnline); this.ucGroupBoxEx1.Controls.Add(this.btnAddUnSelect); @@ -569,30 +567,6 @@ namespace TemuKJD.WXForms.ProductForms this.ucGroupBoxEx1.TabStop = false; this.ucGroupBoxEx1.Text = "店铺筛选"; // - // btnRefreshAuthor - // - this.btnRefreshAuthor.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnRefreshAuthor.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnRefreshAuthor.DisabledBackColor = System.Drawing.Color.Empty; - this.btnRefreshAuthor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnRefreshAuthor.Location = new System.Drawing.Point(81, 17); - this.btnRefreshAuthor.Name = "btnRefreshAuthor"; - this.btnRefreshAuthor.Size = new System.Drawing.Size(70, 20); - this.btnRefreshAuthor.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnRefreshAuthor.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnRefreshAuthor.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnRefreshAuthor.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.btnRefreshAuthor.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.btnRefreshAuthor.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.btnRefreshAuthor.Style.ForeColor.Color = System.Drawing.Color.White; - this.btnRefreshAuthor.Style.GradientAngle = 90; - this.btnRefreshAuthor.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnRefreshAuthor.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnRefreshAuthor.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnRefreshAuthor.TabIndex = 800; - this.btnRefreshAuthor.Text = "刷新授权"; - this.btnRefreshAuthor.Click += new System.EventHandler(this.btnRefreshAuthor_Click); - // // btnSelectOffline // this.btnSelectOffline.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -802,7 +776,7 @@ namespace TemuKJD.WXForms.ProductForms this.btnRefreshShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnRefreshShop.Location = new System.Drawing.Point(9, 17); this.btnRefreshShop.Name = "btnRefreshShop"; - this.btnRefreshShop.Size = new System.Drawing.Size(70, 20); + this.btnRefreshShop.Size = new System.Drawing.Size(142, 20); this.btnRefreshShop.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnRefreshShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnRefreshShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -1495,7 +1469,6 @@ namespace TemuKJD.WXForms.ProductForms private DevComponents.DotNetBar.PanelEx btnAddSelect; private DevComponents.DotNetBar.PanelEx btnSelectOffline; private DevComponents.DotNetBar.PanelEx btnSelectOnline; - private DevComponents.DotNetBar.PanelEx btnRefreshAuthor; private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect; private System.Windows.Forms.DataGridViewTextBoxColumn colShopLoginName; private System.Windows.Forms.DataGridViewTextBoxColumn colShopId; diff --git a/TEMUKJD/WXForms/ProductForms/WXProdSyncForm.cs b/TEMUKJD/WXForms/ProductForms/WXProdSyncForm.cs index 728a5f4..76d8a50 100644 --- a/TEMUKJD/WXForms/ProductForms/WXProdSyncForm.cs +++ b/TEMUKJD/WXForms/ProductForms/WXProdSyncForm.cs @@ -42,7 +42,6 @@ namespace TemuKJD.WXForms.ProductForms bool isInit = false; CheckBox chkSelectAll = null; - ConcurrentList lstShopAuthInfo = new ConcurrentList(); ConcurrentList lstWXShopTokenInfo = new ConcurrentList(); public NaiBa.Util.ConcurrentList lstTemuDBProductSelect = new NaiBa.Util.ConcurrentList(); NaiBa.Util.ConcurrentList lstAddPriceRule = new NaiBa.Util.ConcurrentList(); @@ -59,10 +58,6 @@ namespace TemuKJD.WXForms.ProductForms { this.splitContainer1.Dock = DockStyle.Fill; - lstShopAuthInfo = NaiBa.Util.Helper.ConfigHelper.LoadConfig>("wx_shop_auth_list"); - if (lstShopAuthInfo == null) - lstShopAuthInfo = new ConcurrentList(); - lstWXShopTokenInfo = NaiBa.Util.Helper.ConfigHelper.LoadConfig>("wx_shop_token_list"); if (lstWXShopTokenInfo == null) lstWXShopTokenInfo = new ConcurrentList(); @@ -83,11 +78,6 @@ namespace TemuKJD.WXForms.ProductForms dicCheckedShopId = NaiBa.Util.Helper.ConfigHelper.LoadConfig>("wx_checked_shop_dic"); if (dicCheckedShopId == null) dicCheckedShopId = new Dictionary(); - dicShopUpload = NaiBa.Util.Helper.ConfigHelper.LoadConfig>("wx_shop_upload_info"); - if (dicShopUpload == null) - dicShopUpload = new Dictionary(); - - chkSelectAll = dgvShop.Columns["colSelect"].AddHeaderCheckBox(HorizontalAlignment.Center, 0, 0, null, null, false); dgvShop.Columns["colSelect"].HeaderText = ""; @@ -114,91 +104,6 @@ namespace TemuKJD.WXForms.ProductForms IsLoadComplate = true; } - private void btnRefreshAuthor_Click(object sender, EventArgs e) - { - updateAuthor(true); - } - - /// - /// 升级授权 - /// - /// 今日取过的也取 - private void updateAuthor(bool idRefreshTodayHasGet = false) - { - this.pbLoadingShop.Visible = true; - Task.Run(() => - { - // 店铺Id - var updateIds = dgvShop.Rows.Cast().Select(r => r.Cells["colShopId"]?.Value.ToString()).ToList(); - var selectIds = dgvShop.Rows.Cast().Where(row - => row.Cells["colSelect"]?.Value.ParseToBool() == true).Select(r => r.Cells["colShopId"]?.Value.ToString()).ToList(); - if (idRefreshTodayHasGet == true) - updateIds = selectIds; - - List tList = new List(); - if (idRefreshTodayHasGet) - lstShopAuthInfo.RemoveAll(s => updateIds.Contains(s.ShopId)); - foreach (var shop in GlobalConfig.ShopLoginList.Where(s => updateIds.Contains(s.ShopId))) - { - Invoke(new Action(() => { BindShop(shop, selectIds, ""); })); - var t = Task.Run(() => - { - try - { - if (shop.LoginStatus != "登录成功") - { - Invoke(new Action(() => { BindShop(shop, selectIds, "店铺掉线"); })); - return; - } - - var authInfo = lstShopAuthInfo.FirstOrDefault(sa => sa.ShopId == shop.ShopId); - if (idRefreshTodayHasGet || authInfo == null || authInfo?.UpdateTime.Date != DateTime.Now.Date) - { - lstShopAuthInfo.RemoveAll(sa => sa.ShopId == shop.ShopId); - var rst = WXUpload.GetApiServiceList(shop); - if (!rst.Contains("\"code\":0")) - { - WXShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false); - if (shop.LoginStatus != "登录成功") - { - Invoke(new Action(() => { BindShop(shop, selectIds, "店铺掉线"); })); - return; - } - - lstShopAuthInfo.Add(new AuthInfo() { ShopId = shop.ShopId, UpdateTime = DateTime.Now, ExpiresTime = DateTime.Now }); - Invoke(new Action(() => { BindShop(shop, selectIds, "授权查询失败"); })); - return; - } - - foreach (var itemObj in JsonHelper.JObjectParse(rst)["itemList"]) - { - // 找到了指定服务 - if (itemObj["serviceName"].ParseToString() == "店统领供应链-商品管理") - { - var expiresTick = itemObj["expireTime"].ParseToLong(); - lstShopAuthInfo.Add(new AuthInfo() { ShopId = shop.ShopId, UpdateTime = DateTime.Now, ExpiresTime = BaseClass.StampToDateTime(expiresTick.ParseToInt()) }); - Invoke(new Action(() => { BindShop(shop, selectIds, "已查询"); })); - return; - } - } - // 没找到指定服务 - lstShopAuthInfo.Add(new AuthInfo() { ShopId = shop.ShopId, UpdateTime = DateTime.Now, ExpiresTime = DateTime.Now }); - Invoke(new Action(() => { BindShop(shop, selectIds, "已查询"); })); - } - } - catch (Exception ex) - { - } - }); - tList.Add(t); - while (tList.Where(ta => !ta.IsFaulted && !ta.IsCompleted).Count() >= 20) { Thread.Sleep(100); } - } - while (tList.Where(ta => !ta.IsFaulted && !ta.IsCompleted).Count() >= 1) { Thread.Sleep(100); } - NaiBa.Util.Helper.ConfigHelper.SaveConfig( "wx_shop_auth_list", lstShopAuthInfo); - Invoke(new Action(() => { pbLoadingShop.Visible = false; })); - }); - } - private void chkSelectAll_CheckedChanged(object sender, EventArgs e) { if (!chkSelectAll.Checked) @@ -237,7 +142,6 @@ namespace TemuKJD.WXForms.ProductForms if (Visible == true) { RefreshShopLogin(); - updateAuthor(); if (!isInit) { @@ -313,7 +217,7 @@ namespace TemuKJD.WXForms.ProductForms shopEntity.Notes, "选择商品", canUse ? "在线" : "掉线", - lstShopAuthInfo.FirstOrDefault(sa => sa.ShopId == shopEntity.ShopId)?.ExpiresTime > DateTime.Now.AddMinutes(5) ? "可用" : "过期", + GlobalConfig.lstWxShopAuthInfo.FirstOrDefault(sa => sa.ShopId == shopEntity.ShopId)?.ExpiresTime > DateTime.Now.AddMinutes(5) ? "可用" : "过期", canUse, dicShopUpload.ContainsKey(shopEntity.ShopId) && dicShopUpload[shopEntity.ShopId].DicDayUploadCount.ContainsKey(day) ? dicShopUpload[shopEntity.ShopId].DicDayUploadCount[day] : 0, @@ -333,7 +237,7 @@ namespace TemuKJD.WXForms.ProductForms row.Cells["colLoginStatus"].Value = canUse ? "在线" : "掉线"; row.Cells["colLoginStatus"].Style.ForeColor = canUse ? Color.Green : Color.Red; row.Cells["colCanUse"].Value = canUse; - row.Cells["colApi"].Value = lstShopAuthInfo.FirstOrDefault(sa => sa.ShopId == shopEntity.ShopId)?.ExpiresTime > DateTime.Now.AddMinutes(5) ? "可用" : "过期"; + row.Cells["colApi"].Value = GlobalConfig.lstWxShopAuthInfo.FirstOrDefault(sa => sa.ShopId == shopEntity.ShopId)?.ExpiresTime > DateTime.Now.AddMinutes(5) ? "可用" : "过期"; row.Cells["colRemaining"].Value = shopEntity.AddProductRemaining; row.Cells["colUploadCount"].Value = dicShopUpload.ContainsKey(shopEntity.ShopId) && dicShopUpload[shopEntity.ShopId].DicDayUploadCount.ContainsKey(day) ? dicShopUpload[shopEntity.ShopId].DicDayUploadCount[day] : 0; diff --git a/TEMUKJD/WXForms/ProductForms/WXProductForm.cs b/TEMUKJD/WXForms/ProductForms/WXProductForm.cs index a872fc4..e876241 100644 --- a/TEMUKJD/WXForms/ProductForms/WXProductForm.cs +++ b/TEMUKJD/WXForms/ProductForms/WXProductForm.cs @@ -33,7 +33,7 @@ namespace TemuKJD.WXForms.ProductForms { tv.SelectedNode = tv.Nodes[0].Nodes[0]; tv.ExpandGroup(tv.Nodes[0].Name); - List hideName = new List() { "清理无流量", "机会商品采集", "商品列表", "爆单神器1", "商品同步1" }; + List hideName = new List() { "清理无流量1", "机会商品采集", "商品列表", "爆单神器1", "商品同步1" }; if (BaseClass.UserAuthority.Contains("机会商品采集")) hideName.Remove("机会商品采集"); diff --git a/TEMUKJD/WXForms/ShopForms/WXShopDefaultAddressListForm.cs b/TEMUKJD/WXForms/ShopForms/WXShopDefaultAddressListForm.cs index fb29875..1770f7e 100644 --- a/TEMUKJD/WXForms/ShopForms/WXShopDefaultAddressListForm.cs +++ b/TEMUKJD/WXForms/ShopForms/WXShopDefaultAddressListForm.cs @@ -222,35 +222,35 @@ namespace TemuKJD.WXForms.ShopForms { if (BaseClass.GroupId != 3) { - //this.dgvShop.Columns["ColEdit"].Visible = false; + this.dgvShop.Columns["ColEdit"].Visible = false; this.dgvShop.Columns["colDelete"].Visible = false; - this.dgvShop.Columns["colSubUser"].Visible = false; - this.dgvShop.Columns["colSubUserAccount"].Visible = false; + //this.dgvShop.Columns["colSubUser"].Visible = false; + //this.dgvShop.Columns["colSubUserAccount"].Visible = false; } - if (BaseClass.UserAuthority.Contains("积分用户")) - this.dgvShop.Columns["colExpireTime"].Visible = true; + //if (BaseClass.UserAuthority.Contains("积分用户")) + // this.dgvShop.Columns["colExpireTime"].Visible = true; this.dgvShop.AddSelectorColumn("colSelect"); this.splitContainer2.FixedPanel = FixedPanel.Panel2; - foreach (var shop in GlobalConfig.ShopLoginList) - { - shop.ShopSubAccountList.Clear(); - if (!string.IsNullOrWhiteSpace(shop.SubUserName)) - { - ShopSubAccountInfo subAccount = new ShopSubAccountInfo(); - subAccount.sub_user_name = shop.SubUserName; - subAccount.user_name = shop.SubUserName; - subAccount.shop_login_name = shop.LoginName; - subAccount.group_id = "4"; - shop.ShopSubAccountList.Add(subAccount); - } - } + //foreach (var shop in GlobalConfig.ShopLoginList) + //{ + // shop.ShopSubAccountList.Clear(); + // if (!string.IsNullOrWhiteSpace(shop.SubUserName)) + // { + // ShopSubAccountInfo subAccount = new ShopSubAccountInfo(); + // subAccount.sub_user_name = shop.SubUserName; + // subAccount.user_name = shop.SubUserName; + // subAccount.shop_login_name = shop.LoginName; + // subAccount.group_id = "4"; + // shop.ShopSubAccountList.Add(subAccount); + // } + //} pbLoading.Visible = true; Task.Run(() => { - WXSubAccountShopEditForm.GetServerSubUser(); + //WXSubAccountShopEditForm.GetServerSubUser(); GetShopDefaultAddress(); Invoke(new Action(() => { diff --git a/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.Designer.cs b/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.Designer.cs index 96591ae..88f181a 100644 --- a/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.Designer.cs +++ b/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.Designer.cs @@ -79,6 +79,19 @@ namespace TemuKJD.WXForms.ShopForms System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle45 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle46 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle47 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle48 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle49 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle50 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle51 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle52 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle53 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle54 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle55 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle56 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle57 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle58 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle59 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle60 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.ucGroupBoxEx3 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.btnWaybillManage = new DevComponents.DotNetBar.PanelEx(); @@ -91,6 +104,8 @@ namespace TemuKJD.WXForms.ShopForms this.btnSearch = new DevComponents.DotNetBar.PanelEx(); this.panelEx6 = new DevComponents.DotNetBar.PanelEx(); this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); + this.cmbFilterShopGroup = new TemuKJD.UserComponent.UcComboBoxMutiSelect(); + this.label24 = new System.Windows.Forms.Label(); this.btnSelectOffline = new DevComponents.DotNetBar.PanelEx(); this.btnSelectOnline = new DevComponents.DotNetBar.PanelEx(); this.btnAddUnSelect = new DevComponents.DotNetBar.PanelEx(); @@ -105,20 +120,11 @@ namespace TemuKJD.WXForms.ShopForms this.label17 = new System.Windows.Forms.Label(); this.pbLoadingShop = new System.Windows.Forms.PictureBox(); this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx(); - this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.colShopLoginName = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colShopNotes = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colSelectProduct = new System.Windows.Forms.DataGridViewLinkColumn(); - this.colLoginStatus = new System.Windows.Forms.DataGridViewLinkColumn(); - this.colApi = new System.Windows.Forms.DataGridViewLinkColumn(); - this.colCanUse = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.colUploadCount = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colOnSaleNum = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colRemaining = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); + this.txtFilterOrderId = new System.Windows.Forms.TextBox(); + this.btnRestoreFilter = new DevComponents.DotNetBar.PanelEx(); + this.btnFilter = new DevComponents.DotNetBar.PanelEx(); + this.label3 = new System.Windows.Forms.Label(); this.ucTabControl1 = new TemuKJD.UserComponent.UcTabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); this.panel1 = new System.Windows.Forms.Panel(); @@ -131,6 +137,7 @@ namespace TemuKJD.WXForms.ShopForms this.btnRemarkOK = new DevComponents.DotNetBar.PanelEx(); this.lblOrderId = new System.Windows.Forms.Label(); this.lblShopName = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); this.dgvData1 = new TemuKJD.UserComponent.DataGridViewEx(); this.colDgv1Check = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colDgv1ShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -176,7 +183,7 @@ namespace TemuKJD.WXForms.ShopForms this.colDgv2Optimize = new System.Windows.Forms.DataGridViewLinkColumn(); this.colDgv2Remark = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.tabPage3 = new System.Windows.Forms.TabPage(); - this.mainPanel = new System.Windows.Forms.Panel(); + this.panel3 = new System.Windows.Forms.Panel(); this.pictureBox3 = new System.Windows.Forms.PictureBox(); this.dgvData3 = new TemuKJD.UserComponent.DataGridViewEx(); this.colDgv3Check = new System.Windows.Forms.DataGridViewCheckBoxColumn(); @@ -202,7 +209,7 @@ namespace TemuKJD.WXForms.ShopForms this.colDgv3Optimize = new System.Windows.Forms.DataGridViewLinkColumn(); this.colDgv3Remark = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.tabPage4 = new System.Windows.Forms.TabPage(); - this.panel3 = new System.Windows.Forms.Panel(); + this.panel4 = new System.Windows.Forms.Panel(); this.pictureBox4 = new System.Windows.Forms.PictureBox(); this.dgvData4 = new TemuKJD.UserComponent.DataGridViewEx(); this.colDgv4Check = new System.Windows.Forms.DataGridViewCheckBoxColumn(); @@ -228,10 +235,47 @@ namespace TemuKJD.WXForms.ShopForms this.colDgv4Optimize = new System.Windows.Forms.DataGridViewLinkColumn(); this.colDgv4Remark = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.tabPage5 = new System.Windows.Forms.TabPage(); - this.chkTestNoAuditUpload = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.panel5 = new System.Windows.Forms.Panel(); + this.pictureBox5 = new System.Windows.Forms.PictureBox(); + this.dgvData5 = new TemuKJD.UserComponent.DataGridViewEx(); + this.dataGridViewCheckBoxColumn1 = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewLinkColumn1 = new System.Windows.Forms.DataGridViewLinkColumn(); + this.dataGridViewLinkColumn2 = new System.Windows.Forms.DataGridViewLinkColumn(); + this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewImageColumn1 = new System.Windows.Forms.DataGridViewImageColumn(); + this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn11 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn14 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv5OrderId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn16 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn17 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn18 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv5WaybillId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn20 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn21 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn22 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn23 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewLinkColumn3 = new System.Windows.Forms.DataGridViewLinkColumn(); + this.dataGridViewTextBoxColumn24 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); this.splitContainer3 = new System.Windows.Forms.SplitContainer(); - this.label2 = new System.Windows.Forms.Label(); + this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.colShopLoginName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colShopNotes = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colGroup = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colSelectProduct = new System.Windows.Forms.DataGridViewLinkColumn(); + this.colLoginStatus = new System.Windows.Forms.DataGridViewLinkColumn(); + this.colApi = new System.Windows.Forms.DataGridViewLinkColumn(); + this.colCanUse = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.colUploadCount = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colOnSaleNum = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colRemaining = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -255,13 +299,17 @@ namespace TemuKJD.WXForms.ShopForms ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dgvData2)).BeginInit(); this.tabPage3.SuspendLayout(); - this.mainPanel.SuspendLayout(); + this.panel3.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dgvData3)).BeginInit(); this.tabPage4.SuspendLayout(); - this.panel3.SuspendLayout(); + this.panel4.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dgvData4)).BeginInit(); + this.tabPage5.SuspendLayout(); + this.panel5.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dgvData5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).BeginInit(); this.splitContainer3.Panel1.SuspendLayout(); this.splitContainer3.Panel2.SuspendLayout(); @@ -285,7 +333,7 @@ namespace TemuKJD.WXForms.ShopForms // this.splitContainer1.Panel2.Controls.Add(this.pbLoadingShop); this.splitContainer1.Panel2.Controls.Add(this.dgvShop); - this.splitContainer1.Size = new System.Drawing.Size(346, 529); + this.splitContainer1.Size = new System.Drawing.Size(361, 529); this.splitContainer1.SplitterDistance = 165; this.splitContainer1.TabIndex = 11; // @@ -306,9 +354,9 @@ namespace TemuKJD.WXForms.ShopForms this.ucGroupBoxEx3.Controls.Add(this.btnCancel); this.ucGroupBoxEx3.Controls.Add(this.btnSearch); this.ucGroupBoxEx3.Controls.Add(this.panelEx6); - this.ucGroupBoxEx3.Location = new System.Drawing.Point(157, 2); + this.ucGroupBoxEx3.Location = new System.Drawing.Point(182, 2); this.ucGroupBoxEx3.Name = "ucGroupBoxEx3"; - this.ucGroupBoxEx3.Size = new System.Drawing.Size(190, 165); + this.ucGroupBoxEx3.Size = new System.Drawing.Size(181, 165); this.ucGroupBoxEx3.TabIndex = 668; this.ucGroupBoxEx3.TabStop = false; this.ucGroupBoxEx3.Text = "查询"; @@ -319,7 +367,7 @@ namespace TemuKJD.WXForms.ShopForms this.btnWaybillManage.Cursor = System.Windows.Forms.Cursors.Hand; this.btnWaybillManage.DisabledBackColor = System.Drawing.Color.Empty; this.btnWaybillManage.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnWaybillManage.Location = new System.Drawing.Point(12, 130); + this.btnWaybillManage.Location = new System.Drawing.Point(10, 130); this.btnWaybillManage.Name = "btnWaybillManage"; this.btnWaybillManage.Size = new System.Drawing.Size(89, 23); this.btnWaybillManage.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -342,7 +390,7 @@ namespace TemuKJD.WXForms.ShopForms this.ucCheckBox5.AutoSize = true; this.ucCheckBox5.Checked = true; this.ucCheckBox5.CheckState = System.Windows.Forms.CheckState.Checked; - this.ucCheckBox5.Location = new System.Drawing.Point(12, 77); + this.ucCheckBox5.Location = new System.Drawing.Point(10, 77); this.ucCheckBox5.Name = "ucCheckBox5"; this.ucCheckBox5.Size = new System.Drawing.Size(99, 21); this.ucCheckBox5.TabIndex = 873; @@ -352,12 +400,11 @@ namespace TemuKJD.WXForms.ShopForms // // ucCheckBox4 // - this.ucCheckBox4.AutoSize = true; this.ucCheckBox4.Checked = true; this.ucCheckBox4.CheckState = System.Windows.Forms.CheckState.Checked; - this.ucCheckBox4.Location = new System.Drawing.Point(98, 50); + this.ucCheckBox4.Location = new System.Drawing.Point(95, 50); this.ucCheckBox4.Name = "ucCheckBox4"; - this.ucCheckBox4.Size = new System.Drawing.Size(87, 21); + this.ucCheckBox4.Size = new System.Drawing.Size(79, 21); this.ucCheckBox4.TabIndex = 872; this.ucCheckBox4.Text = "配送不达标"; this.ucCheckBox4.UseVisualStyleBackColor = true; @@ -367,7 +414,7 @@ namespace TemuKJD.WXForms.ShopForms this.ucCheckBox3.AutoSize = true; this.ucCheckBox3.Checked = true; this.ucCheckBox3.CheckState = System.Windows.Forms.CheckState.Checked; - this.ucCheckBox3.Location = new System.Drawing.Point(12, 50); + this.ucCheckBox3.Location = new System.Drawing.Point(10, 50); this.ucCheckBox3.Name = "ucCheckBox3"; this.ucCheckBox3.Size = new System.Drawing.Size(87, 21); this.ucCheckBox3.TabIndex = 871; @@ -379,7 +426,7 @@ namespace TemuKJD.WXForms.ShopForms this.ucCheckBox2.AutoSize = true; this.ucCheckBox2.Checked = true; this.ucCheckBox2.CheckState = System.Windows.Forms.CheckState.Checked; - this.ucCheckBox2.Location = new System.Drawing.Point(98, 23); + this.ucCheckBox2.Location = new System.Drawing.Point(95, 23); this.ucCheckBox2.Name = "ucCheckBox2"; this.ucCheckBox2.Size = new System.Drawing.Size(75, 21); this.ucCheckBox2.TabIndex = 870; @@ -391,7 +438,7 @@ namespace TemuKJD.WXForms.ShopForms this.ucCheckBox1.AutoSize = true; this.ucCheckBox1.Checked = true; this.ucCheckBox1.CheckState = System.Windows.Forms.CheckState.Checked; - this.ucCheckBox1.Location = new System.Drawing.Point(12, 23); + this.ucCheckBox1.Location = new System.Drawing.Point(10, 23); this.ucCheckBox1.Name = "ucCheckBox1"; this.ucCheckBox1.Size = new System.Drawing.Size(75, 21); this.ucCheckBox1.TabIndex = 869; @@ -403,7 +450,7 @@ namespace TemuKJD.WXForms.ShopForms this.btnCancel.CanvasColor = System.Drawing.SystemColors.Control; this.btnCancel.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnCancel.DisabledBackColor = System.Drawing.Color.Empty; - this.btnCancel.Location = new System.Drawing.Point(104, 130); + this.btnCancel.Location = new System.Drawing.Point(102, 130); this.btnCancel.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); this.btnCancel.Name = "btnCancel"; this.btnCancel.Size = new System.Drawing.Size(69, 23); @@ -429,7 +476,7 @@ namespace TemuKJD.WXForms.ShopForms this.btnSearch.Cursor = System.Windows.Forms.Cursors.Hand; this.btnSearch.DisabledBackColor = System.Drawing.Color.Empty; this.btnSearch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSearch.Location = new System.Drawing.Point(12, 104); + this.btnSearch.Location = new System.Drawing.Point(10, 104); this.btnSearch.Name = "btnSearch"; this.btnSearch.Size = new System.Drawing.Size(161, 23); this.btnSearch.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -478,6 +525,8 @@ namespace TemuKJD.WXForms.ShopForms | System.Windows.Forms.AnchorStyles.Left))); this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx1.Controls.Add(this.cmbFilterShopGroup); + this.ucGroupBoxEx1.Controls.Add(this.label24); this.ucGroupBoxEx1.Controls.Add(this.btnSelectOffline); this.ucGroupBoxEx1.Controls.Add(this.btnSelectOnline); this.ucGroupBoxEx1.Controls.Add(this.btnAddUnSelect); @@ -492,20 +541,43 @@ namespace TemuKJD.WXForms.ShopForms this.ucGroupBoxEx1.Controls.Add(this.label17); this.ucGroupBoxEx1.Location = new System.Drawing.Point(-2, 2); this.ucGroupBoxEx1.Name = "ucGroupBoxEx1"; - this.ucGroupBoxEx1.Size = new System.Drawing.Size(160, 165); + this.ucGroupBoxEx1.Size = new System.Drawing.Size(185, 165); this.ucGroupBoxEx1.TabIndex = 399; this.ucGroupBoxEx1.TabStop = false; this.ucGroupBoxEx1.Text = "店铺筛选"; // + // cmbFilterShopGroup + // + this.cmbFilterShopGroup.DefaultText = "全部"; + this.cmbFilterShopGroup.DropDownHeight = 1; + this.cmbFilterShopGroup.DropDownWidth = 1; + this.cmbFilterShopGroup.FormattingEnabled = true; + this.cmbFilterShopGroup.IntegralHeight = false; + this.cmbFilterShopGroup.Location = new System.Drawing.Point(38, 92); + this.cmbFilterShopGroup.Name = "cmbFilterShopGroup"; + this.cmbFilterShopGroup.Size = new System.Drawing.Size(137, 25); + this.cmbFilterShopGroup.TabIndex = 834; + this.cmbFilterShopGroup.Text = "全部"; + // + // label24 + // + this.label24.AutoSize = true; + this.label24.Location = new System.Drawing.Point(7, 96); + this.label24.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label24.Name = "label24"; + this.label24.Size = new System.Drawing.Size(32, 17); + this.label24.TabIndex = 835; + this.label24.Text = "分组"; + // // btnSelectOffline // this.btnSelectOffline.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnSelectOffline.Cursor = System.Windows.Forms.Cursors.Hand; this.btnSelectOffline.DisabledBackColor = System.Drawing.Color.Empty; this.btnSelectOffline.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSelectOffline.Location = new System.Drawing.Point(61, 137); + this.btnSelectOffline.Location = new System.Drawing.Point(59, 139); this.btnSelectOffline.Name = "btnSelectOffline"; - this.btnSelectOffline.Size = new System.Drawing.Size(50, 20); + this.btnSelectOffline.Size = new System.Drawing.Size(48, 18); this.btnSelectOffline.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnSelectOffline.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnSelectOffline.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -527,9 +599,9 @@ namespace TemuKJD.WXForms.ShopForms this.btnSelectOnline.Cursor = System.Windows.Forms.Cursors.Hand; this.btnSelectOnline.DisabledBackColor = System.Drawing.Color.Empty; this.btnSelectOnline.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSelectOnline.Location = new System.Drawing.Point(9, 137); + this.btnSelectOnline.Location = new System.Drawing.Point(9, 139); this.btnSelectOnline.Name = "btnSelectOnline"; - this.btnSelectOnline.Size = new System.Drawing.Size(50, 20); + this.btnSelectOnline.Size = new System.Drawing.Size(48, 18); this.btnSelectOnline.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnSelectOnline.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnSelectOnline.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -551,9 +623,9 @@ namespace TemuKJD.WXForms.ShopForms this.btnAddUnSelect.Cursor = System.Windows.Forms.Cursors.Hand; this.btnAddUnSelect.DisabledBackColor = System.Drawing.Color.Empty; this.btnAddUnSelect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnAddUnSelect.Location = new System.Drawing.Point(81, 115); + this.btnAddUnSelect.Location = new System.Drawing.Point(76, 119); this.btnAddUnSelect.Name = "btnAddUnSelect"; - this.btnAddUnSelect.Size = new System.Drawing.Size(70, 20); + this.btnAddUnSelect.Size = new System.Drawing.Size(65, 18); this.btnAddUnSelect.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnAddUnSelect.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnAddUnSelect.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -575,9 +647,9 @@ namespace TemuKJD.WXForms.ShopForms this.btnReverse.Cursor = System.Windows.Forms.Cursors.Hand; this.btnReverse.DisabledBackColor = System.Drawing.Color.Empty; this.btnReverse.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnReverse.Location = new System.Drawing.Point(113, 137); + this.btnReverse.Location = new System.Drawing.Point(109, 139); this.btnReverse.Name = "btnReverse"; - this.btnReverse.Size = new System.Drawing.Size(38, 20); + this.btnReverse.Size = new System.Drawing.Size(32, 18); this.btnReverse.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnReverse.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnReverse.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -600,9 +672,9 @@ namespace TemuKJD.WXForms.ShopForms this.cmbFilterShopNotes.DropDownWidth = 1; this.cmbFilterShopNotes.FormattingEnabled = true; this.cmbFilterShopNotes.IntegralHeight = false; - this.cmbFilterShopNotes.Location = new System.Drawing.Point(38, 66); + this.cmbFilterShopNotes.Location = new System.Drawing.Point(38, 65); this.cmbFilterShopNotes.Name = "cmbFilterShopNotes"; - this.cmbFilterShopNotes.Size = new System.Drawing.Size(113, 25); + this.cmbFilterShopNotes.Size = new System.Drawing.Size(137, 25); this.cmbFilterShopNotes.TabIndex = 442; this.cmbFilterShopNotes.Text = "全部"; // @@ -612,9 +684,9 @@ namespace TemuKJD.WXForms.ShopForms this.btnAddSelect.Cursor = System.Windows.Forms.Cursors.Hand; this.btnAddSelect.DisabledBackColor = System.Drawing.Color.Empty; this.btnAddSelect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnAddSelect.Location = new System.Drawing.Point(9, 115); + this.btnAddSelect.Location = new System.Drawing.Point(9, 119); this.btnAddSelect.Name = "btnAddSelect"; - this.btnAddSelect.Size = new System.Drawing.Size(70, 20); + this.btnAddSelect.Size = new System.Drawing.Size(65, 18); this.btnAddSelect.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnAddSelect.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnAddSelect.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -627,7 +699,7 @@ namespace TemuKJD.WXForms.ShopForms this.btnAddSelect.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); this.btnAddSelect.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); this.btnAddSelect.TabIndex = 742; - this.btnAddSelect.Text = "选中条件"; + this.btnAddSelect.Text = "加选条件"; this.btnAddSelect.Click += new System.EventHandler(this.btnAddSelect_Click); // // btnEmptyShop @@ -635,10 +707,10 @@ namespace TemuKJD.WXForms.ShopForms this.btnEmptyShop.CanvasColor = System.Drawing.SystemColors.Control; this.btnEmptyShop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnEmptyShop.DisabledBackColor = System.Drawing.Color.Empty; - this.btnEmptyShop.Location = new System.Drawing.Point(113, 93); + this.btnEmptyShop.Location = new System.Drawing.Point(143, 139); this.btnEmptyShop.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); this.btnEmptyShop.Name = "btnEmptyShop"; - this.btnEmptyShop.Size = new System.Drawing.Size(38, 20); + this.btnEmptyShop.Size = new System.Drawing.Size(32, 18); this.btnEmptyShop.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnEmptyShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); this.btnEmptyShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); @@ -661,9 +733,9 @@ namespace TemuKJD.WXForms.ShopForms this.btnFilterShop.Cursor = System.Windows.Forms.Cursors.Hand; this.btnFilterShop.DisabledBackColor = System.Drawing.Color.Empty; this.btnFilterShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnFilterShop.Location = new System.Drawing.Point(9, 93); + this.btnFilterShop.Location = new System.Drawing.Point(143, 119); this.btnFilterShop.Name = "btnFilterShop"; - this.btnFilterShop.Size = new System.Drawing.Size(102, 20); + this.btnFilterShop.Size = new System.Drawing.Size(32, 18); this.btnFilterShop.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnFilterShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnFilterShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -676,13 +748,13 @@ namespace TemuKJD.WXForms.ShopForms this.btnFilterShop.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); this.btnFilterShop.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); this.btnFilterShop.TabIndex = 703; - this.btnFilterShop.Text = "过滤店铺"; + this.btnFilterShop.Text = "过滤"; this.btnFilterShop.Click += new System.EventHandler(this.btnFilterShop_Click); // // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(7, 70); + this.label16.Location = new System.Drawing.Point(7, 69); this.label16.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(32, 17); @@ -692,10 +764,10 @@ namespace TemuKJD.WXForms.ShopForms // txtFilterShopName // this.txtFilterShopName.Font = new System.Drawing.Font("微软雅黑", 10F); - this.txtFilterShopName.Location = new System.Drawing.Point(38, 39); + this.txtFilterShopName.Location = new System.Drawing.Point(38, 38); this.txtFilterShopName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtFilterShopName.Name = "txtFilterShopName"; - this.txtFilterShopName.Size = new System.Drawing.Size(113, 25); + this.txtFilterShopName.Size = new System.Drawing.Size(137, 25); this.txtFilterShopName.TabIndex = 653; // // btnRefreshShop @@ -704,9 +776,9 @@ namespace TemuKJD.WXForms.ShopForms this.btnRefreshShop.Cursor = System.Windows.Forms.Cursors.Hand; this.btnRefreshShop.DisabledBackColor = System.Drawing.Color.Empty; this.btnRefreshShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnRefreshShop.Location = new System.Drawing.Point(9, 17); + this.btnRefreshShop.Location = new System.Drawing.Point(9, 18); this.btnRefreshShop.Name = "btnRefreshShop"; - this.btnRefreshShop.Size = new System.Drawing.Size(142, 20); + this.btnRefreshShop.Size = new System.Drawing.Size(166, 18); this.btnRefreshShop.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnRefreshShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnRefreshShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -725,7 +797,7 @@ namespace TemuKJD.WXForms.ShopForms // label17 // this.label17.AutoSize = true; - this.label17.Location = new System.Drawing.Point(7, 43); + this.label17.Location = new System.Drawing.Point(7, 42); this.label17.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label17.Name = "label17"; this.label17.Size = new System.Drawing.Size(32, 17); @@ -736,7 +808,7 @@ namespace TemuKJD.WXForms.ShopForms // this.pbLoadingShop.Anchor = System.Windows.Forms.AnchorStyles.None; this.pbLoadingShop.Image = global::TemuKJD.Properties.Resources.loading_blue; - this.pbLoadingShop.Location = new System.Drawing.Point(146, 155); + this.pbLoadingShop.Location = new System.Drawing.Point(153, 155); this.pbLoadingShop.Name = "pbLoadingShop"; this.pbLoadingShop.Size = new System.Drawing.Size(50, 50); this.pbLoadingShop.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -768,6 +840,7 @@ namespace TemuKJD.WXForms.ShopForms this.colShopId, this.colShopName, this.colShopNotes, + this.colGroup, this.colSelectProduct, this.colLoginStatus, this.colApi, @@ -783,117 +856,10 @@ namespace TemuKJD.WXForms.ShopForms this.dgvShop.ReadOnly = true; this.dgvShop.RowHeadersWidth = 25; this.dgvShop.RowTemplate.Height = 23; - this.dgvShop.Size = new System.Drawing.Size(346, 360); + this.dgvShop.Size = new System.Drawing.Size(361, 360); this.dgvShop.TabIndex = 6; this.dgvShop.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellContentClick); // - // colSelect - // - this.colSelect.HeaderText = "全选"; - this.colSelect.Name = "colSelect"; - this.colSelect.ReadOnly = true; - this.colSelect.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.colSelect.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colSelect.Width = 28; - // - // colShopLoginName - // - this.colShopLoginName.HeaderText = "店铺登录名"; - this.colShopLoginName.Name = "colShopLoginName"; - this.colShopLoginName.ReadOnly = true; - this.colShopLoginName.Visible = false; - // - // colShopId - // - this.colShopId.HeaderText = "店铺Id"; - this.colShopId.Name = "colShopId"; - this.colShopId.ReadOnly = true; - this.colShopId.Visible = false; - this.colShopId.Width = 55; - // - // colShopName - // - this.colShopName.FillWeight = 150F; - this.colShopName.HeaderText = "店铺名称"; - this.colShopName.Name = "colShopName"; - this.colShopName.ReadOnly = true; - this.colShopName.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.colShopName.Width = 75; - // - // colShopNotes - // - this.colShopNotes.HeaderText = "备注"; - this.colShopNotes.Name = "colShopNotes"; - this.colShopNotes.ReadOnly = true; - this.colShopNotes.Width = 75; - // - // colSelectProduct - // - this.colSelectProduct.HeaderText = "选择商品"; - this.colSelectProduct.Name = "colSelectProduct"; - this.colSelectProduct.ReadOnly = true; - this.colSelectProduct.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.colSelectProduct.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colSelectProduct.Visible = false; - this.colSelectProduct.Width = 62; - // - // colLoginStatus - // - this.colLoginStatus.HeaderText = "状态"; - this.colLoginStatus.Name = "colLoginStatus"; - this.colLoginStatus.ReadOnly = true; - this.colLoginStatus.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.colLoginStatus.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colLoginStatus.Width = 38; - // - // colApi - // - this.colApi.HeaderText = "Api"; - this.colApi.Name = "colApi"; - this.colApi.ReadOnly = true; - this.colApi.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colApi.Visible = false; - this.colApi.Width = 38; - // - // colCanUse - // - this.colCanUse.HeaderText = "可用"; - this.colCanUse.Name = "colCanUse"; - this.colCanUse.ReadOnly = true; - this.colCanUse.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.colCanUse.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colCanUse.Visible = false; - this.colCanUse.Width = 28; - // - // colUploadCount - // - this.colUploadCount.HeaderText = "已传"; - this.colUploadCount.Name = "colUploadCount"; - this.colUploadCount.ReadOnly = true; - this.colUploadCount.Visible = false; - this.colUploadCount.Width = 38; - // - // colOnSaleNum - // - this.colOnSaleNum.HeaderText = "在售"; - this.colOnSaleNum.Name = "colOnSaleNum"; - this.colOnSaleNum.ReadOnly = true; - this.colOnSaleNum.Visible = false; - this.colOnSaleNum.Width = 38; - // - // colRemaining - // - this.colRemaining.HeaderText = "月限额"; - this.colRemaining.Name = "colRemaining"; - this.colRemaining.ReadOnly = true; - this.colRemaining.Visible = false; - // - // colMessage - // - this.colMessage.HeaderText = "消息"; - this.colMessage.Name = "colMessage"; - this.colMessage.ReadOnly = true; - // // splitContainer2 // this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill; @@ -908,13 +874,86 @@ namespace TemuKJD.WXForms.ShopForms // // splitContainer2.Panel2 // + this.splitContainer2.Panel2.Controls.Add(this.txtFilterOrderId); + this.splitContainer2.Panel2.Controls.Add(this.btnRestoreFilter); + this.splitContainer2.Panel2.Controls.Add(this.btnFilter); + this.splitContainer2.Panel2.Controls.Add(this.label3); this.splitContainer2.Panel2.Controls.Add(this.ucTabControl1); - this.splitContainer2.Panel2.Controls.Add(this.chkTestNoAuditUpload); this.splitContainer2.Panel2.Padding = new System.Windows.Forms.Padding(0, 0, 4, 0); this.splitContainer2.Size = new System.Drawing.Size(1772, 533); - this.splitContainer2.SplitterDistance = 350; + this.splitContainer2.SplitterDistance = 365; this.splitContainer2.TabIndex = 0; // + // txtFilterOrderId + // + this.txtFilterOrderId.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.txtFilterOrderId.Font = new System.Drawing.Font("微软雅黑", 10F); + this.txtFilterOrderId.Location = new System.Drawing.Point(1082, 7); + this.txtFilterOrderId.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtFilterOrderId.Name = "txtFilterOrderId"; + this.txtFilterOrderId.Size = new System.Drawing.Size(219, 25); + this.txtFilterOrderId.TabIndex = 790; + // + // btnRestoreFilter + // + this.btnRestoreFilter.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnRestoreFilter.CanvasColor = System.Drawing.SystemColors.Control; + this.btnRestoreFilter.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnRestoreFilter.DisabledBackColor = System.Drawing.Color.Empty; + this.btnRestoreFilter.Location = new System.Drawing.Point(1351, 7); + this.btnRestoreFilter.Name = "btnRestoreFilter"; + this.btnRestoreFilter.Size = new System.Drawing.Size(44, 25); + this.btnRestoreFilter.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnRestoreFilter.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnRestoreFilter.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnRestoreFilter.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.btnRestoreFilter.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnRestoreFilter.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.btnRestoreFilter.Style.GradientAngle = 90; + this.btnRestoreFilter.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; + this.btnRestoreFilter.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnRestoreFilter.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnRestoreFilter.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnRestoreFilter.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.btnRestoreFilter.TabIndex = 789; + this.btnRestoreFilter.Text = "还原"; + this.btnRestoreFilter.Click += new System.EventHandler(this.btnRestoreFilter_Click); + // + // btnFilter + // + this.btnFilter.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnFilter.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnFilter.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnFilter.DisabledBackColor = System.Drawing.Color.Empty; + this.btnFilter.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnFilter.Location = new System.Drawing.Point(1304, 7); + this.btnFilter.Name = "btnFilter"; + this.btnFilter.Size = new System.Drawing.Size(44, 25); + this.btnFilter.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnFilter.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnFilter.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnFilter.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnFilter.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnFilter.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnFilter.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnFilter.Style.GradientAngle = 90; + this.btnFilter.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnFilter.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnFilter.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnFilter.TabIndex = 788; + this.btnFilter.Text = "过滤"; + this.btnFilter.Click += new System.EventHandler(this.btnFilter_Click); + // + // label3 + // + this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(1035, 12); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(56, 17); + this.label3.TabIndex = 797; + this.label3.Text = "订单号："; + // // ucTabControl1 // this.ucTabControl1.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(251)))), ((int)(((byte)(251)))), ((int)(((byte)(251))))); @@ -930,7 +969,7 @@ namespace TemuKJD.WXForms.ShopForms this.ucTabControl1.Name = "ucTabControl1"; this.ucTabControl1.SelectedIndex = 0; this.ucTabControl1.ShowCloseButton = false; - this.ucTabControl1.Size = new System.Drawing.Size(1414, 533); + this.ucTabControl1.Size = new System.Drawing.Size(1399, 533); this.ucTabControl1.TabIndex = 781; this.ucTabControl1.TabSelectColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.ucTabControl1.TabSelectTextColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -941,7 +980,7 @@ namespace TemuKJD.WXForms.ShopForms this.tabPage1.Controls.Add(this.panel1); this.tabPage1.Location = new System.Drawing.Point(2, 40); this.tabPage1.Name = "tabPage1"; - this.tabPage1.Size = new System.Drawing.Size(1408, 489); + this.tabPage1.Size = new System.Drawing.Size(1393, 489); this.tabPage1.TabIndex = 4; this.tabPage1.Text = " 品质退款 "; this.tabPage1.UseVisualStyleBackColor = true; @@ -955,14 +994,14 @@ namespace TemuKJD.WXForms.ShopForms this.panel1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(1408, 489); + this.panel1.Size = new System.Drawing.Size(1393, 489); this.panel1.TabIndex = 2; // // pictureBox1 // this.pictureBox1.Anchor = System.Windows.Forms.AnchorStyles.None; this.pictureBox1.Image = global::TemuKJD.Properties.Resources.loading_blue; - this.pictureBox1.Location = new System.Drawing.Point(679, 219); + this.pictureBox1.Location = new System.Drawing.Point(671, 219); this.pictureBox1.Name = "pictureBox1"; this.pictureBox1.Size = new System.Drawing.Size(50, 50); this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -982,7 +1021,7 @@ namespace TemuKJD.WXForms.ShopForms this.pnlUpdateRemark.Controls.Add(this.lblOrderId); this.pnlUpdateRemark.Controls.Add(this.lblShopName); this.pnlUpdateRemark.Controls.Add(this.label2); - this.pnlUpdateRemark.Location = new System.Drawing.Point(467, 63); + this.pnlUpdateRemark.Location = new System.Drawing.Point(459, 63); this.pnlUpdateRemark.Name = "pnlUpdateRemark"; this.pnlUpdateRemark.Size = new System.Drawing.Size(474, 146); this.pnlUpdateRemark.TabIndex = 781; @@ -1081,6 +1120,15 @@ namespace TemuKJD.WXForms.ShopForms this.lblShopName.TabIndex = 455; this.lblShopName.Text = "ShopName"; // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(223, 19); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(44, 17); + this.label2.TabIndex = 482; + this.label2.Text = "单号："; + // // dgvData1 // this.dgvData1.AllowUserToAddRows = false; @@ -1124,7 +1172,7 @@ namespace TemuKJD.WXForms.ShopForms this.dgvData1.Name = "dgvData1"; this.dgvData1.ReadOnly = true; this.dgvData1.RowTemplate.Height = 23; - this.dgvData1.Size = new System.Drawing.Size(1408, 489); + this.dgvData1.Size = new System.Drawing.Size(1393, 489); this.dgvData1.TabIndex = 187; this.dgvData1.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvData_CellContentClick); // @@ -1283,7 +1331,7 @@ namespace TemuKJD.WXForms.ShopForms this.tabPage2.Controls.Add(this.panel2); this.tabPage2.Location = new System.Drawing.Point(2, 40); this.tabPage2.Name = "tabPage2"; - this.tabPage2.Size = new System.Drawing.Size(1408, 489); + this.tabPage2.Size = new System.Drawing.Size(1393, 489); this.tabPage2.TabIndex = 5; this.tabPage2.Text = " 订单评价 "; this.tabPage2.UseVisualStyleBackColor = true; @@ -1296,14 +1344,14 @@ namespace TemuKJD.WXForms.ShopForms this.panel2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.panel2.Location = new System.Drawing.Point(0, 0); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(1408, 489); + this.panel2.Size = new System.Drawing.Size(1393, 489); this.panel2.TabIndex = 3; // // pictureBox2 // this.pictureBox2.Anchor = System.Windows.Forms.AnchorStyles.None; this.pictureBox2.Image = global::TemuKJD.Properties.Resources.loading_blue; - this.pictureBox2.Location = new System.Drawing.Point(679, 219); + this.pictureBox2.Location = new System.Drawing.Point(671, 219); this.pictureBox2.Name = "pictureBox2"; this.pictureBox2.Size = new System.Drawing.Size(50, 50); this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -1357,7 +1405,7 @@ namespace TemuKJD.WXForms.ShopForms this.dgvData2.Name = "dgvData2"; this.dgvData2.ReadOnly = true; this.dgvData2.RowTemplate.Height = 23; - this.dgvData2.Size = new System.Drawing.Size(1408, 489); + this.dgvData2.Size = new System.Drawing.Size(1393, 489); this.dgvData2.TabIndex = 187; this.dgvData2.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvData_CellContentClick); // @@ -1540,30 +1588,30 @@ namespace TemuKJD.WXForms.ShopForms // // tabPage3 // - this.tabPage3.Controls.Add(this.mainPanel); + this.tabPage3.Controls.Add(this.panel3); this.tabPage3.Location = new System.Drawing.Point(2, 40); this.tabPage3.Name = "tabPage3"; - this.tabPage3.Size = new System.Drawing.Size(1408, 489); + this.tabPage3.Size = new System.Drawing.Size(1393, 489); this.tabPage3.TabIndex = 1; this.tabPage3.Text = " 揽收不达标 "; this.tabPage3.UseVisualStyleBackColor = true; // - // mainPanel + // panel3 // - this.mainPanel.Controls.Add(this.pictureBox3); - this.mainPanel.Controls.Add(this.dgvData3); - this.mainPanel.Dock = System.Windows.Forms.DockStyle.Fill; - this.mainPanel.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.mainPanel.Location = new System.Drawing.Point(0, 0); - this.mainPanel.Name = "mainPanel"; - this.mainPanel.Size = new System.Drawing.Size(1408, 489); - this.mainPanel.TabIndex = 1; + this.panel3.Controls.Add(this.pictureBox3); + this.panel3.Controls.Add(this.dgvData3); + this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.panel3.Location = new System.Drawing.Point(0, 0); + this.panel3.Name = "panel3"; + this.panel3.Size = new System.Drawing.Size(1393, 489); + this.panel3.TabIndex = 1; // // pictureBox3 // this.pictureBox3.Anchor = System.Windows.Forms.AnchorStyles.None; this.pictureBox3.Image = global::TemuKJD.Properties.Resources.loading_blue; - this.pictureBox3.Location = new System.Drawing.Point(685, 219); + this.pictureBox3.Location = new System.Drawing.Point(677, 219); this.pictureBox3.Name = "pictureBox3"; this.pictureBox3.Size = new System.Drawing.Size(50, 50); this.pictureBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -1618,7 +1666,7 @@ namespace TemuKJD.WXForms.ShopForms this.dgvData3.Name = "dgvData3"; this.dgvData3.ReadOnly = true; this.dgvData3.RowTemplate.Height = 23; - this.dgvData3.Size = new System.Drawing.Size(1408, 489); + this.dgvData3.Size = new System.Drawing.Size(1393, 489); this.dgvData3.TabIndex = 187; this.dgvData3.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvData_CellContentClick); // @@ -1812,30 +1860,30 @@ namespace TemuKJD.WXForms.ShopForms // // tabPage4 // - this.tabPage4.Controls.Add(this.panel3); + this.tabPage4.Controls.Add(this.panel4); this.tabPage4.Location = new System.Drawing.Point(2, 40); this.tabPage4.Name = "tabPage4"; - this.tabPage4.Size = new System.Drawing.Size(1408, 489); + this.tabPage4.Size = new System.Drawing.Size(1393, 489); this.tabPage4.TabIndex = 2; this.tabPage4.Text = " 配送不达标 "; this.tabPage4.UseVisualStyleBackColor = true; // - // panel3 + // panel4 // - this.panel3.Controls.Add(this.pictureBox4); - this.panel3.Controls.Add(this.dgvData4); - this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.panel3.Location = new System.Drawing.Point(0, 0); - this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(1408, 489); - this.panel3.TabIndex = 2; + this.panel4.Controls.Add(this.pictureBox4); + this.panel4.Controls.Add(this.dgvData4); + this.panel4.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.panel4.Location = new System.Drawing.Point(0, 0); + this.panel4.Name = "panel4"; + this.panel4.Size = new System.Drawing.Size(1393, 489); + this.panel4.TabIndex = 2; // // pictureBox4 // this.pictureBox4.Anchor = System.Windows.Forms.AnchorStyles.None; this.pictureBox4.Image = global::TemuKJD.Properties.Resources.loading_blue; - this.pictureBox4.Location = new System.Drawing.Point(685, 219); + this.pictureBox4.Location = new System.Drawing.Point(677, 219); this.pictureBox4.Name = "pictureBox4"; this.pictureBox4.Size = new System.Drawing.Size(50, 50); this.pictureBox4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -1890,7 +1938,7 @@ namespace TemuKJD.WXForms.ShopForms this.dgvData4.Name = "dgvData4"; this.dgvData4.ReadOnly = true; this.dgvData4.RowTemplate.Height = 23; - this.dgvData4.Size = new System.Drawing.Size(1408, 489); + this.dgvData4.Size = new System.Drawing.Size(1393, 489); this.dgvData4.TabIndex = 187; this.dgvData4.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvData_CellContentClick); // @@ -2084,23 +2132,274 @@ namespace TemuKJD.WXForms.ShopForms // // tabPage5 // + this.tabPage5.Controls.Add(this.panel5); this.tabPage5.Location = new System.Drawing.Point(2, 40); this.tabPage5.Name = "tabPage5"; - this.tabPage5.Size = new System.Drawing.Size(1408, 489); + this.tabPage5.Size = new System.Drawing.Size(1393, 489); this.tabPage5.TabIndex = 3; this.tabPage5.Text = " 物流负向反馈 "; this.tabPage5.UseVisualStyleBackColor = true; // - // chkTestNoAuditUpload + // panel5 // - this.chkTestNoAuditUpload.AutoSize = true; - this.chkTestNoAuditUpload.Location = new System.Drawing.Point(1094, 35); - this.chkTestNoAuditUpload.Name = "chkTestNoAuditUpload"; - this.chkTestNoAuditUpload.Size = new System.Drawing.Size(123, 21); - this.chkTestNoAuditUpload.TabIndex = 779; - this.chkTestNoAuditUpload.Text = "测试免审提交商品"; - this.chkTestNoAuditUpload.UseVisualStyleBackColor = true; - this.chkTestNoAuditUpload.Visible = false; + this.panel5.Controls.Add(this.pictureBox5); + this.panel5.Controls.Add(this.dgvData5); + this.panel5.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.panel5.Location = new System.Drawing.Point(0, 0); + this.panel5.Name = "panel5"; + this.panel5.Size = new System.Drawing.Size(1393, 489); + this.panel5.TabIndex = 3; + // + // pictureBox5 + // + this.pictureBox5.Anchor = System.Windows.Forms.AnchorStyles.None; + this.pictureBox5.Image = global::TemuKJD.Properties.Resources.loading_blue; + this.pictureBox5.Location = new System.Drawing.Point(677, 219); + this.pictureBox5.Name = "pictureBox5"; + this.pictureBox5.Size = new System.Drawing.Size(50, 50); + this.pictureBox5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pictureBox5.TabIndex = 780; + this.pictureBox5.TabStop = false; + this.pictureBox5.Visible = false; + // + // dgvData5 + // + this.dgvData5.AllowUserToAddRows = false; + this.dgvData5.AllowUserToDeleteRows = false; + dataGridViewCellStyle48.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvData5.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle48; + this.dgvData5.AutoRowNumber = true; + this.dgvData5.BackgroundColor = System.Drawing.Color.White; + this.dgvData5.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + dataGridViewCellStyle49.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle49.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle49.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle49.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle49.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle49.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle49.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvData5.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle49; + this.dgvData5.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dgvData5.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.dataGridViewCheckBoxColumn1, + this.dataGridViewTextBoxColumn1, + this.dataGridViewTextBoxColumn2, + this.dataGridViewLinkColumn1, + this.dataGridViewLinkColumn2, + this.dataGridViewTextBoxColumn3, + this.dataGridViewImageColumn1, + this.dataGridViewTextBoxColumn8, + this.dataGridViewTextBoxColumn11, + this.dataGridViewTextBoxColumn13, + this.dataGridViewTextBoxColumn14, + this.colDgv5OrderId, + this.dataGridViewTextBoxColumn16, + this.dataGridViewTextBoxColumn17, + this.dataGridViewTextBoxColumn18, + this.colDgv5WaybillId, + this.dataGridViewTextBoxColumn20, + this.dataGridViewTextBoxColumn21, + this.dataGridViewTextBoxColumn22, + this.dataGridViewTextBoxColumn23, + this.dataGridViewLinkColumn3, + this.dataGridViewTextBoxColumn24}); + this.dgvData5.Dock = System.Windows.Forms.DockStyle.Fill; + this.dgvData5.Location = new System.Drawing.Point(0, 0); + this.dgvData5.MultiSelectCheckBox = true; + this.dgvData5.Name = "dgvData5"; + this.dgvData5.ReadOnly = true; + this.dgvData5.RowTemplate.Height = 23; + this.dgvData5.Size = new System.Drawing.Size(1393, 489); + this.dgvData5.TabIndex = 187; + // + // dataGridViewCheckBoxColumn1 + // + this.dataGridViewCheckBoxColumn1.Frozen = true; + this.dataGridViewCheckBoxColumn1.HeaderText = "选择"; + this.dataGridViewCheckBoxColumn1.Name = "dataGridViewCheckBoxColumn1"; + this.dataGridViewCheckBoxColumn1.ReadOnly = true; + this.dataGridViewCheckBoxColumn1.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewCheckBoxColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.dataGridViewCheckBoxColumn1.Width = 30; + // + // dataGridViewTextBoxColumn1 + // + this.dataGridViewTextBoxColumn1.Frozen = true; + this.dataGridViewTextBoxColumn1.HeaderText = "店铺Id"; + this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1"; + this.dataGridViewTextBoxColumn1.ReadOnly = true; + this.dataGridViewTextBoxColumn1.Visible = false; + // + // dataGridViewTextBoxColumn2 + // + dataGridViewCellStyle50.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle50; + this.dataGridViewTextBoxColumn2.Frozen = true; + this.dataGridViewTextBoxColumn2.HeaderText = "店铺名称"; + this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2"; + this.dataGridViewTextBoxColumn2.ReadOnly = true; + // + // dataGridViewLinkColumn1 + // + this.dataGridViewLinkColumn1.HeaderText = "登录"; + this.dataGridViewLinkColumn1.Name = "dataGridViewLinkColumn1"; + this.dataGridViewLinkColumn1.ReadOnly = true; + this.dataGridViewLinkColumn1.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewLinkColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.dataGridViewLinkColumn1.Visible = false; + this.dataGridViewLinkColumn1.Width = 40; + // + // dataGridViewLinkColumn2 + // + this.dataGridViewLinkColumn2.HeaderText = "进店"; + this.dataGridViewLinkColumn2.Name = "dataGridViewLinkColumn2"; + this.dataGridViewLinkColumn2.ReadOnly = true; + this.dataGridViewLinkColumn2.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewLinkColumn2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.dataGridViewLinkColumn2.Visible = false; + this.dataGridViewLinkColumn2.Width = 40; + // + // dataGridViewTextBoxColumn3 + // + this.dataGridViewTextBoxColumn3.HeaderText = "图片地址"; + this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3"; + this.dataGridViewTextBoxColumn3.ReadOnly = true; + this.dataGridViewTextBoxColumn3.Visible = false; + // + // dataGridViewImageColumn1 + // + this.dataGridViewImageColumn1.HeaderText = "图片"; + this.dataGridViewImageColumn1.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Zoom; + this.dataGridViewImageColumn1.Name = "dataGridViewImageColumn1"; + this.dataGridViewImageColumn1.ReadOnly = true; + this.dataGridViewImageColumn1.Width = 60; + // + // dataGridViewTextBoxColumn8 + // + this.dataGridViewTextBoxColumn8.HeaderText = "商品Id"; + this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8"; + this.dataGridViewTextBoxColumn8.ReadOnly = true; + this.dataGridViewTextBoxColumn8.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewTextBoxColumn8.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.dataGridViewTextBoxColumn8.Width = 110; + // + // dataGridViewTextBoxColumn11 + // + dataGridViewCellStyle51.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewTextBoxColumn11.DefaultCellStyle = dataGridViewCellStyle51; + this.dataGridViewTextBoxColumn11.HeaderText = "商品标题"; + this.dataGridViewTextBoxColumn11.Name = "dataGridViewTextBoxColumn11"; + this.dataGridViewTextBoxColumn11.ReadOnly = true; + this.dataGridViewTextBoxColumn11.Width = 120; + // + // dataGridViewTextBoxColumn13 + // + dataGridViewCellStyle52.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewTextBoxColumn13.DefaultCellStyle = dataGridViewCellStyle52; + this.dataGridViewTextBoxColumn13.HeaderText = "数量"; + this.dataGridViewTextBoxColumn13.Name = "dataGridViewTextBoxColumn13"; + this.dataGridViewTextBoxColumn13.ReadOnly = true; + this.dataGridViewTextBoxColumn13.Width = 40; + // + // dataGridViewTextBoxColumn14 + // + this.dataGridViewTextBoxColumn14.HeaderText = "sku货号"; + this.dataGridViewTextBoxColumn14.Name = "dataGridViewTextBoxColumn14"; + this.dataGridViewTextBoxColumn14.ReadOnly = true; + this.dataGridViewTextBoxColumn14.Visible = false; + this.dataGridViewTextBoxColumn14.Width = 140; + // + // colDgv5OrderId + // + dataGridViewCellStyle53.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv5OrderId.DefaultCellStyle = dataGridViewCellStyle53; + this.colDgv5OrderId.HeaderText = "单号"; + this.colDgv5OrderId.Name = "colDgv5OrderId"; + this.colDgv5OrderId.ReadOnly = true; + this.colDgv5OrderId.Width = 145; + // + // dataGridViewTextBoxColumn16 + // + dataGridViewCellStyle54.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewTextBoxColumn16.DefaultCellStyle = dataGridViewCellStyle54; + this.dataGridViewTextBoxColumn16.HeaderText = "收货地址"; + this.dataGridViewTextBoxColumn16.Name = "dataGridViewTextBoxColumn16"; + this.dataGridViewTextBoxColumn16.ReadOnly = true; + // + // dataGridViewTextBoxColumn17 + // + dataGridViewCellStyle55.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewTextBoxColumn17.DefaultCellStyle = dataGridViewCellStyle55; + this.dataGridViewTextBoxColumn17.HeaderText = "下单时间"; + this.dataGridViewTextBoxColumn17.Name = "dataGridViewTextBoxColumn17"; + this.dataGridViewTextBoxColumn17.ReadOnly = true; + this.dataGridViewTextBoxColumn17.Width = 75; + // + // dataGridViewTextBoxColumn18 + // + dataGridViewCellStyle56.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewTextBoxColumn18.DefaultCellStyle = dataGridViewCellStyle56; + this.dataGridViewTextBoxColumn18.HeaderText = "物流公司"; + this.dataGridViewTextBoxColumn18.Name = "dataGridViewTextBoxColumn18"; + this.dataGridViewTextBoxColumn18.ReadOnly = true; + this.dataGridViewTextBoxColumn18.Width = 70; + // + // colDgv5WaybillId + // + this.colDgv5WaybillId.HeaderText = "物流单号"; + this.colDgv5WaybillId.Name = "colDgv5WaybillId"; + this.colDgv5WaybillId.ReadOnly = true; + this.colDgv5WaybillId.Width = 120; + // + // dataGridViewTextBoxColumn20 + // + dataGridViewCellStyle57.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewTextBoxColumn20.DefaultCellStyle = dataGridViewCellStyle57; + this.dataGridViewTextBoxColumn20.HeaderText = "揽收、签收时间"; + this.dataGridViewTextBoxColumn20.Name = "dataGridViewTextBoxColumn20"; + this.dataGridViewTextBoxColumn20.ReadOnly = true; + this.dataGridViewTextBoxColumn20.Width = 120; + // + // dataGridViewTextBoxColumn21 + // + dataGridViewCellStyle58.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewTextBoxColumn21.DefaultCellStyle = dataGridViewCellStyle58; + this.dataGridViewTextBoxColumn21.HeaderText = "发货、收货地"; + this.dataGridViewTextBoxColumn21.Name = "dataGridViewTextBoxColumn21"; + this.dataGridViewTextBoxColumn21.ReadOnly = true; + this.dataGridViewTextBoxColumn21.Width = 110; + // + // dataGridViewTextBoxColumn22 + // + dataGridViewCellStyle59.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewTextBoxColumn22.DefaultCellStyle = dataGridViewCellStyle59; + this.dataGridViewTextBoxColumn22.HeaderText = "配送时长"; + this.dataGridViewTextBoxColumn22.Name = "dataGridViewTextBoxColumn22"; + this.dataGridViewTextBoxColumn22.ReadOnly = true; + this.dataGridViewTextBoxColumn22.Width = 80; + // + // dataGridViewTextBoxColumn23 + // + dataGridViewCellStyle60.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewTextBoxColumn23.DefaultCellStyle = dataGridViewCellStyle60; + this.dataGridViewTextBoxColumn23.HeaderText = "补发状态"; + this.dataGridViewTextBoxColumn23.Name = "dataGridViewTextBoxColumn23"; + this.dataGridViewTextBoxColumn23.ReadOnly = true; + this.dataGridViewTextBoxColumn23.Width = 80; + // + // dataGridViewLinkColumn3 + // + this.dataGridViewLinkColumn3.HeaderText = "补发"; + this.dataGridViewLinkColumn3.Name = "dataGridViewLinkColumn3"; + this.dataGridViewLinkColumn3.ReadOnly = true; + this.dataGridViewLinkColumn3.Width = 50; + // + // dataGridViewTextBoxColumn24 + // + this.dataGridViewTextBoxColumn24.HeaderText = "备注"; + this.dataGridViewTextBoxColumn24.Name = "dataGridViewTextBoxColumn24"; + this.dataGridViewTextBoxColumn24.ReadOnly = true; // // statusBar // @@ -2132,14 +2431,123 @@ namespace TemuKJD.WXForms.ShopForms this.splitContainer3.SplitterDistance = 533; this.splitContainer3.TabIndex = 3; // - // label2 + // colSelect // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(223, 19); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(44, 17); - this.label2.TabIndex = 482; - this.label2.Text = "单号："; + this.colSelect.Frozen = true; + this.colSelect.HeaderText = "全选"; + this.colSelect.Name = "colSelect"; + this.colSelect.ReadOnly = true; + this.colSelect.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colSelect.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colSelect.Width = 28; + // + // colShopLoginName + // + this.colShopLoginName.Frozen = true; + this.colShopLoginName.HeaderText = "店铺登录名"; + this.colShopLoginName.Name = "colShopLoginName"; + this.colShopLoginName.ReadOnly = true; + this.colShopLoginName.Visible = false; + // + // colShopId + // + this.colShopId.Frozen = true; + this.colShopId.HeaderText = "店铺Id"; + this.colShopId.Name = "colShopId"; + this.colShopId.ReadOnly = true; + this.colShopId.Visible = false; + this.colShopId.Width = 55; + // + // colShopName + // + this.colShopName.FillWeight = 150F; + this.colShopName.Frozen = true; + this.colShopName.HeaderText = "店铺名称"; + this.colShopName.Name = "colShopName"; + this.colShopName.ReadOnly = true; + this.colShopName.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colShopName.Width = 75; + // + // colShopNotes + // + this.colShopNotes.HeaderText = "备注"; + this.colShopNotes.Name = "colShopNotes"; + this.colShopNotes.ReadOnly = true; + this.colShopNotes.Width = 66; + // + // colGroup + // + this.colGroup.HeaderText = "分组"; + this.colGroup.Name = "colGroup"; + this.colGroup.ReadOnly = true; + this.colGroup.Width = 66; + // + // colSelectProduct + // + this.colSelectProduct.HeaderText = "选择商品"; + this.colSelectProduct.Name = "colSelectProduct"; + this.colSelectProduct.ReadOnly = true; + this.colSelectProduct.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colSelectProduct.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colSelectProduct.Visible = false; + this.colSelectProduct.Width = 62; + // + // colLoginStatus + // + this.colLoginStatus.HeaderText = "状态"; + this.colLoginStatus.Name = "colLoginStatus"; + this.colLoginStatus.ReadOnly = true; + this.colLoginStatus.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colLoginStatus.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colLoginStatus.Width = 38; + // + // colApi + // + this.colApi.HeaderText = "Api"; + this.colApi.Name = "colApi"; + this.colApi.ReadOnly = true; + this.colApi.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colApi.Visible = false; + this.colApi.Width = 38; + // + // colCanUse + // + this.colCanUse.HeaderText = "可用"; + this.colCanUse.Name = "colCanUse"; + this.colCanUse.ReadOnly = true; + this.colCanUse.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colCanUse.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colCanUse.Visible = false; + this.colCanUse.Width = 28; + // + // colUploadCount + // + this.colUploadCount.HeaderText = "已传"; + this.colUploadCount.Name = "colUploadCount"; + this.colUploadCount.ReadOnly = true; + this.colUploadCount.Visible = false; + this.colUploadCount.Width = 38; + // + // colOnSaleNum + // + this.colOnSaleNum.HeaderText = "在售"; + this.colOnSaleNum.Name = "colOnSaleNum"; + this.colOnSaleNum.ReadOnly = true; + this.colOnSaleNum.Visible = false; + this.colOnSaleNum.Width = 38; + // + // colRemaining + // + this.colRemaining.HeaderText = "月限额"; + this.colRemaining.Name = "colRemaining"; + this.colRemaining.ReadOnly = true; + this.colRemaining.Visible = false; + // + // colMessage + // + this.colMessage.HeaderText = "消息"; + this.colMessage.Name = "colMessage"; + this.colMessage.ReadOnly = true; // // WXShopOptimizeForm // @@ -2180,13 +2588,17 @@ namespace TemuKJD.WXForms.ShopForms ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dgvData2)).EndInit(); this.tabPage3.ResumeLayout(false); - this.mainPanel.ResumeLayout(false); + this.panel3.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dgvData3)).EndInit(); this.tabPage4.ResumeLayout(false); - this.panel3.ResumeLayout(false); + this.panel4.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dgvData4)).EndInit(); + this.tabPage5.ResumeLayout(false); + this.panel5.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dgvData5)).EndInit(); this.splitContainer3.Panel1.ResumeLayout(false); this.splitContainer3.Panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).EndInit(); @@ -2204,7 +2616,6 @@ namespace TemuKJD.WXForms.ShopForms private UserComponent.DataGridViewEx dgvShop; private UserComponent.DataGridViewEx dgvData3; private UserControls.StatusBarUserControl statusBar; - private UserComponent.UcCheckBox chkTestNoAuditUpload; private System.Windows.Forms.PictureBox pbLoadingShop; private System.Windows.Forms.PictureBox pictureBox3; private System.Windows.Forms.TextBox txtFilterShopName; @@ -2218,24 +2629,11 @@ namespace TemuKJD.WXForms.ShopForms private DevComponents.DotNetBar.PanelEx btnAddSelect; private DevComponents.DotNetBar.PanelEx btnSelectOffline; private DevComponents.DotNetBar.PanelEx btnSelectOnline; - private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect; - private System.Windows.Forms.DataGridViewTextBoxColumn colShopLoginName; - private System.Windows.Forms.DataGridViewTextBoxColumn colShopId; - private System.Windows.Forms.DataGridViewTextBoxColumn colShopName; - private System.Windows.Forms.DataGridViewTextBoxColumn colShopNotes; - private System.Windows.Forms.DataGridViewLinkColumn colSelectProduct; - private System.Windows.Forms.DataGridViewLinkColumn colLoginStatus; - private System.Windows.Forms.DataGridViewLinkColumn colApi; - private System.Windows.Forms.DataGridViewCheckBoxColumn colCanUse; - private System.Windows.Forms.DataGridViewTextBoxColumn colUploadCount; - private System.Windows.Forms.DataGridViewTextBoxColumn colOnSaleNum; - private System.Windows.Forms.DataGridViewTextBoxColumn colRemaining; - private System.Windows.Forms.DataGridViewTextBoxColumn colMessage; private UserComponent.UcGroupBoxEx ucGroupBoxEx3; private DevComponents.DotNetBar.PanelEx panelEx6; private UserComponent.UcTabControl ucTabControl1; private System.Windows.Forms.TabPage tabPage3; - private System.Windows.Forms.Panel mainPanel; + private System.Windows.Forms.Panel panel3; private System.Windows.Forms.TabPage tabPage4; private System.Windows.Forms.TabPage tabPage5; private System.Windows.Forms.TabPage tabPage1; @@ -2254,7 +2652,7 @@ namespace TemuKJD.WXForms.ShopForms private UserComponent.UcCheckBox ucCheckBox3; private UserComponent.UcCheckBox ucCheckBox2; private UserComponent.UcCheckBox ucCheckBox1; - private System.Windows.Forms.Panel panel3; + private System.Windows.Forms.Panel panel4; private System.Windows.Forms.PictureBox pictureBox4; private UserComponent.DataGridViewEx dgvData4; private DevComponents.DotNetBar.PanelEx btnWaybillManage; @@ -2350,5 +2748,50 @@ namespace TemuKJD.WXForms.ShopForms private System.Windows.Forms.DataGridViewTextBoxColumn colDgv4Remark; private System.Windows.Forms.Label lblShopId; private System.Windows.Forms.Label label2; + private System.Windows.Forms.TextBox txtFilterOrderId; + private DevComponents.DotNetBar.PanelEx btnRestoreFilter; + private DevComponents.DotNetBar.PanelEx btnFilter; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.Panel panel5; + private System.Windows.Forms.PictureBox pictureBox5; + private UserComponent.DataGridViewEx dgvData5; + private System.Windows.Forms.DataGridViewCheckBoxColumn dataGridViewCheckBoxColumn1; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2; + private System.Windows.Forms.DataGridViewLinkColumn dataGridViewLinkColumn1; + private System.Windows.Forms.DataGridViewLinkColumn dataGridViewLinkColumn2; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3; + private System.Windows.Forms.DataGridViewImageColumn dataGridViewImageColumn1; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn8; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn11; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn13; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn14; + private System.Windows.Forms.DataGridViewTextBoxColumn colDgv5OrderId; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn16; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn17; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn18; + private System.Windows.Forms.DataGridViewTextBoxColumn colDgv5WaybillId; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn20; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn21; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn22; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn23; + private System.Windows.Forms.DataGridViewLinkColumn dataGridViewLinkColumn3; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn24; + private UserComponent.UcComboBoxMutiSelect cmbFilterShopGroup; + private System.Windows.Forms.Label label24; + private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect; + private System.Windows.Forms.DataGridViewTextBoxColumn colShopLoginName; + private System.Windows.Forms.DataGridViewTextBoxColumn colShopId; + private System.Windows.Forms.DataGridViewTextBoxColumn colShopName; + private System.Windows.Forms.DataGridViewTextBoxColumn colShopNotes; + private System.Windows.Forms.DataGridViewTextBoxColumn colGroup; + private System.Windows.Forms.DataGridViewLinkColumn colSelectProduct; + private System.Windows.Forms.DataGridViewLinkColumn colLoginStatus; + private System.Windows.Forms.DataGridViewLinkColumn colApi; + private System.Windows.Forms.DataGridViewCheckBoxColumn colCanUse; + private System.Windows.Forms.DataGridViewTextBoxColumn colUploadCount; + private System.Windows.Forms.DataGridViewTextBoxColumn colOnSaleNum; + private System.Windows.Forms.DataGridViewTextBoxColumn colRemaining; + private System.Windows.Forms.DataGridViewTextBoxColumn colMessage; } } \ No newline at end of file diff --git a/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.cs b/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.cs index 7c79571..52a1183 100644 --- a/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.cs +++ b/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.cs @@ -150,11 +150,15 @@ namespace TemuKJD.WXForms.ShopForms BindShop(shopEntity, selectIds); } cmbFilterShopNotes.Items.Clear(); - //cmbFilterShopNotes.Items.Add(""); foreach (var note in GlobalConfig.ShopLoginList.Select(s => s.Notes).Where(s => !s.IsNullOrEmpty()).Distinct()) { cmbFilterShopNotes.Items.Add(note); } + cmbFilterShopGroup.Items.Clear(); + foreach (var note in GlobalConfig.ShopLoginList.Select(s => s.GroupName).Where(s => !s.IsNullOrEmpty()).Distinct()) + { + cmbFilterShopGroup.Items.Add(note); + } } private void BindShop(ShopLoginInfo shopEntity, List selectShopId = null, string msg = "") @@ -179,9 +183,10 @@ namespace TemuKJD.WXForms.ShopForms shopEntity.ShopId, shopEntity.ShopAccount, shopEntity.Notes, + shopEntity.GroupName, "选择商品", canUse ? "在线" : "掉线", - "", //lstShopAuthInfo.FirstOrDefault(sa => sa.ShopId == shopEntity.ShopId)?.ExpiresTime > DateTime.Now.AddMinutes(5) ? "可用" : "过期", + GlobalConfig.lstWxShopAuthInfo.FirstOrDefault(sa => sa.ShopId == shopEntity.ShopId)?.ExpiresTime > DateTime.Now.AddMinutes(5) ? "可用" : "过期", canUse, shopEntity.AddProductRemaining, "", @@ -194,10 +199,11 @@ namespace TemuKJD.WXForms.ShopForms row.Cells["colShopLoginName"].Value = shopEntity.LoginName; row.Cells["colShopName"].Value = shopEntity.ShopAccount; row.Cells["colShopNotes"].Value = shopEntity.Notes; + row.Cells["colGroup"].Value = shopEntity.GroupName; row.Cells["colLoginStatus"].Value = canUse ? "在线" : "掉线"; row.Cells["colLoginStatus"].Style.ForeColor = canUse ? Color.Green : Color.Red; row.Cells["colCanUse"].Value = canUse; - row.Cells["colApi"].Value = ""; //lstShopAuthInfo.FirstOrDefault(sa => sa.ShopId == shopEntity.ShopId)?.ExpiresTime > DateTime.Now.AddMinutes(5) ? "可用" : "过期"; + row.Cells["colApi"].Value = GlobalConfig.lstWxShopAuthInfo.FirstOrDefault(sa => sa.ShopId == shopEntity.ShopId)?.ExpiresTime > DateTime.Now.AddMinutes(5) ? "可用" : "过期"; row.Cells["colRemaining"].Value = shopEntity.AddProductRemaining; row.Cells["colMessage"].Value = msg; } @@ -296,13 +302,18 @@ namespace TemuKJD.WXForms.ShopForms private void btnFilterShop_Click(object sender, EventArgs e) { - foreach(DataGridViewRow row in dgvShop.Rows) - { - string notes = cmbFilterShopNotes.Text.Trim().Trim(';'); - if (notes == "全部") - notes = ""; - List notesLst = notes.Split(new string[] { ";", "；", ",", "，" }, StringSplitOptions.RemoveEmptyEntries).ToList(); + string notes = cmbFilterShopNotes.Text.Trim().Trim(';'); + if (notes == "全部") + notes = ""; + List notesLst = notes.Split(new string[] { ";", "；", ",", "，" }, StringSplitOptions.RemoveEmptyEntries).ToList(); + string group = cmbFilterShopGroup.Text.Trim().Trim(';'); + if (group == "全部") + group = ""; + List groupLst = group.Split(new string[] { ";", "；", ",", "，" }, StringSplitOptions.RemoveEmptyEntries).ToList(); + + foreach (DataGridViewRow row in dgvShop.Rows) + { if (!row.Cells["colShopName"].Value.ParseToString().Contains(txtFilterShopName.Text.Trim())) { row.Visible = false; @@ -315,6 +326,12 @@ namespace TemuKJD.WXForms.ShopForms row.Cells["colSelect"].Value = false; continue; } + if (!string.IsNullOrWhiteSpace(group) && !groupLst.Contains(row.Cells["colGroup"].Value.ParseToString())) + { + row.Visible = false; + row.Cells["colSelect"].Value = false; + continue; + } row.Visible = true; } } @@ -323,6 +340,7 @@ namespace TemuKJD.WXForms.ShopForms { txtFilterShopName.Text = ""; cmbFilterShopNotes.Text = "全部"; + cmbFilterShopGroup.Text = "全部"; btnFilterShop_Click(null, null); } @@ -342,16 +360,24 @@ namespace TemuKJD.WXForms.ShopForms notes = ""; List notesLst = notes.Split(new string[] { ";", "；", ",", "，" }, StringSplitOptions.RemoveEmptyEntries).ToList(); + string group = cmbFilterShopGroup.Text.Trim().Trim(';'); + if (group == "全部") + group = ""; + List groupLst = group.Split(new string[] { ";", "；", ",", "，" }, StringSplitOptions.RemoveEmptyEntries).ToList(); + foreach (DataGridViewRow row in dgvShop.Rows) { - if (row.Visible == true) - { - if (row.Cells["colShopName"].Value.ParseToString().Contains(txtFilterShopName.Text.Trim()) && - (string.IsNullOrWhiteSpace(notes) || notesLst.Contains(row.Cells["colShopNotes"].Value.ParseToString()))) - { - row.Cells["colSelect"].Value = true; - } - } + if (row.Visible == false) + continue; + + if (!row.Cells["colShopName"].Value.ParseToString().Contains(txtFilterShopName.Text.Trim())) + continue; + if (!string.IsNullOrWhiteSpace(notes) && !notesLst.Contains(row.Cells["colShopNotes"].Value.ParseToString())) + continue; + if (!string.IsNullOrWhiteSpace(group) && !groupLst.Contains(row.Cells["colGroup"].Value.ParseToString())) + continue; + + row.Cells["colSelect"].Value = true; } } @@ -362,16 +388,24 @@ namespace TemuKJD.WXForms.ShopForms notes = ""; List notesLst = notes.Split(new string[] { ";", "；", ",", "，" }, StringSplitOptions.RemoveEmptyEntries).ToList(); + string group = cmbFilterShopGroup.Text.Trim().Trim(';'); + if (group == "全部") + group = ""; + List groupLst = group.Split(new string[] { ";", "；", ",", "，" }, StringSplitOptions.RemoveEmptyEntries).ToList(); + foreach (DataGridViewRow row in dgvShop.Rows) { - if (row.Visible == true) - { - if (row.Cells["colShopName"].Value.ParseToString().Contains(txtFilterShopName.Text.Trim()) && - (string.IsNullOrWhiteSpace(notes) || notesLst.Contains(row.Cells["colShopNotes"].Value.ParseToString()))) - { - row.Cells["colSelect"].Value = false; - } - } + if (row.Visible == false) + continue; + + if (!row.Cells["colShopName"].Value.ParseToString().Contains(txtFilterShopName.Text.Trim())) + continue; + if (!string.IsNullOrWhiteSpace(notes) && !notesLst.Contains(row.Cells["colShopNotes"].Value.ParseToString())) + continue; + if (!string.IsNullOrWhiteSpace(group) && !groupLst.Contains(row.Cells["colGroup"].Value.ParseToString())) + continue; + + row.Cells["colSelect"].Value = false; } } @@ -1967,7 +2001,7 @@ namespace TemuKJD.WXForms.ShopForms return; } orderId = orderId.Split(new string[] { "\r", "\n" }, StringSplitOptions.RemoveEmptyEntries).FirstOrDefault(); - if (!string.IsNullOrEmpty(orderId)) + if (string.IsNullOrEmpty(orderId)) { BaseMsgForm.ShowError("缺少订单编号无法补发！"); return; @@ -1981,18 +2015,18 @@ namespace TemuKJD.WXForms.ShopForms var orderId = row.Cells[$"colDgv{dgvNum}OrderId"].Value.ParseToString(); if (orderId.Contains("未获取到对应订单号")) { - BaseMsgForm.ShowError("缺少单编号无法补发！"); + BaseMsgForm.ShowError("缺少单编号无法备注！"); return; } if (orderId.Contains("获取到多条订单号")) { - BaseMsgForm.ShowError("订单编号不符合补发条件！"); + BaseMsgForm.ShowError("订单编号不符合备注条件！"); return; } orderId = orderId.Split(new string[] { "\r", "\n" }, StringSplitOptions.RemoveEmptyEntries).FirstOrDefault(); if (string.IsNullOrEmpty(orderId)) { - BaseMsgForm.ShowError("缺少订单编号无法补发！"); + BaseMsgForm.ShowError("缺少订单编号无法备注！"); return; } pnlUpdateRemark.Tag = row.Cells[$"colDgv{dgvNum}Remark"]; @@ -2069,6 +2103,36 @@ namespace TemuKJD.WXForms.ShopForms lblShopName.Text = ""; pnlUpdateRemark.Visible = false; } + + private void btnFilter_Click(object sender, EventArgs e) + { + var orderId = txtFilterOrderId.Text.Trim(); + List dgvList = new List() { dgvData1, dgvData2, dgvData3, dgvData4, dgvData5 }; + for (int i = 0; i < dgvList.Count; i++) + { + var dgvNum = i + 1; + foreach (DataGridViewRow row in dgvList[i].Rows) + { + if (row.Cells[$"colDgv{dgvNum}OrderId"].Value.ParseToString().Contains(orderId)) + row.Visible = true; + else + row.Visible = false; + } + } + } + + private void btnRestoreFilter_Click(object sender, EventArgs e) + { + txtFilterOrderId.Text = ""; + List dgvList = new List() { dgvData1, dgvData2, dgvData3, dgvData4, dgvData5 }; + for (int i = 0; i< dgvList.Count; i++) + { + foreach(DataGridViewRow row in dgvList[i].Rows) + { + row.Visible = true; + } + } + } } public static class ShopOptimize diff --git a/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.resx b/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.resx index 0fe5f3c..0e16f69 100644 --- a/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.resx +++ b/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.resx @@ -129,6 +129,9 @@ True + + True + True @@ -402,4 +405,70 @@ True + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + \ No newline at end of file diff --git a/TEMUKJD/WXForms/ShopForms/WxShopStatisticsForm.Designer.cs b/TEMUKJD/WXForms/ShopForms/WxShopStatisticsForm.Designer.cs index 30bc2f5..c9be8b4 100644 --- a/TEMUKJD/WXForms/ShopForms/WxShopStatisticsForm.Designer.cs +++ b/TEMUKJD/WXForms/ShopForms/WxShopStatisticsForm.Designer.cs @@ -34,6 +34,8 @@ namespace TemuKJD.WXForms.ShopForms System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.ucGroupBoxEx3 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); + this.cmbFilterShopGroup = new TemuKJD.UserComponent.UcComboBoxMutiSelect(); + this.label23 = new System.Windows.Forms.Label(); this.cmbFilterShopNotes = new TemuKJD.UserComponent.UcComboBoxMutiSelect(); this.label18 = new System.Windows.Forms.Label(); this.txtFilterShopName = new System.Windows.Forms.TextBox(); @@ -91,6 +93,7 @@ namespace TemuKJD.WXForms.ShopForms this.btnClose = new DevComponents.DotNetBar.PanelEx(); this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colLoginStatus = new System.Windows.Forms.DataGridViewLinkColumn(); this.colDetail = new System.Windows.Forms.DataGridViewLinkColumn(); @@ -99,6 +102,7 @@ namespace TemuKJD.WXForms.ShopForms this.colShopAccount = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colNotes = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colGroup = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colSubUser = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colOnSaleProductNumber = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colScore = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colPayCnt = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -121,9 +125,6 @@ namespace TemuKJD.WXForms.ShopForms this.colAvailableAmount = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colPendingAmount = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colDepositBalance = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); - this.cmbFilterShopGroup = new TemuKJD.UserComponent.UcComboBoxMutiSelect(); - this.label23 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -158,7 +159,7 @@ namespace TemuKJD.WXForms.ShopForms // this.splitContainer1.Panel2.Controls.Add(this.splitContainer2); this.splitContainer1.Panel2.Margin = new System.Windows.Forms.Padding(4); - this.splitContainer1.Size = new System.Drawing.Size(1235, 597); + this.splitContainer1.Size = new System.Drawing.Size(1350, 601); this.splitContainer1.SplitterDistance = 140; this.splitContainer1.TabIndex = 35; // @@ -179,13 +180,36 @@ namespace TemuKJD.WXForms.ShopForms this.ucGroupBoxEx3.Controls.Add(this.btnFliter); this.ucGroupBoxEx3.Controls.Add(this.btnSetColumn); this.ucGroupBoxEx3.Controls.Add(this.btnGetNotGet); - this.ucGroupBoxEx3.Location = new System.Drawing.Point(1002, 2); + this.ucGroupBoxEx3.Location = new System.Drawing.Point(1117, 2); this.ucGroupBoxEx3.Name = "ucGroupBoxEx3"; this.ucGroupBoxEx3.Size = new System.Drawing.Size(230, 140); this.ucGroupBoxEx3.TabIndex = 668; this.ucGroupBoxEx3.TabStop = false; this.ucGroupBoxEx3.Text = "统计查询"; // + // cmbFilterShopGroup + // + this.cmbFilterShopGroup.DefaultText = "全部"; + this.cmbFilterShopGroup.DropDownHeight = 1; + this.cmbFilterShopGroup.DropDownWidth = 1; + this.cmbFilterShopGroup.FormattingEnabled = true; + this.cmbFilterShopGroup.IntegralHeight = false; + this.cmbFilterShopGroup.Location = new System.Drawing.Point(42, 77); + this.cmbFilterShopGroup.Name = "cmbFilterShopGroup"; + this.cmbFilterShopGroup.Size = new System.Drawing.Size(141, 25); + this.cmbFilterShopGroup.TabIndex = 851; + this.cmbFilterShopGroup.Text = "全部"; + // + // label23 + // + this.label23.AutoSize = true; + this.label23.Location = new System.Drawing.Point(9, 81); + this.label23.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label23.Name = "label23"; + this.label23.Size = new System.Drawing.Size(32, 17); + this.label23.TabIndex = 852; + this.label23.Text = "分组"; + // // cmbFilterShopNotes // this.cmbFilterShopNotes.DefaultText = "全部"; @@ -363,7 +387,7 @@ namespace TemuKJD.WXForms.ShopForms this.ucGroupBoxEx1.Controls.Add(this.tableLayoutPanel1); this.ucGroupBoxEx1.Location = new System.Drawing.Point(2, 2); this.ucGroupBoxEx1.Name = "ucGroupBoxEx1"; - this.ucGroupBoxEx1.Size = new System.Drawing.Size(1000, 140); + this.ucGroupBoxEx1.Size = new System.Drawing.Size(1115, 140); this.ucGroupBoxEx1.TabIndex = 667; this.ucGroupBoxEx1.TabStop = false; this.ucGroupBoxEx1.Text = "统计汇总"; @@ -383,7 +407,7 @@ namespace TemuKJD.WXForms.ShopForms this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.00115F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.00244F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.00244F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 9.999105F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 9.999104F)); this.tableLayoutPanel1.Controls.Add(this.lblPayRefund1, 9, 1); this.tableLayoutPanel1.Controls.Add(this.label22, 9, 0); this.tableLayoutPanel1.Controls.Add(this.lblPayCnt1, 1, 1); @@ -431,7 +455,7 @@ namespace TemuKJD.WXForms.ShopForms this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 30F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 30F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(957, 115); + this.tableLayoutPanel1.Size = new System.Drawing.Size(1072, 115); this.tableLayoutPanel1.TabIndex = 435; // // lblPayRefund1 @@ -439,7 +463,7 @@ namespace TemuKJD.WXForms.ShopForms this.lblPayRefund1.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lblPayRefund1.AutoSize = true; this.lblPayRefund1.Font = new System.Drawing.Font("微软雅黑", 11F); - this.lblPayRefund1.Location = new System.Drawing.Point(858, 30); + this.lblPayRefund1.Location = new System.Drawing.Point(966, 30); this.lblPayRefund1.Name = "lblPayRefund1"; this.lblPayRefund1.Size = new System.Drawing.Size(18, 20); this.lblPayRefund1.TabIndex = 20; @@ -450,7 +474,7 @@ namespace TemuKJD.WXForms.ShopForms this.label22.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label22.AutoSize = true; this.label22.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.label22.Location = new System.Drawing.Point(858, 3); + this.label22.Location = new System.Drawing.Point(966, 3); this.label22.Name = "label22"; this.label22.Size = new System.Drawing.Size(80, 17); this.label22.TabIndex = 16; @@ -461,7 +485,7 @@ namespace TemuKJD.WXForms.ShopForms this.lblPayCnt1.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lblPayCnt1.AutoSize = true; this.lblPayCnt1.Font = new System.Drawing.Font("微软雅黑", 11F); - this.lblPayCnt1.Location = new System.Drawing.Point(98, 30); + this.lblPayCnt1.Location = new System.Drawing.Point(110, 30); this.lblPayCnt1.Name = "lblPayCnt1"; this.lblPayCnt1.Size = new System.Drawing.Size(18, 20); this.lblPayCnt1.TabIndex = 16; @@ -472,7 +496,7 @@ namespace TemuKJD.WXForms.ShopForms this.label21.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label21.AutoSize = true; this.label21.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.label21.Location = new System.Drawing.Point(98, 3); + this.label21.Location = new System.Drawing.Point(110, 3); this.label21.Name = "label21"; this.label21.Size = new System.Drawing.Size(56, 17); this.label21.TabIndex = 15; @@ -505,7 +529,7 @@ namespace TemuKJD.WXForms.ShopForms this.label6.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label6.AutoSize = true; this.label6.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.label6.Location = new System.Drawing.Point(858, 60); + this.label6.Location = new System.Drawing.Point(966, 60); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(92, 17); this.label6.TabIndex = 11; @@ -516,7 +540,7 @@ namespace TemuKJD.WXForms.ShopForms this.lblDepositBalance.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lblDepositBalance.AutoSize = true; this.lblDepositBalance.Font = new System.Drawing.Font("微软雅黑", 11F); - this.lblDepositBalance.Location = new System.Drawing.Point(858, 87); + this.lblDepositBalance.Location = new System.Drawing.Point(966, 87); this.lblDepositBalance.Name = "lblDepositBalance"; this.lblDepositBalance.Size = new System.Drawing.Size(18, 20); this.lblDepositBalance.TabIndex = 15; @@ -527,9 +551,9 @@ namespace TemuKJD.WXForms.ShopForms this.label8.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label8.AutoSize = true; this.label8.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.label8.Location = new System.Drawing.Point(763, 57); + this.label8.Location = new System.Drawing.Point(859, 60); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(80, 23); + this.label8.Size = new System.Drawing.Size(92, 17); this.label8.TabIndex = 13; this.label8.Text = "待结算金额总和"; // @@ -538,7 +562,7 @@ namespace TemuKJD.WXForms.ShopForms this.lblPendingAmount.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lblPendingAmount.AutoSize = true; this.lblPendingAmount.Font = new System.Drawing.Font("微软雅黑", 11F); - this.lblPendingAmount.Location = new System.Drawing.Point(763, 87); + this.lblPendingAmount.Location = new System.Drawing.Point(859, 87); this.lblPendingAmount.Name = "lblPendingAmount"; this.lblPendingAmount.Size = new System.Drawing.Size(18, 20); this.lblPendingAmount.TabIndex = 15; @@ -549,9 +573,9 @@ namespace TemuKJD.WXForms.ShopForms this.label7.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label7.AutoSize = true; this.label7.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.label7.Location = new System.Drawing.Point(668, 57); + this.label7.Location = new System.Drawing.Point(752, 60); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(80, 23); + this.label7.Size = new System.Drawing.Size(92, 17); this.label7.TabIndex = 12; this.label7.Text = "可提现金额总和"; // @@ -560,7 +584,7 @@ namespace TemuKJD.WXForms.ShopForms this.lblAvailableAmount.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lblAvailableAmount.AutoSize = true; this.lblAvailableAmount.Font = new System.Drawing.Font("微软雅黑", 11F); - this.lblAvailableAmount.Location = new System.Drawing.Point(668, 87); + this.lblAvailableAmount.Location = new System.Drawing.Point(752, 87); this.lblAvailableAmount.Name = "lblAvailableAmount"; this.lblAvailableAmount.Size = new System.Drawing.Size(18, 20); this.lblAvailableAmount.TabIndex = 15; @@ -571,7 +595,7 @@ namespace TemuKJD.WXForms.ShopForms this.label17.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label17.AutoSize = true; this.label17.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.label17.Location = new System.Drawing.Point(573, 60); + this.label17.Location = new System.Drawing.Point(645, 60); this.label17.Name = "label17"; this.label17.Size = new System.Drawing.Size(80, 17); this.label17.TabIndex = 25; @@ -582,7 +606,7 @@ namespace TemuKJD.WXForms.ShopForms this.lblTotalAmount.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lblTotalAmount.AutoSize = true; this.lblTotalAmount.Font = new System.Drawing.Font("微软雅黑", 11F); - this.lblTotalAmount.Location = new System.Drawing.Point(573, 87); + this.lblTotalAmount.Location = new System.Drawing.Point(645, 87); this.lblTotalAmount.Name = "lblTotalAmount"; this.lblTotalAmount.Size = new System.Drawing.Size(18, 20); this.lblTotalAmount.TabIndex = 26; @@ -593,7 +617,7 @@ namespace TemuKJD.WXForms.ShopForms this.label5.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label5.AutoSize = true; this.label5.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.label5.Location = new System.Drawing.Point(478, 60); + this.label5.Location = new System.Drawing.Point(538, 60); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(56, 17); this.label5.TabIndex = 10; @@ -604,7 +628,7 @@ namespace TemuKJD.WXForms.ShopForms this.lblPunish.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lblPunish.AutoSize = true; this.lblPunish.Font = new System.Drawing.Font("微软雅黑", 11F); - this.lblPunish.Location = new System.Drawing.Point(478, 87); + this.lblPunish.Location = new System.Drawing.Point(538, 87); this.lblPunish.Name = "lblPunish"; this.lblPunish.Size = new System.Drawing.Size(18, 20); this.lblPunish.TabIndex = 15; @@ -615,7 +639,7 @@ namespace TemuKJD.WXForms.ShopForms this.label4.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label4.AutoSize = true; this.label4.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.label4.Location = new System.Drawing.Point(383, 60); + this.label4.Location = new System.Drawing.Point(431, 60); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(32, 17); this.label4.TabIndex = 9; @@ -626,7 +650,7 @@ namespace TemuKJD.WXForms.ShopForms this.lblAfterSaleAll.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lblAfterSaleAll.AutoSize = true; this.lblAfterSaleAll.Font = new System.Drawing.Font("微软雅黑", 11F); - this.lblAfterSaleAll.Location = new System.Drawing.Point(383, 87); + this.lblAfterSaleAll.Location = new System.Drawing.Point(431, 87); this.lblAfterSaleAll.Name = "lblAfterSaleAll"; this.lblAfterSaleAll.Size = new System.Drawing.Size(18, 20); this.lblAfterSaleAll.TabIndex = 15; @@ -637,7 +661,7 @@ namespace TemuKJD.WXForms.ShopForms this.label3.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label3.AutoSize = true; this.label3.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.label3.Location = new System.Drawing.Point(288, 60); + this.label3.Location = new System.Drawing.Point(324, 60); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(56, 17); this.label3.TabIndex = 8; @@ -648,7 +672,7 @@ namespace TemuKJD.WXForms.ShopForms this.lblWaybillError.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lblWaybillError.AutoSize = true; this.lblWaybillError.Font = new System.Drawing.Font("微软雅黑", 11F); - this.lblWaybillError.Location = new System.Drawing.Point(288, 87); + this.lblWaybillError.Location = new System.Drawing.Point(324, 87); this.lblWaybillError.Name = "lblWaybillError"; this.lblWaybillError.Size = new System.Drawing.Size(18, 20); this.lblWaybillError.TabIndex = 15; @@ -659,7 +683,7 @@ namespace TemuKJD.WXForms.ShopForms this.lblOrderNum.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lblOrderNum.AutoSize = true; this.lblOrderNum.Font = new System.Drawing.Font("微软雅黑", 11F); - this.lblOrderNum.Location = new System.Drawing.Point(193, 87); + this.lblOrderNum.Location = new System.Drawing.Point(217, 87); this.lblOrderNum.Name = "lblOrderNum"; this.lblOrderNum.Size = new System.Drawing.Size(18, 20); this.lblOrderNum.TabIndex = 22; @@ -670,7 +694,7 @@ namespace TemuKJD.WXForms.ShopForms this.label14.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label14.AutoSize = true; this.label14.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.label14.Location = new System.Drawing.Point(193, 60); + this.label14.Location = new System.Drawing.Point(217, 60); this.label14.Name = "label14"; this.label14.Size = new System.Drawing.Size(44, 17); this.label14.TabIndex = 20; @@ -681,9 +705,9 @@ namespace TemuKJD.WXForms.ShopForms this.label16.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label16.AutoSize = true; this.label16.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.label16.Location = new System.Drawing.Point(98, 57); + this.label16.Location = new System.Drawing.Point(110, 60); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(82, 23); + this.label16.Size = new System.Drawing.Size(94, 17); this.label16.TabIndex = 24; this.label16.Text = "近30日退款金额"; // @@ -692,7 +716,7 @@ namespace TemuKJD.WXForms.ShopForms this.lblPayRefund30.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lblPayRefund30.AutoSize = true; this.lblPayRefund30.Font = new System.Drawing.Font("微软雅黑", 11F); - this.lblPayRefund30.Location = new System.Drawing.Point(98, 87); + this.lblPayRefund30.Location = new System.Drawing.Point(110, 87); this.lblPayRefund30.Name = "lblPayRefund30"; this.lblPayRefund30.Size = new System.Drawing.Size(18, 20); this.lblPayRefund30.TabIndex = 21; @@ -725,9 +749,9 @@ namespace TemuKJD.WXForms.ShopForms this.label12.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label12.AutoSize = true; this.label12.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.label12.Location = new System.Drawing.Point(668, 0); + this.label12.Location = new System.Drawing.Point(752, 3); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(82, 23); + this.label12.Size = new System.Drawing.Size(94, 17); this.label12.TabIndex = 8; this.label12.Text = "近30日成交金额"; // @@ -736,7 +760,7 @@ namespace TemuKJD.WXForms.ShopForms this.lblPay30.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lblPay30.AutoSize = true; this.lblPay30.Font = new System.Drawing.Font("微软雅黑", 11F); - this.lblPay30.Location = new System.Drawing.Point(668, 30); + this.lblPay30.Location = new System.Drawing.Point(752, 30); this.lblPay30.Name = "lblPay30"; this.lblPay30.Size = new System.Drawing.Size(18, 20); this.lblPay30.TabIndex = 18; @@ -747,7 +771,7 @@ namespace TemuKJD.WXForms.ShopForms this.label10.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label10.AutoSize = true; this.label10.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.label10.Location = new System.Drawing.Point(573, 3); + this.label10.Location = new System.Drawing.Point(645, 3); this.label10.Name = "label10"; this.label10.Size = new System.Drawing.Size(87, 17); this.label10.TabIndex = 13; @@ -758,7 +782,7 @@ namespace TemuKJD.WXForms.ShopForms this.lblPay7.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lblPay7.AutoSize = true; this.lblPay7.Font = new System.Drawing.Font("微软雅黑", 11F); - this.lblPay7.Location = new System.Drawing.Point(573, 30); + this.lblPay7.Location = new System.Drawing.Point(645, 30); this.lblPay7.Name = "lblPay7"; this.lblPay7.Size = new System.Drawing.Size(18, 20); this.lblPay7.TabIndex = 17; @@ -769,7 +793,7 @@ namespace TemuKJD.WXForms.ShopForms this.label20.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label20.AutoSize = true; this.label20.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.label20.Location = new System.Drawing.Point(478, 3); + this.label20.Location = new System.Drawing.Point(538, 3); this.label20.Name = "label20"; this.label20.Size = new System.Drawing.Size(80, 17); this.label20.TabIndex = 14; @@ -780,7 +804,7 @@ namespace TemuKJD.WXForms.ShopForms this.lblPay1.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lblPay1.AutoSize = true; this.lblPay1.Font = new System.Drawing.Font("微软雅黑", 11F); - this.lblPay1.Location = new System.Drawing.Point(478, 30); + this.lblPay1.Location = new System.Drawing.Point(538, 30); this.lblPay1.Name = "lblPay1"; this.lblPay1.Size = new System.Drawing.Size(18, 20); this.lblPay1.TabIndex = 18; @@ -791,7 +815,7 @@ namespace TemuKJD.WXForms.ShopForms this.label9.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label9.AutoSize = true; this.label9.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.label9.Location = new System.Drawing.Point(383, 3); + this.label9.Location = new System.Drawing.Point(431, 3); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(80, 17); this.label9.TabIndex = 14; @@ -802,7 +826,7 @@ namespace TemuKJD.WXForms.ShopForms this.lblPay.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lblPay.AutoSize = true; this.lblPay.Font = new System.Drawing.Font("微软雅黑", 11F); - this.lblPay.Location = new System.Drawing.Point(383, 30); + this.lblPay.Location = new System.Drawing.Point(431, 30); this.lblPay.Name = "lblPay"; this.lblPay.Size = new System.Drawing.Size(18, 20); this.lblPay.TabIndex = 16; @@ -813,7 +837,7 @@ namespace TemuKJD.WXForms.ShopForms this.label11.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label11.AutoSize = true; this.label11.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.label11.Location = new System.Drawing.Point(288, 3); + this.label11.Location = new System.Drawing.Point(324, 3); this.label11.Name = "label11"; this.label11.Size = new System.Drawing.Size(70, 17); this.label11.TabIndex = 14; @@ -824,7 +848,7 @@ namespace TemuKJD.WXForms.ShopForms this.lblPayCnt30.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lblPayCnt30.AutoSize = true; this.lblPayCnt30.Font = new System.Drawing.Font("微软雅黑", 11F); - this.lblPayCnt30.Location = new System.Drawing.Point(288, 30); + this.lblPayCnt30.Location = new System.Drawing.Point(324, 30); this.lblPayCnt30.Name = "lblPayCnt30"; this.lblPayCnt30.Size = new System.Drawing.Size(18, 20); this.lblPayCnt30.TabIndex = 16; @@ -835,7 +859,7 @@ namespace TemuKJD.WXForms.ShopForms this.label2.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label2.AutoSize = true; this.label2.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.label2.Location = new System.Drawing.Point(193, 3); + this.label2.Location = new System.Drawing.Point(217, 3); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(63, 17); this.label2.TabIndex = 7; @@ -846,7 +870,7 @@ namespace TemuKJD.WXForms.ShopForms this.lblPayCnt7.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lblPayCnt7.AutoSize = true; this.lblPayCnt7.Font = new System.Drawing.Font("微软雅黑", 11F); - this.lblPayCnt7.Location = new System.Drawing.Point(193, 30); + this.lblPayCnt7.Location = new System.Drawing.Point(217, 30); this.lblPayCnt7.Name = "lblPayCnt7"; this.lblPayCnt7.Size = new System.Drawing.Size(18, 20); this.lblPayCnt7.TabIndex = 15; @@ -857,7 +881,7 @@ namespace TemuKJD.WXForms.ShopForms this.label13.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label13.AutoSize = true; this.label13.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.label13.Location = new System.Drawing.Point(763, 3); + this.label13.Location = new System.Drawing.Point(859, 3); this.label13.Name = "label13"; this.label13.Size = new System.Drawing.Size(80, 17); this.label13.TabIndex = 15; @@ -868,7 +892,7 @@ namespace TemuKJD.WXForms.ShopForms this.lblPayRefund.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lblPayRefund.AutoSize = true; this.lblPayRefund.Font = new System.Drawing.Font("微软雅黑", 11F); - this.lblPayRefund.Location = new System.Drawing.Point(763, 30); + this.lblPayRefund.Location = new System.Drawing.Point(859, 30); this.lblPayRefund.Name = "lblPayRefund"; this.lblPayRefund.Size = new System.Drawing.Size(18, 20); this.lblPayRefund.TabIndex = 19; @@ -894,15 +918,15 @@ namespace TemuKJD.WXForms.ShopForms // splitContainer2.Panel2 // this.splitContainer2.Panel2.Controls.Add(this.statusBar); - this.splitContainer2.Size = new System.Drawing.Size(1235, 453); - this.splitContainer2.SplitterDistance = 423; + this.splitContainer2.Size = new System.Drawing.Size(1350, 457); + this.splitContainer2.SplitterDistance = 427; this.splitContainer2.TabIndex = 0; // // pbLoading // this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None; this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue; - this.pbLoading.Location = new System.Drawing.Point(592, 186); + this.pbLoading.Location = new System.Drawing.Point(650, 188); this.pbLoading.Name = "pbLoading"; this.pbLoading.Size = new System.Drawing.Size(50, 50); this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -919,7 +943,7 @@ namespace TemuKJD.WXForms.ShopForms this.panel1.Controls.Add(this.flowLayoutPanel1); this.panel1.Location = new System.Drawing.Point(98, 65); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(1039, 154); + this.panel1.Size = new System.Drawing.Size(1154, 154); this.panel1.TabIndex = 9; this.panel1.Visible = false; // @@ -930,7 +954,7 @@ namespace TemuKJD.WXForms.ShopForms this.btnClose.Cursor = System.Windows.Forms.Cursors.Hand; this.btnClose.DisabledBackColor = System.Drawing.Color.Empty; this.btnClose.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnClose.Location = new System.Drawing.Point(950, 118); + this.btnClose.Location = new System.Drawing.Point(1065, 118); this.btnClose.Name = "btnClose"; this.btnClose.Size = new System.Drawing.Size(58, 23); this.btnClose.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -955,7 +979,7 @@ namespace TemuKJD.WXForms.ShopForms | System.Windows.Forms.AnchorStyles.Right))); this.flowLayoutPanel1.Location = new System.Drawing.Point(24, 17); this.flowLayoutPanel1.Name = "flowLayoutPanel1"; - this.flowLayoutPanel1.Size = new System.Drawing.Size(984, 95); + this.flowLayoutPanel1.Size = new System.Drawing.Size(1099, 95); this.flowLayoutPanel1.TabIndex = 8; // // dgvShop @@ -985,6 +1009,7 @@ namespace TemuKJD.WXForms.ShopForms this.colShopAccount, this.colNotes, this.colGroup, + this.colSubUser, this.colOnSaleProductNumber, this.colScore, this.colPayCnt, @@ -1014,10 +1039,21 @@ namespace TemuKJD.WXForms.ShopForms this.dgvShop.ReadOnly = true; this.dgvShop.RowHeadersWidth = 36; this.dgvShop.RowTemplate.Height = 23; - this.dgvShop.Size = new System.Drawing.Size(1227, 423); + this.dgvShop.Size = new System.Drawing.Size(1342, 427); this.dgvShop.TabIndex = 5; this.dgvShop.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellContentClick); // + // statusBar + // + this.statusBar.BackColor = System.Drawing.Color.White; + this.statusBar.Dock = System.Windows.Forms.DockStyle.Fill; + this.statusBar.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.statusBar.Location = new System.Drawing.Point(0, 0); + this.statusBar.Margin = new System.Windows.Forms.Padding(0); + this.statusBar.Name = "statusBar"; + this.statusBar.Size = new System.Drawing.Size(1350, 26); + this.statusBar.TabIndex = 1; + // // colSelect // this.colSelect.FillWeight = 22F; @@ -1085,6 +1121,12 @@ namespace TemuKJD.WXForms.ShopForms this.colGroup.ReadOnly = true; this.colGroup.Width = 68; // + // colSubUser + // + this.colSubUser.HeaderText = "子账户"; + this.colSubUser.Name = "colSubUser"; + this.colSubUser.ReadOnly = true; + // // colOnSaleProductNumber // this.colOnSaleProductNumber.FillWeight = 60F; @@ -1245,46 +1287,12 @@ namespace TemuKJD.WXForms.ShopForms this.colDepositBalance.HeaderText = "保证金"; this.colDepositBalance.Name = "colDepositBalance"; this.colDepositBalance.ReadOnly = true; - this.colDepositBalance.Width = 60; - // - // statusBar - // - this.statusBar.BackColor = System.Drawing.Color.White; - this.statusBar.Dock = System.Windows.Forms.DockStyle.Fill; - this.statusBar.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.statusBar.Location = new System.Drawing.Point(0, 0); - this.statusBar.Margin = new System.Windows.Forms.Padding(0); - this.statusBar.Name = "statusBar"; - this.statusBar.Size = new System.Drawing.Size(1235, 26); - this.statusBar.TabIndex = 1; - // - // cmbFilterShopGroup - // - this.cmbFilterShopGroup.DefaultText = "全部"; - this.cmbFilterShopGroup.DropDownHeight = 1; - this.cmbFilterShopGroup.DropDownWidth = 1; - this.cmbFilterShopGroup.FormattingEnabled = true; - this.cmbFilterShopGroup.IntegralHeight = false; - this.cmbFilterShopGroup.Location = new System.Drawing.Point(42, 77); - this.cmbFilterShopGroup.Name = "cmbFilterShopGroup"; - this.cmbFilterShopGroup.Size = new System.Drawing.Size(141, 25); - this.cmbFilterShopGroup.TabIndex = 851; - this.cmbFilterShopGroup.Text = "全部"; - // - // label23 - // - this.label23.AutoSize = true; - this.label23.Location = new System.Drawing.Point(9, 81); - this.label23.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.label23.Name = "label23"; - this.label23.Size = new System.Drawing.Size(32, 17); - this.label23.TabIndex = 852; - this.label23.Text = "分组"; + this.colDepositBalance.Width = 80; // // WxShopStatisticsForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.ClientSize = new System.Drawing.Size(1235, 597); + this.ClientSize = new System.Drawing.Size(1350, 601); this.Controls.Add(this.splitContainer1); this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.KeyPreview = true; @@ -1374,6 +1382,8 @@ namespace TemuKJD.WXForms.ShopForms private System.Windows.Forms.Label label21; private System.Windows.Forms.Label lblPayRefund1; private System.Windows.Forms.Label label22; + private UserComponent.UcComboBoxMutiSelect cmbFilterShopGroup; + private System.Windows.Forms.Label label23; private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect; private System.Windows.Forms.DataGridViewLinkColumn colLoginStatus; private System.Windows.Forms.DataGridViewLinkColumn colDetail; @@ -1382,6 +1392,7 @@ namespace TemuKJD.WXForms.ShopForms private System.Windows.Forms.DataGridViewTextBoxColumn colShopAccount; private System.Windows.Forms.DataGridViewTextBoxColumn colNotes; private System.Windows.Forms.DataGridViewTextBoxColumn colGroup; + private System.Windows.Forms.DataGridViewTextBoxColumn colSubUser; private System.Windows.Forms.DataGridViewTextBoxColumn colOnSaleProductNumber; private System.Windows.Forms.DataGridViewTextBoxColumn colScore; private System.Windows.Forms.DataGridViewTextBoxColumn colPayCnt; @@ -1404,7 +1415,5 @@ namespace TemuKJD.WXForms.ShopForms private System.Windows.Forms.DataGridViewTextBoxColumn colAvailableAmount; private System.Windows.Forms.DataGridViewTextBoxColumn colPendingAmount; private System.Windows.Forms.DataGridViewTextBoxColumn colDepositBalance; - private UserComponent.UcComboBoxMutiSelect cmbFilterShopGroup; - private System.Windows.Forms.Label label23; } } \ No newline at end of file diff --git a/TEMUKJD/WXForms/ShopForms/WxShopStatisticsForm.cs b/TEMUKJD/WXForms/ShopForms/WxShopStatisticsForm.cs index 1604de1..2730204 100644 --- a/TEMUKJD/WXForms/ShopForms/WxShopStatisticsForm.cs +++ b/TEMUKJD/WXForms/ShopForms/WxShopStatisticsForm.cs @@ -270,6 +270,10 @@ namespace TemuKJD.WXForms.ShopForms bool canUse = shopEntity.LoginStatus == "登录成功"; var row = dgvShop.Rows.Cast().FirstOrDefault( p => p.Cells.GetCellValueFromColumnName("colShopId").ParseToString() == shopEntity.ShopId); + + var subUserNames = shopEntity.SubUserName.Split(',').Where(su => !string.IsNullOrEmpty(su)); + var subUsers = WXSubAccountShopEditForm.lstAllSubAccount.Where(su => subUserNames.Contains(su.user_name)); + if (row == null) { int rowId = this.dgvShop.Rows.Add( @@ -281,6 +285,7 @@ namespace TemuKJD.WXForms.ShopForms shopEntity.ShopAccount, shopEntity.Notes, shopEntity.GroupName, + string.Join(",", subUsers.Select(s => s.nick_name)), statistics.ProdCount.ParseToNullableInt(), // 在售商品 statistics.curScoreValue.ParseToNullableDecimal(), // 店铺体验分 statistics.WxShopSaleInfoToday.pay_order_cnt, // 今日订单 @@ -324,6 +329,7 @@ namespace TemuKJD.WXForms.ShopForms row.Cells["colShopAccount"].Value = shopEntity.ShopAccount; row.Cells["colNotes"].Value = shopEntity.Notes; row.Cells["colGroup"].Value = shopEntity.GroupName; + row.Cells["colSubUser"].Value = string.Join(",", subUsers.Select(s => s.nick_name)); row.Cells["colOnSaleProductNumber"].Value = statistics.ProdCount.ParseToNullableInt(); // 商品数量 row.Cells["colScore"].Value = statistics.curScoreValue.ParseToNullableDecimal(); // 店铺体验分 row.Cells["colPayCnt"].Value = statistics.WxShopSaleInfoToday.pay_order_cnt; // 今日订单 diff --git a/TEMUKJD/WXForms/ShopForms/WxShopStatisticsForm.resx b/TEMUKJD/WXForms/ShopForms/WxShopStatisticsForm.resx index b540f51..5018b0c 100644 --- a/TEMUKJD/WXForms/ShopForms/WxShopStatisticsForm.resx +++ b/TEMUKJD/WXForms/ShopForms/WxShopStatisticsForm.resx @@ -141,6 +141,9 @@ True + + True + True diff --git a/TEMUKJD/WXForms/TalkForms/OtherBuyerOrderListForm.Designer.cs b/TEMUKJD/WXForms/TalkForms/OtherBuyerOrderListForm.Designer.cs new file mode 100644 index 0000000..37a29fc --- /dev/null +++ b/TEMUKJD/WXForms/TalkForms/OtherBuyerOrderListForm.Designer.cs @@ -0,0 +1,451 @@ + +namespace TemuKJD.WXForms.TalkForms +{ + partial class OtherBuyerOrderListForm + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(OtherBuyerOrderListForm)); + this.panel1 = new System.Windows.Forms.Panel(); + this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.cmbBuyerName = new System.Windows.Forms.ComboBox(); + this.txtOrderAmount = new System.Windows.Forms.TextBox(); + this.label4 = new System.Windows.Forms.Label(); + this.txtExpressSn = new System.Windows.Forms.TextBox(); + this.label3 = new System.Windows.Forms.Label(); + this.txtBuyerOrderSn = new System.Windows.Forms.TextBox(); + this.label1 = new System.Windows.Forms.Label(); + this.btnSendOrder = new DevComponents.DotNetBar.PanelEx(); + this.btnRestore = new DevComponents.DotNetBar.PanelEx(); + this.label2 = new System.Windows.Forms.Label(); + this.dgvPddBuyerOrder = new TemuKJD.UserComponent.DataGridViewEx(); + this.dataGridViewCheckBoxColumn1 = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.colOBuyerId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colOBuyerName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colOOtherOrderSn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colOOrderTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colOImgUrl = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colOImg = new System.Windows.Forms.DataGridViewImageColumn(); + this.colOGoodsInfo = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colOOrderAmount = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colOStatus = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colOExpressName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colOExpressId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colOMsg = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colSend = new System.Windows.Forms.DataGridViewLinkColumn(); + this.colAfterSale = new System.Windows.Forms.DataGridViewLinkColumn(); + this.panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); + this.splitContainer1.Panel1.SuspendLayout(); + this.splitContainer1.Panel2.SuspendLayout(); + this.splitContainer1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dgvPddBuyerOrder)).BeginInit(); + this.SuspendLayout(); + // + // panel1 + // + this.panel1.BackColor = System.Drawing.Color.White; + this.panel1.Controls.Add(this.splitContainer1); + this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel1.Location = new System.Drawing.Point(1, 33); + this.panel1.Name = "panel1"; + this.panel1.Padding = new System.Windows.Forms.Padding(4); + this.panel1.Size = new System.Drawing.Size(907, 483); + this.panel1.TabIndex = 1; + // + // splitContainer1 + // + this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer1.Location = new System.Drawing.Point(4, 4); + this.splitContainer1.Name = "splitContainer1"; + this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal; + // + // splitContainer1.Panel1 + // + this.splitContainer1.Panel1.Controls.Add(this.cmbBuyerName); + this.splitContainer1.Panel1.Controls.Add(this.txtOrderAmount); + this.splitContainer1.Panel1.Controls.Add(this.label4); + this.splitContainer1.Panel1.Controls.Add(this.txtExpressSn); + this.splitContainer1.Panel1.Controls.Add(this.label3); + this.splitContainer1.Panel1.Controls.Add(this.txtBuyerOrderSn); + this.splitContainer1.Panel1.Controls.Add(this.label1); + this.splitContainer1.Panel1.Controls.Add(this.btnSendOrder); + this.splitContainer1.Panel1.Controls.Add(this.btnRestore); + this.splitContainer1.Panel1.Controls.Add(this.label2); + // + // splitContainer1.Panel2 + // + this.splitContainer1.Panel2.Controls.Add(this.dgvPddBuyerOrder); + this.splitContainer1.Size = new System.Drawing.Size(899, 475); + this.splitContainer1.SplitterDistance = 77; + this.splitContainer1.TabIndex = 0; + // + // cmbBuyerName + // + this.cmbBuyerName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.cmbBuyerName.FormattingEnabled = true; + this.cmbBuyerName.Location = new System.Drawing.Point(430, 11); + this.cmbBuyerName.Name = "cmbBuyerName"; + this.cmbBuyerName.Size = new System.Drawing.Size(160, 25); + this.cmbBuyerName.TabIndex = 954; + // + // txtOrderAmount + // + this.txtOrderAmount.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.txtOrderAmount.Location = new System.Drawing.Point(657, 12); + this.txtOrderAmount.Name = "txtOrderAmount"; + this.txtOrderAmount.Size = new System.Drawing.Size(160, 23); + this.txtOrderAmount.TabIndex = 947; + // + // label4 + // + this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(601, 15); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(56, 17); + this.label4.TabIndex = 946; + this.label4.Text = "拍单金额"; + // + // txtExpressSn + // + this.txtExpressSn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.txtExpressSn.Location = new System.Drawing.Point(657, 41); + this.txtExpressSn.Name = "txtExpressSn"; + this.txtExpressSn.Size = new System.Drawing.Size(160, 23); + this.txtExpressSn.TabIndex = 945; + // + // label3 + // + this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(601, 44); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(56, 17); + this.label3.TabIndex = 944; + this.label3.Text = "物流单号"; + // + // txtBuyerOrderSn + // + this.txtBuyerOrderSn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.txtBuyerOrderSn.Location = new System.Drawing.Point(430, 41); + this.txtBuyerOrderSn.Name = "txtBuyerOrderSn"; + this.txtBuyerOrderSn.Size = new System.Drawing.Size(160, 23); + this.txtBuyerOrderSn.TabIndex = 942; + // + // label1 + // + this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(374, 15); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(56, 17); + this.label1.TabIndex = 941; + this.label1.Text = "买手名称"; + // + // btnSendOrder + // + this.btnSendOrder.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnSendOrder.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnSendOrder.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnSendOrder.DisabledBackColor = System.Drawing.Color.Empty; + this.btnSendOrder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnSendOrder.Location = new System.Drawing.Point(823, 12); + this.btnSendOrder.Name = "btnSendOrder"; + this.btnSendOrder.Size = new System.Drawing.Size(57, 23); + this.btnSendOrder.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnSendOrder.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnSendOrder.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnSendOrder.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnSendOrder.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnSendOrder.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnSendOrder.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnSendOrder.Style.GradientAngle = 90; + this.btnSendOrder.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnSendOrder.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnSendOrder.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnSendOrder.TabIndex = 940; + this.btnSendOrder.Text = "发送订单"; + this.btnSendOrder.Click += new System.EventHandler(this.btnSendOrder_Click); + // + // btnRestore + // + this.btnRestore.CanvasColor = System.Drawing.SystemColors.Control; + this.btnRestore.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnRestore.DisabledBackColor = System.Drawing.Color.Empty; + this.btnRestore.Location = new System.Drawing.Point(3, 3); + this.btnRestore.Name = "btnRestore"; + this.btnRestore.Size = new System.Drawing.Size(45, 23); + this.btnRestore.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnRestore.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnRestore.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnRestore.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.btnRestore.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnRestore.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.btnRestore.Style.GradientAngle = 90; + this.btnRestore.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; + this.btnRestore.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnRestore.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnRestore.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnRestore.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.btnRestore.TabIndex = 939; + this.btnRestore.Text = "还原"; + this.btnRestore.Visible = false; + // + // label2 + // + this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(362, 44); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(68, 17); + this.label2.TabIndex = 943; + this.label2.Text = "拍单订单号"; + // + // dgvPddBuyerOrder + // + this.dgvPddBuyerOrder.AllowUserToAddRows = false; + this.dgvPddBuyerOrder.AllowUserToDeleteRows = false; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvPddBuyerOrder.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + this.dgvPddBuyerOrder.AutoRowNumber = true; + this.dgvPddBuyerOrder.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dgvPddBuyerOrder.BackgroundColor = System.Drawing.Color.White; + this.dgvPddBuyerOrder.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvPddBuyerOrder.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; + this.dgvPddBuyerOrder.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dgvPddBuyerOrder.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.dataGridViewCheckBoxColumn1, + this.colOBuyerId, + this.colOBuyerName, + this.colOOtherOrderSn, + this.colOOrderTime, + this.colOImgUrl, + this.colOImg, + this.colOGoodsInfo, + this.colOOrderAmount, + this.colOStatus, + this.colOExpressName, + this.colOExpressId, + this.colOMsg, + this.colSend, + this.colAfterSale}); + this.dgvPddBuyerOrder.Dock = System.Windows.Forms.DockStyle.Fill; + this.dgvPddBuyerOrder.Location = new System.Drawing.Point(0, 0); + this.dgvPddBuyerOrder.MultiSelectCheckBox = true; + this.dgvPddBuyerOrder.Name = "dgvPddBuyerOrder"; + this.dgvPddBuyerOrder.ReadOnly = true; + this.dgvPddBuyerOrder.RowTemplate.Height = 23; + this.dgvPddBuyerOrder.Size = new System.Drawing.Size(899, 394); + this.dgvPddBuyerOrder.TabIndex = 887; + this.dgvPddBuyerOrder.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvPddBuyerOrder_CellContentClick); + // + // dataGridViewCheckBoxColumn1 + // + this.dataGridViewCheckBoxColumn1.FillWeight = 26F; + this.dataGridViewCheckBoxColumn1.HeaderText = "选"; + this.dataGridViewCheckBoxColumn1.Name = "dataGridViewCheckBoxColumn1"; + this.dataGridViewCheckBoxColumn1.ReadOnly = true; + this.dataGridViewCheckBoxColumn1.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewCheckBoxColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + // + // colOBuyerId + // + this.colOBuyerId.HeaderText = "买手编号"; + this.colOBuyerId.Name = "colOBuyerId"; + this.colOBuyerId.ReadOnly = true; + this.colOBuyerId.Visible = false; + // + // colOBuyerName + // + this.colOBuyerName.FillWeight = 70F; + this.colOBuyerName.HeaderText = "买手名称"; + this.colOBuyerName.Name = "colOBuyerName"; + this.colOBuyerName.ReadOnly = true; + // + // colOOtherOrderSn + // + this.colOOtherOrderSn.HeaderText = "拍单订单号"; + this.colOOtherOrderSn.Name = "colOOtherOrderSn"; + this.colOOtherOrderSn.ReadOnly = true; + // + // colOOrderTime + // + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colOOrderTime.DefaultCellStyle = dataGridViewCellStyle3; + this.colOOrderTime.FillWeight = 70F; + this.colOOrderTime.HeaderText = "拍单时间"; + this.colOOrderTime.Name = "colOOrderTime"; + this.colOOrderTime.ReadOnly = true; + this.colOOrderTime.Visible = false; + // + // colOImgUrl + // + this.colOImgUrl.HeaderText = "图片路径"; + this.colOImgUrl.Name = "colOImgUrl"; + this.colOImgUrl.ReadOnly = true; + this.colOImgUrl.Visible = false; + // + // colOImg + // + this.colOImg.FillWeight = 35F; + this.colOImg.HeaderText = "订单图片"; + this.colOImg.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Zoom; + this.colOImg.Name = "colOImg"; + this.colOImg.ReadOnly = true; + this.colOImg.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colOImg.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colOImg.Visible = false; + // + // colOGoodsInfo + // + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colOGoodsInfo.DefaultCellStyle = dataGridViewCellStyle4; + this.colOGoodsInfo.FillWeight = 140F; + this.colOGoodsInfo.HeaderText = "商品信息"; + this.colOGoodsInfo.Name = "colOGoodsInfo"; + this.colOGoodsInfo.ReadOnly = true; + this.colOGoodsInfo.Visible = false; + // + // colOOrderAmount + // + this.colOOrderAmount.FillWeight = 50F; + this.colOOrderAmount.HeaderText = "金额"; + this.colOOrderAmount.Name = "colOOrderAmount"; + this.colOOrderAmount.ReadOnly = true; + // + // colOStatus + // + this.colOStatus.HeaderText = "订单状态"; + this.colOStatus.Name = "colOStatus"; + this.colOStatus.ReadOnly = true; + this.colOStatus.Visible = false; + // + // colOExpressName + // + this.colOExpressName.FillWeight = 70F; + this.colOExpressName.HeaderText = "物流名称"; + this.colOExpressName.Name = "colOExpressName"; + this.colOExpressName.ReadOnly = true; + // + // colOExpressId + // + this.colOExpressId.HeaderText = "物流单号"; + this.colOExpressId.Name = "colOExpressId"; + this.colOExpressId.ReadOnly = true; + // + // colOMsg + // + this.colOMsg.HeaderText = "订单信息"; + this.colOMsg.Name = "colOMsg"; + this.colOMsg.ReadOnly = true; + // + // colSend + // + this.colSend.FillWeight = 50F; + this.colSend.HeaderText = "发送"; + this.colSend.Name = "colSend"; + this.colSend.ReadOnly = true; + this.colSend.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colSend.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + // + // colAfterSale + // + this.colAfterSale.FillWeight = 50F; + this.colAfterSale.HeaderText = "退货"; + this.colAfterSale.Name = "colAfterSale"; + this.colAfterSale.ReadOnly = true; + this.colAfterSale.Visible = false; + // + // OtherBuyerOrderListForm + // + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; + this.ClientSize = new System.Drawing.Size(909, 517); + this.Controls.Add(this.panel1); + this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.KeyPreview = true; + this.Name = "OtherBuyerOrderListForm"; + this.Text = "其他平台买手单发货"; + this.TitleText = "其他平台买手单发货"; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.OtherBuyerOrderListForm_FormClosing); + this.Load += new System.EventHandler(this.OtherBuyerOrderListForm_Load); + this.Controls.SetChildIndex(this.panel1, 0); + this.panel1.ResumeLayout(false); + this.splitContainer1.Panel1.ResumeLayout(false); + this.splitContainer1.Panel1.PerformLayout(); + this.splitContainer1.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); + this.splitContainer1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dgvPddBuyerOrder)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.SplitContainer splitContainer1; + private UserComponent.DataGridViewEx dgvPddBuyerOrder; + private System.Windows.Forms.TextBox txtExpressSn; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.TextBox txtBuyerOrderSn; + private System.Windows.Forms.Label label1; + private DevComponents.DotNetBar.PanelEx btnSendOrder; + private DevComponents.DotNetBar.PanelEx btnRestore; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.TextBox txtOrderAmount; + private System.Windows.Forms.DataGridViewCheckBoxColumn dataGridViewCheckBoxColumn1; + private System.Windows.Forms.DataGridViewTextBoxColumn colOBuyerId; + private System.Windows.Forms.DataGridViewTextBoxColumn colOBuyerName; + private System.Windows.Forms.DataGridViewTextBoxColumn colOOtherOrderSn; + private System.Windows.Forms.DataGridViewTextBoxColumn colOOrderTime; + private System.Windows.Forms.DataGridViewTextBoxColumn colOImgUrl; + private System.Windows.Forms.DataGridViewImageColumn colOImg; + private System.Windows.Forms.DataGridViewTextBoxColumn colOGoodsInfo; + private System.Windows.Forms.DataGridViewTextBoxColumn colOOrderAmount; + private System.Windows.Forms.DataGridViewTextBoxColumn colOStatus; + private System.Windows.Forms.DataGridViewTextBoxColumn colOExpressName; + private System.Windows.Forms.DataGridViewTextBoxColumn colOExpressId; + private System.Windows.Forms.DataGridViewTextBoxColumn colOMsg; + private System.Windows.Forms.DataGridViewLinkColumn colSend; + private System.Windows.Forms.DataGridViewLinkColumn colAfterSale; + private System.Windows.Forms.ComboBox cmbBuyerName; + } +} \ No newline at end of file diff --git a/TEMUKJD/WXForms/TalkForms/OtherBuyerOrderListForm.cs b/TEMUKJD/WXForms/TalkForms/OtherBuyerOrderListForm.cs new file mode 100644 index 0000000..6a09e0a --- /dev/null +++ b/TEMUKJD/WXForms/TalkForms/OtherBuyerOrderListForm.cs @@ -0,0 +1,372 @@ +using AllBase; +using AllBase.Model.Result.PDDResult; +using NaiBa.Util; +using NaiBa.Util.Extension; +using Newtonsoft.Json.Linq; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading; +using System.Threading.Tasks; +using System.Windows.Forms; +using TemuKJD.BaseForms; +using TemuKJD.BLL; +using TemuKJD.Extension; +using TemuKJD.ToolForms; + +namespace TemuKJD.WXForms.TalkForms +{ + public partial class OtherBuyerOrderListForm : BaseForms.BaseGeneralForm + { + public static OtherBuyerOrderListForm Instance { get; set; } = null; + ConcurrentList lstOtherBuyerOrderInfoLite { get; set; } = new ConcurrentList(); + bool isInitOrder = false; + + public OtherBuyerOrderListForm() + { + InitializeComponent(); + Instance = this; + } + + private void OtherBuyerOrderListForm_Load(object sender, EventArgs e) + { + lstOtherBuyerOrderInfoLite = NaiBa.Util.Helper.ConfigHelper.LoadConfig>("other_buyer_order_list"); + if (lstOtherBuyerOrderInfoLite == null) + lstOtherBuyerOrderInfoLite = new ConcurrentList(); + lstOtherBuyerOrderInfoLite.RemoveAll(o => o.order_time < BaseClass.DateTimeToTimestampSeconds(DateTime.Now.AddMonths(-1))); + + foreach (var buyer in lstOtherBuyerOrderInfoLite.Select(o => o.buyerName).Where(o => !o.IsNullOrEmpty()).Distinct().ToList()) + { + cmbBuyerName.Items.Add(buyer); + } + ShowExistOrder(); + } + + void ShowExistOrder() + { + isInitOrder = true; + //Task.Run(() => { + int index = 0; + foreach (var order in lstOtherBuyerOrderInfoLite) + { + if (index % 100 == 0) + Thread.Sleep(1); + index++; + Invoke(new Action(() => + { + ShowOrder(order); + })); + } + isInitOrder = false; + //}); + } + + void ShowOrder(PddBuyerOrderInfoLite order) + { + if (order == null) + return; + + var row = dgvPddBuyerOrder.Rows.Cast().FirstOrDefault(p => p.Cells.GetCellValueFromColumnName("colOOtherOrderSn").ParseToString() == order.order_sn); + if (row == null) + { + var rowIndex = this.dgvPddBuyerOrder.Rows.Add( + false, + order.buyerId, + order.buyerName, + order.order_sn, + order.order_time == null ? "" : BaseClass.StampToDateTime(order.order_time.ParseToInt()).ToString("yy-MM-dd HH:ss"), + "", // 图片路径, + DataGridViewExtension.defaultBitmap, // 订单图片 + order.order_Goods == null ? "" : string.Join("\r\n", order.order_Goods.Select(g => g.goods_name + " x" + g.goods_number)), // 商品信息 + order.order_amount * 0.01, + order.order_status_prompt, + order.outExpressCompanyName, + order.tracking_number, + order.sendStatus, + "发送", + "退货" + ); + row = dgvPddBuyerOrder.Rows[rowIndex]; + row.Height = 40; + + } + else + { + //row.Cells["colOSelect"].Value = selectIds.Contains(buyer.buyer_id); + row.Cells["colOBuyerId"].Value = order.buyerId; + row.Cells["colOBuyerName"].Value = order.buyerName; + row.Cells["colOOtherOrderSn"].Value = order.order_sn; + row.Cells["colOOrderTime"].Value = order.order_time == null ? "" : BaseClass.StampToDateTime(order.order_time.ParseToInt()).ToString("yy-MM-dd HH:ss"); + //row.Cells["colOImgUrl"].Value = ""; + // 商品信息 + row.Cells["colOGoodsInfo"].Value = order.order_Goods == null ? "" : string.Join("\r\n", order.order_Goods.Select(g => g.goods_name + " x" + g.goods_number)); + row.Cells["colOOrderAmount"].Value = order.order_amount * 0.01; + row.Cells["colOStatus"].Value = order.order_status_prompt; + row.Cells["colOExpressName"].Value = order.outExpressCompanyName; + row.Cells["colOExpressId"].Value = order.tracking_number; + row.Cells["colOMsg"].Value = order.sendStatus; + } + // + if (order.outExpressCompanyName == "物流名称获取失败") + row.Cells["colOExpressName"].Style.ForeColor = Color.Orange; + else + row.Cells["colOExpressName"].Style.ForeColor = Control.DefaultForeColor; + + if (order.order_status_prompt.Contains("交易成功")) + { + row.Cells["colOMsg"].Value = "[完]" + row.Cells["colOMsg"].Value.ParseToString(); + row.Cells["colOMsg"].Style.ForeColor = Color.Green; + } + else if (order.order_status_prompt.Contains("退款成功") || order.order_status_prompt.Contains("交易已取消")) + { + row.Cells["colOMsg"].Value = "[已退]" + row.Cells["colOMsg"].Value.ParseToString(); + row.Cells["colOMsg"].Style.ForeColor = Color.Gray; + } + else if (order.after_sales != null) + { + if (order.order_sn == "260417-009038743070257") + { + //after_sales_id 20093344800098 after_sales_status 12 after_sales_type 2 + } + if (order.order_sn == "260427-536315174430257") + { + + } + if (order.after_sales.after_sales_status == 12 && order.after_sales.after_sales_type == 2) + { + row.Cells["colOMsg"].Value = "[退货失败]" + row.Cells["colOMsg"].Value.ParseToString(); + row.Cells["colOMsg"].Style.ForeColor = Color.SlateBlue; + } + else + { + row.Cells["colOMsg"].Value = "[退货中]" + row.Cells["colOMsg"].Value.ParseToString(); + row.Cells["colOMsg"].Style.ForeColor = Color.DeepSkyBlue; + } + } + else if (!string.IsNullOrEmpty(order.wxRefundStatus)) + { + row.Cells["colOMsg"].Value = "[" + order.wxRefundStatus + "]" + row.Cells["colOMsg"].Value.ParseToString(); + row.Cells["colOMsg"].Style.ForeColor = Color.Red; + } + else + { + row.Cells["colOMsg"].Style.ForeColor = Control.DefaultForeColor; + } + } + + private void btnSendOrder_Click(object sender, EventArgs e) + { + + PddBuyerOrderInfoLite order = new PddBuyerOrderInfoLite(); + order.buyerName = cmbBuyerName.Text.Trim(); + order.order_amount = (txtOrderAmount.Text.Trim().ParseToDecimal() * 100).ParseToInt(); + order.order_sn = txtBuyerOrderSn.Text.Trim(); + order.outExpressCompanyMsg = "其他快递"; + order.tracking_number = txtExpressSn.Text.Trim(); + order.order_time = BaseClass.DateTimeToTimestampSeconds(DateTime.Now); + order.order_status_prompt = ""; + + if (order.buyerName.IsNullOrEmpty() || order.order_amount == 0 || order.order_sn.IsNullOrEmpty() || order.tracking_number.IsNullOrEmpty()) + { + BaseMsgForm.ShowError("请完整填写拍单信息"); + return; + } + + var orderExist = lstOtherBuyerOrderInfoLite.FirstOrDefault(o => o.order_sn == order.order_sn); + if (orderExist == null) + lstOtherBuyerOrderInfoLite.Add(order); + else + { + if (BaseMsgForm.ShowConfirm("已存在该买手订单，是否覆盖并重复发送？").DialogResult != DialogResult.OK) + return; + orderExist.order_amount = order.order_amount; + orderExist.buyerName = order.buyerName; + orderExist.outExpressCompanyMsg = order.outExpressCompanyMsg; + orderExist.tracking_number = order.tracking_number; + } + NaiBa.Util.Helper.ConfigHelper.SaveConfig("other_buyer_order_list", lstOtherBuyerOrderInfoLite); + + ShowOrder(order); + SendOrderE57(order, true); + } + + ConcurrentList tempWaitOrderLst = new ConcurrentList(); + /// + /// 调用e57接口更新web端订单数据信息 + /// + /// + /// 手动强制重置状态，一定重新发送 + public void SendOrderE57(PddBuyerOrderInfoLite order, bool resetSendStatus = false) + { + if (tempWaitOrderLst.Any(o => o.order_sn == order.order_sn)) + return; + tempWaitOrderLst.Add(order); + Task.Run(() => + { + var orderSn = order.order_sn; + Thread.Sleep(5000); + tempWaitOrderLst.RemoveAll(o => o.order_sn == orderSn); + }); + + if (order == null) + return; + if (resetSendStatus) + order.sendStatus = ""; + var row = dgvPddBuyerOrder.Rows.Cast().FirstOrDefault(p => p.Cells.GetCellValueFromColumnName("colOPddOrderSn").ParseToString() == order.order_sn); + Invoke(new Action(() => + { + if (row != null) + row.Cells["colOMsg"].Value = ""; + })); + Thread.Sleep(100); + + if (order.sendStatus.Contains("外采订单已发货") || order.sendStatus.Contains("微信发货成功") || + order.sendStatus.Contains("已发送待发货订单") || order.sendStatus.Contains("接收成功") || + order.sendStatus.Contains("已发送售后订单")) + { + Invoke(new Action(() => + { + ShowOrder(order); + })); + return; + } + + JObject obj = new JObject(); + obj["platform"] = "WEISHOP"; + obj["outAmount"] = order.order_amount; + obj["outAccount"] = order.buyerName; + obj["outOrderNo"] = order.order_sn; + if (!order.outExpressCompanyCode.IsNullOrEmpty() && !order.tracking_number.IsNullOrEmpty()) + { + obj["outExpressCompany"] = order.outExpressCompanyCode; + obj["outExpressNo"] = order.tracking_number; + } + var dataStr = JsonHelper.SerializeObject(obj); + string url = "https://po.e57.cn/prod-api/api/oms-api/external_procurement/bind"; + //成功 "0SUCCESS" + //失败 已存在 1505调用微信接口更新物流信息失败: 非法参数, 同运单号拦截 rid: 69d8ab9c-22baa3b1-67de0d95 + var exportRst = WXHttpResponseBLL.e57PostResponse(url, dataStr, ""); + if (exportRst == null) + { + + } + for (int i = 0; i < 3 && exportRst.Contains("操作超时") && resetSendStatus == false; i++) + { + Thread.Sleep(210000); + WXHttpResponseBLL.e57PostResponse(url, dataStr, ""); + } + if (exportRst.Contains("操作超时")) + { + order.sendStatus = "发送失败 操作超时"; + NaiBa.Util.Helper.ConfigHelper.SaveConfig("other_buyer_order_list", lstOtherBuyerOrderInfoLite); + Invoke(new Action(() => + { + ShowOrder(order); + })); + return; + } + System.Xml.XmlDocument xmlDoc = new System.Xml.XmlDocument(); + string msg = ""; + string data = ""; + string code = ""; + try + { + xmlDoc.LoadXml(exportRst); //1505不支持的平台类型: WEISHOP + code = xmlDoc["AjaxResult"]["code"].InnerText; + msg = xmlDoc["AjaxResult"]["msg"].InnerText; + //data = xmlDoc["AjaxResult"]["data"].InnerText; + + // 更新微信外采订单信息成功, orderNo:260430-3065512320302571 + } + catch + { + msg = exportRst.ParseToString(); + } + if (code == "0" || code == "1") //if (msg == "SUCCESS") // || msg == "SUCCESS" + { + var sendStatusTmp = string.IsNullOrEmpty(data) ? msg : data; + order.sendStatus = sendStatusTmp; + + if (code == "0" && !order.sendStatus.Contains("微信发货成功")) + order.sendStatus = ("微信发货成功 " + sendStatusTmp).Trim(); + if (code == "1" && !order.sendStatus.Contains("接收成功")) + order.sendStatus = ("接收成功 " + sendStatusTmp).Trim(); + + // 处理特殊情况 如未发货或退货订单 + //if (order.sendStatus == "处理完成" || order.sendStatus == "快递公司和快递单号必须同时提供或同时为空") + // order.sendStatus = "已发送完成"; + if (order.order_status_prompt.Contains("待发货")) // 更新微信外采订单状态成功 + order.sendStatus = "已发送待发货订单"; + if (order.after_sales != null) + order.sendStatus = "已发送售后订单 " + sendStatusTmp; + NaiBa.Util.Helper.ConfigHelper.SaveConfig("other_buyer_order_list", lstOtherBuyerOrderInfoLite); + } + else + { + order.sendStatus = "发送失败 " + (string.IsNullOrEmpty(msg) ? data : msg); + NaiBa.Util.Helper.ConfigHelper.SaveConfig("other_buyer_order_list", lstOtherBuyerOrderInfoLite); + } + Invoke(new Action(() => + { + ShowOrder(order); + })); + //Thread.Sleep(500); + } + + private void OtherBuyerOrderListForm_FormClosing(object sender, FormClosingEventArgs e) + { + Hide(); + + e.Cancel = true; + return; + } + + private void dgvPddBuyerOrder_CellContentClick(object sender, DataGridViewCellEventArgs e) + { + if (e.ColumnIndex < 0 || e.RowIndex < 0) + return; + string headerText = dgvPddBuyerOrder.Columns[e.ColumnIndex].HeaderText; + var orderSn = dgvPddBuyerOrder.Rows[e.RowIndex].Cells["colOOtherOrderSn"].Value.ParseToString(); + var order = lstOtherBuyerOrderInfoLite.FirstOrDefault(p => p.order_sn == orderSn); + + + switch (headerText) + { + case "详情": + case "编辑/详情": + break; + case "图片": + ShowImgForm imgFrom = new ShowImgForm(dgvPddBuyerOrder.Rows[e.RowIndex].Cells["colImgUrl"].Value.ParseToString().Replace("?imageView2/2/w/90/h/90", "")); + imgFrom.ShowDialog(); + break; + case "": + case "全选": + dgvPddBuyerOrder.Rows[e.RowIndex].Cells["colCheck"].Value = !(bool)dgvPddBuyerOrder.Rows[e.RowIndex].Cells["colCheck"].Value; + break; + case "发送": + if (tempWaitOrderLst.Any(o => o.order_sn == order.order_sn)) + return; + Task.Run(() => + { + if (1 == 1) + SendOrderE57(order, true); + }); + break; + case "退货": + //pictureBox1.Visible = true; + //Task.Run(() => + //{ + // MakeWxToPddAfterSale(order); + // Invoke(new Action(() => { pictureBox1.Visible = false; })); + //}); + break; + default: + break; + } + } + } +} diff --git a/TEMUKJD/WXForms/TalkForms/OtherBuyerOrderListForm.resx b/TEMUKJD/WXForms/TalkForms/OtherBuyerOrderListForm.resx new file mode 100644 index 0000000..5b4ab44 --- /dev/null +++ b/TEMUKJD/WXForms/TalkForms/OtherBuyerOrderListForm.resx @@ -0,0 +1,343 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + + + AAABAAEAgIAQAAAAAABoKAAAFgAAACgAAACAAAAAAAEAAAEABAAAAAAAACgAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAgICAAMDAwAAAAP8AAP8AAAD//wD/AAAA/wD/AP// + AAD///8AAAAAAAAAAAAAAAAzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMQ + AAAAAAAAAAAAAAAAAAAAAAAAABM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZkzEAAAAAAAAAAAAAAAAAAAAAADOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZMwAAAAAAAAAAAAAAAAAAABOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZkzAAAAAAAAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmTEAAAAAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAAAAAAAA5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAAAAAADmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAAAA5mZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAADmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAGZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAJmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZAAAAAA + OZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmT + AAAAAZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmRAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZkwAAAZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZkwAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZMAAJmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZEAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTADmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkwCZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkRmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZOZmZOZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmP+JmZmZmZmZj/////// + ///4OZmZj/eZmZmZmZmZmPg5OZmZmZuI//iIuZmZmZmZmZmZmZM5mZmZmZmZmZmZmb//+JmZmZmZmP// + //////////OZmP//uZmZmZmZmY//+ZmZOZf///////h5k5mZmZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZ + mZ/////////////4mZ///4mZmZmZmZP///uZmZmP////////+JmZmZmZmZmZkzmZmZmZmZmZmZmZj//4 + mZmZmZmf////////////+Jmf//+JmZmZmZmb///4mZmY//////////+JmZmZmZmZmZM5mZmZmZmZmZmZ + mY//+JmZmZmZn/////////////mZmP//iZmZmZmZk///+5mZj/////iP////+JmZmZmZmZmTOZmZmZmZ + mZmZmZmP//iZmZmZmZ////iIiIiIiIiZOZj//4mZmZmZmZP///uZmf////eZmT////+ZmZmZmZmZkzmZ + mZmZmZmZmZmZj//4mZmZmZmf//+JmZmZmZmZk5mY//+JmZmZmZmT///7mZj///+ZmZmZj///uZmZmZmZ + mZM5mZmZmZmZmZmZmY//+JmZmZmZn///iZmZmZmZmZmZmP//iZmZN5k5k///+5mY///zk5mZOT///4mZ + mZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZmZ///4mZmZmZmZmZmZj//4mZmP/5k5P///uZmP//+ZmZmZmY + //+JmZmZmZmZkzmZmZmZmZmZmZmZj//4mZmZmZmf///4iIiIiIg5mZmY//+JOb//+JmT///7mZj//4mZ + mZmZmP//+ZmZmZmZmZM5mZmZmZmZmZmZmY//+JmZmZmZn///////////85mZmP//iZn///+Jk///+5mf + //+JmZmZmZj///mZmZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZmZ////////////+ZmZj//4mY////85v/ + //uZmP//iZmZmZmY///5mZmZmZmZkzmZmZmZmZmZmZmZj//4mZmZmZmf////////////mZmY//+Jv/// + //+Z///7mZj//4mZmZmZmP//+ZmZmZmZmZM5mZmZmZmZmZmZmY//+JmZmZmZn///////////+JmZmP// + if//////if//+5mY//+JmZmZmZj///mZmZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZmZ///////////4mZ + mZj//4j///////j///uZmP//iZmZmZmY///5mZmZmZmZkzmZmZmZmZmZmZmZj//4mZmZmZmf//+JMzMz + MzOZOZmY//////+D///////7mZj//4mZmZmZmP//+ZmZmZmZmZM5mZmZmZmZmZmZmY//+JmZmZmZn/// + iZmZmZmZmZmZmP//////mY//////+5mY//+JmZmZmZj///mZmZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZ + mZ///4mZmZmZmZmZmZj/////+5mf//////uZmP//iZmZmZmY///5mZmZmZmZkzmZmZmZmZmZMzM5j//4 + kzMzmZmf//+JMzMzMzM5mZmY/////4mTk//////7mZj//4mZmZmZmP//+ZmZmZmZmZM5mZmZmZmZmP// + /////////4mZn////////////4mZmP////+ZmZmP////+5mY//+JmZmZmZj///mZmZmZmZmTOZmZmZmZ + mY/////////////4mZ/////////////7mZj////7mZmZn/////uZmP//iZmZmZmY///5mZmZmZmZkzmZ + mZmZmZn//////////////5mf////////////+Jmf////iZmZk5P////4mZ///4mZmZmZmP//+ZmZmZmZ + mZM5mZmZmZmZj/////////////iZn/////////////iZmP///5mZmZmZj///+5mY//+JmZmZmZj//4mZ + mZmZmZmTOZmZmZmZmZ/////////////zmZP///////////+JmZP///uTmZmZmZj//4mZm///mZmZmZmZ + //85mZmZmZmZkzmZmZmZmZOZiIiIiIiIiIiImTmZOIiIiIiIiIiImTmZOIi5mZmZmZOZiIuZmZk4iZOZ + mZmZOZiDmZmZmZmZmZM5mZmZmZmZOZmZmZmZmZmZmZOZmZmZmZmZmZmZmZOZmZmZmZmZmZmZOZmZmZmZ + mZk5mZmZmZOZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmTuIiIiIs5mZmZmZmZ + mTu4i7mZmZmZmZmZmTMzmZOZmZkzOZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmTmbj///////+HmT + mZmZk4j/////iJmZmZk4iP////iZOZmZj/mZOZOIiIiIiIiIiDmZmZmZmZmZkzmZmZmZmZmZj/////// + ///4mZk5k4///4iI///4OZOY////////iZOZmb/5mZmP///////////4mZmZmZmZmZM5mZmZmZmZn/// + //////////mZmY///5mZmZP///iZmP////////+ZOZk/iZmY/////////////4mZmZmZmZmTOZmZmZmZ + mZ/////////////5mZ////+JmZmY////iZl/////////+ZmZP4mZP//////////////7mZmZmZmZkzmZ + mZmZmZmb////////////uZP/j///+HM3j/////+ZmYj///////iZmT+JmY//////////////+JmZmZmZ + mZM5mZmZmZmZmY//////////+JmT+Jv///////////iPmTmZOI/4mP//uTk/iZmP//////////////iZ + mZmZmZmTOZmZmZmZmZmf//////////mZmZmZ///////////5mZmZmZmTOZk///mZP4mZj/////////// + ///4mZmZmZmZkzmZmZmZmZmTmP////////+JOZmZOY//////////iZmZmZmZmZk5mf/4mT+JmY////// + ////////+JmZmZmZmZM5mZmZmZmZmZn/////////mZmZmZk//////////zmZmZmZmZmZmTmP/zm/iZmP + //////////////iZmZmZmZmTOZmZmZmZmZk5v///////85OZmZkzmP////////iZmZmZmZmZmZmZn//4 + /4mZj/////hzN4/////4mZmZmZmZkzmZmZmZmZmZmZj//////4mZmTmY/4j////////4mZmZmZmZmZmZ + mZj///+JmY////+JmZmY////+JmZmZmZmZM5mZmZmZmZmZmZ//////+ZmZmZj////////////4mZmZmZ + mZmZmZmb////+ZmP///4mZu5mY////iZmZmZmZmTOZmZmZmZmZmZOb/////4k5mZmP/////////////7 + mZmZmZmZmZmZk/////OZv///+ZmP+Jmf///4mZmZmZmZkzmZmZmZmZmZmZmf////+ZmZmZj////////4 + eI//+JmZmZmZmZmZmZP////4mb///4mY//+JmP//+5mZmZmZmZM5mZmZmZmZmZk5v/////uTmZmb//// + ///4mZmX//iZmZmZmZmZmZmZ////+Jmf//95n///+Zj///OZmZmZmZmTOZmZmZmZmZmZmf//////mZmZ + mY//////+ZOZmZiJmZmZmZmZmZmZmY////+ZmP//+I////iP//+JmZmZmZmZkzmZmZmZmZmZmZj///// + /4mZmZmf/////5k5mZOZmTmZmZmZmZmZmZmP///4mZP/////////////OZmZmZmZmZM5mZmZmZmZmZk/ + ///////zmZmZm/////iZmZmZmZmZmZmZmZmZmZmZj///85mZj///////////+JmZmZmZmZmTOZmZmZmZ + mZmZv///////+5mZmZmP///5mZmZmZmZmZmZmZmZmZmZmZ///3mZmZj//////////4mZmZmZmZmZkzmZ + mZmZmZmZmb///4j///uZmZmZmP//mTmZmZmZmZmZmZmZmZmZmZmY/4OZmZmZeP///////4eZmZmZmZmZ + mZM5mZmZmZmZmZmY/4OZOP+JmZmZmZmIiZOZmZmZmZmZmZmZmZmZmZmZmYiZmZmZmZk4iIiIiIOZmZmZ + mZmZmZmTOZmZmZmZmZmZmTOZmZkzmZmZmZmZmZk5mZmZmZmZmZmZmZmZmZmZmZmZk5mZmZmZmZmZmZmZ + mZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmTGZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZkwmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZADmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZkwA5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZMACZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmQAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAABmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTAAADmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAJmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmRAAAAA5mZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAACZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmQAAAAAAGZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAOZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkwAAAAAA + AAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTAA + AAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZMAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZkwAAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmTAAAAAAAAAAAAAAGZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZEAAAAAAAAAAAAAAAA5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZMAAAAAAAAAAAAAAAAAATmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZMQAAAAAAAAAAAAAAAAAAABOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZMQAAAAAAAAAAAAAAAAAAAAAAAzmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTMAAAAAAAAAAAAAAAAAAAAAAAAAAAEzMzMzMzMzMzMzMzMzMz + MzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMxAAAAAAAAAAAAAAD////////////////////////4AAAA + AAAAAAAAAB//////wAAAAAAAAAAAAAAD/////wAAAAAAAAAAAAAAAP////wAAAAAAAAAAAAAAAA////w + AAAAAAAAAAAAAAAAD///4AAAAAAAAAAAAAAAAAf//8AAAAAAAAAAAAAAAAAD//+AAAAAAAAAAAAAAAAA + Af//AAAAAAAAAAAAAAAAAAD//gAAAAAAAAAAAAAAAAAAf/wAAAAAAAAAAAAAAAAAAD/4AAAAAAAAAAAA + AAAAAAAf+AAAAAAAAAAAAAAAAAAAH/AAAAAAAAAAAAAAAAAAAA/wAAAAAAAAAAAAAAAAAAAP4AAAAAAA + AAAAAAAAAAAAB+AAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAADwAAAAAAAAAAAAAAAAAAAA8AA + AAAAAAAAAAAAAAAAAAOAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA + AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA + AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA + AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA + AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA + AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA + AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA + AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA + AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA + AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA + AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA + AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA + AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA + AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA + AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA + AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA + AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA + AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA + AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA + AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA + AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA + AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA + AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA + AAAAAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAPAAAAAAAAAAAAAAAAAAAAD4AAAAAAAAAAAAAAAAAAAA+AA + AAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAH8AAAAAAAAAAAAAAAAAAAD/AAAAAAAAAAAAAAAAAA + AA/4AAAAAAAAAAAAAAAAAAAf/AAAAAAAAAAAAAAAAAAAH/wAAAAAAAAAAAAAAAAAAD/+AAAAAAAAAAAA + AAAAAAB//wAAAAAAAAAAAAAAAAAA//+AAAAAAAAAAAAAAAAAAf//wAAAAAAAAAAAAAAAAAP//+AAAAAA + AAAAAAAAAAAH///4AAAAAAAAAAAAAAAAD////AAAAAAAAAAAAAAAAD////8AAAAAAAAAAAAAAAD///// + wAAAAAAAAAAAAAAD//////wAAAAAAAAAAAAAH////////////////////////w== + + + \ No newline at end of file diff --git a/TEMUKJD/WXForms/TalkForms/BuyerOrderListForm.Designer.cs b/TEMUKJD/WXForms/TalkForms/PDDBuyerOrderListForm.Designer.cs similarity index 89% rename from TEMUKJD/WXForms/TalkForms/BuyerOrderListForm.Designer.cs rename to TEMUKJD/WXForms/TalkForms/PDDBuyerOrderListForm.Designer.cs index f539e80..4577261 100644 --- a/TEMUKJD/WXForms/TalkForms/BuyerOrderListForm.Designer.cs +++ b/TEMUKJD/WXForms/TalkForms/PDDBuyerOrderListForm.Designer.cs @@ -1,7 +1,7 @@  namespace TemuKJD.WXForms.TalkForms { - partial class BuyerOrderListForm + partial class PDDBuyerOrderListForm { /// /// Required designer variable. @@ -46,7 +46,7 @@ namespace TemuKJD.WXForms.TalkForms System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(BuyerOrderListForm)); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PDDBuyerOrderListForm)); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.chkAutoAfterSale = new TemuKJD.UserComponent.UcCheckBox(this.components); this.btnStopStop = new DevComponents.DotNetBar.PanelEx(); @@ -85,8 +85,10 @@ namespace TemuKJD.WXForms.TalkForms this.panelEx2 = new DevComponents.DotNetBar.PanelEx(); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.panel2 = new System.Windows.Forms.Panel(); - this.txtOrderMsgFilter = new System.Windows.Forms.TextBox(); - this.label4 = new System.Windows.Forms.Label(); + this.cmbBuyer = new System.Windows.Forms.ComboBox(); + this.chkHideSuccessOrder = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.btnForceSendAfterSale = new DevComponents.DotNetBar.PanelEx(); + this.txtForceSendAfterSale = new System.Windows.Forms.TextBox(); this.txtOrderSnFilter = new System.Windows.Forms.TextBox(); this.label1 = new System.Windows.Forms.Label(); this.dgvAfterSale = new TemuKJD.UserComponent.DataGridViewEx(); @@ -106,7 +108,6 @@ namespace TemuKJD.WXForms.TalkForms this.dataGridViewLinkColumn1 = new System.Windows.Forms.DataGridViewLinkColumn(); this.btnExchange = new DevComponents.DotNetBar.PanelEx(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.lblMsg = new System.Windows.Forms.Label(); this.btnRestore = new DevComponents.DotNetBar.PanelEx(); this.btnFilterOrder = new DevComponents.DotNetBar.PanelEx(); this.dgvPddBuyerOrder = new TemuKJD.UserComponent.DataGridViewEx(); @@ -125,6 +126,8 @@ namespace TemuKJD.WXForms.TalkForms this.colOMsg = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colSend = new System.Windows.Forms.DataGridViewLinkColumn(); this.colAfterSale = new System.Windows.Forms.DataGridViewLinkColumn(); + this.lblForceSendAfterSale = new System.Windows.Forms.Label(); + this.lblMsg = new System.Windows.Forms.Label(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.btnFilter = new DevComponents.DotNetBar.PanelEx(); this.label3 = new System.Windows.Forms.Label(); @@ -139,6 +142,7 @@ namespace TemuKJD.WXForms.TalkForms this.chkOnlyShowCurrentShop = new TemuKJD.UserComponent.UcCheckBox(this.components); this.lblCurrentShop = new System.Windows.Forms.Label(); this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); + this.btnOtherPlatformOrder = new DevComponents.DotNetBar.PanelEx(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -186,7 +190,7 @@ namespace TemuKJD.WXForms.TalkForms this.splitContainer1.Panel2.Controls.Add(this.pbLoading); this.splitContainer1.Panel2.Controls.Add(this.dgvWxOrder); this.splitContainer1.Panel2.Controls.Add(this.dgvBuyer); - this.splitContainer1.Size = new System.Drawing.Size(364, 657); + this.splitContainer1.Size = new System.Drawing.Size(364, 659); this.splitContainer1.SplitterDistance = 90; this.splitContainer1.TabIndex = 1; // @@ -359,7 +363,7 @@ namespace TemuKJD.WXForms.TalkForms // this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None; this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue; - this.pbLoading.Location = new System.Drawing.Point(157, 256); + this.pbLoading.Location = new System.Drawing.Point(157, 257); this.pbLoading.Name = "pbLoading"; this.pbLoading.Size = new System.Drawing.Size(50, 50); this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -398,7 +402,7 @@ namespace TemuKJD.WXForms.TalkForms this.colOrderStatus, this.col_notes, this.colEdit}); - this.dgvWxOrder.Location = new System.Drawing.Point(8, 348); + this.dgvWxOrder.Location = new System.Drawing.Point(5, 347); this.dgvWxOrder.MultiSelectCheckBox = true; this.dgvWxOrder.Name = "dgvWxOrder"; this.dgvWxOrder.ReadOnly = true; @@ -537,7 +541,7 @@ namespace TemuKJD.WXForms.TalkForms this.dgvBuyer.ReadOnly = true; this.dgvBuyer.RowHeadersWidth = 25; this.dgvBuyer.RowTemplate.Height = 23; - this.dgvBuyer.Size = new System.Drawing.Size(364, 563); + this.dgvBuyer.Size = new System.Drawing.Size(364, 565); this.dgvBuyer.TabIndex = 7; this.dgvBuyer.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellContentClick); // @@ -610,27 +614,27 @@ namespace TemuKJD.WXForms.TalkForms this.splitContainer2.BackColor = System.Drawing.Color.White; this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill; this.splitContainer2.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; - this.splitContainer2.Location = new System.Drawing.Point(1, 33); + this.splitContainer2.Location = new System.Drawing.Point(0, 32); this.splitContainer2.Name = "splitContainer2"; this.splitContainer2.Orientation = System.Windows.Forms.Orientation.Horizontal; // // splitContainer2.Panel1 // this.splitContainer2.Panel1.Controls.Add(this.splitContainer3); - this.splitContainer2.Panel1.Padding = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.splitContainer2.Panel1.Padding = new System.Windows.Forms.Padding(0, 0, 4, 0); // // splitContainer2.Panel2 // this.splitContainer2.Panel2.Controls.Add(this.statusBar); - this.splitContainer2.Size = new System.Drawing.Size(1438, 686); - this.splitContainer2.SplitterDistance = 657; + this.splitContainer2.Size = new System.Drawing.Size(1440, 688); + this.splitContainer2.SplitterDistance = 659; this.splitContainer2.TabIndex = 0; // // splitContainer3 // this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill; this.splitContainer3.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; - this.splitContainer3.Location = new System.Drawing.Point(4, 0); + this.splitContainer3.Location = new System.Drawing.Point(0, 0); this.splitContainer3.Name = "splitContainer3"; // // splitContainer3.Panel1 @@ -646,7 +650,7 @@ namespace TemuKJD.WXForms.TalkForms this.splitContainer3.Panel2.Controls.Add(this.tableLayoutPanel1); this.splitContainer3.Panel2.Controls.Add(this.chkOnlyShowCurrentShop); this.splitContainer3.Panel2.Controls.Add(this.lblCurrentShop); - this.splitContainer3.Size = new System.Drawing.Size(1430, 657); + this.splitContainer3.Size = new System.Drawing.Size(1436, 659); this.splitContainer3.SplitterDistance = 364; this.splitContainer3.TabIndex = 8; // @@ -657,7 +661,7 @@ namespace TemuKJD.WXForms.TalkForms this.btnClose.Cursor = System.Windows.Forms.Cursors.Hand; this.btnClose.DisabledBackColor = System.Drawing.Color.Empty; this.btnClose.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnClose.Location = new System.Drawing.Point(501, 637); + this.btnClose.Location = new System.Drawing.Point(504, 639); this.btnClose.Name = "btnClose"; this.btnClose.Size = new System.Drawing.Size(61, 20); this.btnClose.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -682,7 +686,7 @@ namespace TemuKJD.WXForms.TalkForms this.panelEx2.Cursor = System.Windows.Forms.Cursors.Hand; this.panelEx2.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.panelEx2.Location = new System.Drawing.Point(1038, 624); + this.panelEx2.Location = new System.Drawing.Point(1044, 626); this.panelEx2.Name = "panelEx2"; this.panelEx2.Size = new System.Drawing.Size(24, 25); this.panelEx2.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -708,7 +712,7 @@ namespace TemuKJD.WXForms.TalkForms this.panelEx1.Cursor = System.Windows.Forms.Cursors.Hand; this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.panelEx1.Location = new System.Drawing.Point(1038, 593); + this.panelEx1.Location = new System.Drawing.Point(1044, 595); this.panelEx1.Name = "panelEx1"; this.panelEx1.Size = new System.Drawing.Size(24, 25); this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -729,54 +733,99 @@ namespace TemuKJD.WXForms.TalkForms // // panel2 // - this.panel2.Controls.Add(this.txtOrderMsgFilter); - this.panel2.Controls.Add(this.label4); + this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel2.Controls.Add(this.btnOtherPlatformOrder); + this.panel2.Controls.Add(this.cmbBuyer); + this.panel2.Controls.Add(this.chkHideSuccessOrder); + this.panel2.Controls.Add(this.btnForceSendAfterSale); + this.panel2.Controls.Add(this.txtForceSendAfterSale); this.panel2.Controls.Add(this.txtOrderSnFilter); this.panel2.Controls.Add(this.label1); this.panel2.Controls.Add(this.dgvAfterSale); this.panel2.Controls.Add(this.btnExchange); this.panel2.Controls.Add(this.pictureBox1); - this.panel2.Controls.Add(this.lblMsg); this.panel2.Controls.Add(this.btnRestore); this.panel2.Controls.Add(this.btnFilterOrder); this.panel2.Controls.Add(this.dgvPddBuyerOrder); + this.panel2.Controls.Add(this.lblForceSendAfterSale); + this.panel2.Controls.Add(this.lblMsg); this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel2.Location = new System.Drawing.Point(0, 312); + this.panel2.Location = new System.Drawing.Point(0, 308); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(1062, 345); + this.panel2.Size = new System.Drawing.Size(1068, 351); this.panel2.TabIndex = 908; // - // txtOrderMsgFilter + // cmbBuyer // - this.txtOrderMsgFilter.Location = new System.Drawing.Point(425, 3); - this.txtOrderMsgFilter.Name = "txtOrderMsgFilter"; - this.txtOrderMsgFilter.Size = new System.Drawing.Size(242, 23); - this.txtOrderMsgFilter.TabIndex = 953; + this.cmbBuyer.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.cmbBuyer.Font = new System.Drawing.Font("微软雅黑", 7F); + this.cmbBuyer.FormattingEnabled = true; + this.cmbBuyer.Location = new System.Drawing.Point(670, 28); + this.cmbBuyer.Name = "cmbBuyer"; + this.cmbBuyer.Size = new System.Drawing.Size(88, 22); + this.cmbBuyer.TabIndex = 993; + this.cmbBuyer.Visible = false; // - // label4 + // chkHideSuccessOrder // - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(372, 6); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(56, 17); - this.label4.TabIndex = 952; - this.label4.Text = "订单信息"; + this.chkHideSuccessOrder.Location = new System.Drawing.Point(465, 3); + this.chkHideSuccessOrder.Name = "chkHideSuccessOrder"; + this.chkHideSuccessOrder.Size = new System.Drawing.Size(141, 21); + this.chkHideSuccessOrder.TabIndex = 980; + this.chkHideSuccessOrder.Text = "隐藏店铺发货成功订单"; + this.chkHideSuccessOrder.UseVisualStyleBackColor = true; + this.chkHideSuccessOrder.CheckedChanged += new System.EventHandler(this.chkHideSuccessOrder_CheckedChanged); + // + // btnForceSendAfterSale + // + this.btnForceSendAfterSale.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnForceSendAfterSale.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnForceSendAfterSale.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnForceSendAfterSale.DisabledBackColor = System.Drawing.Color.Empty; + this.btnForceSendAfterSale.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnForceSendAfterSale.Location = new System.Drawing.Point(1007, 28); + this.btnForceSendAfterSale.Name = "btnForceSendAfterSale"; + this.btnForceSendAfterSale.Size = new System.Drawing.Size(57, 23); + this.btnForceSendAfterSale.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnForceSendAfterSale.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnForceSendAfterSale.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnForceSendAfterSale.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnForceSendAfterSale.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnForceSendAfterSale.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnForceSendAfterSale.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnForceSendAfterSale.Style.GradientAngle = 90; + this.btnForceSendAfterSale.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnForceSendAfterSale.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnForceSendAfterSale.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnForceSendAfterSale.TabIndex = 967; + this.btnForceSendAfterSale.Text = "发送售后"; + this.btnForceSendAfterSale.Visible = false; + this.btnForceSendAfterSale.Click += new System.EventHandler(this.btnForceSendAfterSale_Click); + // + // txtForceSendAfterSale + // + this.txtForceSendAfterSale.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.txtForceSendAfterSale.Location = new System.Drawing.Point(840, 28); + this.txtForceSendAfterSale.Name = "txtForceSendAfterSale"; + this.txtForceSendAfterSale.Size = new System.Drawing.Size(165, 23); + this.txtForceSendAfterSale.TabIndex = 963; + this.txtForceSendAfterSale.Visible = false; // // txtOrderSnFilter // - this.txtOrderSnFilter.Location = new System.Drawing.Point(124, 3); + this.txtOrderSnFilter.Location = new System.Drawing.Point(194, 2); this.txtOrderSnFilter.Name = "txtOrderSnFilter"; - this.txtOrderSnFilter.Size = new System.Drawing.Size(242, 23); + this.txtOrderSnFilter.Size = new System.Drawing.Size(165, 23); this.txtOrderSnFilter.TabIndex = 903; // // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(1, 6); + this.label1.Location = new System.Drawing.Point(1, 5); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(126, 17); + this.label1.Size = new System.Drawing.Size(203, 17); this.label1.TabIndex = 951; - this.label1.Text = "买手/订单号/售后单号"; + this.label1.Text = "买手号/订单号/售后单号/订单信息："; // // dgvAfterSale // @@ -820,7 +869,7 @@ namespace TemuKJD.WXForms.TalkForms this.dgvAfterSale.Name = "dgvAfterSale"; this.dgvAfterSale.ReadOnly = true; this.dgvAfterSale.RowTemplate.Height = 23; - this.dgvAfterSale.Size = new System.Drawing.Size(1005, 83); + this.dgvAfterSale.Size = new System.Drawing.Size(1009, 87); this.dgvAfterSale.TabIndex = 941; this.dgvAfterSale.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvAfterSale_CellContentClick); // @@ -898,14 +947,14 @@ namespace TemuKJD.WXForms.TalkForms // // colROrderAmount // - this.colROrderAmount.FillWeight = 50F; + this.colROrderAmount.FillWeight = 55F; this.colROrderAmount.HeaderText = "付款金额"; this.colROrderAmount.Name = "colROrderAmount"; this.colROrderAmount.ReadOnly = true; // // colRRefundAmount // - this.colRRefundAmount.FillWeight = 50F; + this.colRRefundAmount.FillWeight = 55F; this.colRRefundAmount.HeaderText = "退款金额"; this.colRRefundAmount.Name = "colRRefundAmount"; this.colRRefundAmount.ReadOnly = true; @@ -938,9 +987,9 @@ namespace TemuKJD.WXForms.TalkForms this.btnExchange.Cursor = System.Windows.Forms.Cursors.Hand; this.btnExchange.DisabledBackColor = System.Drawing.Color.Empty; this.btnExchange.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnExchange.Location = new System.Drawing.Point(989, 12); + this.btnExchange.Location = new System.Drawing.Point(1007, 2); this.btnExchange.Name = "btnExchange"; - this.btnExchange.Size = new System.Drawing.Size(70, 23); + this.btnExchange.Size = new System.Drawing.Size(57, 23); this.btnExchange.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnExchange.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnExchange.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -960,31 +1009,21 @@ namespace TemuKJD.WXForms.TalkForms // this.pictureBox1.Anchor = System.Windows.Forms.AnchorStyles.None; this.pictureBox1.Image = global::TemuKJD.Properties.Resources.loading_blue; - this.pictureBox1.Location = new System.Drawing.Point(506, 147); + this.pictureBox1.Location = new System.Drawing.Point(508, 149); this.pictureBox1.Name = "pictureBox1"; this.pictureBox1.Size = new System.Drawing.Size(50, 50); this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox1.TabIndex = 921; this.pictureBox1.TabStop = false; // - // lblMsg - // - this.lblMsg.AutoSize = true; - this.lblMsg.Location = new System.Drawing.Point(1, 27); - this.lblMsg.Name = "lblMsg"; - this.lblMsg.Size = new System.Drawing.Size(48, 17); - this.lblMsg.TabIndex = 914; - this.lblMsg.Text = "lblMsg"; - this.lblMsg.Click += new System.EventHandler(this.lblMsg_Click); - // // btnRestore // this.btnRestore.CanvasColor = System.Drawing.SystemColors.Control; this.btnRestore.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnRestore.DisabledBackColor = System.Drawing.Color.Empty; - this.btnRestore.Location = new System.Drawing.Point(735, 3); + this.btnRestore.Location = new System.Drawing.Point(408, 2); this.btnRestore.Name = "btnRestore"; - this.btnRestore.Size = new System.Drawing.Size(61, 23); + this.btnRestore.Size = new System.Drawing.Size(45, 23); this.btnRestore.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnRestore.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); this.btnRestore.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); @@ -1007,9 +1046,9 @@ namespace TemuKJD.WXForms.TalkForms this.btnFilterOrder.Cursor = System.Windows.Forms.Cursors.Hand; this.btnFilterOrder.DisabledBackColor = System.Drawing.Color.Empty; this.btnFilterOrder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnFilterOrder.Location = new System.Drawing.Point(672, 3); + this.btnFilterOrder.Location = new System.Drawing.Point(361, 2); this.btnFilterOrder.Name = "btnFilterOrder"; - this.btnFilterOrder.Size = new System.Drawing.Size(61, 23); + this.btnFilterOrder.Size = new System.Drawing.Size(45, 23); this.btnFilterOrder.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnFilterOrder.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnFilterOrder.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -1022,7 +1061,7 @@ namespace TemuKJD.WXForms.TalkForms this.btnFilterOrder.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); this.btnFilterOrder.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); this.btnFilterOrder.TabIndex = 902; - this.btnFilterOrder.Text = "筛选"; + this.btnFilterOrder.Text = "过滤"; this.btnFilterOrder.Click += new System.EventHandler(this.btnFilterOrder_Click); // // dgvPddBuyerOrder @@ -1063,12 +1102,12 @@ namespace TemuKJD.WXForms.TalkForms this.colOMsg, this.colSend, this.colAfterSale}); - this.dgvPddBuyerOrder.Location = new System.Drawing.Point(2, 45); + this.dgvPddBuyerOrder.Location = new System.Drawing.Point(-1, 54); this.dgvPddBuyerOrder.MultiSelectCheckBox = true; this.dgvPddBuyerOrder.Name = "dgvPddBuyerOrder"; this.dgvPddBuyerOrder.ReadOnly = true; this.dgvPddBuyerOrder.RowTemplate.Height = 23; - this.dgvPddBuyerOrder.Size = new System.Drawing.Size(1057, 300); + this.dgvPddBuyerOrder.Size = new System.Drawing.Size(1068, 296); this.dgvPddBuyerOrder.TabIndex = 886; this.dgvPddBuyerOrder.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvPddBuyerOrder_CellContentClick); // @@ -1185,6 +1224,27 @@ namespace TemuKJD.WXForms.TalkForms this.colAfterSale.ReadOnly = true; this.colAfterSale.Visible = false; // + // lblForceSendAfterSale + // + this.lblForceSendAfterSale.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.lblForceSendAfterSale.AutoSize = true; + this.lblForceSendAfterSale.Location = new System.Drawing.Point(758, 31); + this.lblForceSendAfterSale.Name = "lblForceSendAfterSale"; + this.lblForceSendAfterSale.Size = new System.Drawing.Size(92, 17); + this.lblForceSendAfterSale.TabIndex = 968; + this.lblForceSendAfterSale.Text = "已取消订单号："; + this.lblForceSendAfterSale.Visible = false; + // + // lblMsg + // + this.lblMsg.AutoSize = true; + this.lblMsg.Location = new System.Drawing.Point(1, 27); + this.lblMsg.Name = "lblMsg"; + this.lblMsg.Size = new System.Drawing.Size(48, 17); + this.lblMsg.TabIndex = 914; + this.lblMsg.Text = "lblMsg"; + this.lblMsg.Click += new System.EventHandler(this.lblMsg_Click); + // // tableLayoutPanel1 // this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) @@ -1220,7 +1280,7 @@ namespace TemuKJD.WXForms.TalkForms this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33444F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33445F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33112F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(896, 105); + this.tableLayoutPanel1.Size = new System.Drawing.Size(902, 105); this.tableLayoutPanel1.TabIndex = 679; this.tableLayoutPanel1.Visible = false; // @@ -1231,7 +1291,7 @@ namespace TemuKJD.WXForms.TalkForms this.btnFilter.Cursor = System.Windows.Forms.Cursors.Hand; this.btnFilter.DisabledBackColor = System.Drawing.Color.Empty; this.btnFilter.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnFilter.Location = new System.Drawing.Point(823, 40); + this.btnFilter.Location = new System.Drawing.Point(827, 40); this.btnFilter.Name = "btnFilter"; this.btnFilter.Size = new System.Drawing.Size(69, 25); this.btnFilter.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -1267,7 +1327,7 @@ namespace TemuKJD.WXForms.TalkForms this.pnlEmpty.CanvasColor = System.Drawing.SystemColors.Control; this.pnlEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.pnlEmpty.DisabledBackColor = System.Drawing.Color.Empty; - this.pnlEmpty.Location = new System.Drawing.Point(771, 40); + this.pnlEmpty.Location = new System.Drawing.Point(775, 40); this.pnlEmpty.Name = "pnlEmpty"; this.pnlEmpty.Size = new System.Drawing.Size(46, 25); this.pnlEmpty.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -1291,7 +1351,7 @@ namespace TemuKJD.WXForms.TalkForms // this.label17.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label17.AutoSize = true; - this.label17.Location = new System.Drawing.Point(189, 44); + this.label17.Location = new System.Drawing.Point(190, 44); this.label17.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label17.Name = "label17"; this.label17.Size = new System.Drawing.Size(56, 17); @@ -1302,10 +1362,10 @@ namespace TemuKJD.WXForms.TalkForms // txtMobile // this.txtMobile.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtMobile.Location = new System.Drawing.Point(245, 41); + this.txtMobile.Location = new System.Drawing.Point(246, 41); this.txtMobile.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.txtMobile.Name = "txtMobile"; - this.txtMobile.Size = new System.Drawing.Size(124, 23); + this.txtMobile.Size = new System.Drawing.Size(125, 23); this.txtMobile.TabIndex = 428; this.txtMobile.Visible = false; // @@ -1315,7 +1375,7 @@ namespace TemuKJD.WXForms.TalkForms this.txtOrderSn.Location = new System.Drawing.Point(59, 41); this.txtOrderSn.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.txtOrderSn.Name = "txtOrderSn"; - this.txtOrderSn.Size = new System.Drawing.Size(124, 23); + this.txtOrderSn.Size = new System.Drawing.Size(125, 23); this.txtOrderSn.TabIndex = 427; this.txtOrderSn.Visible = false; // @@ -1323,7 +1383,7 @@ namespace TemuKJD.WXForms.TalkForms // this.label2.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(375, 44); + this.label2.Location = new System.Drawing.Point(377, 44); this.label2.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(68, 17); @@ -1334,9 +1394,9 @@ namespace TemuKJD.WXForms.TalkForms // dtpStartTime // this.dtpStartTime.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.dtpStartTime.Location = new System.Drawing.Point(446, 41); + this.dtpStartTime.Location = new System.Drawing.Point(448, 41); this.dtpStartTime.Name = "dtpStartTime"; - this.dtpStartTime.Size = new System.Drawing.Size(121, 23); + this.dtpStartTime.Size = new System.Drawing.Size(122, 23); this.dtpStartTime.TabIndex = 812; this.dtpStartTime.Visible = false; // @@ -1344,7 +1404,7 @@ namespace TemuKJD.WXForms.TalkForms // this.label14.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label14.AutoSize = true; - this.label14.Location = new System.Drawing.Point(573, 44); + this.label14.Location = new System.Drawing.Point(576, 44); this.label14.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label14.Name = "label14"; this.label14.Size = new System.Drawing.Size(68, 17); @@ -1355,9 +1415,9 @@ namespace TemuKJD.WXForms.TalkForms // dtpEndTime // this.dtpEndTime.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.dtpEndTime.Location = new System.Drawing.Point(644, 41); + this.dtpEndTime.Location = new System.Drawing.Point(647, 41); this.dtpEndTime.Name = "dtpEndTime"; - this.dtpEndTime.Size = new System.Drawing.Size(121, 23); + this.dtpEndTime.Size = new System.Drawing.Size(122, 23); this.dtpEndTime.TabIndex = 813; this.dtpEndTime.Visible = false; // @@ -1365,7 +1425,7 @@ namespace TemuKJD.WXForms.TalkForms // this.chkOnlyShowCurrentShop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.chkOnlyShowCurrentShop.AutoSize = true; - this.chkOnlyShowCurrentShop.Location = new System.Drawing.Point(38, 498); + this.chkOnlyShowCurrentShop.Location = new System.Drawing.Point(44, 498); this.chkOnlyShowCurrentShop.Name = "chkOnlyShowCurrentShop"; this.chkOnlyShowCurrentShop.Size = new System.Drawing.Size(135, 21); this.chkOnlyShowCurrentShop.TabIndex = 885; @@ -1378,7 +1438,7 @@ namespace TemuKJD.WXForms.TalkForms this.lblCurrentShop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.lblCurrentShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblCurrentShop.ForeColor = System.Drawing.Color.DarkOrange; - this.lblCurrentShop.Location = new System.Drawing.Point(187, 498); + this.lblCurrentShop.Location = new System.Drawing.Point(193, 498); this.lblCurrentShop.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.lblCurrentShop.Name = "lblCurrentShop"; this.lblCurrentShop.Size = new System.Drawing.Size(214, 17); @@ -1389,16 +1449,43 @@ namespace TemuKJD.WXForms.TalkForms // // statusBar // + this.statusBar.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.statusBar.BackColor = System.Drawing.Color.White; - this.statusBar.Dock = System.Windows.Forms.DockStyle.Fill; this.statusBar.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.statusBar.Location = new System.Drawing.Point(0, 0); + this.statusBar.Location = new System.Drawing.Point(-4, 0); this.statusBar.Margin = new System.Windows.Forms.Padding(0); this.statusBar.Name = "statusBar"; this.statusBar.Size = new System.Drawing.Size(1438, 25); this.statusBar.TabIndex = 5; // - // BuyerOrderListForm + // btnOtherPlatformOrder + // + this.btnOtherPlatformOrder.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnOtherPlatformOrder.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnOtherPlatformOrder.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnOtherPlatformOrder.DisabledBackColor = System.Drawing.Color.Empty; + this.btnOtherPlatformOrder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnOtherPlatformOrder.Location = new System.Drawing.Point(917, 2); + this.btnOtherPlatformOrder.Name = "btnOtherPlatformOrder"; + this.btnOtherPlatformOrder.Size = new System.Drawing.Size(88, 23); + this.btnOtherPlatformOrder.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnOtherPlatformOrder.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnOtherPlatformOrder.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnOtherPlatformOrder.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnOtherPlatformOrder.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnOtherPlatformOrder.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnOtherPlatformOrder.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnOtherPlatformOrder.Style.GradientAngle = 90; + this.btnOtherPlatformOrder.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnOtherPlatformOrder.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnOtherPlatformOrder.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnOtherPlatformOrder.TabIndex = 1009; + this.btnOtherPlatformOrder.Text = "其他平台订单"; + this.btnOtherPlatformOrder.Click += new System.EventHandler(this.btnOtherPlatformOrder_Click); + // + // PDDBuyerOrderListForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.ClientSize = new System.Drawing.Size(1440, 720); @@ -1406,7 +1493,8 @@ namespace TemuKJD.WXForms.TalkForms this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.KeyPreview = true; - this.Name = "BuyerOrderListForm"; + this.Name = "PDDBuyerOrderListForm"; + this.Padding = new System.Windows.Forms.Padding(0); this.Text = "产品数据库"; this.TitleText = "产品数据库"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.WXUserProdListForm_FormClosing); @@ -1505,22 +1593,7 @@ namespace TemuKJD.WXForms.TalkForms private System.Windows.Forms.DataGridViewTextBoxColumn colMessage; private DevComponents.DotNetBar.PanelEx btnExchange; private UserComponent.DataGridViewEx dgvAfterSale; - private System.Windows.Forms.Label label4; private System.Windows.Forms.Label label1; - private System.Windows.Forms.DataGridViewCheckBoxColumn dataGridViewCheckBoxColumn2; - private System.Windows.Forms.DataGridViewTextBoxColumn colRBuyerId; - private System.Windows.Forms.DataGridViewTextBoxColumn colRBuyerName; - private System.Windows.Forms.DataGridViewTextBoxColumn colRAfterSaleId; - private System.Windows.Forms.DataGridViewTextBoxColumn colRPddOrderSn; - private System.Windows.Forms.DataGridViewTextBoxColumn colROrderDate; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5; - private System.Windows.Forms.DataGridViewImageColumn dataGridViewImageColumn1; - private System.Windows.Forms.DataGridViewTextBoxColumn colRGoodsInfo; - private System.Windows.Forms.DataGridViewTextBoxColumn colROrderAmount; - private System.Windows.Forms.DataGridViewTextBoxColumn colRRefundAmount; - private System.Windows.Forms.DataGridViewTextBoxColumn colRStatus; - private System.Windows.Forms.DataGridViewTextBoxColumn colRMsg; - private System.Windows.Forms.DataGridViewLinkColumn dataGridViewLinkColumn1; private System.Windows.Forms.DataGridViewCheckBoxColumn dataGridViewCheckBoxColumn1; private System.Windows.Forms.DataGridViewTextBoxColumn colOBuyerId; private System.Windows.Forms.DataGridViewTextBoxColumn colOBuyerName; @@ -1536,6 +1609,25 @@ namespace TemuKJD.WXForms.TalkForms private System.Windows.Forms.DataGridViewTextBoxColumn colOMsg; private System.Windows.Forms.DataGridViewLinkColumn colSend; private System.Windows.Forms.DataGridViewLinkColumn colAfterSale; - private System.Windows.Forms.TextBox txtOrderMsgFilter; + private System.Windows.Forms.Label lblForceSendAfterSale; + private DevComponents.DotNetBar.PanelEx btnForceSendAfterSale; + private System.Windows.Forms.TextBox txtForceSendAfterSale; + private UserComponent.UcCheckBox chkHideSuccessOrder; + private System.Windows.Forms.ComboBox cmbBuyer; + private System.Windows.Forms.DataGridViewCheckBoxColumn dataGridViewCheckBoxColumn2; + private System.Windows.Forms.DataGridViewTextBoxColumn colRBuyerId; + private System.Windows.Forms.DataGridViewTextBoxColumn colRBuyerName; + private System.Windows.Forms.DataGridViewTextBoxColumn colRAfterSaleId; + private System.Windows.Forms.DataGridViewTextBoxColumn colRPddOrderSn; + private System.Windows.Forms.DataGridViewTextBoxColumn colROrderDate; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5; + private System.Windows.Forms.DataGridViewImageColumn dataGridViewImageColumn1; + private System.Windows.Forms.DataGridViewTextBoxColumn colRGoodsInfo; + private System.Windows.Forms.DataGridViewTextBoxColumn colROrderAmount; + private System.Windows.Forms.DataGridViewTextBoxColumn colRRefundAmount; + private System.Windows.Forms.DataGridViewTextBoxColumn colRStatus; + private System.Windows.Forms.DataGridViewTextBoxColumn colRMsg; + private System.Windows.Forms.DataGridViewLinkColumn dataGridViewLinkColumn1; + private DevComponents.DotNetBar.PanelEx btnOtherPlatformOrder; } } \ No newline at end of file diff --git a/TEMUKJD/WXForms/TalkForms/BuyerOrderListForm.cs b/TEMUKJD/WXForms/TalkForms/PDDBuyerOrderListForm.cs similarity index 94% rename from TEMUKJD/WXForms/TalkForms/BuyerOrderListForm.cs rename to TEMUKJD/WXForms/TalkForms/PDDBuyerOrderListForm.cs index a05031e..89b135b 100644 --- a/TEMUKJD/WXForms/TalkForms/BuyerOrderListForm.cs +++ b/TEMUKJD/WXForms/TalkForms/PDDBuyerOrderListForm.cs @@ -36,10 +36,10 @@ using Work; namespace TemuKJD.WXForms.TalkForms { - public partial class BuyerOrderListForm : BaseGeneralForm + public partial class PDDBuyerOrderListForm : BaseGeneralForm { - private static BuyerOrderListForm instance = null; - public static BuyerOrderListForm Instance { get { if (instance == null || instance.IsDisposed || instance.Disposing) instance = new BuyerOrderListForm(); return instance; } } + private static PDDBuyerOrderListForm instance = null; + public static PDDBuyerOrderListForm Instance { get { if (instance == null || instance.IsDisposed || instance.Disposing) instance = new PDDBuyerOrderListForm(); return instance; } } ShopLoginInfo currentShop { get { return this.lblCurrentShop.Tag as ShopLoginInfo; } } //ConcurrentList lstWxOrderInfoLite { get; set; } = new ConcurrentList(); ConcurrentList lstPddBuyerOrderInfoLite { get; set; } = new ConcurrentList(); @@ -55,7 +55,7 @@ namespace TemuKJD.WXForms.TalkForms bool isInitBuyer = false; bool isReadOrder = false; - public BuyerOrderListForm() + public PDDBuyerOrderListForm() { InitializeComponent(); instance = this; @@ -784,6 +784,7 @@ namespace TemuKJD.WXForms.TalkForms Invoke(new Action(() => { dgvBuyer.Rows.Clear(); + cmbBuyer.Items.Clear(); })); foreach (var buyer in GlobalConfig.BuyerLoginList) @@ -791,6 +792,7 @@ namespace TemuKJD.WXForms.TalkForms Invoke(new Action(() => { BindBuyer(buyer, "", ids); + cmbBuyer.Items.Add(buyer.buyer_nick); })); } } @@ -1676,6 +1678,12 @@ namespace TemuKJD.WXForms.TalkForms { ShowOrder(order); })); + PddBuyerAfterSaleInfoLite afterSale = new PddBuyerAfterSaleInfoLite(); + afterSale.listItemStatusVO = new ListItemStatusVO(); + afterSale.listItemStatusVO.statusText = "退款成功"; + afterSale.listItemExtraVO = new ListItemExtraVO(); + afterSale.listItemExtraVO.navToDetailPageUrl = "&order_sn=" + txtForceSendAfterSale.Text.Trim(); + SendAfterSaleE57(afterSale, true); return "{\"success\":true,\"msg\":\"操作成功\"}"; } else @@ -1688,7 +1696,7 @@ namespace TemuKJD.WXForms.TalkForms } // 向服务端更新售后退货信息更新状态 - public void SendAfterSaleE57(PddBuyerAfterSaleInfoLite afterSale, bool resetSendStatus = false) + public void SendAfterSaleE57(PddBuyerAfterSaleInfoLite afterSale, bool resetSendStatus = false, bool isManualSendNoRecordCancelOrder = false) { if (resetSendStatus) afterSale.sendStatus = ""; @@ -1742,11 +1750,21 @@ namespace TemuKJD.WXForms.TalkForms afterSale.sendStatus = "发送失败 " + exportRst; NaiBa.Util.Helper.ConfigHelper.SaveConfig("pdd_buyer_after_sale_list", lstPddBuyerAfterSaleInfoLite); } + Invoke(new Action(() => { - ShowAfterSale(afterSale); + var after = lstPddBuyerAfterSaleInfoLite.FirstOrDefault(a => a.orderSn == afterSale.orderSn); + if (after != null) + { + after.sendStatus = afterSale.sendStatus; + ShowAfterSale(after); + } + + if (isManualSendNoRecordCancelOrder) + { + BaseMsgForm.ShowInfo(afterSale.sendStatus); + } })); - //Thread.Sleep(500); } private void btnClose_Click(object sender, EventArgs e) @@ -1790,19 +1808,26 @@ namespace TemuKJD.WXForms.TalkForms { foreach(DataGridViewRow row in dgvPddBuyerOrder.Rows) { - if (!row.Cells["colOPddOrderSn"].Value.ParseToString().Contains(txtOrderSnFilter.Text.Trim()) && !row.Cells["colOBuyerName"].Value.ParseToString().Contains(txtOrderSnFilter.Text.Trim())) + if (!row.Cells["colOPddOrderSn"].Value.ParseToString().Contains(txtOrderSnFilter.Text.Trim()) && + !row.Cells["colOBuyerName"].Value.ParseToString().Contains(txtOrderSnFilter.Text.Trim()) && + !row.Cells["colOMsg"].Value.ParseToString().Contains(txtOrderSnFilter.Text.Trim())) + { row.Visible = false; - else if (!row.Cells["colOMsg"].Value.ParseToString().Contains(txtOrderMsgFilter.Text.Trim())) + continue; + } + if (chkHideSuccessOrder.Checked && row.Cells["colOMsg"].Value.ParseToString().Contains("外采订单已发货")) + { row.Visible = false; - else - row.Visible = true; + continue; + } + row.Visible = true; } foreach (DataGridViewRow row in dgvAfterSale.Rows) { - if (!row.Cells["colRPddOrderSn"].Value.ParseToString().Contains(txtOrderSnFilter.Text.Trim()) && !row.Cells["colRBuyerName"].Value.ParseToString().Contains(txtOrderSnFilter.Text.Trim()) && - !row.Cells["colRAfterSaleId"].Value.ParseToString().Contains(txtOrderSnFilter.Text.Trim())) - row.Visible = false; - else if (!row.Cells["colRMsg"].Value.ParseToString().Contains(txtOrderMsgFilter.Text.Trim())) + if (!row.Cells["colRPddOrderSn"].Value.ParseToString().Contains(txtOrderSnFilter.Text.Trim()) && + !row.Cells["colRBuyerName"].Value.ParseToString().Contains(txtOrderSnFilter.Text.Trim()) && + !row.Cells["colRAfterSaleId"].Value.ParseToString().Contains(txtOrderSnFilter.Text.Trim()) && + !row.Cells["colRMsg"].Value.ParseToString().Contains(txtOrderSnFilter.Text.Trim())) row.Visible = false; else row.Visible = true; @@ -1832,11 +1857,19 @@ namespace TemuKJD.WXForms.TalkForms { this.dgvPddBuyerOrder.SendToBack(); btnExchange.Text = "切换订单"; + btnForceSendAfterSale.Visible = true; + lblForceSendAfterSale.Visible = true; + txtForceSendAfterSale.Visible = true; + cmbBuyer.Visible = true; } else { this.dgvAfterSale.SendToBack(); btnExchange.Text = "切换售后"; + btnForceSendAfterSale.Visible = false; + lblForceSendAfterSale.Visible = false; + txtForceSendAfterSale.Visible = false; + cmbBuyer.Visible = false; } } @@ -1872,6 +1905,70 @@ namespace TemuKJD.WXForms.TalkForms break; } } + + private void btnForceSendAfterSale_Click(object sender, EventArgs e) + { + if (cmbBuyer.Text == "666") + { + Task.Run(() => + { + var orderId = txtForceSendAfterSale.Text.Trim(); + + PddBuyerAfterSaleInfoLite afterSale = new PddBuyerAfterSaleInfoLite(); + afterSale.listItemStatusVO = new ListItemStatusVO(); + afterSale.listItemStatusVO.statusText = "退款成功"; + afterSale.listItemExtraVO = new ListItemExtraVO(); + afterSale.listItemExtraVO.navToDetailPageUrl = "&order_sn=" + orderId; + SendAfterSaleE57(afterSale, true, true); + }); + return; + } + + var buyer = GlobalConfig.BuyerLoginList.FirstOrDefault(b => b.buyer_nick == cmbBuyer.Text.Trim()); + if (cmbBuyer.Text.Trim().IsNullOrEmpty() || buyer == null) + { + BaseMsgForm.ShowError("请选择买手！"); + return; + } + if (txtForceSendAfterSale.Text.Trim().IsNullOrEmpty() || !txtForceSendAfterSale.Text.Trim().Contains("-")) + { + BaseMsgForm.ShowError("请填写正确买手订单格式！"); + return; + } + + Task.Run(() => + { + var orderId = txtForceSendAfterSale.Text.Trim(); + var rst = YkdBuyerOrder.GetSearchOrder(buyer, orderId); + if (!rst.Contains("订单已取消") && !rst.Contains("退款成功")) + { + BaseMsgForm.ShowError("买手下未找到订单售后退款成功信息，请确定订单存在且订单已取消或退款。"); + return; + } + + PddBuyerAfterSaleInfoLite afterSale = new PddBuyerAfterSaleInfoLite(); + afterSale.listItemStatusVO = new ListItemStatusVO(); + afterSale.listItemStatusVO.statusText = "退款成功"; + afterSale.listItemExtraVO = new ListItemExtraVO(); + afterSale.listItemExtraVO.navToDetailPageUrl = "&order_sn=" + orderId; + SendAfterSaleE57(afterSale, true, true); + }); + } + + private void chkHideSuccessOrder_CheckedChanged(object sender, EventArgs e) + { + btnFilterOrder_Click(sender, e); + } + + private void btnOtherPlatformOrder_Click(object sender, EventArgs e) + { + if (OtherBuyerOrderListForm.Instance == null) + { + OtherBuyerOrderListForm bo = new OtherBuyerOrderListForm(); + } + OtherBuyerOrderListForm.Instance.Hide(); + OtherBuyerOrderListForm.Instance.Show(); + } } public class YkdBuyerOrder @@ -1897,6 +1994,18 @@ namespace TemuKJD.WXForms.TalkForms var rst = YkdHttpResponseBLL.YangkeduoPostResponse(buyer, url, body, referer); return rst; } + + public static string GetSearchOrder(BuyerLoginInfo buyer, string orderSn) + { + //1778823980132_ro0aie9x73 + var page_id = "10032_" + BaseClass.DateTimeToTimestampMilliseconds(DateTime.Now) + "_" + Randomx.GetWordWithNumber(10); + string url = "https://mobile.yangkeduo.com/transac_orders_search_results.html?keyWord=" + orderSn + + "&type=0&main_orders=1&refer_page_name=my_order&refer_page_id=" + page_id + "&refer_page_sn=10032"; + + string refere = "https://mobile.yangkeduo.com/orders.html?type=0&comment_tab=1&combine_orders=1&main_orders=1&refer_page_name=personal&refer_page_id=&refer_page_sn=10001&page_id=" + page_id + "&is_back=1"; + var rst = YkdHttpResponseBLL.YangkeduoGetSearchOrderResponse(buyer, url, refere); + return rst; + } } public class WxOrder diff --git a/TEMUKJD/WXForms/TalkForms/BuyerOrderListForm.resx b/TEMUKJD/WXForms/TalkForms/PDDBuyerOrderListForm.resx similarity index 100% rename from TEMUKJD/WXForms/TalkForms/BuyerOrderListForm.resx rename to TEMUKJD/WXForms/TalkForms/PDDBuyerOrderListForm.resx diff --git a/TEMUKJD/WXForms/TalkForms/WxTalkForm.Designer.cs b/TEMUKJD/WXForms/TalkForms/WxTalkForm.Designer.cs index 05cd08c..4debf6e 100644 --- a/TEMUKJD/WXForms/TalkForms/WxTalkForm.Designer.cs +++ b/TEMUKJD/WXForms/TalkForms/WxTalkForm.Designer.cs @@ -81,6 +81,8 @@ namespace TemuKJD.WXForms.TalkForms this.label3 = new System.Windows.Forms.Label(); this.line1 = new DevComponents.DotNetBar.Controls.Line(); this.label5 = new System.Windows.Forms.Label(); + this.panel4 = new System.Windows.Forms.Panel(); + this.btnClose = new DevComponents.DotNetBar.PanelEx(); this.ucTabControl1 = new TemuKJD.UserComponent.UcTabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); this.splitContainer3 = new System.Windows.Forms.SplitContainer(); @@ -123,6 +125,7 @@ namespace TemuKJD.WXForms.TalkForms this.splitContainer4.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dgvShop)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).BeginInit(); + this.panel4.SuspendLayout(); this.ucTabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).BeginInit(); @@ -163,13 +166,14 @@ namespace TemuKJD.WXForms.TalkForms // splitContainer1.Panel1 // this.splitContainer1.Panel1.Controls.Add(this.splitContainer2); + this.splitContainer1.Panel1MinSize = 0; // // splitContainer1.Panel2 // - this.splitContainer1.Panel2.Controls.Add(this.ucTabControl1); + this.splitContainer1.Panel2.Controls.Add(this.panel4); + this.splitContainer1.Panel2MinSize = 0; this.splitContainer1.Size = new System.Drawing.Size(1498, 618); - this.splitContainer1.SplitterDistance = 500; - this.splitContainer1.SplitterWidth = 1; + this.splitContainer1.SplitterDistance = 496; this.splitContainer1.TabIndex = 1; // // splitContainer2 @@ -196,14 +200,14 @@ namespace TemuKJD.WXForms.TalkForms // this.splitContainer2.Panel2.Controls.Add(this.splitContainer4); this.splitContainer2.Panel2.Padding = new System.Windows.Forms.Padding(4, 0, 0, 4); - this.splitContainer2.Size = new System.Drawing.Size(500, 618); - this.splitContainer2.SplitterDistance = 62; + this.splitContainer2.Size = new System.Drawing.Size(496, 618); + this.splitContainer2.SplitterDistance = 60; this.splitContainer2.TabIndex = 0; // // lblProgress // this.lblProgress.AutoSize = true; - this.lblProgress.Location = new System.Drawing.Point(280, 39); + this.lblProgress.Location = new System.Drawing.Point(280, 40); this.lblProgress.Name = "lblProgress"; this.lblProgress.Size = new System.Drawing.Size(74, 17); this.lblProgress.TabIndex = 234; @@ -215,7 +219,7 @@ namespace TemuKJD.WXForms.TalkForms this.btnChangeAddress.Cursor = System.Windows.Forms.Cursors.Hand; this.btnChangeAddress.DisabledBackColor = System.Drawing.Color.Empty; this.btnChangeAddress.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnChangeAddress.Location = new System.Drawing.Point(216, 37); + this.btnChangeAddress.Location = new System.Drawing.Point(216, 38); this.btnChangeAddress.Name = "btnChangeAddress"; this.btnChangeAddress.Size = new System.Drawing.Size(64, 20); this.btnChangeAddress.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -238,7 +242,7 @@ namespace TemuKJD.WXForms.TalkForms this.btnMultiLogin.Cursor = System.Windows.Forms.Cursors.Hand; this.btnMultiLogin.DisabledBackColor = System.Drawing.Color.Empty; this.btnMultiLogin.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnMultiLogin.Location = new System.Drawing.Point(412, 37); + this.btnMultiLogin.Location = new System.Drawing.Point(413, 38); this.btnMultiLogin.Name = "btnMultiLogin"; this.btnMultiLogin.Size = new System.Drawing.Size(83, 20); this.btnMultiLogin.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -258,7 +262,7 @@ namespace TemuKJD.WXForms.TalkForms // this.chkNotShowMessageWindow.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.chkNotShowMessageWindow.AutoSize = true; - this.chkNotShowMessageWindow.Location = new System.Drawing.Point(374, 6); + this.chkNotShowMessageWindow.Location = new System.Drawing.Point(370, 7); this.chkNotShowMessageWindow.Name = "chkNotShowMessageWindow"; this.chkNotShowMessageWindow.Size = new System.Drawing.Size(123, 21); this.chkNotShowMessageWindow.TabIndex = 201; @@ -297,15 +301,15 @@ namespace TemuKJD.WXForms.TalkForms "19号电脑", "20号电脑", "无"}); - this.cmbMessage.Location = new System.Drawing.Point(77, 6); + this.cmbMessage.Location = new System.Drawing.Point(77, 7); this.cmbMessage.Name = "cmbMessage"; - this.cmbMessage.Size = new System.Drawing.Size(289, 20); + this.cmbMessage.Size = new System.Drawing.Size(285, 20); this.cmbMessage.TabIndex = 193; // // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(4, 8); + this.label1.Location = new System.Drawing.Point(4, 9); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(80, 17); this.label1.TabIndex = 197; @@ -317,7 +321,7 @@ namespace TemuKJD.WXForms.TalkForms this.btnSet.Cursor = System.Windows.Forms.Cursors.Hand; this.btnSet.DisabledBackColor = System.Drawing.Color.Empty; this.btnSet.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSet.Location = new System.Drawing.Point(102, 37); + this.btnSet.Location = new System.Drawing.Point(102, 38); this.btnSet.Name = "btnSet"; this.btnSet.Size = new System.Drawing.Size(88, 20); this.btnSet.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -341,14 +345,14 @@ namespace TemuKJD.WXForms.TalkForms this.line4.Location = new System.Drawing.Point(4, 28); this.line4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.line4.Name = "line4"; - this.line4.Size = new System.Drawing.Size(493, 8); + this.line4.Size = new System.Drawing.Size(489, 8); this.line4.TabIndex = 180; this.line4.Text = "line4"; // // chkIsAutoReply // this.chkIsAutoReply.AutoSize = true; - this.chkIsAutoReply.Location = new System.Drawing.Point(6, 38); + this.chkIsAutoReply.Location = new System.Drawing.Point(6, 39); this.chkIsAutoReply.Name = "chkIsAutoReply"; this.chkIsAutoReply.Size = new System.Drawing.Size(99, 21); this.chkIsAutoReply.TabIndex = 0; @@ -389,8 +393,8 @@ namespace TemuKJD.WXForms.TalkForms this.splitContainer4.Panel2.Controls.Add(this.label3); this.splitContainer4.Panel2.Controls.Add(this.line1); this.splitContainer4.Panel2.Controls.Add(this.label5); - this.splitContainer4.Size = new System.Drawing.Size(496, 548); - this.splitContainer4.SplitterDistance = 450; + this.splitContainer4.Size = new System.Drawing.Size(492, 550); + this.splitContainer4.SplitterDistance = 452; this.splitContainer4.TabIndex = 7; // // dgvShop @@ -435,7 +439,7 @@ namespace TemuKJD.WXForms.TalkForms this.dgvShop.ReadOnly = true; this.dgvShop.RowHeadersWidth = 25; this.dgvShop.RowTemplate.Height = 23; - this.dgvShop.Size = new System.Drawing.Size(496, 450); + this.dgvShop.Size = new System.Drawing.Size(492, 452); this.dgvShop.TabIndex = 7; this.dgvShop.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellClick); this.dgvShop.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellContentClick); @@ -564,8 +568,7 @@ namespace TemuKJD.WXForms.TalkForms // // cmbFiltGroups // - this.cmbFiltGroups.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.cmbFiltGroups.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.cmbFiltGroups.DefaultText = "全部"; this.cmbFiltGroups.DropDownHeight = 1; this.cmbFiltGroups.DropDownWidth = 1; @@ -579,9 +582,9 @@ namespace TemuKJD.WXForms.TalkForms // // pbLoading // - this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None; + this.pbLoading.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue; - this.pbLoading.Location = new System.Drawing.Point(408, 2); + this.pbLoading.Location = new System.Drawing.Point(410, 2); this.pbLoading.Name = "pbLoading"; this.pbLoading.Size = new System.Drawing.Size(25, 25); this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -839,7 +842,7 @@ namespace TemuKJD.WXForms.TalkForms this.line1.ForeColor = System.Drawing.Color.Silver; this.line1.Location = new System.Drawing.Point(4, 26); this.line1.Name = "line1"; - this.line1.Size = new System.Drawing.Size(487, 10); + this.line1.Size = new System.Drawing.Size(483, 10); this.line1.TabIndex = 242; this.line1.Text = "line1"; // @@ -853,6 +856,41 @@ namespace TemuKJD.WXForms.TalkForms this.label5.TabIndex = 774; this.label5.Text = "店铺分组："; // + // panel4 + // + this.panel4.Controls.Add(this.btnClose); + this.panel4.Controls.Add(this.ucTabControl1); + this.panel4.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel4.Location = new System.Drawing.Point(0, 0); + this.panel4.Name = "panel4"; + this.panel4.Size = new System.Drawing.Size(998, 618); + this.panel4.TabIndex = 906; + // + // btnClose + // + this.btnClose.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.btnClose.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnClose.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnClose.DisabledBackColor = System.Drawing.Color.Empty; + this.btnClose.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnClose.Location = new System.Drawing.Point(2, 284); + this.btnClose.Name = "btnClose"; + this.btnClose.Size = new System.Drawing.Size(12, 50); + this.btnClose.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnClose.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnClose.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnClose.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnClose.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnClose.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnClose.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnClose.Style.GradientAngle = 90; + this.btnClose.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnClose.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnClose.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnClose.TabIndex = 902; + this.btnClose.Text = "<<"; + this.btnClose.Click += new System.EventHandler(this.btnClose_Click); + // // ucTabControl1 // this.ucTabControl1.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(251)))), ((int)(((byte)(251)))), ((int)(((byte)(251))))); @@ -861,12 +899,13 @@ namespace TemuKJD.WXForms.TalkForms this.ucTabControl1.Controls.Add(this.tabPage3); this.ucTabControl1.Dock = System.Windows.Forms.DockStyle.Fill; this.ucTabControl1.Font = new System.Drawing.Font("微软雅黑", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.ucTabControl1.ItemSize = new System.Drawing.Size(80, 31); + this.ucTabControl1.ItemSize = new System.Drawing.Size(330, 36); this.ucTabControl1.Location = new System.Drawing.Point(0, 0); + this.ucTabControl1.Multiline = true; this.ucTabControl1.Name = "ucTabControl1"; this.ucTabControl1.SelectedIndex = 0; this.ucTabControl1.ShowCloseButton = false; - this.ucTabControl1.Size = new System.Drawing.Size(997, 618); + this.ucTabControl1.Size = new System.Drawing.Size(998, 618); this.ucTabControl1.TabIndex = 0; this.ucTabControl1.TabSelectColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.ucTabControl1.TabSelectTextColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -876,10 +915,10 @@ namespace TemuKJD.WXForms.TalkForms // this.tabPage1.Controls.Add(this.splitContainer3); this.tabPage1.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tabPage1.Location = new System.Drawing.Point(2, 35); + this.tabPage1.Location = new System.Drawing.Point(2, 40); this.tabPage1.Name = "tabPage1"; - this.tabPage1.Padding = new System.Windows.Forms.Padding(3); - this.tabPage1.Size = new System.Drawing.Size(991, 579); + this.tabPage1.Padding = new System.Windows.Forms.Padding(0, 3, 0, 0); + this.tabPage1.Size = new System.Drawing.Size(992, 574); this.tabPage1.TabIndex = 0; this.tabPage1.Text = "客服窗口"; this.tabPage1.UseVisualStyleBackColor = true; @@ -888,7 +927,7 @@ namespace TemuKJD.WXForms.TalkForms // this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill; this.splitContainer3.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; - this.splitContainer3.Location = new System.Drawing.Point(3, 3); + this.splitContainer3.Location = new System.Drawing.Point(0, 3); this.splitContainer3.Name = "splitContainer3"; this.splitContainer3.Orientation = System.Windows.Forms.Orientation.Horizontal; // @@ -902,7 +941,7 @@ namespace TemuKJD.WXForms.TalkForms // splitContainer3.Panel2 // this.splitContainer3.Panel2.Controls.Add(this.pnlTalk); - this.splitContainer3.Size = new System.Drawing.Size(985, 573); + this.splitContainer3.Size = new System.Drawing.Size(992, 571); this.splitContainer3.SplitterDistance = 25; this.splitContainer3.TabIndex = 2; // @@ -939,7 +978,7 @@ namespace TemuKJD.WXForms.TalkForms this.btnToKfMainPage.Cursor = System.Windows.Forms.Cursors.Hand; this.btnToKfMainPage.DisabledBackColor = System.Drawing.Color.Empty; this.btnToKfMainPage.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnToKfMainPage.Location = new System.Drawing.Point(898, 2); + this.btnToKfMainPage.Location = new System.Drawing.Point(905, 2); this.btnToKfMainPage.Name = "btnToKfMainPage"; this.btnToKfMainPage.Size = new System.Drawing.Size(88, 23); this.btnToKfMainPage.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -992,7 +1031,7 @@ namespace TemuKJD.WXForms.TalkForms this.txtAddress.Location = new System.Drawing.Point(66, 1); this.txtAddress.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.txtAddress.Name = "txtAddress"; - this.txtAddress.Size = new System.Drawing.Size(830, 23); + this.txtAddress.Size = new System.Drawing.Size(837, 23); this.txtAddress.TabIndex = 12; this.txtAddress.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtAddress_KeyDown); // @@ -1007,7 +1046,7 @@ namespace TemuKJD.WXForms.TalkForms this.pnlTalk.Dock = System.Windows.Forms.DockStyle.Fill; this.pnlTalk.Location = new System.Drawing.Point(0, 0); this.pnlTalk.Name = "pnlTalk"; - this.pnlTalk.Size = new System.Drawing.Size(985, 544); + this.pnlTalk.Size = new System.Drawing.Size(992, 542); this.pnlTalk.TabIndex = 1; // // textBox1 @@ -1019,7 +1058,7 @@ namespace TemuKJD.WXForms.TalkForms this.textBox1.Multiline = true; this.textBox1.Name = "textBox1"; this.textBox1.ScrollBars = System.Windows.Forms.ScrollBars.Both; - this.textBox1.Size = new System.Drawing.Size(555, 422); + this.textBox1.Size = new System.Drawing.Size(562, 420); this.textBox1.TabIndex = 208; this.textBox1.Visible = false; // @@ -1027,7 +1066,7 @@ namespace TemuKJD.WXForms.TalkForms // this.lblAutoReplyStatus.AutoSize = true; this.lblAutoReplyStatus.Dock = System.Windows.Forms.DockStyle.Bottom; - this.lblAutoReplyStatus.Location = new System.Drawing.Point(0, 527); + this.lblAutoReplyStatus.Location = new System.Drawing.Point(0, 525); this.lblAutoReplyStatus.Name = "lblAutoReplyStatus"; this.lblAutoReplyStatus.Size = new System.Drawing.Size(116, 17); this.lblAutoReplyStatus.TabIndex = 207; @@ -1080,7 +1119,7 @@ namespace TemuKJD.WXForms.TalkForms this.txtAutoReplyText.Location = new System.Drawing.Point(17, 45); this.txtAutoReplyText.Multiline = true; this.txtAutoReplyText.Name = "txtAutoReplyText"; - this.txtAutoReplyText.Size = new System.Drawing.Size(156, 50); + this.txtAutoReplyText.Size = new System.Drawing.Size(123, 50); this.txtAutoReplyText.TabIndex = 1; this.txtAutoReplyText.Visible = false; // @@ -1088,10 +1127,10 @@ namespace TemuKJD.WXForms.TalkForms // this.tabPage2.Controls.Add(this.mainPanel); this.tabPage2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.tabPage2.Location = new System.Drawing.Point(2, 35); + this.tabPage2.Location = new System.Drawing.Point(2, 40); this.tabPage2.Name = "tabPage2"; - this.tabPage2.Padding = new System.Windows.Forms.Padding(3); - this.tabPage2.Size = new System.Drawing.Size(991, 579); + this.tabPage2.Padding = new System.Windows.Forms.Padding(0, 3, 0, 0); + this.tabPage2.Size = new System.Drawing.Size(992, 574); this.tabPage2.TabIndex = 1; this.tabPage2.Text = "店铺后台"; this.tabPage2.UseVisualStyleBackColor = true; @@ -1099,17 +1138,17 @@ namespace TemuKJD.WXForms.TalkForms // mainPanel // this.mainPanel.Dock = System.Windows.Forms.DockStyle.Fill; - this.mainPanel.Location = new System.Drawing.Point(3, 3); + this.mainPanel.Location = new System.Drawing.Point(0, 3); this.mainPanel.Name = "mainPanel"; - this.mainPanel.Size = new System.Drawing.Size(985, 573); + this.mainPanel.Size = new System.Drawing.Size(992, 571); this.mainPanel.TabIndex = 1; // // tabPage3 // - this.tabPage3.Location = new System.Drawing.Point(2, 35); + this.tabPage3.Location = new System.Drawing.Point(2, 40); this.tabPage3.Name = "tabPage3"; - this.tabPage3.Padding = new System.Windows.Forms.Padding(3); - this.tabPage3.Size = new System.Drawing.Size(991, 579); + this.tabPage3.Padding = new System.Windows.Forms.Padding(0, 3, 0, 0); + this.tabPage3.Size = new System.Drawing.Size(992, 574); this.tabPage3.TabIndex = 2; this.tabPage3.Text = "订单管理"; this.tabPage3.UseVisualStyleBackColor = true; @@ -1219,6 +1258,7 @@ namespace TemuKJD.WXForms.TalkForms this.splitContainer4.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.dgvShop)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).EndInit(); + this.panel4.ResumeLayout(false); this.ucTabControl1.ResumeLayout(false); this.tabPage1.ResumeLayout(false); this.splitContainer3.Panel1.ResumeLayout(false); @@ -1309,5 +1349,7 @@ namespace TemuKJD.WXForms.TalkForms private System.Windows.Forms.DataGridViewCheckBoxColumn colCanUse; private UserComponent.UcComboBoxMutiSelect cmbFiltGroups; private System.Windows.Forms.Label label5; + private DevComponents.DotNetBar.PanelEx btnClose; + private System.Windows.Forms.Panel panel4; } } \ No newline at end of file diff --git a/TEMUKJD/WXForms/TalkForms/WxTalkForm.cs b/TEMUKJD/WXForms/TalkForms/WxTalkForm.cs index a09b407..54c72c9 100644 --- a/TEMUKJD/WXForms/TalkForms/WxTalkForm.cs +++ b/TEMUKJD/WXForms/TalkForms/WxTalkForm.cs @@ -81,7 +81,7 @@ namespace TemuKJD.WXForms.TalkForms public static Dictionary dicRowColor = new Dictionary(); public List LstTagShop = new List(); - public BuyerOrderListForm orderListForm = null; + public PDDBuyerOrderListForm orderListForm = null; public int LocationXY = 0; public int LocationSize = 200; @@ -432,7 +432,7 @@ namespace TemuKJD.WXForms.TalkForms { Invoke(new Action(() => { - orderListForm = new BuyerOrderListForm(); + orderListForm = new PDDBuyerOrderListForm(); orderListForm.TopLevel = false; orderListForm.FormBorderStyle = FormBorderStyle.None; orderListForm.Dock = DockStyle.Fill; @@ -1797,6 +1797,20 @@ namespace TemuKJD.WXForms.TalkForms //订单编号###亲，您的这笔订单已核实，请问是遇到什么问题了呢？ //退款成功###亲，您的退款已办理成功，欢迎下次光临哦!"; + private void btnClose_Click(object sender, EventArgs e) + { + if (btnClose.Text == ">>") + { + splitContainer1.SplitterDistance = 496; + btnClose.Text = "<<"; + } + else + { + splitContainer1.SplitterDistance = 0; + btnClose.Text = ">>"; + } + } + //https://store.weixin.qq.com/shop-faas/mmchannelstradeorder/list/cgi/orderSearch?token=&lang=zh_CN //https://store.weixin.qq.com/shop/order/list