diff --git a/AllBase/AllBase.csproj b/AllBase/AllBase.csproj index 8420856..66a5c4f 100644 --- a/AllBase/AllBase.csproj +++ b/AllBase/AllBase.csproj @@ -194,6 +194,7 @@ + diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs index af01471..ea1dd43 100644 --- a/AllBase/BaseClass.cs +++ b/AllBase/BaseClass.cs @@ -27,8 +27,8 @@ namespace AllBase /// /// 版本ID /// - public static int VersionCount = 556; - //public static int VersionCount = 556; + public static int VersionCount = 558; + //public static int VersionCount = 558; /// /// 版本号 diff --git a/AllBase/Model/Result/ShopLoginInfo.cs b/AllBase/Model/Result/ShopLoginInfo.cs index 0310896..19e16e7 100644 --- a/AllBase/Model/Result/ShopLoginInfo.cs +++ b/AllBase/Model/Result/ShopLoginInfo.cs @@ -250,7 +250,7 @@ namespace AllBase.Model.Result public string LoginStatus { get; set; } } - public class ShopStatisticsInfo + public class ShopOrderStatisticsInfo { #region 店铺基础信息 public long shop_id { get; set; } @@ -363,6 +363,31 @@ namespace AllBase.Model.Result public decimal? withdrawCashAmount { get; set; } = 0; } + + public class ShopWorkStatisticsInfo + { + #region 店铺基础信息 + public long shop_id { get; set; } + public string shop_account { get; set; } + /// + /// 备注/分组 + /// + public string notes { get; set; } + #endregion + + #region 两个模块是否读取成功 + /// + /// 首页订单信息 + /// + public bool is_search_1 { get; set; } = false; + /// + /// 日到账金额信息 + /// + public bool is_search_2 { get; set; } = false; + public string err_msg { get; set; } + #endregion + } + //public class ShopStatisticsPermissionsInfo //{ // public bool? thirtyDaysSaleVolume { get; set; } diff --git a/AllBase/Model/Result/TemuCategoryTemplateInfo.cs b/AllBase/Model/Result/TemuCategoryTemplateInfo.cs new file mode 100644 index 0000000..6c64d89 --- /dev/null +++ b/AllBase/Model/Result/TemuCategoryTemplateInfo.cs @@ -0,0 +1,63 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AllBase.Model.Result +{ + public class TemuCategoryTemplateInfo + { + public long? templatePid { get; set; } + public int? pid { get; set; } + public int? refPid { get; set; } + public string name { get; set; } + public Dictionary lang2Name { get; set; } + public int? propertyValueType { get; set; } + public List valueUnit { get; set; } + public List values { get; set; } + public int? chooseMaxNum { get; set; } + public int? inputMaxNum { get; set; } + public string maxValue { get; set; } + public string minValue { get; set; } + public int? valuePrecision { get; set; } + public object showCondition { get; set; } + /// + /// 是否为必填项 + /// + public bool? required { get; set; } + public object requiredRuleType { get; set; } + public object requiredRule { get; set; } + public bool? isSale { get; set; } + public object parentSpecId { get; set; } + public bool? canNote { get; set; } + public bool? isImportant { get; set; } + public bool? isSku { get; set; } + public object mainSale { get; set; } + public int? feature { get; set; } + public object propertyChooseTitle { get; set; } + public object numberInputTitle { get; set; } + public int? valueRule { get; set; } + public int? controlType { get; set; } + public object hasSub { get; set; } + public int? showType { get; set; } + public object noteText { get; set; } + public object noteImgUrl { get; set; } + public int? parentTemplatePid { get; set; } + public object referenceType { get; set; } + public object templatePropertyValueParentList { get; set; } + } + + public class TemuCategoryTemplateValue + { + public int? vid { get; set; } + public string value { get; set; } + public Dictionary lang2Value { get; set; } + public object group { get; set; } + public object specId { get; set; } + public object parentVids { get; set; } + public object extendInfo { get; set; } + public object noteText { get; set; } + public object noteImgUrl { get; set; } + } +} diff --git a/AllBase/Model/Result/TemuCheckPriceInfo.cs b/AllBase/Model/Result/TemuCheckPriceInfo.cs index c4b13f7..14c5f75 100644 --- a/AllBase/Model/Result/TemuCheckPriceInfo.cs +++ b/AllBase/Model/Result/TemuCheckPriceInfo.cs @@ -28,6 +28,7 @@ namespace AllBase.Model.Result public string supplierPrice { get; set; } public List defaultSelectedSkuList { get; set; } public string extCode { get; set; } + public List skuList { get; set; } public List supplierPriceReviewInfoList { get; set; } public long? productCreatedAt { get; set; } } @@ -54,6 +55,7 @@ namespace AllBase.Model.Result public class TemuProductSkuInfo { + public int? priceReviewStatus { get; set; } // 状态3=作废 public string skuPreviewImage { get; set; } public long? skuId { get; set; } public int? supplierPriceValue { get; set; } diff --git a/TEMUKJD/KJD.csproj b/TEMUKJD/KJD.csproj index b3af271..2e9d591 100644 --- a/TEMUKJD/KJD.csproj +++ b/TEMUKJD/KJD.csproj @@ -352,11 +352,11 @@ ShopLoginForm.cs - + Form - - ShopStatisticsForm.cs + + ShopOrderStatisticsForm.cs Form @@ -364,6 +364,12 @@ ShopUpdateCookieForm.cs + + Form + + + ShopWorkStatisticsForm.cs + Form @@ -701,8 +707,11 @@ ShopUpdateCookieForm.cs - - ShopStatisticsForm.cs + + ShopOrderStatisticsForm.cs + + + ShopWorkStatisticsForm.cs SubAccountListForm.cs @@ -801,14 +810,12 @@ + - - - @@ -860,7 +867,6 @@ - diff --git a/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.Designer.cs b/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.Designer.cs index 39c4b4e..013df64 100644 --- a/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.Designer.cs +++ b/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.Designer.cs @@ -30,29 +30,34 @@ namespace TemuKJD.KJDForms.AdminForms private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); + this.chkSearchTime = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.pnlDetailOperate1 = new System.Windows.Forms.Panel(); + this.btnRePrice = new DevComponents.DotNetBar.PanelEx(); + this.label10 = new System.Windows.Forms.Label(); + this.txtPriceDown = new System.Windows.Forms.TextBox(); + this.label1 = new System.Windows.Forms.Label(); + this.label6 = new System.Windows.Forms.Label(); + this.btnMutliCancel = new DevComponents.DotNetBar.PanelEx(); + this.panelEx2 = new DevComponents.DotNetBar.PanelEx(); + this.btnMutliOk = new DevComponents.DotNetBar.PanelEx(); + this.dtpEndTime = new System.Windows.Forms.DateTimePicker(); + this.dtpStartTime = new System.Windows.Forms.DateTimePicker(); this.btnStop = new DevComponents.DotNetBar.PanelEx(); this.btnSearchPrice2 = new DevComponents.DotNetBar.PanelEx(); - this.btnMutliCancel = new DevComponents.DotNetBar.PanelEx(); - this.btnMutliOk = new DevComponents.DotNetBar.PanelEx(); - this.panelEx2 = new DevComponents.DotNetBar.PanelEx(); this.txtSkcId = new System.Windows.Forms.TextBox(); - this.btnRePrice = new DevComponents.DotNetBar.PanelEx(); - this.label6 = new System.Windows.Forms.Label(); this.chkSearchAllShop = new TemuKJD.UserComponent.UcCheckBox(this.components); this.btnEmpty = new DevComponents.DotNetBar.PanelEx(); - this.label1 = new System.Windows.Forms.Label(); this.btnSearchPrice = new DevComponents.DotNetBar.PanelEx(); - this.txtPriceDown = new System.Windows.Forms.TextBox(); this.label5 = new System.Windows.Forms.Label(); - this.label10 = new System.Windows.Forms.Label(); this.txtNotes = new System.Windows.Forms.TextBox(); this.label4 = new System.Windows.Forms.Label(); this.btnRefreshShop = new DevComponents.DotNetBar.PanelEx(); @@ -61,6 +66,8 @@ namespace TemuKJD.KJDForms.AdminForms this.label2 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label(); this.label7 = new System.Windows.Forms.Label(); + this.pnlDetailOperate2 = new System.Windows.Forms.Panel(); + this.pnlMutliCancelWithTitleWrong = new DevComponents.DotNetBar.PanelEx(); this.splitContainer3 = new System.Windows.Forms.SplitContainer(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); this.pbShopLoading = new System.Windows.Forms.PictureBox(); @@ -78,9 +85,6 @@ namespace TemuKJD.KJDForms.AdminForms this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.btnClear = new DevComponents.DotNetBar.PanelEx(); this.dgvPriceCheck = new TemuKJD.UserComponent.DataGridViewEx(); - this.splitContainer4 = new System.Windows.Forms.SplitContainer(); - this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage(); - this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colProdIndex = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colOrderId = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -98,14 +102,21 @@ namespace TemuKJD.KJDForms.AdminForms this.colAdjustPrice = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colNewPrice = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colPriceTimes = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colCreatTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colOk = new System.Windows.Forms.DataGridViewLinkColumn(); this.colCancel = new System.Windows.Forms.DataGridViewLinkColumn(); + this.colCancelWithTitleWrong = new System.Windows.Forms.DataGridViewLinkColumn(); this.colMsg = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.splitContainer4 = new System.Windows.Forms.SplitContainer(); + this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); this.splitContainer1.SuspendLayout(); this.ucGroupBoxEx1.SuspendLayout(); + this.pnlDetailOperate1.SuspendLayout(); + this.pnlDetailOperate2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).BeginInit(); this.splitContainer3.Panel1.SuspendLayout(); this.splitContainer3.Panel2.SuspendLayout(); @@ -151,21 +162,17 @@ namespace TemuKJD.KJDForms.AdminForms | System.Windows.Forms.AnchorStyles.Right))); this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx1.Controls.Add(this.chkSearchTime); + this.ucGroupBoxEx1.Controls.Add(this.pnlDetailOperate1); + this.ucGroupBoxEx1.Controls.Add(this.dtpEndTime); + this.ucGroupBoxEx1.Controls.Add(this.dtpStartTime); this.ucGroupBoxEx1.Controls.Add(this.btnStop); this.ucGroupBoxEx1.Controls.Add(this.btnSearchPrice2); - this.ucGroupBoxEx1.Controls.Add(this.btnMutliCancel); - this.ucGroupBoxEx1.Controls.Add(this.btnMutliOk); - this.ucGroupBoxEx1.Controls.Add(this.panelEx2); this.ucGroupBoxEx1.Controls.Add(this.txtSkcId); - this.ucGroupBoxEx1.Controls.Add(this.btnRePrice); - this.ucGroupBoxEx1.Controls.Add(this.label6); this.ucGroupBoxEx1.Controls.Add(this.chkSearchAllShop); this.ucGroupBoxEx1.Controls.Add(this.btnEmpty); - this.ucGroupBoxEx1.Controls.Add(this.label1); this.ucGroupBoxEx1.Controls.Add(this.btnSearchPrice); - this.ucGroupBoxEx1.Controls.Add(this.txtPriceDown); this.ucGroupBoxEx1.Controls.Add(this.label5); - this.ucGroupBoxEx1.Controls.Add(this.label10); this.ucGroupBoxEx1.Controls.Add(this.txtNotes); this.ucGroupBoxEx1.Controls.Add(this.label4); this.ucGroupBoxEx1.Controls.Add(this.btnRefreshShop); @@ -174,6 +181,7 @@ namespace TemuKJD.KJDForms.AdminForms this.ucGroupBoxEx1.Controls.Add(this.label2); this.ucGroupBoxEx1.Controls.Add(this.label3); this.ucGroupBoxEx1.Controls.Add(this.label7); + this.ucGroupBoxEx1.Controls.Add(this.pnlDetailOperate2); this.ucGroupBoxEx1.Location = new System.Drawing.Point(3, 2); this.ucGroupBoxEx1.Name = "ucGroupBoxEx1"; this.ucGroupBoxEx1.Size = new System.Drawing.Size(1338, 120); @@ -181,12 +189,185 @@ namespace TemuKJD.KJDForms.AdminForms this.ucGroupBoxEx1.TabStop = false; this.ucGroupBoxEx1.Text = "参数设置"; // + // chkSearchTime + // + this.chkSearchTime.AutoSize = true; + this.chkSearchTime.Checked = true; + this.chkSearchTime.CheckState = System.Windows.Forms.CheckState.Checked; + this.chkSearchTime.Location = new System.Drawing.Point(456, 58); + this.chkSearchTime.Name = "chkSearchTime"; + this.chkSearchTime.Size = new System.Drawing.Size(15, 14); + this.chkSearchTime.TabIndex = 827; + this.chkSearchTime.UseVisualStyleBackColor = true; + // + // pnlDetailOperate1 + // + this.pnlDetailOperate1.Controls.Add(this.btnRePrice); + this.pnlDetailOperate1.Controls.Add(this.label10); + this.pnlDetailOperate1.Controls.Add(this.txtPriceDown); + this.pnlDetailOperate1.Controls.Add(this.label1); + this.pnlDetailOperate1.Controls.Add(this.label6); + this.pnlDetailOperate1.Controls.Add(this.btnMutliCancel); + this.pnlDetailOperate1.Controls.Add(this.panelEx2); + this.pnlDetailOperate1.Controls.Add(this.btnMutliOk); + this.pnlDetailOperate1.Location = new System.Drawing.Point(761, 12); + this.pnlDetailOperate1.Name = "pnlDetailOperate1"; + this.pnlDetailOperate1.Size = new System.Drawing.Size(568, 76); + this.pnlDetailOperate1.TabIndex = 855; + // + // btnRePrice + // + this.btnRePrice.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnRePrice.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnRePrice.DisabledBackColor = System.Drawing.Color.Empty; + this.btnRePrice.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnRePrice.Location = new System.Drawing.Point(302, 20); + this.btnRePrice.Name = "btnRePrice"; + this.btnRePrice.Size = new System.Drawing.Size(98, 23); + this.btnRePrice.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnRePrice.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnRePrice.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnRePrice.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnRePrice.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnRePrice.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnRePrice.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnRePrice.Style.GradientAngle = 90; + this.btnRePrice.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnRePrice.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnRePrice.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnRePrice.TabIndex = 427; + this.btnRePrice.Text = "批量再次报价"; + this.btnRePrice.Click += new System.EventHandler(this.btnRePrice_Click); + // + // label10 + // + this.label10.AutoSize = true; + this.label10.Location = new System.Drawing.Point(142, 23); + this.label10.Name = "label10"; + this.label10.Size = new System.Drawing.Size(32, 17); + this.label10.TabIndex = 680; + this.label10.Text = "降价"; + // + // txtPriceDown + // + this.txtPriceDown.Location = new System.Drawing.Point(174, 20); + this.txtPriceDown.Margin = new System.Windows.Forms.Padding(0); + this.txtPriceDown.Name = "txtPriceDown"; + this.txtPriceDown.Size = new System.Drawing.Size(48, 23); + this.txtPriceDown.TabIndex = 679; + this.txtPriceDown.Text = "0.1"; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.ForeColor = System.Drawing.SystemColors.ControlDarkDark; + this.label1.Location = new System.Drawing.Point(142, 48); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(223, 17); + this.label1.TabIndex = 684; + this.label1.Text = "注：再次报价价格 = 原价 - 次数 × 降价"; + // + // label6 + // + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(225, 23); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(80, 17); + this.label6.TabIndex = 723; + this.label6.Text = "元（人民币）"; + // + // btnMutliCancel + // + this.btnMutliCancel.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnMutliCancel.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnMutliCancel.DisabledBackColor = System.Drawing.Color.Empty; + this.btnMutliCancel.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnMutliCancel.Location = new System.Drawing.Point(438, 49); + this.btnMutliCancel.Name = "btnMutliCancel"; + this.btnMutliCancel.Size = new System.Drawing.Size(98, 23); + this.btnMutliCancel.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnMutliCancel.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnMutliCancel.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnMutliCancel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnMutliCancel.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnMutliCancel.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnMutliCancel.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnMutliCancel.Style.GradientAngle = 90; + this.btnMutliCancel.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnMutliCancel.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnMutliCancel.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnMutliCancel.TabIndex = 772; + this.btnMutliCancel.Text = "批量拒绝报价"; + this.btnMutliCancel.Click += new System.EventHandler(this.btnMutliCancel_Click); + // + // panelEx2 + // + this.panelEx2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + 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(21, 20); + this.panelEx2.Name = "panelEx2"; + this.panelEx2.Size = new System.Drawing.Size(99, 23); + this.panelEx2.Style.Alignment = System.Drawing.StringAlignment.Center; + this.panelEx2.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.panelEx2.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.panelEx2.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.panelEx2.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.panelEx2.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.panelEx2.Style.ForeColor.Color = System.Drawing.Color.White; + this.panelEx2.Style.GradientAngle = 90; + this.panelEx2.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.panelEx2.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.panelEx2.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.panelEx2.TabIndex = 749; + this.panelEx2.Text = "批量还原标题"; + this.panelEx2.Click += new System.EventHandler(this.btnReturnProdName_Click); + // + // btnMutliOk + // + this.btnMutliOk.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnMutliOk.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnMutliOk.DisabledBackColor = System.Drawing.Color.Empty; + this.btnMutliOk.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnMutliOk.Location = new System.Drawing.Point(438, 20); + this.btnMutliOk.Name = "btnMutliOk"; + this.btnMutliOk.Size = new System.Drawing.Size(98, 23); + this.btnMutliOk.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnMutliOk.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnMutliOk.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnMutliOk.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnMutliOk.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnMutliOk.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnMutliOk.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnMutliOk.Style.GradientAngle = 90; + this.btnMutliOk.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnMutliOk.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnMutliOk.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnMutliOk.TabIndex = 768; + this.btnMutliOk.Text = "批量同意报价"; + this.btnMutliOk.Click += new System.EventHandler(this.btnMutliOk_Click); + // + // dtpEndTime + // + this.dtpEndTime.Location = new System.Drawing.Point(619, 54); + this.dtpEndTime.Name = "dtpEndTime"; + this.dtpEndTime.Size = new System.Drawing.Size(136, 23); + this.dtpEndTime.TabIndex = 826; + // + // dtpStartTime + // + this.dtpStartTime.Location = new System.Drawing.Point(477, 54); + this.dtpStartTime.Name = "dtpStartTime"; + this.dtpStartTime.Size = new System.Drawing.Size(136, 23); + this.dtpStartTime.TabIndex = 825; + // // btnStop // this.btnStop.CanvasColor = System.Drawing.SystemColors.Control; this.btnStop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnStop.DisabledBackColor = System.Drawing.Color.Empty; - this.btnStop.Location = new System.Drawing.Point(638, 83); + this.btnStop.Location = new System.Drawing.Point(690, 82); this.btnStop.Name = "btnStop"; this.btnStop.Size = new System.Drawing.Size(65, 24); this.btnStop.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -211,9 +392,9 @@ namespace TemuKJD.KJDForms.AdminForms this.btnSearchPrice2.Cursor = System.Windows.Forms.Cursors.Hand; this.btnSearchPrice2.DisabledBackColor = System.Drawing.Color.Empty; this.btnSearchPrice2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSearchPrice2.Location = new System.Drawing.Point(601, 54); + this.btnSearchPrice2.Location = new System.Drawing.Point(571, 82); this.btnSearchPrice2.Name = "btnSearchPrice2"; - this.btnSearchPrice2.Size = new System.Drawing.Size(102, 23); + this.btnSearchPrice2.Size = new System.Drawing.Size(113, 23); this.btnSearchPrice2.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnSearchPrice2.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnSearchPrice2.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -229,118 +410,13 @@ namespace TemuKJD.KJDForms.AdminForms this.btnSearchPrice2.Text = "读取待创建首单"; this.btnSearchPrice2.Click += new System.EventHandler(this.btnSearchPrice2_Click); // - // btnMutliCancel - // - this.btnMutliCancel.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnMutliCancel.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnMutliCancel.DisabledBackColor = System.Drawing.Color.Empty; - this.btnMutliCancel.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnMutliCancel.Location = new System.Drawing.Point(1193, 66); - this.btnMutliCancel.Name = "btnMutliCancel"; - this.btnMutliCancel.Size = new System.Drawing.Size(98, 23); - this.btnMutliCancel.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnMutliCancel.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnMutliCancel.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnMutliCancel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.btnMutliCancel.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.btnMutliCancel.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.btnMutliCancel.Style.ForeColor.Color = System.Drawing.Color.White; - this.btnMutliCancel.Style.GradientAngle = 90; - this.btnMutliCancel.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnMutliCancel.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnMutliCancel.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnMutliCancel.TabIndex = 772; - this.btnMutliCancel.Text = "批量拒绝报价"; - this.btnMutliCancel.Click += new System.EventHandler(this.btnMutliCancel_Click); - // - // btnMutliOk - // - this.btnMutliOk.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnMutliOk.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnMutliOk.DisabledBackColor = System.Drawing.Color.Empty; - this.btnMutliOk.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnMutliOk.Location = new System.Drawing.Point(1193, 37); - this.btnMutliOk.Name = "btnMutliOk"; - this.btnMutliOk.Size = new System.Drawing.Size(98, 23); - this.btnMutliOk.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnMutliOk.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnMutliOk.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnMutliOk.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.btnMutliOk.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.btnMutliOk.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.btnMutliOk.Style.ForeColor.Color = System.Drawing.Color.White; - this.btnMutliOk.Style.GradientAngle = 90; - this.btnMutliOk.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnMutliOk.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnMutliOk.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnMutliOk.TabIndex = 768; - this.btnMutliOk.Text = "批量同意报价"; - this.btnMutliOk.Click += new System.EventHandler(this.btnMutliOk_Click); - // - // panelEx2 - // - this.panelEx2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - 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(736, 37); - this.panelEx2.Name = "panelEx2"; - this.panelEx2.Size = new System.Drawing.Size(99, 23); - this.panelEx2.Style.Alignment = System.Drawing.StringAlignment.Center; - this.panelEx2.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.panelEx2.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.panelEx2.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.panelEx2.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.panelEx2.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.panelEx2.Style.ForeColor.Color = System.Drawing.Color.White; - this.panelEx2.Style.GradientAngle = 90; - this.panelEx2.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.panelEx2.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.panelEx2.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.panelEx2.TabIndex = 749; - this.panelEx2.Text = "批量还原标题"; - this.panelEx2.Click += new System.EventHandler(this.btnReturnProdName_Click); - // // txtSkcId // this.txtSkcId.Location = new System.Drawing.Point(495, 25); this.txtSkcId.Name = "txtSkcId"; - this.txtSkcId.Size = new System.Drawing.Size(208, 23); + this.txtSkcId.Size = new System.Drawing.Size(260, 23); this.txtSkcId.TabIndex = 733; // - // btnRePrice - // - this.btnRePrice.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnRePrice.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnRePrice.DisabledBackColor = System.Drawing.Color.Empty; - this.btnRePrice.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnRePrice.Location = new System.Drawing.Point(1036, 37); - this.btnRePrice.Name = "btnRePrice"; - this.btnRePrice.Size = new System.Drawing.Size(98, 23); - this.btnRePrice.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnRePrice.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnRePrice.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnRePrice.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.btnRePrice.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.btnRePrice.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.btnRePrice.Style.ForeColor.Color = System.Drawing.Color.White; - this.btnRePrice.Style.GradientAngle = 90; - this.btnRePrice.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnRePrice.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnRePrice.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnRePrice.TabIndex = 427; - this.btnRePrice.Text = "批量再次报价"; - this.btnRePrice.Click += new System.EventHandler(this.btnRePrice_Click); - // - // label6 - // - this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(959, 40); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(80, 17); - this.label6.TabIndex = 723; - this.label6.Text = "元（人民币）"; - // // chkSearchAllShop // this.chkSearchAllShop.AutoSize = true; @@ -375,25 +451,15 @@ namespace TemuKJD.KJDForms.AdminForms this.btnEmpty.Text = "重置"; this.btnEmpty.Click += new System.EventHandler(this.btnEmpty_Click); // - // label1 - // - this.label1.AutoSize = true; - this.label1.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.label1.Location = new System.Drawing.Point(876, 65); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(223, 17); - this.label1.TabIndex = 684; - this.label1.Text = "注：再次报价价格 = 原价 - 次数 × 降价"; - // // btnSearchPrice // this.btnSearchPrice.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnSearchPrice.Cursor = System.Windows.Forms.Cursors.Hand; this.btnSearchPrice.DisabledBackColor = System.Drawing.Color.Empty; this.btnSearchPrice.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSearchPrice.Location = new System.Drawing.Point(495, 54); + this.btnSearchPrice.Location = new System.Drawing.Point(456, 82); this.btnSearchPrice.Name = "btnSearchPrice"; - this.btnSearchPrice.Size = new System.Drawing.Size(102, 23); + this.btnSearchPrice.Size = new System.Drawing.Size(109, 23); this.btnSearchPrice.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnSearchPrice.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnSearchPrice.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -409,15 +475,6 @@ namespace TemuKJD.KJDForms.AdminForms this.btnSearchPrice.Text = "读取待核价"; this.btnSearchPrice.Click += new System.EventHandler(this.btnSearchPrice_Click); // - // txtPriceDown - // - this.txtPriceDown.Location = new System.Drawing.Point(908, 37); - this.txtPriceDown.Margin = new System.Windows.Forms.Padding(0); - this.txtPriceDown.Name = "txtPriceDown"; - this.txtPriceDown.Size = new System.Drawing.Size(48, 23); - this.txtPriceDown.TabIndex = 679; - this.txtPriceDown.Text = "0.1"; - // // label5 // this.label5.ForeColor = System.Drawing.SystemColors.ControlDarkDark; @@ -427,15 +484,6 @@ namespace TemuKJD.KJDForms.AdminForms this.label5.TabIndex = 685; this.label5.Text = "注：可使用逗号分隔，一次查询多个店铺"; // - // label10 - // - this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(876, 40); - this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(32, 17); - this.label10.TabIndex = 680; - this.label10.Text = "降价"; - // // txtNotes // this.txtNotes.Location = new System.Drawing.Point(61, 83); @@ -517,6 +565,39 @@ namespace TemuKJD.KJDForms.AdminForms this.label7.TabIndex = 734; this.label7.Text = "SkcId："; // + // pnlDetailOperate2 + // + this.pnlDetailOperate2.Controls.Add(this.pnlMutliCancelWithTitleWrong); + this.pnlDetailOperate2.Location = new System.Drawing.Point(761, 40); + this.pnlDetailOperate2.Name = "pnlDetailOperate2"; + this.pnlDetailOperate2.Size = new System.Drawing.Size(568, 75); + this.pnlDetailOperate2.TabIndex = 856; + this.pnlDetailOperate2.Visible = false; + // + // pnlMutliCancelWithTitleWrong + // + this.pnlMutliCancelWithTitleWrong.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.pnlMutliCancelWithTitleWrong.Cursor = System.Windows.Forms.Cursors.Hand; + this.pnlMutliCancelWithTitleWrong.DisabledBackColor = System.Drawing.Color.Empty; + this.pnlMutliCancelWithTitleWrong.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.pnlMutliCancelWithTitleWrong.Location = new System.Drawing.Point(438, 49); + this.pnlMutliCancelWithTitleWrong.Name = "pnlMutliCancelWithTitleWrong"; + this.pnlMutliCancelWithTitleWrong.Size = new System.Drawing.Size(98, 23); + this.pnlMutliCancelWithTitleWrong.Style.Alignment = System.Drawing.StringAlignment.Center; + this.pnlMutliCancelWithTitleWrong.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.pnlMutliCancelWithTitleWrong.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.pnlMutliCancelWithTitleWrong.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.pnlMutliCancelWithTitleWrong.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.pnlMutliCancelWithTitleWrong.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.pnlMutliCancelWithTitleWrong.Style.ForeColor.Color = System.Drawing.Color.White; + this.pnlMutliCancelWithTitleWrong.Style.GradientAngle = 90; + this.pnlMutliCancelWithTitleWrong.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.pnlMutliCancelWithTitleWrong.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.pnlMutliCancelWithTitleWrong.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.pnlMutliCancelWithTitleWrong.TabIndex = 772; + this.pnlMutliCancelWithTitleWrong.Text = "批量作废"; + this.pnlMutliCancelWithTitleWrong.Click += new System.EventHandler(this.pnlMutliCancelWithTitleWrong_Click); + // // splitContainer3 // this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill; @@ -576,18 +657,18 @@ namespace TemuKJD.KJDForms.AdminForms // this.dgvShop.AllowUserToAddRows = false; this.dgvShop.AllowUserToDeleteRows = false; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle8.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle8; this.dgvShop.BackgroundColor = System.Drawing.Color.White; this.dgvShop.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; + 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.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle9; this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colSelect, @@ -723,7 +804,7 @@ namespace TemuKJD.KJDForms.AdminForms 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(825, 380); + this.btnClear.Location = new System.Drawing.Point(718, 380); this.btnClear.Name = "btnClear"; this.btnClear.Size = new System.Drawing.Size(90, 21); this.btnClear.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -742,22 +823,22 @@ namespace TemuKJD.KJDForms.AdminForms this.btnClear.Text = "清空结果"; this.btnClear.Visible = false; // - // dgvAdjust + // dgvPriceCheck // this.dgvPriceCheck.AllowUserToAddRows = false; this.dgvPriceCheck.AllowUserToDeleteRows = false; - dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvPriceCheck.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle10.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvPriceCheck.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle10; this.dgvPriceCheck.BackgroundColor = System.Drawing.Color.White; this.dgvPriceCheck.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvPriceCheck.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvPriceCheck.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11; this.dgvPriceCheck.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvPriceCheck.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colCheck, @@ -777,59 +858,21 @@ namespace TemuKJD.KJDForms.AdminForms this.colAdjustPrice, this.colNewPrice, this.colPriceTimes, + this.colCreatTime, this.colOk, this.colCancel, + this.colCancelWithTitleWrong, this.colMsg}); this.dgvPriceCheck.Dock = System.Windows.Forms.DockStyle.Fill; this.dgvPriceCheck.Location = new System.Drawing.Point(0, 0); - this.dgvPriceCheck.Name = "dgvAdjust"; + this.dgvPriceCheck.Name = "dgvPriceCheck"; this.dgvPriceCheck.ReadOnly = true; + this.dgvPriceCheck.RowHeadersWidth = 36; this.dgvPriceCheck.RowTemplate.Height = 23; this.dgvPriceCheck.Size = new System.Drawing.Size(1056, 431); this.dgvPriceCheck.TabIndex = 187; - this.dgvPriceCheck.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvAdjust_CellContentClick); - this.dgvPriceCheck.Scroll += new System.Windows.Forms.ScrollEventHandler(this.dgvAdjust_Scroll); - // - // splitContainer4 - // - this.splitContainer4.Dock = System.Windows.Forms.DockStyle.Fill; - this.splitContainer4.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; - this.splitContainer4.Location = new System.Drawing.Point(0, 0); - this.splitContainer4.Name = "splitContainer4"; - // - // splitContainer4.Panel1 - // - this.splitContainer4.Panel1.Controls.Add(this.ucSplitPage1); - // - // splitContainer4.Panel2 - // - this.splitContainer4.Panel2.Controls.Add(this.statusBar); - this.splitContainer4.Size = new System.Drawing.Size(1344, 26); - this.splitContainer4.SplitterDistance = 282; - this.splitContainer4.TabIndex = 3; - // - // ucSplitPage1 - // - this.ucSplitPage1.CurrentPage = 1; - this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Left; - this.ucSplitPage1.Location = new System.Drawing.Point(0, 0); - this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0); - this.ucSplitPage1.Name = "ucSplitPage1"; - this.ucSplitPage1.Size = new System.Drawing.Size(282, 26); - this.ucSplitPage1.TabIndex = 5; - this.ucSplitPage1.TotalPage = 1; - this.ucSplitPage1.PageChange += new System.Action(this.ucSplitPage1_PageChange); - // - // 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(1058, 26); - this.statusBar.TabIndex = 2; + this.dgvPriceCheck.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvCheckPrice_CellContentClick); + this.dgvPriceCheck.Scroll += new System.Windows.Forms.ScrollEventHandler(this.dgvPriceCheck_Scroll); // // colCheck // @@ -838,14 +881,14 @@ namespace TemuKJD.KJDForms.AdminForms this.colCheck.ReadOnly = true; this.colCheck.Resizable = System.Windows.Forms.DataGridViewTriState.True; this.colCheck.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colCheck.Width = 30; + this.colCheck.Width = 28; // // colProdIndex // - this.colProdIndex.HeaderText = "商品序号"; + this.colProdIndex.HeaderText = "序号"; this.colProdIndex.Name = "colProdIndex"; this.colProdIndex.ReadOnly = true; - this.colProdIndex.Width = 68; + this.colProdIndex.Width = 40; // // colOrderId // @@ -903,8 +946,8 @@ namespace TemuKJD.KJDForms.AdminForms // // colProdName // - dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colProdName.DefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colProdName.DefaultCellStyle = dataGridViewCellStyle12; this.colProdName.HeaderText = "标题"; this.colProdName.Name = "colProdName"; this.colProdName.ReadOnly = true; @@ -912,8 +955,8 @@ namespace TemuKJD.KJDForms.AdminForms // // colSkuName // - dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colSkuName.DefaultCellStyle = dataGridViewCellStyle6; + dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colSkuName.DefaultCellStyle = dataGridViewCellStyle13; this.colSkuName.HeaderText = "规格名称"; this.colSkuName.Name = "colSkuName"; this.colSkuName.ReadOnly = true; @@ -931,7 +974,7 @@ namespace TemuKJD.KJDForms.AdminForms this.colExtCodePrice.HeaderText = "货号进价"; this.colExtCodePrice.Name = "colExtCodePrice"; this.colExtCodePrice.ReadOnly = true; - this.colExtCodePrice.Width = 68; + this.colExtCodePrice.Width = 65; // // colPrcie // @@ -952,14 +995,23 @@ namespace TemuKJD.KJDForms.AdminForms this.colNewPrice.HeaderText = "新报价"; this.colNewPrice.Name = "colNewPrice"; this.colNewPrice.ReadOnly = true; - this.colNewPrice.Width = 68; + this.colNewPrice.Width = 60; // // colPriceTimes // this.colPriceTimes.HeaderText = "报价次数"; this.colPriceTimes.Name = "colPriceTimes"; this.colPriceTimes.ReadOnly = true; - this.colPriceTimes.Width = 68; + this.colPriceTimes.Width = 65; + // + // colCreatTime + // + dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colCreatTime.DefaultCellStyle = dataGridViewCellStyle14; + this.colCreatTime.HeaderText = "创建时间"; + this.colCreatTime.Name = "colCreatTime"; + this.colCreatTime.ReadOnly = true; + this.colCreatTime.Width = 65; // // colOk // @@ -968,7 +1020,7 @@ namespace TemuKJD.KJDForms.AdminForms this.colOk.ReadOnly = true; this.colOk.Resizable = System.Windows.Forms.DataGridViewTriState.True; this.colOk.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colOk.Width = 68; + this.colOk.Width = 65; // // colCancel // @@ -977,7 +1029,16 @@ namespace TemuKJD.KJDForms.AdminForms this.colCancel.ReadOnly = true; this.colCancel.Resizable = System.Windows.Forms.DataGridViewTriState.True; this.colCancel.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colCancel.Width = 68; + this.colCancel.Width = 65; + // + // colCancelWithTitleWrong + // + this.colCancelWithTitleWrong.HeaderText = "作废待创建"; + this.colCancelWithTitleWrong.Name = "colCancelWithTitleWrong"; + this.colCancelWithTitleWrong.ReadOnly = true; + this.colCancelWithTitleWrong.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colCancelWithTitleWrong.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colCancelWithTitleWrong.Width = 80; // // colMsg // @@ -986,6 +1047,47 @@ namespace TemuKJD.KJDForms.AdminForms this.colMsg.ReadOnly = true; this.colMsg.Width = 160; // + // splitContainer4 + // + this.splitContainer4.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer4.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; + this.splitContainer4.Location = new System.Drawing.Point(0, 0); + this.splitContainer4.Name = "splitContainer4"; + // + // splitContainer4.Panel1 + // + this.splitContainer4.Panel1.Controls.Add(this.ucSplitPage1); + // + // splitContainer4.Panel2 + // + this.splitContainer4.Panel2.Controls.Add(this.statusBar); + this.splitContainer4.Size = new System.Drawing.Size(1344, 26); + this.splitContainer4.SplitterDistance = 282; + this.splitContainer4.TabIndex = 3; + // + // ucSplitPage1 + // + this.ucSplitPage1.CurrentPage = 1; + this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Left; + this.ucSplitPage1.Location = new System.Drawing.Point(0, 0); + this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0); + this.ucSplitPage1.Name = "ucSplitPage1"; + this.ucSplitPage1.Size = new System.Drawing.Size(282, 26); + this.ucSplitPage1.TabIndex = 5; + this.ucSplitPage1.TotalPage = 1; + this.ucSplitPage1.PageChange += new System.Action(this.ucSplitPage1_PageChange); + // + // 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(1058, 26); + this.statusBar.TabIndex = 2; + // // AdminProductPriceCheckForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -1002,6 +1104,9 @@ namespace TemuKJD.KJDForms.AdminForms this.splitContainer1.ResumeLayout(false); this.ucGroupBoxEx1.ResumeLayout(false); this.ucGroupBoxEx1.PerformLayout(); + this.pnlDetailOperate1.ResumeLayout(false); + this.pnlDetailOperate1.PerformLayout(); + this.pnlDetailOperate2.ResumeLayout(false); this.splitContainer3.Panel1.ResumeLayout(false); this.splitContainer3.Panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).EndInit(); @@ -1069,6 +1174,12 @@ namespace TemuKJD.KJDForms.AdminForms private System.Windows.Forms.DataGridViewTextBoxColumn colMessage; private DevComponents.DotNetBar.PanelEx btnSearchPrice2; private DevComponents.DotNetBar.PanelEx btnStop; + private System.Windows.Forms.DateTimePicker dtpEndTime; + private System.Windows.Forms.DateTimePicker dtpStartTime; + private UserComponent.UcCheckBox chkSearchTime; + private System.Windows.Forms.Panel pnlDetailOperate1; + private System.Windows.Forms.Panel pnlDetailOperate2; + private DevComponents.DotNetBar.PanelEx pnlMutliCancelWithTitleWrong; private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck; private System.Windows.Forms.DataGridViewTextBoxColumn colProdIndex; private System.Windows.Forms.DataGridViewTextBoxColumn colOrderId; @@ -1086,8 +1197,10 @@ namespace TemuKJD.KJDForms.AdminForms private System.Windows.Forms.DataGridViewTextBoxColumn colAdjustPrice; private System.Windows.Forms.DataGridViewTextBoxColumn colNewPrice; private System.Windows.Forms.DataGridViewTextBoxColumn colPriceTimes; + private System.Windows.Forms.DataGridViewTextBoxColumn colCreatTime; private System.Windows.Forms.DataGridViewLinkColumn colOk; private System.Windows.Forms.DataGridViewLinkColumn colCancel; + private System.Windows.Forms.DataGridViewLinkColumn colCancelWithTitleWrong; private System.Windows.Forms.DataGridViewTextBoxColumn colMsg; } } \ No newline at end of file diff --git a/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.cs b/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.cs index 23ac341..1d2248b 100644 --- a/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.cs +++ b/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.cs @@ -37,6 +37,9 @@ namespace TemuKJD.KJDForms.AdminForms this.dgvShop.AddSelectorColumn("colSelect"); this.dgvPriceCheck.AddSelectorColumn("colCheck"); + this.dtpEndTime.Value = DateTime.Now.Date.AddDays(1).AddMilliseconds(-1); + this.dtpStartTime.Value = DateTime.Now.Date.AddDays(-7); + if (BaseClass.SaLevel != 1) { //this.chkShowDelete.Visible = false; @@ -257,12 +260,13 @@ namespace TemuKJD.KJDForms.AdminForms } } - private void dgvAdjust_CellContentClick(object sender, DataGridViewCellEventArgs e) + private void dgvCheckPrice_CellContentClick(object sender, DataGridViewCellEventArgs e) { if (e.ColumnIndex < 0 || e.RowIndex < 0) return; string headerText = dgvPriceCheck.Columns[e.ColumnIndex].HeaderText; string orderId = dgvPriceCheck.Rows[e.RowIndex].Cells["colOrderId"].Value.ParseToString(); + string prodId = dgvPriceCheck.Rows[e.RowIndex].Cells["colProductId"].Value.ParseToString(); string accountId = dgvPriceCheck.Rows[e.RowIndex].Cells["colSupplierId"].Value.ParseToString(); var shop = lstAdminShopInfo.FirstOrDefault(v => v.ShopId == accountId); @@ -278,15 +282,22 @@ namespace TemuKJD.KJDForms.AdminForms cancelLowPrice(shop, orderId, dgvPriceCheck.Rows[e.RowIndex]); } break; + case "作废待创建": + { + this.cancelTitleWrongPrice(shop, prodId); + } + break; case "Skc图片": string url = dgvPriceCheck.Rows[e.RowIndex].Cells["colImgUrl"].Value.ParseToString().Replace("img.kwcdn.com", "img.cdnfe.com"); url = url.IndexOf("?") < 0 ? url : url.Substring(0, url.IndexOf("?")); ShowImgForm imgFrom = new ShowImgForm(url); imgFrom.ShowDialog(); break; - default: + case "": dgvPriceCheck.Rows[e.RowIndex].Cells["colCheck"].Value = !(bool)dgvPriceCheck.Rows[e.RowIndex].Cells["colCheck"].Value; break; + default: + break; } } @@ -391,6 +402,72 @@ namespace TemuKJD.KJDForms.AdminForms } } + private void cancelTitleWrongPrice(ShopLoginInfo shop, string prodId) + { + if (shop == null || string.IsNullOrEmpty(prodId)) + return; + + var rows = dgvPriceCheck.Rows.Cast().Where(r => r.Cells["colProductId"].Value.ParseToString() == prodId).ToList(); + if (rows.Count == 0) + return; + + //TemuSupplierPriceReviewInfo priceReview = null; + TemuCheckPriceInfo checkPriceInfo = null; + foreach (var price in this.lstCheckPriceInfo) + { + if (price.productId.ParseToString() == prodId) + { + checkPriceInfo = price; + break; + } + } + if (checkPriceInfo == null) + return; + + string data = "{\"adjustReason\":3,\"adjustItems\":["; + data += "{"; + data += "\"productName\":\"" + checkPriceInfo.productName + "\","; + data += "\"productSkcId\":" + checkPriceInfo.skcList.FirstOrDefault()?.skcId + ","; + data += "\"skuAdjustList\":["; + foreach (var sku in checkPriceInfo.skcList.FirstOrDefault()?.skuList) + { + // 2是正常状态，3是作废 + if (sku.priceReviewStatus != 2) + continue; + + data += "{\"targetPriceCurrency\":\"CNY\",\"oldPriceCurrency\":\"CNY\","; + data += "\"oldSupplyPrice\":" + sku.supplierPriceValue.ParseToInt() + ","; + data += "\"skuId\":" + sku.skuId + ","; + //data += "\"targetSupplyPrice\":" + Math.Max(1, sku.supplierPriceValue.ParseToInt() - 1) + ","; // 测试，每次减少1分 + data += "\"targetSupplyPrice\":" + 10 + ","; // 作废后价格改为1角钱，看到低价就不会再买 + data += "\"syncPurchasePrice\":1},"; + } + data = data.TrimEnd(','); + data += "],"; + data += "\"productId\":" + checkPriceInfo.productId + ","; + data += "\"supplierId\":" + checkPriceInfo.supplierId; + data += "}]}"; + var rst = priceAdjust(shop, data); + if (rst.Contains("登录过期") || rst.Contains("Invalid Login State")) + { + AdminShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false); + Invoke(new Action(() => + { + displayShopStatus(shop); + })); + } + foreach(var row in rows) + { + if (rst.Contains("\"success\":true")) + { + row.Cells["colMsg"].Value = "已作废商品-价格0.01"; + row.Cells["colNewPrice"].Value = 1 / 100.0; + } + else + row.Cells["colMsg"].Value = "作废商品失败" + rst; + } + } + private void cancelLowPrice(ShopLoginInfo shop, string orderId, DataGridViewRow row) { if (shop == null) @@ -416,11 +493,22 @@ namespace TemuKJD.KJDForms.AdminForms private void btnSearchPrice_Click(object sender, EventArgs e) { + this.pnlDetailOperate1.Visible = true; + this.pnlDetailOperate2.Visible = false; + this.dgvPriceCheck.Columns["colOk"].Visible = false; + this.dgvPriceCheck.Columns["colCancel"].Visible = true; + this.dgvPriceCheck.Columns["colCancelWithTitleWrong"].Visible = false; SearchPrice("待卖家确认"); } private void btnSearchPrice2_Click(object sender, EventArgs e) { + this.pnlDetailOperate2.Location = this.pnlDetailOperate1.Location; + this.pnlDetailOperate1.Visible = false; + this.pnlDetailOperate2.Visible = true; + this.dgvPriceCheck.Columns["colOk"].Visible = false; + this.dgvPriceCheck.Columns["colCancel"].Visible = false; + this.dgvPriceCheck.Columns["colCancelWithTitleWrong"].Visible = true; SearchPrice("待创建首单"); } @@ -434,6 +522,14 @@ namespace TemuKJD.KJDForms.AdminForms BaseMsgForm.ShowError("没有选择店铺！"); return; } + if (chkSearchTime.Checked) + { + if (dtpStartTime.Value.Date.AddMonths(3) < dtpEndTime.Value.Date.AddDays(1).AddMilliseconds(-1)) + { + BaseMsgForm.ShowError("一次最多只支持查询三个月！"); + return; + } + } this.dgvPriceCheck.Rows.Clear(); this.lstCheckPriceInfo.Clear(); @@ -463,7 +559,13 @@ namespace TemuKJD.KJDForms.AdminForms if (cancellationTokenSource.IsCancellationRequested) break; page++; - var searchRst = this.SearchForChainSupplier(shop, page, txtSkcId.Text.Trim().Trim(','), type); + long startTime = 0, endTime = 0; + if (chkSearchTime.Checked) + { + startTime = BaseClass.DateTimeToTimestampMilliseconds(dtpStartTime.Value.Date); + endTime = BaseClass.DateTimeToTimestampMilliseconds(dtpEndTime.Value.Date.AddDays(1).AddMilliseconds(-1)); + } + var searchRst = this.SearchForChainSupplier(shop, page, txtSkcId.Text.Trim().Trim(','), type, startTime, endTime); if (searchRst.Contains("登录过期") || searchRst.Contains("Invalid Login State")) { AdminShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false); @@ -488,14 +590,21 @@ namespace TemuKJD.KJDForms.AdminForms List checkPriceInfoTmpLst = new List(); foreach (var item in jArr) { - var jStr = JsonHelper.SerializeObject(item); TemuCheckPriceInfo priceInfo = JsonHelper.DeserializeJsonToObject(jStr); lstCheckPriceInfo.Add(priceInfo); checkPriceInfoTmpLst.Add(priceInfo); extCodeLst.Add(priceInfo.skcList.FirstOrDefault()?.extCode); } - var extCodePriceList = GetServerExtCodePriceLst(extCodeLst.Distinct().ToList()); + List extCodePriceList = new List(); + try + { + extCodePriceList = GetServerExtCodePriceLst(extCodeLst.Distinct().ToList()); + } + catch (Exception ex) + { + BaseMsgForm.ShowError("获取货号价格失败 " + ex.Message); + } foreach (var priceInfo in checkPriceInfoTmpLst) { prodIndex++; @@ -577,8 +686,10 @@ namespace TemuKJD.KJDForms.AdminForms suggestSupplyPrice,//核价 "", //新报价 reviewInfo.times, // 修改报价次数 + BaseClass.StampToDateTime((priceInfo.skcList.FirstOrDefault()?.statusTime.createdTime.ParseToLong() / 1000).ParseToInt()).ToString("yy/MM/dd HH:mm:ss"), "同意", "拒绝", + "作废", "" ); dgvPriceCheck.Rows[rowId].Height = 60; @@ -589,11 +700,10 @@ namespace TemuKJD.KJDForms.AdminForms } catch (Exception ex) { - BaseMsgForm.ShowError(ex.Message); + BaseMsgForm.ShowError("查询商品失败 " + ex.Message); break; } } - } } @@ -609,22 +719,28 @@ namespace TemuKJD.KJDForms.AdminForms } - private string SearchForChainSupplier (ShopLoginInfo shop, int page, string prodSkcIds = null, string type = "待卖家确认") + private string SearchForChainSupplier(ShopLoginInfo shop, int page, string prodSkcIds = null, string type = "待卖家确认", long startTime = 0, long endTime = 0) { string url = "https://agentseller.temu.com/api/kiana/mms/robin/searchForChainSupplier"; string body = ""; + body = "{\"pageSize\":100,\"pageNum\":" + page + ","; + if (startTime != 0 && endTime != 0) // 查询创建时间 + body += "\"timeType\":1,\"timeBegin\":" + startTime + ",\"timeEnd\":" + endTime + ","; if (type == "待卖家确认") - { - body = @"{""pageSize"":100,""pageNum"":" + page + @",""priceReviewStatusList"":[1],""secondarySelectStatusList"":[7],""supplierTodoTypeList"":[]}"; - if (!string.IsNullOrEmpty(prodSkcIds)) - body = @"{""pageSize"":100,""pageNum"":" + page + @",""priceReviewStatusList"":[1],""secondarySelectStatusList"":[7],""supplierTodoTypeList"":[],""productSkcIdList"":["+ prodSkcIds + "]}"; - } - if (type == "待创建首单") - { - body = @"{""pageSize"":100,""pageNum"":" + page + @",""secondarySelectStatusList"":[10],""supplierTodoTypeList"":[]}"; - if (!string.IsNullOrEmpty(prodSkcIds)) - body = @"{""pageSize"":100,""pageNum"":" + page + @",""secondarySelectStatusList"":[10],""supplierTodoTypeList"":[],""productSkcIdList"":[" + prodSkcIds + "]}"; - } + body += "\"priceReviewStatusList\":[1],\"secondarySelectStatusList\":[7],"; + else if (type == "待创建首单") + body += "\"secondarySelectStatusList\":[10],"; + body += "\"supplierTodoTypeList\":[],"; + if (!string.IsNullOrEmpty(prodSkcIds)) + body += "\"productSkcIdList\":[" + prodSkcIds + "],"; + body = body.TrimEnd(','); + body += "}"; + //if (type == "待创建首单") + //{ + // body = @"{""pageSize"":100,""pageNum"":" + page + @",""secondarySelectStatusList"":[10],""supplierTodoTypeList"":[]}"; + // if (!string.IsNullOrEmpty(prodSkcIds)) + // body = @"{""pageSize"":100,""pageNum"":" + page + @",""secondarySelectStatusList"":[10],""supplierTodoTypeList"":[],""productSkcIdList"":[" + prodSkcIds + "]}"; + //} string referer = "https://agentseller.temu.com/newon/product-select"; return KJDHttpResponse.PostResponse2(shop, url, body, referer); } @@ -661,6 +777,14 @@ namespace TemuKJD.KJDForms.AdminForms return KJDHttpResponse.PostResponse2(shop, url, body, referer); } + private string priceAdjust(ShopLoginInfo shop, string data) + { + string url = "https://agentseller.temu.com/api/kiana/mms/gmp/bg/magneto/api/price/priceAdjust/gmpProductBatchAdjustPrice"; + string body = data; + string referer = "https://agentseller.temu.com/newon/product-select"; + return KJDHttpResponse.PostResponse2(shop, url, body, referer); + } + private string editPriceProductNameBatchAdd(ShopLoginInfo shop, string productId) { string url = "https://agentseller.temu.com/lich-mms/audit/edit/task/product/batchAdd"; @@ -709,7 +833,8 @@ namespace TemuKJD.KJDForms.AdminForms if (!string.IsNullOrWhiteSpace(imgUrl)) image = GetHtml.GetUrlImg(imgUrl, out getImgError); if (!string.IsNullOrEmpty(getImgError)) - BaseMsgForm.ShowError(getImgError); + //BaseMsgForm.ShowError("图片加载失败 " + getImgError); + image = TemuKJD.Properties.Resources.errpic; try { @@ -726,7 +851,7 @@ namespace TemuKJD.KJDForms.AdminForms }); } - private void dgvAdjust_Scroll(object sender, ScrollEventArgs e) + private void dgvPriceCheck_Scroll(object sender, ScrollEventArgs e) { this.ShowDgvImg(); } @@ -1007,6 +1132,38 @@ namespace TemuKJD.KJDForms.AdminForms return JsonHelper.DeserializeJsonToList(jArr.ToString()); } + + private void pnlMutliCancelWithTitleWrong_Click(object sender, EventArgs e) + { + var rows = this.dgvPriceCheck.Rows.Cast().Where(r => r.Cells["colCheck"].Value.ParseToBool() == true).ToList(); + if (rows.Count == 0) + { + BaseMsgForm.ShowError("未选择要重新报价的商品！"); + return; + } + var productIds = rows.Select(r => r.Cells["colProductId"].Value.ParseToString()).Distinct().ToList(); + + this.pbLoading.Visible = true; + Task.Run(() => + { + foreach (var prodId in productIds) + { + var row = rows.FirstOrDefault(r => r.Cells["colProductId"].Value.ParseToString() == prodId); + if (row == null) + continue; + var shop = lstAdminShopInfo.FirstOrDefault(s => s.ShopId == row.Cells["colSupplierId"].Value.ParseToString()); + if (shop == null) + continue; + + this.cancelTitleWrongPrice(shop, prodId); + } + + Invoke(new Action(() => + { + this.pbLoading.Visible = false; + })); + }); + } } public class PriceCheckConfig diff --git a/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.resx b/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.resx index 3455eb7..a23f6f6 100644 --- a/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.resx +++ b/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.resx @@ -189,12 +189,18 @@ True + + True + True True + + True + True diff --git a/TEMUKJD/KJDForms/ProductForms/PriceManageForm.cs b/TEMUKJD/KJDForms/ProductForms/PriceManageForm.cs index f49fe8f..919e775 100644 --- a/TEMUKJD/KJDForms/ProductForms/PriceManageForm.cs +++ b/TEMUKJD/KJDForms/ProductForms/PriceManageForm.cs @@ -650,7 +650,8 @@ namespace TemuKJD.KJDForms.ProductForms if (!string.IsNullOrWhiteSpace(imgUrl)) image = GetHtml.GetUrlImg(imgUrl, out getImgError); if (!string.IsNullOrEmpty(getImgError)) - BaseMsgForm.ShowError(getImgError); + //BaseMsgForm.ShowError("图片加载失败 " + getImgError); + image = TemuKJD.Properties.Resources.errpic; try { diff --git a/TEMUKJD/KJDForms/ProductForms/SaleStockUpForm.cs b/TEMUKJD/KJDForms/ProductForms/SaleStockUpForm.cs index 003baf7..b8836db 100644 --- a/TEMUKJD/KJDForms/ProductForms/SaleStockUpForm.cs +++ b/TEMUKJD/KJDForms/ProductForms/SaleStockUpForm.cs @@ -1241,7 +1241,8 @@ namespace TemuKJD.KJDForms.ProductForms if (!string.IsNullOrWhiteSpace(imgUrl)) image = GetHtml.GetUrlImg(imgUrl, out getImgError); if (!string.IsNullOrEmpty(getImgError)) - BaseMsgForm.ShowError(getImgError); + //BaseMsgForm.ShowError("图片加载失败 " + getImgError); + image = TemuKJD.Properties.Resources.errpic; try { diff --git a/TEMUKJD/KJDForms/ProductSelectForms/DbProductListForm.cs b/TEMUKJD/KJDForms/ProductSelectForms/DbProductListForm.cs index bfbdb89..64ba50e 100644 --- a/TEMUKJD/KJDForms/ProductSelectForms/DbProductListForm.cs +++ b/TEMUKJD/KJDForms/ProductSelectForms/DbProductListForm.cs @@ -185,7 +185,8 @@ namespace TemuKJD.KJDForms.ProductSelectForms if (!string.IsNullOrWhiteSpace(imgUrl)) image = GetHtml.GetUrlImg(imgUrl, out getImgError); if (!string.IsNullOrEmpty(getImgError)) - BaseMsgForm.ShowError(getImgError); + //BaseMsgForm.ShowError("图片加载失败 " + getImgError); + image = TemuKJD.Properties.Resources.errpic; try { diff --git a/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs b/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs index 39b5f56..07b9238 100644 --- a/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs +++ b/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs @@ -34,6 +34,75 @@ namespace TemuKJD.KJDForms.ProductSelectForms List lstDbPrice = new List(); List lstCustomImg = new List(); Dictionary dicCustomImg = new Dictionary(); + List lstExtCodeFleeceInShoes = new List() { + "DZ-GM-857", + "DZ-GM-971", + "DZ-GM-TY02", + "DZ-BM-TY07", + "058-2039", + "161-8", + "166-8", + "607-8", + "307-8", + "707", + "GM-909", + "DZ-808", + "DZ-YD607", + "DZ-YD608", + "DZ--D-3", + "DZ-GM-988", + "DZ-GM-966", + "DZ-GM-B002", + "DZ-GM-U001", + "DZ-GM-X004", + "BM-DF01", + "DZ-BM-W620", + "DZ-GM-BSX05", + "DZ-BM-HT700", + "BM-D-5", + "DZ-GM-CF001", + "DZ-GM-CF20", + "GM-D-6", + "BM-D-8", + "DZ-GM-602", + "DZ-GM-610", + "DZ-GM-990", + "DZ-GM-HT710", + "DZ-GM-J004", + "DZ-BM-N006", + "GM-QXR01", + "GM-S85", + "DZ-GM-S616", + "DZ-GM-SX08", + "DZ-GM-XR06", + "DZ-GM-XR08", + "GM-YD609", + "BM-YH05", + "BM-YH07", + "GM-ZH001", + "GM-ZH002", + "5922", + "5928", + "5169", + "5268", + "5921", + "5627", + "5777", + "5829", + "5866", + "5888", + "5621", + "5925", + "5926", + "5927", + "5929", + "5931", + "5932", + "5963", + "5965", + "5966", + "5968", + }; public DbProductSelectListManageForm() { @@ -206,7 +275,8 @@ namespace TemuKJD.KJDForms.ProductSelectForms if (!string.IsNullOrWhiteSpace(imgUrl)) image = GetHtml.GetUrlImg(imgUrl, out getImgError); if (!string.IsNullOrEmpty(getImgError)) - BaseMsgForm.ShowError(getImgError); + //BaseMsgForm.ShowError("图片加载失败 " + getImgError); + image = TemuKJD.Properties.Resources.errpic; try { @@ -812,6 +882,22 @@ namespace TemuKJD.KJDForms.ProductSelectForms return "上传失败 " + html; } + List categoryTemplateList = new List(); + var propTemplateRst = QueryCategoryTemplate(shop, prodParam.productDraftId.ParseToString(), catId.ParseToString()); + if (propTemplateRst.Contains("\"success\":true")) + { + try + { + JObject jObj = JObject.Parse(propTemplateRst); + var PropLstStr = JsonHelper.SerializeObject(jObj["result"]["properties"]); + categoryTemplateList.AddRange(JsonHelper.DeserializeJsonToList(PropLstStr)); + } + catch (Exception ex) + { + } + + } + prodParam.carouselImageI18nReqs = prodInfo.carouselImageI18nVOList; prodParam.carouselImageUrls = prodInfo.carouselImageUrls; @@ -819,7 +905,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms List realCarouselImageUrls = new List(); realCarouselImageUrls.AddRange(prodInfo.carouselImageUrls); - if (chkCustomPic.Checked) + if (chkCustomPic.Checked) // 上传自定义图片 { for (int i = 0; i < prodParam.carouselImageUrls.Count; i++) { @@ -1019,6 +1105,41 @@ namespace TemuKJD.KJDForms.ProductSelectForms valueExtendInfo = "" }); } + var prop = categoryTemplateList.FirstOrDefault(p => p.name.Contains("内里是否加绒")); + if (prop != null && prop.required == true && !prodParam.productPropertyReqs.Any(p => p.propName == prop.name)) + { + if (lstExtCodeFleeceInShoes.Contains(dbProd.ext_code) || + lstExtCodeFleeceInShoes.Any(c => (dbProd.ext_code.Contains("-" + c)))) + { + prodParam.productPropertyReqs.Add(new ProductPropertyReqsItem + { + valueUnit = "", + propValue = "是", + propName = "内里是否加绒", + refPid = prop.refPid.ParseToLong(), + vid = 404104, + controlType = 1, + pid = prop.pid.ParseToLong(), + templatePid = prop.templatePid, + valueExtendInfo = "" + }); + } + else + { + prodParam.productPropertyReqs.Add(new ProductPropertyReqsItem + { + valueUnit = "", + propValue = "否", + propName = "内里是否加绒", + refPid = prop.refPid.ParseToLong(), + vid = 404105, + controlType = 1, + pid = prop.pid.ParseToLong(), + templatePid = prop.templatePid, + valueExtendInfo = "" + }); + } + } prodParam.productSaleExtAttrReq = new ProductSaleExtAttrReq { bodyShape = prodInfo.productSaleExtAttr.bodyShape, @@ -1034,7 +1155,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms } catch (Exception ex) { - BaseMsgForm.ShowError(ex.Message); + BaseMsgForm.ShowError("商品属性转换失败 " + ex.Message); } } prodParam.productWhExtAttrReq = new ProductWhExtAttrReq() @@ -1591,6 +1712,15 @@ namespace TemuKJD.KJDForms.ProductSelectForms return KJDHttpResponse.PostResponse2(shop, url, body, refere); } + private string QueryCategoryTemplate(ShopLoginInfo shop, string draftId, string catId) + { + string url = "https://agentseller.temu.com/anniston-agent-seller/category/template/query"; + string body = @"{""catId"":" + catId + @",""langList"":[""en""]}"; + + string refere = "https://agentseller.temu.com/goods/edit?productDraftId=" + draftId + "&from=productDraftList"; + return KJDHttpResponse.PostResponse2(shop, url, body, refere); + } + private string CheckImgMd5(ShopLoginInfo shop, string draftId, string parentSpecId, string fileMd5) { string url = "https://agentseller.temu.com/phoenix-mms/material/queryByMd5"; @@ -1979,7 +2109,7 @@ Content-Disposition: form-data; name=""upload_sign"" catch (Exception ex) { //Console.WriteLine("An error occurred: " + ex.Message); - BaseMsgForm.ShowError(ex.Message); + BaseMsgForm.ShowError("打开自定义图片失败 " + ex.Message); return; } } diff --git a/TEMUKJD/KJDForms/ProductSelectForms/DbProductUserSelectForm.cs b/TEMUKJD/KJDForms/ProductSelectForms/DbProductUserSelectForm.cs index 9dc3185..04eba06 100644 --- a/TEMUKJD/KJDForms/ProductSelectForms/DbProductUserSelectForm.cs +++ b/TEMUKJD/KJDForms/ProductSelectForms/DbProductUserSelectForm.cs @@ -506,7 +506,8 @@ namespace TemuKJD.KJDForms.ProductSelectForms if (!string.IsNullOrWhiteSpace(imgUrl)) image = GetHtml.GetUrlImg(imgUrl, out getImgError); if (!string.IsNullOrEmpty(getImgError)) - BaseMsgForm.ShowError(getImgError); + //BaseMsgForm.ShowError("图片加载失败 " + getImgError); + image = TemuKJD.Properties.Resources.errpic; try { diff --git a/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.cs b/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.cs index e844e68..e9e6009 100644 --- a/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.cs +++ b/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.cs @@ -205,7 +205,7 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms if (!string.IsNullOrWhiteSpace(imgUrl)) image = GetHtml.GetUrlImg(imgUrl, out getImgError); if (!string.IsNullOrEmpty(getImgError)) - BaseMsgForm.ShowError(getImgError); + BaseMsgForm.ShowError("图片加载失败" + getImgError); try { @@ -1116,7 +1116,7 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms } catch (Exception ex) { - BaseMsgForm.ShowError(ex.Message); + BaseMsgForm.ShowError("商品属性转换失败 " + ex.Message); } } prodParam.productWhExtAttrReq = new ProductWhExtAttrReq() diff --git a/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdUserSelectForm.cs b/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdUserSelectForm.cs index afdccdd..718b7ad 100644 --- a/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdUserSelectForm.cs +++ b/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdUserSelectForm.cs @@ -512,7 +512,8 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms if (!string.IsNullOrWhiteSpace(imgUrl)) image = GetHtml.GetUrlImg(imgUrl, out getImgError); if (!string.IsNullOrEmpty(getImgError)) - BaseMsgForm.ShowError(getImgError); + //BaseMsgForm.ShowError("图片加载失败 " + getImgError); + image = TemuKJD.Properties.Resources.errpic; try { diff --git a/TEMUKJD/KJDForms/ShopForms/ReturnPackageDetailForm.cs b/TEMUKJD/KJDForms/ShopForms/ReturnPackageDetailForm.cs index 6b5e518..bef42b2 100644 --- a/TEMUKJD/KJDForms/ShopForms/ReturnPackageDetailForm.cs +++ b/TEMUKJD/KJDForms/ShopForms/ReturnPackageDetailForm.cs @@ -343,6 +343,7 @@ namespace TemuKJD.KJDForms.ShopForms specName = string.IsNullOrWhiteSpace(pack.secondarySaleSpec) ? pack.mainSaleSpec : pack.secondarySaleSpec }; + string imgBase64 = ""; Image image = null; string getImgError = ""; string imgUrl = pack.thumbUrl.Replace("https:", "http:"); @@ -355,16 +356,19 @@ namespace TemuKJD.KJDForms.ShopForms { Invoke(new Action(() => { - BaseMsgForm.ShowError(getImgError); + BaseMsgForm.ShowError("图片加载失败 " + getImgError); + //image = TemuKJD.Properties.Resources.errpic; })); } } - string imgBase64 = ""; - using (MemoryStream memoryStream = new MemoryStream()) + else { - image.Save(memoryStream, System.Drawing.Imaging.ImageFormat.Jpeg); - byte[] imageBytes = memoryStream.ToArray(); - imgBase64 = Convert.ToBase64String(imageBytes); + using (MemoryStream memoryStream = new MemoryStream()) + { + image.Save(memoryStream, System.Drawing.Imaging.ImageFormat.Jpeg); + byte[] imageBytes = memoryStream.ToArray(); + imgBase64 = Convert.ToBase64String(imageBytes); + } } TemuReturnPackageDetailParam packageParam = new TemuReturnPackageDetailParam @@ -518,7 +522,8 @@ namespace TemuKJD.KJDForms.ShopForms if (!string.IsNullOrWhiteSpace(imgUrl)) image = GetHtml.GetUrlImg(imgUrl, out getImgError); if (!string.IsNullOrEmpty(getImgError)) - BaseMsgForm.ShowError(getImgError); + //BaseMsgForm.ShowError("图片加载失败 " + getImgError); + image = TemuKJD.Properties.Resources.errpic; try { diff --git a/TEMUKJD/KJDForms/ShopForms/ShopForm.Designer.cs b/TEMUKJD/KJDForms/ShopForms/ShopForm.Designer.cs index 1620ff4..b6b000f 100644 --- a/TEMUKJD/KJDForms/ShopForms/ShopForm.Designer.cs +++ b/TEMUKJD/KJDForms/ShopForms/ShopForm.Designer.cs @@ -30,17 +30,19 @@ { System.Windows.Forms.TreeNode treeNode1 = new System.Windows.Forms.TreeNode("店铺列表"); System.Windows.Forms.TreeNode treeNode2 = new System.Windows.Forms.TreeNode("子账号管理"); - System.Windows.Forms.TreeNode treeNode3 = new System.Windows.Forms.TreeNode("订单销售统计"); - System.Windows.Forms.TreeNode treeNode4 = new System.Windows.Forms.TreeNode("运费模板"); - System.Windows.Forms.TreeNode treeNode5 = new System.Windows.Forms.TreeNode("高级运费模板"); - System.Windows.Forms.TreeNode treeNode6 = new System.Windows.Forms.TreeNode("素材库管理"); - System.Windows.Forms.TreeNode treeNode7 = new System.Windows.Forms.TreeNode("店铺管理", new System.Windows.Forms.TreeNode[] { + System.Windows.Forms.TreeNode treeNode3 = new System.Windows.Forms.TreeNode("订单金额统计"); + System.Windows.Forms.TreeNode treeNode4 = new System.Windows.Forms.TreeNode("工作明细统计"); + System.Windows.Forms.TreeNode treeNode5 = new System.Windows.Forms.TreeNode("运费模板"); + System.Windows.Forms.TreeNode treeNode6 = new System.Windows.Forms.TreeNode("高级运费模板"); + System.Windows.Forms.TreeNode treeNode7 = new System.Windows.Forms.TreeNode("素材库管理"); + System.Windows.Forms.TreeNode treeNode8 = new System.Windows.Forms.TreeNode("店铺管理", new System.Windows.Forms.TreeNode[] { treeNode1, treeNode2, treeNode3, treeNode4, treeNode5, - treeNode6}); + treeNode6, + treeNode7}); this.panel1 = new System.Windows.Forms.Panel(); this.panel3 = new System.Windows.Forms.Panel(); this.panel2 = new System.Windows.Forms.Panel(); @@ -135,18 +137,20 @@ treeNode1.Text = "店铺列表"; treeNode2.Name = "子账号管理"; treeNode2.Text = "子账号管理"; - treeNode3.Name = "订单销售统计"; - treeNode3.Text = "订单销售统计"; - treeNode4.Name = "运费模板"; - treeNode4.Text = "运费模板"; - treeNode5.Name = "高级运费模板"; - treeNode5.Text = "高级运费模板"; - treeNode6.Name = "素材库管理"; - treeNode6.Text = "素材库管理"; - treeNode7.Name = "店铺管理"; - treeNode7.Text = "店铺管理"; + treeNode3.Name = "订单金额统计"; + treeNode3.Text = "订单金额统计"; + treeNode4.Name = "工作明细统计"; + treeNode4.Text = "工作明细统计"; + treeNode5.Name = "运费模板"; + treeNode5.Text = "运费模板"; + treeNode6.Name = "高级运费模板"; + treeNode6.Text = "高级运费模板"; + treeNode7.Name = "素材库管理"; + treeNode7.Text = "素材库管理"; + treeNode8.Name = "店铺管理"; + treeNode8.Text = "店铺管理"; this.tv.Nodes.AddRange(new System.Windows.Forms.TreeNode[] { - treeNode7}); + treeNode8}); this.tv.OverForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235))))); this.tv.Size = new System.Drawing.Size(140, 461); this.tv.TabIndex = 1; diff --git a/TEMUKJD/KJDForms/ShopForms/ShopForm.cs b/TEMUKJD/KJDForms/ShopForms/ShopForm.cs index b67da6c..1a905da 100644 --- a/TEMUKJD/KJDForms/ShopForms/ShopForm.cs +++ b/TEMUKJD/KJDForms/ShopForms/ShopForm.cs @@ -13,6 +13,7 @@ using TemuKJD.KJDForms.AdminForms; using TemuKJD.KJDForms.BaseForms; using TemuKJD.KJDForms.ProductSelectForms; using TemuKJD.KJDForms.ProductThirdSelectForms; +using TemuKJD.KJDForms.ShopForms.Statistics; namespace TemuKJD.KJDForms.ShopForms { @@ -20,7 +21,8 @@ namespace TemuKJD.KJDForms.ShopForms { public Lazy shopListForm = new Lazy(); public Lazy sbuAccountForm = new Lazy(); - public Lazy shopStatisticsForm = new Lazy(); + public Lazy shopOrderStatisticsForm = new Lazy(); + public Lazy shopWorkStatisticsForm = new Lazy(); public ShopForm() @@ -32,7 +34,7 @@ namespace TemuKJD.KJDForms.ShopForms tv.SelectedNode = tv.Nodes[0].Nodes[0]; tv.ExpandGroup(tv.Nodes[0].Name); - List hideName = new List() { "子账号管理", "高级运费模板", "运费模板", "素材库管理", /*"订单销售统计"*/ }; + List hideName = new List() { "子账号管理", "高级运费模板", "运费模板", "素材库管理", /*"订单金额统计",*/ "工作明细统计" }; if (BaseClass.GroupId == 3) { @@ -68,8 +70,11 @@ namespace TemuKJD.KJDForms.ShopForms case "子账号管理": SetForm(sbuAccountForm.Value); break; - case "订单销售统计": - SetForm(shopStatisticsForm.Value); + case "订单金额统计": + SetForm(shopOrderStatisticsForm.Value); + break; + case "工作明细统计": + SetForm(shopWorkStatisticsForm.Value); break; } })); diff --git a/TEMUKJD/KJDForms/ShopForms/Statistics/ShopStatisticsForm.Designer.cs b/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsForm.Designer.cs similarity index 95% rename from TEMUKJD/KJDForms/ShopForms/Statistics/ShopStatisticsForm.Designer.cs rename to TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsForm.Designer.cs index 85542af..9762563 100644 --- a/TEMUKJD/KJDForms/ShopForms/Statistics/ShopStatisticsForm.Designer.cs +++ b/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsForm.Designer.cs @@ -1,7 +1,7 @@  namespace TemuKJD.KJDForms.ShopForms { - partial class ShopStatisticsForm + partial class ShopOrderStatisticsForm { /// /// Required designer variable. @@ -30,8 +30,8 @@ namespace TemuKJD.KJDForms.ShopForms private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = 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(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.ucGroupBoxEx3 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.btnGetNotGet = new DevComponents.DotNetBar.PanelEx(); @@ -109,7 +109,7 @@ namespace TemuKJD.KJDForms.ShopForms // this.splitContainer1.Panel2.Controls.Add(this.splitContainer2); this.splitContainer1.Panel2.Margin = new System.Windows.Forms.Padding(4); - this.splitContainer1.Size = new System.Drawing.Size(1438, 600); + this.splitContainer1.Size = new System.Drawing.Size(1350, 601); this.splitContainer1.SplitterDistance = 140; this.splitContainer1.TabIndex = 34; // @@ -121,7 +121,7 @@ namespace TemuKJD.KJDForms.ShopForms this.ucGroupBoxEx3.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; this.ucGroupBoxEx3.Controls.Add(this.btnGetNotGet); this.ucGroupBoxEx3.Controls.Add(this.btnGetSelect); - this.ucGroupBoxEx3.Location = new System.Drawing.Point(1298, 2); + this.ucGroupBoxEx3.Location = new System.Drawing.Point(1210, 2); this.ucGroupBoxEx3.Name = "ucGroupBoxEx3"; this.ucGroupBoxEx3.Size = new System.Drawing.Size(137, 140); this.ucGroupBoxEx3.TabIndex = 668; @@ -188,7 +188,7 @@ namespace TemuKJD.KJDForms.ShopForms this.ucGroupBoxEx1.Controls.Add(this.tableLayoutPanel1); this.ucGroupBoxEx1.Location = new System.Drawing.Point(2, 2); this.ucGroupBoxEx1.Name = "ucGroupBoxEx1"; - this.ucGroupBoxEx1.Size = new System.Drawing.Size(1296, 140); + this.ucGroupBoxEx1.Size = new System.Drawing.Size(1208, 140); this.ucGroupBoxEx1.TabIndex = 667; this.ucGroupBoxEx1.TabStop = false; this.ucGroupBoxEx1.Text = "统计汇总"; @@ -204,7 +204,7 @@ namespace TemuKJD.KJDForms.ShopForms this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 10F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 13F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 10F)); this.tableLayoutPanel1.Controls.Add(this.lblWithdrawCashAmount, 3, 3); this.tableLayoutPanel1.Controls.Add(this.lblAvailableBalance, 2, 3); this.tableLayoutPanel1.Controls.Add(this.lblMallDepositLimitAmount, 1, 3); @@ -228,7 +228,7 @@ namespace TemuKJD.KJDForms.ShopForms this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 30F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 30F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(1253, 115); + this.tableLayoutPanel1.Size = new System.Drawing.Size(1165, 115); this.tableLayoutPanel1.TabIndex = 435; // // lblWithdrawCashAmount @@ -236,7 +236,7 @@ namespace TemuKJD.KJDForms.ShopForms this.lblWithdrawCashAmount.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lblWithdrawCashAmount.AutoSize = true; this.lblWithdrawCashAmount.Font = new System.Drawing.Font("微软雅黑", 11F); - this.lblWithdrawCashAmount.Location = new System.Drawing.Point(924, 87); + this.lblWithdrawCashAmount.Location = new System.Drawing.Point(861, 87); this.lblWithdrawCashAmount.Name = "lblWithdrawCashAmount"; this.lblWithdrawCashAmount.Size = new System.Drawing.Size(18, 20); this.lblWithdrawCashAmount.TabIndex = 15; @@ -247,7 +247,7 @@ namespace TemuKJD.KJDForms.ShopForms this.lblAvailableBalance.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lblAvailableBalance.AutoSize = true; this.lblAvailableBalance.Font = new System.Drawing.Font("微软雅黑", 11F); - this.lblAvailableBalance.Location = new System.Drawing.Point(617, 87); + this.lblAvailableBalance.Location = new System.Drawing.Point(575, 87); this.lblAvailableBalance.Name = "lblAvailableBalance"; this.lblAvailableBalance.Size = new System.Drawing.Size(18, 20); this.lblAvailableBalance.TabIndex = 15; @@ -258,7 +258,7 @@ namespace TemuKJD.KJDForms.ShopForms this.lblMallDepositLimitAmount.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lblMallDepositLimitAmount.AutoSize = true; this.lblMallDepositLimitAmount.Font = new System.Drawing.Font("微软雅黑", 11F); - this.lblMallDepositLimitAmount.Location = new System.Drawing.Point(310, 87); + this.lblMallDepositLimitAmount.Location = new System.Drawing.Point(289, 87); this.lblMallDepositLimitAmount.Name = "lblMallDepositLimitAmount"; this.lblMallDepositLimitAmount.Size = new System.Drawing.Size(18, 20); this.lblMallDepositLimitAmount.TabIndex = 15; @@ -280,7 +280,7 @@ namespace TemuKJD.KJDForms.ShopForms this.lblThisMonthIncomeAmount.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lblThisMonthIncomeAmount.AutoSize = true; this.lblThisMonthIncomeAmount.Font = new System.Drawing.Font("微软雅黑", 11F); - this.lblThisMonthIncomeAmount.Location = new System.Drawing.Point(924, 30); + this.lblThisMonthIncomeAmount.Location = new System.Drawing.Point(861, 30); this.lblThisMonthIncomeAmount.Name = "lblThisMonthIncomeAmount"; this.lblThisMonthIncomeAmount.Size = new System.Drawing.Size(18, 20); this.lblThisMonthIncomeAmount.TabIndex = 15; @@ -291,7 +291,7 @@ namespace TemuKJD.KJDForms.ShopForms this.lblYesterdayIncomeAmount.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lblYesterdayIncomeAmount.AutoSize = true; this.lblYesterdayIncomeAmount.Font = new System.Drawing.Font("微软雅黑", 11F); - this.lblYesterdayIncomeAmount.Location = new System.Drawing.Point(617, 30); + this.lblYesterdayIncomeAmount.Location = new System.Drawing.Point(575, 30); this.lblYesterdayIncomeAmount.Name = "lblYesterdayIncomeAmount"; this.lblYesterdayIncomeAmount.Size = new System.Drawing.Size(18, 20); this.lblYesterdayIncomeAmount.TabIndex = 15; @@ -302,7 +302,7 @@ namespace TemuKJD.KJDForms.ShopForms this.lblSevenDaysSaleVolume.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lblSevenDaysSaleVolume.AutoSize = true; this.lblSevenDaysSaleVolume.Font = new System.Drawing.Font("微软雅黑", 11F); - this.lblSevenDaysSaleVolume.Location = new System.Drawing.Point(310, 30); + this.lblSevenDaysSaleVolume.Location = new System.Drawing.Point(289, 30); this.lblSevenDaysSaleVolume.Name = "lblSevenDaysSaleVolume"; this.lblSevenDaysSaleVolume.Size = new System.Drawing.Size(18, 20); this.lblSevenDaysSaleVolume.TabIndex = 15; @@ -313,7 +313,7 @@ namespace TemuKJD.KJDForms.ShopForms this.label8.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label8.AutoSize = true; this.label8.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.label8.Location = new System.Drawing.Point(924, 60); + this.label8.Location = new System.Drawing.Point(861, 60); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(80, 17); this.label8.TabIndex = 13; @@ -324,7 +324,7 @@ namespace TemuKJD.KJDForms.ShopForms this.label7.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label7.AutoSize = true; this.label7.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.label7.Location = new System.Drawing.Point(617, 60); + this.label7.Location = new System.Drawing.Point(575, 60); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(92, 17); this.label7.TabIndex = 12; @@ -335,7 +335,7 @@ namespace TemuKJD.KJDForms.ShopForms this.label6.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label6.AutoSize = true; this.label6.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.label6.Location = new System.Drawing.Point(310, 60); + this.label6.Location = new System.Drawing.Point(289, 60); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(92, 17); this.label6.TabIndex = 11; @@ -357,7 +357,7 @@ namespace TemuKJD.KJDForms.ShopForms this.label4.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label4.AutoSize = true; this.label4.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.label4.Location = new System.Drawing.Point(924, 3); + this.label4.Location = new System.Drawing.Point(861, 3); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(104, 17); this.label4.TabIndex = 9; @@ -368,7 +368,7 @@ namespace TemuKJD.KJDForms.ShopForms this.label3.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label3.AutoSize = true; this.label3.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.label3.Location = new System.Drawing.Point(617, 3); + this.label3.Location = new System.Drawing.Point(575, 3); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(104, 17); this.label3.TabIndex = 8; @@ -379,7 +379,7 @@ namespace TemuKJD.KJDForms.ShopForms this.label2.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label2.AutoSize = true; this.label2.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.label2.Location = new System.Drawing.Point(310, 3); + this.label2.Location = new System.Drawing.Point(289, 3); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(63, 17); this.label2.TabIndex = 7; @@ -426,15 +426,15 @@ namespace TemuKJD.KJDForms.ShopForms // splitContainer2.Panel2 // this.splitContainer2.Panel2.Controls.Add(this.statusBar); - this.splitContainer2.Size = new System.Drawing.Size(1438, 456); - this.splitContainer2.SplitterDistance = 426; + this.splitContainer2.Size = new System.Drawing.Size(1350, 457); + this.splitContainer2.SplitterDistance = 427; this.splitContainer2.TabIndex = 0; // // pbLoading // this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None; this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue; - this.pbLoading.Location = new System.Drawing.Point(694, 188); + this.pbLoading.Location = new System.Drawing.Point(650, 188); this.pbLoading.Name = "pbLoading"; this.pbLoading.Size = new System.Drawing.Size(50, 50); this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -446,19 +446,19 @@ namespace TemuKJD.KJDForms.ShopForms // this.dgvShop.AllowUserToAddRows = false; this.dgvShop.AllowUserToDeleteRows = false; - dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; this.dgvShop.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.dgvShop.BackgroundColor = System.Drawing.Color.White; this.dgvShop.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4; + 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, @@ -485,7 +485,7 @@ namespace TemuKJD.KJDForms.ShopForms this.dgvShop.ReadOnly = true; this.dgvShop.RowHeadersWidth = 36; this.dgvShop.RowTemplate.Height = 23; - this.dgvShop.Size = new System.Drawing.Size(1430, 426); + this.dgvShop.Size = new System.Drawing.Size(1342, 427); this.dgvShop.TabIndex = 5; this.dgvShop.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellContentClick); // @@ -611,16 +611,16 @@ namespace TemuKJD.KJDForms.ShopForms this.statusBar.Location = new System.Drawing.Point(0, 0); this.statusBar.Margin = new System.Windows.Forms.Padding(0); this.statusBar.Name = "statusBar"; - this.statusBar.Size = new System.Drawing.Size(1438, 26); + this.statusBar.Size = new System.Drawing.Size(1350, 26); this.statusBar.TabIndex = 1; // - // ShopStatisticsForm + // ShopOrderStatisticsForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.ClientSize = new System.Drawing.Size(1438, 600); + this.ClientSize = new System.Drawing.Size(1350, 601); this.Controls.Add(this.splitContainer1); this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.Name = "ShopStatisticsForm"; + this.Name = "ShopOrderStatisticsForm"; this.Text = "ShopStatisticsForm"; this.Load += new System.EventHandler(this.ShopStatisticsForm_Load); this.VisibleChanged += new System.EventHandler(this.ShopStatisticsForm_VisibleChanged); diff --git a/TEMUKJD/KJDForms/ShopForms/Statistics/ShopStatisticsForm.cs b/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsForm.cs similarity index 96% rename from TEMUKJD/KJDForms/ShopForms/Statistics/ShopStatisticsForm.cs rename to TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsForm.cs index 9a84e90..64c94e4 100644 --- a/TEMUKJD/KJDForms/ShopForms/Statistics/ShopStatisticsForm.cs +++ b/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsForm.cs @@ -17,13 +17,13 @@ using TemuKJD.KJDForms.BaseForms; namespace TemuKJD.KJDForms.ShopForms { - public partial class ShopStatisticsForm : Form + public partial class ShopOrderStatisticsForm : Form { - public List lstShopStatisticsInfo = new List(); + public List lstShopStatisticsInfo = new List(); public bool IsOperate = false; public bool isFirstLoad = false; - public ShopStatisticsForm() + public ShopOrderStatisticsForm() { InitializeComponent(); } @@ -54,7 +54,7 @@ namespace TemuKJD.KJDForms.ShopForms dgvShop.Rows.Remove(row); } // 获取被删除的统计信息并删除 - List statisticsDeleteLst = lstShopStatisticsInfo.Where(row + List statisticsDeleteLst = lstShopStatisticsInfo.Where(row => !GlobalConfig.ShopLoginList.Any(s => s.ShopId == row.shop_id.ToString())).ToList(); foreach (var s in statisticsDeleteLst) { @@ -86,10 +86,10 @@ namespace TemuKJD.KJDForms.ShopForms continue; } - ShopStatisticsInfo statistics = lstShopStatisticsInfo.FirstOrDefault(s => s.shop_id.ToString() == shopEntity.ShopId); + ShopOrderStatisticsInfo statistics = lstShopStatisticsInfo.FirstOrDefault(s => s.shop_id.ToString() == shopEntity.ShopId); if (statistics == null) { - statistics = new ShopStatisticsInfo() + statistics = new ShopOrderStatisticsInfo() { notes = shopEntity.Notes, shop_id = shopEntity.ShopId.ParseToLong(), @@ -126,10 +126,10 @@ namespace TemuKJD.KJDForms.ShopForms if (selectShopId == null) selectShopId = new List(); - ShopStatisticsInfo statistics = lstShopStatisticsInfo.FirstOrDefault(s => s.shop_id.ToString() == shopEntity.ShopId); + ShopOrderStatisticsInfo statistics = lstShopStatisticsInfo.FirstOrDefault(s => s.shop_id.ToString() == shopEntity.ShopId); if (statistics == null) { - statistics = new ShopStatisticsInfo() + statistics = new ShopOrderStatisticsInfo() { notes = shopEntity.Notes, shop_id = shopEntity.ShopId.ParseToLong(), @@ -199,7 +199,7 @@ namespace TemuKJD.KJDForms.ShopForms } } - private void GetShopStatistics(ShopLoginInfo shop, ShopStatisticsInfo statistics, List selectShopId = null) + private void GetShopStatistics(ShopLoginInfo shop, ShopOrderStatisticsInfo statistics, List selectShopId = null) { if (statistics.is_search_1 != true) { @@ -524,7 +524,7 @@ namespace TemuKJD.KJDForms.ShopForms var shopList = GlobalConfig.ShopLoginList.Where(s => reGetShopIds.Contains(s.ShopId)).ToList(); foreach (var shop in shopList) { - ShopStatisticsInfo statistics = lstShopStatisticsInfo.FirstOrDefault(s => s.shop_id.ToString() == shop.ShopId); + ShopOrderStatisticsInfo statistics = lstShopStatisticsInfo.FirstOrDefault(s => s.shop_id.ToString() == shop.ShopId); if (statistics != null) statistics.is_search_1 = statistics.is_search_2 = statistics.is_search_3 = statistics.is_search_4 = false; } diff --git a/TEMUKJD/KJDForms/ShopForms/Statistics/ShopStatisticsForm.resx b/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsForm.resx similarity index 100% rename from TEMUKJD/KJDForms/ShopForms/Statistics/ShopStatisticsForm.resx rename to TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsForm.resx diff --git a/TEMUKJD/KJDForms/ShopForms/Statistics/ShopWorkStatisticsForm.Designer.cs b/TEMUKJD/KJDForms/ShopForms/Statistics/ShopWorkStatisticsForm.Designer.cs new file mode 100644 index 0000000..6b20e31 --- /dev/null +++ b/TEMUKJD/KJDForms/ShopForms/Statistics/ShopWorkStatisticsForm.Designer.cs @@ -0,0 +1,642 @@ + +namespace TemuKJD.KJDForms.ShopForms.Statistics +{ + partial class ShopWorkStatisticsForm + { + /// + /// 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(); + this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.ucGroupBoxEx3 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); + this.btnGetNotGet = new DevComponents.DotNetBar.PanelEx(); + this.btnGetSelect = new DevComponents.DotNetBar.PanelEx(); + this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); + this.lblWithdrawCashAmount = new System.Windows.Forms.Label(); + this.lblSuggestStockup = new System.Windows.Forms.Label(); + this.lblWillShortInSize = new System.Windows.Forms.Label(); + this.lblShortInSize = new System.Windows.Forms.Label(); + this.lblOutOfStock = new System.Windows.Forms.Label(); + this.lblShortSupply = new System.Windows.Forms.Label(); + this.lblWaitSend = new System.Windows.Forms.Label(); + this.label8 = new System.Windows.Forms.Label(); + this.label7 = new System.Windows.Forms.Label(); + this.label6 = new System.Windows.Forms.Label(); + this.label5 = new System.Windows.Forms.Label(); + this.label4 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + this.lblWaitCreat = new System.Windows.Forms.Label(); + this.splitContainer2 = new System.Windows.Forms.SplitContainer(); + this.pbLoading = new System.Windows.Forms.PictureBox(); + this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); + this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.colLoginStatus = new System.Windows.Forms.DataGridViewLinkColumn(); + this.colShopLoginName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colShopAccount = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colNotes = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colWaitCreat = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colWaitSend = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colShortSupply = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colOutOfStock = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colShortInSize = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colWillShortInSize = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colSuggestStockup = new System.Windows.Forms.DataGridViewTextBoxColumn(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); + this.splitContainer1.Panel1.SuspendLayout(); + this.splitContainer1.Panel2.SuspendLayout(); + this.splitContainer1.SuspendLayout(); + this.ucGroupBoxEx3.SuspendLayout(); + this.ucGroupBoxEx1.SuspendLayout(); + this.tableLayoutPanel1.SuspendLayout(); + ((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.dgvShop)).BeginInit(); + this.SuspendLayout(); + // + // splitContainer1 + // + this.splitContainer1.BackColor = System.Drawing.Color.White; + this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; + this.splitContainer1.Location = new System.Drawing.Point(0, 0); + this.splitContainer1.Name = "splitContainer1"; + this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal; + // + // splitContainer1.Panel1 + // + this.splitContainer1.Panel1.Controls.Add(this.ucGroupBoxEx3); + this.splitContainer1.Panel1.Controls.Add(this.ucGroupBoxEx1); + // + // 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(1253, 557); + this.splitContainer1.SplitterDistance = 140; + this.splitContainer1.TabIndex = 35; + // + // ucGroupBoxEx3 + // + this.ucGroupBoxEx3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | 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.btnGetNotGet); + this.ucGroupBoxEx3.Controls.Add(this.btnGetSelect); + this.ucGroupBoxEx3.Location = new System.Drawing.Point(1113, 2); + this.ucGroupBoxEx3.Name = "ucGroupBoxEx3"; + this.ucGroupBoxEx3.Size = new System.Drawing.Size(137, 140); + this.ucGroupBoxEx3.TabIndex = 668; + this.ucGroupBoxEx3.TabStop = false; + this.ucGroupBoxEx3.Text = "统计查询"; + // + // btnGetNotGet + // + this.btnGetNotGet.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnGetNotGet.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnGetNotGet.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnGetNotGet.DisabledBackColor = System.Drawing.Color.Empty; + this.btnGetNotGet.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnGetNotGet.Location = new System.Drawing.Point(32, 42); + this.btnGetNotGet.Name = "btnGetNotGet"; + this.btnGetNotGet.Size = new System.Drawing.Size(80, 23); + this.btnGetNotGet.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnGetNotGet.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnGetNotGet.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnGetNotGet.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnGetNotGet.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnGetNotGet.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnGetNotGet.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnGetNotGet.Style.GradientAngle = 90; + this.btnGetNotGet.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnGetNotGet.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnGetNotGet.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnGetNotGet.TabIndex = 431; + this.btnGetNotGet.Text = "查询未获取"; + // + // btnGetSelect + // + this.btnGetSelect.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnGetSelect.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnGetSelect.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnGetSelect.DisabledBackColor = System.Drawing.Color.Empty; + this.btnGetSelect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnGetSelect.Location = new System.Drawing.Point(32, 80); + this.btnGetSelect.Name = "btnGetSelect"; + this.btnGetSelect.Size = new System.Drawing.Size(80, 23); + this.btnGetSelect.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnGetSelect.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnGetSelect.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnGetSelect.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnGetSelect.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnGetSelect.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnGetSelect.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnGetSelect.Style.GradientAngle = 90; + this.btnGetSelect.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnGetSelect.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnGetSelect.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnGetSelect.TabIndex = 427; + this.btnGetSelect.Text = "查询选中"; + // + // ucGroupBoxEx1 + // + this.ucGroupBoxEx1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx1.Controls.Add(this.tableLayoutPanel1); + this.ucGroupBoxEx1.Location = new System.Drawing.Point(2, 2); + this.ucGroupBoxEx1.Name = "ucGroupBoxEx1"; + this.ucGroupBoxEx1.Size = new System.Drawing.Size(1111, 140); + this.ucGroupBoxEx1.TabIndex = 667; + this.ucGroupBoxEx1.TabStop = false; + this.ucGroupBoxEx1.Text = "统计汇总"; + // + // tableLayoutPanel1 + // + this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.tableLayoutPanel1.ColumnCount = 6; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 10F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 10F)); + this.tableLayoutPanel1.Controls.Add(this.lblWithdrawCashAmount, 3, 3); + this.tableLayoutPanel1.Controls.Add(this.lblSuggestStockup, 2, 3); + this.tableLayoutPanel1.Controls.Add(this.lblWillShortInSize, 1, 3); + this.tableLayoutPanel1.Controls.Add(this.lblShortInSize, 0, 3); + this.tableLayoutPanel1.Controls.Add(this.lblOutOfStock, 3, 1); + this.tableLayoutPanel1.Controls.Add(this.lblShortSupply, 2, 1); + this.tableLayoutPanel1.Controls.Add(this.lblWaitSend, 1, 1); + this.tableLayoutPanel1.Controls.Add(this.label8, 3, 2); + this.tableLayoutPanel1.Controls.Add(this.label7, 2, 2); + this.tableLayoutPanel1.Controls.Add(this.label6, 1, 2); + this.tableLayoutPanel1.Controls.Add(this.label5, 0, 2); + this.tableLayoutPanel1.Controls.Add(this.label4, 3, 0); + this.tableLayoutPanel1.Controls.Add(this.label3, 2, 0); + this.tableLayoutPanel1.Controls.Add(this.label2, 1, 0); + this.tableLayoutPanel1.Controls.Add(this.label1, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.lblWaitCreat, 0, 1); + this.tableLayoutPanel1.Location = new System.Drawing.Point(31, 19); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 4; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 30F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 30F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(1068, 115); + this.tableLayoutPanel1.TabIndex = 435; + // + // lblWithdrawCashAmount + // + this.lblWithdrawCashAmount.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.lblWithdrawCashAmount.AutoSize = true; + this.lblWithdrawCashAmount.Font = new System.Drawing.Font("微软雅黑", 11F); + this.lblWithdrawCashAmount.Location = new System.Drawing.Point(789, 87); + this.lblWithdrawCashAmount.Name = "lblWithdrawCashAmount"; + this.lblWithdrawCashAmount.Size = new System.Drawing.Size(18, 20); + this.lblWithdrawCashAmount.TabIndex = 15; + this.lblWithdrawCashAmount.Text = "0"; + // + // lblSuggestStockup + // + this.lblSuggestStockup.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.lblSuggestStockup.AutoSize = true; + this.lblSuggestStockup.Font = new System.Drawing.Font("微软雅黑", 11F); + this.lblSuggestStockup.Location = new System.Drawing.Point(527, 87); + this.lblSuggestStockup.Name = "lblSuggestStockup"; + this.lblSuggestStockup.Size = new System.Drawing.Size(18, 20); + this.lblSuggestStockup.TabIndex = 15; + this.lblSuggestStockup.Text = "0"; + // + // lblWillShortInSize + // + this.lblWillShortInSize.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.lblWillShortInSize.AutoSize = true; + this.lblWillShortInSize.Font = new System.Drawing.Font("微软雅黑", 11F); + this.lblWillShortInSize.Location = new System.Drawing.Point(265, 87); + this.lblWillShortInSize.Name = "lblWillShortInSize"; + this.lblWillShortInSize.Size = new System.Drawing.Size(18, 20); + this.lblWillShortInSize.TabIndex = 15; + this.lblWillShortInSize.Text = "0"; + // + // lblShortInSize + // + this.lblShortInSize.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.lblShortInSize.AutoSize = true; + this.lblShortInSize.Font = new System.Drawing.Font("微软雅黑", 11F); + this.lblShortInSize.Location = new System.Drawing.Point(3, 87); + this.lblShortInSize.Name = "lblShortInSize"; + this.lblShortInSize.Size = new System.Drawing.Size(18, 20); + this.lblShortInSize.TabIndex = 15; + this.lblShortInSize.Text = "0"; + // + // lblOutOfStock + // + this.lblOutOfStock.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.lblOutOfStock.AutoSize = true; + this.lblOutOfStock.Font = new System.Drawing.Font("微软雅黑", 11F); + this.lblOutOfStock.Location = new System.Drawing.Point(789, 30); + this.lblOutOfStock.Name = "lblOutOfStock"; + this.lblOutOfStock.Size = new System.Drawing.Size(18, 20); + this.lblOutOfStock.TabIndex = 15; + this.lblOutOfStock.Text = "0"; + // + // lblShortSupply + // + this.lblShortSupply.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.lblShortSupply.AutoSize = true; + this.lblShortSupply.Font = new System.Drawing.Font("微软雅黑", 11F); + this.lblShortSupply.Location = new System.Drawing.Point(527, 30); + this.lblShortSupply.Name = "lblShortSupply"; + this.lblShortSupply.Size = new System.Drawing.Size(18, 20); + this.lblShortSupply.TabIndex = 15; + this.lblShortSupply.Text = "0"; + // + // lblWaitSend + // + this.lblWaitSend.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.lblWaitSend.AutoSize = true; + this.lblWaitSend.Font = new System.Drawing.Font("微软雅黑", 11F); + this.lblWaitSend.Location = new System.Drawing.Point(265, 30); + this.lblWaitSend.Name = "lblWaitSend"; + this.lblWaitSend.Size = new System.Drawing.Size(18, 20); + this.lblWaitSend.TabIndex = 15; + this.lblWaitSend.Text = "0"; + // + // label8 + // + this.label8.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label8.AutoSize = true; + this.label8.ForeColor = System.Drawing.SystemColors.ControlDarkDark; + this.label8.Location = new System.Drawing.Point(789, 62); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(11, 12); + this.label8.TabIndex = 13; + this.label8.Text = "-"; + // + // label7 + // + this.label7.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label7.AutoSize = true; + this.label7.ForeColor = System.Drawing.SystemColors.ControlDarkDark; + this.label7.Location = new System.Drawing.Point(527, 62); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(53, 12); + this.label7.TabIndex = 12; + this.label7.Text = "建议备货"; + // + // label6 + // + this.label6.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label6.AutoSize = true; + this.label6.ForeColor = System.Drawing.SystemColors.ControlDarkDark; + this.label6.Location = new System.Drawing.Point(265, 62); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(53, 12); + this.label6.TabIndex = 11; + this.label6.Text = "即将断码"; + // + // label5 + // + this.label5.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label5.AutoSize = true; + this.label5.ForeColor = System.Drawing.SystemColors.ControlDarkDark; + this.label5.Location = new System.Drawing.Point(3, 62); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(41, 12); + this.label5.TabIndex = 10; + this.label5.Text = "已断码"; + // + // label4 + // + this.label4.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label4.AutoSize = true; + this.label4.ForeColor = System.Drawing.SystemColors.ControlDarkDark; + this.label4.Location = new System.Drawing.Point(789, 5); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(41, 12); + this.label4.TabIndex = 9; + this.label4.Text = "已断货"; + // + // label3 + // + this.label3.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label3.AutoSize = true; + this.label3.ForeColor = System.Drawing.SystemColors.ControlDarkDark; + this.label3.Location = new System.Drawing.Point(527, 5); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(41, 12); + this.label3.TabIndex = 8; + this.label3.Text = "已缺货"; + // + // label2 + // + this.label2.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label2.AutoSize = true; + this.label2.ForeColor = System.Drawing.SystemColors.ControlDarkDark; + this.label2.Location = new System.Drawing.Point(265, 5); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(41, 12); + this.label2.TabIndex = 7; + this.label2.Text = "待发货"; + // + // label1 + // + this.label1.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label1.AutoSize = true; + this.label1.ForeColor = System.Drawing.SystemColors.ControlDarkDark; + this.label1.Location = new System.Drawing.Point(3, 5); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(41, 12); + this.label1.TabIndex = 0; + this.label1.Text = "待创建"; + // + // lblWaitCreat + // + this.lblWaitCreat.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.lblWaitCreat.AutoSize = true; + this.lblWaitCreat.Font = new System.Drawing.Font("微软雅黑", 11F); + this.lblWaitCreat.Location = new System.Drawing.Point(3, 30); + this.lblWaitCreat.Name = "lblWaitCreat"; + this.lblWaitCreat.Size = new System.Drawing.Size(18, 20); + this.lblWaitCreat.TabIndex = 14; + this.lblWaitCreat.Text = "0"; + // + // 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.dgvShop); + this.splitContainer2.Panel1.Padding = new System.Windows.Forms.Padding(4, 0, 4, 0); + // + // splitContainer2.Panel2 + // + this.splitContainer2.Panel2.Controls.Add(this.statusBar); + this.splitContainer2.Size = new System.Drawing.Size(1253, 413); + this.splitContainer2.SplitterDistance = 383; + 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(601, 166); + 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; + // + // dgvShop + // + this.dgvShop.AllowUserToAddRows = false; + this.dgvShop.AllowUserToDeleteRows = false; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + this.dgvShop.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dgvShop.BackgroundColor = System.Drawing.Color.White; + this.dgvShop.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; + this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.colSelect, + this.colLoginStatus, + this.colShopLoginName, + this.colShopId, + this.colShopAccount, + this.colNotes, + this.colWaitCreat, + this.colWaitSend, + this.colShortSupply, + this.colOutOfStock, + this.colShortInSize, + this.colWillShortInSize, + this.colSuggestStockup}); + this.dgvShop.Dock = System.Windows.Forms.DockStyle.Fill; + this.dgvShop.Location = new System.Drawing.Point(4, 0); + this.dgvShop.Name = "dgvShop"; + this.dgvShop.ReadOnly = true; + this.dgvShop.RowHeadersWidth = 36; + this.dgvShop.RowTemplate.Height = 23; + this.dgvShop.Size = new System.Drawing.Size(1245, 383); + this.dgvShop.TabIndex = 5; + // + // 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(1253, 26); + this.statusBar.TabIndex = 1; + // + // 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; + // + // colLoginStatus + // + this.colLoginStatus.FillWeight = 50F; + this.colLoginStatus.HeaderText = "状态"; + this.colLoginStatus.Name = "colLoginStatus"; + this.colLoginStatus.ReadOnly = true; + this.colLoginStatus.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colLoginStatus.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + // + // colShopLoginName + // + this.colShopLoginName.HeaderText = "店铺登录号码"; + this.colShopLoginName.Name = "colShopLoginName"; + this.colShopLoginName.ReadOnly = true; + // + // colShopId + // + this.colShopId.HeaderText = "店铺Id"; + this.colShopId.Name = "colShopId"; + this.colShopId.ReadOnly = true; + // + // colShopAccount + // + this.colShopAccount.HeaderText = "店铺名称"; + this.colShopAccount.Name = "colShopAccount"; + this.colShopAccount.ReadOnly = true; + // + // colNotes + // + this.colNotes.HeaderText = "备注/分组"; + this.colNotes.Name = "colNotes"; + this.colNotes.ReadOnly = true; + // + // colWaitCreat + // + this.colWaitCreat.HeaderText = "待创建"; + this.colWaitCreat.Name = "colWaitCreat"; + this.colWaitCreat.ReadOnly = true; + // + // colWaitSend + // + this.colWaitSend.HeaderText = "待发货"; + this.colWaitSend.Name = "colWaitSend"; + this.colWaitSend.ReadOnly = true; + // + // colShortSupply + // + this.colShortSupply.HeaderText = "已缺货"; + this.colShortSupply.Name = "colShortSupply"; + this.colShortSupply.ReadOnly = true; + // + // colOutOfStock + // + this.colOutOfStock.HeaderText = "已断货"; + this.colOutOfStock.Name = "colOutOfStock"; + this.colOutOfStock.ReadOnly = true; + // + // colShortInSize + // + this.colShortInSize.HeaderText = "已断码"; + this.colShortInSize.Name = "colShortInSize"; + this.colShortInSize.ReadOnly = true; + // + // colWillShortInSize + // + this.colWillShortInSize.HeaderText = "即将断码"; + this.colWillShortInSize.Name = "colWillShortInSize"; + this.colWillShortInSize.ReadOnly = true; + // + // colSuggestStockup + // + this.colSuggestStockup.HeaderText = "建议备货"; + this.colSuggestStockup.Name = "colSuggestStockup"; + this.colSuggestStockup.ReadOnly = true; + // + // ShopWorkStatisticsForm + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1253, 557); + this.Controls.Add(this.splitContainer1); + this.Name = "ShopWorkStatisticsForm"; + this.Text = "ShopWorkStatistics"; + this.splitContainer1.Panel1.ResumeLayout(false); + this.splitContainer1.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); + this.splitContainer1.ResumeLayout(false); + this.ucGroupBoxEx3.ResumeLayout(false); + this.ucGroupBoxEx1.ResumeLayout(false); + this.tableLayoutPanel1.ResumeLayout(false); + this.tableLayoutPanel1.PerformLayout(); + 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.dgvShop)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.SplitContainer splitContainer1; + private UserComponent.UcGroupBoxEx ucGroupBoxEx3; + private DevComponents.DotNetBar.PanelEx btnGetNotGet; + private DevComponents.DotNetBar.PanelEx btnGetSelect; + private UserComponent.UcGroupBoxEx ucGroupBoxEx1; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; + private System.Windows.Forms.Label lblWithdrawCashAmount; + private System.Windows.Forms.Label lblSuggestStockup; + private System.Windows.Forms.Label lblWillShortInSize; + private System.Windows.Forms.Label lblShortInSize; + private System.Windows.Forms.Label lblOutOfStock; + private System.Windows.Forms.Label lblShortSupply; + private System.Windows.Forms.Label lblWaitSend; + private System.Windows.Forms.Label label8; + private System.Windows.Forms.Label label7; + private System.Windows.Forms.Label label6; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label lblWaitCreat; + private System.Windows.Forms.SplitContainer splitContainer2; + private System.Windows.Forms.PictureBox pbLoading; + private UserComponent.DataGridViewEx dgvShop; + private UserControls.StatusBarUserControl statusBar; + private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect; + private System.Windows.Forms.DataGridViewLinkColumn colLoginStatus; + private System.Windows.Forms.DataGridViewTextBoxColumn colShopLoginName; + private System.Windows.Forms.DataGridViewTextBoxColumn colShopId; + private System.Windows.Forms.DataGridViewTextBoxColumn colShopAccount; + private System.Windows.Forms.DataGridViewTextBoxColumn colNotes; + private System.Windows.Forms.DataGridViewTextBoxColumn colWaitCreat; + private System.Windows.Forms.DataGridViewTextBoxColumn colWaitSend; + private System.Windows.Forms.DataGridViewTextBoxColumn colShortSupply; + private System.Windows.Forms.DataGridViewTextBoxColumn colOutOfStock; + private System.Windows.Forms.DataGridViewTextBoxColumn colShortInSize; + private System.Windows.Forms.DataGridViewTextBoxColumn colWillShortInSize; + private System.Windows.Forms.DataGridViewTextBoxColumn colSuggestStockup; + } +} \ No newline at end of file diff --git a/TEMUKJD/KJDForms/ShopForms/Statistics/ShopWorkStatisticsForm.cs b/TEMUKJD/KJDForms/ShopForms/Statistics/ShopWorkStatisticsForm.cs new file mode 100644 index 0000000..b890d13 --- /dev/null +++ b/TEMUKJD/KJDForms/ShopForms/Statistics/ShopWorkStatisticsForm.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace TemuKJD.KJDForms.ShopForms.Statistics +{ + public partial class ShopWorkStatisticsForm : Form + { + public ShopWorkStatisticsForm() + { + InitializeComponent(); + } + } +} diff --git a/TEMUKJD/KJDForms/ShopForms/Statistics/ShopWorkStatisticsForm.resx b/TEMUKJD/KJDForms/ShopForms/Statistics/ShopWorkStatisticsForm.resx new file mode 100644 index 0000000..3a540dc --- /dev/null +++ b/TEMUKJD/KJDForms/ShopForms/Statistics/ShopWorkStatisticsForm.resx @@ -0,0 +1,159 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + \ No newline at end of file diff --git a/TEMUKJD/Properties/Resources.Designer.cs b/TEMUKJD/Properties/Resources.Designer.cs index 33ee754..3558311 100644 --- a/TEMUKJD/Properties/Resources.Designer.cs +++ b/TEMUKJD/Properties/Resources.Designer.cs @@ -209,6 +209,16 @@ namespace TemuKJD.Properties { } } + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap errpic { + get { + object obj = ResourceManager.GetObject("errpic", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// diff --git a/TEMUKJD/Properties/Resources.resx b/TEMUKJD/Properties/Resources.resx index ae210ef..521e5d9 100644 --- a/TEMUKJD/Properties/Resources.resx +++ b/TEMUKJD/Properties/Resources.resx @@ -157,6 +157,9 @@ ..\static\dycategorys.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 + + ..\resources\errpic.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\fullpaste.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/TEMUKJD/Resources/errpic.png b/TEMUKJD/Resources/errpic.png new file mode 100644 index 0000000..2e41d42 Binary files /dev/null and b/TEMUKJD/Resources/errpic.png differ