diff --git a/AllBase/AllBase.csproj b/AllBase/AllBase.csproj index d8a13b6..f032902 100644 --- a/AllBase/AllBase.csproj +++ b/AllBase/AllBase.csproj @@ -150,7 +150,9 @@ - + + Always + diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs index ee9e0fb..a64a21e 100644 --- a/AllBase/BaseClass.cs +++ b/AllBase/BaseClass.cs @@ -27,7 +27,7 @@ namespace AllBase /// /// 版本ID /// - public static int VersionCount = 1136; + public static int VersionCount = 1162; public static string MainPath = "29wx"; //public static string MainPath = "29wx"; //public static string MainPath = "29pdd"; diff --git a/AllBase/Model/Result/TemuDBProductSelect.cs b/AllBase/Model/Result/TemuDBProductSelect.cs index 0a7c9fb..6e72932 100644 --- a/AllBase/Model/Result/TemuDBProductSelect.cs +++ b/AllBase/Model/Result/TemuDBProductSelect.cs @@ -34,6 +34,7 @@ namespace AllBase.Model.Result get { return string.IsNullOrWhiteSpace(_fission_product_name) ? product_name : _fission_product_name; } set { _fission_product_name = value; } } + public bool is_fission_title { get; set; } = false; #region 外键连接属性 public string from_shop_id { get; set; } diff --git a/AllBase/Model/Result/WXResult/WxOptimizeOrderAfterSaleInfo.cs b/AllBase/Model/Result/WXResult/WxOptimizeOrderAfterSaleInfo.cs index 70c5347..4ae372d 100644 --- a/AllBase/Model/Result/WXResult/WxOptimizeOrderAfterSaleInfo.cs +++ b/AllBase/Model/Result/WXResult/WxOptimizeOrderAfterSaleInfo.cs @@ -26,6 +26,13 @@ namespace AllBase.Model.Result.WXResult /// 收货 区 /// public string district‌ { get; set; } + /// + /// 商品Id + /// + public string spuId { get { return orderInfo.spuId; } } + public string skuId { get; set; } + public string skuCode { get { return orderInfo.skuCode; } } + public int? cnt { get { return orderInfo.productCnt; } } public AfterSaleOrderInfo orderInfo { get; set; } diff --git a/AllBase/Model/Result/WXResult/WxOptimizeOrderWayBillInfo.cs b/AllBase/Model/Result/WXResult/WxOptimizeOrderWayBillInfo.cs index e8db270..431a53c 100644 --- a/AllBase/Model/Result/WXResult/WxOptimizeOrderWayBillInfo.cs +++ b/AllBase/Model/Result/WXResult/WxOptimizeOrderWayBillInfo.cs @@ -26,6 +26,13 @@ namespace AllBase.Model.Result.WXResult /// 收货 区 /// public string district‌ { get; set; } + /// + /// 商品Id + /// + public string spuId { get { return orderInfo.spuId; } } + public string skuId { get; set; } + public string skuCode { get { return orderInfo.skuCode; } } + public int? cnt { get { return orderInfo.productCnt; } } public WayBillOrderInfo orderInfo { get; set; } diff --git a/AllBase/Model/Result/WXResult/WxOptimizeProductEvaluationInfo.cs b/AllBase/Model/Result/WXResult/WxOptimizeProductEvaluationInfo.cs index 9fbcf37..f241028 100644 --- a/AllBase/Model/Result/WXResult/WxOptimizeProductEvaluationInfo.cs +++ b/AllBase/Model/Result/WXResult/WxOptimizeProductEvaluationInfo.cs @@ -27,6 +27,13 @@ namespace AllBase.Model.Result.WXResult /// 收货 区 /// public string district‌ { get; set; } + /// + /// 商品Id + /// + public string spuId { get { return productInfo.productId; } } + public string skuId { get { return productInfo.skuId; } } + public string skuCode { get; set; } + public int? cnt { get; set; } public string productEvaluationId { get; set; } // "53890834526", diff --git a/KJDService/KJD_WebService/BLL/BXX/BXXProductManage.cs b/KJDService/KJD_WebService/BLL/BXX/BXXProductManage.cs index a992407..9e1c369 100644 --- a/KJDService/KJD_WebService/BLL/BXX/BXXProductManage.cs +++ b/KJDService/KJD_WebService/BLL/BXX/BXXProductManage.cs @@ -1643,7 +1643,7 @@ namespace KJD_Web.BLL.BXX // 供应商货源是否已完成初始设置 if (!string.IsNullOrEmpty(is_supplier_prod_ok)) { - if (is_supplier_prod_ok == "1" || is_supplier_prod_ok == "已设置") + if (is_supplier_prod_ok == "1" || is_supplier_prod_ok == "是" || is_supplier_prod_ok == "已设置") where += " and wx_cat_leaf IS NOT NULL and send_to_out_server=1 and distribution_set=1"; else where += " and (wx_cat_leaf IS NULL or send_to_out_server!=1 or distribution_set=0)"; diff --git a/KJDService/KJD_WebService/BLL/KJD/UpadteManage.cs b/KJDService/KJD_WebService/BLL/KJD/UpdateManage.cs similarity index 59% rename from KJDService/KJD_WebService/BLL/KJD/UpadteManage.cs rename to KJDService/KJD_WebService/BLL/KJD/UpdateManage.cs index bcd96ae..7161248 100644 --- a/KJDService/KJD_WebService/BLL/KJD/UpadteManage.cs +++ b/KJDService/KJD_WebService/BLL/KJD/UpdateManage.cs @@ -2,12 +2,13 @@ using NaiBa.Util.Extension; using System; using System.Collections.Generic; +using System.IO; using System.Linq; using System.Web; namespace KJD_Web.BLL { - public class UpadteManage + public class UpdateManage { public string GetUpdate(string inputData) { @@ -62,6 +63,8 @@ namespace KJD_Web.BLL if (time1 != EncrypUtil.Encryption(time)) return "{\"code\":50000,\"msg\":\"校验失败\"}"; + var path = RegexUtils.GetStringQuery(ref inputData, "path"); + var version = RegexUtils.GetStringQuery(ref inputData, "version").ParseToInt(); var serverVersion = System.Configuration.ConfigurationManager.ConnectionStrings["UpdateVersion"].ConnectionString; var UpdateNewUrl = System.Configuration.ConfigurationManager.ConnectionStrings["UpdateNewUrl"].ConnectionString; @@ -71,6 +74,58 @@ namespace KJD_Web.BLL if (version > LowVersion.ParseToInt()) { + if (path != null) + { + try + { + var fileDir = System.Configuration.ConfigurationManager.ConnectionStrings["UpdateFileDir"].ConnectionString; + if (path == "29wx") + { + var file = Directory.GetFiles(fileDir); + var versionTmp = 0; + foreach (var f in file) + { + var v = Path.GetFileName(f).Replace("Update29wx", "").Replace(".zip", "").ParseToInt(); + if (v > versionTmp && v <= serverVersion.ParseToInt()) + { + versionTmp = v; + } + } + if (versionTmp > 0) + { + serverVersion = versionTmp.ToString(); + return "{\"code\":200,\"msg\":\"success\",\"next_version\":" + serverVersion + ",\"exe_check\":\"" + UpdateExeChk + + "\",\"exe_address\":\"" + UpdateExe + "\",\"file_address\":\"" + UpdateNewUrl + "Update" + serverVersion + ".zip\"}"; + } + } + if (path == "29pdd") + { + var file = Directory.GetFiles(fileDir); + var versionTmp = 0; + foreach (var f in file) + { + var v = Path.GetFileName(f).Replace("Update29pdd", "").Replace(".zip", "").ParseToInt(); + if (v > versionTmp && v <= serverVersion.ParseToInt()) + { + versionTmp = v; + } + } + if (versionTmp > 0) + { + serverVersion = versionTmp.ToString(); + return "{\"code\":200,\"msg\":\"success\",\"next_version\":" + serverVersion + ",\"exe_check\":\"" + UpdateExeChk + + "\",\"exe_address\":\"" + UpdateExe + "\",\"file_address\":\"" + UpdateNewUrl + "Update" + serverVersion + ".zip\"}"; + } + } + } + catch (Exception ex) + { + //return "{\"code\":500,\"msg\":\"升级文件查询失败\"}"; + } + } + + if (serverVersion.ParseToInt() > 1159) + serverVersion = 1159.ToString(); return "{\"code\":200,\"msg\":\"success\",\"next_version\":" + serverVersion + ",\"exe_check\":\"" + UpdateExeChk + "\",\"exe_address\":\"" + UpdateExe + "\",\"file_address\":\"" + UpdateNewUrl + "Update" + serverVersion + ".zip\"}"; } diff --git a/KJDService/KJD_WebService/KJD_WebService.csproj b/KJDService/KJD_WebService/KJD_WebService.csproj index 93da609..6520939 100644 --- a/KJDService/KJD_WebService/KJD_WebService.csproj +++ b/KJDService/KJD_WebService/KJD_WebService.csproj @@ -112,7 +112,7 @@ - + diff --git a/KJDService/KJD_WebService/UpdateService.asmx.cs b/KJDService/KJD_WebService/UpdateService.asmx.cs index a247605..75a0d02 100644 --- a/KJDService/KJD_WebService/UpdateService.asmx.cs +++ b/KJDService/KJD_WebService/UpdateService.asmx.cs @@ -61,7 +61,7 @@ namespace KJD_Web var jsontext = GetRequestJsonString(); var result = jsontext; - result = new UpadteManage().GetUpdate(jsontext); + result = new UpdateManage().GetUpdate(jsontext); Context.Response.Write(result); Context.Response.End(); @@ -73,7 +73,7 @@ namespace KJD_Web var jsontext = GetRequestJsonString(); var result = jsontext; - result = new UpadteManage().GetUpdateNew(jsontext); + result = new UpdateManage().GetUpdateNew(jsontext); Context.Response.Write(result); Context.Response.End(); diff --git a/KJDService/KJD_WebService/Web.config b/KJDService/KJD_WebService/Web.config index 523dd30..5f56a64 100644 --- a/KJDService/KJD_WebService/Web.config +++ b/KJDService/KJD_WebService/Web.config @@ -8,6 +8,7 @@ + diff --git a/PackTools/Publish/Publish/Form1.cs b/PackTools/Publish/Publish/Form1.cs index f031b76..5796c03 100644 --- a/PackTools/Publish/Publish/Form1.cs +++ b/PackTools/Publish/Publish/Form1.cs @@ -23,7 +23,8 @@ namespace Publish { try { - var dir = "..\\AllBase\\BaseClass.cs"; + //var dir = "..\\AllBase\\BaseClass.cs"; + var dir = "BaseClass.cs"; string baseClassStr = File.ReadAllText(dir); var mainPath = baseClassStr.Substring(baseClassStr.IndexOf("MainPath = \"") + "MainPath = \"".Length); mainPath = mainPath.Split('\"')[0]; diff --git a/PackTools/package260528pdd.nsi b/PackTools/package260528pdd.nsi index 3ae82f0..0031668 100644 --- a/PackTools/package260528pdd.nsi +++ b/PackTools/package260528pdd.nsi @@ -65,7 +65,7 @@ Section "MainSection" SEC01 SetOverwrite on ;/x ųĿ¼ļ ;File /r /x "Config.xml" /x "choice.debug.tools" /x "DB.dll" /x "Publish.exe" /x "AllBase.pdb" /x "Work.pdb" /x "29Ӧ.pdb" /x "data" "${BIN_PATH}\*.*" - File /r /x "Config.xml" /x "choice.debug.tools" /x "DB.dll" /x "Publish.exe" /x "*.pdb" /x "*.zip" /x "data" /x "Cache" /x "29wx.lnk" /x "29wx.ico" "${BIN_PATH}\*.*" + File /r /x "BaseClass.cs" /x "Config.xml" /x "choice.debug.tools" /x "DB.dll" /x "Publish.exe" /x "*.pdb" /x "*.zip" /x "data" /x "Cache" /x "29wx.lnk" /x "29wx.ico" "${BIN_PATH}\*.*" CreateDirectory "$SMPROGRAMS\29Ӧ-ƴ" CreateShortCut "$SMPROGRAMS\29Ӧ-ƴ\29Ӧ-ƴ.lnk" "$INSTDIR\29Ӧ.exe" "" "$INSTDIR\29pdd.ico" CreateShortCut "$DESKTOP\29Ӧ-ƴ.lnk" "$INSTDIR\29Ӧ.exe" "" "$INSTDIR\29pdd.ico" diff --git a/PackTools/package260528wx.nsi b/PackTools/package260528wx.nsi index ccf05be..b5a4abc 100644 --- a/PackTools/package260528wx.nsi +++ b/PackTools/package260528wx.nsi @@ -64,7 +64,7 @@ Section "MainSection" SEC01 SetOverwrite on ;/x ųĿ¼ļ ;File /r /x "Config.xml" /x "choice.debug.tools" /x "DB.dll" /x "Publish.exe" /x "AllBase.pdb" /x "Work.pdb" /x "29Ӧ.pdb" /x "data" "${BIN_PATH}\*.*" - File /r /x "Config.xml" /x "choice.debug.tools" /x "DB.dll" /x "Publish.exe" /x "*.pdb" /x "*.zip" /x "data" /x "Cache" /x "29pdd.lnk" /x "29pdd.ico" "${BIN_PATH}\*.*" + File /r /x "BaseClass.cs" /x "Config.xml" /x "choice.debug.tools" /x "DB.dll" /x "Publish.exe" /x "*.pdb" /x "*.zip" /x "data" /x "Cache" /x "29pdd.lnk" /x "29pdd.ico" "${BIN_PATH}\*.*" CreateDirectory "$SMPROGRAMS\29Ӧ-΢С" CreateShortCut "$SMPROGRAMS\29Ӧ-΢С\29Ӧ-΢С.lnk" "$INSTDIR\29Ӧ.exe" "" "$INSTDIR\29wx.ico" CreateShortCut "$DESKTOP\29Ӧ-΢С.lnk" "$INSTDIR\29Ӧ.exe" "" "$INSTDIR\29wx.ico" diff --git a/TEMUKJD/KJD.csproj b/TEMUKJD/KJD.csproj index 726ecee..9a6690c 100644 --- a/TEMUKJD/KJD.csproj +++ b/TEMUKJD/KJD.csproj @@ -336,11 +336,11 @@ WXUserCollectAuthProdListForm.cs - + Form - - WXUserProdListForm.cs + + WXSelectDBProdListForm.cs Form @@ -409,12 +409,6 @@ WXAdminShopLoginForm.cs - - Form - - - WXDBProdUploadCacheForm.cs - Form @@ -1423,11 +1417,8 @@ WXUserCollectAuthProdListForm.cs - - WXUserProdListForm.cs - - - WXDBProdUploadCacheForm.cs + + WXSelectDBProdListForm.cs WXFinderSquareForm.cs diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdEditForm.Designer.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdEditForm.Designer.cs index cdaf935..c0cd3ed 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdEditForm.Designer.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdEditForm.Designer.cs @@ -31,19 +31,13 @@ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PDDDBProdEditForm)); this.panel2 = new System.Windows.Forms.Panel(); this.btnOk = new TemuKJD.UserControls.ButtonEx(); - this.pnlSkuOption = new System.Windows.Forms.Panel(); - this.label9 = new System.Windows.Forms.Label(); - this.btnBookImg = new DevComponents.DotNetBar.PanelEx(); - this.pictureBox2 = new System.Windows.Forms.PictureBox(); - this.buttonEx1 = new TemuKJD.UserControls.ButtonEx(); - this.btnSelect = new TemuKJD.UserControls.ButtonEx(); - this.btnEditDetail = new DevComponents.DotNetBar.PanelEx(); this.label7 = new System.Windows.Forms.Label(); this.txtFissionWords = new DevComponents.DotNetBar.Controls.TextBoxX(); this.txtEndWords = new System.Windows.Forms.TextBox(); this.label6 = new System.Windows.Forms.Label(); this.txtHeadWords = new System.Windows.Forms.TextBox(); this.label5 = new System.Windows.Forms.Label(); + this.btnEditDetail = new DevComponents.DotNetBar.PanelEx(); this.txtProductName = new System.Windows.Forms.TextBox(); this.txtSkcId = new System.Windows.Forms.TextBox(); this.txtSpuId = new System.Windows.Forms.TextBox(); @@ -55,10 +49,16 @@ this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.label8 = new System.Windows.Forms.Label(); this.txtNotes = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.pnlSkuOption = new System.Windows.Forms.Panel(); + this.label9 = new System.Windows.Forms.Label(); + this.btnBookImg = new DevComponents.DotNetBar.PanelEx(); + this.pictureBox2 = new System.Windows.Forms.PictureBox(); + this.buttonEx1 = new TemuKJD.UserControls.ButtonEx(); + this.btnSelect = new TemuKJD.UserControls.ButtonEx(); this.panel2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.pnlSkuOption.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // // panel2 @@ -98,7 +98,7 @@ this.btnOk.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnOk.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnOk.ForeColor = System.Drawing.Color.White; - this.btnOk.Location = new System.Drawing.Point(400, 616); + this.btnOk.Location = new System.Drawing.Point(372, 614); this.btnOk.Margin = new System.Windows.Forms.Padding(2); this.btnOk.Name = "btnOk"; this.btnOk.Size = new System.Drawing.Size(55, 26); @@ -107,119 +107,6 @@ this.btnOk.UseVisualStyleBackColor = false; this.btnOk.Click += new System.EventHandler(this.btnOk_Click); // - // pnlSkuOption - // - this.pnlSkuOption.Controls.Add(this.label9); - this.pnlSkuOption.Controls.Add(this.btnBookImg); - this.pnlSkuOption.Controls.Add(this.pictureBox2); - this.pnlSkuOption.Controls.Add(this.buttonEx1); - this.pnlSkuOption.Controls.Add(this.btnSelect); - this.pnlSkuOption.Location = new System.Drawing.Point(10, 483); - this.pnlSkuOption.Name = "pnlSkuOption"; - this.pnlSkuOption.Size = new System.Drawing.Size(417, 147); - this.pnlSkuOption.TabIndex = 661; - // - // label9 - // - this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(8, 10); - this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(68, 17); - this.label9.TabIndex = 404; - this.label9.Text = "SKU替换图"; - // - // btnBookImg - // - this.btnBookImg.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnBookImg.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnBookImg.DisabledBackColor = System.Drawing.Color.Empty; - this.btnBookImg.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnBookImg.Location = new System.Drawing.Point(332, 5); - this.btnBookImg.Name = "btnBookImg"; - this.btnBookImg.Size = new System.Drawing.Size(85, 26); - this.btnBookImg.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnBookImg.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnBookImg.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnBookImg.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.btnBookImg.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.btnBookImg.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.btnBookImg.Style.ForeColor.Color = System.Drawing.Color.White; - this.btnBookImg.Style.GradientAngle = 90; - this.btnBookImg.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnBookImg.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnBookImg.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnBookImg.TabIndex = 654; - this.btnBookImg.Text = "生成书籍图片"; - this.btnBookImg.Visible = false; - this.btnBookImg.Click += new System.EventHandler(this.btnBookImg_Click); - // - // pictureBox2 - // - this.pictureBox2.Location = new System.Drawing.Point(154, 5); - this.pictureBox2.Name = "pictureBox2"; - this.pictureBox2.Size = new System.Drawing.Size(136, 136); - this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.pictureBox2.TabIndex = 405; - this.pictureBox2.TabStop = false; - this.pictureBox2.Click += new System.EventHandler(this.pictureBox2_Click); - // - // buttonEx1 - // - this.buttonEx1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.buttonEx1.Cursor = System.Windows.Forms.Cursors.Hand; - this.buttonEx1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.buttonEx1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.buttonEx1.ForeColor = System.Drawing.Color.White; - this.buttonEx1.Location = new System.Drawing.Point(79, 114); - this.buttonEx1.Margin = new System.Windows.Forms.Padding(2); - this.buttonEx1.Name = "buttonEx1"; - this.buttonEx1.Size = new System.Drawing.Size(70, 26); - this.buttonEx1.TabIndex = 406; - this.buttonEx1.Text = "上传图片"; - this.buttonEx1.UseVisualStyleBackColor = false; - this.buttonEx1.Visible = false; - this.buttonEx1.Click += new System.EventHandler(this.buttonEx1_Click); - // - // btnSelect - // - this.btnSelect.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnSelect.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnSelect.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnSelect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSelect.ForeColor = System.Drawing.Color.White; - this.btnSelect.Location = new System.Drawing.Point(79, 5); - this.btnSelect.Margin = new System.Windows.Forms.Padding(2); - this.btnSelect.Name = "btnSelect"; - this.btnSelect.Size = new System.Drawing.Size(70, 26); - this.btnSelect.TabIndex = 407; - this.btnSelect.Text = "选择图片"; - this.btnSelect.UseVisualStyleBackColor = false; - this.btnSelect.Click += new System.EventHandler(this.btnSelect_Click); - // - // btnEditDetail - // - this.btnEditDetail.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnEditDetail.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnEditDetail.DisabledBackColor = System.Drawing.Color.Empty; - this.btnEditDetail.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnEditDetail.Location = new System.Drawing.Point(308, 616); - this.btnEditDetail.Name = "btnEditDetail"; - this.btnEditDetail.Size = new System.Drawing.Size(85, 26); - this.btnEditDetail.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnEditDetail.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnEditDetail.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnEditDetail.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.btnEditDetail.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.btnEditDetail.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.btnEditDetail.Style.ForeColor.Color = System.Drawing.Color.White; - this.btnEditDetail.Style.GradientAngle = 90; - this.btnEditDetail.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnEditDetail.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnEditDetail.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnEditDetail.TabIndex = 647; - this.btnEditDetail.Text = "编辑商品SKU"; - this.btnEditDetail.Click += new System.EventHandler(this.btnEditDetail_Click); - // // label7 // this.label7.AutoSize = true; @@ -227,7 +114,7 @@ this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(56, 17); this.label7.TabIndex = 403; - this.label7.Text = "裂变分词"; + this.label7.Text = "裂变标题"; // // txtFissionWords // @@ -249,6 +136,7 @@ this.txtFissionWords.Location = new System.Drawing.Point(90, 386); this.txtFissionWords.Multiline = true; this.txtFissionWords.Name = "txtFissionWords"; + this.txtFissionWords.ScrollBars = System.Windows.Forms.ScrollBars.Both; this.txtFissionWords.Size = new System.Drawing.Size(337, 93); this.txtFissionWords.TabIndex = 402; this.txtFissionWords.WatermarkText = "一行一个"; @@ -287,6 +175,30 @@ this.label5.TabIndex = 398; this.label5.Text = "标题前缀"; // + // btnEditDetail + // + this.btnEditDetail.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnEditDetail.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnEditDetail.DisabledBackColor = System.Drawing.Color.Empty; + this.btnEditDetail.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnEditDetail.Location = new System.Drawing.Point(31, 614); + this.btnEditDetail.Name = "btnEditDetail"; + this.btnEditDetail.Size = new System.Drawing.Size(85, 26); + this.btnEditDetail.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnEditDetail.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnEditDetail.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnEditDetail.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnEditDetail.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnEditDetail.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnEditDetail.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnEditDetail.Style.GradientAngle = 90; + this.btnEditDetail.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnEditDetail.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnEditDetail.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnEditDetail.TabIndex = 647; + this.btnEditDetail.Text = "编辑商品SKU"; + this.btnEditDetail.Click += new System.EventHandler(this.btnEditDetail_Click); + // // txtProductName // this.txtProductName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) @@ -403,6 +315,95 @@ this.txtNotes.Size = new System.Drawing.Size(337, 47); this.txtNotes.TabIndex = 385; // + // pnlSkuOption + // + this.pnlSkuOption.Controls.Add(this.label9); + this.pnlSkuOption.Controls.Add(this.btnBookImg); + this.pnlSkuOption.Controls.Add(this.pictureBox2); + this.pnlSkuOption.Controls.Add(this.buttonEx1); + this.pnlSkuOption.Controls.Add(this.btnSelect); + this.pnlSkuOption.Location = new System.Drawing.Point(10, 483); + this.pnlSkuOption.Name = "pnlSkuOption"; + this.pnlSkuOption.Size = new System.Drawing.Size(417, 147); + this.pnlSkuOption.TabIndex = 661; + // + // label9 + // + this.label9.AutoSize = true; + this.label9.Location = new System.Drawing.Point(8, 10); + this.label9.Name = "label9"; + this.label9.Size = new System.Drawing.Size(68, 17); + this.label9.TabIndex = 404; + this.label9.Text = "SKU替换图"; + // + // btnBookImg + // + this.btnBookImg.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnBookImg.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnBookImg.DisabledBackColor = System.Drawing.Color.Empty; + this.btnBookImg.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnBookImg.Location = new System.Drawing.Point(332, 5); + this.btnBookImg.Name = "btnBookImg"; + this.btnBookImg.Size = new System.Drawing.Size(85, 26); + this.btnBookImg.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnBookImg.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnBookImg.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnBookImg.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnBookImg.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnBookImg.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnBookImg.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnBookImg.Style.GradientAngle = 90; + this.btnBookImg.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnBookImg.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnBookImg.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnBookImg.TabIndex = 654; + this.btnBookImg.Text = "生成书籍图片"; + this.btnBookImg.Visible = false; + this.btnBookImg.Click += new System.EventHandler(this.btnBookImg_Click); + // + // pictureBox2 + // + this.pictureBox2.Location = new System.Drawing.Point(154, 5); + this.pictureBox2.Name = "pictureBox2"; + this.pictureBox2.Size = new System.Drawing.Size(136, 136); + this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pictureBox2.TabIndex = 405; + this.pictureBox2.TabStop = false; + this.pictureBox2.Click += new System.EventHandler(this.pictureBox2_Click); + // + // buttonEx1 + // + this.buttonEx1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.buttonEx1.Cursor = System.Windows.Forms.Cursors.Hand; + this.buttonEx1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.buttonEx1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.buttonEx1.ForeColor = System.Drawing.Color.White; + this.buttonEx1.Location = new System.Drawing.Point(79, 114); + this.buttonEx1.Margin = new System.Windows.Forms.Padding(2); + this.buttonEx1.Name = "buttonEx1"; + this.buttonEx1.Size = new System.Drawing.Size(70, 26); + this.buttonEx1.TabIndex = 406; + this.buttonEx1.Text = "上传图片"; + this.buttonEx1.UseVisualStyleBackColor = false; + this.buttonEx1.Visible = false; + this.buttonEx1.Click += new System.EventHandler(this.buttonEx1_Click); + // + // btnSelect + // + this.btnSelect.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnSelect.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnSelect.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnSelect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnSelect.ForeColor = System.Drawing.Color.White; + this.btnSelect.Location = new System.Drawing.Point(79, 5); + this.btnSelect.Margin = new System.Windows.Forms.Padding(2); + this.btnSelect.Name = "btnSelect"; + this.btnSelect.Size = new System.Drawing.Size(70, 26); + this.btnSelect.TabIndex = 407; + this.btnSelect.Text = "选择图片"; + this.btnSelect.UseVisualStyleBackColor = false; + this.btnSelect.Click += new System.EventHandler(this.btnSelect_Click); + // // PDDDBProdEditForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -417,10 +418,10 @@ this.Controls.SetChildIndex(this.panel2, 0); this.panel2.ResumeLayout(false); this.panel2.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.pnlSkuOption.ResumeLayout(false); this.pnlSkuOption.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); } diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdEditForm.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdEditForm.cs index 799b874..9e44b9a 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdEditForm.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdEditForm.cs @@ -41,7 +41,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.pictureBox1.ImageLocation = dbProd.main_img.Replace("https", "http"); this.txtNotes.Text = dbProd.notes; this.txtExtCode.Text = dbProd.ext_code; - this.txtFissionWords.Text = dbProd.fission_words; + this.txtFissionWords.Text = dbProd.fission_words.Replace("fission_goods_names:", ""); this.txtHeadWords.Text = string.IsNullOrWhiteSpace(dbProd.head_words) ? "5-99个" : dbProd.head_words; this.txtEndWords.Text = string.IsNullOrWhiteSpace(dbProd.end_words) ? "适合不同的搭配风格" : dbProd.end_words; this.txtHeadWords.Text = dbProd.head_words; @@ -74,7 +74,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms "&db_id=" + dbProd.id + "¬es=" + this.txtNotes.Text.Trim(); data += "&product_name=" + this.txtProductName.Text.Trim(); data += "&ext_code=" + this.txtExtCode.Text.Trim(); - data += "&fission_words=" + this.txtFissionWords.Text.Trim(); + if (string.IsNullOrEmpty(this.txtFissionWords.Text.Trim())) + data += "&fission_words="; + else + data += "&fission_words=" + "fission_goods_names:" + this.txtFissionWords.Text.Trim(); data += "&head_words=" + this.txtHeadWords.Text.Trim(); data += "&end_words=" + this.txtEndWords.Text.Trim(); var html = GetHtml.PostUtf8(url, data); @@ -92,7 +95,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms dbProd.ext_code = this.txtExtCode.Text.Trim(); dbProd.head_words = this.txtHeadWords.Text.Trim(); dbProd.end_words = this.txtEndWords.Text.Trim(); - dbProd.fission_words = this.txtFissionWords.Text.Trim(); + if (string.IsNullOrEmpty(this.txtFissionWords.Text.Trim())) + dbProd.fission_words = ""; + else + dbProd.fission_words = "fission_goods_names:" + this.txtFissionWords.Text.Trim(); dbProd.product_name = this.txtProductName.Text.Trim(); this.Close(); } diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdEditNotesForm.Designer.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdEditNotesForm.Designer.cs index 3b5f1b9..99ae309 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdEditNotesForm.Designer.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdEditNotesForm.Designer.cs @@ -30,6 +30,8 @@ { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PDDDBProdEditNotesForm)); this.panel2 = new System.Windows.Forms.Panel(); + this.btnOK1 = new DevComponents.DotNetBar.PanelEx(); + this.btnEditDetail = new DevComponents.DotNetBar.PanelEx(); this.txtProductName = new System.Windows.Forms.TextBox(); this.txtSpuId = new System.Windows.Forms.TextBox(); this.label3 = new System.Windows.Forms.Label(); @@ -37,8 +39,8 @@ this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.label8 = new System.Windows.Forms.Label(); this.txtNotes = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.btnEditDetail = new DevComponents.DotNetBar.PanelEx(); - this.btnOK1 = new DevComponents.DotNetBar.PanelEx(); + this.label7 = new System.Windows.Forms.Label(); + this.txtFissionWords = new DevComponents.DotNetBar.Controls.TextBoxX(); this.panel2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); @@ -46,6 +48,8 @@ // panel2 // this.panel2.BackColor = System.Drawing.Color.White; + this.panel2.Controls.Add(this.label7); + this.panel2.Controls.Add(this.txtFissionWords); this.panel2.Controls.Add(this.btnOK1); this.panel2.Controls.Add(this.btnEditDetail); this.panel2.Controls.Add(this.txtProductName); @@ -58,9 +62,59 @@ this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; this.panel2.Location = new System.Drawing.Point(1, 33); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(464, 372); + this.panel2.Size = new System.Drawing.Size(464, 511); this.panel2.TabIndex = 1; // + // btnOK1 + // + this.btnOK1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.btnOK1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnOK1.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnOK1.DisabledBackColor = System.Drawing.Color.Empty; + this.btnOK1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnOK1.Location = new System.Drawing.Point(381, 467); + this.btnOK1.Name = "btnOK1"; + this.btnOK1.Size = new System.Drawing.Size(46, 26); + this.btnOK1.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnOK1.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnOK1.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnOK1.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnOK1.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnOK1.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnOK1.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnOK1.Style.GradientAngle = 90; + this.btnOK1.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnOK1.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnOK1.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnOK1.TabIndex = 651; + this.btnOK1.Text = "提交"; + this.btnOK1.Click += new System.EventHandler(this.btnOk_Click); + // + // btnEditDetail + // + this.btnEditDetail.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.btnEditDetail.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnEditDetail.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnEditDetail.DisabledBackColor = System.Drawing.Color.Empty; + this.btnEditDetail.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnEditDetail.Location = new System.Drawing.Point(31, 467); + this.btnEditDetail.Name = "btnEditDetail"; + this.btnEditDetail.Size = new System.Drawing.Size(85, 26); + this.btnEditDetail.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnEditDetail.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnEditDetail.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnEditDetail.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnEditDetail.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnEditDetail.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnEditDetail.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnEditDetail.Style.GradientAngle = 90; + this.btnEditDetail.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnEditDetail.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnEditDetail.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnEditDetail.TabIndex = 647; + this.btnEditDetail.Text = "编辑商品SKU"; + this.btnEditDetail.Click += new System.EventHandler(this.btnEditDetail_Click); + // // txtProductName // this.txtProductName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) @@ -141,60 +195,45 @@ this.txtNotes.Size = new System.Drawing.Size(337, 47); this.txtNotes.TabIndex = 385; // - // btnEditDetail + // label7 // - this.btnEditDetail.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.btnEditDetail.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnEditDetail.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnEditDetail.DisabledBackColor = System.Drawing.Color.Empty; - this.btnEditDetail.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnEditDetail.Location = new System.Drawing.Point(308, 337); - this.btnEditDetail.Name = "btnEditDetail"; - this.btnEditDetail.Size = new System.Drawing.Size(85, 26); - this.btnEditDetail.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnEditDetail.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnEditDetail.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnEditDetail.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.btnEditDetail.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.btnEditDetail.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.btnEditDetail.Style.ForeColor.Color = System.Drawing.Color.White; - this.btnEditDetail.Style.GradientAngle = 90; - this.btnEditDetail.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnEditDetail.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnEditDetail.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnEditDetail.TabIndex = 647; - this.btnEditDetail.Text = "编辑商品SKU"; - this.btnEditDetail.Click += new System.EventHandler(this.btnEditDetail_Click); + this.label7.AutoSize = true; + this.label7.Location = new System.Drawing.Point(31, 318); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(56, 17); + this.label7.TabIndex = 659; + this.label7.Text = "裂变标题"; // - // btnOK1 + // txtFissionWords // - this.btnOK1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.btnOK1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnOK1.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnOK1.DisabledBackColor = System.Drawing.Color.Empty; - this.btnOK1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnOK1.Location = new System.Drawing.Point(400, 337); - this.btnOK1.Name = "btnOK1"; - this.btnOK1.Size = new System.Drawing.Size(46, 26); - this.btnOK1.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnOK1.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnOK1.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnOK1.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.btnOK1.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.btnOK1.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.btnOK1.Style.ForeColor.Color = System.Drawing.Color.White; - this.btnOK1.Style.GradientAngle = 90; - this.btnOK1.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnOK1.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnOK1.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnOK1.TabIndex = 651; - this.btnOK1.Text = "提交"; - this.btnOK1.Click += new System.EventHandler(this.btnOk_Click); + this.txtFissionWords.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.txtFissionWords.Border.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.txtFissionWords.Border.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.txtFissionWords.Border.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.txtFissionWords.Border.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.txtFissionWords.Border.Class = "CrumbBarBackgroundKey"; + this.txtFissionWords.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.txtFissionWords.Border.PaddingBottom = 2; + this.txtFissionWords.Border.PaddingLeft = 2; + this.txtFissionWords.Border.PaddingRight = 2; + this.txtFissionWords.Border.PaddingTop = 2; + this.txtFissionWords.Location = new System.Drawing.Point(90, 318); + this.txtFissionWords.Multiline = true; + this.txtFissionWords.Name = "txtFissionWords"; + this.txtFissionWords.ScrollBars = System.Windows.Forms.ScrollBars.Both; + this.txtFissionWords.Size = new System.Drawing.Size(337, 129); + this.txtFissionWords.TabIndex = 658; + this.txtFissionWords.WatermarkText = "一行一个"; // // PDDDBProdEditNotesForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.ClientSize = new System.Drawing.Size(466, 406); + this.ClientSize = new System.Drawing.Size(466, 545); this.Controls.Add(this.panel2); 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"))); @@ -222,5 +261,7 @@ private System.Windows.Forms.Label label8; private DevComponents.DotNetBar.PanelEx btnOK1; private DevComponents.DotNetBar.PanelEx btnEditDetail; + private System.Windows.Forms.Label label7; + private DevComponents.DotNetBar.Controls.TextBoxX txtFissionWords; } } \ No newline at end of file diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdEditNotesForm.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdEditNotesForm.cs index 6e8d330..df6a860 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdEditNotesForm.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdEditNotesForm.cs @@ -40,8 +40,9 @@ namespace TemuKJD.PDDForms.ProductSelectForms txtSpuId.Text = dbProd.spu_id; this.pictureBox1.ImageLocation = dbProd.main_img.Replace("https", "http"); this.txtNotes.Text = dbProd.notes; + this.txtFissionWords.Text = dbProd.fission_words.Replace("fission_goods_names:", ""); - if(string.IsNullOrWhiteSpace(dbProd?.product_json)) + if (string.IsNullOrWhiteSpace(dbProd?.product_json)) { dbProdDetail = GetPddProductDetail(dbProd.id.ToString()); //if (prodTmp != null) @@ -59,6 +60,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms var data = UserLogin.GetSignaturex() + "&db_id=" + dbProd.id + "¬es=" + this.txtNotes.Text.Trim(); data += "&product_name=" + this.txtProductName.Text.Trim(); + if (string.IsNullOrEmpty(this.txtFissionWords.Text.Trim())) + data += "&fission_words="; + else + data += "&fission_words=" + "fission_goods_names:" + this.txtFissionWords.Text.Trim(); var html = GetHtml.PostUtf8(url, data); if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) html = GetHtml.PostUtf8(url, data); @@ -72,6 +77,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms { dbProd.notes = this.txtNotes.Text.Trim(); dbProd.product_name = this.txtProductName.Text.Trim(); + if (string.IsNullOrEmpty(this.txtFissionWords.Text.Trim())) + dbProd.fission_words = ""; + else + dbProd.fission_words = "fission_goods_names:" + this.txtFissionWords.Text.Trim(); this.Close(); } } diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs index 50a3140..d21d393 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs @@ -52,18 +52,21 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.ucTabControlMetro1 = new TemuKJD.UserControls.UcTabControlMetro(); this.tabPage1 = new System.Windows.Forms.TabPage(); this.btnTitleFission = new DevComponents.DotNetBar.PanelEx(); - this.btnExportIdImg = new DevComponents.DotNetBar.PanelEx(); this.btnSetGroup = new DevComponents.DotNetBar.PanelEx(); this.btnDelSelect = new DevComponents.DotNetBar.PanelEx(); this.cmbGroup = new System.Windows.Forms.ComboBox(); - this.btnImport = new DevComponents.DotNetBar.PanelEx(); this.cmbSetWxSafe = new System.Windows.Forms.ComboBox(); this.btnSetWxSafe = new DevComponents.DotNetBar.PanelEx(); + this.tabPage4 = new System.Windows.Forms.TabPage(); + this.btnOutProdSaveDb = new DevComponents.DotNetBar.PanelEx(); + this.btnImport = new DevComponents.DotNetBar.PanelEx(); this.tabPage3 = new System.Windows.Forms.TabPage(); this.chkHighestPriceSku = new TemuKJD.UserComponent.UcCheckBox(this.components); this.txtMinPrice = new System.Windows.Forms.TextBox(); + this.btnExportIdImg = new DevComponents.DotNetBar.PanelEx(); this.txtReplaceText = new System.Windows.Forms.TextBox(); this.label7 = new System.Windows.Forms.Label(); + this.label8 = new System.Windows.Forms.Label(); this.chkSameSpecPrice = new TemuKJD.UserComponent.UcCheckBox(this.components); this.label9 = new System.Windows.Forms.Label(); this.btnExportTxt = new DevComponents.DotNetBar.PanelEx(); @@ -88,6 +91,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.dtpStart = new System.Windows.Forms.DateTimePicker(); this.chkTime = new TemuKJD.UserComponent.UcCheckBox(this.components); this.cmbCat2 = new System.Windows.Forms.ComboBox(); + this.chkNoUserProduct = new TemuKJD.UserComponent.UcCheckBox(this.components); this.label16 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); this.txtSecretStyleCode = new System.Windows.Forms.TextBox(); @@ -174,15 +178,13 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.col_select_product = new System.Windows.Forms.DataGridViewLinkColumn(); this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage(); this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); - this.btnOutProdSaveDb = new DevComponents.DotNetBar.PanelEx(); - this.tabPage4 = new System.Windows.Forms.TabPage(); - this.label8 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); this.splitContainer1.SuspendLayout(); this.ucTabControlMetro1.SuspendLayout(); this.tabPage1.SuspendLayout(); + this.tabPage4.SuspendLayout(); this.tabPage3.SuspendLayout(); this.tabPage2.SuspendLayout(); this.flowLayoutPanel1.SuspendLayout(); @@ -195,7 +197,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.panel2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dgvDbProduct)).BeginInit(); - this.tabPage4.SuspendLayout(); this.SuspendLayout(); // // splitContainer1 @@ -282,34 +283,9 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.btnTitleFission.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); this.btnTitleFission.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); this.btnTitleFission.TabIndex = 784; - this.btnTitleFission.Text = "标题裂变"; + this.btnTitleFission.Text = "AI标题裂变"; this.btnTitleFission.Click += new System.EventHandler(this.btnTitleFission_Click); // - // btnExportIdImg - // - this.btnExportIdImg.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.btnExportIdImg.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnExportIdImg.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnExportIdImg.DisabledBackColor = System.Drawing.Color.Empty; - this.btnExportIdImg.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnExportIdImg.Location = new System.Drawing.Point(270, 54); - this.btnExportIdImg.Name = "btnExportIdImg"; - this.btnExportIdImg.Size = new System.Drawing.Size(134, 23); - this.btnExportIdImg.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnExportIdImg.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnExportIdImg.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnExportIdImg.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.btnExportIdImg.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.btnExportIdImg.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.btnExportIdImg.Style.ForeColor.Color = System.Drawing.Color.White; - this.btnExportIdImg.Style.GradientAngle = 90; - this.btnExportIdImg.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnExportIdImg.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnExportIdImg.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnExportIdImg.TabIndex = 765; - this.btnExportIdImg.Text = "导出Id+图片(品牌校验)"; - this.btnExportIdImg.Click += new System.EventHandler(this.btnExportIdImg_Click); - // // btnSetGroup // this.btnSetGroup.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -369,31 +345,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.cmbGroup.Size = new System.Drawing.Size(92, 25); this.cmbGroup.TabIndex = 640; // - // btnImport - // - this.btnImport.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btnImport.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - 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(17, 12); - this.btnImport.Name = "btnImport"; - this.btnImport.Size = new System.Drawing.Size(105, 25); - this.btnImport.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnImport.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnImport.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnImport.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.btnImport.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.btnImport.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.btnImport.Style.ForeColor.Color = System.Drawing.Color.White; - this.btnImport.Style.GradientAngle = 90; - this.btnImport.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnImport.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnImport.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnImport.TabIndex = 741; - this.btnImport.Text = "导入外部多多数据"; - this.btnImport.Click += new System.EventHandler(this.btnImport_Click); - // // cmbSetWxSafe // this.cmbSetWxSafe.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -434,6 +385,69 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.btnSetWxSafe.Text = "设置微信安检"; this.btnSetWxSafe.Click += new System.EventHandler(this.btnSetWxSafe_Click); // + // tabPage4 + // + this.tabPage4.Controls.Add(this.btnOutProdSaveDb); + this.tabPage4.Controls.Add(this.btnImport); + this.tabPage4.Location = new System.Drawing.Point(4, 26); + this.tabPage4.Name = "tabPage4"; + this.tabPage4.Padding = new System.Windows.Forms.Padding(3); + this.tabPage4.Size = new System.Drawing.Size(407, 80); + this.tabPage4.TabIndex = 3; + this.tabPage4.Text = "商品导入"; + this.tabPage4.UseVisualStyleBackColor = true; + // + // btnOutProdSaveDb + // + this.btnOutProdSaveDb.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnOutProdSaveDb.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnOutProdSaveDb.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnOutProdSaveDb.DisabledBackColor = System.Drawing.Color.Empty; + this.btnOutProdSaveDb.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnOutProdSaveDb.Location = new System.Drawing.Point(17, 43); + this.btnOutProdSaveDb.Name = "btnOutProdSaveDb"; + this.btnOutProdSaveDb.Size = new System.Drawing.Size(105, 23); + this.btnOutProdSaveDb.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnOutProdSaveDb.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnOutProdSaveDb.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnOutProdSaveDb.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnOutProdSaveDb.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnOutProdSaveDb.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnOutProdSaveDb.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnOutProdSaveDb.Style.GradientAngle = 90; + this.btnOutProdSaveDb.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnOutProdSaveDb.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnOutProdSaveDb.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnOutProdSaveDb.TabIndex = 1154; + this.btnOutProdSaveDb.Text = "导入已采集数据"; + this.btnOutProdSaveDb.Visible = false; + this.btnOutProdSaveDb.Click += new System.EventHandler(this.btnOutProdSaveDb_Click); + // + // btnImport + // + this.btnImport.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnImport.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + 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(17, 12); + this.btnImport.Name = "btnImport"; + this.btnImport.Size = new System.Drawing.Size(105, 25); + this.btnImport.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnImport.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnImport.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnImport.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnImport.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnImport.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnImport.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnImport.Style.GradientAngle = 90; + this.btnImport.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnImport.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnImport.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnImport.TabIndex = 741; + this.btnImport.Text = "导入外部多多数据"; + this.btnImport.Click += new System.EventHandler(this.btnImport_Click); + // // tabPage3 // this.tabPage3.BackColor = System.Drawing.Color.White; @@ -474,6 +488,31 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.txtMinPrice.TabIndex = 707; this.txtMinPrice.Text = "10"; // + // btnExportIdImg + // + this.btnExportIdImg.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.btnExportIdImg.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnExportIdImg.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnExportIdImg.DisabledBackColor = System.Drawing.Color.Empty; + this.btnExportIdImg.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnExportIdImg.Location = new System.Drawing.Point(270, 54); + this.btnExportIdImg.Name = "btnExportIdImg"; + this.btnExportIdImg.Size = new System.Drawing.Size(134, 23); + this.btnExportIdImg.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnExportIdImg.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnExportIdImg.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnExportIdImg.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnExportIdImg.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnExportIdImg.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnExportIdImg.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnExportIdImg.Style.GradientAngle = 90; + this.btnExportIdImg.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnExportIdImg.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnExportIdImg.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnExportIdImg.TabIndex = 765; + this.btnExportIdImg.Text = "导出Id+图片(品牌校验)"; + this.btnExportIdImg.Click += new System.EventHandler(this.btnExportIdImg_Click); + // // txtReplaceText // this.txtReplaceText.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) @@ -495,6 +534,17 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.label7.TabIndex = 705; this.label7.Text = "导出时移除词语"; // + // label8 + // + 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(2, 57); + this.label8.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(80, 17); + this.label8.TabIndex = 706; + this.label8.Text = "移除价格低于"; + // // chkSameSpecPrice // this.chkSameSpecPrice.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -553,7 +603,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.tabPage2.Location = new System.Drawing.Point(4, 26); this.tabPage2.Name = "tabPage2"; this.tabPage2.Padding = new System.Windows.Forms.Padding(3); - this.tabPage2.Size = new System.Drawing.Size(407, 75); + this.tabPage2.Size = new System.Drawing.Size(407, 80); this.tabPage2.TabIndex = 1; this.tabPage2.Text = "数据修复 3.15前"; // @@ -776,6 +826,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.tableLayoutPanel1.Controls.Add(this.dtpStart, 9, 2); this.tableLayoutPanel1.Controls.Add(this.chkTime, 8, 2); this.tableLayoutPanel1.Controls.Add(this.cmbCat2, 5, 2); + this.tableLayoutPanel1.Controls.Add(this.chkNoUserProduct, 15, 2); this.tableLayoutPanel1.Controls.Add(this.label16, 0, 1); this.tableLayoutPanel1.Controls.Add(this.label1, 0, 2); this.tableLayoutPanel1.Controls.Add(this.txtSecretStyleCode, 5, 0); @@ -830,36 +881,36 @@ namespace TemuKJD.PDDForms.ProductSelectForms "", "是", "否"}); - this.cmbHasFission.Location = new System.Drawing.Point(805, 40); + this.cmbHasFission.Location = new System.Drawing.Point(794, 42); this.cmbHasFission.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbHasFission.Name = "cmbHasFission"; - this.cmbHasFission.Size = new System.Drawing.Size(38, 25); + this.cmbHasFission.Size = new System.Drawing.Size(48, 25); this.cmbHasFission.TabIndex = 981; // // label20 // this.label20.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label20.AutoSize = true; - this.label20.Location = new System.Drawing.Point(737, 44); + this.label20.Location = new System.Drawing.Point(738, 44); this.label20.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(68, 17); + this.label20.Size = new System.Drawing.Size(56, 17); this.label20.TabIndex = 805; - this.label20.Text = "裂变标题："; + this.label20.Text = "裂变标题"; // // txtViewUvMin // this.txtViewUvMin.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtViewUvMin.Location = new System.Drawing.Point(693, 41); + this.txtViewUvMin.Location = new System.Drawing.Point(684, 41); this.txtViewUvMin.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.txtViewUvMin.Name = "txtViewUvMin"; - this.txtViewUvMin.Size = new System.Drawing.Size(38, 23); + this.txtViewUvMin.Size = new System.Drawing.Size(48, 23); this.txtViewUvMin.TabIndex = 980; // // chkViewUvMin // this.chkViewUvMin.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.chkViewUvMin.Location = new System.Drawing.Point(634, 42); + this.chkViewUvMin.Location = new System.Drawing.Point(625, 42); this.chkViewUvMin.Name = "chkViewUvMin"; this.chkViewUvMin.Size = new System.Drawing.Size(56, 21); this.chkViewUvMin.TabIndex = 978; @@ -874,22 +925,22 @@ namespace TemuKJD.PDDForms.ProductSelectForms "", "是", "否"}); - this.cmbPddRelation.Location = new System.Drawing.Point(693, 5); + this.cmbPddRelation.Location = new System.Drawing.Point(684, 7); this.cmbPddRelation.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbPddRelation.Name = "cmbPddRelation"; - this.cmbPddRelation.Size = new System.Drawing.Size(38, 25); + this.cmbPddRelation.Size = new System.Drawing.Size(48, 25); this.cmbPddRelation.TabIndex = 805; // // label19 // this.label19.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(625, 9); + this.label19.Location = new System.Drawing.Point(628, 9); this.label19.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(68, 17); + this.label19.Size = new System.Drawing.Size(56, 17); this.label19.TabIndex = 804; - this.label19.Text = "数据转换："; + this.label19.Text = "数据转换"; // // dtpEnd // @@ -897,10 +948,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.tableLayoutPanel1.SetColumnSpan(this.dtpEnd, 2); this.dtpEnd.CustomFormat = "yyyy-MM-dd HH:mm"; this.dtpEnd.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - this.dtpEnd.Location = new System.Drawing.Point(581, 76); + this.dtpEnd.Location = new System.Drawing.Point(571, 76); this.dtpEnd.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.dtpEnd.Name = "dtpEnd"; - this.dtpEnd.Size = new System.Drawing.Size(109, 23); + this.dtpEnd.Size = new System.Drawing.Size(110, 23); this.dtpEnd.TabIndex = 979; // // dtpStart @@ -909,16 +960,16 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.tableLayoutPanel1.SetColumnSpan(this.dtpStart, 2); this.dtpStart.CustomFormat = "yyyy-MM-dd HH:mm"; this.dtpStart.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - this.dtpStart.Location = new System.Drawing.Point(469, 76); + this.dtpStart.Location = new System.Drawing.Point(461, 76); this.dtpStart.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.dtpStart.Name = "dtpStart"; - this.dtpStart.Size = new System.Drawing.Size(109, 23); + this.dtpStart.Size = new System.Drawing.Size(107, 23); this.dtpStart.TabIndex = 978; // // chkTime // this.chkTime.Anchor = System.Windows.Forms.AnchorStyles.None; - this.chkTime.Location = new System.Drawing.Point(401, 77); + this.chkTime.Location = new System.Drawing.Point(393, 77); this.chkTime.Name = "chkTime"; this.chkTime.Size = new System.Drawing.Size(65, 21); this.chkTime.TabIndex = 977; @@ -929,13 +980,28 @@ 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(262, 75); + this.cmbCat2.Location = new System.Drawing.Point(246, 77); this.cmbCat2.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbCat2.Name = "cmbCat2"; - this.cmbCat2.Size = new System.Drawing.Size(38, 25); + this.cmbCat2.Size = new System.Drawing.Size(48, 25); this.cmbCat2.TabIndex = 804; this.cmbCat2.SelectedIndexChanged += new System.EventHandler(this.cmbCateFilter2_SelectedIndexChanged); // + // chkNoUserProduct + // + this.chkNoUserProduct.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.chkNoUserProduct.AutoSize = true; + this.chkNoUserProduct.Checked = true; + this.chkNoUserProduct.CheckState = System.Windows.Forms.CheckState.Checked; + this.tableLayoutPanel1.SetColumnSpan(this.chkNoUserProduct, 2); + this.chkNoUserProduct.Location = new System.Drawing.Point(800, 77); + this.chkNoUserProduct.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3); + this.chkNoUserProduct.Name = "chkNoUserProduct"; + this.chkNoUserProduct.Size = new System.Drawing.Size(97, 21); + this.chkNoUserProduct.TabIndex = 809; + this.chkNoUserProduct.Text = "不显示客户商品"; + this.chkNoUserProduct.UseVisualStyleBackColor = true; + // // label16 // this.label16.Anchor = System.Windows.Forms.AnchorStyles.Right; @@ -943,9 +1009,9 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.label16.Location = new System.Drawing.Point(3, 44); this.label16.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(69, 17); + this.label16.Size = new System.Drawing.Size(57, 17); this.label16.TabIndex = 812; - this.label16.Text = "coid/skc："; + this.label16.Text = "coid/skc"; // // label1 // @@ -954,51 +1020,51 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.label1.Location = new System.Drawing.Point(3, 79); this.label1.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(69, 17); + this.label1.Size = new System.Drawing.Size(57, 17); this.label1.TabIndex = 813; - this.label1.Text = "真实coid："; + this.label1.Text = "真实coid"; // // txtSecretStyleCode // this.txtSecretStyleCode.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtSecretStyleCode.Location = new System.Drawing.Point(262, 6); + this.txtSecretStyleCode.Location = new System.Drawing.Point(246, 6); this.txtSecretStyleCode.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.txtSecretStyleCode.Name = "txtSecretStyleCode"; - this.txtSecretStyleCode.Size = new System.Drawing.Size(38, 23); + this.txtSecretStyleCode.Size = new System.Drawing.Size(48, 23); this.txtSecretStyleCode.TabIndex = 812; // // label14 // this.label14.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label14.AutoSize = true; - this.label14.Location = new System.Drawing.Point(211, 79); + this.label14.Location = new System.Drawing.Point(207, 79); this.label14.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(51, 17); + this.label14.Size = new System.Drawing.Size(39, 17); this.label14.TabIndex = 784; - this.label14.Text = "类目2："; + this.label14.Text = "类目2"; // // label15 // this.label15.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(218, 9); + this.label15.Location = new System.Drawing.Point(214, 9); this.label15.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(44, 17); + this.label15.Size = new System.Drawing.Size(32, 17); this.label15.TabIndex = 811; - this.label15.Text = "编码："; + this.label15.Text = "编码"; // // label13 // this.label13.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(513, 44); + this.label13.Location = new System.Drawing.Point(515, 44); this.label13.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(68, 17); + this.label13.Size = new System.Drawing.Size(56, 17); this.label13.TabIndex = 802; - this.label13.Text = "导出入库："; + this.label13.Text = "导出入库"; // // cmbSourceType // @@ -1015,10 +1081,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms "机会商品", "以图搜品", "多多外部数据"}); - this.cmbSourceType.Location = new System.Drawing.Point(262, 40); + this.cmbSourceType.Location = new System.Drawing.Point(246, 42); this.cmbSourceType.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbSourceType.Name = "cmbSourceType"; - this.cmbSourceType.Size = new System.Drawing.Size(38, 25); + this.cmbSourceType.Size = new System.Drawing.Size(48, 25); this.cmbSourceType.TabIndex = 654; this.cmbSourceType.SelectedIndexChanged += new System.EventHandler(this.cmbSourceType_SelectedIndexChanged); // @@ -1026,31 +1092,31 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.label10.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(218, 44); + this.label10.Location = new System.Drawing.Point(214, 44); this.label10.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(44, 17); + this.label10.Size = new System.Drawing.Size(32, 17); this.label10.TabIndex = 651; - this.label10.Text = "来源："; + this.label10.Text = "来源"; // // label5 // - this.label5.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label5.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(3, 9); + this.label5.Location = new System.Drawing.Point(15, 9); this.label5.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(57, 17); + this.label5.Size = new System.Drawing.Size(45, 17); this.label5.TabIndex = 435; - this.label5.Text = "商品ID："; + this.label5.Text = "商品ID"; // // txtSPU // this.txtSPU.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtSPU.Location = new System.Drawing.Point(72, 6); + this.txtSPU.Location = new System.Drawing.Point(60, 6); this.txtSPU.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.txtSPU.Name = "txtSPU"; - this.txtSPU.Size = new System.Drawing.Size(38, 23); + this.txtSPU.Size = new System.Drawing.Size(48, 23); this.txtSPU.TabIndex = 434; // // cmbWxCat @@ -1061,19 +1127,19 @@ namespace TemuKJD.PDDForms.ProductSelectForms "", "是", "否"}); - this.cmbWxCat.Location = new System.Drawing.Point(581, 5); + this.cmbWxCat.Location = new System.Drawing.Point(571, 7); this.cmbWxCat.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbWxCat.Name = "cmbWxCat"; - this.cmbWxCat.Size = new System.Drawing.Size(38, 25); + this.cmbWxCat.Size = new System.Drawing.Size(48, 25); this.cmbWxCat.TabIndex = 802; // // txtSKC // this.txtSKC.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtSKC.Location = new System.Drawing.Point(72, 41); + this.txtSKC.Location = new System.Drawing.Point(60, 41); this.txtSKC.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.txtSKC.Name = "txtSKC"; - this.txtSKC.Size = new System.Drawing.Size(38, 23); + this.txtSKC.Size = new System.Drawing.Size(48, 23); this.txtSKC.TabIndex = 432; // // cmbSort @@ -1083,10 +1149,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.cmbSort.Items.AddRange(new object[] { "入库时间", "曝光量"}); - this.cmbSort.Location = new System.Drawing.Point(357, 40); + this.cmbSort.Location = new System.Drawing.Point(339, 42); this.cmbSort.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbSort.Name = "cmbSort"; - this.cmbSort.Size = new System.Drawing.Size(38, 25); + this.cmbSort.Size = new System.Drawing.Size(48, 25); this.cmbSort.TabIndex = 448; this.cmbSort.Text = "入库时间"; // @@ -1094,63 +1160,63 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.label6.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(313, 44); + this.label6.Location = new System.Drawing.Point(307, 44); this.label6.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(44, 17); + this.label6.Size = new System.Drawing.Size(32, 17); this.label6.TabIndex = 449; - this.label6.Text = "排序："; + this.label6.Text = "排序"; // // label4 // this.label4.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(313, 9); + this.label4.Location = new System.Drawing.Point(307, 9); this.label4.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(44, 17); + this.label4.Size = new System.Drawing.Size(32, 17); this.label4.TabIndex = 430; - this.label4.Text = "货号："; + this.label4.Text = "货号"; // // label12 // this.label12.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(513, 9); + this.label12.Location = new System.Drawing.Point(515, 9); this.label12.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(68, 17); + this.label12.Size = new System.Drawing.Size(56, 17); this.label12.TabIndex = 801; - this.label12.Text = "类目识别："; + this.label12.Text = "类目识别"; // // txtExtCode // this.txtExtCode.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtExtCode.Location = new System.Drawing.Point(357, 6); + this.txtExtCode.Location = new System.Drawing.Point(339, 6); this.txtExtCode.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.txtExtCode.Name = "txtExtCode"; - this.txtExtCode.Size = new System.Drawing.Size(38, 23); + this.txtExtCode.Size = new System.Drawing.Size(48, 23); this.txtExtCode.TabIndex = 429; // // lblGroup // this.lblGroup.Anchor = System.Windows.Forms.AnchorStyles.Right; this.lblGroup.AutoSize = true; - this.lblGroup.Location = new System.Drawing.Point(123, 44); + this.lblGroup.Location = new System.Drawing.Point(121, 44); this.lblGroup.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.lblGroup.Name = "lblGroup"; - this.lblGroup.Size = new System.Drawing.Size(44, 17); + this.lblGroup.Size = new System.Drawing.Size(32, 17); this.lblGroup.TabIndex = 641; - this.lblGroup.Text = "分组："; + this.lblGroup.Text = "分组"; // // cmbGroupFilter // 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(167, 40); + this.cmbGroupFilter.Location = new System.Drawing.Point(153, 42); this.cmbGroupFilter.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbGroupFilter.Name = "cmbGroupFilter"; - this.cmbGroupFilter.Size = new System.Drawing.Size(38, 25); + this.cmbGroupFilter.Size = new System.Drawing.Size(48, 25); this.cmbGroupFilter.TabIndex = 653; // // cmbExportToOutServer @@ -1162,30 +1228,30 @@ namespace TemuKJD.PDDForms.ProductSelectForms "是", "否", "导出未拉回"}); - this.cmbExportToOutServer.Location = new System.Drawing.Point(581, 40); + this.cmbExportToOutServer.Location = new System.Drawing.Point(571, 42); this.cmbExportToOutServer.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbExportToOutServer.Name = "cmbExportToOutServer"; - this.cmbExportToOutServer.Size = new System.Drawing.Size(38, 25); + this.cmbExportToOutServer.Size = new System.Drawing.Size(48, 25); this.cmbExportToOutServer.TabIndex = 803; // // label3 // this.label3.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(401, 9); + this.label3.Location = new System.Drawing.Point(393, 9); this.label3.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(68, 17); + this.label3.Size = new System.Drawing.Size(56, 17); this.label3.TabIndex = 428; - this.label3.Text = "商品标题："; + this.label3.Text = "商品标题"; // // txtProdName // this.txtProdName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtProdName.Location = new System.Drawing.Point(469, 6); + this.txtProdName.Location = new System.Drawing.Point(461, 6); this.txtProdName.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.txtProdName.Name = "txtProdName"; - this.txtProdName.Size = new System.Drawing.Size(38, 23); + this.txtProdName.Size = new System.Drawing.Size(48, 23); this.txtProdName.TabIndex = 427; // // cmbWxSafe @@ -1198,10 +1264,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms "安全商品", "违规商品", "未校验"}); - this.cmbWxSafe.Location = new System.Drawing.Point(469, 40); + this.cmbWxSafe.Location = new System.Drawing.Point(461, 42); this.cmbWxSafe.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbWxSafe.Name = "cmbWxSafe"; - this.cmbWxSafe.Size = new System.Drawing.Size(38, 25); + this.cmbWxSafe.Size = new System.Drawing.Size(48, 25); this.cmbWxSafe.TabIndex = 676; this.cmbWxSafe.Text = "安全+未校验"; // @@ -1209,41 +1275,41 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.lblWxSafe.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lblWxSafe.AutoSize = true; - this.lblWxSafe.Location = new System.Drawing.Point(401, 44); + this.lblWxSafe.Location = new System.Drawing.Point(393, 44); this.lblWxSafe.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.lblWxSafe.Name = "lblWxSafe"; - this.lblWxSafe.Size = new System.Drawing.Size(68, 17); + this.lblWxSafe.Size = new System.Drawing.Size(56, 17); this.lblWxSafe.TabIndex = 651; - this.lblWxSafe.Text = "微信安检："; + this.lblWxSafe.Text = "微信安检"; // // lblNotes // this.lblNotes.Anchor = System.Windows.Forms.AnchorStyles.Right; this.lblNotes.AutoSize = true; - this.lblNotes.Location = new System.Drawing.Point(123, 9); + this.lblNotes.Location = new System.Drawing.Point(121, 9); this.lblNotes.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.lblNotes.Name = "lblNotes"; - this.lblNotes.Size = new System.Drawing.Size(44, 17); + this.lblNotes.Size = new System.Drawing.Size(32, 17); this.lblNotes.TabIndex = 440; - this.lblNotes.Text = "备注："; + this.lblNotes.Text = "备注"; // // txtNotes // this.txtNotes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtNotes.Location = new System.Drawing.Point(167, 6); + this.txtNotes.Location = new System.Drawing.Point(153, 6); this.txtNotes.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.txtNotes.Name = "txtNotes"; - this.txtNotes.Size = new System.Drawing.Size(38, 23); + this.txtNotes.Size = new System.Drawing.Size(48, 23); this.txtNotes.TabIndex = 439; // // cmbCat1 // 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(167, 75); + this.cmbCat1.Location = new System.Drawing.Point(153, 77); this.cmbCat1.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbCat1.Name = "cmbCat1"; - this.cmbCat1.Size = new System.Drawing.Size(38, 25); + this.cmbCat1.Size = new System.Drawing.Size(48, 25); this.cmbCat1.TabIndex = 805; this.cmbCat1.SelectedIndexChanged += new System.EventHandler(this.cmbCateFilter1_SelectedIndexChanged); // @@ -1251,21 +1317,21 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.label2.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(116, 79); + this.label2.Location = new System.Drawing.Point(114, 79); this.label2.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(51, 17); + this.label2.Size = new System.Drawing.Size(39, 17); this.label2.TabIndex = 426; - this.label2.Text = "类目1："; + this.label2.Text = "类目1"; // // cmbCat3 // 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(357, 75); + this.cmbCat3.Location = new System.Drawing.Point(339, 77); this.cmbCat3.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbCat3.Name = "cmbCat3"; - this.cmbCat3.Size = new System.Drawing.Size(38, 25); + this.cmbCat3.Size = new System.Drawing.Size(48, 25); this.cmbCat3.TabIndex = 811; this.cmbCat3.SelectedIndexChanged += new System.EventHandler(this.cmbCateFilter3_SelectedIndexChanged); // @@ -1273,20 +1339,20 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.label17.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label17.AutoSize = true; - this.label17.Location = new System.Drawing.Point(306, 79); + this.label17.Location = new System.Drawing.Point(300, 79); this.label17.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(51, 17); + this.label17.Size = new System.Drawing.Size(39, 17); this.label17.TabIndex = 811; - this.label17.Text = "类目3："; + this.label17.Text = "类目3"; // // txtRealCoid // this.txtRealCoid.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtRealCoid.Location = new System.Drawing.Point(72, 76); + this.txtRealCoid.Location = new System.Drawing.Point(60, 76); this.txtRealCoid.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.txtRealCoid.Name = "txtRealCoid"; - this.txtRealCoid.Size = new System.Drawing.Size(38, 23); + this.txtRealCoid.Size = new System.Drawing.Size(48, 23); this.txtRealCoid.TabIndex = 814; // // btnEmpty @@ -1295,7 +1361,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms 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(849, 40); + this.btnEmpty.Location = new System.Drawing.Point(848, 40); this.btnEmpty.Name = "btnEmpty"; this.btnEmpty.Size = new System.Drawing.Size(46, 25); this.btnEmpty.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -1321,7 +1387,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms 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(849, 5); + this.btnSearch.Location = new System.Drawing.Point(848, 5); this.btnSearch.Name = "btnSearch"; this.btnSearch.Size = new System.Drawing.Size(46, 25); this.btnSearch.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -1343,12 +1409,12 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.label11.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(737, 9); + this.label11.Location = new System.Drawing.Point(738, 9); this.label11.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(68, 17); + this.label11.Size = new System.Drawing.Size(56, 17); this.label11.TabIndex = 651; - this.label11.Text = "商品类型："; + this.label11.Text = "商品类型"; // // cmbSpProdType // @@ -1358,17 +1424,17 @@ namespace TemuKJD.PDDForms.ProductSelectForms "", "普通商品", "爆款数据"}); - this.cmbSpProdType.Location = new System.Drawing.Point(805, 5); + this.cmbSpProdType.Location = new System.Drawing.Point(794, 7); this.cmbSpProdType.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbSpProdType.Name = "cmbSpProdType"; - this.cmbSpProdType.Size = new System.Drawing.Size(38, 25); + this.cmbSpProdType.Size = new System.Drawing.Size(48, 25); this.cmbSpProdType.TabIndex = 677; // // chkWXComplateProd // this.chkWXComplateProd.Anchor = System.Windows.Forms.AnchorStyles.Left; this.tableLayoutPanel1.SetColumnSpan(this.chkWXComplateProd, 2); - this.chkWXComplateProd.Location = new System.Drawing.Point(699, 77); + this.chkWXComplateProd.Location = new System.Drawing.Point(690, 77); this.chkWXComplateProd.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3); this.chkWXComplateProd.Name = "chkWXComplateProd"; this.chkWXComplateProd.Size = new System.Drawing.Size(87, 21); @@ -1952,55 +2018,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.statusBar.Size = new System.Drawing.Size(1438, 25); this.statusBar.TabIndex = 5; // - // btnOutProdSaveDb - // - this.btnOutProdSaveDb.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btnOutProdSaveDb.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnOutProdSaveDb.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnOutProdSaveDb.DisabledBackColor = System.Drawing.Color.Empty; - this.btnOutProdSaveDb.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnOutProdSaveDb.Location = new System.Drawing.Point(17, 43); - this.btnOutProdSaveDb.Name = "btnOutProdSaveDb"; - this.btnOutProdSaveDb.Size = new System.Drawing.Size(105, 23); - this.btnOutProdSaveDb.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnOutProdSaveDb.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnOutProdSaveDb.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnOutProdSaveDb.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.btnOutProdSaveDb.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.btnOutProdSaveDb.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.btnOutProdSaveDb.Style.ForeColor.Color = System.Drawing.Color.White; - this.btnOutProdSaveDb.Style.GradientAngle = 90; - this.btnOutProdSaveDb.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnOutProdSaveDb.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnOutProdSaveDb.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnOutProdSaveDb.TabIndex = 1154; - this.btnOutProdSaveDb.Text = "导入已采集数据"; - this.btnOutProdSaveDb.Visible = false; - this.btnOutProdSaveDb.Click += new System.EventHandler(this.btnOutProdSaveDb_Click); - // - // tabPage4 - // - this.tabPage4.Controls.Add(this.btnOutProdSaveDb); - this.tabPage4.Controls.Add(this.btnImport); - this.tabPage4.Location = new System.Drawing.Point(4, 26); - this.tabPage4.Name = "tabPage4"; - this.tabPage4.Padding = new System.Windows.Forms.Padding(3); - this.tabPage4.Size = new System.Drawing.Size(407, 80); - this.tabPage4.TabIndex = 3; - this.tabPage4.Text = "商品导入"; - this.tabPage4.UseVisualStyleBackColor = true; - // - // label8 - // - 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(2, 57); - this.label8.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); - this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(80, 17); - this.label8.TabIndex = 706; - this.label8.Text = "移除价格低于"; - // // PDDDBProdListForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -2024,6 +2041,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.splitContainer1.ResumeLayout(false); this.ucTabControlMetro1.ResumeLayout(false); this.tabPage1.ResumeLayout(false); + this.tabPage4.ResumeLayout(false); this.tabPage3.ResumeLayout(false); this.tabPage3.PerformLayout(); this.tabPage2.ResumeLayout(false); @@ -2041,7 +2059,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.panel2.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dgvDbProduct)).EndInit(); - this.tabPage4.ResumeLayout(false); this.ResumeLayout(false); } @@ -2177,5 +2194,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms private DevComponents.DotNetBar.PanelEx btnOutProdSaveDb; private System.Windows.Forms.TabPage tabPage4; private System.Windows.Forms.Label label8; + private UserComponent.UcCheckBox chkNoUserProduct; } } \ No newline at end of file diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs index 9699947..4f9d328 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs @@ -345,6 +345,12 @@ namespace TemuKJD.PDDForms.ProductSelectForms "&wx_safe_status=" + cmbWxSafe.Text.Trim().Replace("安全+未校验", "安全商品,未校验") + "&special_prod_type=" + (cmbSpProdType.Text.Trim().IsNullOrEmpty() ? "普通商品,书籍,爆款数据" : cmbSpProdType.Text.Trim().Replace("普通商品", "普通商品,书籍")); + if (chkNoUserProduct.Checked) + { + var addUserName = "admin"; + data += "&add_user_name=" + addUserName; + } + if (chkViewUvMin.Checked) { data += "&min_view_uv=" + txtViewUvMin.Text.ParseToInt(); @@ -392,15 +398,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms data += "&has_wx_cat=" + (cmbWxCat.Text.Trim() == "是").ParseToString().ToLower(); } - if (cmbHasFission.Text == "是") - { - data += "&fission_words=fission_goods_names:"; - } - else if (cmbHasFission.Text == "否") - { - data += "&no_fission_words=true"; - } - if (!string.IsNullOrEmpty(cmbExportToOutServer.Text)) { //data += "&has_send_to_out_server=" + (cmbExportToOutServer.Text.Trim() == "是").ParseToString().ToLower(); @@ -436,6 +433,15 @@ namespace TemuKJD.PDDForms.ProductSelectForms if (chkWXComplateProd.Checked) data += "&has_wx_format=1"; + if (cmbHasFission.Text == "是") + { + data += "&fission_words=fission_goods_names:"; + } + else if (cmbHasFission.Text == "否") + { + data += "&no_fission_words=true"; + } + // 回传修复是否完成 if (cmbHasReturn.Text.Trim() == "是") data += "&problem_prod_data=1"; @@ -446,7 +452,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms else if (!string.IsNullOrEmpty(cmbHasReturn.Text.Trim())) data += "&problem_prod_data=" + cmbHasReturn.Text.Trim(); - if (cmbPddRelation.Text == "否") data += "&is_relation=0"; else if (cmbPddRelation.Text == "是") @@ -521,6 +526,11 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.cmbWxCat.Text = ""; this.cmbExportToOutServer.Text = ""; this.txtSecretStyleCode.Text = ""; + this.chkNoUserProduct.Checked = true; + this.chkWXComplateProd.Checked = false; + this.cmbHasFission.Text = ""; + this.cmbPddRelation.Text = ""; + this.txtViewUvMin.Text = ""; } private void cmbCateFilter1_SelectedIndexChanged(object sender, EventArgs e) diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUploadForm.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUploadForm.cs index 77a408e..7ecfc30 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUploadForm.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUploadForm.cs @@ -8713,16 +8713,16 @@ Content-Type: image/jpeg private void btnProdDb_Click(object sender, EventArgs e) { - WXUserProdListForm.Instance.lstTemuDBProductSelect = this.lstTemuDBProductSelect; - WXUserProdListForm.Instance.cmbSourceType.Items.Clear(); - WXUserProdListForm.Instance.cmbSourceType.Items.AddRange(this.cmbSourceType.Items.Cast().ToArray()); - WXUserProdListForm.Instance.lblRelation.Visible = false; - WXUserProdListForm.Instance.cmbRelation.Visible = false; - WXUserProdListForm.Instance.cmbRelation.Text = "是"; - WXUserProdListForm.Instance.SaveComplete -= dbProdList_SaveComplete; - WXUserProdListForm.Instance.SaveComplete += dbProdList_SaveComplete; - WXUserProdListForm.Instance.Show(); - WXUserProdListForm.Instance.BringToFront(); + WXSelectDBProdListForm.Instance.lstTemuDBProductSelect = this.lstTemuDBProductSelect; + WXSelectDBProdListForm.Instance.cmbSourceType.Items.Clear(); + WXSelectDBProdListForm.Instance.cmbSourceType.Items.AddRange(this.cmbSourceType.Items.Cast().ToArray()); + WXSelectDBProdListForm.Instance.lblRelation.Visible = false; + WXSelectDBProdListForm.Instance.cmbRelation.Visible = false; + WXSelectDBProdListForm.Instance.cmbRelation.Text = "是"; + WXSelectDBProdListForm.Instance.SaveComplete -= dbProdList_SaveComplete; + WXSelectDBProdListForm.Instance.SaveComplete += dbProdList_SaveComplete; + WXSelectDBProdListForm.Instance.Show(); + WXSelectDBProdListForm.Instance.BringToFront(); } private void dbProdList_SaveComplete(object obj) diff --git a/TEMUKJD/ToolForms/DouBaoTitleFissionCefForm.Designer.cs b/TEMUKJD/ToolForms/DouBaoTitleFissionCefForm.Designer.cs index 0e03197..6cef0e1 100644 --- a/TEMUKJD/ToolForms/DouBaoTitleFissionCefForm.Designer.cs +++ b/TEMUKJD/ToolForms/DouBaoTitleFissionCefForm.Designer.cs @@ -29,6 +29,7 @@ namespace TemuKJD.ToolForms /// private void InitializeComponent() { + this.components = new System.ComponentModel.Container(); 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(); @@ -81,6 +82,7 @@ namespace TemuKJD.ToolForms this.col_edit = new System.Windows.Forms.DataGridViewLinkColumn(); this.col_delete = new System.Windows.Forms.DataGridViewLinkColumn(); this.col_select_product = new System.Windows.Forms.DataGridViewLinkColumn(); + this.chkWithTitle = new TemuKJD.UserComponent.UcCheckBox(this.components); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -271,6 +273,7 @@ namespace TemuKJD.ToolForms // // splitContainer3.Panel1 // + this.splitContainer3.Panel1.Controls.Add(this.chkWithTitle); this.splitContainer3.Panel1.Controls.Add(this.btnBatchCreateFissionTitle); this.splitContainer3.Panel1MinSize = 0; // @@ -290,7 +293,7 @@ namespace TemuKJD.ToolForms this.btnBatchCreateFissionTitle.Cursor = System.Windows.Forms.Cursors.Hand; this.btnBatchCreateFissionTitle.DisabledBackColor = System.Drawing.Color.Empty; this.btnBatchCreateFissionTitle.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnBatchCreateFissionTitle.Location = new System.Drawing.Point(21, 17); + this.btnBatchCreateFissionTitle.Location = new System.Drawing.Point(21, 20); this.btnBatchCreateFissionTitle.Name = "btnBatchCreateFissionTitle"; this.btnBatchCreateFissionTitle.Size = new System.Drawing.Size(135, 23); this.btnBatchCreateFissionTitle.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -586,6 +589,18 @@ namespace TemuKJD.ToolForms this.col_select_product.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; this.col_select_product.Visible = false; // + // chkWithTitle + // + this.chkWithTitle.AutoSize = true; + this.chkWithTitle.Checked = true; + this.chkWithTitle.CheckState = System.Windows.Forms.CheckState.Checked; + this.chkWithTitle.Location = new System.Drawing.Point(21, 53); + this.chkWithTitle.Name = "chkWithTitle"; + this.chkWithTitle.Size = new System.Drawing.Size(215, 21); + this.chkWithTitle.TabIndex = 1132; + this.chkWithTitle.Text = "提问时附带商品标题(防止数据不符)"; + this.chkWithTitle.UseVisualStyleBackColor = true; + // // DouBaoTitleFissionCefForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -619,6 +634,7 @@ namespace TemuKJD.ToolForms ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit(); this.splitContainer2.ResumeLayout(false); this.splitContainer3.Panel1.ResumeLayout(false); + this.splitContainer3.Panel1.PerformLayout(); this.splitContainer3.Panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).EndInit(); this.splitContainer3.ResumeLayout(false); @@ -668,5 +684,6 @@ namespace TemuKJD.ToolForms private System.Windows.Forms.DataGridViewLinkColumn col_edit; private System.Windows.Forms.DataGridViewLinkColumn col_delete; private System.Windows.Forms.DataGridViewLinkColumn col_select_product; + private UserComponent.UcCheckBox chkWithTitle; } } \ No newline at end of file diff --git a/TEMUKJD/ToolForms/DouBaoTitleFissionCefForm.cs b/TEMUKJD/ToolForms/DouBaoTitleFissionCefForm.cs index d300b11..8ddda1b 100644 --- a/TEMUKJD/ToolForms/DouBaoTitleFissionCefForm.cs +++ b/TEMUKJD/ToolForms/DouBaoTitleFissionCefForm.cs @@ -252,6 +252,8 @@ namespace TemuKJD.ToolForms Invoke(new Action(() => { askText = textBox1.Text.Trim(); + if (chkWithTitle.Checked) + askText = row.Cells["col_product_name"].Value.ParseToString() + "。" + textBox1.Text.Trim(); Clipboard.SetText(askText); })); host.SendKeyEvent(new CefSharp.KeyEvent() { WindowsKeyCode = 86, Type = KeyEventType.RawKeyDown, Modifiers = CefEventFlags.ControlDown }); @@ -259,14 +261,18 @@ namespace TemuKJD.ToolForms host.SendKeyEvent(new CefSharp.KeyEvent() { WindowsKeyCode = 13, Type = KeyEventType.RawKeyDown }); - for (int i = 0; i < 80; i++) + // 等待2分钟以防出现验证码等问题 + for (int i = 0; i < 120; i++) { Thread.Sleep(1000); if (currentProd == null) break; } if (currentProd != null) + { + Invoke(new Action(() => { cell.Value = "生成失败，超时"; })); currentProd = null; + } Invoke(new Action(() => { cefWebBrowser.Load(Url); })); @@ -304,6 +310,14 @@ namespace TemuKJD.ToolForms var dbId = currentProd.id; var rows = dgvDbProduct.Rows.Cast().Where(r => r.Cells["col_spu_id"].Value.ParseToString() == prodId).ToList(); + if (chkWithTitle.Checked && !data.Contains(currentProd.product_name)) + { + foreach (var row in rows) + Invoke(new Action(() => { row.Cells["colOpResult"].Value = "标题不匹配"; })); + currentProd = null; + return; + } + var titleStr = ""; var stringList = data.Split(new string[] { "data:" }, StringSplitOptions.RemoveEmptyEntries); foreach(var str in stringList) @@ -327,6 +341,8 @@ namespace TemuKJD.ToolForms if (titleList.Count() > 50) { + if (dbId.IsNullOrZero()) + dbId = 0; var url = BaseClass.BuildPDDObjString("product/mdy_db_product"); var body = UserLogin.GetSignaturex() + "&db_id=" + dbId; @@ -392,7 +408,7 @@ namespace TemuKJD.ToolForms //dgvDbProduct.Rows[e.RowIndex].Cells["colSkuReplaceImgUrl"].Value = dbProduct.sku_img_replace_url; break; case "主图": - ShowImgForm imgFrom = new ShowImgForm(dgvDbProduct.Rows[e.RowIndex].Cells["colImgUrl"].Value.ParseToString().Replace("?imageView2/2/w/90/h/90", "")); + ShowImgForm imgFrom = new ShowImgForm(dgvDbProduct.Rows[e.RowIndex].Cells["colMainImgUrl"].Value.ParseToString().Replace("?imageView2/2/w/90/h/90", "")); imgFrom.ShowDialog(); break; case "": diff --git a/TEMUKJD/ToolForms/Get1688ProductForm.Designer.cs b/TEMUKJD/ToolForms/Get1688ProductForm.Designer.cs index 6da79fc..dc4a07d 100644 --- a/TEMUKJD/ToolForms/Get1688ProductForm.Designer.cs +++ b/TEMUKJD/ToolForms/Get1688ProductForm.Designer.cs @@ -567,7 +567,7 @@ namespace TemuKJD.ToolForms this.splitContainer1.Panel2.Controls.Add(this.label2); this.splitContainer1.Panel2.Controls.Add(this.line1); this.splitContainer1.Size = new System.Drawing.Size(1404, 561); - this.splitContainer1.SplitterDistance = 464; + this.splitContainer1.SplitterDistance = 465; this.splitContainer1.SplitterWidth = 3; this.splitContainer1.TabIndex = 4; // @@ -584,7 +584,7 @@ namespace TemuKJD.ToolForms this.ucTabControlMetro1.Name = "ucTabControlMetro1"; this.ucTabControlMetro1.SelectedIndex = 0; this.ucTabControlMetro1.ShowCloseButton = false; - this.ucTabControlMetro1.Size = new System.Drawing.Size(1404, 464); + this.ucTabControlMetro1.Size = new System.Drawing.Size(1404, 465); this.ucTabControlMetro1.TabIndex = 462; this.ucTabControlMetro1.TabSelectColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.ucTabControlMetro1.TabSelectTextColor = System.Drawing.Color.Gray; @@ -598,7 +598,7 @@ namespace TemuKJD.ToolForms this.tabPage1.Margin = new System.Windows.Forms.Padding(5); this.tabPage1.Name = "tabPage1"; this.tabPage1.Padding = new System.Windows.Forms.Padding(3); - this.tabPage1.Size = new System.Drawing.Size(1396, 432); + this.tabPage1.Size = new System.Drawing.Size(1396, 433); this.tabPage1.TabIndex = 0; this.tabPage1.Text = "商品页面"; this.tabPage1.UseVisualStyleBackColor = true; @@ -617,7 +617,7 @@ namespace TemuKJD.ToolForms this.splitContainer2.Panel1.Controls.Add(this.btnNext); this.splitContainer2.Panel1.Controls.Add(this.btnPrev); this.splitContainer2.Panel1.Controls.Add(this.txtAddress); - this.splitContainer2.Size = new System.Drawing.Size(1390, 426); + this.splitContainer2.Size = new System.Drawing.Size(1390, 427); this.splitContainer2.SplitterDistance = 26; this.splitContainer2.TabIndex = 6; // @@ -659,7 +659,7 @@ namespace TemuKJD.ToolForms this.tabPage2.Location = new System.Drawing.Point(4, 28); this.tabPage2.Name = "tabPage2"; this.tabPage2.Padding = new System.Windows.Forms.Padding(3); - this.tabPage2.Size = new System.Drawing.Size(1396, 431); + this.tabPage2.Size = new System.Drawing.Size(1396, 432); this.tabPage2.TabIndex = 1; this.tabPage2.Text = "采集商品列表"; this.tabPage2.UseVisualStyleBackColor = true; @@ -668,7 +668,7 @@ namespace TemuKJD.ToolForms // this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None; this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue; - this.pbLoading.Location = new System.Drawing.Point(673, 188); + this.pbLoading.Location = new System.Drawing.Point(673, 189); this.pbLoading.Name = "pbLoading"; this.pbLoading.Size = new System.Drawing.Size(50, 50); this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -719,7 +719,7 @@ namespace TemuKJD.ToolForms this.dgvProduct.Name = "dgvProduct"; this.dgvProduct.ReadOnly = true; this.dgvProduct.RowTemplate.Height = 23; - this.dgvProduct.Size = new System.Drawing.Size(1390, 425); + this.dgvProduct.Size = new System.Drawing.Size(1390, 426); this.dgvProduct.TabIndex = 7; this.dgvProduct.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvProduct_CellContentClick); // @@ -861,7 +861,7 @@ namespace TemuKJD.ToolForms this.tabPage3.Location = new System.Drawing.Point(4, 28); this.tabPage3.Name = "tabPage3"; this.tabPage3.Padding = new System.Windows.Forms.Padding(3); - this.tabPage3.Size = new System.Drawing.Size(1396, 431); + this.tabPage3.Size = new System.Drawing.Size(1396, 433); this.tabPage3.TabIndex = 2; this.tabPage3.Text = "1688地址管理"; this.tabPage3.UseVisualStyleBackColor = true; @@ -871,7 +871,7 @@ namespace TemuKJD.ToolForms this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Location = new System.Drawing.Point(3, 3); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(1390, 425); + this.panel1.Size = new System.Drawing.Size(1390, 427); this.panel1.TabIndex = 0; // // chkSkip diff --git a/TEMUKJD/ToolForms/Get1688ProductForm.cs b/TEMUKJD/ToolForms/Get1688ProductForm.cs index fbaeeb6..f675fbc 100644 --- a/TEMUKJD/ToolForms/Get1688ProductForm.cs +++ b/TEMUKJD/ToolForms/Get1688ProductForm.cs @@ -69,7 +69,6 @@ namespace TemuKJD.ToolForms { if(IsAuthorityUser) { - this.ucTabControlMetro1.TabPages.RemoveAt(3); this.ucTabControlMetro1.TabPages.RemoveAt(2); } @@ -1138,7 +1137,7 @@ namespace TemuKJD.ToolForms { } - public static void Out1688ProductImport(bool isAuthorityUser, StatusBarUserControl statusBar, PictureBox pbLoading) + public static void Out1688ProductImport(bool isCollectAuthorityUser, StatusBarUserControl statusBar, PictureBox pbLoading) { OpenFileDialog openFileDialog = new OpenFileDialog(); openFileDialog.Multiselect = true; @@ -1169,9 +1168,9 @@ namespace TemuKJD.ToolForms { content = sr.ReadToEnd(); } - rst = Out1688ProdImportOne(isAuthorityUser, path, content); + rst = Out1688ProdImportOne(isCollectAuthorityUser, path, content); Thread.Sleep(100); - if (isAuthorityUser) + if (isCollectAuthorityUser) Thread.Sleep(1000); } catch (Exception ex) diff --git a/TEMUKJD/VDianForms/VDianUploadProductForm.cs b/TEMUKJD/VDianForms/VDianUploadProductForm.cs index 3da4358..7aec988 100644 --- a/TEMUKJD/VDianForms/VDianUploadProductForm.cs +++ b/TEMUKJD/VDianForms/VDianUploadProductForm.cs @@ -140,16 +140,16 @@ namespace KJD.VDianForms private void BtnImport_Click(object sender, EventArgs e) { - WXUserProdListForm.Instance.lstTemuDBProductSelect = this.lstTemuDBProductSelect; + WXSelectDBProdListForm.Instance.lstTemuDBProductSelect = this.lstTemuDBProductSelect; //WXUserProdListForm.Instance.cmbSourceType.Items.Clear(); //WXUserProdListForm.Instance.cmbSourceType.Items.Add("厂商直采"); - WXUserProdListForm.Instance.lblRelation.Visible = true; - WXUserProdListForm.Instance.cmbRelation.Visible = true; - WXUserProdListForm.Instance.cmbRelation.Text = "否"; - WXUserProdListForm.Instance.SaveComplete -= dbProdList_SaveComplete; - WXUserProdListForm.Instance.SaveComplete += dbProdList_SaveComplete; - WXUserProdListForm.Instance.Show(); - WXUserProdListForm.Instance.BringToFront(); + WXSelectDBProdListForm.Instance.lblRelation.Visible = true; + WXSelectDBProdListForm.Instance.cmbRelation.Visible = true; + WXSelectDBProdListForm.Instance.cmbRelation.Text = "否"; + WXSelectDBProdListForm.Instance.SaveComplete -= dbProdList_SaveComplete; + WXSelectDBProdListForm.Instance.SaveComplete += dbProdList_SaveComplete; + WXSelectDBProdListForm.Instance.Show(); + WXSelectDBProdListForm.Instance.BringToFront(); } private void dbProdList_SaveComplete(object obj) { diff --git a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadCacheForm.Designer.cs b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadCacheForm.Designer.cs deleted file mode 100644 index 986fcac..0000000 --- a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadCacheForm.Designer.cs +++ /dev/null @@ -1,278 +0,0 @@ - -namespace TemuKJD.WXForms.ProductForms -{ - partial class WXDBProdUploadCacheForm - { - /// - /// 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.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WXDBProdUploadCacheForm)); - this.splitContainer1 = new System.Windows.Forms.SplitContainer(); - this.btnClearDgv = new DevComponents.DotNetBar.PanelEx(); - this.splitContainer2 = new System.Windows.Forms.SplitContainer(); - this.dgvSelectProduct = new TemuKJD.UserComponent.DataGridViewEx(); - this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.colId = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colSpuId = new System.Windows.Forms.DataGridViewLinkColumn(); - this.colImgUrl = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colProductSkcPic = new System.Windows.Forms.DataGridViewImageColumn(); - this.colProductName = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colProductCat = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colExtCode = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colNotes = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.ColDelete = new System.Windows.Forms.DataGridViewLinkColumn(); - ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); - this.splitContainer1.Panel1.SuspendLayout(); - this.splitContainer1.Panel2.SuspendLayout(); - this.splitContainer1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit(); - this.splitContainer2.Panel1.SuspendLayout(); - this.splitContainer2.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dgvSelectProduct)).BeginInit(); - this.SuspendLayout(); - // - // splitContainer1 - // - this.splitContainer1.BackColor = System.Drawing.Color.White; - this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; - this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; - this.splitContainer1.Location = new System.Drawing.Point(1, 33); - this.splitContainer1.Name = "splitContainer1"; - this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal; - // - // splitContainer1.Panel1 - // - this.splitContainer1.Panel1.Controls.Add(this.btnClearDgv); - // - // splitContainer1.Panel2 - // - this.splitContainer1.Panel2.Controls.Add(this.splitContainer2); - this.splitContainer1.Size = new System.Drawing.Size(1110, 566); - this.splitContainer1.SplitterDistance = 55; - this.splitContainer1.TabIndex = 1; - this.splitContainer1.TabStop = false; - // - // btnClearDgv - // - this.btnClearDgv.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - 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(1000, 16); - 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); - this.btnClearDgv.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnClearDgv.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); - this.btnClearDgv.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); - this.btnClearDgv.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.btnClearDgv.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnClearDgv.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.btnClearDgv.Style.GradientAngle = 90; - this.btnClearDgv.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; - this.btnClearDgv.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnClearDgv.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnClearDgv.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnClearDgv.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; - this.btnClearDgv.TabIndex = 616; - this.btnClearDgv.Text = "清空列表选中"; - this.btnClearDgv.Click += new System.EventHandler(this.btnClearDgv_Click); - // - // splitContainer2 - // - this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill; - this.splitContainer2.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; - this.splitContainer2.Location = new System.Drawing.Point(0, 0); - this.splitContainer2.Name = "splitContainer2"; - this.splitContainer2.Orientation = System.Windows.Forms.Orientation.Horizontal; - // - // splitContainer2.Panel1 - // - this.splitContainer2.Panel1.Controls.Add(this.dgvSelectProduct); - this.splitContainer2.Panel1.Padding = new System.Windows.Forms.Padding(5, 0, 5, 0); - this.splitContainer2.Size = new System.Drawing.Size(1110, 507); - this.splitContainer2.SplitterDistance = 478; - this.splitContainer2.TabIndex = 0; - this.splitContainer2.TabStop = false; - // - // dgvSelectProduct - // - this.dgvSelectProduct.AllowUserToAddRows = false; - this.dgvSelectProduct.AllowUserToDeleteRows = false; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; - this.dgvSelectProduct.BackgroundColor = System.Drawing.Color.White; - this.dgvSelectProduct.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.dgvSelectProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; - this.dgvSelectProduct.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dgvSelectProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.colCheck, - this.colId, - this.colSpuId, - this.colImgUrl, - this.colProductSkcPic, - this.colProductName, - this.colProductCat, - this.colExtCode, - this.colNotes, - this.ColDelete}); - this.dgvSelectProduct.Dock = System.Windows.Forms.DockStyle.Fill; - this.dgvSelectProduct.Location = new System.Drawing.Point(5, 0); - this.dgvSelectProduct.Name = "dgvSelectProduct"; - this.dgvSelectProduct.ReadOnly = true; - this.dgvSelectProduct.RowTemplate.Height = 23; - this.dgvSelectProduct.Size = new System.Drawing.Size(1100, 478); - this.dgvSelectProduct.TabIndex = 188; - this.dgvSelectProduct.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvSelectProduct_CellContentClick); - // - // colCheck - // - this.colCheck.Frozen = true; - this.colCheck.HeaderText = "选择"; - this.colCheck.Name = "colCheck"; - this.colCheck.ReadOnly = true; - this.colCheck.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.colCheck.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colCheck.Width = 30; - // - // colId - // - this.colId.HeaderText = "序号"; - this.colId.Name = "colId"; - this.colId.ReadOnly = true; - this.colId.Width = 45; - // - // colSpuId - // - this.colSpuId.HeaderText = "商品ID"; - this.colSpuId.Name = "colSpuId"; - this.colSpuId.ReadOnly = true; - this.colSpuId.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.colSpuId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - // - // colImgUrl - // - this.colImgUrl.HeaderText = "图片地址"; - this.colImgUrl.Name = "colImgUrl"; - this.colImgUrl.ReadOnly = true; - this.colImgUrl.Visible = false; - // - // colProductSkcPic - // - this.colProductSkcPic.HeaderText = "图片"; - this.colProductSkcPic.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Zoom; - this.colProductSkcPic.Name = "colProductSkcPic"; - this.colProductSkcPic.ReadOnly = true; - this.colProductSkcPic.Width = 60; - // - // colProductName - // - dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colProductName.DefaultCellStyle = dataGridViewCellStyle3; - this.colProductName.HeaderText = "商品标题"; - this.colProductName.Name = "colProductName"; - this.colProductName.ReadOnly = true; - this.colProductName.Width = 390; - // - // colProductCat - // - this.colProductCat.HeaderText = "商品类目"; - this.colProductCat.Name = "colProductCat"; - this.colProductCat.ReadOnly = true; - this.colProductCat.Width = 120; - // - // colExtCode - // - this.colExtCode.HeaderText = "商品货号"; - this.colExtCode.Name = "colExtCode"; - this.colExtCode.ReadOnly = true; - this.colExtCode.Width = 120; - // - // colNotes - // - this.colNotes.HeaderText = "商品备注"; - this.colNotes.Name = "colNotes"; - this.colNotes.ReadOnly = true; - // - // ColDelete - // - this.ColDelete.HeaderText = "删除"; - this.ColDelete.Name = "ColDelete"; - this.ColDelete.ReadOnly = true; - this.ColDelete.Width = 75; - // - // PDDDBProdUserSelectCacheForm - // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.ClientSize = new System.Drawing.Size(1112, 600); - this.Controls.Add(this.splitContainer1); - 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.Name = "PDDDBProdUserSelectCacheForm"; - this.Text = "待上传商品"; - this.TitleText = "待上传商品"; - this.Load += new System.EventHandler(this.WXDBProdUploadCacheForm_Load); - this.Controls.SetChildIndex(this.splitContainer1, 0); - this.splitContainer1.Panel1.ResumeLayout(false); - this.splitContainer1.Panel2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); - this.splitContainer1.ResumeLayout(false); - this.splitContainer2.Panel1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit(); - this.splitContainer2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.dgvSelectProduct)).EndInit(); - this.ResumeLayout(false); - - } - - #endregion - - private System.Windows.Forms.SplitContainer splitContainer1; - private System.Windows.Forms.SplitContainer splitContainer2; - private UserComponent.DataGridViewEx dgvSelectProduct; - private DevComponents.DotNetBar.PanelEx btnClearDgv; - private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck; - private System.Windows.Forms.DataGridViewTextBoxColumn colId; - private System.Windows.Forms.DataGridViewLinkColumn colSpuId; - private System.Windows.Forms.DataGridViewTextBoxColumn colImgUrl; - private System.Windows.Forms.DataGridViewImageColumn colProductSkcPic; - private System.Windows.Forms.DataGridViewTextBoxColumn colProductName; - private System.Windows.Forms.DataGridViewTextBoxColumn colProductCat; - private System.Windows.Forms.DataGridViewTextBoxColumn colExtCode; - private System.Windows.Forms.DataGridViewTextBoxColumn colNotes; - private System.Windows.Forms.DataGridViewLinkColumn ColDelete; - } -} \ No newline at end of file diff --git a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadCacheForm.cs b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadCacheForm.cs deleted file mode 100644 index 23d2125..0000000 --- a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadCacheForm.cs +++ /dev/null @@ -1,98 +0,0 @@ -using AllBase; -using AllBase.Model.Result; -using NaiBa.Util.Extension; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; -using TemuKJD.BaseForms; -using TemuKJD.Extension; -using TemuKJD.ToolForms; - -namespace TemuKJD.WXForms.ProductForms -{ - public partial class WXDBProdUploadCacheForm : BaseGeneralForm - { - NaiBa.Util.ConcurrentList lstTemuDBProductSelect; - public WXDBProdUploadCacheForm(NaiBa.Util.ConcurrentList _lstTemuDBProductSelect) - { - InitializeComponent(); - - lstTemuDBProductSelect = _lstTemuDBProductSelect; - } - - private void WXDBProdUploadCacheForm_Load(object sender, EventArgs e) - { - dgvSelectProduct.AddSelectorColumn("colCheck"); - dgvSelectProduct.AddImgColumn("colProductSkcPic", "colImgUrl"); - - if (lstTemuDBProductSelect != null && lstTemuDBProductSelect.Count > 0) - { - foreach (var prodSelect in lstTemuDBProductSelect) - { - int rowIndex = this.dgvSelectProduct.Rows.Add( - false, - prodSelect.id, - prodSelect.spu_id, - prodSelect.main_img, - null, - prodSelect.product_name, // 商品名称 - prodSelect.cat_name, - prodSelect.ext_code, - prodSelect.notes, - "删除" - ); - - dgvSelectProduct.Rows[rowIndex].Height = 60; - } - } - } - - private void dgvSelectProduct_CellContentClick(object sender, DataGridViewCellEventArgs e) - { - if (e.ColumnIndex < 0 || e.RowIndex < 0) - return; - string headerText = dgvSelectProduct.Columns[e.ColumnIndex].HeaderText; - var id = dgvSelectProduct.Rows[e.RowIndex].Cells["colId"].Value.ParseToString(); - var dbProduct = lstTemuDBProductSelect.FirstOrDefault(p => p.id.ToString() == id); - var row = dgvSelectProduct.Rows[e.RowIndex]; - - switch (headerText) - { - case "删除": - if (BaseMsgForm.ShowConfirm("确定删除商品吗？删除后不可恢复！").DialogResult == DialogResult.Cancel) - return; - lstTemuDBProductSelect.RemoveAll(s => s.id == row.Cells["colId"].Value.ParseToInt()); - this.dgvSelectProduct.Rows.Remove(row); - break; - case "图片": - ShowImgForm imgFrom = new ShowImgForm(dgvSelectProduct.Rows[e.RowIndex].Cells["colImgUrl"].Value.ParseToString()); - imgFrom.ShowDialog(); - break; - case "": - dgvSelectProduct.Rows[e.RowIndex].Cells["colCheck"].Value = !(bool)dgvSelectProduct.Rows[e.RowIndex].Cells["colCheck"].Value; - break; - default: - break; - } - } - - private void btnClearDgv_Click(object sender, EventArgs e) - { - var rows = this.dgvSelectProduct.Rows.Cast().ToList(); //Cast后Rows做foreach循环时仍会夹花跳过，所以要ToList转一个新的数组。 - foreach (var row in rows) - { - if (row.Cells["colCheck"].Value.ParseToBool() == true) - { - lstTemuDBProductSelect.RemoveAll(s => s.id == row.Cells["colId"].Value.ParseToInt()); - this.dgvSelectProduct.Rows.Remove(row); - } - } - } - } -} diff --git a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadCacheForm.resx b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadCacheForm.resx deleted file mode 100644 index 05d1891..0000000 --- a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadCacheForm.resx +++ /dev/null @@ -1,328 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - - - 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/ProductForms/WXDBProdUploadForm.Designer.cs b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.Designer.cs index 6a795d3..f443d4a 100644 --- a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.Designer.cs +++ b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.Designer.cs @@ -32,14 +32,14 @@ namespace TemuKJD.WXForms.ProductForms private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - 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(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle(); + 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(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.ucGroupBoxEx2 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.txtShippingPriceTimes = new System.Windows.Forms.TextBox(); @@ -109,6 +109,7 @@ namespace TemuKJD.WXForms.ProductForms this.chkCommission = new TemuKJD.UserComponent.UcCheckBox(this.components); this.btnLoginAssistant = new DevComponents.DotNetBar.PanelEx(); this.商品裂变 = new System.Windows.Forms.TabPage(); + this.txtFissionTitle = new System.Windows.Forms.TextBox(); this.line2 = new DevComponents.DotNetBar.Controls.Line(); this.label38 = new System.Windows.Forms.Label(); this.txtFissionRandomPriceChange = new System.Windows.Forms.TextBox(); @@ -127,18 +128,17 @@ namespace TemuKJD.WXForms.ProductForms this.lblFissionTitleCount = new System.Windows.Forms.Label(); this.chkFissionGoodsName = new TemuKJD.UserComponent.UcCheckBox(this.components); this.chkRandomImgBorder = new TemuKJD.UserComponent.UcCheckBox(this.components); - this.txtFissionTitle = new System.Windows.Forms.TextBox(); this.line1 = new DevComponents.DotNetBar.Controls.Line(); this.label37 = new System.Windows.Forms.Label(); this.ucGroupBoxEx4 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); + this.txtRandomFissionProductCount = new System.Windows.Forms.TextBox(); + this.chkRandomFissionProduct = new TemuKJD.UserComponent.UcCheckBox(this.components); this.btnSwitchCatType = new DevComponents.DotNetBar.PanelEx(); this.cmbHot = new System.Windows.Forms.ComboBox(); this.btnProdDb = new DevComponents.DotNetBar.PanelEx(); this.chkWXComplateProd = new TemuKJD.UserComponent.UcCheckBox(this.components); this.txtAddCount = new System.Windows.Forms.TextBox(); - this.cmbJstInitSet = new System.Windows.Forms.ComboBox(); this.txtSearchGoodsName = new System.Windows.Forms.TextBox(); - this.lblJstInitSet = new System.Windows.Forms.Label(); this.pbSelectProd = new System.Windows.Forms.PictureBox(); this.cmbSourceType = new System.Windows.Forms.ComboBox(); this.cmbCateFilter3 = new TemuKJD.UserComponent.UcComboBoxMutiSelect(); @@ -163,6 +163,8 @@ namespace TemuKJD.WXForms.ProductForms this.lblIdFilter = new System.Windows.Forms.Label(); this.lblHot = new System.Windows.Forms.Label(); this.label19 = new System.Windows.Forms.Label(); + this.cmbJstInitSet = new System.Windows.Forms.ComboBox(); + this.lblJstInitSet = 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(); @@ -233,8 +235,6 @@ namespace TemuKJD.WXForms.ProductForms this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); this.btnClear = new DevComponents.DotNetBar.PanelEx(); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); - this.chkFissionProduct = new TemuKJD.UserComponent.UcCheckBox(this.components); - this.txtFissionProductCount = new System.Windows.Forms.TextBox(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -1220,8 +1220,7 @@ namespace TemuKJD.WXForms.ProductForms // // 商品裂变 // - this.商品裂变.Controls.Add(this.txtFissionProductCount); - this.商品裂变.Controls.Add(this.chkFissionProduct); + this.商品裂变.Controls.Add(this.txtFissionTitle); this.商品裂变.Controls.Add(this.line2); this.商品裂变.Controls.Add(this.label38); this.商品裂变.Controls.Add(this.txtFissionRandomPriceChange); @@ -1240,7 +1239,6 @@ namespace TemuKJD.WXForms.ProductForms this.商品裂变.Controls.Add(this.lblFissionTitleCount); this.商品裂变.Controls.Add(this.chkFissionGoodsName); this.商品裂变.Controls.Add(this.chkRandomImgBorder); - this.商品裂变.Controls.Add(this.txtFissionTitle); this.商品裂变.Controls.Add(this.line1); this.商品裂变.Controls.Add(this.label37); this.商品裂变.Location = new System.Drawing.Point(4, 28); @@ -1251,6 +1249,19 @@ namespace TemuKJD.WXForms.ProductForms this.商品裂变.Text = "商品裂变"; this.商品裂变.UseVisualStyleBackColor = true; // + // txtFissionTitle + // + this.txtFissionTitle.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.txtFissionTitle.Location = new System.Drawing.Point(81, 7); + this.txtFissionTitle.Multiline = true; + this.txtFissionTitle.Name = "txtFissionTitle"; + this.txtFissionTitle.ScrollBars = System.Windows.Forms.ScrollBars.Both; + this.txtFissionTitle.Size = new System.Drawing.Size(496, 79); + this.txtFissionTitle.TabIndex = 0; + this.txtFissionTitle.TextChanged += new System.EventHandler(this.txtFissionTitle_TextChanged); + // // line2 // this.line2.ForeColor = System.Drawing.SystemColors.ControlDark; @@ -1280,11 +1291,13 @@ namespace TemuKJD.WXForms.ProductForms this.txtFissionRandomPriceChange.Name = "txtFissionRandomPriceChange"; this.txtFissionRandomPriceChange.Size = new System.Drawing.Size(24, 23); this.txtFissionRandomPriceChange.TabIndex = 906; - this.txtFissionRandomPriceChange.Text = "2"; + this.txtFissionRandomPriceChange.Text = "1"; // // chkFissionRandomPriceChange // this.chkFissionRandomPriceChange.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.chkFissionRandomPriceChange.Checked = true; + this.chkFissionRandomPriceChange.CheckState = System.Windows.Forms.CheckState.Checked; this.chkFissionRandomPriceChange.Location = new System.Drawing.Point(446, 91); this.chkFissionRandomPriceChange.Name = "chkFissionRandomPriceChange"; this.chkFissionRandomPriceChange.Size = new System.Drawing.Size(75, 21); @@ -1300,7 +1313,7 @@ namespace TemuKJD.WXForms.ProductForms this.txtDetailBorderImgCount.Name = "txtDetailBorderImgCount"; this.txtDetailBorderImgCount.Size = new System.Drawing.Size(24, 23); this.txtDetailBorderImgCount.TabIndex = 902; - this.txtDetailBorderImgCount.Text = "0"; + this.txtDetailBorderImgCount.Text = "29"; // // label35 // @@ -1414,7 +1427,7 @@ namespace TemuKJD.WXForms.ProductForms // lblFissionTitleCount // this.lblFissionTitleCount.ForeColor = System.Drawing.Color.Gray; - this.lblFissionTitleCount.Location = new System.Drawing.Point(25, 33); + this.lblFissionTitleCount.Location = new System.Drawing.Point(-10, 26); this.lblFissionTitleCount.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.lblFissionTitleCount.Name = "lblFissionTitleCount"; this.lblFissionTitleCount.Size = new System.Drawing.Size(88, 17); @@ -1424,9 +1437,9 @@ namespace TemuKJD.WXForms.ProductForms // // chkFissionGoodsName // - this.chkFissionGoodsName.Location = new System.Drawing.Point(45, 10); + this.chkFissionGoodsName.Location = new System.Drawing.Point(10, 7); this.chkFissionGoodsName.Name = "chkFissionGoodsName"; - this.chkFissionGoodsName.Size = new System.Drawing.Size(68, 21); + this.chkFissionGoodsName.Size = new System.Drawing.Size(72, 21); this.chkFissionGoodsName.TabIndex = 893; this.chkFissionGoodsName.Text = "裂变标题"; this.chkFissionGoodsName.UseVisualStyleBackColor = true; @@ -1434,6 +1447,8 @@ namespace TemuKJD.WXForms.ProductForms // chkRandomImgBorder // this.chkRandomImgBorder.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.chkRandomImgBorder.Checked = true; + this.chkRandomImgBorder.CheckState = System.Windows.Forms.CheckState.Checked; this.chkRandomImgBorder.Location = new System.Drawing.Point(10, 91); this.chkRandomImgBorder.Name = "chkRandomImgBorder"; this.chkRandomImgBorder.Size = new System.Drawing.Size(94, 21); @@ -1441,19 +1456,6 @@ namespace TemuKJD.WXForms.ProductForms this.chkRandomImgBorder.Text = "随机图片边框"; this.chkRandomImgBorder.UseVisualStyleBackColor = true; // - // txtFissionTitle - // - this.txtFissionTitle.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.txtFissionTitle.Location = new System.Drawing.Point(115, 7); - this.txtFissionTitle.Multiline = true; - this.txtFissionTitle.Name = "txtFissionTitle"; - this.txtFissionTitle.ScrollBars = System.Windows.Forms.ScrollBars.Both; - this.txtFissionTitle.Size = new System.Drawing.Size(462, 79); - this.txtFissionTitle.TabIndex = 0; - this.txtFissionTitle.TextChanged += new System.EventHandler(this.txtFissionTitle_TextChanged); - // // line1 // this.line1.ForeColor = System.Drawing.SystemColors.ControlDark; @@ -1481,14 +1483,13 @@ namespace TemuKJD.WXForms.ProductForms | System.Windows.Forms.AnchorStyles.Left))); this.ucGroupBoxEx4.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.ucGroupBoxEx4.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx4.Controls.Add(this.txtRandomFissionProductCount); this.ucGroupBoxEx4.Controls.Add(this.btnSwitchCatType); this.ucGroupBoxEx4.Controls.Add(this.cmbHot); this.ucGroupBoxEx4.Controls.Add(this.btnProdDb); this.ucGroupBoxEx4.Controls.Add(this.chkWXComplateProd); this.ucGroupBoxEx4.Controls.Add(this.txtAddCount); - this.ucGroupBoxEx4.Controls.Add(this.cmbJstInitSet); this.ucGroupBoxEx4.Controls.Add(this.txtSearchGoodsName); - this.ucGroupBoxEx4.Controls.Add(this.lblJstInitSet); this.ucGroupBoxEx4.Controls.Add(this.pbSelectProd); this.ucGroupBoxEx4.Controls.Add(this.cmbSourceType); this.ucGroupBoxEx4.Controls.Add(this.cmbCateFilter3); @@ -1513,6 +1514,9 @@ namespace TemuKJD.WXForms.ProductForms this.ucGroupBoxEx4.Controls.Add(this.lblIdFilter); this.ucGroupBoxEx4.Controls.Add(this.lblHot); this.ucGroupBoxEx4.Controls.Add(this.label19); + this.ucGroupBoxEx4.Controls.Add(this.cmbJstInitSet); + this.ucGroupBoxEx4.Controls.Add(this.lblJstInitSet); + this.ucGroupBoxEx4.Controls.Add(this.chkRandomFissionProduct); this.ucGroupBoxEx4.Location = new System.Drawing.Point(186, 2); this.ucGroupBoxEx4.Name = "ucGroupBoxEx4"; this.ucGroupBoxEx4.Size = new System.Drawing.Size(410, 165); @@ -1520,6 +1524,29 @@ namespace TemuKJD.WXForms.ProductForms this.ucGroupBoxEx4.TabStop = false; this.ucGroupBoxEx4.Text = "待传商品"; // + // txtRandomFissionProductCount + // + this.txtRandomFissionProductCount.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.txtRandomFissionProductCount.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.txtRandomFissionProductCount.Font = new System.Drawing.Font("微软雅黑", 10F); + this.txtRandomFissionProductCount.Location = new System.Drawing.Point(244, 100); + this.txtRandomFissionProductCount.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtRandomFissionProductCount.Name = "txtRandomFissionProductCount"; + this.txtRandomFissionProductCount.Size = new System.Drawing.Size(32, 25); + this.txtRandomFissionProductCount.TabIndex = 911; + this.txtRandomFissionProductCount.Text = "100"; + this.txtRandomFissionProductCount.Visible = false; + // + // chkRandomFissionProduct + // + this.chkRandomFissionProduct.Location = new System.Drawing.Point(155, 104); + this.chkRandomFissionProduct.Name = "chkRandomFissionProduct"; + this.chkRandomFissionProduct.Size = new System.Drawing.Size(92, 17); + this.chkRandomFissionProduct.TabIndex = 910; + this.chkRandomFissionProduct.Text = "裂变商品数量"; + this.chkRandomFissionProduct.UseVisualStyleBackColor = true; + this.chkRandomFissionProduct.Visible = false; + // // btnSwitchCatType // this.btnSwitchCatType.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -1605,20 +1632,6 @@ namespace TemuKJD.WXForms.ProductForms this.txtAddCount.TabIndex = 536; this.txtAddCount.Text = "500"; // - // cmbJstInitSet - // - this.cmbJstInitSet.FormattingEnabled = true; - this.cmbJstInitSet.Items.AddRange(new object[] { - "", - "已设置", - "未设置"}); - this.cmbJstInitSet.Location = new System.Drawing.Point(184, 100); - this.cmbJstInitSet.Name = "cmbJstInitSet"; - this.cmbJstInitSet.Size = new System.Drawing.Size(92, 25); - this.cmbJstInitSet.TabIndex = 697; - this.cmbJstInitSet.Text = "已设置"; - this.cmbJstInitSet.Visible = false; - // // txtSearchGoodsName // this.txtSearchGoodsName.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; @@ -1629,21 +1642,10 @@ namespace TemuKJD.WXForms.ProductForms this.txtSearchGoodsName.Size = new System.Drawing.Size(220, 25); this.txtSearchGoodsName.TabIndex = 795; // - // lblJstInitSet - // - this.lblJstInitSet.AutoSize = true; - this.lblJstInitSet.Location = new System.Drawing.Point(155, 104); - this.lblJstInitSet.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.lblJstInitSet.Name = "lblJstInitSet"; - this.lblJstInitSet.Size = new System.Drawing.Size(32, 17); - this.lblJstInitSet.TabIndex = 696; - this.lblJstInitSet.Text = "分销"; - this.lblJstInitSet.Visible = false; - // // pbSelectProd // this.pbSelectProd.Image = global::TemuKJD.Properties.Resources.loading_blue; - this.pbSelectProd.Location = new System.Drawing.Point(98, 131); + this.pbSelectProd.Location = new System.Drawing.Point(94, 131); this.pbSelectProd.Name = "pbSelectProd"; this.pbSelectProd.Size = new System.Drawing.Size(25, 25); this.pbSelectProd.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -1765,7 +1767,7 @@ namespace TemuKJD.WXForms.ProductForms // lblGoodsCount // this.lblGoodsCount.AutoSize = true; - this.lblGoodsCount.Location = new System.Drawing.Point(123, 127); + this.lblGoodsCount.Location = new System.Drawing.Point(117, 127); this.lblGoodsCount.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.lblGoodsCount.Name = "lblGoodsCount"; this.lblGoodsCount.Size = new System.Drawing.Size(71, 17); @@ -1843,7 +1845,7 @@ namespace TemuKJD.WXForms.ProductForms this.lblWaitToUp.Cursor = System.Windows.Forms.Cursors.Hand; this.lblWaitToUp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblWaitToUp.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.lblWaitToUp.Location = new System.Drawing.Point(123, 144); + this.lblWaitToUp.Location = new System.Drawing.Point(117, 144); this.lblWaitToUp.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.lblWaitToUp.Name = "lblWaitToUp"; this.lblWaitToUp.Size = new System.Drawing.Size(71, 17); @@ -1877,7 +1879,7 @@ namespace TemuKJD.WXForms.ProductForms // // chkSevenDays // - this.chkSevenDays.Location = new System.Drawing.Point(7, 127); + this.chkSevenDays.Location = new System.Drawing.Point(6, 127); this.chkSevenDays.Name = "chkSevenDays"; this.chkSevenDays.Size = new System.Drawing.Size(87, 17); this.chkSevenDays.TabIndex = 805; @@ -1886,7 +1888,7 @@ namespace TemuKJD.WXForms.ProductForms // // chkSkipQualification // - this.chkSkipQualification.Location = new System.Drawing.Point(7, 144); + this.chkSkipQualification.Location = new System.Drawing.Point(6, 144); this.chkSkipQualification.Name = "chkSkipQualification"; this.chkSkipQualification.Size = new System.Drawing.Size(87, 17); this.chkSkipQualification.TabIndex = 806; @@ -1937,13 +1939,13 @@ namespace TemuKJD.WXForms.ProductForms // // lblIdFilter // - this.lblIdFilter.AutoSize = true; - this.lblIdFilter.Location = new System.Drawing.Point(39, 104); + this.lblIdFilter.Location = new System.Drawing.Point(28, 104); this.lblIdFilter.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.lblIdFilter.Name = "lblIdFilter"; - this.lblIdFilter.Size = new System.Drawing.Size(21, 17); + this.lblIdFilter.Size = new System.Drawing.Size(32, 17); this.lblIdFilter.TabIndex = 651; this.lblIdFilter.Text = "ID"; + this.lblIdFilter.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblIdFilter.Visible = false; // // lblHot @@ -1967,6 +1969,31 @@ namespace TemuKJD.WXForms.ProductForms this.label19.TabIndex = 707; this.label19.Text = "类目2"; // + // cmbJstInitSet + // + this.cmbJstInitSet.FormattingEnabled = true; + this.cmbJstInitSet.Items.AddRange(new object[] { + "", + "是", + "否"}); + this.cmbJstInitSet.Location = new System.Drawing.Point(206, 131); + this.cmbJstInitSet.Name = "cmbJstInitSet"; + this.cmbJstInitSet.Size = new System.Drawing.Size(36, 25); + this.cmbJstInitSet.TabIndex = 697; + this.cmbJstInitSet.Text = "是"; + this.cmbJstInitSet.Visible = false; + // + // lblJstInitSet + // + this.lblJstInitSet.AutoSize = true; + this.lblJstInitSet.Location = new System.Drawing.Point(177, 135); + this.lblJstInitSet.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.lblJstInitSet.Name = "lblJstInitSet"; + this.lblJstInitSet.Size = new System.Drawing.Size(32, 17); + this.lblJstInitSet.TabIndex = 696; + this.lblJstInitSet.Text = "分销"; + this.lblJstInitSet.Visible = false; + // // ucGroupBoxEx1 // this.ucGroupBoxEx1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) @@ -2389,19 +2416,19 @@ namespace TemuKJD.WXForms.ProductForms // this.dgvShop.AllowUserToAddRows = false; this.dgvShop.AllowUserToDeleteRows = false; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle17.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle17; 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))))); - 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; + dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle18.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle18; this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colSelect, @@ -2633,19 +2660,19 @@ namespace TemuKJD.WXForms.ProductForms // this.dgvSelectProduct.AllowUserToAddRows = false; this.dgvSelectProduct.AllowUserToDeleteRows = false; - dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle19.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle19; 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; + dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle20.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle20.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle20.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle20.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle20.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvSelectProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle20; this.dgvSelectProduct.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvSelectProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colCheck, @@ -2707,8 +2734,8 @@ namespace TemuKJD.WXForms.ProductForms // // colSupplierName // - dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle21; this.colSupplierName.Frozen = true; this.colSupplierName.HeaderText = "店铺名称"; this.colSupplierName.Name = "colSupplierName"; @@ -2788,8 +2815,8 @@ namespace TemuKJD.WXForms.ProductForms // // colProductName // - dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colProductName.DefaultCellStyle = dataGridViewCellStyle6; + dataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colProductName.DefaultCellStyle = dataGridViewCellStyle22; this.colProductName.HeaderText = "商品标题"; this.colProductName.Name = "colProductName"; this.colProductName.ReadOnly = true; @@ -2797,8 +2824,8 @@ namespace TemuKJD.WXForms.ProductForms // // colProductCat // - dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colProductCat.DefaultCellStyle = dataGridViewCellStyle7; + dataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colProductCat.DefaultCellStyle = dataGridViewCellStyle23; this.colProductCat.HeaderText = "商品类目"; this.colProductCat.Name = "colProductCat"; this.colProductCat.ReadOnly = true; @@ -2853,8 +2880,8 @@ namespace TemuKJD.WXForms.ProductForms // // colAddTime // - dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colAddTime.DefaultCellStyle = dataGridViewCellStyle8; + dataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colAddTime.DefaultCellStyle = dataGridViewCellStyle24; this.colAddTime.HeaderText = "上传时间"; this.colAddTime.Name = "colAddTime"; this.colAddTime.ReadOnly = true; @@ -2947,25 +2974,6 @@ namespace TemuKJD.WXForms.ProductForms this.panelEx1.Text = "停止当前操作"; this.panelEx1.Visible = false; // - // chkFissionProduct - // - this.chkFissionProduct.Location = new System.Drawing.Point(10, 64); - this.chkFissionProduct.Name = "chkFissionProduct"; - this.chkFissionProduct.Size = new System.Drawing.Size(68, 21); - this.chkFissionProduct.TabIndex = 910; - this.chkFissionProduct.Text = "裂变商品"; - this.chkFissionProduct.UseVisualStyleBackColor = true; - // - // txtFissionProductCount - // - this.txtFissionProductCount.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.txtFissionProductCount.Location = new System.Drawing.Point(78, 63); - this.txtFissionProductCount.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); - this.txtFissionProductCount.Name = "txtFissionProductCount"; - this.txtFissionProductCount.Size = new System.Drawing.Size(32, 23); - this.txtFissionProductCount.TabIndex = 911; - this.txtFissionProductCount.Text = "100"; - // // WXDBProdUploadForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -3218,7 +3226,7 @@ namespace TemuKJD.WXForms.ProductForms private DevComponents.DotNetBar.Controls.Line line1; private System.Windows.Forms.Label label37; private DevComponents.DotNetBar.PanelEx btnSwitchCatType; - private System.Windows.Forms.TextBox txtFissionProductCount; - private UserComponent.UcCheckBox chkFissionProduct; + private System.Windows.Forms.TextBox txtRandomFissionProductCount; + private UserComponent.UcCheckBox chkRandomFissionProduct; } } \ No newline at end of file diff --git a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs index d93f2eb..029e57e 100644 --- a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs +++ b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs @@ -355,26 +355,37 @@ namespace TemuKJD.WXForms.ProductForms cmbSourceType.Items.Insert(1, "------"); cmbSourceType.Items.Insert(1, "1688商品"); cmbSourceType.Items.Insert(1, "多多商品"); + + chkRandomFissionProduct.Visible = true; + txtRandomFissionProductCount.Visible = true; } - if (!BaseClass.UserAuthority.Contains("商品裂变")) + cmbHot_TextChanged(null, null); + + if (BaseClass.UserAuthority.Contains("商品裂变")) + { + chkRandomFissionProduct.Visible = true; + txtRandomFissionProductCount.Visible = true; + } + else { ucTabControlMetro1.TabPages.Remove(商品裂变); } - //#endif - if (BaseClass.SaLevel == 1) - { - //chkImgRandomBlock.Visible = true; - } - List ctrlLst = new List() { - lblSourceType, cmbSourceType, lblGroupFilter, cmbGroupFilter, lblHot, cmbHot, lblIdFilter, txtIdFilter, lblJstInitSet, cmbJstInitSet + List ctrlLst = new List() + { + lblSourceType, cmbSourceType, lblGroupFilter, cmbGroupFilter, lblHot, cmbHot, lblIdFilter, txtIdFilter, + chkRandomFissionProduct, txtRandomFissionProductCount, lblJstInitSet, cmbJstInitSet }; - for (int i = 0; i < ctrlLst.Count - 1; i++) + for (int i = 0; i < ctrlLst.Count - 2; i += 2) { if (ctrlLst[i].Visible == false) { - for (int j= ctrlLst.Count - 1; j > i; j--) - ctrlLst[j].Location = new Point(ctrlLst[j -1].Location.X, ctrlLst[j - 1].Location.Y); + for (int j= ctrlLst.Count - 2; j > i; j-=2) + { + ctrlLst[j].Location = new Point(ctrlLst[j - 2].Location.X, ctrlLst[j - 2].Location.Y); + ctrlLst[j + 1].Location = new Point(ctrlLst[j].Location.X + ctrlLst[j].Width - 3, ctrlLst[j - 1].Location.Y); + ctrlLst[j + 1].BringToFront(); + } } } @@ -1456,6 +1467,7 @@ namespace TemuKJD.WXForms.ProductForms isFinish = true; } selectProd.product_name = titles[0]; + selectProd.is_fission_title = true; titles.RemoveAt(0); txtFissionTitle.Text = string.Join("\r\n", titles); cell.Value = "标题裂变成功，更改为：" + selectProd.product_name; @@ -1471,7 +1483,7 @@ namespace TemuKJD.WXForms.ProductForms if (chkSkipUploaded.Checked) { // 裂变按标题名称 - if (chkFissionProduct.Checked || chkFissionGoodsName.Checked) + if (selectProd.is_fission_title) { var searchRst = WXUpload.searchProductWithTitle(shop, GetHtml.UrlEncodeUtf8(selectProd?.product_name)); if (!searchRst.Contains("\"code\":0") && !searchRst.Contains("\"success\":true")) @@ -3604,6 +3616,7 @@ namespace TemuKJD.WXForms.ProductForms if (prodInfo.detail.sku.FirstOrDefault().thumb_url.IsNullOrEmpty()) prodInfo.detail.sku.FirstOrDefault().thumb_url = prodInfo.detail.galleries.FirstOrDefault(g => g.type == 1)?.url; + // 处理系统指定的规格名称 if (upProdParam.product.info.category.FirstOrDefault()?.name == "食品饮料" || prodInfo.detail.cats.FirstOrDefault() == "食品饮料") { if (selectProd.cat_name == "坚果炒货" || selectProd.cat_name == "果干") @@ -3627,6 +3640,34 @@ namespace TemuKJD.WXForms.ProductForms } } } + else + { + var leafCat = upProdParam.product.info.category.LastOrDefault(); + if (leafCat?.catInfo?.saleAttr?.attr != null) + { + foreach (var att in leafCat.catInfo.saleAttr.attr) + { + if (att.isRequired == true) + { + if (att.normalRelease.ruleType == 2 && prodInfo.detail.sku.FirstOrDefault()?.spec.Count == 2) + { + foreach (var sku in prodInfo.detail.sku) + { + sku.spec[1].parent_name = att.name; + } + } + else + { + foreach (var sku in prodInfo.detail.sku) + { + sku.spec[0].parent_name = att.name; + } + } + } + } + } + } + if (prodInfo.detail.sku.FirstOrDefault()?.spec?.Count > 0) { productSaleAttrParam attrParam = new productSaleAttrParam() @@ -3862,7 +3903,7 @@ namespace TemuKJD.WXForms.ProductForms // 聚水潭上微信小店，加运费（其他平台shipPrice默认为0） skuParam.productSkuInfo.salePrice += (shipPrice * defaultAddPriceRule.ShippingPriceTimes).ParseToInt(); // 商品裂变随机增加价格 - if (BaseClass.UserAuthority.Contains("商品裂变") && chkFissionRandomPriceChange.Checked) + if (selectProd.is_fission_title && chkFissionRandomPriceChange.Checked) { Invoke(new Action(() => { @@ -4377,8 +4418,9 @@ namespace TemuKJD.WXForms.ProductForms #endregion #region 添加图片随机外框，用于商品裂变 - if (BaseClass.UserAuthority.Contains("商品裂变") && chkRandomImgBorder.Checked) + if (selectProd.is_fission_title && chkRandomImgBorder.Checked) { + // selectProd.isFission int mainCount = 9; int detailCount = 1; Invoke(new Action(() => @@ -4998,9 +5040,9 @@ namespace TemuKJD.WXForms.ProductForms return; } - this.lstTemuDBProductSelect.Clear(); - NaiBa.Util.Helper.ConfigHelper.SaveConfig("wx_db_prod_upload_list", this.lstTemuDBProductSelect); - lblWaitToUp.Text = "待上传 " + lstTemuDBProductSelect.Count + " 件"; + //this.lstTemuDBProductSelect.Clear(); + //NaiBa.Util.Helper.ConfigHelper.SaveConfig("wx_db_prod_upload_list", this.lstTemuDBProductSelect); + //lblWaitToUp.Text = "待上传 " + lstTemuDBProductSelect.Count + " 件"; })); } @@ -5050,11 +5092,11 @@ namespace TemuKJD.WXForms.ProductForms foreach (var prod in prodLst) { var productNameLst = new List() { prod.product_name }; - if (BaseClass.UserAuthority.Contains("商品裂变") && chkFissionProduct.Checked) + if (chkRandomFissionProduct.Checked) { Invoke(new Action(() => { - var titleCount = txtFissionProductCount.Text.Trim().ParseToInt(); + var titleCount = txtRandomFissionProductCount.Text.Trim().ParseToInt(); if (prod.fission_words.ParseToString().Length > 20 && titleCount > 0) { productNameLst = prod.fission_words.Replace("fission_goods_names:", "") @@ -5066,9 +5108,11 @@ namespace TemuKJD.WXForms.ProductForms foreach (var productName in productNameLst) { var selectProd = JsonHelper.DeserializeJsonToObject(JsonHelper.SerializeObject(prod)); + selectProd.product_name = productName; + if (chkRandomFissionProduct.Checked) + selectProd.is_fission_title = true; selectProd.out_product_Id = prod.id.ToString(); selectProd.id = 1; - selectProd.product_name = productName; if (lstTemuDBProductSelect.Count > 0) selectProd.id = lstTemuDBProductSelect.Max(p => p.id) + 1; this.lstTemuDBProductSelect.Add(selectProd); @@ -5134,8 +5178,9 @@ namespace TemuKJD.WXForms.ProductForms string addUserName = BaseClass.UserAuthority.Contains("商品采集") ? ("admin," + BaseClass.UserName) : "admin"; if (BaseClass.GroupId != 3) addUserName = BaseClass.ParentAuthority.Contains("商品采集") ? ("admin," + BaseClass.ParentUserName) : "admin"; - // 如果指定是自己采集的商品，则只随机自己采集的商品 - if (cmbSourceType.Text.Trim().Contains("多多商品") || cmbSourceType.Text.Trim().Contains("1688商品")) + // 如果指定只有自己采集的商品，则只随机自己采集的商品 + if ((cmbSourceType.Text.Trim().Contains("多多商品") || cmbSourceType.Text.Trim().Contains("1688商品")) && + cmbSourceType.Text.Trim().Replace("多多商品", "").Replace("1688商品", "").Trim(',').IsNullOrEmpty()) data += "&add_user_name=" + (BaseClass.GroupId == 3 ? BaseClass.UserName : BaseClass.ParentUserName); else data += "&add_user_name=" + addUserName; @@ -5214,7 +5259,7 @@ namespace TemuKJD.WXForms.ProductForms if (chkWXComplateProd.Checked) data += "&has_wx_format=1"; - if (BaseClass.UserAuthority.Contains("商品裂变") && chkFissionProduct.Checked) + if (chkRandomFissionProduct.Checked) { data += "&fission_words=fission_goods_names:"; } @@ -5468,6 +5513,7 @@ namespace TemuKJD.WXForms.ProductForms cmbSourceType.Text = "厂商直采"; cmbHot.Text = "普通商品"; chkSkipQualification.Checked = false; + cmbHot_TextChanged(null, null); int prodCount; pbSelectProd.Visible = true; @@ -5661,7 +5707,7 @@ namespace TemuKJD.WXForms.ProductForms } else { - cmbJstInitSet.Text = "已设置"; + cmbJstInitSet.Text = "是"; } string sourceType = cmbSourceType.Text.Trim().Replace("已采集数据", "1688外部数据"); @@ -6003,13 +6049,13 @@ namespace TemuKJD.WXForms.ProductForms private void btnProdDb_Click(object sender, EventArgs e) { - WXUserProdListForm.Instance.lstTemuDBProductSelect = this.lstTemuDBProductSelect; - WXUserProdListForm.Instance.cmbSourceType.Items.Clear(); - WXUserProdListForm.Instance.cmbSourceType.Items.AddRange(this.cmbSourceType.Items.Cast().ToArray()); - WXUserProdListForm.Instance.SaveComplete -= dbProdList_SaveComplete; - WXUserProdListForm.Instance.SaveComplete += dbProdList_SaveComplete; - WXUserProdListForm.Instance.Show(); - WXUserProdListForm.Instance.BringToFront(); + WXSelectDBProdListForm.Instance.lstTemuDBProductSelect = this.lstTemuDBProductSelect; + WXSelectDBProdListForm.Instance.cmbSourceType.Items.Clear(); + WXSelectDBProdListForm.Instance.cmbSourceType.Items.AddRange(this.cmbSourceType.Items.Cast().ToArray()); + WXSelectDBProdListForm.Instance.SaveComplete -= dbProdList_SaveComplete; + WXSelectDBProdListForm.Instance.SaveComplete += dbProdList_SaveComplete; + WXSelectDBProdListForm.Instance.Show(); + WXSelectDBProdListForm.Instance.BringToFront(); } public void dbProdList_SaveComplete(object obj) @@ -6025,13 +6071,20 @@ namespace TemuKJD.WXForms.ProductForms { if (cmbHot.Text == "爆款数据") { - cmbSourceType.Text = "微信店采"; + cmbSourceType.Text = ""; cmbJstInitSet.Text = ""; } else { cmbSourceType.Text = "厂商直采"; - cmbJstInitSet.Text = "已设置"; + cmbJstInitSet.Text = "是"; + // 商品采集用户无货源选择权限只能随机自己的商品 + if ((BaseClass.UserAuthority.Contains("商品采集") || BaseClass.ParentAuthority.Contains("商品采集")) && + !BaseClass.UserAuthority.Contains("货源选择") && BaseClass.SaLevel == 0) + { + cmbSourceType.Text = "多多商品,1688商品"; + cmbJstInitSet.Text = ""; + } } } diff --git a/TEMUKJD/WXForms/ProductForms/WXUserProdListForm.Designer.cs b/TEMUKJD/WXForms/ProductForms/WXSelectDBProdListForm.Designer.cs similarity index 92% rename from TEMUKJD/WXForms/ProductForms/WXUserProdListForm.Designer.cs rename to TEMUKJD/WXForms/ProductForms/WXSelectDBProdListForm.Designer.cs index 705aab5..5ed8d50 100644 --- a/TEMUKJD/WXForms/ProductForms/WXUserProdListForm.Designer.cs +++ b/TEMUKJD/WXForms/ProductForms/WXSelectDBProdListForm.Designer.cs @@ -1,7 +1,7 @@  namespace TemuKJD.WXForms.ProductForms { - partial class WXUserProdListForm + partial class WXSelectDBProdListForm { /// /// Required designer variable. @@ -49,11 +49,13 @@ namespace TemuKJD.WXForms.ProductForms System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WXUserProdListForm)); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WXSelectDBProdListForm)); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.txtFissionProductCount = new System.Windows.Forms.TextBox(); + this.cmbHasFission = new System.Windows.Forms.ComboBox(); + this.lblHasFission = new System.Windows.Forms.Label(); this.cmbRelation = new System.Windows.Forms.ComboBox(); this.lblRelation = new System.Windows.Forms.Label(); - this.btnSetShop = new DevComponents.DotNetBar.PanelEx(); this.btnSelect = new DevComponents.DotNetBar.PanelEx(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.txtViewUvMin = new System.Windows.Forms.TextBox(); @@ -67,7 +69,7 @@ namespace TemuKJD.WXForms.ProductForms this.cmbCat2 = new TemuKJD.UserComponent.UcComboBoxMutiSelect(); this.label14 = new System.Windows.Forms.Label(); this.cmbCat1 = new TemuKJD.UserComponent.UcComboBoxMutiSelect(); - this.label2 = new System.Windows.Forms.Label(); + this.lblCat1 = new System.Windows.Forms.Label(); this.txtProdName = new System.Windows.Forms.TextBox(); this.label3 = new System.Windows.Forms.Label(); this.lblWxSafe = new System.Windows.Forms.Label(); @@ -81,6 +83,7 @@ namespace TemuKJD.WXForms.ProductForms this.lblGroupFilter = new System.Windows.Forms.Label(); this.cmbSourceType = new System.Windows.Forms.ComboBox(); this.lblSetShop = new System.Windows.Forms.Label(); + this.chkFissionProduct = new TemuKJD.UserComponent.UcCheckBox(this.components); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); this.btnStopStop = new DevComponents.DotNetBar.PanelEx(); this.pnlSetShop = new System.Windows.Forms.Panel(); @@ -103,6 +106,7 @@ namespace TemuKJD.WXForms.ProductForms this.label7 = new System.Windows.Forms.Label(); this.pbLoading = new System.Windows.Forms.PictureBox(); this.label16 = new System.Windows.Forms.Label(); + this.btnSetShop = new DevComponents.DotNetBar.PanelEx(); this.txtRealCoid = new System.Windows.Forms.TextBox(); this.txtSKC = new System.Windows.Forms.TextBox(); this.cmbWxCat = new System.Windows.Forms.ComboBox(); @@ -186,12 +190,15 @@ namespace TemuKJD.WXForms.ProductForms // // splitContainer1.Panel1 // + this.splitContainer1.Panel1.Controls.Add(this.txtFissionProductCount); + this.splitContainer1.Panel1.Controls.Add(this.cmbHasFission); + this.splitContainer1.Panel1.Controls.Add(this.lblHasFission); this.splitContainer1.Panel1.Controls.Add(this.cmbRelation); this.splitContainer1.Panel1.Controls.Add(this.lblRelation); - this.splitContainer1.Panel1.Controls.Add(this.btnSetShop); this.splitContainer1.Panel1.Controls.Add(this.btnSelect); this.splitContainer1.Panel1.Controls.Add(this.tableLayoutPanel1); this.splitContainer1.Panel1.Controls.Add(this.lblSetShop); + this.splitContainer1.Panel1.Controls.Add(this.chkFissionProduct); // // splitContainer1.Panel2 // @@ -200,6 +207,46 @@ namespace TemuKJD.WXForms.ProductForms this.splitContainer1.SplitterDistance = 74; this.splitContainer1.TabIndex = 1; // + // txtFissionProductCount + // + this.txtFissionProductCount.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.txtFissionProductCount.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.txtFissionProductCount.Font = new System.Drawing.Font("微软雅黑", 10F); + this.txtFissionProductCount.Location = new System.Drawing.Point(1226, 44); + this.txtFissionProductCount.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtFissionProductCount.Name = "txtFissionProductCount"; + this.txtFissionProductCount.Size = new System.Drawing.Size(32, 25); + this.txtFissionProductCount.TabIndex = 913; + this.txtFissionProductCount.Text = "100"; + this.txtFissionProductCount.Visible = false; + // + // cmbHasFission + // + this.cmbHasFission.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.cmbHasFission.FormattingEnabled = true; + this.cmbHasFission.Items.AddRange(new object[] { + "", + "是", + "否"}); + this.cmbHasFission.Location = new System.Drawing.Point(1190, 10); + this.cmbHasFission.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); + this.cmbHasFission.Name = "cmbHasFission"; + this.cmbHasFission.Size = new System.Drawing.Size(68, 25); + this.cmbHasFission.TabIndex = 983; + this.cmbHasFission.Visible = false; + // + // lblHasFission + // + this.lblHasFission.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.lblHasFission.AutoSize = true; + this.lblHasFission.Location = new System.Drawing.Point(1134, 14); + this.lblHasFission.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); + this.lblHasFission.Name = "lblHasFission"; + this.lblHasFission.Size = new System.Drawing.Size(56, 17); + this.lblHasFission.TabIndex = 982; + this.lblHasFission.Text = "裂变标题"; + this.lblHasFission.Visible = false; + // // cmbRelation // this.cmbRelation.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); @@ -208,10 +255,10 @@ namespace TemuKJD.WXForms.ProductForms "", "是", "否"}); - this.cmbRelation.Location = new System.Drawing.Point(1267, 42); + this.cmbRelation.Location = new System.Drawing.Point(1345, 42); this.cmbRelation.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbRelation.Name = "cmbRelation"; - this.cmbRelation.Size = new System.Drawing.Size(153, 25); + this.cmbRelation.Size = new System.Drawing.Size(84, 25); this.cmbRelation.TabIndex = 882; this.cmbRelation.Visible = false; // @@ -219,7 +266,7 @@ namespace TemuKJD.WXForms.ProductForms // this.lblRelation.Anchor = System.Windows.Forms.AnchorStyles.Right; this.lblRelation.AutoSize = true; - this.lblRelation.Location = new System.Drawing.Point(1201, 46); + this.lblRelation.Location = new System.Drawing.Point(1286, 46); this.lblRelation.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.lblRelation.Name = "lblRelation"; this.lblRelation.Size = new System.Drawing.Size(68, 17); @@ -227,39 +274,13 @@ namespace TemuKJD.WXForms.ProductForms this.lblRelation.Text = "数据转换："; this.lblRelation.Visible = false; // - // btnSetShop - // - this.btnSetShop.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.btnSetShop.CanvasColor = System.Drawing.SystemColors.Control; - this.btnSetShop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnSetShop.DisabledBackColor = System.Drawing.Color.Empty; - this.btnSetShop.Location = new System.Drawing.Point(1267, 9); - this.btnSetShop.Name = "btnSetShop"; - this.btnSetShop.Size = new System.Drawing.Size(63, 25); - this.btnSetShop.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnSetShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); - this.btnSetShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); - this.btnSetShop.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.btnSetShop.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnSetShop.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.btnSetShop.Style.GradientAngle = 90; - this.btnSetShop.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; - this.btnSetShop.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnSetShop.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnSetShop.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnSetShop.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; - this.btnSetShop.TabIndex = 711; - this.btnSetShop.Text = "指定店铺"; - this.btnSetShop.Visible = false; - this.btnSetShop.Click += new System.EventHandler(this.btnSetShop_Click); - // // btnSelect // this.btnSelect.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnSelect.Cursor = System.Windows.Forms.Cursors.Hand; this.btnSelect.DisabledBackColor = System.Drawing.Color.Empty; this.btnSelect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSelect.Location = new System.Drawing.Point(1336, 9); + this.btnSelect.Location = new System.Drawing.Point(1345, 9); this.btnSelect.Name = "btnSelect"; this.btnSelect.Size = new System.Drawing.Size(84, 25); this.btnSelect.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -305,7 +326,7 @@ namespace TemuKJD.WXForms.ProductForms this.tableLayoutPanel1.Controls.Add(this.cmbCat2, 5, 0); this.tableLayoutPanel1.Controls.Add(this.label14, 4, 0); this.tableLayoutPanel1.Controls.Add(this.cmbCat1, 3, 0); - this.tableLayoutPanel1.Controls.Add(this.label2, 2, 0); + this.tableLayoutPanel1.Controls.Add(this.lblCat1, 2, 0); this.tableLayoutPanel1.Controls.Add(this.txtProdName, 1, 0); this.tableLayoutPanel1.Controls.Add(this.label3, 0, 0); this.tableLayoutPanel1.Controls.Add(this.lblWxSafe, 0, 1); @@ -324,22 +345,23 @@ namespace TemuKJD.WXForms.ProductForms 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(1193, 105); + this.tableLayoutPanel1.Size = new System.Drawing.Size(1127, 105); this.tableLayoutPanel1.TabIndex = 679; // // txtViewUvMin // - this.txtViewUvMin.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtViewUvMin.Location = new System.Drawing.Point(1127, 41); + this.txtViewUvMin.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.txtViewUvMin.Location = new System.Drawing.Point(1075, 41); + this.txtViewUvMin.Margin = new System.Windows.Forms.Padding(0); this.txtViewUvMin.Name = "txtViewUvMin"; - this.txtViewUvMin.Size = new System.Drawing.Size(63, 23); + this.txtViewUvMin.Size = new System.Drawing.Size(51, 23); this.txtViewUvMin.TabIndex = 882; this.txtViewUvMin.Visible = false; // // chkViewUvMin // - this.chkViewUvMin.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.chkViewUvMin.Location = new System.Drawing.Point(1073, 42); + this.chkViewUvMin.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.chkViewUvMin.Location = new System.Drawing.Point(1024, 42); this.chkViewUvMin.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3); this.chkViewUvMin.Name = "chkViewUvMin"; this.chkViewUvMin.Size = new System.Drawing.Size(48, 21); @@ -356,35 +378,37 @@ namespace TemuKJD.WXForms.ProductForms "", "爆款数据", "普通商品"}); - this.cmbHot.Location = new System.Drawing.Point(917, 7); + this.cmbHot.Location = new System.Drawing.Point(869, 5); this.cmbHot.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbHot.Name = "cmbHot"; - this.cmbHot.Size = new System.Drawing.Size(147, 25); + this.cmbHot.Size = new System.Drawing.Size(144, 25); this.cmbHot.TabIndex = 882; this.cmbHot.Text = "普通商品"; this.cmbHot.Visible = false; + this.cmbHot.SelectedIndexChanged += new System.EventHandler(this.cmbHot_TextChanged); this.cmbHot.TextChanged += new System.EventHandler(this.cmbHot_TextChanged); // // lblHot // this.lblHot.Anchor = System.Windows.Forms.AnchorStyles.Right; this.lblHot.AutoSize = true; - this.lblHot.Location = new System.Drawing.Point(873, 9); + this.lblHot.Location = new System.Drawing.Point(837, 9); this.lblHot.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.lblHot.Name = "lblHot"; - this.lblHot.Size = new System.Drawing.Size(44, 17); + this.lblHot.Size = new System.Drawing.Size(32, 17); this.lblHot.TabIndex = 882; - this.lblHot.Text = "爆品："; + this.lblHot.Text = "爆品"; this.lblHot.Visible = false; // // btnSearch // - this.btnSearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.btnSearch.Anchor = System.Windows.Forms.AnchorStyles.Left; this.btnSearch.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; 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(1070, 5); + this.btnSearch.Location = new System.Drawing.Point(1019, 5); + this.btnSearch.Margin = new System.Windows.Forms.Padding(3, 3, 5, 3); this.btnSearch.Name = "btnSearch"; this.btnSearch.Size = new System.Drawing.Size(51, 25); this.btnSearch.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -404,13 +428,14 @@ namespace TemuKJD.WXForms.ProductForms // // btnEmpty // - this.btnEmpty.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.btnEmpty.Anchor = System.Windows.Forms.AnchorStyles.Left; 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(1127, 5); + this.btnEmpty.Location = new System.Drawing.Point(1075, 5); + this.btnEmpty.Margin = new System.Windows.Forms.Padding(0); this.btnEmpty.Name = "btnEmpty"; - this.btnEmpty.Size = new System.Drawing.Size(63, 25); + this.btnEmpty.Size = new System.Drawing.Size(51, 25); this.btnEmpty.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnEmpty.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); this.btnEmpty.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); @@ -435,10 +460,10 @@ namespace TemuKJD.WXForms.ProductForms this.cmbCat3.DropDownWidth = 1; this.cmbCat3.FormattingEnabled = true; this.cmbCat3.IntegralHeight = false; - this.cmbCat3.Location = new System.Drawing.Point(720, 7); + this.cmbCat3.Location = new System.Drawing.Point(687, 5); this.cmbCat3.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbCat3.Name = "cmbCat3"; - this.cmbCat3.Size = new System.Drawing.Size(147, 25); + this.cmbCat3.Size = new System.Drawing.Size(144, 25); this.cmbCat3.TabIndex = 811; this.cmbCat3.Text = "全部"; this.cmbCat3.SelectedIndexChanged += new System.EventHandler(this.cmbCat3_SelectedIndexChanged); @@ -448,12 +473,12 @@ namespace TemuKJD.WXForms.ProductForms // this.label17.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label17.AutoSize = true; - this.label17.Location = new System.Drawing.Point(669, 9); + this.label17.Location = new System.Drawing.Point(648, 9); this.label17.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(51, 17); + this.label17.Size = new System.Drawing.Size(39, 17); this.label17.TabIndex = 811; - this.label17.Text = "类目3："; + this.label17.Text = "类目3"; // // cmbCat2 // @@ -463,10 +488,10 @@ namespace TemuKJD.WXForms.ProductForms this.cmbCat2.DropDownWidth = 1; this.cmbCat2.FormattingEnabled = true; this.cmbCat2.IntegralHeight = false; - this.cmbCat2.Location = new System.Drawing.Point(517, 7); + this.cmbCat2.Location = new System.Drawing.Point(499, 5); this.cmbCat2.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbCat2.Name = "cmbCat2"; - this.cmbCat2.Size = new System.Drawing.Size(146, 25); + this.cmbCat2.Size = new System.Drawing.Size(143, 25); this.cmbCat2.TabIndex = 804; this.cmbCat2.Text = "全部"; this.cmbCat2.SelectedIndexChanged += new System.EventHandler(this.cmbCat2_SelectedIndexChanged); @@ -476,12 +501,12 @@ namespace TemuKJD.WXForms.ProductForms // this.label14.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label14.AutoSize = true; - this.label14.Location = new System.Drawing.Point(466, 9); + this.label14.Location = new System.Drawing.Point(460, 9); this.label14.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(51, 17); + this.label14.Size = new System.Drawing.Size(39, 17); this.label14.TabIndex = 784; - this.label14.Text = "类目2："; + this.label14.Text = "类目2"; // // cmbCat1 // @@ -491,56 +516,60 @@ namespace TemuKJD.WXForms.ProductForms this.cmbCat1.DropDownWidth = 1; this.cmbCat1.FormattingEnabled = true; this.cmbCat1.IntegralHeight = false; - this.cmbCat1.Location = new System.Drawing.Point(294, 5); + this.cmbCat1.Location = new System.Drawing.Point(279, 7); this.cmbCat1.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbCat1.Name = "cmbCat1"; - this.cmbCat1.Size = new System.Drawing.Size(147, 25); + this.cmbCat1.Size = new System.Drawing.Size(144, 25); this.cmbCat1.TabIndex = 805; this.cmbCat1.Text = "全部"; this.cmbCat1.SelectedIndexChanged += new System.EventHandler(this.cmbCat1_SelectedIndexChanged); this.cmbCat1.TextChanged += new System.EventHandler(this.cmbCat1_MultiSelectChanged); // - // label2 + // lblCat1 // - this.label2.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(243, 9); - this.label2.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(51, 17); - this.label2.TabIndex = 426; - this.label2.Text = "类目1："; + this.lblCat1.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.lblCat1.AutoSize = true; + this.lblCat1.Cursor = System.Windows.Forms.Cursors.Hand; + this.lblCat1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.lblCat1.ForeColor = System.Drawing.Color.Blue; + this.lblCat1.Location = new System.Drawing.Point(229, 9); + this.lblCat1.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); + this.lblCat1.Name = "lblCat1"; + this.lblCat1.Size = new System.Drawing.Size(50, 17); + this.lblCat1.TabIndex = 426; + this.lblCat1.Text = "P 类目1"; + this.lblCat1.Click += new System.EventHandler(this.lblCat1_Click); // // txtProdName // this.txtProdName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtProdName.Location = new System.Drawing.Point(71, 6); + this.txtProdName.Location = new System.Drawing.Point(59, 6); this.txtProdName.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.txtProdName.Name = "txtProdName"; - this.txtProdName.Size = new System.Drawing.Size(147, 23); + this.txtProdName.Size = new System.Drawing.Size(144, 23); this.txtProdName.TabIndex = 427; // // label3 // - this.label3.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label3.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label3.AutoSize = true; this.label3.Location = new System.Drawing.Point(3, 9); this.label3.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(68, 17); + this.label3.Size = new System.Drawing.Size(56, 17); this.label3.TabIndex = 428; - this.label3.Text = "商品标题："; + this.label3.Text = "商品标题"; // // lblWxSafe // - this.lblWxSafe.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.lblWxSafe.Anchor = System.Windows.Forms.AnchorStyles.Right; this.lblWxSafe.AutoSize = true; this.lblWxSafe.Location = new System.Drawing.Point(3, 44); this.lblWxSafe.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.lblWxSafe.Name = "lblWxSafe"; - this.lblWxSafe.Size = new System.Drawing.Size(68, 17); + this.lblWxSafe.Size = new System.Drawing.Size(56, 17); this.lblWxSafe.TabIndex = 651; - this.lblWxSafe.Text = "微信安检："; + this.lblWxSafe.Text = "微信安检"; // // cmbWxSafe // @@ -551,17 +580,17 @@ namespace TemuKJD.WXForms.ProductForms "安全+未校验", "安全商品", "未校验"}); - this.cmbWxSafe.Location = new System.Drawing.Point(71, 40); + this.cmbWxSafe.Location = new System.Drawing.Point(59, 42); this.cmbWxSafe.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbWxSafe.Name = "cmbWxSafe"; - this.cmbWxSafe.Size = new System.Drawing.Size(147, 25); + this.cmbWxSafe.Size = new System.Drawing.Size(144, 25); this.cmbWxSafe.TabIndex = 676; this.cmbWxSafe.Text = "安全+未校验"; // // chkCatBoundMoreThan // this.chkCatBoundMoreThan.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.chkCatBoundMoreThan.Location = new System.Drawing.Point(227, 42); + this.chkCatBoundMoreThan.Location = new System.Drawing.Point(212, 42); this.chkCatBoundMoreThan.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3); this.chkCatBoundMoreThan.Name = "chkCatBoundMoreThan"; this.chkCatBoundMoreThan.Size = new System.Drawing.Size(64, 21); @@ -573,10 +602,10 @@ namespace TemuKJD.WXForms.ProductForms // txtCatBoundMoreThan // this.txtCatBoundMoreThan.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtCatBoundMoreThan.Location = new System.Drawing.Point(294, 41); + this.txtCatBoundMoreThan.Location = new System.Drawing.Point(279, 41); this.txtCatBoundMoreThan.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.txtCatBoundMoreThan.Name = "txtCatBoundMoreThan"; - this.txtCatBoundMoreThan.Size = new System.Drawing.Size(147, 23); + this.txtCatBoundMoreThan.Size = new System.Drawing.Size(144, 23); this.txtCatBoundMoreThan.TabIndex = 882; this.txtCatBoundMoreThan.Text = "1000"; this.txtCatBoundMoreThan.Visible = false; @@ -584,7 +613,7 @@ namespace TemuKJD.WXForms.ProductForms // chkCatBoundLessThan // this.chkCatBoundLessThan.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.chkCatBoundLessThan.Location = new System.Drawing.Point(450, 42); + this.chkCatBoundLessThan.Location = new System.Drawing.Point(432, 42); this.chkCatBoundLessThan.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3); this.chkCatBoundLessThan.Name = "chkCatBoundLessThan"; this.chkCatBoundLessThan.Size = new System.Drawing.Size(64, 21); @@ -596,10 +625,10 @@ namespace TemuKJD.WXForms.ProductForms // txtCatBoundLessThan // this.txtCatBoundLessThan.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtCatBoundLessThan.Location = new System.Drawing.Point(517, 41); + this.txtCatBoundLessThan.Location = new System.Drawing.Point(499, 41); this.txtCatBoundLessThan.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.txtCatBoundLessThan.Name = "txtCatBoundLessThan"; - this.txtCatBoundLessThan.Size = new System.Drawing.Size(146, 23); + this.txtCatBoundLessThan.Size = new System.Drawing.Size(143, 23); this.txtCatBoundLessThan.TabIndex = 883; this.txtCatBoundLessThan.Text = "100000"; this.txtCatBoundLessThan.Visible = false; @@ -608,10 +637,10 @@ namespace TemuKJD.WXForms.ProductForms // 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(917, 42); + this.cmbGroupFilter.Location = new System.Drawing.Point(869, 40); this.cmbGroupFilter.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbGroupFilter.Name = "cmbGroupFilter"; - this.cmbGroupFilter.Size = new System.Drawing.Size(147, 25); + this.cmbGroupFilter.Size = new System.Drawing.Size(144, 25); this.cmbGroupFilter.TabIndex = 653; this.cmbGroupFilter.Visible = false; this.cmbGroupFilter.SelectedIndexChanged += new System.EventHandler(this.cmbGroupFilter_SelectedIndexChanged); @@ -620,24 +649,24 @@ namespace TemuKJD.WXForms.ProductForms // this.lblSourceType.Anchor = System.Windows.Forms.AnchorStyles.Right; this.lblSourceType.AutoSize = true; - this.lblSourceType.Location = new System.Drawing.Point(676, 44); + this.lblSourceType.Location = new System.Drawing.Point(655, 44); this.lblSourceType.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.lblSourceType.Name = "lblSourceType"; - this.lblSourceType.Size = new System.Drawing.Size(44, 17); + this.lblSourceType.Size = new System.Drawing.Size(32, 17); this.lblSourceType.TabIndex = 651; - this.lblSourceType.Text = "来源："; + this.lblSourceType.Text = "来源"; this.lblSourceType.Visible = false; // // lblGroupFilter // this.lblGroupFilter.Anchor = System.Windows.Forms.AnchorStyles.Right; this.lblGroupFilter.AutoSize = true; - this.lblGroupFilter.Location = new System.Drawing.Point(873, 44); + this.lblGroupFilter.Location = new System.Drawing.Point(837, 44); this.lblGroupFilter.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.lblGroupFilter.Name = "lblGroupFilter"; - this.lblGroupFilter.Size = new System.Drawing.Size(44, 17); + this.lblGroupFilter.Size = new System.Drawing.Size(32, 17); this.lblGroupFilter.TabIndex = 641; - this.lblGroupFilter.Text = "分组："; + this.lblGroupFilter.Text = "分组"; this.lblGroupFilter.Visible = false; // // cmbSourceType @@ -655,10 +684,10 @@ namespace TemuKJD.WXForms.ProductForms "机会商品", "以图搜品", "多多外部数据"}); - this.cmbSourceType.Location = new System.Drawing.Point(720, 42); + this.cmbSourceType.Location = new System.Drawing.Point(687, 40); this.cmbSourceType.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbSourceType.Name = "cmbSourceType"; - this.cmbSourceType.Size = new System.Drawing.Size(147, 25); + this.cmbSourceType.Size = new System.Drawing.Size(144, 25); this.cmbSourceType.TabIndex = 654; this.cmbSourceType.Text = "厂商直采"; this.cmbSourceType.Visible = false; @@ -678,6 +707,17 @@ namespace TemuKJD.WXForms.ProductForms this.lblSetShop.Text = "指定店铺："; this.lblSetShop.TextAlign = System.Drawing.ContentAlignment.TopRight; // + // chkFissionProduct + // + this.chkFissionProduct.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.chkFissionProduct.Location = new System.Drawing.Point(1137, 48); + this.chkFissionProduct.Name = "chkFissionProduct"; + this.chkFissionProduct.Size = new System.Drawing.Size(88, 17); + this.chkFissionProduct.TabIndex = 912; + this.chkFissionProduct.Text = "裂变商品数量"; + this.chkFissionProduct.UseVisualStyleBackColor = true; + this.chkFissionProduct.Visible = false; + // // splitContainer2 // this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill; @@ -692,6 +732,7 @@ namespace TemuKJD.WXForms.ProductForms this.splitContainer2.Panel1.Controls.Add(this.pnlSetShop); this.splitContainer2.Panel1.Controls.Add(this.pbLoading); this.splitContainer2.Panel1.Controls.Add(this.label16); + this.splitContainer2.Panel1.Controls.Add(this.btnSetShop); this.splitContainer2.Panel1.Controls.Add(this.txtRealCoid); this.splitContainer2.Panel1.Controls.Add(this.txtSKC); this.splitContainer2.Panel1.Controls.Add(this.cmbWxCat); @@ -1022,6 +1063,32 @@ namespace TemuKJD.WXForms.ProductForms this.label16.Text = "coid/skc："; this.label16.Visible = false; // + // btnSetShop + // + this.btnSetShop.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.btnSetShop.CanvasColor = System.Drawing.SystemColors.Control; + this.btnSetShop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnSetShop.DisabledBackColor = System.Drawing.Color.Empty; + this.btnSetShop.Location = new System.Drawing.Point(1357, 36); + this.btnSetShop.Name = "btnSetShop"; + this.btnSetShop.Size = new System.Drawing.Size(63, 25); + this.btnSetShop.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnSetShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnSetShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnSetShop.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.btnSetShop.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnSetShop.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.btnSetShop.Style.GradientAngle = 90; + this.btnSetShop.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; + this.btnSetShop.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnSetShop.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnSetShop.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnSetShop.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.btnSetShop.TabIndex = 711; + this.btnSetShop.Text = "指定店铺"; + this.btnSetShop.Visible = false; + this.btnSetShop.Click += new System.EventHandler(this.btnSetShop_Click); + // // txtRealCoid // this.txtRealCoid.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); @@ -1640,7 +1707,7 @@ namespace TemuKJD.WXForms.ProductForms this.statusBar.Size = new System.Drawing.Size(1438, 25); this.statusBar.TabIndex = 5; // - // WXUserProdListForm + // WXSelectDBProdListForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.ClientSize = new System.Drawing.Size(1440, 720); @@ -1648,7 +1715,7 @@ namespace TemuKJD.WXForms.ProductForms 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 = "WXUserProdListForm"; + this.Name = "WXSelectDBProdListForm"; this.Text = "产品数据库"; this.TitleText = "产品数据库"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.WXUserProdListForm_FormClosing); @@ -1692,7 +1759,7 @@ namespace TemuKJD.WXForms.ProductForms private System.Windows.Forms.Label label4; private System.Windows.Forms.TextBox txtProdName; private System.Windows.Forms.Label label3; - private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label lblCat1; private UserComponent.DataGridViewEx dgvDbProduct; private System.Windows.Forms.PictureBox pbLoading; private System.Windows.Forms.TextBox txtNotes; @@ -1790,5 +1857,9 @@ namespace TemuKJD.WXForms.ProductForms private System.Windows.Forms.DataGridViewLinkColumn col_edit; private System.Windows.Forms.DataGridViewLinkColumn col_delete; private System.Windows.Forms.DataGridViewLinkColumn col_select_product; + private System.Windows.Forms.TextBox txtFissionProductCount; + private UserComponent.UcCheckBox chkFissionProduct; + private System.Windows.Forms.ComboBox cmbHasFission; + private System.Windows.Forms.Label lblHasFission; } } \ No newline at end of file diff --git a/TEMUKJD/WXForms/ProductForms/WXUserProdListForm.cs b/TEMUKJD/WXForms/ProductForms/WXSelectDBProdListForm.cs similarity index 88% rename from TEMUKJD/WXForms/ProductForms/WXUserProdListForm.cs rename to TEMUKJD/WXForms/ProductForms/WXSelectDBProdListForm.cs index d2a0a73..6adfc3a 100644 --- a/TEMUKJD/WXForms/ProductForms/WXUserProdListForm.cs +++ b/TEMUKJD/WXForms/ProductForms/WXSelectDBProdListForm.cs @@ -30,22 +30,22 @@ using Work; namespace TemuKJD.WXForms.ProductForms { - public partial class WXUserProdListForm : BaseGeneralForm + public partial class WXSelectDBProdListForm : BaseGeneralForm { - private static WXUserProdListForm instance = null; - public static WXUserProdListForm Instance { get { if (instance == null || instance.IsDisposed || instance.Disposing) instance = new WXUserProdListForm(); return instance; } } + private static WXSelectDBProdListForm instance = null; + public static WXSelectDBProdListForm Instance { get { if (instance == null || instance.IsDisposed || instance.Disposing) instance = new WXSelectDBProdListForm(); return instance; } } ShopLoginInfo shop = null; public CancellationTokenSource cancellationTokenSource { get; set; } = new CancellationTokenSource(); ConcurrentList lstTemuDbProduct = new ConcurrentList(); public ConcurrentList lstTemuDBProductSelect { get; set; } = new ConcurrentList(); - public WXUserProdListForm() + public WXSelectDBProdListForm() { InitializeComponent(); } - public WXUserProdListForm(ShopLoginInfo _shop) + public WXSelectDBProdListForm(ShopLoginInfo _shop) { InitializeComponent(); shop = _shop; @@ -54,6 +54,8 @@ namespace TemuKJD.WXForms.ProductForms private void ProductListForm_Load(object sender, EventArgs e) { + lblCat1_Click(null, null); + if (BaseClass.MainPath == "29pdd") { chkCatBoundLessThan.Visible = false; @@ -79,6 +81,21 @@ namespace TemuKJD.WXForms.ProductForms { cmbGroupFilter.Items.Insert(1, "------"); cmbGroupFilter.Items.Insert(1, "我的商品"); + + chkFissionProduct.Visible = true; + txtFissionProductCount.Visible = true; + lblHasFission.Visible = true; + cmbHasFission.Visible = true; + })); + } + if (BaseClass.UserAuthority.Contains("商品裂变")) + { + Invoke(new Action(() => + { + chkFissionProduct.Visible = true; + txtFissionProductCount.Visible = true; + lblHasFission.Visible = true; + cmbHasFission.Visible = true; })); } GetPddProductCate(); @@ -191,6 +208,8 @@ namespace TemuKJD.WXForms.ProductForms tableLayoutPanel1.ColumnStyles[i].SizeType = SizeType.AutoSize; } } + + cmbHot_TextChanged(null, null); } private void btnSearch_Click(object sender, EventArgs e) @@ -434,8 +453,9 @@ namespace TemuKJD.WXForms.ProductForms string addUserName = BaseClass.UserAuthority.Contains("商品采集") ? ("admin," + BaseClass.UserName) : "admin"; if (BaseClass.GroupId != 3) addUserName = BaseClass.ParentAuthority.Contains("商品采集") ? ("admin," + BaseClass.ParentUserName) : "admin"; - // 如果指定是自己采集的商品，则只随机自己采集的商品 - if (cmbSourceType.Text.Trim().Contains("多多商品") || cmbSourceType.Text.Trim().Contains("1688商品")) + // 如果指定只有自己采集的商品，则只随机自己采集的商品 + if ((cmbSourceType.Text.Trim().Contains("多多商品") || cmbSourceType.Text.Trim().Contains("1688商品")) && + cmbSourceType.Text.Trim().Replace("多多商品", "").Replace("1688商品", "").Trim(',').IsNullOrEmpty()) data += "&add_user_name=" + (BaseClass.GroupId == 3 ? BaseClass.UserName : BaseClass.ParentUserName); else data += "&add_user_name=" + addUserName; @@ -537,10 +557,19 @@ namespace TemuKJD.WXForms.ProductForms } if (chkWXComplateProd.Checked) data += "&has_wx_format=1"; - data += "&is_not_count=true"; if (!string.IsNullOrWhiteSpace(cmbHot.Text.Trim())) data += "&special_prod_type=" + cmbHot.Text.Replace("普通商品", "普通商品,书籍"); + + if (cmbHasFission.Text == "是") + { + data += "&fission_words=fission_goods_names:"; + } + else if (cmbHasFission.Text == "否") + { + data += "&no_fission_words=true"; + } + data += "&is_not_count=true"; })); var html = GetHtml.PostUtf8(url, data); if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) @@ -612,6 +641,7 @@ namespace TemuKJD.WXForms.ProductForms this.cmbExportToOutServer.Text = "是"; this.txtSecretStyleCode.Text = ""; this.cmbHot.Text = "普通商品"; + cmbHot_TextChanged(null, null); } private void cmbCat1_SelectedIndexChanged(object sender, EventArgs e) @@ -631,7 +661,9 @@ namespace TemuKJD.WXForms.ProductForms private void cmbCat1_MultiSelectChanged(object sender, EventArgs e) { - if (cmbSourceType.Text != "厂商直采" && cmbSourceType.Text != "1688厂家" && cmbSourceType.Text != "微信店采" && cmbSourceType.Text != "微信小店") + //if (cmbSourceType.Text != "厂商直采" && cmbSourceType.Text != "1688厂家" && cmbSourceType.Text != "微信店采" && cmbSourceType.Text != "微信小店") + // return; + if (!lblCat1.Text.StartsWith("W")) return; cmbCat2.Text = ""; @@ -649,7 +681,9 @@ namespace TemuKJD.WXForms.ProductForms private void cmbCat2_MultiSelectChanged(object sender, EventArgs e) { - if (cmbSourceType.Text != "厂商直采" && cmbSourceType.Text != "1688厂家" && cmbSourceType.Text != "微信店采" && cmbSourceType.Text != "微信小店") + //if (cmbSourceType.Text != "厂商直采" && cmbSourceType.Text != "1688厂家" && cmbSourceType.Text != "微信店采" && cmbSourceType.Text != "微信小店") + // return; + if (!lblCat1.Text.StartsWith("W")) return; cmbCat3.Text = ""; @@ -823,15 +857,45 @@ namespace TemuKJD.WXForms.ProductForms { foreach (var prod in prodList) { - var selectProd = JsonHelper.DeserializeJsonToObject(JsonHelper.SerializeObject(prod)); - selectProd.out_product_Id = prod.id.ToString(); - selectProd.id = 1; - if (lstTemuDBProductSelect.Count > 0) - selectProd.id = lstTemuDBProductSelect.Max(p => p.id) + 1; - if (!string.IsNullOrEmpty(lblSetShop.Tag.ParseToString())) - selectProd.shop_id = lblSetShop.Tag.ParseToString(); - this.lstTemuDBProductSelect.Add(selectProd); + //var selectProd = JsonHelper.DeserializeJsonToObject(JsonHelper.SerializeObject(prod)); + //selectProd.out_product_Id = prod.id.ToString(); + //selectProd.id = 1; + //if (lstTemuDBProductSelect.Count > 0) + // selectProd.id = lstTemuDBProductSelect.Max(p => p.id) + 1; + //if (!string.IsNullOrEmpty(lblSetShop.Tag.ParseToString())) + // selectProd.shop_id = lblSetShop.Tag.ParseToString(); + //this.lstTemuDBProductSelect.Add(selectProd); + + + var productNameLst = new List() { prod.product_name }; + if (chkFissionProduct.Checked) + { + Invoke(new Action(() => + { + var titleCount = txtFissionProductCount.Text.Trim().ParseToInt(); + if (prod.fission_words.ParseToString().Length > 20 && titleCount > 0) + { + productNameLst = prod.fission_words.Replace("fission_goods_names:", "") + .Split(new string[] { "\r", "\n" }, StringSplitOptions.RemoveEmptyEntries).OrderBy(x => Guid.NewGuid()).Distinct().Take(titleCount) + .ToList(); + } + })); + } + + foreach (var productName in productNameLst) + { + var selectProd = JsonHelper.DeserializeJsonToObject(JsonHelper.SerializeObject(prod)); + selectProd.product_name = productName; + if (chkFissionProduct.Checked) + selectProd.is_fission_title = true; + selectProd.out_product_Id = prod.id.ToString(); + selectProd.id = 1; + if (WXDBProdUploadForm.Instance.lstTemuDBProductSelect.Count > 0) + selectProd.id = WXDBProdUploadForm.Instance.lstTemuDBProductSelect.Max(p => p.id) + 1; + WXDBProdUploadForm.Instance.lstTemuDBProductSelect.Add(selectProd); + } } + this.OnSaveComplete(lstTemuDBProductSelect); } @@ -906,9 +970,9 @@ namespace TemuKJD.WXForms.ProductForms private void cmbSourceType_SelectedIndexChanged(object sender, EventArgs e) { - fillCate(); + //fillCate(); - if (!string.IsNullOrWhiteSpace(cmbSourceType.Text) && cmbSourceType.Text != "厂商直采") + if (/*!string.IsNullOrWhiteSpace(cmbSourceType.Text) && */ cmbSourceType.Text != "厂商直采") { cmbExportToOutServer.Text = ""; cmbWxCat.Text = ""; @@ -940,23 +1004,23 @@ namespace TemuKJD.WXForms.ProductForms pdd_product_cates = BaseRegex.GetStringJson(ref html, "data"); } - Invoke(new Action(() => - { - fillCate(); - })); + //Invoke(new Action(() => + //{ + // fillCate(); + //})); } public void fillCate() { - if (!string.IsNullOrWhiteSpace(cmbSourceType.Text) && - cmbSourceType.Text != "厂商直采" && cmbSourceType.Text != "1688厂家" && cmbSourceType.Text != "微信店采" && cmbSourceType.Text != "微信小店") - { - fillPddCate(); - } - else - { - fillWxCate(); - } + //if (!string.IsNullOrWhiteSpace(cmbSourceType.Text) && + // cmbSourceType.Text != "厂商直采" && cmbSourceType.Text != "1688厂家" && cmbSourceType.Text != "微信店采" && cmbSourceType.Text != "微信小店") + //{ + // fillPddCate(); + //} + //else + //{ + // fillWxCate(); + //} } public string pdd_product_cates = ""; @@ -1140,6 +1204,19 @@ namespace TemuKJD.WXForms.ProductForms private void cmbHot_TextChanged(object sender, EventArgs e) { + //if (cmbHot.Text == "爆款数据") + //{ + // cmbSourceType.Text = ""; + // cmbExportToOutServer.Text = ""; + // cmbWxCat.Text = ""; + //} + //else + //{ + // cmbSourceType.Text = "厂商直采"; + // cmbExportToOutServer.Text = "是"; + // cmbWxCat.Text = "是"; + //} + if (cmbHot.Text == "爆款数据") { cmbSourceType.Text = ""; @@ -1151,6 +1228,14 @@ namespace TemuKJD.WXForms.ProductForms cmbSourceType.Text = "厂商直采"; cmbExportToOutServer.Text = "是"; cmbWxCat.Text = "是"; + // 商品采集用户无货源选择权限只能随机自己的商品 + if ((BaseClass.UserAuthority.Contains("商品采集") || BaseClass.ParentAuthority.Contains("商品采集")) && + !BaseClass.UserAuthority.Contains("货源选择") && BaseClass.SaLevel == 0) + { + cmbSourceType.Text = "多多商品,1688商品"; + cmbExportToOutServer.Text = ""; + cmbWxCat.Text = ""; + } } } @@ -1161,5 +1246,19 @@ namespace TemuKJD.WXForms.ProductForms cmbSourceType.Text = ""; } } + + private void lblCat1_Click(object sender, EventArgs e) + { + if (lblCat1.Text == "W 类目1") + { + lblCat1.Text = "P 类目1"; + fillPddCate(); + } + else + { + lblCat1.Text = "W 类目1"; + fillWxCate(); + } + } } } diff --git a/TEMUKJD/WXForms/ProductForms/WXUserProdListForm.resx b/TEMUKJD/WXForms/ProductForms/WXSelectDBProdListForm.resx similarity index 100% rename from TEMUKJD/WXForms/ProductForms/WXUserProdListForm.resx rename to TEMUKJD/WXForms/ProductForms/WXSelectDBProdListForm.resx diff --git a/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.Designer.cs b/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.Designer.cs index 8df8a23..04d1f1c 100644 --- a/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.Designer.cs +++ b/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.Designer.cs @@ -49,6 +49,10 @@ namespace TemuKJD.WXForms.ProductForms System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WXUserCollectAuthProdListForm)); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.btnAITitleFission = new DevComponents.DotNetBar.PanelEx(); + this.txtFissionProductCount = new System.Windows.Forms.TextBox(); + this.chkFissionProduct = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.btnOut1688ProdSaveDb = new DevComponents.DotNetBar.PanelEx(); this.btnImportPddOutData = new DevComponents.DotNetBar.PanelEx(); this.btnSelect = new DevComponents.DotNetBar.PanelEx(); this.btnSearch = new DevComponents.DotNetBar.PanelEx(); @@ -57,13 +61,13 @@ namespace TemuKJD.WXForms.ProductForms this.btnGetProdWxCate = new DevComponents.DotNetBar.PanelEx(); this.btnDel = new DevComponents.DotNetBar.PanelEx(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); + this.cmbHasFission = new System.Windows.Forms.ComboBox(); + this.label8 = new System.Windows.Forms.Label(); this.txtCatBoundLessThan = new System.Windows.Forms.TextBox(); this.chkCatBoundLessThan = new TemuKJD.UserComponent.UcCheckBox(this.components); this.txtSPU = new System.Windows.Forms.TextBox(); this.label5 = new System.Windows.Forms.Label(); - this.cmbWxCat = new System.Windows.Forms.ComboBox(); this.txtProdName = new System.Windows.Forms.TextBox(); - this.label12 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.cmbCat1 = new TemuKJD.UserComponent.UcComboBoxMutiSelect(); @@ -73,12 +77,15 @@ namespace TemuKJD.WXForms.ProductForms this.cmbCat2 = new TemuKJD.UserComponent.UcComboBoxMutiSelect(); this.label17 = new System.Windows.Forms.Label(); this.cmbCat3 = new TemuKJD.UserComponent.UcComboBoxMutiSelect(); + this.lblSourceType = new System.Windows.Forms.Label(); + this.cmbSourceType = new System.Windows.Forms.ComboBox(); + this.lblNotes = new System.Windows.Forms.Label(); + this.txtNotes = new System.Windows.Forms.TextBox(); + this.label12 = new System.Windows.Forms.Label(); + this.cmbWxCat = new System.Windows.Forms.ComboBox(); this.lblWxSafe = new System.Windows.Forms.Label(); this.cmbWxSafe = new System.Windows.Forms.ComboBox(); - this.txtNotes = new System.Windows.Forms.TextBox(); - this.lblNotes = new System.Windows.Forms.Label(); - this.cmbSourceType = new System.Windows.Forms.ComboBox(); - this.lblSourceType = new System.Windows.Forms.Label(); + this.label7 = new System.Windows.Forms.Label(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); this.lblRelation = new System.Windows.Forms.Label(); this.pbLoading = new System.Windows.Forms.PictureBox(); @@ -99,8 +106,6 @@ namespace TemuKJD.WXForms.ProductForms this.cmbSort = new System.Windows.Forms.ComboBox(); this.label6 = new System.Windows.Forms.Label(); this.dgvDbProduct = new TemuKJD.UserComponent.DataGridViewEx(); - this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage(); - this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.col_db_id = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colFromShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -137,6 +142,8 @@ namespace TemuKJD.WXForms.ProductForms this.col_edit = new System.Windows.Forms.DataGridViewLinkColumn(); this.col_delete = new System.Windows.Forms.DataGridViewLinkColumn(); this.col_select_product = new System.Windows.Forms.DataGridViewLinkColumn(); + this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -161,6 +168,10 @@ namespace TemuKJD.WXForms.ProductForms // // splitContainer1.Panel1 // + this.splitContainer1.Panel1.Controls.Add(this.btnAITitleFission); + this.splitContainer1.Panel1.Controls.Add(this.txtFissionProductCount); + this.splitContainer1.Panel1.Controls.Add(this.chkFissionProduct); + this.splitContainer1.Panel1.Controls.Add(this.btnOut1688ProdSaveDb); this.splitContainer1.Panel1.Controls.Add(this.btnImportPddOutData); this.splitContainer1.Panel1.Controls.Add(this.btnSelect); this.splitContainer1.Panel1.Controls.Add(this.btnSearch); @@ -169,6 +180,7 @@ namespace TemuKJD.WXForms.ProductForms this.splitContainer1.Panel1.Controls.Add(this.btnGetProdWxCate); this.splitContainer1.Panel1.Controls.Add(this.btnDel); this.splitContainer1.Panel1.Controls.Add(this.tableLayoutPanel1); + this.splitContainer1.Panel1.Controls.Add(this.label7); // // splitContainer1.Panel2 // @@ -177,6 +189,77 @@ namespace TemuKJD.WXForms.ProductForms this.splitContainer1.SplitterDistance = 74; this.splitContainer1.TabIndex = 1; // + // btnAITitleFission + // + this.btnAITitleFission.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnAITitleFission.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnAITitleFission.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnAITitleFission.DisabledBackColor = System.Drawing.Color.Empty; + this.btnAITitleFission.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnAITitleFission.Location = new System.Drawing.Point(1095, 9); + this.btnAITitleFission.Name = "btnAITitleFission"; + this.btnAITitleFission.Size = new System.Drawing.Size(72, 25); + this.btnAITitleFission.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnAITitleFission.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnAITitleFission.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnAITitleFission.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnAITitleFission.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnAITitleFission.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnAITitleFission.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnAITitleFission.Style.GradientAngle = 90; + this.btnAITitleFission.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnAITitleFission.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnAITitleFission.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnAITitleFission.TabIndex = 1195; + this.btnAITitleFission.Text = "AI标题裂变"; + this.btnAITitleFission.Click += new System.EventHandler(this.btnAITitleFission_Click); + // + // txtFissionProductCount + // + this.txtFissionProductCount.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.txtFissionProductCount.Location = new System.Drawing.Point(1160, 45); + this.txtFissionProductCount.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); + this.txtFissionProductCount.Name = "txtFissionProductCount"; + this.txtFissionProductCount.Size = new System.Drawing.Size(30, 23); + this.txtFissionProductCount.TabIndex = 1160; + this.txtFissionProductCount.Text = "100"; + // + // chkFissionProduct + // + this.chkFissionProduct.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.chkFissionProduct.Location = new System.Drawing.Point(1082, 46); + this.chkFissionProduct.Margin = new System.Windows.Forms.Padding(10, 3, 3, 3); + this.chkFissionProduct.Name = "chkFissionProduct"; + this.chkFissionProduct.Size = new System.Drawing.Size(76, 21); + this.chkFissionProduct.TabIndex = 1159; + this.chkFissionProduct.Text = "添加时裂变"; + this.chkFissionProduct.UseVisualStyleBackColor = true; + // + // btnOut1688ProdSaveDb + // + this.btnOut1688ProdSaveDb.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnOut1688ProdSaveDb.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnOut1688ProdSaveDb.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnOut1688ProdSaveDb.DisabledBackColor = System.Drawing.Color.Empty; + this.btnOut1688ProdSaveDb.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnOut1688ProdSaveDb.Location = new System.Drawing.Point(1324, 44); + this.btnOut1688ProdSaveDb.Name = "btnOut1688ProdSaveDb"; + this.btnOut1688ProdSaveDb.Size = new System.Drawing.Size(105, 25); + this.btnOut1688ProdSaveDb.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnOut1688ProdSaveDb.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnOut1688ProdSaveDb.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnOut1688ProdSaveDb.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnOut1688ProdSaveDb.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnOut1688ProdSaveDb.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnOut1688ProdSaveDb.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnOut1688ProdSaveDb.Style.GradientAngle = 90; + this.btnOut1688ProdSaveDb.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnOut1688ProdSaveDb.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnOut1688ProdSaveDb.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnOut1688ProdSaveDb.TabIndex = 1158; + this.btnOut1688ProdSaveDb.Text = "导入已采集数据"; + this.btnOut1688ProdSaveDb.Click += new System.EventHandler(this.btnOutProdSaveDb_Click); + // // btnImportPddOutData // this.btnImportPddOutData.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -184,7 +267,7 @@ namespace TemuKJD.WXForms.ProductForms this.btnImportPddOutData.Cursor = System.Windows.Forms.Cursors.Hand; this.btnImportPddOutData.DisabledBackColor = System.Drawing.Color.Empty; this.btnImportPddOutData.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnImportPddOutData.Location = new System.Drawing.Point(1176, 44); + this.btnImportPddOutData.Location = new System.Drawing.Point(1216, 44); this.btnImportPddOutData.Name = "btnImportPddOutData"; this.btnImportPddOutData.Size = new System.Drawing.Size(105, 25); this.btnImportPddOutData.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -209,9 +292,9 @@ namespace TemuKJD.WXForms.ProductForms this.btnSelect.Cursor = System.Windows.Forms.Cursors.Hand; this.btnSelect.DisabledBackColor = System.Drawing.Color.Empty; this.btnSelect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSelect.Location = new System.Drawing.Point(1060, 44); + this.btnSelect.Location = new System.Drawing.Point(997, 44); this.btnSelect.Name = "btnSelect"; - this.btnSelect.Size = new System.Drawing.Size(95, 25); + this.btnSelect.Size = new System.Drawing.Size(82, 25); this.btnSelect.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnSelect.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnSelect.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -234,9 +317,9 @@ namespace TemuKJD.WXForms.ProductForms 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(1060, 9); + this.btnSearch.Location = new System.Drawing.Point(997, 9); this.btnSearch.Name = "btnSearch"; - this.btnSearch.Size = new System.Drawing.Size(46, 25); + this.btnSearch.Size = new System.Drawing.Size(40, 25); this.btnSearch.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnSearch.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnSearch.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -258,7 +341,7 @@ namespace TemuKJD.WXForms.ProductForms this.btnStopStop.CanvasColor = System.Drawing.SystemColors.Control; this.btnStopStop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnStopStop.DisabledBackColor = System.Drawing.Color.Empty; - this.btnStopStop.Location = new System.Drawing.Point(1263, 9); + this.btnStopStop.Location = new System.Drawing.Point(1268, 9); this.btnStopStop.Name = "btnStopStop"; this.btnStopStop.Size = new System.Drawing.Size(63, 25); this.btnStopStop.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -283,9 +366,9 @@ namespace TemuKJD.WXForms.ProductForms 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(1109, 9); + this.btnEmpty.Location = new System.Drawing.Point(1039, 9); this.btnEmpty.Name = "btnEmpty"; - this.btnEmpty.Size = new System.Drawing.Size(46, 25); + this.btnEmpty.Size = new System.Drawing.Size(40, 25); this.btnEmpty.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnEmpty.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); this.btnEmpty.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); @@ -309,7 +392,7 @@ namespace TemuKJD.WXForms.ProductForms this.btnGetProdWxCate.Cursor = System.Windows.Forms.Cursors.Hand; this.btnGetProdWxCate.DisabledBackColor = System.Drawing.Color.Empty; this.btnGetProdWxCate.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnGetProdWxCate.Location = new System.Drawing.Point(1176, 9); + this.btnGetProdWxCate.Location = new System.Drawing.Point(1181, 9); this.btnGetProdWxCate.Name = "btnGetProdWxCate"; this.btnGetProdWxCate.Size = new System.Drawing.Size(84, 25); this.btnGetProdWxCate.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -356,7 +439,7 @@ namespace TemuKJD.WXForms.ProductForms // this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.tableLayoutPanel1.ColumnCount = 14; + this.tableLayoutPanel1.ColumnCount = 12; this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); @@ -369,15 +452,15 @@ namespace TemuKJD.WXForms.ProductForms this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel1.Controls.Add(this.cmbHasFission, 11, 1); + this.tableLayoutPanel1.Controls.Add(this.label8, 10, 1); this.tableLayoutPanel1.Controls.Add(this.txtCatBoundLessThan, 9, 1); this.tableLayoutPanel1.Controls.Add(this.chkCatBoundLessThan, 8, 1); this.tableLayoutPanel1.Controls.Add(this.txtSPU, 1, 0); this.tableLayoutPanel1.Controls.Add(this.label5, 0, 0); - this.tableLayoutPanel1.Controls.Add(this.cmbWxCat, 11, 0); this.tableLayoutPanel1.Controls.Add(this.txtProdName, 3, 0); - this.tableLayoutPanel1.Controls.Add(this.label12, 10, 0); this.tableLayoutPanel1.Controls.Add(this.label3, 2, 0); this.tableLayoutPanel1.Controls.Add(this.label2, 0, 1); this.tableLayoutPanel1.Controls.Add(this.cmbCat1, 1, 1); @@ -387,35 +470,62 @@ namespace TemuKJD.WXForms.ProductForms this.tableLayoutPanel1.Controls.Add(this.cmbCat2, 3, 1); this.tableLayoutPanel1.Controls.Add(this.label17, 4, 1); this.tableLayoutPanel1.Controls.Add(this.cmbCat3, 5, 1); - this.tableLayoutPanel1.Controls.Add(this.lblWxSafe, 10, 1); - this.tableLayoutPanel1.Controls.Add(this.cmbWxSafe, 11, 1); - this.tableLayoutPanel1.Controls.Add(this.txtNotes, 9, 0); - this.tableLayoutPanel1.Controls.Add(this.lblNotes, 8, 0); - this.tableLayoutPanel1.Controls.Add(this.cmbSourceType, 7, 0); - this.tableLayoutPanel1.Controls.Add(this.lblSourceType, 6, 0); + this.tableLayoutPanel1.Controls.Add(this.lblSourceType, 4, 0); + this.tableLayoutPanel1.Controls.Add(this.cmbSourceType, 5, 0); + this.tableLayoutPanel1.Controls.Add(this.lblNotes, 6, 0); + this.tableLayoutPanel1.Controls.Add(this.txtNotes, 7, 0); + this.tableLayoutPanel1.Controls.Add(this.label12, 8, 0); + this.tableLayoutPanel1.Controls.Add(this.cmbWxCat, 9, 0); + this.tableLayoutPanel1.Controls.Add(this.lblWxSafe, 10, 0); + this.tableLayoutPanel1.Controls.Add(this.cmbWxSafe, 11, 0); this.tableLayoutPanel1.Location = new System.Drawing.Point(4, 4); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.RowCount = 3; 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(1050, 105); + this.tableLayoutPanel1.Size = new System.Drawing.Size(992, 105); this.tableLayoutPanel1.TabIndex = 679; // + // cmbHasFission + // + this.cmbHasFission.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.cmbHasFission.FormattingEnabled = true; + this.cmbHasFission.Items.AddRange(new object[] { + "", + "是", + "否"}); + this.cmbHasFission.Location = new System.Drawing.Point(889, 42); + this.cmbHasFission.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); + this.cmbHasFission.Name = "cmbHasFission"; + this.cmbHasFission.Size = new System.Drawing.Size(100, 25); + this.cmbHasFission.TabIndex = 982; + // + // label8 + // + this.label8.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label8.AutoSize = true; + this.label8.Location = new System.Drawing.Point(829, 44); + this.label8.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(56, 17); + this.label8.TabIndex = 885; + this.label8.Text = "裂变标题"; + // // txtCatBoundLessThan // this.txtCatBoundLessThan.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtCatBoundLessThan.Location = new System.Drawing.Point(763, 41); + this.txtCatBoundLessThan.Location = new System.Drawing.Point(724, 41); this.txtCatBoundLessThan.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.txtCatBoundLessThan.Name = "txtCatBoundLessThan"; - this.txtCatBoundLessThan.Size = new System.Drawing.Size(109, 23); + this.txtCatBoundLessThan.Size = new System.Drawing.Size(99, 23); this.txtCatBoundLessThan.TabIndex = 883; this.txtCatBoundLessThan.Text = "100000"; // // chkCatBoundLessThan // this.chkCatBoundLessThan.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.chkCatBoundLessThan.Location = new System.Drawing.Point(696, 42); + this.chkCatBoundLessThan.Location = new System.Drawing.Point(657, 42); this.chkCatBoundLessThan.Margin = new System.Windows.Forms.Padding(10, 3, 3, 3); this.chkCatBoundLessThan.Name = "chkCatBoundLessThan"; this.chkCatBoundLessThan.Size = new System.Drawing.Size(64, 21); @@ -430,7 +540,7 @@ namespace TemuKJD.WXForms.ProductForms this.txtSPU.Location = new System.Drawing.Point(52, 6); this.txtSPU.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.txtSPU.Name = "txtSPU"; - this.txtSPU.Size = new System.Drawing.Size(109, 23); + this.txtSPU.Size = new System.Drawing.Size(99, 23); this.txtSPU.TabIndex = 434; // // label5 @@ -444,46 +554,20 @@ namespace TemuKJD.WXForms.ProductForms this.label5.TabIndex = 435; this.label5.Text = " 商品ID"; // - // cmbWxCat - // - this.cmbWxCat.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.cmbWxCat.FormattingEnabled = true; - this.cmbWxCat.Items.AddRange(new object[] { - "", - "是", - "否"}); - this.cmbWxCat.Location = new System.Drawing.Point(938, 7); - this.cmbWxCat.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); - this.cmbWxCat.Name = "cmbWxCat"; - this.cmbWxCat.Size = new System.Drawing.Size(109, 25); - this.cmbWxCat.TabIndex = 802; - // // txtProdName // this.txtProdName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.tableLayoutPanel1.SetColumnSpan(this.txtProdName, 3); - this.txtProdName.Location = new System.Drawing.Point(227, 6); + this.txtProdName.Location = new System.Drawing.Point(217, 6); this.txtProdName.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.txtProdName.Name = "txtProdName"; - this.txtProdName.Size = new System.Drawing.Size(267, 23); + this.txtProdName.Size = new System.Drawing.Size(99, 23); this.txtProdName.TabIndex = 427; // - // label12 - // - this.label12.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(878, 9); - this.label12.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); - this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(60, 17); - this.label12.TabIndex = 801; - this.label12.Text = " 类目识别"; - // // label3 // this.label3.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(167, 9); + this.label3.Location = new System.Drawing.Point(157, 9); this.label3.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(60, 17); @@ -509,10 +593,10 @@ namespace TemuKJD.WXForms.ProductForms this.cmbCat1.DropDownWidth = 1; this.cmbCat1.FormattingEnabled = true; this.cmbCat1.IntegralHeight = false; - this.cmbCat1.Location = new System.Drawing.Point(52, 42); + this.cmbCat1.Location = new System.Drawing.Point(52, 40); this.cmbCat1.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbCat1.Name = "cmbCat1"; - this.cmbCat1.Size = new System.Drawing.Size(109, 25); + this.cmbCat1.Size = new System.Drawing.Size(99, 25); this.cmbCat1.TabIndex = 805; this.cmbCat1.Text = "全部"; this.cmbCat1.SelectedIndexChanged += new System.EventHandler(this.cmbCat1_SelectedIndexChanged); @@ -521,17 +605,17 @@ namespace TemuKJD.WXForms.ProductForms // txtCatBoundMoreThan // this.txtCatBoundMoreThan.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtCatBoundMoreThan.Location = new System.Drawing.Point(574, 41); + this.txtCatBoundMoreThan.Location = new System.Drawing.Point(545, 41); this.txtCatBoundMoreThan.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.txtCatBoundMoreThan.Name = "txtCatBoundMoreThan"; - this.txtCatBoundMoreThan.Size = new System.Drawing.Size(109, 23); + this.txtCatBoundMoreThan.Size = new System.Drawing.Size(99, 23); this.txtCatBoundMoreThan.TabIndex = 882; this.txtCatBoundMoreThan.Text = "1000"; // // chkCatBoundMoreThan // this.chkCatBoundMoreThan.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.chkCatBoundMoreThan.Location = new System.Drawing.Point(507, 42); + this.chkCatBoundMoreThan.Location = new System.Drawing.Point(478, 42); this.chkCatBoundMoreThan.Margin = new System.Windows.Forms.Padding(10, 3, 3, 3); this.chkCatBoundMoreThan.Name = "chkCatBoundMoreThan"; this.chkCatBoundMoreThan.Size = new System.Drawing.Size(64, 21); @@ -544,7 +628,7 @@ namespace TemuKJD.WXForms.ProductForms // this.label14.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label14.AutoSize = true; - this.label14.Location = new System.Drawing.Point(184, 44); + this.label14.Location = new System.Drawing.Point(174, 44); this.label14.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label14.Name = "label14"; this.label14.Size = new System.Drawing.Size(43, 17); @@ -559,10 +643,10 @@ namespace TemuKJD.WXForms.ProductForms this.cmbCat2.DropDownWidth = 1; this.cmbCat2.FormattingEnabled = true; this.cmbCat2.IntegralHeight = false; - this.cmbCat2.Location = new System.Drawing.Point(227, 42); + this.cmbCat2.Location = new System.Drawing.Point(217, 40); this.cmbCat2.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbCat2.Name = "cmbCat2"; - this.cmbCat2.Size = new System.Drawing.Size(109, 25); + this.cmbCat2.Size = new System.Drawing.Size(99, 25); this.cmbCat2.TabIndex = 804; this.cmbCat2.Text = "全部"; this.cmbCat2.SelectedIndexChanged += new System.EventHandler(this.cmbCat2_SelectedIndexChanged); @@ -572,7 +656,7 @@ namespace TemuKJD.WXForms.ProductForms // this.label17.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label17.AutoSize = true; - this.label17.Location = new System.Drawing.Point(342, 44); + this.label17.Location = new System.Drawing.Point(323, 44); this.label17.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label17.Name = "label17"; this.label17.Size = new System.Drawing.Size(43, 17); @@ -587,20 +671,92 @@ namespace TemuKJD.WXForms.ProductForms this.cmbCat3.DropDownWidth = 1; this.cmbCat3.FormattingEnabled = true; this.cmbCat3.IntegralHeight = false; - this.cmbCat3.Location = new System.Drawing.Point(385, 42); + this.cmbCat3.Location = new System.Drawing.Point(366, 40); this.cmbCat3.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbCat3.Name = "cmbCat3"; - this.cmbCat3.Size = new System.Drawing.Size(109, 25); + this.cmbCat3.Size = new System.Drawing.Size(99, 25); this.cmbCat3.TabIndex = 811; this.cmbCat3.Text = "全部"; this.cmbCat3.SelectedIndexChanged += new System.EventHandler(this.cmbCat3_SelectedIndexChanged); this.cmbCat3.TextChanged += new System.EventHandler(this.cmbCat3_MultiSelectChanged); // + // lblSourceType + // + this.lblSourceType.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.lblSourceType.AutoSize = true; + this.lblSourceType.Location = new System.Drawing.Point(322, 9); + this.lblSourceType.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); + this.lblSourceType.Name = "lblSourceType"; + this.lblSourceType.Size = new System.Drawing.Size(44, 17); + this.lblSourceType.TabIndex = 651; + this.lblSourceType.Text = "来源："; + // + // cmbSourceType + // + this.cmbSourceType.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.cmbSourceType.FormattingEnabled = true; + this.cmbSourceType.Items.AddRange(new object[] { + "", + "多多商品", + "1688商品"}); + this.cmbSourceType.Location = new System.Drawing.Point(366, 5); + this.cmbSourceType.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); + this.cmbSourceType.Name = "cmbSourceType"; + this.cmbSourceType.Size = new System.Drawing.Size(99, 25); + this.cmbSourceType.TabIndex = 654; + this.cmbSourceType.SelectedIndexChanged += new System.EventHandler(this.cmbSourceType_SelectedIndexChanged); + this.cmbSourceType.TextChanged += new System.EventHandler(this.cmbSourceType_SelectedIndexChanged); + // + // lblNotes + // + this.lblNotes.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.lblNotes.AutoSize = true; + this.lblNotes.Location = new System.Drawing.Point(509, 9); + this.lblNotes.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); + this.lblNotes.Name = "lblNotes"; + this.lblNotes.Size = new System.Drawing.Size(36, 17); + this.lblNotes.TabIndex = 440; + this.lblNotes.Text = " 备注"; + // + // txtNotes + // + this.txtNotes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.txtNotes.Location = new System.Drawing.Point(545, 6); + this.txtNotes.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); + this.txtNotes.Name = "txtNotes"; + this.txtNotes.Size = new System.Drawing.Size(99, 23); + this.txtNotes.TabIndex = 439; + // + // label12 + // + this.label12.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.label12.AutoSize = true; + this.label12.Location = new System.Drawing.Point(664, 9); + this.label12.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(60, 17); + this.label12.TabIndex = 801; + this.label12.Text = " 类目识别"; + // + // cmbWxCat + // + this.cmbWxCat.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.cmbWxCat.FormattingEnabled = true; + this.cmbWxCat.Items.AddRange(new object[] { + "", + "是", + "否"}); + this.cmbWxCat.Location = new System.Drawing.Point(724, 5); + this.cmbWxCat.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); + this.cmbWxCat.Name = "cmbWxCat"; + this.cmbWxCat.Size = new System.Drawing.Size(99, 25); + this.cmbWxCat.TabIndex = 802; + // // lblWxSafe // this.lblWxSafe.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lblWxSafe.AutoSize = true; - this.lblWxSafe.Location = new System.Drawing.Point(878, 44); + this.lblWxSafe.Location = new System.Drawing.Point(829, 9); this.lblWxSafe.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.lblWxSafe.Name = "lblWxSafe"; this.lblWxSafe.Size = new System.Drawing.Size(60, 17); @@ -616,59 +772,23 @@ namespace TemuKJD.WXForms.ProductForms "安全+未校验", "安全商品", "未校验"}); - this.cmbWxSafe.Location = new System.Drawing.Point(938, 42); + this.cmbWxSafe.Location = new System.Drawing.Point(889, 5); this.cmbWxSafe.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbWxSafe.Name = "cmbWxSafe"; - this.cmbWxSafe.Size = new System.Drawing.Size(109, 25); + this.cmbWxSafe.Size = new System.Drawing.Size(100, 25); this.cmbWxSafe.TabIndex = 676; this.cmbWxSafe.Text = "安全+未校验"; // - // txtNotes + // label7 // - this.txtNotes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtNotes.Location = new System.Drawing.Point(763, 6); - this.txtNotes.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); - this.txtNotes.Name = "txtNotes"; - this.txtNotes.Size = new System.Drawing.Size(109, 23); - this.txtNotes.TabIndex = 439; - // - // lblNotes - // - this.lblNotes.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.lblNotes.AutoSize = true; - this.lblNotes.Location = new System.Drawing.Point(727, 9); - this.lblNotes.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); - this.lblNotes.Name = "lblNotes"; - this.lblNotes.Size = new System.Drawing.Size(36, 17); - this.lblNotes.TabIndex = 440; - this.lblNotes.Text = " 备注"; - // - // cmbSourceType - // - this.cmbSourceType.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.cmbSourceType.FormattingEnabled = true; - this.cmbSourceType.Items.AddRange(new object[] { - "", - "多多商品", - "1688商品"}); - this.cmbSourceType.Location = new System.Drawing.Point(574, 7); - this.cmbSourceType.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); - this.cmbSourceType.Name = "cmbSourceType"; - this.cmbSourceType.Size = new System.Drawing.Size(109, 25); - this.cmbSourceType.TabIndex = 654; - this.cmbSourceType.SelectedIndexChanged += new System.EventHandler(this.cmbSourceType_SelectedIndexChanged); - this.cmbSourceType.TextChanged += new System.EventHandler(this.cmbSourceType_SelectedIndexChanged); - // - // lblSourceType - // - this.lblSourceType.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.lblSourceType.AutoSize = true; - this.lblSourceType.Location = new System.Drawing.Point(530, 9); - this.lblSourceType.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); - this.lblSourceType.Name = "lblSourceType"; - this.lblSourceType.Size = new System.Drawing.Size(44, 17); - this.lblSourceType.TabIndex = 651; - this.lblSourceType.Text = "来源："; + 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(1189, 48); + this.label7.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(20, 17); + this.label7.TabIndex = 1161; + this.label7.Text = "条"; // // splitContainer2 // @@ -992,31 +1112,6 @@ namespace TemuKJD.WXForms.ProductForms this.dgvDbProduct.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvDbProduct_CellContentClick); this.dgvDbProduct.Scroll += new System.Windows.Forms.ScrollEventHandler(this.dgvDbProduct_Scroll); // - // ucSplitPage1 - // - this.ucSplitPage1.CurrentPage = 1; - this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Right; - this.ucSplitPage1.IsShowPageSize = true; - this.ucSplitPage1.Location = new System.Drawing.Point(985, 0); - this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0); - this.ucSplitPage1.Name = "ucSplitPage1"; - this.ucSplitPage1.Padding = new System.Windows.Forms.Padding(0, 0, 1, 0); - this.ucSplitPage1.PageSize = 100; - this.ucSplitPage1.Size = new System.Drawing.Size(453, 25); - this.ucSplitPage1.TabIndex = 6; - this.ucSplitPage1.TotalPage = 1; - // - // 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(1438, 25); - this.statusBar.TabIndex = 5; - // // colSelect // this.colSelect.FillWeight = 26F; @@ -1249,10 +1344,9 @@ namespace TemuKJD.WXForms.ProductForms // dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.True; this.colFissionWords.DefaultCellStyle = dataGridViewCellStyle14; - this.colFissionWords.HeaderText = "裂变词"; + this.colFissionWords.HeaderText = "裂变标题"; this.colFissionWords.Name = "colFissionWords"; this.colFissionWords.ReadOnly = true; - this.colFissionWords.Visible = false; // // colGetType // @@ -1323,6 +1417,31 @@ namespace TemuKJD.WXForms.ProductForms this.col_select_product.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; this.col_select_product.Visible = false; // + // ucSplitPage1 + // + this.ucSplitPage1.CurrentPage = 1; + this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Right; + this.ucSplitPage1.IsShowPageSize = true; + this.ucSplitPage1.Location = new System.Drawing.Point(985, 0); + this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0); + this.ucSplitPage1.Name = "ucSplitPage1"; + this.ucSplitPage1.Padding = new System.Windows.Forms.Padding(0, 0, 1, 0); + this.ucSplitPage1.PageSize = 100; + this.ucSplitPage1.Size = new System.Drawing.Size(453, 25); + this.ucSplitPage1.TabIndex = 6; + this.ucSplitPage1.TotalPage = 1; + // + // 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(1438, 25); + this.statusBar.TabIndex = 5; + // // WXUserCollectAuthProdListForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -1341,6 +1460,7 @@ namespace TemuKJD.WXForms.ProductForms this.KeyUp += new System.Windows.Forms.KeyEventHandler(this.PDDDBProdListForm_KeyUp); this.Controls.SetChildIndex(this.splitContainer1, 0); this.splitContainer1.Panel1.ResumeLayout(false); + this.splitContainer1.Panel1.PerformLayout(); this.splitContainer1.Panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); this.splitContainer1.ResumeLayout(false); @@ -1412,6 +1532,13 @@ namespace TemuKJD.WXForms.ProductForms private DevComponents.DotNetBar.PanelEx btnGetProdWxCate; private DevComponents.DotNetBar.PanelEx btnSelect; private DevComponents.DotNetBar.PanelEx btnImportPddOutData; + private DevComponents.DotNetBar.PanelEx btnOut1688ProdSaveDb; + private UserComponent.UcCheckBox chkFissionProduct; + private System.Windows.Forms.Label label7; + private System.Windows.Forms.TextBox txtFissionProductCount; + private System.Windows.Forms.Label label8; + private System.Windows.Forms.ComboBox cmbHasFission; + private DevComponents.DotNetBar.PanelEx btnAITitleFission; private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect; private System.Windows.Forms.DataGridViewTextBoxColumn col_db_id; private System.Windows.Forms.DataGridViewTextBoxColumn colFromShopId; diff --git a/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.cs b/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.cs index 5b9583d..c07603c 100644 --- a/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.cs +++ b/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.cs @@ -137,6 +137,9 @@ namespace TemuKJD.WXForms.ProductForms btnDel.Visible = false; btnGetProdWxCate.Visible = false; btnStopStop.Visible = false; + btnImportPddOutData.Visible = false; + btnOut1688ProdSaveDb.Visible = false; + btnAITitleFission.Visible = false; this.dgvDbProduct.Columns["col_edit"].Visible = false; } } @@ -260,8 +263,8 @@ namespace TemuKJD.WXForms.ProductForms prod.notes, prod.head_words, prod.end_words, - prod.fission_words, - prod.product_get_type_text == "厂商直采" ? (prod.product_get_type_text + " " + prod.skc_id).Trim() : + prod.fission_words.Replace("fission_goods_names:", ""), + prod.product_get_type_text == "厂商直采" ? (prod.product_get_type_text + " " + prod.skc_id).Trim() : prod.product_get_type_text.Replace("1688厂家", "1688商品").Replace("1688外部数据", "1688商品") .Replace("已采集数据", "1688商品").Replace("机会商品", "多多商品").Replace("多多外部数据", "多多商品"), prod.special_prod_type, @@ -270,7 +273,8 @@ namespace TemuKJD.WXForms.ProductForms prod.mdy_time.ToString("yy-MM-dd HH:mm"), "编辑", "删除", - "认领"); + "认领" + ); dgvDbProduct.Rows[rowIndex].Height = dgvDbProduct.Columns["colMainImg"].Width; })); @@ -461,6 +465,16 @@ namespace TemuKJD.WXForms.ProductForms } if (chkWXComplateProd.Checked) data += "&has_wx_format=1"; + + if (cmbHasFission.Text == "是") + { + data += "&fission_words=fission_goods_names:"; + } + else if (cmbHasFission.Text == "否") + { + data += "&no_fission_words=true"; + } + data += "&is_not_count=true"; })); var html = GetHtml.PostUtf8(url, data); @@ -618,7 +632,7 @@ namespace TemuKJD.WXForms.ProductForms dgvDbProduct.Rows[e.RowIndex].Cells["col_ext_code"].Value = dbProduct.ext_code; dgvDbProduct.Rows[e.RowIndex].Cells["colHeadWords"].Value = dbProduct.head_words; dgvDbProduct.Rows[e.RowIndex].Cells["colEndWords"].Value = dbProduct.end_words; - dgvDbProduct.Rows[e.RowIndex].Cells["colFissionWords"].Value = dbProduct.fission_words; + dgvDbProduct.Rows[e.RowIndex].Cells["colFissionWords"].Value = dbProduct.fission_words.Replace("fission_goods_names:", ""); dgvDbProduct.Rows[e.RowIndex].Cells["col_product_name"].Value = dbProduct.product_name; dgvDbProduct.Rows[e.RowIndex].Cells["colSkuReplaceImgUrl"].Value = dbProduct.sku_img_replace_url; break; @@ -1016,14 +1030,33 @@ namespace TemuKJD.WXForms.ProductForms { foreach (var prod in prodList) { - var selectProd = JsonHelper.DeserializeJsonToObject(JsonHelper.SerializeObject(prod)); - selectProd.out_product_Id = prod.id.ToString(); - selectProd.id = 1; - if (WXDBProdUploadForm.Instance.lstTemuDBProductSelect.Count > 0) - selectProd.id = WXDBProdUploadForm.Instance.lstTemuDBProductSelect.Max(p => p.id) + 1; - //if (!string.IsNullOrEmpty(lblSetShop.Tag.ParseToString())) - // selectProd.shop_id = lblSetShop.Tag.ParseToString(); - WXDBProdUploadForm.Instance.lstTemuDBProductSelect.Add(selectProd); + var productNameLst = new List() { prod.product_name }; + if (chkFissionProduct.Checked) + { + Invoke(new Action(() => + { + var titleCount = txtFissionProductCount.Text.Trim().ParseToInt(); + if (prod.fission_words.ParseToString().Length > 20 && titleCount > 0) + { + productNameLst = prod.fission_words.Replace("fission_goods_names:", "") + .Split(new string[] { "\r", "\n" }, StringSplitOptions.RemoveEmptyEntries).OrderBy(x => Guid.NewGuid()).Distinct().Take(titleCount) + .ToList(); + } + })); + } + + foreach (var productName in productNameLst) + { + var selectProd = JsonHelper.DeserializeJsonToObject(JsonHelper.SerializeObject(prod)); + selectProd.product_name = productName; + if (chkFissionProduct.Checked) + selectProd.is_fission_title = true; + selectProd.out_product_Id = prod.id.ToString(); + selectProd.id = 1; + if (WXDBProdUploadForm.Instance.lstTemuDBProductSelect.Count > 0) + selectProd.id = WXDBProdUploadForm.Instance.lstTemuDBProductSelect.Max(p => p.id) + 1; + WXDBProdUploadForm.Instance.lstTemuDBProductSelect.Add(selectProd); + } } WXDBProdUploadForm.Instance.dbProdList_SaveComplete(WXDBProdUploadForm.Instance.lstTemuDBProductSelect); } @@ -1089,5 +1122,26 @@ namespace TemuKJD.WXForms.ProductForms }); } } + + private void btnOutProdSaveDb_Click(object sender, EventArgs e) + { + bool isCollectAuthorityUser = true; + Get1688ProductForm.Out1688ProductImport(isCollectAuthorityUser, this.statusBar, this.pbLoading); + } + + private void btnAITitleFission_Click(object sender, EventArgs e) + { + var lstProdId = dgvDbProduct.Rows.Cast().Where(row + => row.Cells["colSelect"]?.Value.ParseToBool() == true).Select(r => r.Cells["col_spu_id"]?.Value.ToString()).ToList(); + if (lstProdId.Count == 0) + { + BaseMsgForm.ShowError("请选择要裂变的商品"); + return; + } + var prodList = lstTemuDbProduct.Where(p => lstProdId.Contains(p.spu_id)).ToList(); + + DouBaoTitleFissionCefForm fissionCefForm = new DouBaoTitleFissionCefForm(prodList); + fissionCefForm.ShowDialog(); + } } } diff --git a/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.cs b/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.cs index f00722f..e6637ac 100644 --- a/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.cs +++ b/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.cs @@ -1568,6 +1568,12 @@ namespace TemuKJD.WXForms.ShopForms continue; lstWxOptimizeOrderWayBillInfo.Add(orderWaybill); + + if (orderWaybill.orderInfo.orderId == "3736739387308396544") + { + //3736739387308396544 + } + Invoke(new Action(() => { var rowIndex = this.dgvData3.Rows.Add( @@ -2340,8 +2346,9 @@ namespace TemuKJD.WXForms.ShopForms url = "https://po.e57.cn/prod-api/api/oms-api/order/optimize/optimizeExpressInfo"; var bodyStr = JsonHelper.SerializeObject(body); optimizeExpressRst = WXHttpResponseBLL.e57PostResponse(url, bodyStr, ""); - if (!optimizeExpressRst.Contains("修改物流信息成功") && !optimizeExpressRst.Contains("200")) - optimizeExpressRst = WXHttpResponseBLL.e57PostResponse(url, bodyStr, ""); + //修改物流信息失败500 + //if (!optimizeExpressRst.Contains("修改物流信息成功") && !optimizeExpressRst.Contains("200")) + // optimizeExpressRst = WXHttpResponseBLL.e57PostResponse(url, bodyStr, ""); } else { @@ -2378,6 +2385,8 @@ namespace TemuKJD.WXForms.ShopForms } else { + if (!string.IsNullOrEmpty(msg) && !msg.Contains("修改物流信息失败")) + msg = "修改物流信息失败，" + msg; data += "&optimize_rst=" + (msg.IsNullOrEmpty() ? "补发失败" : msg) + " " + delivery_id + ":" + waybill_id; } @@ -2497,7 +2506,7 @@ namespace TemuKJD.WXForms.ShopForms var skuId = row.Cells[$"colDgv{dgvNum}SkuId"].Value.ParseToString(); var cnt = row.Cells[$"colDgv{dgvNum}Cnt"].Value.ParseToInt(); var rst = OptimizeExpress(shop, orderId, orderCreateTime, spuId, skuId, cnt); - row.Cells[$"colDgv{dgvNum}OptimizeStatus"].Value = rst; + row.Cells[$"colDgv{dgvNum}OptimizeStatus"].Value = rst.Replace("修改物流信息失败,", "").Replace("修改物流信息失败，", ""); row.Cells[$"colDgv{dgvNum}OptimizeStatus"].Style.ForeColor = rst.Contains("成功") ? Control.DefaultForeColor : Color.Red; break; } diff --git a/Work/UserLogin.cs b/Work/UserLogin.cs index e098391..0edf969 100644 --- a/Work/UserLogin.cs +++ b/Work/UserLogin.cs @@ -262,10 +262,15 @@ namespace Work shopName = BaseClass.ShopName; int time = BaseClass.DateTimeToTimestampSeconds(DateTime.Now) + BaseClass.TimeDifferent; string time1 = Encryption(time); - return "time=" + time + "&code=" + time1 + "&NbCodeVersion=1" + "&version=" + BaseClass.VersionCount + + //return "time=" + time + "&code=" + time1 + "&NbCodeVersion=1" + "&version=" + BaseClass.VersionCount + + // "&company_id=" + BaseClass.CompanyId + "&company=" + GetHtml.UrlEncodeUtf8(BaseClass.CompanyName) + + // "&user_name=" + BaseClass.UserName + "&user_key=" + BaseClass.UserKey + "&mobile=" + BaseClass.Mobile + + // "&sid=" + shopId + "&shop=" + GetHtml.UrlEncodeUtf8(shopName); + var sign = "time=" + time + "&code=" + time1 + "&code_version=1" + "&version=" + BaseClass.VersionCount + "&company_id=" + BaseClass.CompanyId + "&company=" + GetHtml.UrlEncodeUtf8(BaseClass.CompanyName) + "&user_name=" + BaseClass.UserName + "&user_key=" + BaseClass.UserKey + "&mobile=" + BaseClass.Mobile + - "&sid=" + shopId + "&shop=" + GetHtml.UrlEncodeUtf8(shopName); + "&sid=" + shopId + "&shop=" + GetHtml.UrlEncodeUtf8(shopName) + "&path=" + BaseClass.MainPath; + return sign; } ///