diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs
index 6dead27..cd16158 100644
--- a/AllBase/BaseClass.cs
+++ b/AllBase/BaseClass.cs
@@ -27,7 +27,7 @@ namespace AllBase
///
/// 版本ID
///
- public static int VersionCount = 652;
+ public static int VersionCount = 656;
//public static int VersionCount = 613;
///
diff --git a/TEMUKJD/KJD.csproj b/TEMUKJD/KJD.csproj
index c14b737..478b198 100644
--- a/TEMUKJD/KJD.csproj
+++ b/TEMUKJD/KJD.csproj
@@ -170,6 +170,12 @@
AdminProductPriceCheckForm.cs
+
+ Form
+
+
+ ProductChangePriceForm.cs
+
Form
@@ -826,6 +832,9 @@
AdminProductPriceCheckForm.cs
+
+ ProductChangePriceForm.cs
+
PurchasePriceForm.cs
diff --git a/TEMUKJD/KJDForms/ProductForms/ProductChangePriceForm.Designer.cs b/TEMUKJD/KJDForms/ProductForms/ProductChangePriceForm.Designer.cs
new file mode 100644
index 0000000..06f348f
--- /dev/null
+++ b/TEMUKJD/KJDForms/ProductForms/ProductChangePriceForm.Designer.cs
@@ -0,0 +1,529 @@
+
+namespace TemuKJD.KJDForms.ProductForms
+{
+ partial class ProductChangePriceForm
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ 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.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ProductChangePriceForm));
+ this.panel2 = new System.Windows.Forms.Panel();
+ this.splitContainer1 = new System.Windows.Forms.SplitContainer();
+ this.txtReason = new System.Windows.Forms.TextBox();
+ this.label4 = new System.Windows.Forms.Label();
+ this.btnReset = new DevComponents.DotNetBar.PanelEx();
+ this.btnMultiChangePrice = new DevComponents.DotNetBar.PanelEx();
+ this.numDiscount = new System.Windows.Forms.NumericUpDown();
+ this.label3 = new System.Windows.Forms.Label();
+ this.label1 = new System.Windows.Forms.Label();
+ this.chkPriceDiff = new TemuKJD.UserComponent.UcCheckBox(this.components);
+ this.chkDiscount = new TemuKJD.UserComponent.UcCheckBox(this.components);
+ this.label2 = new System.Windows.Forms.Label();
+ this.cmbChangePriceReason = new System.Windows.Forms.ComboBox();
+ this.numPriceDiff = new System.Windows.Forms.NumericUpDown();
+ this.splitContainer2 = new System.Windows.Forms.SplitContainer();
+ this.pbLoading = new System.Windows.Forms.PictureBox();
+ this.dgvOrder = new TemuKJD.UserComponent.DataGridViewEx();
+ this.btnSave = new DevComponents.DotNetBar.PanelEx();
+ this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+ this.colSpu = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.colSkc = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.colSkuId = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.colSkuName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.colAdjustPriceTypeId = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.colType = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.colSkuPrice = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.colSkuNewPrice = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.colUseArea = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.colAvailableBalance = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.panel2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
+ this.splitContainer1.Panel1.SuspendLayout();
+ this.splitContainer1.Panel2.SuspendLayout();
+ this.splitContainer1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.numDiscount)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.numPriceDiff)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit();
+ this.splitContainer2.Panel1.SuspendLayout();
+ this.splitContainer2.Panel2.SuspendLayout();
+ this.splitContainer2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.dgvOrder)).BeginInit();
+ this.SuspendLayout();
+ //
+ // panel2
+ //
+ this.panel2.BackColor = System.Drawing.Color.White;
+ this.panel2.Controls.Add(this.splitContainer1);
+ this.panel2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.panel2.Location = new System.Drawing.Point(1, 33);
+ this.panel2.Name = "panel2";
+ this.panel2.Size = new System.Drawing.Size(857, 625);
+ this.panel2.TabIndex = 1;
+ //
+ // splitContainer1
+ //
+ this.splitContainer1.BackColor = System.Drawing.Color.White;
+ this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
+ this.splitContainer1.Location = new System.Drawing.Point(0, 0);
+ this.splitContainer1.Name = "splitContainer1";
+ this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal;
+ //
+ // splitContainer1.Panel1
+ //
+ this.splitContainer1.Panel1.Controls.Add(this.txtReason);
+ this.splitContainer1.Panel1.Controls.Add(this.label4);
+ this.splitContainer1.Panel1.Controls.Add(this.btnReset);
+ this.splitContainer1.Panel1.Controls.Add(this.btnMultiChangePrice);
+ this.splitContainer1.Panel1.Controls.Add(this.numDiscount);
+ this.splitContainer1.Panel1.Controls.Add(this.label3);
+ this.splitContainer1.Panel1.Controls.Add(this.label1);
+ this.splitContainer1.Panel1.Controls.Add(this.chkPriceDiff);
+ this.splitContainer1.Panel1.Controls.Add(this.chkDiscount);
+ this.splitContainer1.Panel1.Controls.Add(this.label2);
+ this.splitContainer1.Panel1.Controls.Add(this.cmbChangePriceReason);
+ this.splitContainer1.Panel1.Controls.Add(this.numPriceDiff);
+ //
+ // splitContainer1.Panel2
+ //
+ this.splitContainer1.Panel2.Controls.Add(this.splitContainer2);
+ this.splitContainer1.Panel2.Margin = new System.Windows.Forms.Padding(4);
+ this.splitContainer1.Size = new System.Drawing.Size(857, 625);
+ this.splitContainer1.SplitterDistance = 79;
+ this.splitContainer1.TabIndex = 37;
+ this.splitContainer1.TabStop = false;
+ //
+ // txtNotes
+ //
+ this.txtReason.Location = new System.Drawing.Point(69, 42);
+ this.txtReason.Name = "txtNotes";
+ this.txtReason.Size = new System.Drawing.Size(347, 23);
+ this.txtReason.TabIndex = 472;
+ //
+ // label4
+ //
+ this.label4.AutoSize = true;
+ this.label4.Location = new System.Drawing.Point(36, 45);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(32, 17);
+ this.label4.TabIndex = 471;
+ this.label4.Text = "备注";
+ //
+ // btnReset
+ //
+ this.btnReset.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.btnReset.CanvasColor = System.Drawing.SystemColors.Control;
+ this.btnReset.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+ this.btnReset.DisabledBackColor = System.Drawing.Color.Empty;
+ this.btnReset.Location = new System.Drawing.Point(754, 42);
+ this.btnReset.Name = "btnReset";
+ this.btnReset.Size = new System.Drawing.Size(91, 23);
+ this.btnReset.Style.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnReset.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
+ this.btnReset.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
+ this.btnReset.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+ this.btnReset.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnReset.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+ this.btnReset.Style.GradientAngle = 90;
+ this.btnReset.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnReset.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnReset.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnReset.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnReset.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
+ this.btnReset.TabIndex = 464;
+ this.btnReset.Text = "重置选中";
+ this.btnReset.Click += new System.EventHandler(this.btnReset_Click);
+ //
+ // btnMultiChangePrice
+ //
+ this.btnMultiChangePrice.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+ this.btnMultiChangePrice.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.btnMultiChangePrice.DisabledBackColor = System.Drawing.Color.Empty;
+ this.btnMultiChangePrice.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.btnMultiChangePrice.Location = new System.Drawing.Point(754, 13);
+ this.btnMultiChangePrice.Name = "btnMultiChangePrice";
+ this.btnMultiChangePrice.Size = new System.Drawing.Size(91, 23);
+ this.btnMultiChangePrice.Style.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnMultiChangePrice.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnMultiChangePrice.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnMultiChangePrice.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+ this.btnMultiChangePrice.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+ this.btnMultiChangePrice.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
+ this.btnMultiChangePrice.Style.ForeColor.Color = System.Drawing.Color.White;
+ this.btnMultiChangePrice.Style.GradientAngle = 90;
+ this.btnMultiChangePrice.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnMultiChangePrice.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+ this.btnMultiChangePrice.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+ this.btnMultiChangePrice.TabIndex = 439;
+ this.btnMultiChangePrice.Text = "批量填写选中";
+ this.btnMultiChangePrice.Click += new System.EventHandler(this.btnMultiChangePrice_Click);
+ //
+ // numDiscount
+ //
+ this.numDiscount.DecimalPlaces = 2;
+ this.numDiscount.Location = new System.Drawing.Point(641, 42);
+ this.numDiscount.Maximum = new decimal(new int[] {
+ 10,
+ 0,
+ 0,
+ 0});
+ this.numDiscount.Name = "numDiscount";
+ this.numDiscount.Size = new System.Drawing.Size(86, 23);
+ this.numDiscount.TabIndex = 465;
+ this.numDiscount.Value = new decimal(new int[] {
+ 10,
+ 0,
+ 0,
+ 0});
+ //
+ // label3
+ //
+ this.label3.AutoSize = true;
+ this.label3.Location = new System.Drawing.Point(729, 45);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(20, 17);
+ this.label3.TabIndex = 457;
+ this.label3.Text = "折";
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(584, 45);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(56, 17);
+ this.label1.TabIndex = 456;
+ this.label1.Text = "商品折扣";
+ //
+ // chkPriceDiff
+ //
+ this.chkPriceDiff.AutoSize = true;
+ this.chkPriceDiff.Location = new System.Drawing.Point(668, 13);
+ this.chkPriceDiff.Name = "chkPriceDiff";
+ this.chkPriceDiff.Size = new System.Drawing.Size(87, 21);
+ this.chkPriceDiff.TabIndex = 455;
+ this.chkPriceDiff.Text = "按差额降价";
+ this.chkPriceDiff.UseVisualStyleBackColor = true;
+ this.chkPriceDiff.CheckedChanged += new System.EventHandler(this.chkPriceDiff_CheckedChanged);
+ //
+ // chkDiscount
+ //
+ this.chkDiscount.AutoSize = true;
+ this.chkDiscount.Checked = true;
+ this.chkDiscount.CheckState = System.Windows.Forms.CheckState.Checked;
+ this.chkDiscount.Location = new System.Drawing.Point(587, 13);
+ this.chkDiscount.Name = "chkDiscount";
+ this.chkDiscount.Size = new System.Drawing.Size(87, 21);
+ this.chkDiscount.TabIndex = 454;
+ this.chkDiscount.Text = "按折扣降价";
+ this.chkDiscount.UseVisualStyleBackColor = true;
+ this.chkDiscount.CheckedChanged += new System.EventHandler(this.chkDiscount_CheckedChanged);
+ //
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.Location = new System.Drawing.Point(12, 15);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(56, 17);
+ this.label2.TabIndex = 453;
+ this.label2.Text = "调价原因";
+ //
+ // cmbChangePriceReason
+ //
+ this.cmbChangePriceReason.FormattingEnabled = true;
+ this.cmbChangePriceReason.Items.AddRange(new object[] {
+ "降价清仓",
+ "降价提升竞争力",
+ "促销",
+ "促销-商品有滞销风险,调申报价可促销变现。拒绝导致长期滞销,退供成本由商家承担。",
+ "爆款调价"});
+ this.cmbChangePriceReason.Location = new System.Drawing.Point(69, 11);
+ this.cmbChangePriceReason.Name = "cmbChangePriceReason";
+ this.cmbChangePriceReason.Size = new System.Drawing.Size(153, 25);
+ this.cmbChangePriceReason.TabIndex = 452;
+ this.cmbChangePriceReason.Text = "降价提升竞争力";
+ //
+ // numPriceDiff
+ //
+ this.numPriceDiff.DecimalPlaces = 2;
+ this.numPriceDiff.Location = new System.Drawing.Point(492, 42);
+ this.numPriceDiff.Maximum = new decimal(new int[] {
+ 9999,
+ 0,
+ 0,
+ 0});
+ this.numPriceDiff.Name = "numPriceDiff";
+ this.numPriceDiff.Size = new System.Drawing.Size(86, 23);
+ this.numPriceDiff.TabIndex = 0;
+ this.numPriceDiff.Visible = false;
+ //
+ // splitContainer2
+ //
+ this.splitContainer2.BackColor = System.Drawing.Color.White;
+ this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.splitContainer2.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
+ this.splitContainer2.Location = new System.Drawing.Point(0, 0);
+ this.splitContainer2.Name = "splitContainer2";
+ this.splitContainer2.Orientation = System.Windows.Forms.Orientation.Horizontal;
+ //
+ // splitContainer2.Panel1
+ //
+ this.splitContainer2.Panel1.BackColor = System.Drawing.Color.White;
+ this.splitContainer2.Panel1.Controls.Add(this.pbLoading);
+ this.splitContainer2.Panel1.Controls.Add(this.dgvOrder);
+ this.splitContainer2.Panel1.Padding = new System.Windows.Forms.Padding(12, 0, 12, 0);
+ //
+ // splitContainer2.Panel2
+ //
+ this.splitContainer2.Panel2.Controls.Add(this.btnSave);
+ this.splitContainer2.Size = new System.Drawing.Size(857, 542);
+ this.splitContainer2.SplitterDistance = 496;
+ this.splitContainer2.TabIndex = 0;
+ //
+ // pbLoading
+ //
+ this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None;
+ this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue;
+ this.pbLoading.Location = new System.Drawing.Point(403, 223);
+ this.pbLoading.Name = "pbLoading";
+ this.pbLoading.Size = new System.Drawing.Size(50, 50);
+ this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.pbLoading.TabIndex = 6;
+ this.pbLoading.TabStop = false;
+ this.pbLoading.Visible = false;
+ //
+ // dgvOrder
+ //
+ this.dgvOrder.AllowUserToAddRows = false;
+ this.dgvOrder.AllowUserToDeleteRows = false;
+ dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke;
+ this.dgvOrder.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+ this.dgvOrder.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
+ this.dgvOrder.BackgroundColor = System.Drawing.Color.White;
+ this.dgvOrder.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.dgvOrder.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+ this.dgvOrder.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.dgvOrder.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+ this.colSelect,
+ this.colSpu,
+ this.colSkc,
+ this.colSkuId,
+ this.colSkuName,
+ this.colAdjustPriceTypeId,
+ this.colType,
+ this.colSkuPrice,
+ this.colSkuNewPrice,
+ this.colUseArea,
+ this.colAvailableBalance});
+ this.dgvOrder.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.dgvOrder.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter;
+ this.dgvOrder.Location = new System.Drawing.Point(12, 0);
+ this.dgvOrder.Name = "dgvOrder";
+ this.dgvOrder.RowHeadersWidth = 36;
+ this.dgvOrder.RowTemplate.Height = 23;
+ this.dgvOrder.Size = new System.Drawing.Size(833, 496);
+ this.dgvOrder.TabIndex = 5;
+ this.dgvOrder.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvOrder_CellContentClick);
+ //
+ // btnSave
+ //
+ this.btnSave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.btnSave.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+ this.btnSave.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.btnSave.DisabledBackColor = System.Drawing.Color.Empty;
+ this.btnSave.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.btnSave.Location = new System.Drawing.Point(754, 3);
+ this.btnSave.Name = "btnSave";
+ this.btnSave.Size = new System.Drawing.Size(91, 23);
+ this.btnSave.Style.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnSave.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnSave.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnSave.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+ this.btnSave.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+ this.btnSave.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
+ this.btnSave.Style.ForeColor.Color = System.Drawing.Color.White;
+ this.btnSave.Style.GradientAngle = 90;
+ this.btnSave.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnSave.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+ this.btnSave.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+ this.btnSave.TabIndex = 435;
+ this.btnSave.TabStop = true;
+ this.btnSave.Text = "确认调价";
+ this.btnSave.Click += new System.EventHandler(this.btnSave_Click);
+ //
+ // colSelect
+ //
+ this.colSelect.FillWeight = 28F;
+ this.colSelect.HeaderText = "选";
+ this.colSelect.Name = "colSelect";
+ this.colSelect.ReadOnly = true;
+ this.colSelect.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+ this.colSelect.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+ //
+ // colSpu
+ //
+ this.colSpu.FillWeight = 90F;
+ this.colSpu.HeaderText = "SPU";
+ this.colSpu.Name = "colSpu";
+ this.colSpu.ReadOnly = true;
+ this.colSpu.Visible = false;
+ //
+ // colSkc
+ //
+ this.colSkc.FillWeight = 80F;
+ this.colSkc.HeaderText = "SKC";
+ this.colSkc.Name = "colSkc";
+ this.colSkc.ReadOnly = true;
+ this.colSkc.Visible = false;
+ //
+ // colSkuId
+ //
+ this.colSkuId.FillWeight = 75F;
+ this.colSkuId.HeaderText = "SKU编号";
+ this.colSkuId.Name = "colSkuId";
+ this.colSkuId.ReadOnly = true;
+ this.colSkuId.Visible = false;
+ //
+ // colSkuName
+ //
+ this.colSkuName.HeaderText = "SKU属性集";
+ this.colSkuName.Name = "colSkuName";
+ this.colSkuName.ReadOnly = true;
+ //
+ // colAdjustPriceTypeId
+ //
+ this.colAdjustPriceTypeId.HeaderText = "申报价格类型id";
+ this.colAdjustPriceTypeId.Name = "colAdjustPriceTypeId";
+ this.colAdjustPriceTypeId.Visible = false;
+ //
+ // colType
+ //
+ this.colType.HeaderText = "申报价格类型";
+ this.colType.Name = "colType";
+ //
+ // colSkuPrice
+ //
+ this.colSkuPrice.FillWeight = 75F;
+ this.colSkuPrice.HeaderText = "原申报价格";
+ this.colSkuPrice.Name = "colSkuPrice";
+ this.colSkuPrice.ReadOnly = true;
+ //
+ // colSkuNewPrice
+ //
+ dataGridViewCellStyle3.Padding = new System.Windows.Forms.Padding(2);
+ this.colSkuNewPrice.DefaultCellStyle = dataGridViewCellStyle3;
+ this.colSkuNewPrice.FillWeight = 75F;
+ this.colSkuNewPrice.HeaderText = "调整后的申报价格";
+ this.colSkuNewPrice.Name = "colSkuNewPrice";
+ this.colSkuNewPrice.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+ //
+ // colUseArea
+ //
+ this.colUseArea.HeaderText = "调整后申报价格适用范围";
+ this.colUseArea.Name = "colUseArea";
+ //
+ // colAvailableBalance
+ //
+ this.colAvailableBalance.FillWeight = 60F;
+ this.colAvailableBalance.HeaderText = "操作";
+ this.colAvailableBalance.Name = "colAvailableBalance";
+ this.colAvailableBalance.ReadOnly = true;
+ this.colAvailableBalance.Visible = false;
+ //
+ // ProductChangePriceForm
+ //
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
+ this.ClientSize = new System.Drawing.Size(859, 659);
+ this.Controls.Add(this.panel2);
+ this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+ this.Name = "ProductChangePriceForm";
+ this.Text = "调整商品价格";
+ this.TitleText = "调整商品价格";
+ this.Load += new System.EventHandler(this.ProductChangePriceForm_Load);
+ this.Controls.SetChildIndex(this.panel2, 0);
+ this.panel2.ResumeLayout(false);
+ this.splitContainer1.Panel1.ResumeLayout(false);
+ this.splitContainer1.Panel1.PerformLayout();
+ this.splitContainer1.Panel2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
+ this.splitContainer1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.numDiscount)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.numPriceDiff)).EndInit();
+ this.splitContainer2.Panel1.ResumeLayout(false);
+ this.splitContainer2.Panel2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit();
+ this.splitContainer2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.dgvOrder)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.Panel panel2;
+ private System.Windows.Forms.SplitContainer splitContainer1;
+ private System.Windows.Forms.ComboBox cmbChangePriceReason;
+ private DevComponents.DotNetBar.PanelEx btnMultiChangePrice;
+ private System.Windows.Forms.NumericUpDown numPriceDiff;
+ private System.Windows.Forms.SplitContainer splitContainer2;
+ private System.Windows.Forms.PictureBox pbLoading;
+ private UserComponent.DataGridViewEx dgvOrder;
+ private DevComponents.DotNetBar.PanelEx btnSave;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.Label label1;
+ private UserComponent.UcCheckBox chkPriceDiff;
+ private UserComponent.UcCheckBox chkDiscount;
+ private DevComponents.DotNetBar.PanelEx btnReset;
+ private System.Windows.Forms.NumericUpDown numDiscount;
+ private System.Windows.Forms.TextBox txtReason;
+ private System.Windows.Forms.Label label4;
+ private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect;
+ private System.Windows.Forms.DataGridViewTextBoxColumn colSpu;
+ private System.Windows.Forms.DataGridViewTextBoxColumn colSkc;
+ private System.Windows.Forms.DataGridViewTextBoxColumn colSkuId;
+ private System.Windows.Forms.DataGridViewTextBoxColumn colSkuName;
+ private System.Windows.Forms.DataGridViewTextBoxColumn colAdjustPriceTypeId;
+ private System.Windows.Forms.DataGridViewTextBoxColumn colType;
+ private System.Windows.Forms.DataGridViewTextBoxColumn colSkuPrice;
+ private System.Windows.Forms.DataGridViewTextBoxColumn colSkuNewPrice;
+ private System.Windows.Forms.DataGridViewTextBoxColumn colUseArea;
+ private System.Windows.Forms.DataGridViewTextBoxColumn colAvailableBalance;
+ }
+}
\ No newline at end of file
diff --git a/TEMUKJD/KJDForms/ProductForms/ProductChangePriceForm.cs b/TEMUKJD/KJDForms/ProductForms/ProductChangePriceForm.cs
new file mode 100644
index 0000000..53f31e5
--- /dev/null
+++ b/TEMUKJD/KJDForms/ProductForms/ProductChangePriceForm.cs
@@ -0,0 +1,521 @@
+using AllBase;
+using AllBase.Model.Result;
+using NaiBa.Util.Extension;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using TemuKJD.BaseForms;
+using TemuKJD.BLL;
+using TemuKJD.Extension;
+using TemuKJD.KJDForms.ShopForms;
+
+namespace TemuKJD.KJDForms.ProductForms
+{
+ public partial class ProductChangePriceForm : LRBaseForm
+ {
+ ShopLoginInfo shop = null;
+ WarehouseProductSubOrderInfo prodInfo = null;
+ Dictionary dicAdjustReason = new Dictionary();
+ public bool AdjustPrice = false;
+
+ public ProductChangePriceForm(ShopLoginInfo _shop, WarehouseProductSubOrderInfo _prod)
+ {
+ InitializeComponent();
+ shop = _shop;
+ prodInfo = _prod;
+ }
+
+ private void ProductChangePriceForm_Load(object sender, EventArgs e)
+ {
+ //https://agentseller.temu.com/api/kiana/mms/gmp/bg/magneto/api/price/priceAdjust/gmpProductBatchAdjustPrice
+ //{"result":{"priceAdjustReasonList":[
+ //{"id":1,"desc":"关闭jit,转备货"},
+ //{"id":2,"desc":"降价清仓"},
+ //{"id":3,"desc":"降价提升竞争力"},
+ //{"id":4,"desc":"促销"},
+ //{"id":14,"desc":"促销-商品有滞销风险,调申报价可促销变现。拒绝导致长期滞销,退供成本由商家承担。"},
+ //{"id":17,"desc":"爆款调价"},
+ //{"id":11,"desc":"jit涨运费"}]},
+ //"success":true,"errorCode":1000000,"errorMsg":null}
+
+ dicAdjustReason["关闭jit,转备货"] = 1;
+ dicAdjustReason["降价清仓"] = 2;
+ dicAdjustReason["降价提升竞争力"] = 3;
+ dicAdjustReason["促销"] = 4;
+ dicAdjustReason["促销-商品有滞销风险,调申报价可促销变现。拒绝导致长期滞销,退供成本由商家承担。"] = 14;
+ dicAdjustReason["爆款调价"] = 17;
+ dicAdjustReason["jit涨运费"] = 11;
+
+
+ this.dgvOrder.AddSelectorColumn("colSelect");
+ numDiscount.Visible = true;
+ numPriceDiff.Location = numDiscount.Location;
+
+ pbLoading.Visible = true;
+ Task.Run(() =>
+ {
+ GetProductAdjust();
+ Invoke(new Action(() =>
+ {
+ pbLoading.Visible = false;
+ }));
+ });
+ }
+
+ void GetProductAdjust()
+ {
+ if (shop == null || prodInfo == null)
+ {
+ BaseMsgForm.ShowError("店铺商品信息为空!");
+ return;
+ }
+
+ #region 检测登录
+ if (shop.LoginStatus2 != "国际版在线")
+ {
+ BaseMsgForm.ShowError("店铺未登录!");
+ return;
+ }
+ ShopListForm.Instance.CheckShopLogin(new string[] { shop.LoginName }, false);
+ if (shop.LoginStatus2 != "国际版在线")
+ {
+ BaseMsgForm.ShowError("店铺未登录!");
+ return;
+ }
+ #endregion
+
+ int tryCount = 0;
+ tryAgain:
+ var adjustRst = QueryProductAdjust(shop, prodInfo.productId);
+ if (adjustRst.Contains("当前操作人数太多,请稍后重试") && tryCount < 5)
+ {
+ tryCount++;
+ Thread.Sleep(Randomx.GetId(500, 1000));
+ goto tryAgain;
+ }
+
+ if (!adjustRst.Contains("\"success\":true"))
+ {
+ string sErr = BaseRegex.GetStringJson(ref adjustRst, "errorMsg");
+ if (string.IsNullOrEmpty(sErr))
+ sErr = adjustRst;
+
+ BaseMsgForm.ShowError("查询失败:" + sErr);
+ return;
+ }
+
+ try
+ {
+ var jObj = JObject.Parse(adjustRst);
+ var objStr = JsonHelper.SerializeObject( jObj["result"]);
+ var adjustPriceInfo = JsonHelper.DeserializeJsonToObject(objStr);
+
+ foreach (var item in adjustPriceInfo.spuAdjustResult[prodInfo.productId.ParseToString()].skcItems[0].items)
+ {
+ int mainRowId = -1;
+ Invoke(new Action(() =>
+ {
+ mainRowId = this.dgvOrder.Rows.Add(
+ true,
+ prodInfo.productId,
+ prodInfo.productSkcId,
+ item.productSkuId,
+ item.skuSpec, //属性集
+ "",
+ "日常价格", //申报价格类型
+ item.originSupplyPrice.ParseToDecimal() / 100m, //原申报价格
+ "", //调整后的申报价格
+ "调价成功之后生成的交易订单",
+ ""
+ );
+ this.dgvOrder.Rows[mainRowId].Height = 50;
+ }));
+ if (item?.marketingActivityPriceDTOList == null)
+ continue;
+ foreach (var activityPriceDTO in item.marketingActivityPriceDTOList)
+ {
+ int rowId = -1;
+ Invoke(new Action(() =>
+ {
+ rowId = this.dgvOrder.Rows.Add(
+ true,
+ prodInfo.productId,
+ prodInfo.productSkcId,
+ item.productSkuId,
+ item.skuSpec, //属性集
+ activityPriceDTO.activityInvitationId, //申报价格类型
+ activityPriceDTO.activityInvitationName, //申报价格类型
+ activityPriceDTO.supplyPrice.ParseToDecimal() / 100m, //原申报价格
+ "", //调整后的申报价格
+ "调价成功之后生成的交易订单",
+ ""
+ );
+ this.dgvOrder.Rows[rowId].Height = 50;
+ }));
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+
+ }
+ }
+
+ string QueryProductAdjust(ShopLoginInfo shop, long spuId)
+ {
+ string url = "https://agentseller.temu.com/api/kiana/mms/magneto/price-adjust/product-adjust-query";
+ string body;
+ body = @"{""items"":[{""supplierId"":" + shop.ShopId + @",""productId"":" + spuId + @"}]}";
+ string refere = "https://agentseller.temu.com/newon/product-select";
+
+ return HttpResponseBLL.PostResponse2(shop, url, body, refere);
+ }
+
+ string BatchAdjustPrice(ShopLoginInfo shop, AdjustParam adjustParam)
+ {
+ string url = "https://agentseller.temu.com/api/kiana/mms/gmp/bg/magneto/api/price/priceAdjust/gmpProductBatchAdjustPrice";
+ string body;
+ body = JsonHelper.SerializeObject(adjustParam);
+ string refere = "https://agentseller.temu.com/newon/product-select";
+
+ return HttpResponseBLL.PostResponse2(shop, url, body, refere);
+ }
+
+ private void chkDiscount_CheckedChanged(object sender, EventArgs e)
+ {
+ this.chkPriceDiff.Checked = !this.chkDiscount.Checked;
+ this.label1.Text = chkDiscount.Checked ? "降价折扣" : "降价差额";
+ this.label3.Text = chkDiscount.Checked ? "折" : "元";
+ this.numPriceDiff.Visible = !chkDiscount.Checked;
+ this.numDiscount.Visible = chkDiscount.Checked;
+ }
+
+ private void chkPriceDiff_CheckedChanged(object sender, EventArgs e)
+ {
+ this.chkDiscount.Checked = !this.chkPriceDiff.Checked;
+ }
+
+ private void btnMultiChangePrice_Click(object sender, EventArgs e)
+ {
+ txtReason.Focus();
+
+ if (chkDiscount.Checked)
+ {
+ foreach (DataGridViewRow row in dgvOrder.Rows)
+ {
+ if (row.Cells["colSelect"].Value.ParseToBool() == true)
+ {
+ row.Cells["colSkuNewPrice"].Value = (row.Cells["colSkuPrice"].Value.ParseToDecimal() * this.numDiscount.Value / 10m).ToString();
+ if (row.Cells["colSkuNewPrice"].Value.ParseToDecimal() >= row.Cells["colSkuPrice"].Value.ParseToDecimal())
+ {
+ row.Cells["colSkuNewPrice"].Value = (row.Cells["colSkuPrice"].Value.ParseToDecimal() - 0.01m).ToString();
+ }
+ }
+ }
+ }
+ else
+ {
+ foreach (DataGridViewRow row in dgvOrder.Rows)
+ {
+ if (row.Cells["colSelect"].Value.ParseToBool() == true)
+ {
+ row.Cells["colSkuNewPrice"].Value = (row.Cells["colSkuPrice"].Value.ParseToDecimal() - this.numPriceDiff.Value).ToString();
+ if (row.Cells["colSkuNewPrice"].Value.ParseToDecimal() >= row.Cells["colSkuPrice"].Value.ParseToDecimal())
+ {
+ row.Cells["colSkuNewPrice"].Value = (row.Cells["colSkuPrice"].Value.ParseToDecimal() - 0.01m).ToString();
+ }
+ }
+ }
+ }
+ }
+
+ private void btnReset_Click(object sender, EventArgs e)
+ {
+ txtReason.Focus();
+
+ foreach (DataGridViewRow row in dgvOrder.Rows)
+ {
+ if (row.Cells["colSelect"].Value.ParseToBool() == true)
+ {
+ row.Cells["colSkuNewPrice"].Value = "";
+ }
+ }
+ }
+
+ private void dgvOrder_CellContentClick(object sender, DataGridViewCellEventArgs e)
+ {
+ if (e.RowIndex < 0 || e.ColumnIndex < 0)
+ return;
+ string columnName = dgvOrder.Columns[e.ColumnIndex].Name;
+ var row = dgvOrder.Rows[e.RowIndex];
+ switch (columnName)
+ {
+ case "colCheck":
+ row.Cells["colCheck"].Value = !row.Cells["colCheck"].Value.ParseToBool();
+ break;
+ }
+ }
+
+ private async void btnSave_Click(object sender, EventArgs e)
+ {
+ txtReason.Focus();
+ if (shop == null || prodInfo == null)
+ {
+ BaseMsgForm.ShowError("店铺商品信息为空!");
+ return;
+ }
+ if (!dgvOrder.Rows.Cast().Any(r => r.Cells["colSelect"].Value.ParseToBool() == true))
+ {
+ BaseMsgForm.ShowError("请至少勾选一项!");
+ return;
+ }
+ foreach (DataGridViewRow r in dgvOrder.Rows)
+ {
+ if (r.Cells["colSelect"].Value.ParseToBool() == true)
+ {
+ if (r.Cells["colSkuNewPrice"].Value.ParseToDecimal() == 0)
+ {
+ BaseMsgForm.ShowError("请输入合理的新申报价格!");
+ return;
+ }
+ }
+ }
+
+ pbLoading.Visible = true;
+
+ #region 检测登录
+ if (shop.LoginStatus2 != "国际版在线")
+ {
+ BaseMsgForm.ShowError("店铺未登录!");
+ pbLoading.Visible = false;
+ return;
+ }
+ ShopListForm.Instance.CheckShopLogin(new string[] { shop.LoginName }, false);
+ if (shop.LoginStatus2 != "国际版在线")
+ {
+ BaseMsgForm.ShowError("店铺未登录!");
+ pbLoading.Visible = false;
+ return;
+ }
+ #endregion
+
+ await Task.Run(() =>
+ {
+ Thread.Sleep(200);
+ });
+ AdjustParam param = new AdjustParam();
+ if (dicAdjustReason.Keys.Contains(cmbChangePriceReason.Text))
+ param.adjustReason = dicAdjustReason[cmbChangePriceReason.Text];
+ if (!string.IsNullOrWhiteSpace(txtReason.Text))
+ param.reason = txtReason.Text.Trim();
+ param.adjustItems = new List();
+ adjustItem adjustItem = new adjustItem()
+ {
+ productId = this.prodInfo.productId,
+ productName = this.prodInfo.productName,
+ productSkcId = this.prodInfo.productSkcId,
+ supplierId = this.shop.ShopId.ParseToLong(),
+ };
+ param.adjustItems.Add(adjustItem);
+ adjustItem.skuAdjustList = new List();
+ foreach (DataGridViewRow row in dgvOrder.Rows)
+ {
+ if (row.Cells["colSelect"].Value.ParseToBool() == true)
+ {
+ var adjItem = new skuAdjust
+ {
+ activityInvitationId = row.Cells["colAdjustPriceTypeId"].Value.ParseToLong(),
+ oldPriceCurrency = "CNY",
+ targetPriceCurrency = "CNY",
+ oldSupplyPrice = (row.Cells["colSkuPrice"].Value.ParseToDecimal() * 100).ParseToInt(),
+ syncPurchasePrice = 1,
+ targetSupplyPrice = (row.Cells["colSkuNewPrice"].Value.ParseToDecimal() * 100).ParseToInt(),
+ skuId = row.Cells["colSkuId"].Value.ParseToLong(),
+ };
+ adjustItem.skuAdjustList.Add(adjItem);
+ if (adjItem.activityInvitationId == 0)
+ adjItem.activityInvitationId = null;
+ }
+ }
+
+ int tryCount = 0;
+ tryAgain:
+ //var adjustBatchRst = "\"success\":true";
+ var adjustBatchRst = BatchAdjustPrice(shop, param);
+ if (adjustBatchRst.Contains("当前操作人数太多,请稍后重试") && tryCount < 5)
+ {
+ tryCount++;
+ Thread.Sleep(Randomx.GetId(500, 1000));
+ goto tryAgain;
+ }
+
+ if (!adjustBatchRst.Contains("\"success\":true"))
+ {
+ string sErr = BaseRegex.GetStringJson(ref adjustBatchRst, "errorMsg");
+ if (string.IsNullOrEmpty(sErr))
+ sErr = adjustBatchRst;
+ sErr = sErr.Replace("\\n", "\n").Replace("\n", "\r\n").Replace("\r\r", "\r");
+
+ BaseMsgForm.ShowError("调价失败:" + sErr);
+ pbLoading.Visible = false;
+ return;
+ }
+
+ AdjustPrice = true;
+ // 更新统计列表的价格
+ foreach (DataGridViewRow row in dgvOrder.Rows)
+ {
+ if (row.Cells["colSelect"].Value.ParseToBool() == true)
+ {
+ var adjItem = new skuAdjust
+ {
+ activityInvitationId = row.Cells["colAdjustPriceTypeId"].Value.ParseToLong(),
+ oldPriceCurrency = "CNY",
+ targetPriceCurrency = "CNY",
+ oldSupplyPrice = (row.Cells["colSkuPrice"].Value.ParseToDecimal() * 100).ParseToInt(),
+ syncPurchasePrice = 1,
+ targetSupplyPrice = (row.Cells["colSkuNewPrice"].Value.ParseToDecimal() * 100).ParseToInt(),
+ skuId = row.Cells["colSkuId"].Value.ParseToLong(),
+ };
+ if (adjItem.activityInvitationId == 0)
+ {
+ var sku = prodInfo.skuQuantityDetailList.FirstOrDefault(s => s.productSkuId.ParseToLong() == adjItem.skuId);
+ if (sku != null)
+ sku.supplierPrice = adjItem.targetSupplyPrice;
+ }
+ }
+ }
+ BaseMsgForm.ShowInfo("调价成功!");
+ pbLoading.Visible = false;
+ this.Close();
+ }
+ }
+
+ public class AdjustPriceInfo
+ {
+ public Dictionary spuAdjustResult { get; set; } // key spu:543806635
+ public Dictionary adjustResult { get; set; } // key skc:1278480907
+ public object hasSelectAutoPassRights { get; set; }
+ }
+
+ public class spuAdjustResultInfo
+ {
+ public long? supplierId { get; set; }
+ public object semiHostedBindSiteIdList { get; set; }
+ public long? productId { get; set; }
+ public List skcItems { get; set; }
+ public bool? apparel { get; set; } // false,
+ public bool? isBatchSkcAdjustPrice { get; set; } // false,
+ public bool? supportShutdownJustInTimeAndStockUp { get; set; } // false,
+ public bool? isShoe { get; set; } // null,
+ public bool? semiHosted { get; set; } // false,
+ public object semiHostedBindSiteNameList { get; set; } // null
+
+ }
+
+ public class skcItemInfo
+ {
+ public string imageUrl { get; set; } // "https://img.kwcdn.com/product/fancy/ae03173d-641a-4895-b25c-5ce13bd544d4.jpg"
+ public jitRaiseInfo jitRaiseInfo { get; set; }
+ public long? productSkcId { get; set; } // 1278480907
+ public List items { get; set; }
+ public bool? supportShutdownJustInTimeAndStockUp { get; set; } // false
+ public string spec { get; set; } // "black"
+ }
+
+ public class jitRaiseInfo
+ {
+ public object notApparelSkuJitPriceInfo { get; set; } // null,
+ public string canNotApplyReason { get; set; } // "当前商品暂不支持涨JIT运费",
+ public object notApparelSkuNewestStatus { get; set; } // null,
+ public bool? canApplyJitRaise { get; set; } // false,
+ public object apparelSkcJitPriceInfo { get; set; } // null,
+ public object hasDownOrderAfterJitRaise { get; set; } // null,
+ public bool? isShowJitRaise { get; set; } // false,
+ public object apparelNewestStatus { get; set; } // null
+ }
+ public class itemInfo
+ {
+ public object orderStatus { get; set; } // null,
+ public object targetSupplyPrice { get; set; } // null,
+ public object forbid { get; set; } // null,
+ public int? priceBeforeExchange { get; set; } // 3384,
+ public object punishInfo { get; set; } // null,
+ public object forbidMsg { get; set; } // null,
+ public string currencyName { get; set; } // "人民币",
+ public int? reviewSupplyPrice { get; set; } // 7356,
+ public object suggestSupplyPrice { get; set; } // null,
+ public int? originSupplyPrice { get; set; } // 3384,
+ public bool syncPurchaseHitGray { get; set; } // true,
+ public object syncPurchasePrice { get; set; } // null,
+ public int? limitRemindSupplyPrice { get; set; } // 4384,
+ public string targetPriceCurrency { get; set; } // "CNY",
+ public long? productSkuId { get; set; } // 1922741923,
+ public string skuSpec { get; set; } // "black",
+ public object exchangeDesc { get; set; } // null,
+ public object supplyPriceCNY { get; set; } // null,
+ public string priceCurrency { get; set; } // "CNY",
+ public string specName { get; set; } // "black",
+ public object suggestPriceCurrency { get; set; } // null,
+ public List marketingActivityPriceDTOList { get; set; }
+ public object forbidTag { get; set; } // null,
+ public object ratio { get; set; } // null
+ }
+
+ public class marketingActivityPriceDTOInfo
+ {
+ public int? supplyPrice { get; set; } // 2368,
+ public long? activityEndTime { get; set; } // 1762481729822,
+ public long? activityInvitationId { get; set; } // 2510080228784679,
+ public string activityInvitationName { get; set; } // "活动价格-清仓甩卖",
+ public long? activityStartTime { get; set; } // 1759630529822,
+ public long? targetSupplyPrice { get; set; } // null,
+ public long? afterSupplyPrice { get; set; } // null
+ }
+
+ public class adjustResultInfo
+ {
+ public long? supplierId { get; set; } // 634418214768016
+ public List skuPriceList { get; set; }
+ public long? productId { get; set; } // 543806635
+ public bool? apparel { get; set; } // false
+ public long? productSkcId { get; set; } // 1278480907
+ public bool? supportShutdownJustInTimeAndStockUp { get; set; }
+ public bool? isShoe { get; set; } // null
+ }
+
+ public class AdjustParam
+ {
+ public int? adjustReason { get; set; }
+ public string reason { get; set; }
+ public List adjustItems { get; set; }
+ }
+
+ public class adjustItem
+ {
+ public string productName { get; set; }
+ public long? productSkcId { get; set; }
+ public List skuAdjustList { get; set; }
+ public long? productId { get; set; } // 202140159,
+ public long? supplierId { get; set; } // 634418216147124
+ }
+
+ public class skuAdjust
+ {
+ public long? activityInvitationId { get; set; } // 2510080229923561
+ public string targetPriceCurrency { get; set; } // "CNY",
+ public string oldPriceCurrency { get; set; } // "CNY",
+ public int? oldSupplyPrice { get; set; } // 3505,
+ public long? skuId { get; set; } // 4960442242,
+ public int? targetSupplyPrice { get; set; } // 3504,
+ public int? syncPurchasePrice { get; set; } // 1
+ }
+}
diff --git a/TEMUKJD/KJDForms/ProductForms/ProductChangePriceForm.resx b/TEMUKJD/KJDForms/ProductForms/ProductChangePriceForm.resx
new file mode 100644
index 0000000..eacf73c
--- /dev/null
+++ b/TEMUKJD/KJDForms/ProductForms/ProductChangePriceForm.resx
@@ -0,0 +1,331 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+
+
+ AAABAAEAgIAQAAAAAABoKAAAFgAAACgAAACAAAAAAAEAAAEABAAAAAAAACgAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAgICAAMDAwAAAAP8AAP8AAAD//wD/AAAA/wD/AP//
+ AAD///8AAAAAAAAAAAAAAAAzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMQ
+ AAAAAAAAAAAAAAAAAAAAAAAAABM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZkzEAAAAAAAAAAAAAAAAAAAAAADOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZMwAAAAAAAAAAAAAAAAAAABOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZkzAAAAAAAAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmTEAAAAAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAAAAAAAA5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAAAAAADmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAAAA5mZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAADmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAGZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAJmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZAAAAAA
+ OZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmT
+ AAAAAZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmRAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZkwAAAZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZkwAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZMAAJmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZEAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTADmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkwCZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkRmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZOZmZOZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmP+JmZmZmZmZj///////
+ ///4OZmZj/eZmZmZmZmZmPg5OZmZmZuI//iIuZmZmZmZmZmZmZM5mZmZmZmZmZmZmb//+JmZmZmZmP//
+ //////////OZmP//uZmZmZmZmY//+ZmZOZf///////h5k5mZmZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZ
+ mZ/////////////4mZ///4mZmZmZmZP///uZmZmP////////+JmZmZmZmZmZkzmZmZmZmZmZmZmZj//4
+ mZmZmZmf////////////+Jmf//+JmZmZmZmb///4mZmY//////////+JmZmZmZmZmZM5mZmZmZmZmZmZ
+ mY//+JmZmZmZn/////////////mZmP//iZmZmZmZk///+5mZj/////iP////+JmZmZmZmZmTOZmZmZmZ
+ mZmZmZmP//iZmZmZmZ////iIiIiIiIiZOZj//4mZmZmZmZP///uZmf////eZmT////+ZmZmZmZmZkzmZ
+ mZmZmZmZmZmZj//4mZmZmZmf//+JmZmZmZmZk5mY//+JmZmZmZmT///7mZj///+ZmZmZj///uZmZmZmZ
+ mZM5mZmZmZmZmZmZmY//+JmZmZmZn///iZmZmZmZmZmZmP//iZmZN5k5k///+5mY///zk5mZOT///4mZ
+ mZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZmZ///4mZmZmZmZmZmZj//4mZmP/5k5P///uZmP//+ZmZmZmY
+ //+JmZmZmZmZkzmZmZmZmZmZmZmZj//4mZmZmZmf///4iIiIiIg5mZmY//+JOb//+JmT///7mZj//4mZ
+ mZmZmP//+ZmZmZmZmZM5mZmZmZmZmZmZmY//+JmZmZmZn///////////85mZmP//iZn///+Jk///+5mf
+ //+JmZmZmZj///mZmZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZmZ////////////+ZmZj//4mY////85v/
+ //uZmP//iZmZmZmY///5mZmZmZmZkzmZmZmZmZmZmZmZj//4mZmZmZmf////////////mZmY//+Jv///
+ //+Z///7mZj//4mZmZmZmP//+ZmZmZmZmZM5mZmZmZmZmZmZmY//+JmZmZmZn///////////+JmZmP//
+ if//////if//+5mY//+JmZmZmZj///mZmZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZmZ///////////4mZ
+ mZj//4j///////j///uZmP//iZmZmZmY///5mZmZmZmZkzmZmZmZmZmZmZmZj//4mZmZmZmf//+JMzMz
+ MzOZOZmY//////+D///////7mZj//4mZmZmZmP//+ZmZmZmZmZM5mZmZmZmZmZmZmY//+JmZmZmZn///
+ iZmZmZmZmZmZmP//////mY//////+5mY//+JmZmZmZj///mZmZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZ
+ mZ///4mZmZmZmZmZmZj/////+5mf//////uZmP//iZmZmZmY///5mZmZmZmZkzmZmZmZmZmZMzM5j//4
+ kzMzmZmf//+JMzMzMzM5mZmY/////4mTk//////7mZj//4mZmZmZmP//+ZmZmZmZmZM5mZmZmZmZmP//
+ /////////4mZn////////////4mZmP////+ZmZmP////+5mY//+JmZmZmZj///mZmZmZmZmTOZmZmZmZ
+ mY/////////////4mZ/////////////7mZj////7mZmZn/////uZmP//iZmZmZmY///5mZmZmZmZkzmZ
+ mZmZmZn//////////////5mf////////////+Jmf////iZmZk5P////4mZ///4mZmZmZmP//+ZmZmZmZ
+ mZM5mZmZmZmZj/////////////iZn/////////////iZmP///5mZmZmZj///+5mY//+JmZmZmZj//4mZ
+ mZmZmZmTOZmZmZmZmZ/////////////zmZP///////////+JmZP///uTmZmZmZj//4mZm///mZmZmZmZ
+ //85mZmZmZmZkzmZmZmZmZOZiIiIiIiIiIiImTmZOIiIiIiIiIiImTmZOIi5mZmZmZOZiIuZmZk4iZOZ
+ mZmZOZiDmZmZmZmZmZM5mZmZmZmZOZmZmZmZmZmZmZOZmZmZmZmZmZmZmZOZmZmZmZmZmZmZOZmZmZmZ
+ mZk5mZmZmZOZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmTuIiIiIs5mZmZmZmZ
+ mTu4i7mZmZmZmZmZmTMzmZOZmZkzOZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmTmbj///////+HmT
+ mZmZk4j/////iJmZmZk4iP////iZOZmZj/mZOZOIiIiIiIiIiDmZmZmZmZmZkzmZmZmZmZmZj///////
+ ///4mZk5k4///4iI///4OZOY////////iZOZmb/5mZmP///////////4mZmZmZmZmZM5mZmZmZmZn///
+ //////////mZmY///5mZmZP///iZmP////////+ZOZk/iZmY/////////////4mZmZmZmZmTOZmZmZmZ
+ mZ/////////////5mZ////+JmZmY////iZl/////////+ZmZP4mZP//////////////7mZmZmZmZkzmZ
+ mZmZmZmb////////////uZP/j///+HM3j/////+ZmYj///////iZmT+JmY//////////////+JmZmZmZ
+ mZM5mZmZmZmZmY//////////+JmT+Jv///////////iPmTmZOI/4mP//uTk/iZmP//////////////iZ
+ mZmZmZmTOZmZmZmZmZmf//////////mZmZmZ///////////5mZmZmZmTOZk///mZP4mZj///////////
+ ///4mZmZmZmZkzmZmZmZmZmTmP////////+JOZmZOY//////////iZmZmZmZmZk5mf/4mT+JmY//////
+ ////////+JmZmZmZmZM5mZmZmZmZmZn/////////mZmZmZk//////////zmZmZmZmZmZmTmP/zm/iZmP
+ //////////////iZmZmZmZmTOZmZmZmZmZk5v///////85OZmZkzmP////////iZmZmZmZmZmZmZn//4
+ /4mZj/////hzN4/////4mZmZmZmZkzmZmZmZmZmZmZj//////4mZmTmY/4j////////4mZmZmZmZmZmZ
+ mZj///+JmY////+JmZmY////+JmZmZmZmZM5mZmZmZmZmZmZ//////+ZmZmZj////////////4mZmZmZ
+ mZmZmZmb////+ZmP///4mZu5mY////iZmZmZmZmTOZmZmZmZmZmZOb/////4k5mZmP/////////////7
+ mZmZmZmZmZmZk/////OZv///+ZmP+Jmf///4mZmZmZmZkzmZmZmZmZmZmZmf////+ZmZmZj////////4
+ eI//+JmZmZmZmZmZmZP////4mb///4mY//+JmP//+5mZmZmZmZM5mZmZmZmZmZk5v/////uTmZmb////
+ ///4mZmX//iZmZmZmZmZmZmZ////+Jmf//95n///+Zj///OZmZmZmZmTOZmZmZmZmZmZmf//////mZmZ
+ mY//////+ZOZmZiJmZmZmZmZmZmZmY////+ZmP//+I////iP//+JmZmZmZmZkzmZmZmZmZmZmZj/////
+ /4mZmZmf/////5k5mZOZmTmZmZmZmZmZmZmP///4mZP/////////////OZmZmZmZmZM5mZmZmZmZmZk/
+ ///////zmZmZm/////iZmZmZmZmZmZmZmZmZmZmZj///85mZj///////////+JmZmZmZmZmTOZmZmZmZ
+ mZmZv///////+5mZmZmP///5mZmZmZmZmZmZmZmZmZmZmZ///3mZmZj//////////4mZmZmZmZmZkzmZ
+ mZmZmZmZmb///4j///uZmZmZmP//mTmZmZmZmZmZmZmZmZmZmZmY/4OZmZmZeP///////4eZmZmZmZmZ
+ mZM5mZmZmZmZmZmY/4OZOP+JmZmZmZmIiZOZmZmZmZmZmZmZmZmZmZmZmYiZmZmZmZk4iIiIiIOZmZmZ
+ mZmZmZmTOZmZmZmZmZmZmTOZmZkzmZmZmZmZmZk5mZmZmZmZmZmZmZmZmZmZmZmZk5mZmZmZmZmZmZmZ
+ mZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmTGZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZkwmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZADmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZkwA5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZMACZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmQAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAABmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTAAADmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAJmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmRAAAAA5mZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAACZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmQAAAAAAGZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAOZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkwAAAAAA
+ AAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTAA
+ AAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZMAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZkwAAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmTAAAAAAAAAAAAAAGZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZEAAAAAAAAAAAAAAAA5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZMAAAAAAAAAAAAAAAAAATmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZMQAAAAAAAAAAAAAAAAAAABOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZMQAAAAAAAAAAAAAAAAAAAAAAAzmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTMAAAAAAAAAAAAAAAAAAAAAAAAAAAEzMzMzMzMzMzMzMzMzMz
+ MzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMxAAAAAAAAAAAAAAD////////////////////////4AAAA
+ AAAAAAAAAB//////wAAAAAAAAAAAAAAD/////wAAAAAAAAAAAAAAAP////wAAAAAAAAAAAAAAAA////w
+ AAAAAAAAAAAAAAAAD///4AAAAAAAAAAAAAAAAAf//8AAAAAAAAAAAAAAAAAD//+AAAAAAAAAAAAAAAAA
+ Af//AAAAAAAAAAAAAAAAAAD//gAAAAAAAAAAAAAAAAAAf/wAAAAAAAAAAAAAAAAAAD/4AAAAAAAAAAAA
+ AAAAAAAf+AAAAAAAAAAAAAAAAAAAH/AAAAAAAAAAAAAAAAAAAA/wAAAAAAAAAAAAAAAAAAAP4AAAAAAA
+ AAAAAAAAAAAAB+AAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAADwAAAAAAAAAAAAAAAAAAAA8AA
+ AAAAAAAAAAAAAAAAAAOAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA
+ AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA
+ AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA
+ AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA
+ AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA
+ AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA
+ AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA
+ AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA
+ AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA
+ AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA
+ AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA
+ AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA
+ AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA
+ AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA
+ AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA
+ AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA
+ AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA
+ AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA
+ AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA
+ AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA
+ AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA
+ AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA
+ AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA
+ AAAAAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAPAAAAAAAAAAAAAAAAAAAAD4AAAAAAAAAAAAAAAAAAAA+AA
+ AAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAH8AAAAAAAAAAAAAAAAAAAD/AAAAAAAAAAAAAAAAAA
+ AA/4AAAAAAAAAAAAAAAAAAAf/AAAAAAAAAAAAAAAAAAAH/wAAAAAAAAAAAAAAAAAAD/+AAAAAAAAAAAA
+ AAAAAAB//wAAAAAAAAAAAAAAAAAA//+AAAAAAAAAAAAAAAAAAf//wAAAAAAAAAAAAAAAAAP//+AAAAAA
+ AAAAAAAAAAAH///4AAAAAAAAAAAAAAAAD////AAAAAAAAAAAAAAAAD////8AAAAAAAAAAAAAAAD/////
+ wAAAAAAAAAAAAAAD//////wAAAAAAAAAAAAAH////////////////////////w==
+
+
+
\ No newline at end of file
diff --git a/TEMUKJD/KJDForms/ProductForms/PurchasePriceForm.Designer.cs b/TEMUKJD/KJDForms/ProductForms/PurchasePriceForm.Designer.cs
index 2b90dde..48ca4b5 100644
--- a/TEMUKJD/KJDForms/ProductForms/PurchasePriceForm.Designer.cs
+++ b/TEMUKJD/KJDForms/ProductForms/PurchasePriceForm.Designer.cs
@@ -35,15 +35,13 @@ namespace TemuKJD.KJDForms.ProductForms
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
- this.splitContainer3 = new System.Windows.Forms.SplitContainer();
- this.splitContainer2 = new System.Windows.Forms.SplitContainer();
- this.splitContainer4 = new System.Windows.Forms.SplitContainer();
- this.btnClear = new DevComponents.DotNetBar.PanelEx();
this.ucGroupBoxEx2 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
this.panelEx1 = new DevComponents.DotNetBar.PanelEx();
this.btnSearchPrice = new DevComponents.DotNetBar.PanelEx();
this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
this.btnRefreshShop = new DevComponents.DotNetBar.PanelEx();
+ this.splitContainer3 = new System.Windows.Forms.SplitContainer();
+ this.splitContainer2 = new System.Windows.Forms.SplitContainer();
this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx();
this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.colShopLoginName = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -67,11 +65,15 @@ namespace TemuKJD.KJDForms.ProductForms
this.colPrcie = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colEdit = new System.Windows.Forms.DataGridViewLinkColumn();
this.colMsg = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.splitContainer4 = new System.Windows.Forms.SplitContainer();
this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
+ this.btnClear = new DevComponents.DotNetBar.PanelEx();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
this.splitContainer1.SuspendLayout();
+ this.ucGroupBoxEx2.SuspendLayout();
+ this.ucGroupBoxEx1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).BeginInit();
this.splitContainer3.Panel1.SuspendLayout();
this.splitContainer3.Panel2.SuspendLayout();
@@ -80,14 +82,12 @@ namespace TemuKJD.KJDForms.ProductForms
this.splitContainer2.Panel1.SuspendLayout();
this.splitContainer2.Panel2.SuspendLayout();
this.splitContainer2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.dgvShop)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.dgvProduct)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitContainer4)).BeginInit();
this.splitContainer4.Panel1.SuspendLayout();
this.splitContainer4.Panel2.SuspendLayout();
this.splitContainer4.SuspendLayout();
- this.ucGroupBoxEx2.SuspendLayout();
- this.ucGroupBoxEx1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.dgvShop)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.dgvProduct)).BeginInit();
this.SuspendLayout();
//
// splitContainer1
@@ -110,89 +110,6 @@ namespace TemuKJD.KJDForms.ProductForms
this.splitContainer1.SplitterDistance = 120;
this.splitContainer1.TabIndex = 11;
//
- // splitContainer3
- //
- this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill;
- this.splitContainer3.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
- this.splitContainer3.Location = new System.Drawing.Point(0, 0);
- this.splitContainer3.Name = "splitContainer3";
- this.splitContainer3.Orientation = System.Windows.Forms.Orientation.Horizontal;
- //
- // splitContainer3.Panel1
- //
- this.splitContainer3.Panel1.Controls.Add(this.splitContainer2);
- //
- // splitContainer3.Panel2
- //
- this.splitContainer3.Panel2.Controls.Add(this.splitContainer4);
- this.splitContainer3.Size = new System.Drawing.Size(1121, 449);
- this.splitContainer3.SplitterDistance = 420;
- this.splitContainer3.TabIndex = 1;
- //
- // splitContainer2
- //
- this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.splitContainer2.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
- this.splitContainer2.Location = new System.Drawing.Point(0, 0);
- this.splitContainer2.Name = "splitContainer2";
- //
- // splitContainer2.Panel1
- //
- this.splitContainer2.Panel1.Controls.Add(this.dgvShop);
- this.splitContainer2.Panel1.Padding = new System.Windows.Forms.Padding(4, 0, 0, 0);
- //
- // splitContainer2.Panel2
- //
- this.splitContainer2.Panel2.Controls.Add(this.dgvProduct);
- this.splitContainer2.Panel2.Padding = new System.Windows.Forms.Padding(0, 0, 4, 0);
- this.splitContainer2.Size = new System.Drawing.Size(1121, 420);
- this.splitContainer2.SplitterDistance = 280;
- this.splitContainer2.TabIndex = 0;
- //
- // splitContainer4
- //
- this.splitContainer4.Dock = System.Windows.Forms.DockStyle.Fill;
- this.splitContainer4.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
- this.splitContainer4.Location = new System.Drawing.Point(0, 0);
- this.splitContainer4.Name = "splitContainer4";
- //
- // splitContainer4.Panel1
- //
- this.splitContainer4.Panel1.Controls.Add(this.statusBar);
- //
- // splitContainer4.Panel2
- //
- this.splitContainer4.Panel2.Controls.Add(this.btnClear);
- this.splitContainer4.Size = new System.Drawing.Size(1121, 25);
- this.splitContainer4.SplitterDistance = 587;
- this.splitContainer4.TabIndex = 3;
- //
- // btnClear
- //
- this.btnClear.Anchor = System.Windows.Forms.AnchorStyles.Right;
- this.btnClear.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
- this.btnClear.Cursor = System.Windows.Forms.Cursors.Hand;
- this.btnClear.DisabledBackColor = System.Drawing.Color.Empty;
- this.btnClear.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnClear.Location = new System.Drawing.Point(303, -1);
- this.btnClear.Name = "btnClear";
- this.btnClear.Size = new System.Drawing.Size(90, 21);
- this.btnClear.Style.Alignment = System.Drawing.StringAlignment.Center;
- this.btnClear.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- this.btnClear.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- this.btnClear.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
- this.btnClear.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
- this.btnClear.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
- this.btnClear.Style.ForeColor.Color = System.Drawing.Color.White;
- this.btnClear.Style.GradientAngle = 90;
- this.btnClear.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
- this.btnClear.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
- this.btnClear.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
- this.btnClear.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
- this.btnClear.TabIndex = 440;
- this.btnClear.Text = "清空结果";
- this.btnClear.Visible = false;
- //
// ucGroupBoxEx2
//
this.ucGroupBoxEx2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
@@ -295,6 +212,45 @@ namespace TemuKJD.KJDForms.ProductForms
this.btnRefreshShop.Text = "刷新店铺";
this.btnRefreshShop.Click += new System.EventHandler(this.btnRefreshShop_Click);
//
+ // splitContainer3
+ //
+ this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.splitContainer3.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
+ this.splitContainer3.Location = new System.Drawing.Point(0, 0);
+ this.splitContainer3.Name = "splitContainer3";
+ this.splitContainer3.Orientation = System.Windows.Forms.Orientation.Horizontal;
+ //
+ // splitContainer3.Panel1
+ //
+ this.splitContainer3.Panel1.Controls.Add(this.splitContainer2);
+ //
+ // splitContainer3.Panel2
+ //
+ this.splitContainer3.Panel2.Controls.Add(this.splitContainer4);
+ this.splitContainer3.Size = new System.Drawing.Size(1121, 449);
+ this.splitContainer3.SplitterDistance = 420;
+ this.splitContainer3.TabIndex = 1;
+ //
+ // splitContainer2
+ //
+ this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.splitContainer2.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
+ this.splitContainer2.Location = new System.Drawing.Point(0, 0);
+ this.splitContainer2.Name = "splitContainer2";
+ //
+ // splitContainer2.Panel1
+ //
+ this.splitContainer2.Panel1.Controls.Add(this.dgvShop);
+ this.splitContainer2.Panel1.Padding = new System.Windows.Forms.Padding(4, 0, 0, 0);
+ //
+ // splitContainer2.Panel2
+ //
+ this.splitContainer2.Panel2.Controls.Add(this.dgvProduct);
+ this.splitContainer2.Panel2.Padding = new System.Windows.Forms.Padding(0, 0, 4, 0);
+ this.splitContainer2.Size = new System.Drawing.Size(1121, 420);
+ this.splitContainer2.SplitterDistance = 280;
+ this.splitContainer2.TabIndex = 0;
+ //
// dgvShop
//
this.dgvShop.AllowUserToAddRows = false;
@@ -532,6 +488,24 @@ namespace TemuKJD.KJDForms.ProductForms
this.colMsg.ReadOnly = true;
this.colMsg.Width = 400;
//
+ // splitContainer4
+ //
+ this.splitContainer4.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.splitContainer4.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
+ this.splitContainer4.Location = new System.Drawing.Point(0, 0);
+ this.splitContainer4.Name = "splitContainer4";
+ //
+ // splitContainer4.Panel1
+ //
+ this.splitContainer4.Panel1.Controls.Add(this.statusBar);
+ //
+ // splitContainer4.Panel2
+ //
+ this.splitContainer4.Panel2.Controls.Add(this.btnClear);
+ this.splitContainer4.Size = new System.Drawing.Size(1121, 25);
+ this.splitContainer4.SplitterDistance = 587;
+ this.splitContainer4.TabIndex = 3;
+ //
// statusBar
//
this.statusBar.BackColor = System.Drawing.Color.White;
@@ -543,6 +517,32 @@ namespace TemuKJD.KJDForms.ProductForms
this.statusBar.Size = new System.Drawing.Size(587, 25);
this.statusBar.TabIndex = 2;
//
+ // btnClear
+ //
+ this.btnClear.Anchor = System.Windows.Forms.AnchorStyles.Right;
+ this.btnClear.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+ this.btnClear.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.btnClear.DisabledBackColor = System.Drawing.Color.Empty;
+ this.btnClear.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.btnClear.Location = new System.Drawing.Point(303, -1);
+ this.btnClear.Name = "btnClear";
+ this.btnClear.Size = new System.Drawing.Size(90, 21);
+ this.btnClear.Style.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnClear.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnClear.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnClear.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+ this.btnClear.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+ this.btnClear.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
+ this.btnClear.Style.ForeColor.Color = System.Drawing.Color.White;
+ this.btnClear.Style.GradientAngle = 90;
+ this.btnClear.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnClear.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+ this.btnClear.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+ this.btnClear.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
+ this.btnClear.TabIndex = 440;
+ this.btnClear.Text = "清空结果";
+ this.btnClear.Visible = false;
+ //
// PurchasePriceForm
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -558,6 +558,8 @@ namespace TemuKJD.KJDForms.ProductForms
this.splitContainer1.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
this.splitContainer1.ResumeLayout(false);
+ this.ucGroupBoxEx2.ResumeLayout(false);
+ this.ucGroupBoxEx1.ResumeLayout(false);
this.splitContainer3.Panel1.ResumeLayout(false);
this.splitContainer3.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).EndInit();
@@ -566,14 +568,12 @@ namespace TemuKJD.KJDForms.ProductForms
this.splitContainer2.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit();
this.splitContainer2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.dgvShop)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.dgvProduct)).EndInit();
this.splitContainer4.Panel1.ResumeLayout(false);
this.splitContainer4.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitContainer4)).EndInit();
this.splitContainer4.ResumeLayout(false);
- this.ucGroupBoxEx2.ResumeLayout(false);
- this.ucGroupBoxEx1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.dgvShop)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.dgvProduct)).EndInit();
this.ResumeLayout(false);
}
diff --git a/TEMUKJD/KJDForms/ProductForms/SaleStockUpForm.Designer.cs b/TEMUKJD/KJDForms/ProductForms/SaleStockUpForm.Designer.cs
index 5005131..90812c7 100644
--- a/TEMUKJD/KJDForms/ProductForms/SaleStockUpForm.Designer.cs
+++ b/TEMUKJD/KJDForms/ProductForms/SaleStockUpForm.Designer.cs
@@ -30,13 +30,16 @@ namespace TemuKJD.KJDForms.ProductForms
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- 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 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();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.ucGroupBoxEx4 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
+ this.txtMaxQualityRate = new System.Windows.Forms.TextBox();
+ this.chkMaxQualityRate = new System.Windows.Forms.CheckBox();
+ this.label10 = new System.Windows.Forms.Label();
this.panel4 = new System.Windows.Forms.Panel();
this.rbTodaySaleCount = new System.Windows.Forms.RadioButton();
this.rbSevenDaysAvgSaleCount = new System.Windows.Forms.RadioButton();
@@ -125,10 +128,6 @@ namespace TemuKJD.KJDForms.ProductForms
this.btnStopAdd = new DevComponents.DotNetBar.PanelEx();
this.chkLimited = new System.Windows.Forms.CheckBox();
this.dgvStock = new TemuKJD.UserComponent.DataGridViewEx();
- this.splitContainer4 = new System.Windows.Forms.SplitContainer();
- this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
- this.panelEx1 = new DevComponents.DotNetBar.PanelEx();
- this.btnClear = new DevComponents.DotNetBar.PanelEx();
this.colUpId = new System.Windows.Forms.DataGridViewLinkColumn();
this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.colSupplierId = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -153,9 +152,10 @@ namespace TemuKJD.KJDForms.ProductForms
this.colQualityCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colNeedStockUp = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colMsg = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.txtMaxQualityRate = new System.Windows.Forms.TextBox();
- this.chkMaxQualityRate = new System.Windows.Forms.CheckBox();
- this.label10 = new System.Windows.Forms.Label();
+ this.splitContainer4 = new System.Windows.Forms.SplitContainer();
+ this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
+ this.panelEx1 = new DevComponents.DotNetBar.PanelEx();
+ this.btnClear = new DevComponents.DotNetBar.PanelEx();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@@ -244,6 +244,43 @@ namespace TemuKJD.KJDForms.ProductForms
this.ucGroupBoxEx4.TabStop = false;
this.ucGroupBoxEx4.Text = "创建备货单";
//
+ // txtMaxQualityRate
+ //
+ this.txtMaxQualityRate.Location = new System.Drawing.Point(737, 85);
+ this.txtMaxQualityRate.Margin = new System.Windows.Forms.Padding(0);
+ this.txtMaxQualityRate.Name = "txtMaxQualityRate";
+ this.txtMaxQualityRate.Size = new System.Drawing.Size(32, 23);
+ this.txtMaxQualityRate.TabIndex = 745;
+ this.txtMaxQualityRate.Text = "2";
+ this.txtMaxQualityRate.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+ //
+ // chkMaxQualityRate
+ //
+ this.chkMaxQualityRate.AutoSize = true;
+ this.chkMaxQualityRate.Checked = true;
+ this.chkMaxQualityRate.CheckState = System.Windows.Forms.CheckState.Checked;
+ this.chkMaxQualityRate.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
+ this.chkMaxQualityRate.FlatAppearance.BorderSize = 2;
+ this.chkMaxQualityRate.FlatAppearance.CheckedBackColor = System.Drawing.Color.Blue;
+ this.chkMaxQualityRate.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Blue;
+ this.chkMaxQualityRate.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Blue;
+ this.chkMaxQualityRate.Location = new System.Drawing.Point(655, 86);
+ this.chkMaxQualityRate.Margin = new System.Windows.Forms.Padding(15, 3, 3, 3);
+ this.chkMaxQualityRate.Name = "chkMaxQualityRate";
+ this.chkMaxQualityRate.Size = new System.Drawing.Size(87, 21);
+ this.chkMaxQualityRate.TabIndex = 744;
+ this.chkMaxQualityRate.Text = "售后率高于";
+ this.chkMaxQualityRate.UseVisualStyleBackColor = false;
+ //
+ // label10
+ //
+ this.label10.AutoSize = true;
+ this.label10.Location = new System.Drawing.Point(769, 88);
+ this.label10.Name = "label10";
+ this.label10.Size = new System.Drawing.Size(44, 17);
+ this.label10.TabIndex = 746;
+ this.label10.Text = "不备货";
+ //
// panel4
//
this.panel4.Controls.Add(this.rbTodaySaleCount);
@@ -822,18 +859,18 @@ namespace TemuKJD.KJDForms.ProductForms
//
this.dgvShop.AllowUserToAddRows = false;
this.dgvShop.AllowUserToDeleteRows = false;
- dataGridViewCellStyle6.BackColor = System.Drawing.Color.WhiteSmoke;
- this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle6;
+ dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke;
+ this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
this.dgvShop.BackgroundColor = System.Drawing.Color.White;
this.dgvShop.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
- this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7;
+ dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+ this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colSelect,
@@ -1418,18 +1455,18 @@ namespace TemuKJD.KJDForms.ProductForms
//
this.dgvStock.AllowUserToAddRows = false;
this.dgvStock.AllowUserToDeleteRows = false;
- dataGridViewCellStyle8.BackColor = System.Drawing.Color.WhiteSmoke;
- this.dgvStock.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle8;
+ dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke;
+ this.dgvStock.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3;
this.dgvStock.BackgroundColor = System.Drawing.Color.White;
this.dgvStock.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle9.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- dataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
- this.dgvStock.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle9;
+ 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.dgvStock.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4;
this.dgvStock.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvStock.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colUpId,
@@ -1466,86 +1503,6 @@ namespace TemuKJD.KJDForms.ProductForms
this.dgvStock.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvStock_CellContentClick);
this.dgvStock.Scroll += new System.Windows.Forms.ScrollEventHandler(this.dgvStock_Scroll);
//
- // splitContainer4
- //
- this.splitContainer4.Dock = System.Windows.Forms.DockStyle.Fill;
- this.splitContainer4.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
- this.splitContainer4.Location = new System.Drawing.Point(0, 0);
- this.splitContainer4.Name = "splitContainer4";
- //
- // splitContainer4.Panel1
- //
- this.splitContainer4.Panel1.Controls.Add(this.statusBar);
- //
- // splitContainer4.Panel2
- //
- this.splitContainer4.Panel2.Controls.Add(this.panelEx1);
- this.splitContainer4.Panel2.Controls.Add(this.btnClear);
- this.splitContainer4.Size = new System.Drawing.Size(1350, 26);
- this.splitContainer4.SplitterDistance = 1072;
- this.splitContainer4.TabIndex = 3;
- //
- // statusBar
- //
- this.statusBar.BackColor = System.Drawing.Color.White;
- this.statusBar.Dock = System.Windows.Forms.DockStyle.Fill;
- this.statusBar.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.statusBar.Location = new System.Drawing.Point(0, 0);
- this.statusBar.Margin = new System.Windows.Forms.Padding(0);
- this.statusBar.Name = "statusBar";
- this.statusBar.Size = new System.Drawing.Size(1072, 26);
- this.statusBar.TabIndex = 2;
- //
- // panelEx1
- //
- this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control;
- this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
- this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty;
- this.panelEx1.Location = new System.Drawing.Point(155, 0);
- 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.btnStop_Click);
- //
- // btnClear
- //
- this.btnClear.Anchor = System.Windows.Forms.AnchorStyles.Right;
- this.btnClear.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
- this.btnClear.Cursor = System.Windows.Forms.Cursors.Hand;
- this.btnClear.DisabledBackColor = System.Drawing.Color.Empty;
- this.btnClear.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnClear.Location = new System.Drawing.Point(47, 0);
- this.btnClear.Name = "btnClear";
- this.btnClear.Size = new System.Drawing.Size(90, 21);
- this.btnClear.Style.Alignment = System.Drawing.StringAlignment.Center;
- this.btnClear.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- this.btnClear.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- this.btnClear.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
- this.btnClear.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
- this.btnClear.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
- this.btnClear.Style.ForeColor.Color = System.Drawing.Color.White;
- this.btnClear.Style.GradientAngle = 90;
- this.btnClear.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
- this.btnClear.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
- this.btnClear.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
- this.btnClear.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
- this.btnClear.TabIndex = 440;
- this.btnClear.Text = "清空结果";
- this.btnClear.Visible = false;
- //
// colUpId
//
this.colUpId.HeaderText = "上家Id";
@@ -1631,8 +1588,8 @@ namespace TemuKJD.KJDForms.ProductForms
//
// colProdName
//
- dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.colProdName.DefaultCellStyle = dataGridViewCellStyle10;
+ dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.colProdName.DefaultCellStyle = dataGridViewCellStyle5;
this.colProdName.HeaderText = "标题";
this.colProdName.Name = "colProdName";
this.colProdName.ReadOnly = true;
@@ -1735,42 +1692,85 @@ namespace TemuKJD.KJDForms.ProductForms
this.colMsg.ReadOnly = true;
this.colMsg.Width = 400;
//
- // txtMaxQualityRate
+ // splitContainer4
//
- this.txtMaxQualityRate.Location = new System.Drawing.Point(737, 85);
- this.txtMaxQualityRate.Margin = new System.Windows.Forms.Padding(0);
- this.txtMaxQualityRate.Name = "txtMaxQualityRate";
- this.txtMaxQualityRate.Size = new System.Drawing.Size(32, 23);
- this.txtMaxQualityRate.TabIndex = 745;
- this.txtMaxQualityRate.Text = "2";
- this.txtMaxQualityRate.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+ this.splitContainer4.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.splitContainer4.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
+ this.splitContainer4.Location = new System.Drawing.Point(0, 0);
+ this.splitContainer4.Name = "splitContainer4";
//
- // chkMaxQualityRate
+ // splitContainer4.Panel1
//
- this.chkMaxQualityRate.AutoSize = true;
- this.chkMaxQualityRate.Checked = true;
- this.chkMaxQualityRate.CheckState = System.Windows.Forms.CheckState.Checked;
- this.chkMaxQualityRate.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
- this.chkMaxQualityRate.FlatAppearance.BorderSize = 2;
- this.chkMaxQualityRate.FlatAppearance.CheckedBackColor = System.Drawing.Color.Blue;
- this.chkMaxQualityRate.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Blue;
- this.chkMaxQualityRate.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Blue;
- this.chkMaxQualityRate.Location = new System.Drawing.Point(655, 86);
- this.chkMaxQualityRate.Margin = new System.Windows.Forms.Padding(15, 3, 3, 3);
- this.chkMaxQualityRate.Name = "chkMaxQualityRate";
- this.chkMaxQualityRate.Size = new System.Drawing.Size(87, 21);
- this.chkMaxQualityRate.TabIndex = 744;
- this.chkMaxQualityRate.Text = "售后率高于";
- this.chkMaxQualityRate.UseVisualStyleBackColor = false;
+ this.splitContainer4.Panel1.Controls.Add(this.statusBar);
//
- // label10
+ // splitContainer4.Panel2
//
- this.label10.AutoSize = true;
- this.label10.Location = new System.Drawing.Point(769, 88);
- this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(44, 17);
- this.label10.TabIndex = 746;
- this.label10.Text = "不备货";
+ this.splitContainer4.Panel2.Controls.Add(this.panelEx1);
+ this.splitContainer4.Panel2.Controls.Add(this.btnClear);
+ this.splitContainer4.Size = new System.Drawing.Size(1350, 26);
+ this.splitContainer4.SplitterDistance = 1072;
+ this.splitContainer4.TabIndex = 3;
+ //
+ // statusBar
+ //
+ this.statusBar.BackColor = System.Drawing.Color.White;
+ this.statusBar.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.statusBar.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.statusBar.Location = new System.Drawing.Point(0, 0);
+ this.statusBar.Margin = new System.Windows.Forms.Padding(0);
+ this.statusBar.Name = "statusBar";
+ this.statusBar.Size = new System.Drawing.Size(1072, 26);
+ this.statusBar.TabIndex = 2;
+ //
+ // panelEx1
+ //
+ this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control;
+ this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+ this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty;
+ this.panelEx1.Location = new System.Drawing.Point(155, 0);
+ 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.btnStop_Click);
+ //
+ // btnClear
+ //
+ this.btnClear.Anchor = System.Windows.Forms.AnchorStyles.Right;
+ this.btnClear.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+ this.btnClear.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.btnClear.DisabledBackColor = System.Drawing.Color.Empty;
+ this.btnClear.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.btnClear.Location = new System.Drawing.Point(47, 0);
+ this.btnClear.Name = "btnClear";
+ this.btnClear.Size = new System.Drawing.Size(90, 21);
+ this.btnClear.Style.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnClear.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnClear.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnClear.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+ this.btnClear.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+ this.btnClear.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
+ this.btnClear.Style.ForeColor.Color = System.Drawing.Color.White;
+ this.btnClear.Style.GradientAngle = 90;
+ this.btnClear.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnClear.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+ this.btnClear.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+ this.btnClear.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
+ this.btnClear.TabIndex = 440;
+ this.btnClear.Text = "清空结果";
+ this.btnClear.Visible = false;
//
// SaleStockUpForm
//
diff --git a/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.Designer.cs b/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.Designer.cs
index d870875..f67234f 100644
--- a/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.Designer.cs
+++ b/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.Designer.cs
@@ -112,6 +112,8 @@
this.chkAddPrice = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.chkEnglishProdName = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
+ this.pnlError = new System.Windows.Forms.Panel();
+ this.lblError = new System.Windows.Forms.Label();
this.pbLoading = new System.Windows.Forms.PictureBox();
this.lblCustomImgNum = new System.Windows.Forms.Label();
this.numSeconds = new System.Windows.Forms.NumericUpDown();
@@ -147,8 +149,6 @@
this.colOpResult = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage();
this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
- this.pnlError = new System.Windows.Forms.Panel();
- this.lblError = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@@ -172,10 +172,10 @@
this.splitContainer2.Panel1.SuspendLayout();
this.splitContainer2.Panel2.SuspendLayout();
this.splitContainer2.SuspendLayout();
+ this.pnlError.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pbLoading)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.numSeconds)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.dgvSelectProduct)).BeginInit();
- this.pnlError.SuspendLayout();
this.SuspendLayout();
//
// splitContainer1
@@ -1302,15 +1302,14 @@
//
this.chkEnglishProdName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.chkEnglishProdName.AutoSize = true;
- this.chkEnglishProdName.Checked = true;
- this.chkEnglishProdName.CheckState = System.Windows.Forms.CheckState.Checked;
- this.chkEnglishProdName.Location = new System.Drawing.Point(1179, 73);
+ this.chkEnglishProdName.Location = new System.Drawing.Point(1203, 73);
this.chkEnglishProdName.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
this.chkEnglishProdName.Name = "chkEnglishProdName";
- this.chkEnglishProdName.Size = new System.Drawing.Size(99, 21);
+ this.chkEnglishProdName.Size = new System.Drawing.Size(75, 21);
this.chkEnglishProdName.TabIndex = 679;
- this.chkEnglishProdName.Text = "英文标题翻译";
+ this.chkEnglishProdName.Text = "英文标题";
this.chkEnglishProdName.UseVisualStyleBackColor = true;
+ this.chkEnglishProdName.CheckedChanged += new System.EventHandler(this.chkEnglishProdName_CheckedChanged);
//
// splitContainer2
//
@@ -1340,6 +1339,26 @@
this.splitContainer2.SplitterDistance = 505;
this.splitContainer2.TabIndex = 0;
//
+ // pnlError
+ //
+ this.pnlError.Anchor = System.Windows.Forms.AnchorStyles.Top;
+ this.pnlError.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(244)))), ((int)(((byte)(224)))));
+ this.pnlError.Controls.Add(this.lblError);
+ this.pnlError.Location = new System.Drawing.Point(650, 95);
+ this.pnlError.Name = "pnlError";
+ this.pnlError.Size = new System.Drawing.Size(259, 120);
+ this.pnlError.TabIndex = 488;
+ this.pnlError.Visible = false;
+ //
+ // lblError
+ //
+ this.lblError.ForeColor = System.Drawing.Color.Red;
+ this.lblError.Location = new System.Drawing.Point(32, 26);
+ this.lblError.Name = "lblError";
+ this.lblError.Size = new System.Drawing.Size(200, 69);
+ this.lblError.TabIndex = 0;
+ this.lblError.Text = "错误tip";
+ //
// pbLoading
//
this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None;
@@ -1718,26 +1737,6 @@
this.statusBar.Size = new System.Drawing.Size(1558, 25);
this.statusBar.TabIndex = 5;
//
- // pnlError
- //
- this.pnlError.Anchor = System.Windows.Forms.AnchorStyles.Top;
- this.pnlError.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(244)))), ((int)(((byte)(224)))));
- this.pnlError.Controls.Add(this.lblError);
- this.pnlError.Location = new System.Drawing.Point(650, 95);
- this.pnlError.Name = "pnlError";
- this.pnlError.Size = new System.Drawing.Size(259, 120);
- this.pnlError.TabIndex = 488;
- this.pnlError.Visible = false;
- //
- // lblError
- //
- this.lblError.ForeColor = System.Drawing.Color.Red;
- this.lblError.Location = new System.Drawing.Point(32, 26);
- this.lblError.Name = "lblError";
- this.lblError.Size = new System.Drawing.Size(200, 69);
- this.lblError.TabIndex = 0;
- this.lblError.Text = "错误tip";
- //
// DbProductSelectListManageForm
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -1778,10 +1777,10 @@
this.splitContainer2.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit();
this.splitContainer2.ResumeLayout(false);
+ this.pnlError.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.pbLoading)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.numSeconds)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.dgvSelectProduct)).EndInit();
- this.pnlError.ResumeLayout(false);
this.ResumeLayout(false);
}
diff --git a/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs b/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs
index 92b7aee..920f500 100644
--- a/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs
+++ b/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs
@@ -1095,6 +1095,15 @@ namespace TemuKJD.KJDForms.ProductSelectForms
string endWords = "";
if (this.chkFission.Checked)
{
+ string originProductName = dbProd.product_name;
+ string joinText = ",";
+ //如果有裂变词并且勾选了英文标题,则删除中文标题全部使用英文裂变词组成新的标题并写入英文标题
+ if (chkEnglishProdName.Checked && dbProd.fission_words.Length > 10 && CountChineseCharacters(dbProd.fission_words) < 10)
+ {
+ originProductName = "";
+ joinText = ", ";
+ }
+
// 头词
if (chkHeadWords.Checked)
{
@@ -1131,14 +1140,14 @@ namespace TemuKJD.KJDForms.ProductSelectForms
// 标题部分打乱
List fissionLst = new List();
fissionLst.AddRange(dbProd.fission_words.ParseToString().Split(new string[] { "\r", "\n" }, StringSplitOptions.RemoveEmptyEntries));
- string centerWords = ",";
+ string centerWords = joinText;
while (fissionLst.Count > 0)
{
int id = Randomx.GetId(fissionLst.Count);
var fissionTxt = fissionLst[id];
fissionLst.RemoveAt(id);
- var allTxt = headWords + dbProd.product_name + centerWords + fissionTxt + "," + endWords;
- //var allTxt = dbProd.product_name + centerWords + fissionTxt + ",";
+ var allTxt = headWords + originProductName + centerWords + fissionTxt + joinText + endWords;
+ //var allTxt = originProductName + centerWords + fissionTxt + joinText;
byte[] bytes = Encoding.GetEncoding("gb2312").GetBytes(allTxt);
int titleLength = allTxt.Length;
if (chkLongTitle.Checked)
@@ -1155,9 +1164,9 @@ namespace TemuKJD.KJDForms.ProductSelectForms
break;
}
}
- centerWords += fissionTxt + ",";
+ centerWords += fissionTxt + joinText;
}
- string centerName = dbProd.product_name + centerWords.ParseToString();
+ string centerName = originProductName + centerWords.ParseToString();
// 标题完全打乱
if (chkReFissionAllProdName.Checked)
@@ -1169,13 +1178,13 @@ namespace TemuKJD.KJDForms.ProductSelectForms
while (centerNameLst.Count > 0)
{
int id = Randomx.GetId(centerNameLst.Count);
- newCenterName += centerNameLst[id] + ",";
+ newCenterName += centerNameLst[id] + joinText;
centerNameLst.RemoveAt(id);
}
centerName = newCenterName;
}
- prodParam.productName = (headWords + centerName + endWords).Trim(',');
- //prodParam.productName = centerName.Trim(',');
+ prodParam.productName = (headWords + centerName + endWords).Trim(',', ',', ' ');
+ //prodParam.productName = centerName.Trim(',', ',', ' ');
}
prodParam.productNonAuditExtAttrReq = new ProductNonAuditExtAttrReq()
@@ -1736,41 +1745,57 @@ namespace TemuKJD.KJDForms.ProductSelectForms
//{
//}
- //翻译英文标题
+ //英文标题
if (chkEnglishProdName.Checked)
{
- var realName = AdminProductPriceCheckForm.RestoreProductName(prodParam.productName);
- var transRst = translate(shop, realName);
- var transRstTxt = BaseRegex.GetStringJson(ref transRst, "dst");
- if (!string.IsNullOrEmpty(transRstTxt))
- {
- var transEndWords = "";
- if (realName.EndsWith("不同的搭配场景") || realName.EndsWith("不同的搭配风格") ||
- realName.EndsWith("different matching scenarios") || realName.EndsWith("different matching styles"))
- {
- transEndWords = transRstTxt.Substring(Math.Max(0, transRstTxt.LastIndexOf(',')));
- }
- while ((transRstTxt.Replace(transEndWords, "") + transEndWords).Length > 500)
- {
- transRstTxt = transRstTxt.Substring(0, Math.Max(1, transRstTxt.LastIndexOf(',')));
- }
- if (!string.IsNullOrEmpty(transEndWords))
- transRstTxt = (transRstTxt.Replace(transEndWords, "") + transEndWords);
+ #region 调用百度翻译翻译英文标题 暂时作废
+ //var realName = AdminProductPriceCheckForm.RestoreProductName(prodParam.productName);
+ //var transRst = translate(shop, realName);
+ //var transRstTxt = BaseRegex.GetStringJson(ref transRst, "dst");
+ //if (!string.IsNullOrEmpty(transRstTxt))
+ //{
+ // var transEndWords = "";
+ // if (realName.EndsWith("不同的搭配场景") || realName.EndsWith("不同的搭配风格") ||
+ // realName.EndsWith("different matching scenarios") || realName.EndsWith("different matching styles"))
+ // {
+ // transEndWords = transRstTxt.Substring(Math.Max(0, transRstTxt.LastIndexOf(',')));
+ // }
+ // while ((transRstTxt.Replace(transEndWords, "") + transEndWords).Length > 500)
+ // {
+ // transRstTxt = transRstTxt.Substring(0, Math.Max(1, transRstTxt.LastIndexOf(',')));
+ // }
+ // if (!string.IsNullOrEmpty(transEndWords))
+ // transRstTxt = (transRstTxt.Replace(transEndWords, "") + transEndWords);
- prodParam.productI18nReqs = new List();
- productI18nParam productI18nEn = new productI18nParam
- {
- language = "en",
- productName = transRstTxt,
- };
- prodParam.productI18nReqs.Add(productI18nEn);
- }
- else
+ // prodParam.productI18nReqs = new List();
+ // productI18nParam productI18nEn = new productI18nParam
+ // {
+ // language = "en",
+ // productName = transRstTxt,
+ // };
+ // prodParam.productI18nReqs.Add(productI18nEn);
+ //}
+ //else
+ //{
+ // Invoke(new Action(() =>
+ // {
+ // this.pnlError.Visible = true;
+ // this.lblError.Text = "调用翻译功能失败……";
+ // }));
+ // Task.Run(() =>
+ // {
+ // Thread.Sleep(5000);
+ // this.pnlError.Visible = false;
+ // });
+ //}
+ #endregion
+
+ if (CountChineseCharacters(prodParam.productName) > 2)
{
Invoke(new Action(() =>
{
this.pnlError.Visible = true;
- this.lblError.Text = "调用翻译功能失败……";
+ this.lblError.Text = "标题内含有中文,跳过英文标题设置";
}));
Task.Run(() =>
{
@@ -1778,6 +1803,16 @@ namespace TemuKJD.KJDForms.ProductSelectForms
this.pnlError.Visible = false;
});
}
+ else
+ {
+ prodParam.productI18nReqs = new List();
+ productI18nParam productI18nEn = new productI18nParam
+ {
+ language = "en",
+ productName = prodParam.productName,
+ };
+ prodParam.productI18nReqs.Add(productI18nEn);
+ }
}
html = SaveDraft(shop, prodParam.productDraftId.ToString(), prodParam);
@@ -2505,5 +2540,22 @@ Content-Disposition: form-data; name=""upload_sign""
if (cancellationTokenSource != null)
cancellationTokenSource.Cancel();
}
+
+ private void chkEnglishProdName_CheckedChanged(object sender, EventArgs e)
+ {
+ if (chkEnglishProdName.Checked && !chkFission.Checked)
+ {
+ BaseMsgForm.ShowInfo("需要先勾选重组标题!");
+ chkEnglishProdName.Checked = false;
+ }
+ }
+
+ public static int CountChineseCharacters(string text)
+ {
+ // 使用正则表达式匹配中文字符
+ string pattern = @"[\u4e00-\u9fff]";
+ MatchCollection matches = Regex.Matches(text, pattern);
+ return matches.Count;
+ }
}
}
diff --git a/TEMUKJD/KJDForms/SalesCenterForms/MarketingActivityForm.Designer.cs b/TEMUKJD/KJDForms/SalesCenterForms/MarketingActivityForm.Designer.cs
index e43f49d..564c337 100644
--- a/TEMUKJD/KJDForms/SalesCenterForms/MarketingActivityForm.Designer.cs
+++ b/TEMUKJD/KJDForms/SalesCenterForms/MarketingActivityForm.Designer.cs
@@ -30,14 +30,16 @@ namespace TemuKJD.KJDForms.SalesCenterForms
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MarketingActivityForm));
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.ucGroupBoxEx3 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
+ this.chkSoloActivityProduct = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.chkIfLowCancel = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.actDiscount80 = new TemuKJD.KJDForms.SalesCenterForms.UcActivityDiscountCtrl();
this.object_6dcc57fe_428d_475c_90c2_d99d71a7014f = new TemuKJD.UserComponent.UcCheckBox(this.components);
@@ -52,7 +54,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms
this.panelEx2 = new DevComponents.DotNetBar.PanelEx();
this.chkFullShop = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.chkNoSaleProd = new TemuKJD.UserComponent.UcCheckBox(this.components);
- this.panel1 = new System.Windows.Forms.Panel();
+ this.panel2 = new System.Windows.Forms.Panel();
this.numOnSaleDays2 = new System.Windows.Forms.NumericUpDown();
this.numSaleCount = new System.Windows.Forms.NumericUpDown();
this.cmbDays = new System.Windows.Forms.ComboBox();
@@ -110,6 +112,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms
this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
this.panelEx1 = new DevComponents.DotNetBar.PanelEx();
this.btnClear = new DevComponents.DotNetBar.PanelEx();
+ this.panel1 = new System.Windows.Forms.Panel();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@@ -118,7 +121,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms
this.actDiscount80.SuspendLayout();
this.actDiscount85.SuspendLayout();
this.actDiscount70.SuspendLayout();
- this.panel1.SuspendLayout();
+ this.panel2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.numOnSaleDays2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.numSaleCount)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.numOnSaleDays)).BeginInit();
@@ -143,6 +146,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms
this.splitContainer4.Panel1.SuspendLayout();
this.splitContainer4.Panel2.SuspendLayout();
this.splitContainer4.SuspendLayout();
+ this.panel1.SuspendLayout();
this.SuspendLayout();
//
// splitContainer1
@@ -162,7 +166,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms
// splitContainer1.Panel2
//
this.splitContainer1.Panel2.Controls.Add(this.splitContainer3);
- this.splitContainer1.Size = new System.Drawing.Size(1424, 529);
+ this.splitContainer1.Size = new System.Drawing.Size(1398, 566);
this.splitContainer1.SplitterDistance = 120;
this.splitContainer1.TabIndex = 11;
//
@@ -173,6 +177,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms
| System.Windows.Forms.AnchorStyles.Right)));
this.ucGroupBoxEx3.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.ucGroupBoxEx3.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
+ this.ucGroupBoxEx3.Controls.Add(this.chkSoloActivityProduct);
this.ucGroupBoxEx3.Controls.Add(this.chkIfLowCancel);
this.ucGroupBoxEx3.Controls.Add(this.actDiscount80);
this.ucGroupBoxEx3.Controls.Add(this.actDiscount85);
@@ -181,14 +186,27 @@ namespace TemuKJD.KJDForms.SalesCenterForms
this.ucGroupBoxEx3.Controls.Add(this.panelEx2);
this.ucGroupBoxEx3.Controls.Add(this.chkFullShop);
this.ucGroupBoxEx3.Controls.Add(this.chkNoSaleProd);
- this.ucGroupBoxEx3.Controls.Add(this.panel1);
+ this.ucGroupBoxEx3.Controls.Add(this.panel2);
this.ucGroupBoxEx3.Location = new System.Drawing.Point(282, 2);
this.ucGroupBoxEx3.Name = "ucGroupBoxEx3";
- this.ucGroupBoxEx3.Size = new System.Drawing.Size(1140, 120);
+ this.ucGroupBoxEx3.Size = new System.Drawing.Size(1114, 120);
this.ucGroupBoxEx3.TabIndex = 666;
this.ucGroupBoxEx3.TabStop = false;
this.ucGroupBoxEx3.Text = "活动设置";
//
+ // chkSoloActivityProduct
+ //
+ this.chkSoloActivityProduct.AutoSize = true;
+ this.chkSoloActivityProduct.Checked = true;
+ this.chkSoloActivityProduct.CheckState = System.Windows.Forms.CheckState.Checked;
+ this.chkSoloActivityProduct.Location = new System.Drawing.Point(774, 27);
+ this.chkSoloActivityProduct.Name = "chkSoloActivityProduct";
+ this.chkSoloActivityProduct.Size = new System.Drawing.Size(99, 21);
+ this.chkSoloActivityProduct.TabIndex = 727;
+ this.chkSoloActivityProduct.Text = "报名单品活动";
+ this.chkSoloActivityProduct.UseVisualStyleBackColor = true;
+ this.chkSoloActivityProduct.Visible = false;
+ //
// chkIfLowCancel
//
this.chkIfLowCancel.AutoSize = true;
@@ -322,7 +340,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms
this.panelEx2.Cursor = System.Windows.Forms.Cursors.Hand;
this.panelEx2.DisabledBackColor = System.Drawing.Color.Empty;
this.panelEx2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.panelEx2.Location = new System.Drawing.Point(1050, 32);
+ this.panelEx2.Location = new System.Drawing.Point(1024, 32);
this.panelEx2.Name = "panelEx2";
this.panelEx2.Size = new System.Drawing.Size(70, 23);
this.panelEx2.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -364,22 +382,22 @@ namespace TemuKJD.KJDForms.SalesCenterForms
this.chkNoSaleProd.UseVisualStyleBackColor = true;
this.chkNoSaleProd.CheckedChanged += new System.EventHandler(this.chkNoSaleProd_CheckedChanged);
//
- // panel1
+ // panel2
//
- this.panel1.Controls.Add(this.numOnSaleDays2);
- this.panel1.Controls.Add(this.numSaleCount);
- this.panel1.Controls.Add(this.cmbDays);
- this.panel1.Controls.Add(this.label4);
- this.panel1.Controls.Add(this.label3);
- this.panel1.Controls.Add(this.label2);
- this.panel1.Controls.Add(this.numOnSaleDays);
- this.panel1.Controls.Add(this.label1);
- this.panel1.Controls.Add(this.label5);
- this.panel1.Location = new System.Drawing.Point(223, 23);
- this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(545, 26);
- this.panel1.TabIndex = 722;
- this.panel1.Visible = false;
+ this.panel2.Controls.Add(this.numOnSaleDays2);
+ this.panel2.Controls.Add(this.numSaleCount);
+ this.panel2.Controls.Add(this.cmbDays);
+ this.panel2.Controls.Add(this.label4);
+ this.panel2.Controls.Add(this.label3);
+ this.panel2.Controls.Add(this.label2);
+ this.panel2.Controls.Add(this.numOnSaleDays);
+ this.panel2.Controls.Add(this.label1);
+ this.panel2.Controls.Add(this.label5);
+ this.panel2.Location = new System.Drawing.Point(223, 24);
+ this.panel2.Name = "panel2";
+ this.panel2.Size = new System.Drawing.Size(545, 26);
+ this.panel2.TabIndex = 722;
+ this.panel2.Visible = false;
//
// numOnSaleDays2
//
@@ -585,8 +603,8 @@ namespace TemuKJD.KJDForms.SalesCenterForms
// splitContainer3.Panel2
//
this.splitContainer3.Panel2.Controls.Add(this.splitContainer4);
- this.splitContainer3.Size = new System.Drawing.Size(1424, 405);
- this.splitContainer3.SplitterDistance = 375;
+ this.splitContainer3.Size = new System.Drawing.Size(1398, 442);
+ this.splitContainer3.SplitterDistance = 412;
this.splitContainer3.TabIndex = 1;
//
// splitContainer2
@@ -605,7 +623,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms
//
this.splitContainer2.Panel2.Controls.Add(this.splitContainer5);
this.splitContainer2.Panel2.Padding = new System.Windows.Forms.Padding(0, 0, 4, 0);
- this.splitContainer2.Size = new System.Drawing.Size(1424, 375);
+ this.splitContainer2.Size = new System.Drawing.Size(1398, 412);
this.splitContainer2.SplitterDistance = 280;
this.splitContainer2.TabIndex = 0;
//
@@ -613,18 +631,18 @@ namespace TemuKJD.KJDForms.SalesCenterForms
//
this.dgvShop.AllowUserToAddRows = false;
this.dgvShop.AllowUserToDeleteRows = false;
- dataGridViewCellStyle7.BackColor = System.Drawing.Color.WhiteSmoke;
- this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle7;
+ dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke;
+ this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
this.dgvShop.BackgroundColor = System.Drawing.Color.White;
this.dgvShop.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
- this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle8;
+ dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+ this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colSelect,
@@ -641,7 +659,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms
this.dgvShop.ReadOnly = true;
this.dgvShop.RowHeadersWidth = 25;
this.dgvShop.RowTemplate.Height = 23;
- this.dgvShop.Size = new System.Drawing.Size(276, 375);
+ this.dgvShop.Size = new System.Drawing.Size(276, 412);
this.dgvShop.TabIndex = 7;
this.dgvShop.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellClick);
this.dgvShop.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellContentClick);
@@ -724,27 +742,27 @@ namespace TemuKJD.KJDForms.SalesCenterForms
// splitContainer5.Panel2
//
this.splitContainer5.Panel2.Controls.Add(this.dgvProduct);
- this.splitContainer5.Size = new System.Drawing.Size(1136, 375);
- this.splitContainer5.SplitterDistance = 128;
+ this.splitContainer5.Size = new System.Drawing.Size(1110, 412);
+ this.splitContainer5.SplitterDistance = 169;
this.splitContainer5.TabIndex = 0;
//
// dgvActivity
//
this.dgvActivity.AllowUserToAddRows = false;
this.dgvActivity.AllowUserToDeleteRows = false;
- dataGridViewCellStyle9.BackColor = System.Drawing.Color.WhiteSmoke;
- this.dgvActivity.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle9;
+ dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke;
+ this.dgvActivity.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3;
this.dgvActivity.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
this.dgvActivity.BackgroundColor = System.Drawing.Color.White;
this.dgvActivity.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle10.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- dataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
- this.dgvActivity.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle10;
+ 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.dgvActivity.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4;
this.dgvActivity.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvActivity.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colCheckActivity,
@@ -761,7 +779,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms
this.dgvActivity.Name = "dgvActivity";
this.dgvActivity.ReadOnly = true;
this.dgvActivity.RowTemplate.Height = 23;
- this.dgvActivity.Size = new System.Drawing.Size(1136, 128);
+ this.dgvActivity.Size = new System.Drawing.Size(1110, 169);
this.dgvActivity.TabIndex = 189;
this.dgvActivity.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvActivity_CellContentClick);
//
@@ -832,18 +850,18 @@ namespace TemuKJD.KJDForms.SalesCenterForms
//
this.dgvProduct.AllowUserToAddRows = false;
this.dgvProduct.AllowUserToDeleteRows = false;
- dataGridViewCellStyle11.BackColor = System.Drawing.Color.WhiteSmoke;
- this.dgvProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle11;
+ dataGridViewCellStyle5.BackColor = System.Drawing.Color.WhiteSmoke;
+ this.dgvProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle5;
this.dgvProduct.BackgroundColor = System.Drawing.Color.White;
this.dgvProduct.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle12.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
- this.dgvProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle12;
+ 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.dgvProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle6;
this.dgvProduct.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colCheckProduct,
@@ -867,7 +885,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms
this.dgvProduct.Name = "dgvProduct";
this.dgvProduct.ReadOnly = true;
this.dgvProduct.RowTemplate.Height = 23;
- this.dgvProduct.Size = new System.Drawing.Size(1136, 243);
+ this.dgvProduct.Size = new System.Drawing.Size(1110, 239);
this.dgvProduct.TabIndex = 188;
//
// colCheckProduct
@@ -1005,8 +1023,8 @@ namespace TemuKJD.KJDForms.SalesCenterForms
//
this.splitContainer4.Panel2.Controls.Add(this.panelEx1);
this.splitContainer4.Panel2.Controls.Add(this.btnClear);
- this.splitContainer4.Size = new System.Drawing.Size(1424, 26);
- this.splitContainer4.SplitterDistance = 1146;
+ this.splitContainer4.Size = new System.Drawing.Size(1398, 26);
+ this.splitContainer4.SplitterDistance = 1120;
this.splitContainer4.TabIndex = 3;
//
// statusBar
@@ -1017,7 +1035,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms
this.statusBar.Location = new System.Drawing.Point(0, 0);
this.statusBar.Margin = new System.Windows.Forms.Padding(0);
this.statusBar.Name = "statusBar";
- this.statusBar.Size = new System.Drawing.Size(1146, 26);
+ this.statusBar.Size = new System.Drawing.Size(1120, 26);
this.statusBar.TabIndex = 2;
//
// panelEx1
@@ -1070,17 +1088,32 @@ namespace TemuKJD.KJDForms.SalesCenterForms
this.btnClear.Text = "清空结果";
this.btnClear.Visible = false;
//
+ // panel1
+ //
+ this.panel1.BackColor = System.Drawing.Color.White;
+ this.panel1.Controls.Add(this.splitContainer1);
+ this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.panel1.Location = new System.Drawing.Point(1, 33);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(1398, 566);
+ this.panel1.TabIndex = 12;
+ //
// MarketingActivityForm
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
- this.BackColor = System.Drawing.Color.White;
- this.ClientSize = new System.Drawing.Size(1424, 529);
- this.Controls.Add(this.splitContainer1);
+ this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(98)))), ((int)(((byte)(200)))));
+ this.ClientSize = new System.Drawing.Size(1400, 600);
+ this.Controls.Add(this.panel1);
this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "MarketingActivityForm";
- this.Text = "店铺优化";
+ this.ShowMaximizeBox = true;
+ this.Text = "活动报名";
+ this.TitleText = "活动报名";
+ this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MarketingActivityForm_FormClosing);
this.Load += new System.EventHandler(this.MarketingActivityForm_Load);
this.VisibleChanged += new System.EventHandler(this.MarketingActivityForm_VisibleChanged);
+ this.Controls.SetChildIndex(this.panel1, 0);
this.splitContainer1.Panel1.ResumeLayout(false);
this.splitContainer1.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
@@ -1093,8 +1126,8 @@ namespace TemuKJD.KJDForms.SalesCenterForms
this.actDiscount85.PerformLayout();
this.actDiscount70.ResumeLayout(false);
this.actDiscount70.PerformLayout();
- this.panel1.ResumeLayout(false);
- this.panel1.PerformLayout();
+ this.panel2.ResumeLayout(false);
+ this.panel2.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.numOnSaleDays2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.numSaleCount)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.numOnSaleDays)).EndInit();
@@ -1120,6 +1153,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms
this.splitContainer4.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitContainer4)).EndInit();
this.splitContainer4.ResumeLayout(false);
+ this.panel1.ResumeLayout(false);
this.ResumeLayout(false);
}
@@ -1156,7 +1190,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms
private UserComponent.UcCheckBox object_6dcc57fe_428d_475c_90c2_d99d71a7014f;
private UserComponent.UcCheckBox ucCheckBox2;
private UserComponent.UcCheckBox ucCheckBox3;
- private System.Windows.Forms.Panel panel1;
+ private System.Windows.Forms.Panel panel2;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.NumericUpDown numOnSaleDays;
private System.Windows.Forms.Label label1;
@@ -1200,5 +1234,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms
private UserComponent.UcCheckBox chkIfLowCancel;
private System.Windows.Forms.NumericUpDown numOnSaleDays2;
private System.Windows.Forms.Label label5;
+ private System.Windows.Forms.Panel panel1;
+ private UserComponent.UcCheckBox chkSoloActivityProduct;
}
}
\ No newline at end of file
diff --git a/TEMUKJD/KJDForms/SalesCenterForms/MarketingActivityForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/MarketingActivityForm.cs
index 0e3d514..e85f6c4 100644
--- a/TEMUKJD/KJDForms/SalesCenterForms/MarketingActivityForm.cs
+++ b/TEMUKJD/KJDForms/SalesCenterForms/MarketingActivityForm.cs
@@ -21,8 +21,14 @@ using TemuKJD.BLL;
namespace TemuKJD.KJDForms.SalesCenterForms
{
- public partial class MarketingActivityForm : Form
+ public partial class MarketingActivityForm : LRBaseForm
{
+ public static MarketingActivityForm ActInstance { get; set; } = null;
+ ///
+ /// 单品参加活动时的单品id
+ ///
+ public ShopLoginInfo soloActivityShop { get; set; } = null;
+ public WarehouseProductSubOrderInfo soloActivityProduct { get; set; } = null;
private CheckBox chkSelectAll = null;
public CancellationTokenSource cancellationTokenSource { get; set; } = null;
public List lstActivityThematic { get; set; } = new List();
@@ -36,6 +42,38 @@ namespace TemuKJD.KJDForms.SalesCenterForms
InitializeComponent();
}
+ public MarketingActivityForm(ShopLoginInfo shop, WarehouseProductSubOrderInfo prod)
+ {
+ InitializeComponent();
+
+ if(shop != null && prod != null)
+ {
+ this.soloActivityShop = shop;
+ this.soloActivityProduct = prod;
+ ActInstance = this;
+ this.MaximizeBox = true;
+ this.Size = new Size(1400, 850);
+ RefreshSoloActivityCtrl();
+ }
+ }
+
+ ///
+ /// 刷新单品活动控件显示
+ ///
+ public void RefreshSoloActivityCtrl()
+ {
+ if (this.soloActivityProduct == null || this.soloActivityShop == null)
+ return;
+
+ var prod = soloActivityProduct;
+ chkFullShop.Visible = false;
+ chkNoSaleProd.Visible = false;
+ chkSoloActivityProduct.Visible = true;
+ chkSoloActivityProduct.Location = chkFullShop.Location;
+ chkSoloActivityProduct.Text = "报名单品活动 " + (prod.productName.Length > 60 ? prod.productName.Substring(0, 60) + "……" : prod.productName);
+ this.dgvProduct.Rows.Clear();
+ }
+
private void MarketingActivityForm_Load(object sender, EventArgs e)
{
chkSelectAll = dgvShop.Columns["colSelect"].AddHeaderCheckBox(HorizontalAlignment.Center, 0, 0, null, null, false);
@@ -133,6 +171,19 @@ namespace TemuKJD.KJDForms.SalesCenterForms
row.Cells["colLoginStatus"].Style.ForeColor = canUse ? Color.Green : Color.Red;
row.Cells["colCanUse"].Value = canUse;
}
+ if (soloActivityShop != null && row != null)
+ {
+ if (row.Cells["colShopId"].Value.ParseToString() == soloActivityShop.ShopId)
+ {
+ row.Visible = true;
+ row.Cells["colSelect"].Value = row.Cells["colCanUse"].Value;
+ }
+ else
+ {
+ row.Visible = false;
+ row.Cells["colSelect"].Value = false;
+ }
+ }
}
private void dgvShop_CellClick(object sender, DataGridViewCellEventArgs e)
@@ -220,12 +271,12 @@ namespace TemuKJD.KJDForms.SalesCenterForms
if (chkNoSaleProd.Checked)
{
chkFullShop.Checked = false;
- panel1.Visible = true;
+ panel2.Visible = true;
}
else
{
chkFullShop.Checked = true;
- panel1.Visible = false;
+ panel2.Visible = false;
}
}
@@ -715,6 +766,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms
Task.Run(() =>
{
+ //报名活动
SignActivity();
Invoke(new Action(() =>
@@ -882,6 +934,11 @@ namespace TemuKJD.KJDForms.SalesCenterForms
{
noSaleProdIdLst.Add("123");
}
+ if (soloActivityShop != null && soloActivityProduct != null)
+ {
+ noSaleProdIdLst.Clear();
+ noSaleProdIdLst.Add(soloActivityProduct.productId.ToString());
+ }
var jsonRst = GetActivityMatch(shop, activity.activityType, activity.activityThematicId, string.Join(",", noSaleProdIdLst));
if (jsonRst.Contains("指定的值含有无效的控制字符") || jsonRst.Contains("login") || jsonRst.Contains("Login"))
@@ -932,6 +989,31 @@ namespace TemuKJD.KJDForms.SalesCenterForms
if (jArr.Count() == 0)
{
+ if (soloActivityShop != null && soloActivityProduct != null)
+ {
+ Invoke(new Action(() =>
+ {
+ int rowId = dgvProduct.Rows.Add(
+ false,
+ shop.ShopId,
+ shop.ShopAccount,
+ activity.activityThematicId,
+ activity.activityThematicName,
+ null,//prod.pictureUrl,
+ "--", //prod.productName,
+ "--", //prod.productId,
+ "--", //prod.skcList.FirstOrDefault()?.skcId,
+ "--", //prod.skcList.FirstOrDefault()?.extCode,
+ activity.discount.Trim('0') + "折",
+ "--", //prod.suggestActivityStock,
+ "--", //prod.targetActivityStock,
+ activity.discount.Trim('0') + "折",
+ "--", //inventory
+ "商品 " + soloActivityProduct.productSkcId + " 不符合报名条件"
+ );
+ dgvProduct.Rows[rowId].Height = 30;
+ }));
+ }
continue;
}
@@ -1174,5 +1256,17 @@ namespace TemuKJD.KJDForms.SalesCenterForms
string refere = "https://agentseller.temu.com/stock/fully-mgt/sale-manage/main";
return HttpResponseBLL.PostResponse2(shop, url, body, refere);
}
+
+ private void MarketingActivityForm_FormClosing(object sender, FormClosingEventArgs e)
+ {
+ if (this.soloActivityProduct != null && this.soloActivityShop != null)
+ {
+ this.Visible = false;
+ // 隐藏窗口但不从任务栏中移除
+ this.Hide();
+ // 阻止窗口关闭
+ e.Cancel = true;
+ }
+ }
}
}
diff --git a/TEMUKJD/KJDForms/SalesCenterForms/MarketingActivityForm.resx b/TEMUKJD/KJDForms/SalesCenterForms/MarketingActivityForm.resx
index 250fc0f..088422a 100644
--- a/TEMUKJD/KJDForms/SalesCenterForms/MarketingActivityForm.resx
+++ b/TEMUKJD/KJDForms/SalesCenterForms/MarketingActivityForm.resx
@@ -210,4 +210,182 @@
True
+
+
+
+ AAABAAEAgIAQAAAAAABoKAAAFgAAACgAAACAAAAAAAEAAAEABAAAAAAAACgAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAgICAAMDAwAAAAP8AAP8AAAD//wD/AAAA/wD/AP//
+ AAD///8AAAAAAAAAAAAAAAAzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMQ
+ AAAAAAAAAAAAAAAAAAAAAAAAABM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZkzEAAAAAAAAAAAAAAAAAAAAAADOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZMwAAAAAAAAAAAAAAAAAAABOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZkzAAAAAAAAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmTEAAAAAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAAAAAAAA5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAAAAAADmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAAAA5mZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAADmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAGZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAJmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZAAAAAA
+ OZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmT
+ AAAAAZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmRAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZkwAAAZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZkwAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZMAAJmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZEAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTADmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkwCZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkRmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZOZmZOZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmP+JmZmZmZmZj///////
+ ///4OZmZj/eZmZmZmZmZmPg5OZmZmZuI//iIuZmZmZmZmZmZmZM5mZmZmZmZmZmZmb//+JmZmZmZmP//
+ //////////OZmP//uZmZmZmZmY//+ZmZOZf///////h5k5mZmZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZ
+ mZ/////////////4mZ///4mZmZmZmZP///uZmZmP////////+JmZmZmZmZmZkzmZmZmZmZmZmZmZj//4
+ mZmZmZmf////////////+Jmf//+JmZmZmZmb///4mZmY//////////+JmZmZmZmZmZM5mZmZmZmZmZmZ
+ mY//+JmZmZmZn/////////////mZmP//iZmZmZmZk///+5mZj/////iP////+JmZmZmZmZmTOZmZmZmZ
+ mZmZmZmP//iZmZmZmZ////iIiIiIiIiZOZj//4mZmZmZmZP///uZmf////eZmT////+ZmZmZmZmZkzmZ
+ mZmZmZmZmZmZj//4mZmZmZmf//+JmZmZmZmZk5mY//+JmZmZmZmT///7mZj///+ZmZmZj///uZmZmZmZ
+ mZM5mZmZmZmZmZmZmY//+JmZmZmZn///iZmZmZmZmZmZmP//iZmZN5k5k///+5mY///zk5mZOT///4mZ
+ mZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZmZ///4mZmZmZmZmZmZj//4mZmP/5k5P///uZmP//+ZmZmZmY
+ //+JmZmZmZmZkzmZmZmZmZmZmZmZj//4mZmZmZmf///4iIiIiIg5mZmY//+JOb//+JmT///7mZj//4mZ
+ mZmZmP//+ZmZmZmZmZM5mZmZmZmZmZmZmY//+JmZmZmZn///////////85mZmP//iZn///+Jk///+5mf
+ //+JmZmZmZj///mZmZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZmZ////////////+ZmZj//4mY////85v/
+ //uZmP//iZmZmZmY///5mZmZmZmZkzmZmZmZmZmZmZmZj//4mZmZmZmf////////////mZmY//+Jv///
+ //+Z///7mZj//4mZmZmZmP//+ZmZmZmZmZM5mZmZmZmZmZmZmY//+JmZmZmZn///////////+JmZmP//
+ if//////if//+5mY//+JmZmZmZj///mZmZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZmZ///////////4mZ
+ mZj//4j///////j///uZmP//iZmZmZmY///5mZmZmZmZkzmZmZmZmZmZmZmZj//4mZmZmZmf//+JMzMz
+ MzOZOZmY//////+D///////7mZj//4mZmZmZmP//+ZmZmZmZmZM5mZmZmZmZmZmZmY//+JmZmZmZn///
+ iZmZmZmZmZmZmP//////mY//////+5mY//+JmZmZmZj///mZmZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZ
+ mZ///4mZmZmZmZmZmZj/////+5mf//////uZmP//iZmZmZmY///5mZmZmZmZkzmZmZmZmZmZMzM5j//4
+ kzMzmZmf//+JMzMzMzM5mZmY/////4mTk//////7mZj//4mZmZmZmP//+ZmZmZmZmZM5mZmZmZmZmP//
+ /////////4mZn////////////4mZmP////+ZmZmP////+5mY//+JmZmZmZj///mZmZmZmZmTOZmZmZmZ
+ mY/////////////4mZ/////////////7mZj////7mZmZn/////uZmP//iZmZmZmY///5mZmZmZmZkzmZ
+ mZmZmZn//////////////5mf////////////+Jmf////iZmZk5P////4mZ///4mZmZmZmP//+ZmZmZmZ
+ mZM5mZmZmZmZj/////////////iZn/////////////iZmP///5mZmZmZj///+5mY//+JmZmZmZj//4mZ
+ mZmZmZmTOZmZmZmZmZ/////////////zmZP///////////+JmZP///uTmZmZmZj//4mZm///mZmZmZmZ
+ //85mZmZmZmZkzmZmZmZmZOZiIiIiIiIiIiImTmZOIiIiIiIiIiImTmZOIi5mZmZmZOZiIuZmZk4iZOZ
+ mZmZOZiDmZmZmZmZmZM5mZmZmZmZOZmZmZmZmZmZmZOZmZmZmZmZmZmZmZOZmZmZmZmZmZmZOZmZmZmZ
+ mZk5mZmZmZOZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmTuIiIiIs5mZmZmZmZ
+ mTu4i7mZmZmZmZmZmTMzmZOZmZkzOZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmTmbj///////+HmT
+ mZmZk4j/////iJmZmZk4iP////iZOZmZj/mZOZOIiIiIiIiIiDmZmZmZmZmZkzmZmZmZmZmZj///////
+ ///4mZk5k4///4iI///4OZOY////////iZOZmb/5mZmP///////////4mZmZmZmZmZM5mZmZmZmZn///
+ //////////mZmY///5mZmZP///iZmP////////+ZOZk/iZmY/////////////4mZmZmZmZmTOZmZmZmZ
+ mZ/////////////5mZ////+JmZmY////iZl/////////+ZmZP4mZP//////////////7mZmZmZmZkzmZ
+ mZmZmZmb////////////uZP/j///+HM3j/////+ZmYj///////iZmT+JmY//////////////+JmZmZmZ
+ mZM5mZmZmZmZmY//////////+JmT+Jv///////////iPmTmZOI/4mP//uTk/iZmP//////////////iZ
+ mZmZmZmTOZmZmZmZmZmf//////////mZmZmZ///////////5mZmZmZmTOZk///mZP4mZj///////////
+ ///4mZmZmZmZkzmZmZmZmZmTmP////////+JOZmZOY//////////iZmZmZmZmZk5mf/4mT+JmY//////
+ ////////+JmZmZmZmZM5mZmZmZmZmZn/////////mZmZmZk//////////zmZmZmZmZmZmTmP/zm/iZmP
+ //////////////iZmZmZmZmTOZmZmZmZmZk5v///////85OZmZkzmP////////iZmZmZmZmZmZmZn//4
+ /4mZj/////hzN4/////4mZmZmZmZkzmZmZmZmZmZmZj//////4mZmTmY/4j////////4mZmZmZmZmZmZ
+ mZj///+JmY////+JmZmY////+JmZmZmZmZM5mZmZmZmZmZmZ//////+ZmZmZj////////////4mZmZmZ
+ mZmZmZmb////+ZmP///4mZu5mY////iZmZmZmZmTOZmZmZmZmZmZOb/////4k5mZmP/////////////7
+ mZmZmZmZmZmZk/////OZv///+ZmP+Jmf///4mZmZmZmZkzmZmZmZmZmZmZmf////+ZmZmZj////////4
+ eI//+JmZmZmZmZmZmZP////4mb///4mY//+JmP//+5mZmZmZmZM5mZmZmZmZmZk5v/////uTmZmb////
+ ///4mZmX//iZmZmZmZmZmZmZ////+Jmf//95n///+Zj///OZmZmZmZmTOZmZmZmZmZmZmf//////mZmZ
+ mY//////+ZOZmZiJmZmZmZmZmZmZmY////+ZmP//+I////iP//+JmZmZmZmZkzmZmZmZmZmZmZj/////
+ /4mZmZmf/////5k5mZOZmTmZmZmZmZmZmZmP///4mZP/////////////OZmZmZmZmZM5mZmZmZmZmZk/
+ ///////zmZmZm/////iZmZmZmZmZmZmZmZmZmZmZj///85mZj///////////+JmZmZmZmZmTOZmZmZmZ
+ mZmZv///////+5mZmZmP///5mZmZmZmZmZmZmZmZmZmZmZ///3mZmZj//////////4mZmZmZmZmZkzmZ
+ mZmZmZmZmb///4j///uZmZmZmP//mTmZmZmZmZmZmZmZmZmZmZmY/4OZmZmZeP///////4eZmZmZmZmZ
+ mZM5mZmZmZmZmZmY/4OZOP+JmZmZmZmIiZOZmZmZmZmZmZmZmZmZmZmZmYiZmZmZmZk4iIiIiIOZmZmZ
+ mZmZmZmTOZmZmZmZmZmZmTOZmZkzmZmZmZmZmZk5mZmZmZmZmZmZmZmZmZmZmZmZk5mZmZmZmZmZmZmZ
+ mZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmTGZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZkwmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZADmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZkwA5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZMACZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmQAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAABmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTAAADmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAJmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmRAAAAA5mZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAACZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmQAAAAAAGZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAOZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkwAAAAAA
+ AAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTAA
+ AAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZMAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZkwAAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmTAAAAAAAAAAAAAAGZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZEAAAAAAAAAAAAAAAA5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZMAAAAAAAAAAAAAAAAAATmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZMQAAAAAAAAAAAAAAAAAAABOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZMQAAAAAAAAAAAAAAAAAAAAAAAzmZmZmZmZmZmZmZmZmZmZmZmZmZ
+ mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTMAAAAAAAAAAAAAAAAAAAAAAAAAAAEzMzMzMzMzMzMzMzMzMz
+ MzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMxAAAAAAAAAAAAAAD////////////////////////4AAAA
+ AAAAAAAAAB//////wAAAAAAAAAAAAAAD/////wAAAAAAAAAAAAAAAP////wAAAAAAAAAAAAAAAA////w
+ AAAAAAAAAAAAAAAAD///4AAAAAAAAAAAAAAAAAf//8AAAAAAAAAAAAAAAAAD//+AAAAAAAAAAAAAAAAA
+ Af//AAAAAAAAAAAAAAAAAAD//gAAAAAAAAAAAAAAAAAAf/wAAAAAAAAAAAAAAAAAAD/4AAAAAAAAAAAA
+ AAAAAAAf+AAAAAAAAAAAAAAAAAAAH/AAAAAAAAAAAAAAAAAAAA/wAAAAAAAAAAAAAAAAAAAP4AAAAAAA
+ AAAAAAAAAAAAB+AAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAADwAAAAAAAAAAAAAAAAAAAA8AA
+ AAAAAAAAAAAAAAAAAAOAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA
+ AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA
+ AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA
+ AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA
+ AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA
+ AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA
+ AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA
+ AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA
+ AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA
+ AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA
+ AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA
+ AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA
+ AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA
+ AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA
+ AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA
+ AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA
+ AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA
+ AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA
+ AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA
+ AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA
+ AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA
+ AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA
+ AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA
+ AAAAAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAPAAAAAAAAAAAAAAAAAAAAD4AAAAAAAAAAAAAAAAAAAA+AA
+ AAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAH8AAAAAAAAAAAAAAAAAAAD/AAAAAAAAAAAAAAAAAA
+ AA/4AAAAAAAAAAAAAAAAAAAf/AAAAAAAAAAAAAAAAAAAH/wAAAAAAAAAAAAAAAAAAD/+AAAAAAAAAAAA
+ AAAAAAB//wAAAAAAAAAAAAAAAAAA//+AAAAAAAAAAAAAAAAAAf//wAAAAAAAAAAAAAAAAAP//+AAAAAA
+ AAAAAAAAAAAH///4AAAAAAAAAAAAAAAAD////AAAAAAAAAAAAAAAAD////8AAAAAAAAAAAAAAAD/////
+ wAAAAAAAAAAAAAAD//////wAAAAAAAAAAAAAH////////////////////////w==
+
+
\ No newline at end of file
diff --git a/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsDetailForm.Designer.cs b/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsDetailForm.Designer.cs
index f2090a4..756b760 100644
--- a/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsDetailForm.Designer.cs
+++ b/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsDetailForm.Designer.cs
@@ -32,6 +32,9 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
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.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ShopOrderStatisticsDetailForm));
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.ucGroupBoxEx3 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
@@ -64,6 +67,8 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
this.colScore = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colNotes = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colOperate = new System.Windows.Forms.DataGridViewLinkColumn();
+ this.colActivity = new System.Windows.Forms.DataGridViewLinkColumn();
+ this.colChangePrice = new System.Windows.Forms.DataGridViewLinkColumn();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@@ -254,7 +259,9 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
this.colDiscount,
this.colScore,
this.colNotes,
- this.colOperate});
+ this.colOperate,
+ this.colActivity,
+ this.colChangePrice});
this.dgvOrder.Dock = System.Windows.Forms.DockStyle.Fill;
this.dgvOrder.Location = new System.Drawing.Point(4, 0);
this.dgvOrder.Name = "dgvOrder";
@@ -346,28 +353,28 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
// colSevenDaysSaleVolume
//
this.colSevenDaysSaleVolume.FillWeight = 75F;
- this.colSevenDaysSaleVolume.HeaderText = "近7日销量";
+ this.colSevenDaysSaleVolume.HeaderText = "7日销量";
this.colSevenDaysSaleVolume.Name = "colSevenDaysSaleVolume";
this.colSevenDaysSaleVolume.ReadOnly = true;
//
// colSevenDaysProfit
//
this.colSevenDaysProfit.FillWeight = 75F;
- this.colSevenDaysProfit.HeaderText = "近7日利润";
+ this.colSevenDaysProfit.HeaderText = "7日利润";
this.colSevenDaysProfit.Name = "colSevenDaysProfit";
this.colSevenDaysProfit.ReadOnly = true;
//
// colThirtyDaysSaleVolume
//
- this.colThirtyDaysSaleVolume.FillWeight = 85F;
- this.colThirtyDaysSaleVolume.HeaderText = "近30日销量";
+ this.colThirtyDaysSaleVolume.FillWeight = 75F;
+ this.colThirtyDaysSaleVolume.HeaderText = "30日销量";
this.colThirtyDaysSaleVolume.Name = "colThirtyDaysSaleVolume";
this.colThirtyDaysSaleVolume.ReadOnly = true;
//
// colThirtyDaysProfit
//
- this.colThirtyDaysProfit.FillWeight = 85F;
- this.colThirtyDaysProfit.HeaderText = "近30日利润";
+ this.colThirtyDaysProfit.FillWeight = 75F;
+ this.colThirtyDaysProfit.HeaderText = "30日利润";
this.colThirtyDaysProfit.Name = "colThirtyDaysProfit";
this.colThirtyDaysProfit.ReadOnly = true;
//
@@ -434,12 +441,36 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
//
// colOperate
//
- this.colOperate.FillWeight = 70F;
+ dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.colOperate.DefaultCellStyle = dataGridViewCellStyle3;
+ this.colOperate.FillWeight = 50F;
this.colOperate.HeaderText = "操作";
this.colOperate.Name = "colOperate";
this.colOperate.ReadOnly = true;
this.colOperate.Resizable = System.Windows.Forms.DataGridViewTriState.True;
//
+ // colActivity
+ //
+ dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.colActivity.DefaultCellStyle = dataGridViewCellStyle4;
+ this.colActivity.FillWeight = 50F;
+ this.colActivity.HeaderText = "报名活动";
+ this.colActivity.Name = "colActivity";
+ this.colActivity.ReadOnly = true;
+ this.colActivity.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+ this.colActivity.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+ //
+ // colChangePrice
+ //
+ dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.colChangePrice.DefaultCellStyle = dataGridViewCellStyle5;
+ this.colChangePrice.FillWeight = 50F;
+ this.colChangePrice.HeaderText = "一键调价";
+ this.colChangePrice.Name = "colChangePrice";
+ this.colChangePrice.ReadOnly = true;
+ this.colChangePrice.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+ this.colChangePrice.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+ //
// ShopOrderStatisticsDetailForm
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -502,5 +533,7 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
private System.Windows.Forms.DataGridViewTextBoxColumn colScore;
private System.Windows.Forms.DataGridViewTextBoxColumn colNotes;
private System.Windows.Forms.DataGridViewLinkColumn colOperate;
+ private System.Windows.Forms.DataGridViewLinkColumn colActivity;
+ private System.Windows.Forms.DataGridViewLinkColumn colChangePrice;
}
}
\ No newline at end of file
diff --git a/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsDetailForm.cs b/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsDetailForm.cs
index 65303bd..6e4bd1e 100644
--- a/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsDetailForm.cs
+++ b/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsDetailForm.cs
@@ -11,6 +11,9 @@ using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using TemuKJD.BaseForms;
+using TemuKJD.Extension;
+using TemuKJD.KJDForms.ProductForms;
+using TemuKJD.KJDForms.SalesCenterForms;
using TemuKJD.KJDForms.ToolForms;
using TemuKJD.ToolForms;
@@ -20,6 +23,7 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
{
public static ShopOrderStatisticsDetailForm orderStatisticsDetailInstance = null;
+ public bool IsAdjustPrice = false;
public List lstSubOrderInfo = new List();
ShopLoginInfo shop = null;
public ShopOrderStatisticsDetailForm(ShopLoginInfo shopInfo, List subOrderInfoLst = null)
@@ -52,6 +56,8 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
private void ShopOrderStatisticsDetailForm_Load(object sender, EventArgs e)
{
+ this.dgvOrder.AddMergeColumnHeader(new List() { "colOperate", "colActivity", "colChangePrice" }, "操作");
+
this.TitleText = shop?.ShopId + " - " + shop?.ShopAccount + " - 订单详情";
this.ShowOrderList();
}
@@ -95,7 +101,9 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
order.discount.ParseToDecimal() * 0.01m, //折扣
order.goodsAfsScore == null ? null : order.goodsAfsScore?.ToString("f2"), //品质分
order.purchasePriceInfo?.notes, //备注
- "设置进价"
+ "设置\r\n进价",
+ "报名\r\n活动",
+ "一键\r\n调价"
);
this.dgvOrder.Rows[rowId].Height = 50;
}
@@ -198,7 +206,50 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
}
}
break;
-
+ case "报名活动":
+ {
+ if (shop != null)
+ {
+ if (MarketingActivityForm.ActInstance != null)
+ {
+ MarketingActivityForm.ActInstance.soloActivityShop = shop;
+ MarketingActivityForm.ActInstance.soloActivityProduct = order;
+ MarketingActivityForm.ActInstance.RefreshSoloActivityCtrl();
+ MarketingActivityForm.ActInstance.ShowDialog();
+ }
+ else
+ {
+ MarketingActivityForm activityForm = new MarketingActivityForm(shop, order);
+ activityForm.ShowDialog();
+ }
+ }
+ }
+ break;
+ case "一键调价":
+ {
+ if (shop != null)
+ {
+ ProductChangePriceForm changePriceForm = new ProductChangePriceForm(shop, order);
+ changePriceForm.ShowDialog();
+ if (changePriceForm.AdjustPrice == true)
+ {
+ if (ShopOrderStatisticsForm.OrderStatisticsInstance != null)
+ {
+ ShopOrderStatisticsForm.OrderStatisticsInstance.CountPrice(shop);
+ ShopOrderStatisticsForm.OrderStatisticsInstance.RefreshShop();
+ }
+ dgvOrder.Rows[e.RowIndex].Cells["colDiscount"].Value = order.discount.ParseToDecimal() * 0.01m;
+ dgvOrder.Rows[e.RowIndex].Cells["colNotes"].Value = order.purchasePriceInfo?.notes;
+ dgvOrder.Rows[e.RowIndex].Cells["colTodayProfit"].Value = order.skuQuantityTotalInfo.todayProfit.Value.ToString("0.00");
+ dgvOrder.Rows[e.RowIndex].Cells["colSevenDaysProfit"].Value = order.skuQuantityTotalInfo.sevenDaysProfit.Value.ToString("0.00");
+ dgvOrder.Rows[e.RowIndex].Cells["colThirtyDaysProfit"].Value = order.skuQuantityTotalInfo.thirtyDaysProfit.Value.ToString("0.00");
+ dgvOrder.Rows[e.RowIndex].Cells["colGoodsValue"].Value = order.skuQuantityTotalInfo.goodsValue * 0.01m;
+ dgvOrder.Rows[e.RowIndex].Cells["colGoodsCost"].Value = order.skuQuantityTotalInfo.goodsCost * 0.01m;
+ }
+ }
+ }
+ break;
+
case "状态":
break;
default:
diff --git a/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsDetailForm.resx b/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsDetailForm.resx
index 2dd8227..1ae21f4 100644
--- a/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsDetailForm.resx
+++ b/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsDetailForm.resx
@@ -183,6 +183,12 @@
True
+
+ True
+
+
+ True
+
diff --git a/TEMUKJD/KJDForms/ShopForms/Statistics/ShopSetPurchasePriceForm.Designer.cs b/TEMUKJD/KJDForms/ShopForms/Statistics/ShopSetPurchasePriceForm.Designer.cs
index aaa4b14..61c5f87 100644
--- a/TEMUKJD/KJDForms/ShopForms/Statistics/ShopSetPurchasePriceForm.Designer.cs
+++ b/TEMUKJD/KJDForms/ShopForms/Statistics/ShopSetPurchasePriceForm.Designer.cs
@@ -49,7 +49,6 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
this.btnGetSelect = new DevComponents.DotNetBar.PanelEx();
this.btnGetNotGet = new DevComponents.DotNetBar.PanelEx();
this.dgvOrder = new TemuKJD.UserComponent.DataGridViewEx();
- this.btnSave = new DevComponents.DotNetBar.PanelEx();
this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.colSpu = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colSkc = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -59,6 +58,7 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
this.colSkuPrice = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colSkuPurchasePrice = new DevComponents.DotNetBar.Controls.DataGridViewDoubleInputColumn();
this.colAvailableBalance = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.btnSave = new DevComponents.DotNetBar.PanelEx();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@@ -345,32 +345,6 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
this.dgvOrder.Size = new System.Drawing.Size(630, 434);
this.dgvOrder.TabIndex = 5;
//
- // btnSave
- //
- this.btnSave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.btnSave.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
- this.btnSave.Cursor = System.Windows.Forms.Cursors.Hand;
- this.btnSave.DisabledBackColor = System.Drawing.Color.Empty;
- this.btnSave.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnSave.Location = new System.Drawing.Point(562, 3);
- this.btnSave.Name = "btnSave";
- this.btnSave.Size = new System.Drawing.Size(80, 23);
- this.btnSave.Style.Alignment = System.Drawing.StringAlignment.Center;
- this.btnSave.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- this.btnSave.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- this.btnSave.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
- this.btnSave.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
- this.btnSave.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
- this.btnSave.Style.ForeColor.Color = System.Drawing.Color.White;
- this.btnSave.Style.GradientAngle = 90;
- this.btnSave.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
- this.btnSave.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
- this.btnSave.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
- this.btnSave.TabIndex = 435;
- this.btnSave.TabStop = true;
- this.btnSave.Text = "保存";
- this.btnSave.Click += new System.EventHandler(this.btnSave_Click);
- //
// colSelect
//
this.colSelect.FillWeight = 28F;
@@ -450,6 +424,32 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
this.colAvailableBalance.ReadOnly = true;
this.colAvailableBalance.Visible = false;
//
+ // btnSave
+ //
+ this.btnSave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.btnSave.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+ this.btnSave.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.btnSave.DisabledBackColor = System.Drawing.Color.Empty;
+ this.btnSave.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.btnSave.Location = new System.Drawing.Point(562, 3);
+ this.btnSave.Name = "btnSave";
+ this.btnSave.Size = new System.Drawing.Size(80, 23);
+ this.btnSave.Style.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnSave.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnSave.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnSave.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+ this.btnSave.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+ this.btnSave.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
+ this.btnSave.Style.ForeColor.Color = System.Drawing.Color.White;
+ this.btnSave.Style.GradientAngle = 90;
+ this.btnSave.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnSave.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+ this.btnSave.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+ this.btnSave.TabIndex = 435;
+ this.btnSave.TabStop = true;
+ this.btnSave.Text = "保存";
+ this.btnSave.Click += new System.EventHandler(this.btnSave_Click);
+ //
// ShopSetPurchasePriceForm
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;