diff --git a/KJDService/KJD_WebService/BLL/KJD/ProductManage.cs b/KJDService/KJD_WebService/BLL/KJD/ProductManage.cs index 629a81f..f367604 100644 --- a/KJDService/KJD_WebService/BLL/KJD/ProductManage.cs +++ b/KJDService/KJD_WebService/BLL/KJD/ProductManage.cs @@ -1085,6 +1085,10 @@ namespace KJD_Web.BLL int page = RegexUtils.GetStringQuery(ref inputData, "page").ParseToInt(); int page_size = RegexUtils.GetStringQuery(ref inputData, "page_size").ParseToInt(200); bool is_random = RegexUtils.GetStringQuery(ref inputData, "is_random").ParseToBool(); + if (is_random) + { + page_size = 3; + } string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; MysqlUtils mySql = new MysqlUtils(conn); @@ -1155,11 +1159,16 @@ namespace KJD_Web.BLL spec_name = row["spec_name"].ParseToString(), use_count = row["use_count"].ParseToInt(), }; - if(img.base64_mdy_time.AddDays(2) < DateTime.Now) + if(img.base64_mdy_time.AddDays(3) < DateTime.Now) { - // 每过两天返回给客户端空图，让客户端重传base64图片 + // 每过3天返回给客户端空图，让客户端重传base64图片 img.img_url = ""; } + else if (is_random && !string.IsNullOrWhiteSpace(img.img_url)) + { + // (仅上货)3天内返回给客户端图片链接同时不传base64图片 + img.img_base64 = ""; + } //if (isDetail) //{ // img.img_base64 = row["img_base64"].ToString(); diff --git a/KJDService/KJD_WebService/KJD_WebService.csproj.user b/KJDService/KJD_WebService/KJD_WebService.csproj.user index 4bcdc04..a48a5b1 100644 --- a/KJDService/KJD_WebService/KJD_WebService.csproj.user +++ b/KJDService/KJD_WebService/KJD_WebService.csproj.user @@ -1,4 +1,4 @@ - + true @@ -8,7 +8,7 @@ - Release|Any CPU + Debug|Any CPU ShowAllFiles diff --git a/TEMUKJD/KJDForms/ProductForms/TemuJitForm.Designer.cs b/TEMUKJD/KJDForms/ProductForms/TemuJitForm.Designer.cs index b7ff8ae..f1df60b 100644 --- a/TEMUKJD/KJDForms/ProductForms/TemuJitForm.Designer.cs +++ b/TEMUKJD/KJDForms/ProductForms/TemuJitForm.Designer.cs @@ -30,19 +30,19 @@ namespace TemuKJD.KJDForms.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 dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle33 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle35 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle36 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle37 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle38 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle39 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.line3 = new DevComponents.DotNetBar.Controls.Line(); @@ -53,8 +53,9 @@ namespace TemuKJD.KJDForms.ProductForms this.dgvExtCode = new TemuKJD.UserComponent.DataGridViewEx(); this.colSelectExtCode = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colFilterExtCode = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colJitConfig = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.label6 = new System.Windows.Forms.Label(); - this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); + this.btnCancel = new DevComponents.DotNetBar.PanelEx(); this.btnStop = new DevComponents.DotNetBar.PanelEx(); this.btnAddRealPic = new DevComponents.DotNetBar.PanelEx(); this.btnBatchJit = new DevComponents.DotNetBar.PanelEx(); @@ -113,10 +114,6 @@ namespace TemuKJD.KJDForms.ProductForms this.btnClose = new DevComponents.DotNetBar.PanelEx(); this.pbLoading = new System.Windows.Forms.PictureBox(); this.dgvOpenJit = new TemuKJD.UserComponent.DataGridViewEx(); - this.splitContainer4 = new System.Windows.Forms.SplitContainer(); - this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage(); - this.btnClear = new DevComponents.DotNetBar.PanelEx(); - this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colProdIndex = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colOrderId = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -139,6 +136,11 @@ namespace TemuKJD.KJDForms.ProductForms this.colStock = new System.Windows.Forms.DataGridViewLinkColumn(); this.colRecevieArea = new System.Windows.Forms.DataGridViewLinkColumn(); this.colMsg = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.splitContainer4 = new System.Windows.Forms.SplitContainer(); + this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage(); + this.btnClear = new DevComponents.DotNetBar.PanelEx(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); + this.btnSaveExtCodeJitConfig = new DevComponents.DotNetBar.PanelEx(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -192,6 +194,7 @@ namespace TemuKJD.KJDForms.ProductForms | System.Windows.Forms.AnchorStyles.Right))); this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx1.Controls.Add(this.btnSaveExtCodeJitConfig); this.ucGroupBoxEx1.Controls.Add(this.line3); this.ucGroupBoxEx1.Controls.Add(this.line2); this.ucGroupBoxEx1.Controls.Add(this.line1); @@ -199,7 +202,7 @@ namespace TemuKJD.KJDForms.ProductForms this.ucGroupBoxEx1.Controls.Add(this.btnSetReceiveArea); this.ucGroupBoxEx1.Controls.Add(this.dgvExtCode); this.ucGroupBoxEx1.Controls.Add(this.label6); - this.ucGroupBoxEx1.Controls.Add(this.panelEx1); + this.ucGroupBoxEx1.Controls.Add(this.btnCancel); this.ucGroupBoxEx1.Controls.Add(this.btnStop); this.ucGroupBoxEx1.Controls.Add(this.btnAddRealPic); this.ucGroupBoxEx1.Controls.Add(this.btnBatchJit); @@ -246,7 +249,7 @@ namespace TemuKJD.KJDForms.ProductForms // line3 // this.line3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.line3.Location = new System.Drawing.Point(273, 21); + this.line3.Location = new System.Drawing.Point(265, 21); this.line3.Name = "line3"; this.line3.Size = new System.Drawing.Size(11, 104); this.line3.TabIndex = 1265; @@ -256,7 +259,7 @@ namespace TemuKJD.KJDForms.ProductForms // line2 // this.line2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.line2.Location = new System.Drawing.Point(1410, 21); + this.line2.Location = new System.Drawing.Point(1414, 21); this.line2.Name = "line2"; this.line2.Size = new System.Drawing.Size(11, 76); this.line2.TabIndex = 1264; @@ -266,7 +269,7 @@ namespace TemuKJD.KJDForms.ProductForms // line1 // this.line1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.line1.Location = new System.Drawing.Point(600, 21); + this.line1.Location = new System.Drawing.Point(588, 21); this.line1.Name = "line1"; this.line1.Size = new System.Drawing.Size(11, 104); this.line1.TabIndex = 1263; @@ -277,7 +280,7 @@ namespace TemuKJD.KJDForms.ProductForms // this.chkFilterNotJit.AutoSize = true; this.chkFilterNotJit.ForeColor = System.Drawing.Color.Green; - this.chkFilterNotJit.Location = new System.Drawing.Point(1268, 70); + this.chkFilterNotJit.Location = new System.Drawing.Point(1282, 70); this.chkFilterNotJit.Name = "chkFilterNotJit"; this.chkFilterNotJit.Size = new System.Drawing.Size(127, 21); this.chkFilterNotJit.TabIndex = 1232; @@ -313,34 +316,37 @@ namespace TemuKJD.KJDForms.ProductForms // this.dgvExtCode.AllowUserToAddRows = false; this.dgvExtCode.AllowUserToDeleteRows = false; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249))))); - this.dgvExtCode.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle27.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249))))); + this.dgvExtCode.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle27; + this.dgvExtCode.AutoRowNumber = false; this.dgvExtCode.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.dgvExtCode.BackgroundColor = System.Drawing.Color.White; this.dgvExtCode.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.dgvExtCode.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle28.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle28.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle28.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle28.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle28.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvExtCode.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle28; this.dgvExtCode.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colSelectExtCode, - this.colFilterExtCode}); - this.dgvExtCode.Location = new System.Drawing.Point(651, 17); + this.colFilterExtCode, + this.colJitConfig}); + this.dgvExtCode.Location = new System.Drawing.Point(630, 17); this.dgvExtCode.Name = "dgvExtCode"; this.dgvExtCode.ReadOnly = true; + this.dgvExtCode.RowHeadersVisible = false; this.dgvExtCode.RowHeadersWidth = 24; this.dgvExtCode.RowTemplate.Height = 23; - this.dgvExtCode.Size = new System.Drawing.Size(203, 113); + this.dgvExtCode.Size = new System.Drawing.Size(257, 113); this.dgvExtCode.TabIndex = 684; this.dgvExtCode.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvExtCode_CellContentClick); // // colSelectExtCode // - this.colSelectExtCode.FillWeight = 33F; + this.colSelectExtCode.FillWeight = 30F; this.colSelectExtCode.HeaderText = "选"; this.colSelectExtCode.Name = "colSelectExtCode"; this.colSelectExtCode.ReadOnly = true; @@ -354,46 +360,53 @@ namespace TemuKJD.KJDForms.ProductForms this.colFilterExtCode.Name = "colFilterExtCode"; this.colFilterExtCode.ReadOnly = true; // + // colJitConfig + // + this.colJitConfig.FillWeight = 60F; + this.colJitConfig.HeaderText = "JIT配置"; + this.colJitConfig.Name = "colJitConfig"; + this.colJitConfig.ReadOnly = true; + // // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(617, 20); + this.label6.Location = new System.Drawing.Point(597, 20); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(44, 17); this.label6.TabIndex = 1172; this.label6.Text = "货号："; // - // panelEx1 + // btnCancel // - this.panelEx1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; - this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty; - this.panelEx1.Location = new System.Drawing.Point(1447, 105); - this.panelEx1.Name = "panelEx1"; - this.panelEx1.Size = new System.Drawing.Size(115, 21); - this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; - this.panelEx1.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); - this.panelEx1.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); - this.panelEx1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.panelEx1.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.panelEx1.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.panelEx1.Style.GradientAngle = 90; - this.panelEx1.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; - this.panelEx1.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.panelEx1.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.panelEx1.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.panelEx1.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; - this.panelEx1.TabIndex = 668; - this.panelEx1.Text = "停止当前操作"; - this.panelEx1.Click += new System.EventHandler(this.btnCancel_Click); + this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.btnCancel.CanvasColor = System.Drawing.SystemColors.Control; + this.btnCancel.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnCancel.DisabledBackColor = System.Drawing.Color.Empty; + this.btnCancel.Location = new System.Drawing.Point(1447, 103); + this.btnCancel.Name = "btnCancel"; + this.btnCancel.Size = new System.Drawing.Size(115, 23); + this.btnCancel.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnCancel.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnCancel.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnCancel.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.btnCancel.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnCancel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.btnCancel.Style.GradientAngle = 90; + this.btnCancel.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; + this.btnCancel.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnCancel.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnCancel.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnCancel.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.btnCancel.TabIndex = 668; + this.btnCancel.Text = "停止当前操作"; + this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click); // // btnStop // this.btnStop.CanvasColor = System.Drawing.SystemColors.Control; this.btnStop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnStop.DisabledBackColor = System.Drawing.Color.Empty; - this.btnStop.Location = new System.Drawing.Point(293, 107); + this.btnStop.Location = new System.Drawing.Point(287, 107); this.btnStop.Name = "btnStop"; this.btnStop.Size = new System.Drawing.Size(66, 23); this.btnStop.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -418,7 +431,7 @@ namespace TemuKJD.KJDForms.ProductForms this.btnAddRealPic.CanvasColor = System.Drawing.SystemColors.Control; this.btnAddRealPic.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnAddRealPic.DisabledBackColor = System.Drawing.Color.Empty; - this.btnAddRealPic.Location = new System.Drawing.Point(1011, 103); + this.btnAddRealPic.Location = new System.Drawing.Point(1022, 103); this.btnAddRealPic.Name = "btnAddRealPic"; this.btnAddRealPic.Size = new System.Drawing.Size(37, 23); this.btnAddRealPic.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -443,7 +456,7 @@ namespace TemuKJD.KJDForms.ProductForms this.btnBatchJit.Cursor = System.Windows.Forms.Cursors.Hand; this.btnBatchJit.DisabledBackColor = System.Drawing.Color.Empty; this.btnBatchJit.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnBatchJit.Location = new System.Drawing.Point(1268, 19); + this.btnBatchJit.Location = new System.Drawing.Point(1282, 19); this.btnBatchJit.Name = "btnBatchJit"; this.btnBatchJit.Size = new System.Drawing.Size(116, 23); this.btnBatchJit.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -485,7 +498,7 @@ namespace TemuKJD.KJDForms.ProductForms // // txtBatchStock // - this.txtBatchStock.Location = new System.Drawing.Point(1172, 103); + this.txtBatchStock.Location = new System.Drawing.Point(1188, 103); this.txtBatchStock.Name = "txtBatchStock"; this.txtBatchStock.Size = new System.Drawing.Size(80, 23); this.txtBatchStock.TabIndex = 1054; @@ -493,7 +506,7 @@ namespace TemuKJD.KJDForms.ProductForms // pbRealPicture // this.pbRealPicture.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.pbRealPicture.Location = new System.Drawing.Point(1052, 19); + this.pbRealPicture.Location = new System.Drawing.Point(1063, 19); this.pbRealPicture.Name = "pbRealPicture"; this.pbRealPicture.Size = new System.Drawing.Size(108, 108); this.pbRealPicture.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; @@ -502,23 +515,23 @@ namespace TemuKJD.KJDForms.ProductForms // // txtBatchIdentifyCode // - this.txtBatchIdentifyCode.Location = new System.Drawing.Point(871, 103); + this.txtBatchIdentifyCode.Location = new System.Drawing.Point(904, 103); this.txtBatchIdentifyCode.Name = "txtBatchIdentifyCode"; - this.txtBatchIdentifyCode.Size = new System.Drawing.Size(111, 23); + this.txtBatchIdentifyCode.Size = new System.Drawing.Size(87, 23); this.txtBatchIdentifyCode.TabIndex = 1048; // // txtBatchPriceMax // - this.txtBatchPriceMax.Location = new System.Drawing.Point(930, 42); + this.txtBatchPriceMax.Location = new System.Drawing.Point(952, 42); this.txtBatchPriceMax.Name = "txtBatchPriceMax"; - this.txtBatchPriceMax.Size = new System.Drawing.Size(52, 23); + this.txtBatchPriceMax.Size = new System.Drawing.Size(40, 23); this.txtBatchPriceMax.TabIndex = 1046; // // txtBatchPriceMin // - this.txtBatchPriceMin.Location = new System.Drawing.Point(871, 42); + this.txtBatchPriceMin.Location = new System.Drawing.Point(904, 42); this.txtBatchPriceMin.Name = "txtBatchPriceMin"; - this.txtBatchPriceMin.Size = new System.Drawing.Size(52, 23); + this.txtBatchPriceMin.Size = new System.Drawing.Size(40, 23); this.txtBatchPriceMin.TabIndex = 1045; // // btnSearch1 @@ -527,7 +540,7 @@ namespace TemuKJD.KJDForms.ProductForms this.btnSearch1.Cursor = System.Windows.Forms.Cursors.Hand; this.btnSearch1.DisabledBackColor = System.Drawing.Color.Empty; this.btnSearch1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSearch1.Location = new System.Drawing.Point(361, 107); + this.btnSearch1.Location = new System.Drawing.Point(355, 107); this.btnSearch1.Name = "btnSearch1"; this.btnSearch1.Size = new System.Drawing.Size(110, 23); this.btnSearch1.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -550,7 +563,7 @@ namespace TemuKJD.KJDForms.ProductForms this.btnResetExtCode.CanvasColor = System.Drawing.SystemColors.Control; this.btnResetExtCode.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnResetExtCode.DisabledBackColor = System.Drawing.Color.Empty; - this.btnResetExtCode.Location = new System.Drawing.Point(517, 47); + this.btnResetExtCode.Location = new System.Drawing.Point(511, 47); this.btnResetExtCode.Name = "btnResetExtCode"; this.btnResetExtCode.Size = new System.Drawing.Size(66, 23); this.btnResetExtCode.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -571,7 +584,7 @@ namespace TemuKJD.KJDForms.ProductForms // // txtExtCode // - this.txtExtCode.Location = new System.Drawing.Point(332, 47); + this.txtExtCode.Location = new System.Drawing.Point(326, 47); this.txtExtCode.Name = "txtExtCode"; this.txtExtCode.Size = new System.Drawing.Size(182, 23); this.txtExtCode.TabIndex = 1003; @@ -579,7 +592,7 @@ namespace TemuKJD.KJDForms.ProductForms // label12 // this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(298, 50); + this.label12.Location = new System.Drawing.Point(292, 50); this.label12.Name = "label12"; this.label12.Size = new System.Drawing.Size(44, 17); this.label12.TabIndex = 1004; @@ -590,7 +603,7 @@ namespace TemuKJD.KJDForms.ProductForms this.chkSearchTime.AutoSize = true; this.chkSearchTime.Checked = true; this.chkSearchTime.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkSearchTime.Location = new System.Drawing.Point(293, 81); + this.chkSearchTime.Location = new System.Drawing.Point(287, 81); this.chkSearchTime.Name = "chkSearchTime"; this.chkSearchTime.Size = new System.Drawing.Size(15, 14); this.chkSearchTime.TabIndex = 1002; @@ -598,14 +611,14 @@ namespace TemuKJD.KJDForms.ProductForms // // dtpEndTime // - this.dtpEndTime.Location = new System.Drawing.Point(447, 77); + this.dtpEndTime.Location = new System.Drawing.Point(441, 77); this.dtpEndTime.Name = "dtpEndTime"; this.dtpEndTime.Size = new System.Drawing.Size(136, 23); this.dtpEndTime.TabIndex = 1001; // // dtpStartTime // - this.dtpStartTime.Location = new System.Drawing.Point(309, 77); + this.dtpStartTime.Location = new System.Drawing.Point(303, 77); this.dtpStartTime.Name = "dtpStartTime"; this.dtpStartTime.Size = new System.Drawing.Size(136, 23); this.dtpStartTime.TabIndex = 1000; @@ -616,7 +629,7 @@ namespace TemuKJD.KJDForms.ProductForms this.btnSearch2.Cursor = System.Windows.Forms.Cursors.Hand; this.btnSearch2.DisabledBackColor = System.Drawing.Color.Empty; this.btnSearch2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSearch2.Location = new System.Drawing.Point(473, 107); + this.btnSearch2.Location = new System.Drawing.Point(467, 107); this.btnSearch2.Name = "btnSearch2"; this.btnSearch2.Size = new System.Drawing.Size(110, 23); this.btnSearch2.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -636,7 +649,7 @@ namespace TemuKJD.KJDForms.ProductForms // // txtSpuId // - this.txtSpuId.Location = new System.Drawing.Point(332, 17); + this.txtSpuId.Location = new System.Drawing.Point(326, 17); this.txtSpuId.Name = "txtSpuId"; this.txtSpuId.Size = new System.Drawing.Size(251, 23); this.txtSpuId.TabIndex = 997; @@ -644,7 +657,7 @@ namespace TemuKJD.KJDForms.ProductForms // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(288, 20); + this.label7.Location = new System.Drawing.Point(282, 20); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(54, 17); this.label7.TabIndex = 998; @@ -759,7 +772,7 @@ namespace TemuKJD.KJDForms.ProductForms // label13 // this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(921, 45); + this.label13.Location = new System.Drawing.Point(943, 45); this.label13.Name = "label13"; this.label13.Size = new System.Drawing.Size(13, 17); this.label13.TabIndex = 1062; @@ -770,7 +783,7 @@ namespace TemuKJD.KJDForms.ProductForms this.chkBatchIdentifyCode.AutoSize = true; this.chkBatchIdentifyCode.Checked = true; this.chkBatchIdentifyCode.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkBatchIdentifyCode.Location = new System.Drawing.Point(871, 81); + this.chkBatchIdentifyCode.Location = new System.Drawing.Point(903, 81); this.chkBatchIdentifyCode.Name = "chkBatchIdentifyCode"; this.chkBatchIdentifyCode.Size = new System.Drawing.Size(99, 21); this.chkBatchIdentifyCode.TabIndex = 1111; @@ -782,7 +795,7 @@ namespace TemuKJD.KJDForms.ProductForms this.chkBatchPrice.AutoSize = true; this.chkBatchPrice.Checked = true; this.chkBatchPrice.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkBatchPrice.Location = new System.Drawing.Point(871, 20); + this.chkBatchPrice.Location = new System.Drawing.Point(904, 20); this.chkBatchPrice.Name = "chkBatchPrice"; this.chkBatchPrice.Size = new System.Drawing.Size(87, 21); this.chkBatchPrice.TabIndex = 1112; @@ -794,7 +807,7 @@ namespace TemuKJD.KJDForms.ProductForms this.chkBatchRealPicture.AutoSize = true; this.chkBatchRealPicture.Checked = true; this.chkBatchRealPicture.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkBatchRealPicture.Location = new System.Drawing.Point(993, 20); + this.chkBatchRealPicture.Location = new System.Drawing.Point(1004, 20); this.chkBatchRealPicture.Name = "chkBatchRealPicture"; this.chkBatchRealPicture.Size = new System.Drawing.Size(75, 21); this.chkBatchRealPicture.TabIndex = 1113; @@ -806,7 +819,7 @@ namespace TemuKJD.KJDForms.ProductForms this.chkBatchStock.AutoSize = true; this.chkBatchStock.Checked = true; this.chkBatchStock.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkBatchStock.Location = new System.Drawing.Point(1172, 81); + this.chkBatchStock.Location = new System.Drawing.Point(1188, 81); this.chkBatchStock.Name = "chkBatchStock"; this.chkBatchStock.Size = new System.Drawing.Size(87, 21); this.chkBatchStock.TabIndex = 1114; @@ -818,7 +831,7 @@ namespace TemuKJD.KJDForms.ProductForms this.chkBatchJit.AutoSize = true; this.chkBatchJit.Checked = true; this.chkBatchJit.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkBatchJit.Location = new System.Drawing.Point(1172, 20); + this.chkBatchJit.Location = new System.Drawing.Point(1188, 20); this.chkBatchJit.Name = "chkBatchJit"; this.chkBatchJit.Size = new System.Drawing.Size(91, 21); this.chkBatchJit.TabIndex = 1116; @@ -829,7 +842,7 @@ namespace TemuKJD.KJDForms.ProductForms // this.chkFilterJit.AutoSize = true; this.chkFilterJit.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.chkFilterJit.Location = new System.Drawing.Point(1268, 47); + this.chkFilterJit.Location = new System.Drawing.Point(1282, 47); this.chkFilterJit.Name = "chkFilterJit"; this.chkFilterJit.Size = new System.Drawing.Size(127, 21); this.chkFilterJit.TabIndex = 1231; @@ -954,18 +967,19 @@ namespace TemuKJD.KJDForms.ProductForms // this.dgvShop.AllowUserToAddRows = false; this.dgvShop.AllowUserToDeleteRows = false; - dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle29.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle29; + 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))))); - 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.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle30.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle30.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle30.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle30.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle30.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle30.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle30; this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colSelect, @@ -1125,18 +1139,19 @@ namespace TemuKJD.KJDForms.ProductForms // this.dgvOpenJit.AllowUserToAddRows = false; this.dgvOpenJit.AllowUserToDeleteRows = false; - dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249))))); - this.dgvOpenJit.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle31.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249))))); + this.dgvOpenJit.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle31; + this.dgvOpenJit.AutoRowNumber = true; this.dgvOpenJit.BackgroundColor = System.Drawing.Color.White; this.dgvOpenJit.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvOpenJit.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle6; + dataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle32.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle32.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle32.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle32.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle32.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle32.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvOpenJit.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle32; this.dgvOpenJit.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvOpenJit.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colCheck, @@ -1171,6 +1186,187 @@ namespace TemuKJD.KJDForms.ProductForms this.dgvOpenJit.TabIndex = 187; this.dgvOpenJit.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvOpenJit_CellContentClick); // + // colCheck + // + 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 = 28; + // + // colProdIndex + // + this.colProdIndex.HeaderText = "序号"; + this.colProdIndex.Name = "colProdIndex"; + this.colProdIndex.ReadOnly = true; + this.colProdIndex.Width = 40; + // + // colOrderId + // + this.colOrderId.HeaderText = "处理单号"; + this.colOrderId.Name = "colOrderId"; + this.colOrderId.ReadOnly = true; + this.colOrderId.Visible = false; + // + // colSupplierId + // + this.colSupplierId.HeaderText = "店铺Id"; + this.colSupplierId.Name = "colSupplierId"; + this.colSupplierId.ReadOnly = true; + this.colSupplierId.Width = 80; + // + // colSupplierName + // + dataGridViewCellStyle33.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle33; + this.colSupplierName.HeaderText = "店铺名称"; + this.colSupplierName.Name = "colSupplierName"; + this.colSupplierName.ReadOnly = true; + this.colSupplierName.Width = 90; + // + // colImgUrl + // + this.colImgUrl.HeaderText = "图片路径"; + this.colImgUrl.Name = "colImgUrl"; + this.colImgUrl.ReadOnly = true; + this.colImgUrl.Visible = false; + // + // colProductSkcPic + // + this.colProductSkcPic.HeaderText = "Skc图片"; + this.colProductSkcPic.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Zoom; + this.colProductSkcPic.Name = "colProductSkcPic"; + this.colProductSkcPic.ReadOnly = true; + this.colProductSkcPic.Width = 60; + // + // colProductId + // + this.colProductId.HeaderText = "商品Id"; + this.colProductId.Name = "colProductId"; + this.colProductId.ReadOnly = true; + this.colProductId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colProductId.Width = 85; + // + // colProdSkc + // + this.colProdSkc.FillWeight = 150F; + this.colProdSkc.HeaderText = "商品SKC"; + this.colProdSkc.Name = "colProdSkc"; + this.colProdSkc.ReadOnly = true; + this.colProdSkc.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colProdSkc.Width = 90; + // + // colProdName + // + dataGridViewCellStyle34.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colProdName.DefaultCellStyle = dataGridViewCellStyle34; + this.colProdName.HeaderText = "标题"; + this.colProdName.Name = "colProdName"; + this.colProdName.ReadOnly = true; + this.colProdName.Width = 120; + // + // colSkuName + // + dataGridViewCellStyle35.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colSkuName.DefaultCellStyle = dataGridViewCellStyle35; + this.colSkuName.HeaderText = "规格名称"; + this.colSkuName.Name = "colSkuName"; + this.colSkuName.ReadOnly = true; + this.colSkuName.Width = 120; + // + // colExtCode + // + dataGridViewCellStyle36.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colExtCode.DefaultCellStyle = dataGridViewCellStyle36; + this.colExtCode.HeaderText = "货号"; + this.colExtCode.Name = "colExtCode"; + this.colExtCode.ReadOnly = true; + this.colExtCode.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colExtCode.Width = 120; + // + // colExtCodePrice + // + this.colExtCodePrice.HeaderText = "货号进价"; + this.colExtCodePrice.Name = "colExtCodePrice"; + this.colExtCodePrice.ReadOnly = true; + this.colExtCodePrice.Width = 65; + // + // colPrcie + // + this.colPrcie.HeaderText = "申报价"; + this.colPrcie.Name = "colPrcie"; + this.colPrcie.ReadOnly = true; + this.colPrcie.Width = 60; + // + // colCreatTime + // + dataGridViewCellStyle37.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colCreatTime.DefaultCellStyle = dataGridViewCellStyle37; + this.colCreatTime.HeaderText = "创建时间"; + this.colCreatTime.Name = "colCreatTime"; + this.colCreatTime.ReadOnly = true; + this.colCreatTime.Width = 65; + // + // colChangePrice + // + this.colChangePrice.HeaderText = "调价"; + this.colChangePrice.Name = "colChangePrice"; + this.colChangePrice.ReadOnly = true; + this.colChangePrice.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colChangePrice.Width = 38; + // + // colCompliance + // + dataGridViewCellStyle38.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colCompliance.DefaultCellStyle = dataGridViewCellStyle38; + this.colCompliance.HeaderText = "合规信息"; + this.colCompliance.Name = "colCompliance"; + this.colCompliance.ReadOnly = true; + this.colCompliance.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colCompliance.Width = 65; + // + // colRealPicture + // + this.colRealPicture.HeaderText = "实拍图"; + this.colRealPicture.Name = "colRealPicture"; + this.colRealPicture.ReadOnly = true; + this.colRealPicture.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colRealPicture.Width = 60; + // + // colJit + // + this.colJit.HeaderText = "Jit"; + this.colJit.Name = "colJit"; + this.colJit.ReadOnly = true; + this.colJit.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colJit.Width = 60; + // + // colStock + // + this.colStock.HeaderText = "修改库存"; + this.colStock.Name = "colStock"; + this.colStock.ReadOnly = true; + this.colStock.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colStock.Width = 65; + // + // colRecevieArea + // + dataGridViewCellStyle39.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colRecevieArea.DefaultCellStyle = dataGridViewCellStyle39; + this.colRecevieArea.HeaderText = "期望到货"; + this.colRecevieArea.Name = "colRecevieArea"; + this.colRecevieArea.ReadOnly = true; + this.colRecevieArea.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colRecevieArea.Width = 65; + // + // colMsg + // + this.colMsg.HeaderText = "状态"; + this.colMsg.Name = "colMsg"; + this.colMsg.ReadOnly = true; + this.colMsg.Width = 180; + // // splitContainer4 // this.splitContainer4.Dock = System.Windows.Forms.DockStyle.Fill; @@ -1241,186 +1437,29 @@ namespace TemuKJD.KJDForms.ProductForms this.statusBar.Size = new System.Drawing.Size(1298, 26); this.statusBar.TabIndex = 2; // - // colCheck + // btnSaveExtCodeJitConfig // - 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 = 28; - // - // colProdIndex - // - this.colProdIndex.HeaderText = "序号"; - this.colProdIndex.Name = "colProdIndex"; - this.colProdIndex.ReadOnly = true; - this.colProdIndex.Width = 40; - // - // colOrderId - // - this.colOrderId.HeaderText = "处理单号"; - this.colOrderId.Name = "colOrderId"; - this.colOrderId.ReadOnly = true; - this.colOrderId.Visible = false; - // - // colSupplierId - // - this.colSupplierId.HeaderText = "店铺Id"; - this.colSupplierId.Name = "colSupplierId"; - this.colSupplierId.ReadOnly = true; - this.colSupplierId.Width = 80; - // - // colSupplierName - // - dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle7; - this.colSupplierName.HeaderText = "店铺名称"; - this.colSupplierName.Name = "colSupplierName"; - this.colSupplierName.ReadOnly = true; - this.colSupplierName.Width = 90; - // - // colImgUrl - // - this.colImgUrl.HeaderText = "图片路径"; - this.colImgUrl.Name = "colImgUrl"; - this.colImgUrl.ReadOnly = true; - this.colImgUrl.Visible = false; - // - // colProductSkcPic - // - this.colProductSkcPic.HeaderText = "Skc图片"; - this.colProductSkcPic.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Zoom; - this.colProductSkcPic.Name = "colProductSkcPic"; - this.colProductSkcPic.ReadOnly = true; - this.colProductSkcPic.Width = 60; - // - // colProductId - // - this.colProductId.HeaderText = "商品Id"; - this.colProductId.Name = "colProductId"; - this.colProductId.ReadOnly = true; - this.colProductId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colProductId.Width = 85; - // - // colProdSkc - // - this.colProdSkc.FillWeight = 150F; - this.colProdSkc.HeaderText = "商品SKC"; - this.colProdSkc.Name = "colProdSkc"; - this.colProdSkc.ReadOnly = true; - this.colProdSkc.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colProdSkc.Width = 90; - // - // colProdName - // - dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colProdName.DefaultCellStyle = dataGridViewCellStyle8; - this.colProdName.HeaderText = "标题"; - this.colProdName.Name = "colProdName"; - this.colProdName.ReadOnly = true; - this.colProdName.Width = 120; - // - // colSkuName - // - dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colSkuName.DefaultCellStyle = dataGridViewCellStyle9; - this.colSkuName.HeaderText = "规格名称"; - this.colSkuName.Name = "colSkuName"; - this.colSkuName.ReadOnly = true; - this.colSkuName.Width = 120; - // - // colExtCode - // - dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colExtCode.DefaultCellStyle = dataGridViewCellStyle10; - this.colExtCode.HeaderText = "货号"; - this.colExtCode.Name = "colExtCode"; - this.colExtCode.ReadOnly = true; - this.colExtCode.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colExtCode.Width = 120; - // - // colExtCodePrice - // - this.colExtCodePrice.HeaderText = "货号进价"; - this.colExtCodePrice.Name = "colExtCodePrice"; - this.colExtCodePrice.ReadOnly = true; - this.colExtCodePrice.Width = 65; - // - // colPrcie - // - this.colPrcie.HeaderText = "申报价"; - this.colPrcie.Name = "colPrcie"; - this.colPrcie.ReadOnly = true; - this.colPrcie.Width = 60; - // - // colCreatTime - // - dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colCreatTime.DefaultCellStyle = dataGridViewCellStyle11; - this.colCreatTime.HeaderText = "创建时间"; - this.colCreatTime.Name = "colCreatTime"; - this.colCreatTime.ReadOnly = true; - this.colCreatTime.Width = 65; - // - // colChangePrice - // - this.colChangePrice.HeaderText = "调价"; - this.colChangePrice.Name = "colChangePrice"; - this.colChangePrice.ReadOnly = true; - this.colChangePrice.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colChangePrice.Width = 38; - // - // colCompliance - // - dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colCompliance.DefaultCellStyle = dataGridViewCellStyle12; - this.colCompliance.HeaderText = "合规信息"; - this.colCompliance.Name = "colCompliance"; - this.colCompliance.ReadOnly = true; - this.colCompliance.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colCompliance.Width = 65; - // - // colRealPicture - // - this.colRealPicture.HeaderText = "实拍图"; - this.colRealPicture.Name = "colRealPicture"; - this.colRealPicture.ReadOnly = true; - this.colRealPicture.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colRealPicture.Width = 60; - // - // colJit - // - this.colJit.HeaderText = "Jit"; - this.colJit.Name = "colJit"; - this.colJit.ReadOnly = true; - this.colJit.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colJit.Width = 60; - // - // colStock - // - this.colStock.HeaderText = "修改库存"; - this.colStock.Name = "colStock"; - this.colStock.ReadOnly = true; - this.colStock.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colStock.Width = 65; - // - // colRecevieArea - // - dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colRecevieArea.DefaultCellStyle = dataGridViewCellStyle13; - this.colRecevieArea.HeaderText = "期望到货"; - this.colRecevieArea.Name = "colRecevieArea"; - this.colRecevieArea.ReadOnly = true; - this.colRecevieArea.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colRecevieArea.Width = 65; - // - // colMsg - // - this.colMsg.HeaderText = "状态"; - this.colMsg.Name = "colMsg"; - this.colMsg.ReadOnly = true; - this.colMsg.Width = 180; + this.btnSaveExtCodeJitConfig.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.btnSaveExtCodeJitConfig.CanvasColor = System.Drawing.SystemColors.Control; + this.btnSaveExtCodeJitConfig.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnSaveExtCodeJitConfig.DisabledBackColor = System.Drawing.Color.Empty; + this.btnSaveExtCodeJitConfig.Location = new System.Drawing.Point(1283, 103); + this.btnSaveExtCodeJitConfig.Name = "btnSaveExtCodeJitConfig"; + this.btnSaveExtCodeJitConfig.Size = new System.Drawing.Size(115, 23); + this.btnSaveExtCodeJitConfig.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnSaveExtCodeJitConfig.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnSaveExtCodeJitConfig.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnSaveExtCodeJitConfig.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.btnSaveExtCodeJitConfig.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnSaveExtCodeJitConfig.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.btnSaveExtCodeJitConfig.Style.GradientAngle = 90; + this.btnSaveExtCodeJitConfig.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; + this.btnSaveExtCodeJitConfig.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnSaveExtCodeJitConfig.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnSaveExtCodeJitConfig.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnSaveExtCodeJitConfig.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.btnSaveExtCodeJitConfig.TabIndex = 1299; + this.btnSaveExtCodeJitConfig.Text = "存配置到选中货号"; // // TemuJitForm // @@ -1529,12 +1568,10 @@ namespace TemuKJD.KJDForms.ProductForms private UserComponent.UcCheckBox chkBatchJit; private System.Windows.Forms.Label label6; private UserComponent.DataGridViewEx dgvExtCode; - private System.Windows.Forms.DataGridViewCheckBoxColumn colSelectExtCode; - private System.Windows.Forms.DataGridViewTextBoxColumn colFilterExtCode; private DevComponents.DotNetBar.PanelEx btnSetReceiveArea; private DevComponents.DotNetBar.PanelEx btnCancelJit; private UserComponent.UcCheckBox chkFilterJit; - private DevComponents.DotNetBar.PanelEx panelEx1; + private DevComponents.DotNetBar.PanelEx btnCancel; private UserComponent.UcCheckBox chkFilterNotJit; private DevComponents.DotNetBar.Controls.Line line3; private DevComponents.DotNetBar.Controls.Line line2; @@ -1561,5 +1598,9 @@ namespace TemuKJD.KJDForms.ProductForms private System.Windows.Forms.DataGridViewLinkColumn colStock; private System.Windows.Forms.DataGridViewLinkColumn colRecevieArea; private System.Windows.Forms.DataGridViewTextBoxColumn colMsg; + private System.Windows.Forms.DataGridViewCheckBoxColumn colSelectExtCode; + private System.Windows.Forms.DataGridViewTextBoxColumn colFilterExtCode; + private System.Windows.Forms.DataGridViewTextBoxColumn colJitConfig; + private DevComponents.DotNetBar.PanelEx btnSaveExtCodeJitConfig; } } \ No newline at end of file diff --git a/TEMUKJD/KJDForms/ProductForms/TemuJitForm.cs b/TEMUKJD/KJDForms/ProductForms/TemuJitForm.cs index 52fbe4c..e109fa9 100644 --- a/TEMUKJD/KJDForms/ProductForms/TemuJitForm.cs +++ b/TEMUKJD/KJDForms/ProductForms/TemuJitForm.cs @@ -65,6 +65,8 @@ namespace TemuKJD.KJDForms.ProductForms ucSplitPage1.Visible = false; this.dgvShop.AddSelectorColumn("colSelect"); + var chkSelectExtCode = this.dgvExtCode.AddSelectorColumn("colSelectExtCode"); + chkSelectExtCode.CheckedChanged += ChkSelectExtCode_CheckedChanged; this.dgvOpenJit.AddSelectorColumn("colCheck"); this.dgvOpenJit.AddImgColumn("colProductSkcPic", "colImgUrl"); @@ -438,7 +440,7 @@ namespace TemuKJD.KJDForms.ProductForms column.Visible = true; } - sFilterExtCode = ""; + lstFilterExtCode.Clear(); dgvExtCode.Rows.Clear(); this.dgvOpenJit.Rows.Clear(); this.lstChainProdInfo.Clear(); @@ -1841,27 +1843,25 @@ Content-Disposition: form-data; name=""upload_sign"" cancellationTokenSource.Cancel(); } - string sFilterExtCode = ""; + List lstFilterExtCode = new List(); + private void ChkSelectExtCode_CheckedChanged(object sender, EventArgs e) + { + lstFilterExtCode = dgvExtCode.Rows.Cast() + .Where(r => r.Cells["colSelectExtCode"].Value.ParseToBool() == true) + .Select(r => r.Cells["colFilterExtCode"].Value.ParseToString()).Distinct().ToList(); + FilterRows(); + } + private void dgvExtCode_CellContentClick(object sender, DataGridViewCellEventArgs e) { if (e.ColumnIndex < 0 || e.RowIndex < 0) return; - foreach (DataGridViewRow row in dgvExtCode.Rows) - { - if (row.Index != e.RowIndex) - row.Cells["colSelectExtCode"].Value = false; - } dgvExtCode.Rows[e.RowIndex].Cells["colSelectExtCode"].Value = !dgvExtCode.Rows[e.RowIndex].Cells["colSelectExtCode"].Value.ParseToBool(); - if (dgvExtCode.Rows[e.RowIndex].Cells["colSelectExtCode"].Value.ParseToBool() == true) - { - sFilterExtCode = dgvExtCode.Rows[e.RowIndex].Cells["colFilterExtCode"].Value.ParseToString(); - } - else - { - sFilterExtCode = ""; - } + lstFilterExtCode = dgvExtCode.Rows.Cast() + .Where(r => r.Cells["colSelectExtCode"].Value.ParseToBool() == true) + .Select(r => r.Cells["colFilterExtCode"].Value.ParseToString()).Distinct().ToList(); FilterRows(); } @@ -1870,9 +1870,10 @@ Content-Disposition: form-data; name=""upload_sign"" foreach (DataGridViewRow row in dgvOpenJit.Rows) { row.Visible = true; - if (!sFilterExtCode.IsNullOrEmpty()) + row.Cells["colCheck"].Value = false; + if (lstFilterExtCode != null && lstFilterExtCode.Count > 0) { - if (row.Cells["colExtCode"].Value.ParseToString() == sFilterExtCode) + if (lstFilterExtCode.Contains(row.Cells["colExtCode"].Value.ParseToString())) { row.Cells["colCheck"].Value = true; row.Visible = true; @@ -1937,7 +1938,7 @@ Content-Disposition: form-data; name=""upload_sign"" column.Visible = false; } - sFilterExtCode = ""; + lstFilterExtCode.Clear(); dgvExtCode.Rows.Clear(); this.dgvOpenJit.Rows.Clear(); this.pbLoading.Visible = true; @@ -2180,6 +2181,16 @@ Content-Disposition: form-data; name=""upload_sign"" public string SearchExtCode { get; set; } = ""; public bool SearchDuration { get; set; } = true; } + + public class OpenJitConfig + { + public string ExtCode { get; set; } + public decimal PriceMin { get; set; } + public decimal PriceMax { get; set; } + public string IdentifyCode { get; set; } + public string RealPicture { get; set; } + public int Stock { get; set; } + } /// /// 合规信息 /// @@ -2362,4 +2373,5 @@ Content-Disposition: form-data; name=""upload_sign"" public string expectReceiveAreaConfigDesc { get; set; } // "广东", public bool? canEditExpectReceiveArea { get; set; } // true } + //------------------------------------------------------------------------- } diff --git a/TEMUKJD/KJDForms/ProductForms/TemuJitForm.resx b/TEMUKJD/KJDForms/ProductForms/TemuJitForm.resx index 6dcf460..f81761e 100644 --- a/TEMUKJD/KJDForms/ProductForms/TemuJitForm.resx +++ b/TEMUKJD/KJDForms/ProductForms/TemuJitForm.resx @@ -123,6 +123,9 @@ True + + True + True diff --git a/TEMUKJD/KJDForms/ProductSelectForms/DbProductListForm.Designer.cs b/TEMUKJD/KJDForms/ProductSelectForms/DbProductListForm.Designer.cs index 53bb706..47a8be3 100644 --- a/TEMUKJD/KJDForms/ProductSelectForms/DbProductListForm.Designer.cs +++ b/TEMUKJD/KJDForms/ProductSelectForms/DbProductListForm.Designer.cs @@ -40,38 +40,34 @@ namespace TemuKJD.KJDForms.ProductSelectForms System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DbProductListForm)); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.btnBatchSelect = new DevComponents.DotNetBar.PanelEx(); + this.btnSearch = new DevComponents.DotNetBar.PanelEx(); + this.btnSelect = new DevComponents.DotNetBar.PanelEx(); this.cmbGroup = new System.Windows.Forms.ComboBox(); this.lblGroup = new System.Windows.Forms.Label(); this.btnImportHtml = new DevComponents.DotNetBar.PanelEx(); this.cmbSort = new System.Windows.Forms.ComboBox(); - this.btnSelect = new TemuKJD.UserControls.ButtonEx(); this.txtNotes = new System.Windows.Forms.TextBox(); this.lblNotes = new System.Windows.Forms.Label(); this.txtSPU = new System.Windows.Forms.TextBox(); this.label5 = new System.Windows.Forms.Label(); - this.label1 = new System.Windows.Forms.Label(); this.pnlEmpty = new DevComponents.DotNetBar.PanelEx(); - this.btnSearch = new TemuKJD.UserControls.ButtonEx(); this.txtExtCode = new System.Windows.Forms.TextBox(); this.label4 = new System.Windows.Forms.Label(); this.txtProdName = new System.Windows.Forms.TextBox(); - this.label3 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); this.label6 = new System.Windows.Forms.Label(); this.txtCat = new System.Windows.Forms.TextBox(); this.txtSKC = new System.Windows.Forms.TextBox(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); this.pbLoading = new System.Windows.Forms.PictureBox(); this.panel2 = new System.Windows.Forms.Panel(); + this.lbxProdName = new System.Windows.Forms.ListBox(); this.lblProdName = new System.Windows.Forms.Label(); this.numCount = new System.Windows.Forms.NumericUpDown(); this.dgvSelectShop = new TemuKJD.UserComponent.DataGridViewEx(); - this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.colUserName = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colSubUserName = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colShopNotes = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.btnCancel = new DevComponents.DotNetBar.PanelEx(); this.btnAddToSelectDb = new DevComponents.DotNetBar.PanelEx(); this.btnGetShop = new DevComponents.DotNetBar.PanelEx(); @@ -104,6 +100,12 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.col_select_product = new System.Windows.Forms.DataGridViewLinkColumn(); this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage(); this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); + this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.colUserName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colSubUserName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colShopNotes = new System.Windows.Forms.DataGridViewTextBoxColumn(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -130,17 +132,18 @@ namespace TemuKJD.KJDForms.ProductSelectForms // // splitContainer1.Panel1 // + this.splitContainer1.Panel1.Controls.Add(this.btnBatchSelect); + this.splitContainer1.Panel1.Controls.Add(this.btnSearch); + this.splitContainer1.Panel1.Controls.Add(this.btnSelect); this.splitContainer1.Panel1.Controls.Add(this.cmbGroup); this.splitContainer1.Panel1.Controls.Add(this.lblGroup); this.splitContainer1.Panel1.Controls.Add(this.btnImportHtml); this.splitContainer1.Panel1.Controls.Add(this.cmbSort); - this.splitContainer1.Panel1.Controls.Add(this.btnSelect); this.splitContainer1.Panel1.Controls.Add(this.txtNotes); this.splitContainer1.Panel1.Controls.Add(this.lblNotes); this.splitContainer1.Panel1.Controls.Add(this.txtSPU); this.splitContainer1.Panel1.Controls.Add(this.label5); this.splitContainer1.Panel1.Controls.Add(this.pnlEmpty); - this.splitContainer1.Panel1.Controls.Add(this.btnSearch); this.splitContainer1.Panel1.Controls.Add(this.txtExtCode); this.splitContainer1.Panel1.Controls.Add(this.label4); this.splitContainer1.Panel1.Controls.Add(this.txtProdName); @@ -158,11 +161,85 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.splitContainer1.SplitterDistance = 70; this.splitContainer1.TabIndex = 1; // - // txtGroup + // btnBatchSelect + // + this.btnBatchSelect.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnBatchSelect.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnBatchSelect.DisabledBackColor = System.Drawing.Color.Empty; + this.btnBatchSelect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnBatchSelect.Location = new System.Drawing.Point(801, 38); + this.btnBatchSelect.Name = "btnBatchSelect"; + this.btnBatchSelect.Size = new System.Drawing.Size(91, 23); + this.btnBatchSelect.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnBatchSelect.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnBatchSelect.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnBatchSelect.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnBatchSelect.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnBatchSelect.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnBatchSelect.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnBatchSelect.Style.GradientAngle = 90; + this.btnBatchSelect.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnBatchSelect.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnBatchSelect.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnBatchSelect.TabIndex = 510; + this.btnBatchSelect.Text = "批量商品直传"; + this.btnBatchSelect.Click += new System.EventHandler(this.btnBatchSelect_Click); + // + // btnSearch + // + 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(647, 9); + this.btnSearch.Name = "btnSearch"; + this.btnSearch.Size = new System.Drawing.Size(56, 23); + 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))))); + this.btnSearch.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnSearch.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnSearch.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnSearch.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnSearch.Style.GradientAngle = 90; + this.btnSearch.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnSearch.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnSearch.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnSearch.TabIndex = 499; + this.btnSearch.Text = "搜索"; + this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click); + // + // btnSelect + // + this.btnSelect.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + 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(1178, 9); + this.btnSelect.Name = "btnSelect"; + this.btnSelect.Size = new System.Drawing.Size(91, 23); + 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))))); + this.btnSelect.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnSelect.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnSelect.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnSelect.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnSelect.Style.GradientAngle = 90; + this.btnSelect.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnSelect.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnSelect.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnSelect.TabIndex = 495; + this.btnSelect.Text = "认领选中商品"; + this.btnSelect.Visible = false; + this.btnSelect.Click += new System.EventHandler(this.btnSelect_Click); + // + // cmbGroup // this.cmbGroup.FormattingEnabled = true; this.cmbGroup.Location = new System.Drawing.Point(361, 37); - this.cmbGroup.Name = "txtGroup"; + this.cmbGroup.Name = "cmbGroup"; this.cmbGroup.Size = new System.Drawing.Size(121, 25); this.cmbGroup.TabIndex = 500; // @@ -181,9 +258,9 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.btnImportHtml.Cursor = System.Windows.Forms.Cursors.Hand; this.btnImportHtml.DisabledBackColor = System.Drawing.Color.Empty; this.btnImportHtml.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnImportHtml.Location = new System.Drawing.Point(950, 7); + this.btnImportHtml.Location = new System.Drawing.Point(801, 9); this.btnImportHtml.Name = "btnImportHtml"; - this.btnImportHtml.Size = new System.Drawing.Size(91, 26); + this.btnImportHtml.Size = new System.Drawing.Size(91, 23); this.btnImportHtml.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnImportHtml.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnImportHtml.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -205,30 +282,12 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.cmbSort.Items.AddRange(new object[] { "入库时间", "认领总数"}); - this.cmbSort.Location = new System.Drawing.Point(833, 8); + this.cmbSort.Location = new System.Drawing.Point(520, 37); this.cmbSort.Name = "cmbSort"; - this.cmbSort.Size = new System.Drawing.Size(79, 25); + this.cmbSort.Size = new System.Drawing.Size(121, 25); this.cmbSort.TabIndex = 448; this.cmbSort.Text = "入库时间"; // - // btnSelect - // - this.btnSelect.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - 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(1171, 7); - this.btnSelect.Margin = new System.Windows.Forms.Padding(2); - this.btnSelect.Name = "btnSelect"; - this.btnSelect.Size = new System.Drawing.Size(91, 26); - this.btnSelect.TabIndex = 444; - this.btnSelect.Text = "认领选中商品"; - this.btnSelect.UseVisualStyleBackColor = false; - this.btnSelect.Visible = false; - this.btnSelect.Click += new System.EventHandler(this.btnSelect_Click); - // // txtNotes // this.txtNotes.Location = new System.Drawing.Point(202, 38); @@ -261,23 +320,14 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.label5.TabIndex = 435; this.label5.Text = "SPU："; // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(169, 12); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(43, 17); - this.label1.TabIndex = 433; - this.label1.Text = "SKC："; - // // pnlEmpty // this.pnlEmpty.CanvasColor = System.Drawing.SystemColors.Control; this.pnlEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.pnlEmpty.DisabledBackColor = System.Drawing.Color.Empty; - this.pnlEmpty.Location = new System.Drawing.Point(709, 7); + this.pnlEmpty.Location = new System.Drawing.Point(709, 9); this.pnlEmpty.Name = "pnlEmpty"; - this.pnlEmpty.Size = new System.Drawing.Size(56, 26); + this.pnlEmpty.Size = new System.Drawing.Size(56, 23); this.pnlEmpty.Style.Alignment = System.Drawing.StringAlignment.Center; this.pnlEmpty.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); this.pnlEmpty.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); @@ -294,22 +344,6 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.pnlEmpty.Text = "清空条件"; this.pnlEmpty.Click += new System.EventHandler(this.pnlEmpty_Click); // - // btnSearch - // - this.btnSearch.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnSearch.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnSearch.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnSearch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSearch.ForeColor = System.Drawing.Color.White; - this.btnSearch.Location = new System.Drawing.Point(648, 7); - this.btnSearch.Margin = new System.Windows.Forms.Padding(2); - this.btnSearch.Name = "btnSearch"; - this.btnSearch.Size = new System.Drawing.Size(56, 26); - this.btnSearch.TabIndex = 424; - this.btnSearch.Text = "搜索"; - this.btnSearch.UseVisualStyleBackColor = false; - this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click); - // // txtExtCode // this.txtExtCode.Location = new System.Drawing.Point(44, 38); @@ -333,32 +367,14 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.txtProdName.Size = new System.Drawing.Size(121, 23); this.txtProdName.TabIndex = 427; // - // label3 - // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(486, 12); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(44, 17); - this.label3.TabIndex = 428; - this.label3.Text = "标题："; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(327, 12); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(44, 17); - this.label2.TabIndex = 426; - this.label2.Text = "类目："; - // // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(776, 12); + this.label6.Location = new System.Drawing.Point(486, 41); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(68, 17); + this.label6.Size = new System.Drawing.Size(44, 17); this.label6.TabIndex = 449; - this.label6.Text = "排序方式："; + this.label6.Text = "排序："; // // txtCat // @@ -374,6 +390,33 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.txtSKC.Size = new System.Drawing.Size(121, 23); this.txtSKC.TabIndex = 432; // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(169, 12); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(43, 17); + this.label1.TabIndex = 433; + this.label1.Text = "SKC："; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(327, 12); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(44, 17); + this.label2.TabIndex = 426; + this.label2.Text = "类目："; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(486, 12); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(44, 17); + this.label3.TabIndex = 428; + this.label3.Text = "标题："; + // // splitContainer2 // this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill; @@ -412,6 +455,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms // this.panel2.Anchor = System.Windows.Forms.AnchorStyles.Top; this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel2.Controls.Add(this.lbxProdName); this.panel2.Controls.Add(this.lblProdName); this.panel2.Controls.Add(this.numCount); this.panel2.Controls.Add(this.dgvSelectShop); @@ -422,23 +466,33 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.panel2.Controls.Add(this.label7); this.panel2.Controls.Add(this.txtShopId); this.panel2.Controls.Add(this.label8); - this.panel2.Location = new System.Drawing.Point(406, 54); + this.panel2.Location = new System.Drawing.Point(406, 53); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(467, 246); + this.panel2.Size = new System.Drawing.Size(508, 447); this.panel2.TabIndex = 8; this.panel2.Visible = false; // + // lbxProdName + // + this.lbxProdName.FormattingEnabled = true; + this.lbxProdName.ItemHeight = 17; + this.lbxProdName.Location = new System.Drawing.Point(19, 258); + this.lbxProdName.Name = "lbxProdName"; + this.lbxProdName.Size = new System.Drawing.Size(468, 140); + this.lbxProdName.TabIndex = 525; + // // lblProdName // - this.lblProdName.Location = new System.Drawing.Point(363, 46); + this.lblProdName.AutoSize = true; + this.lblProdName.Location = new System.Drawing.Point(16, 241); this.lblProdName.Name = "lblProdName"; - this.lblProdName.Size = new System.Drawing.Size(90, 123); + this.lblProdName.Size = new System.Drawing.Size(56, 17); this.lblProdName.TabIndex = 515; this.lblProdName.Text = "商品名称"; // // numCount // - this.numCount.Location = new System.Drawing.Point(363, 175); + this.numCount.Location = new System.Drawing.Point(297, 408); this.numCount.Maximum = new decimal(new int[] { 1000, 0, @@ -459,6 +513,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.dgvSelectShop.AllowUserToDeleteRows = false; dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke; this.dgvSelectShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + this.dgvSelectShop.AutoRowNumber = true; this.dgvSelectShop.BackgroundColor = System.Drawing.Color.White; this.dgvSelectShop.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; @@ -477,68 +532,23 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.colShopId, this.colShopName, this.colShopNotes}); - this.dgvSelectShop.Location = new System.Drawing.Point(19, 46); + this.dgvSelectShop.Location = new System.Drawing.Point(17, 46); this.dgvSelectShop.Name = "dgvSelectShop"; this.dgvSelectShop.ReadOnly = true; this.dgvSelectShop.RowHeadersWidth = 28; this.dgvSelectShop.RowTemplate.Height = 23; - this.dgvSelectShop.Size = new System.Drawing.Size(338, 184); + this.dgvSelectShop.Size = new System.Drawing.Size(470, 184); this.dgvSelectShop.TabIndex = 504; this.dgvSelectShop.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvSelectShop_CellContentClick); // - // colCheck - // - this.colCheck.HeaderText = "选择"; - this.colCheck.MinimumWidth = 6; - 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; - // - // colUserName - // - this.colUserName.HeaderText = "用户名称"; - this.colUserName.MinimumWidth = 6; - this.colUserName.Name = "colUserName"; - this.colUserName.ReadOnly = true; - this.colUserName.Visible = false; - this.colUserName.Width = 125; - // - // colSubUserName - // - this.colSubUserName.HeaderText = "子账户名称"; - this.colSubUserName.Name = "colSubUserName"; - this.colSubUserName.ReadOnly = true; - this.colSubUserName.Visible = false; - this.colSubUserName.Width = 150; - // - // colShopId - // - this.colShopId.HeaderText = "店铺Id"; - this.colShopId.Name = "colShopId"; - this.colShopId.ReadOnly = true; - // - // colShopName - // - this.colShopName.HeaderText = "店铺名称"; - this.colShopName.Name = "colShopName"; - this.colShopName.ReadOnly = true; - // - // colShopNotes - // - this.colShopNotes.HeaderText = "店铺备注"; - this.colShopNotes.Name = "colShopNotes"; - this.colShopNotes.ReadOnly = true; - // // btnCancel // this.btnCancel.CanvasColor = System.Drawing.SystemColors.Control; this.btnCancel.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnCancel.DisabledBackColor = System.Drawing.Color.Empty; - this.btnCancel.Location = new System.Drawing.Point(411, 204); + this.btnCancel.Location = new System.Drawing.Point(445, 408); this.btnCancel.Name = "btnCancel"; - this.btnCancel.Size = new System.Drawing.Size(42, 26); + this.btnCancel.Size = new System.Drawing.Size(42, 23); this.btnCancel.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnCancel.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); this.btnCancel.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); @@ -561,9 +571,9 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.btnAddToSelectDb.Cursor = System.Windows.Forms.Cursors.Hand; this.btnAddToSelectDb.DisabledBackColor = System.Drawing.Color.Empty; this.btnAddToSelectDb.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnAddToSelectDb.Location = new System.Drawing.Point(363, 204); + this.btnAddToSelectDb.Location = new System.Drawing.Point(397, 408); this.btnAddToSelectDb.Name = "btnAddToSelectDb"; - this.btnAddToSelectDb.Size = new System.Drawing.Size(42, 26); + this.btnAddToSelectDb.Size = new System.Drawing.Size(42, 23); this.btnAddToSelectDb.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnAddToSelectDb.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnAddToSelectDb.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -585,9 +595,9 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.btnGetShop.Cursor = System.Windows.Forms.Cursors.Hand; this.btnGetShop.DisabledBackColor = System.Drawing.Color.Empty; this.btnGetShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnGetShop.Location = new System.Drawing.Point(411, 11); + this.btnGetShop.Location = new System.Drawing.Point(445, 13); this.btnGetShop.Name = "btnGetShop"; - this.btnGetShop.Size = new System.Drawing.Size(42, 26); + this.btnGetShop.Size = new System.Drawing.Size(42, 23); this.btnGetShop.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnGetShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnGetShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -605,15 +615,15 @@ namespace TemuKJD.KJDForms.ProductSelectForms // // txtShopName // - this.txtShopName.Location = new System.Drawing.Point(263, 13); + this.txtShopName.Location = new System.Drawing.Point(279, 13); this.txtShopName.Name = "txtShopName"; - this.txtShopName.Size = new System.Drawing.Size(142, 23); + this.txtShopName.Size = new System.Drawing.Size(160, 23); this.txtShopName.TabIndex = 433; // // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(206, 16); + this.label7.Location = new System.Drawing.Point(222, 16); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(68, 17); this.label7.TabIndex = 434; @@ -621,15 +631,15 @@ namespace TemuKJD.KJDForms.ProductSelectForms // // txtShopId // - this.txtShopId.Location = new System.Drawing.Point(61, 13); + this.txtShopId.Location = new System.Drawing.Point(59, 13); this.txtShopId.Name = "txtShopId"; - this.txtShopId.Size = new System.Drawing.Size(142, 23); + this.txtShopId.Size = new System.Drawing.Size(160, 23); this.txtShopId.TabIndex = 431; // // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(16, 16); + this.label8.Location = new System.Drawing.Point(14, 16); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(56, 17); this.label8.TabIndex = 432; @@ -641,6 +651,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.dgvDbProduct.AllowUserToDeleteRows = false; dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke; this.dgvDbProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3; + this.dgvDbProduct.AutoRowNumber = true; this.dgvDbProduct.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.dgvDbProduct.BackgroundColor = System.Drawing.Color.White; this.dgvDbProduct.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -883,6 +894,50 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.statusBar.Size = new System.Drawing.Size(1278, 25); this.statusBar.TabIndex = 5; // + // colCheck + // + this.colCheck.HeaderText = "选择"; + this.colCheck.MinimumWidth = 6; + 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; + // + // colUserName + // + this.colUserName.HeaderText = "用户名称"; + this.colUserName.MinimumWidth = 6; + this.colUserName.Name = "colUserName"; + this.colUserName.ReadOnly = true; + this.colUserName.Width = 90; + // + // colSubUserName + // + this.colSubUserName.HeaderText = "子账户名称"; + this.colSubUserName.Name = "colSubUserName"; + this.colSubUserName.ReadOnly = true; + this.colSubUserName.Visible = false; + this.colSubUserName.Width = 150; + // + // colShopId + // + this.colShopId.HeaderText = "店铺Id"; + this.colShopId.Name = "colShopId"; + this.colShopId.ReadOnly = true; + // + // colShopName + // + this.colShopName.HeaderText = "店铺名称"; + this.colShopName.Name = "colShopName"; + this.colShopName.ReadOnly = true; + // + // colShopNotes + // + this.colShopNotes.HeaderText = "店铺备注"; + this.colShopNotes.Name = "colShopNotes"; + this.colShopNotes.ReadOnly = true; + // // DbProductListForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -926,7 +981,6 @@ namespace TemuKJD.KJDForms.ProductSelectForms private System.Windows.Forms.TextBox txtSKC; private System.Windows.Forms.Label label1; private DevComponents.DotNetBar.PanelEx pnlEmpty; - private UserControls.ButtonEx btnSearch; private System.Windows.Forms.TextBox txtExtCode; private System.Windows.Forms.Label label4; private System.Windows.Forms.TextBox txtProdName; @@ -937,7 +991,6 @@ namespace TemuKJD.KJDForms.ProductSelectForms private System.Windows.Forms.PictureBox pbLoading; private System.Windows.Forms.TextBox txtNotes; private System.Windows.Forms.Label lblNotes; - private UserControls.ButtonEx btnSelect; private System.Windows.Forms.ComboBox cmbSort; private System.Windows.Forms.Label label6; private DevComponents.DotNetBar.PanelEx btnImportHtml; @@ -950,12 +1003,6 @@ namespace TemuKJD.KJDForms.ProductSelectForms private DevComponents.DotNetBar.PanelEx btnCancel; private DevComponents.DotNetBar.PanelEx btnAddToSelectDb; private UserComponent.DataGridViewEx dgvSelectShop; - private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck; - private System.Windows.Forms.DataGridViewTextBoxColumn colUserName; - private System.Windows.Forms.DataGridViewTextBoxColumn colSubUserName; - private System.Windows.Forms.DataGridViewTextBoxColumn colShopId; - private System.Windows.Forms.DataGridViewTextBoxColumn colShopName; - private System.Windows.Forms.DataGridViewTextBoxColumn colShopNotes; private System.Windows.Forms.NumericUpDown numCount; private System.Windows.Forms.Label lblProdName; private System.Windows.Forms.Label lblGroup; @@ -982,5 +1029,15 @@ namespace TemuKJD.KJDForms.ProductSelectForms private System.Windows.Forms.DataGridViewLinkColumn col_delete; private System.Windows.Forms.DataGridViewLinkColumn col_select_product; private System.Windows.Forms.ComboBox cmbGroup; + private System.Windows.Forms.ListBox lbxProdName; + private DevComponents.DotNetBar.PanelEx btnBatchSelect; + private DevComponents.DotNetBar.PanelEx btnSearch; + private DevComponents.DotNetBar.PanelEx btnSelect; + private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck; + private System.Windows.Forms.DataGridViewTextBoxColumn colUserName; + private System.Windows.Forms.DataGridViewTextBoxColumn colSubUserName; + private System.Windows.Forms.DataGridViewTextBoxColumn colShopId; + private System.Windows.Forms.DataGridViewTextBoxColumn colShopName; + private System.Windows.Forms.DataGridViewTextBoxColumn colShopNotes; } } \ No newline at end of file diff --git a/TEMUKJD/KJDForms/ProductSelectForms/DbProductListForm.cs b/TEMUKJD/KJDForms/ProductSelectForms/DbProductListForm.cs index c4b8263..e85c33c 100644 --- a/TEMUKJD/KJDForms/ProductSelectForms/DbProductListForm.cs +++ b/TEMUKJD/KJDForms/ProductSelectForms/DbProductListForm.cs @@ -59,6 +59,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.lblGroup.Visible = true; this.cmbGroup.Visible = true; this.btnImportHtml.Visible = true; + this.btnBatchSelect.Visible = true; } else { @@ -76,6 +77,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.lblGroup.Visible = false; this.cmbGroup.Visible = false; this.btnImportHtml.Visible = false; + this.btnBatchSelect.Visible = false; } btnSelect.Visible = false; @@ -377,8 +379,9 @@ namespace TemuKJD.KJDForms.ProductSelectForms break; case "商品直传": panel2.Visible = true; - panel2.Tag = dbProduct; - lblProdName.Text = dbProduct.product_name; + panel2.Tag = new List { dbProduct }; + lbxProdName.Items.Clear(); + lbxProdName.Items.Add(dbProduct.product_name); break; case "": dgvDbProduct.Rows[e.RowIndex].Cells["colSelect"].Value = !(bool)dgvDbProduct.Rows[e.RowIndex].Cells["colSelect"].Value; @@ -394,17 +397,19 @@ namespace TemuKJD.KJDForms.ProductSelectForms /// /// 商品上传(直传)次数 /// 数据直传 - private void SelectProduct(ShopLoginInfo selectShop, KJDDBProduct[] prods, int prodSelectCount = 1, bool isDbToDb = false) + private string SelectProduct(ShopLoginInfo selectShop, KJDDBProduct[] prods, int prodSelectCount = 1, bool isDbToDb = false) { if (selectShop == null) { - BaseMsgForm.ShowError("店铺不能为空！"); - return; + if (!isDbToDb) + BaseMsgForm.ShowError("店铺不能为空！"); + return "店铺不能为空！"; } if (prods == null || prods.Count() == 0) { - BaseMsgForm.ShowError("认领商品不能为空！"); - return; + if (!isDbToDb) + BaseMsgForm.ShowError("认领商品不能为空！"); + return "店铺不能为空！"; } Invoke(new Action(() => @@ -455,9 +460,18 @@ namespace TemuKJD.KJDForms.ProductSelectForms var data = UserLogin.GetSignaturex() + "&out_product_id=" + prod.id + "&shop_id=" + selectShop.ShopId + - "&shop_account=" + selectShop.ShopAccount + - "&main_user_name=" + selectShop.UserName + - "&sub_user_name=" + selectShop.SubUserName; + "&shop_account=" + selectShop.ShopAccount; + data += "&main_user_name=" + selectShop.UserName; + data += "&sub_user_name=" + selectShop.SubUserName; + //if (!isDbToDb) + //{ + // data += "&main_user_name=" + selectShop.UserName; + // data += "&sub_user_name=" + selectShop.SubUserName; + //} + //else + //{ + // data += "&main_user_name=" + BaseClass.UserName; + //} if (!isDbToDb) // 管理员发起的数据直传不消耗次数，不计算认领次数 data += "&add_product_remaining=" + selectShop.AddProductRemaining; data += "&add_fission_product_name=" + GetHtml.UrlEncodeUtf8(fissionProductName) + @@ -496,17 +510,23 @@ namespace TemuKJD.KJDForms.ProductSelectForms } if (!string.IsNullOrEmpty(errorMsg)) { - Invoke(new Action(() => + if (!isDbToDb) { - BaseMsgForm.ShowError("认领商品失败，请重试！\r\n" + errorMsg.Trim()); - })); + Invoke(new Action(() => + { + BaseMsgForm.ShowError("认领商品失败，请重试！\r\n" + errorMsg.Trim()); + })); + } } else { - Invoke(new Action(() => + if (!isDbToDb) { - BaseMsgForm.ShowInfo("认领商品成功！"); - })); + Invoke(new Action(() => + { + BaseMsgForm.ShowInfo("认领商品成功！"); + })); + } } Invoke(new Action(() => { @@ -514,6 +534,8 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.statusBar.lblTaskStatus.Text = "认领完成"; this.statusBar.UpdateProgressBar(prods.Length); })); + + return errorMsg.Trim(); } public static string GetFissionProductName(KJDDBProduct prod) @@ -1157,27 +1179,57 @@ namespace TemuKJD.KJDForms.ProductSelectForms private void btnAddToSelectDb_Click(object sender, EventArgs e) { - KJDDBProduct dbProduct = panel2.Tag as KJDDBProduct; - if (dbProduct == null) + List dbProductLst = panel2.Tag as List; + if (dbProductLst == null) return; - var selectShopId = this.dgvSelectShop.Rows.Cast() - .FirstOrDefault(r => r.Cells["colCheck"].Value.ParseToBool() == true)?.Cells["colShopId"].Value.ParseToString(); - var selectShop = lstAdminShopInfo.FirstOrDefault(s => s.ShopId == selectShopId); - if (!string.IsNullOrEmpty(selectShopId) && selectShop != null) - { - this.btnSelect.Enabled = false; - Task.Run(() => { - SelectProduct(selectShop, new KJDDBProduct[] { dbProduct }, numCount.Value.ParseToInt(), true); - Invoke(new Action(() => - { - this.btnSelect.Enabled = true; - })); - }); - } - else + var selectShopIds = this.dgvSelectShop.Rows.Cast() + .Where(r => r.Cells["colCheck"].Value.ParseToBool() == true).Select(r => r.Cells["colShopId"].Value.ParseToString()).ToList(); + var selectUserNames = this.dgvSelectShop.Rows.Cast() + .Where(r => r.Cells["colCheck"].Value.ParseToBool() == true).Select(r => r.Cells["colUserName"].Value.ParseToString()).ToList(); + var selectShopLst = lstAdminShopInfo.Where(s => selectShopIds.Contains(s.ShopId) && selectUserNames.Contains(s.UserName)).ToList(); + if (selectShopLst.Count <= 0) { BaseMsgForm.ShowError("未选择店铺！"); + return; } + this.btnSelect.Enabled = false; + Task.Run(() => + { + string result = ""; + foreach (var shop in selectShopLst) + { + var rst = SelectProduct(shop, dbProductLst.ToArray(), numCount.Value.ParseToInt(), true); + if (!rst.IsNullOrEmpty()) + { + result += rst + "\r\n"; + } + } + Invoke(new Action(() => + { + if (!string.IsNullOrEmpty(result)) + BaseMsgForm.ShowError("添加商品直传发生以下错误：\r\n" + result); + else + BaseMsgForm.ShowInfo("添加商品直传成功！"); + this.btnSelect.Enabled = true; + })); + }); + } + + private void btnBatchSelect_Click(object sender, EventArgs e) + { + var dbIds = this.dgvDbProduct.Rows.Cast().Where(r => r.Cells["colSelect"].Value.ParseToBool() == true).Select(r => r.Cells["col_db_id"].Value.ParseToString()).ToList(); + if (dbIds.Count <= 0) + { + BaseMsgForm.ShowError("请至少选择一条商品数据！"); + return; + } + var dbProductLst = lstTemuDbProduct.Where(p => dbIds.Contains(p.id.ToString())).ToList(); + + panel2.Visible = true; + panel2.Tag = dbProductLst; + lbxProdName.Items.Clear(); + foreach(var dbProd in dbProductLst) + lbxProdName.Items.Add(dbProd.product_name); } } } diff --git a/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs b/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs index 651fe92..8edfba2 100644 --- a/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs +++ b/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs @@ -639,6 +639,11 @@ namespace TemuKJD.KJDForms.ProductSelectForms Invoke(new Action(() => { row.Cells["colOpResult"].Value = "店铺" + shop.LoginStatus; + var rows = dgvSelectProduct.Rows.Cast().Where(r => r.Cells["colSupplierId"].Value.ParseToString() == prod.shop_id).ToList(); + foreach (var r in rows) + { + r.Cells["colLogin"].Value = "登录"; + } })); continue; } @@ -648,19 +653,15 @@ namespace TemuKJD.KJDForms.ProductSelectForms Invoke(new Action(() => { row.Cells["colOpResult"].Value = "店铺" + shop.LoginStatus2; + var rows = dgvSelectProduct.Rows.Cast().Where(r => r.Cells["colSupplierId"].Value.ParseToString() == prod.shop_id).ToList(); + foreach (var r in rows) + { + r.Cells["colLogin"].Value = "登录"; + } })); continue; } - //if (prod.status != "待上传") - //{ - // Invoke(new Action(() => - // { - // row.Cells["colOpResult"].Value = "选品商品" + prod.status; - // })); - // continue; - //} - var temuDBProd = GetProductDetail(prod.out_product_Id.ToString()); if (temuDBProd == null || temuDBProd.id == 0) { @@ -1733,7 +1734,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms { string productId = prodInfo.productId.ParseToString(); string specId = skuInfo.productSkuSpecList[0].specId.ParseToString(); - var aiSkuImgLst = DouBaoImgCefForm.GetSkuImgList(productId, specId, 5, true); + var aiSkuImgLst = DouBaoImgCefForm.GetSkuImgList(productId, specId, 3, true); // 随机获取3张sku的ai图片 if (aiSkuImgLst.Count > 0) { aiImgInfoList.AddRange(aiSkuImgLst); @@ -1759,7 +1760,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms if (aiSkuImgInfo != null) { var imgUrlRst = aiSkuImgInfo.img_url; - if (string.IsNullOrEmpty(imgUrlRst)) + if (string.IsNullOrWhiteSpace(imgUrlRst)) { imgUrlRst = UploadAiSkuImg(shop, prodParam.productDraftId.ParseToString(), aiSkuImgInfo.img_base64, aiSkuImgInfo.img_md5); if (imgUrlRst.Contains("\"success\":false")) @@ -2471,9 +2472,9 @@ namespace TemuKJD.KJDForms.ProductSelectForms var videoBaseUrl = BaseRegex.GetStringJson(ref uploadImgRst, "url"); if (string.IsNullOrEmpty(videoBaseUrl)) { - var error = BaseRegex.GetStringJson(ref videoBaseUrl, "errorMsg"); + var error = BaseRegex.GetStringJson(ref uploadImgRst, "errorMsg"); if (string.IsNullOrEmpty(error)) - error = BaseRegex.GetStringJson(ref videoBaseUrl, "error_msg"); + error = BaseRegex.GetStringJson(ref uploadImgRst, "error_msg"); return "{\"success\":false,\"status\":\"未上传\"," + "\"productDraftId\":\"" + productDraftId + "\"," + "\"errMsg\":\"草稿箱上传失败，视频文件上传失败 " + error + "\"}";