diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs
index 73632d3..a1e051b 100644
--- a/AllBase/BaseClass.cs
+++ b/AllBase/BaseClass.cs
@@ -27,8 +27,8 @@ namespace AllBase
///
/// 版本ID
///
- public static int VersionCount = 579;
- //public static int VersionCount = 579;
+ public static int VersionCount = 581;
+ //public static int VersionCount = 581;
///
/// 版本号
diff --git a/KJDService/KJD_WebService/BLL/ShopManage.cs b/KJDService/KJD_WebService/BLL/ShopManage.cs
index 7f36c61..10be36f 100644
--- a/KJDService/KJD_WebService/BLL/ShopManage.cs
+++ b/KJDService/KJD_WebService/BLL/ShopManage.cs
@@ -1,10 +1,12 @@
using KJD_Web.Model;
using KJD_Web.Model.ShopModel;
using KJD_Web.Utils;
+using MySqlX.XDevAPI;
using NaiBa.Util.Extension;
using System;
using System.Collections.Generic;
using System.Data;
+using System.Drawing;
using System.Linq;
using System.Web;
using System.Web.Security;
@@ -368,6 +370,48 @@ namespace KJD_Web.BLL
return "{\"code\":19999,\"msg\":\"未知错误\"}";
}
+
+
+ public string UpdateAddProdRemaining(string inputData)
+ {
+ if (!string.IsNullOrEmpty(inputData))
+ {
+ var time = RegexUtils.GetStringQuery(ref inputData, "time").ParseToInt();
+ string time1 = RegexUtils.GetStringQuery(ref inputData, "code");
+ if (time1 != EncrypUtil.Encryption(time))
+ return "{\"code\":50000,\"msg\":\"校验失败\"}";
+
+ var user_name = RegexUtils.GetStringQuery(ref inputData, "user_name");
+ var password = RegexUtils.GetStringQuery(ref inputData, "password");
+ var remainCount = RegexUtils.GetStringQuery(ref inputData, "remain_count");
+ var shop_ids = RegexUtils.GetStringQuery(ref inputData, "shop_ids")?.Replace("'", "");
+ if (!string.IsNullOrWhiteSpace(shop_ids))
+ {
+ List shopIdLst = shop_ids.Split(',').ToList();
+ shop_ids = "'" + string.Join("','", shopIdLst) + "'";
+ }
+
+ string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString;
+ MysqlUtils mySql = new MysqlUtils(conn);
+ string sql = "";
+ sql += "update kjd.shop_add_prod_count set add_product_remaining=" + remainCount +
+ " where 1=1 and shop_id in (" + shop_ids + ");";
+
+ var rst = mySql.ExecuteNonQuery(sql);
+ var msg = mySql.Message;
+ mySql.Close();
+
+ if (rst)
+ return "{\"code\":200,\"msg\":\"success\"}";
+ else
+ return "{\"code\":50000,\"msg\":\"" + msg + "\"}";
+ }
+ else
+ {
+ return "{\"code\":19999,\"msg\":\"输入为空\"}";
+ }
+ }
+
//获取一个手机登录号码下的所有店铺（以便有则更新，无则新增）
public string GetOneLoginNameShop(string inputData)
{
diff --git a/KJDService/KJD_WebService/ShopService.asmx.cs b/KJDService/KJD_WebService/ShopService.asmx.cs
index 7f9c18b..ccfacfa 100644
--- a/KJDService/KJD_WebService/ShopService.asmx.cs
+++ b/KJDService/KJD_WebService/ShopService.asmx.cs
@@ -144,6 +144,17 @@ namespace KJD_Web
Context.Response.End();
}
+ [WebMethod]
+ public void update_add_prod_remaining()
+ {
+ string jsontext = GetRequestJsonString();
+
+ var result = jsontext;
+ result = new ShopManage().UpdateAddProdRemaining(jsontext);
+
+ Context.Response.Write(result);
+ Context.Response.End();
+ }
[WebMethod]
public void admin_mdy_shop()
diff --git a/TEMUKJD/Extension/DataGridViewExtension.cs b/TEMUKJD/Extension/DataGridViewExtension.cs
index 5d8043a..249382a 100644
--- a/TEMUKJD/Extension/DataGridViewExtension.cs
+++ b/TEMUKJD/Extension/DataGridViewExtension.cs
@@ -245,7 +245,7 @@ namespace TemuKJD.Extension
/// 单元格名称
/// 合并后的表头显示文字
/// 是否允许调整大小
- public static void MergeColumnHeader(this DataGridView dgv, List colNameCollection, string headerText, bool isMultiLevelHeader = false)
+ public static void AddMergeColumnHeader(this DataGridView dgv, List colNameCollection, string headerText, bool isMultiLevelHeader = false)
{
int nHeight = 0;
int nLeft = 0;
@@ -261,7 +261,8 @@ namespace TemuKJD.Extension
{
foreach(var columnName in colNameCollection)
{
- dgv.InvalidateCell(dgv.Columns[columnName].HeaderCell); // 标记单元格为需要重绘
+ if (dgv.Columns.Contains(columnName))
+ dgv.InvalidateCell(dgv.Columns[columnName].HeaderCell); // 标记单元格为需要重绘
}
dgv.Update();
}
@@ -284,7 +285,8 @@ namespace TemuKJD.Extension
{
foreach (var columnName in colNameCollection)
{
- dgv.InvalidateCell(dgv.Columns[columnName].HeaderCell); // 标记单元格为需要重绘
+ if (dgv.Columns.Contains(columnName))
+ dgv.InvalidateCell(dgv.Columns[columnName].HeaderCell); // 标记单元格为需要重绘
}
dgv.Update();
}
@@ -411,5 +413,123 @@ namespace TemuKJD.Extension
}
};
}
+
+ public static void AddMergeColumn(this DataGridView dgv, List colNameCollection, Color? VerGridColor = null, Color? VerGridSelectColor = null)
+ {
+ int nHeight = 0;
+ int nLeft = 0;
+ int nTop = 0;
+ int nWidth = 0;
+
+ //合并列中某一列的列宽变化时，强制重绘表头
+ dgv.ColumnWidthChanged += (s, e) =>
+ {
+ if (colNameCollection.Contains(e.Column.Name))
+ {
+ foreach (var columnName in colNameCollection)
+ {
+ if (dgv.Columns.Contains(columnName))
+ dgv.InvalidateCell(dgv.Columns[columnName].HeaderCell); // 标记单元格为需要重绘
+ }
+ dgv.Update();
+ }
+ };
+ dgv.Scroll += (s, e) =>
+ {
+ if (e.ScrollOrientation == ScrollOrientation.HorizontalScroll)
+ {
+ bool tag = false;
+ foreach (var columnName in colNameCollection)
+ {
+ var bounds = dgv.Columns[columnName].HeaderCell.ContentBounds;
+ if (bounds.Left < 10 || bounds.Right > dgv.Width - 10)
+ {
+ tag = true;
+ break;
+ }
+ }
+ if (tag == true)
+ {
+ foreach (var columnName in colNameCollection)
+ {
+ if (dgv.Columns.Contains(columnName))
+ dgv.InvalidateCell(dgv.Columns[columnName].HeaderCell); // 标记单元格为需要重绘
+ }
+ dgv.Update();
+ }
+ }
+ };
+ //处理重绘事件
+ dgv.CellPainting += (s, e) =>
+ {
+ if (e.RowIndex >=0 && e.ColumnIndex >= 0) // 重绘单元格
+ {
+ string name = dgv.Columns[e.ColumnIndex].Name;
+ if (colNameCollection.Contains(name))
+ {
+ e.PaintBackground(e.CellBounds, true); // false不绘制单元格背景
+ e.PaintContent(e.CellBounds); // 绘制单元格内容,此处要绘制内容
+
+ Brush brush;
+ Pen pen;
+ if (colNameCollection.IndexOf(name) == 0)
+ {
+ nTop = e.CellBounds.Top;
+ nLeft = e.CellBounds.Left;
+ nWidth = e.CellBounds.Width;
+ nHeight = e.CellBounds.Height;
+ foreach (string str2 in colNameCollection)
+ {
+ if (!str2.Equals(name))
+ {
+ nWidth += dgv.Columns[str2].Width;
+ }
+ }
+ }
+ //填充背景(覆盖原来的分隔线)
+ //Rectangle rtTmp = new Rectangle(nLeft, nTop, nWidth, nHeight);
+ //using (brush = new SolidBrush(/*e.CellStyle.BackColor*/dgv.BackgroundColor))
+ //{
+ // var rtBounds = e.CellBounds;
+ // rtBounds.Height -= 1;
+ // e.Graphics.FillRectangle(brush, rtBounds);
+ //}
+ if (colNameCollection.IndexOf(name) < colNameCollection.Count - 1)
+ {
+ var penColor = VerGridColor;
+ // 分隔线
+ if (penColor == null)
+ {
+ //VerGridColor = Color.FromArgb(229, 229, 229);
+ penColor = e.RowIndex % 2 == 0 ? dgv.DefaultCellStyle.BackColor : dgv.AlternatingRowsDefaultCellStyle.BackColor;
+ }
+ var penSelectColor = VerGridSelectColor;
+ if (penSelectColor == null)
+ //VerGridColorSelect = Color.FromArgb(129, 129, 129);
+ penSelectColor = dgv.DefaultCellStyle.SelectionBackColor;
+ if ((dgv.Rows[e.RowIndex].Cells[e.ColumnIndex]).Selected)
+ {
+ using (pen = new Pen(penSelectColor.Value))
+ {
+ var rtBounds = e.CellBounds;
+ e.Graphics.DrawLine(pen, rtBounds.Right - 1, rtBounds.Top, rtBounds.Right - 1, rtBounds.Bottom - 2);
+ }
+ }
+ else
+ {
+ using (pen = new Pen(penColor.Value))
+ {
+ var rtBounds = e.CellBounds;
+ e.Graphics.DrawLine(pen, rtBounds.Right - 1, rtBounds.Top, rtBounds.Right - 1, rtBounds.Bottom - 2);
+ }
+ }
+ }
+ //e.set_Handled(true);
+ e.Handled = true; // 告知系统不再处理表头单元格绘制事件
+ }
+ }
+ };
+ }
+
}
}
diff --git a/TEMUKJD/InitForm.Designer.cs b/TEMUKJD/InitForm.Designer.cs
index 09b30a0..b254d07 100644
--- a/TEMUKJD/InitForm.Designer.cs
+++ b/TEMUKJD/InitForm.Designer.cs
@@ -28,41 +28,116 @@
///
private void InitializeComponent()
{
+ this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(InitForm));
this.panel2 = new System.Windows.Forms.Panel();
- this.progressBarX1 = new DevComponents.DotNetBar.Controls.ProgressBarX();
+ this.panel4 = new System.Windows.Forms.Panel();
+ this.btnOK = new DevComponents.DotNetBar.PanelEx();
+ this.chkRemember = new TemuKJD.UserComponent.UcCheckBox(this.components);
+ this.rbTemu = new System.Windows.Forms.RadioButton();
+ this.rbPdd = new System.Windows.Forms.RadioButton();
+ this.panel3 = new System.Windows.Forms.Panel();
this.pbShopLoading = new System.Windows.Forms.PictureBox();
this.label1 = new System.Windows.Forms.Label();
+ this.progressBarX1 = new DevComponents.DotNetBar.Controls.ProgressBarX();
this.panel2.SuspendLayout();
+ this.panel4.SuspendLayout();
+ this.panel3.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pbShopLoading)).BeginInit();
this.SuspendLayout();
//
// panel2
//
this.panel2.BackColor = System.Drawing.Color.WhiteSmoke;
- this.panel2.Controls.Add(this.progressBarX1);
- this.panel2.Controls.Add(this.pbShopLoading);
- this.panel2.Controls.Add(this.label1);
+ this.panel2.Controls.Add(this.panel4);
+ this.panel2.Controls.Add(this.panel3);
this.panel2.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel2.Location = new System.Drawing.Point(1, 33);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(234, 151);
+ this.panel2.Size = new System.Drawing.Size(265, 190);
this.panel2.TabIndex = 39;
//
- // progressBarX1
+ // panel4
//
- this.progressBarX1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
+ this.panel4.Controls.Add(this.btnOK);
+ this.panel4.Controls.Add(this.chkRemember);
+ this.panel4.Controls.Add(this.rbTemu);
+ this.panel4.Controls.Add(this.rbPdd);
+ this.panel4.Location = new System.Drawing.Point(4, 132);
+ this.panel4.Name = "panel4";
+ this.panel4.Size = new System.Drawing.Size(256, 52);
+ this.panel4.TabIndex = 40;
+ this.panel4.Visible = false;
//
+ // btnOK
//
+ this.btnOK.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+ this.btnOK.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.btnOK.DisabledBackColor = System.Drawing.Color.Empty;
+ this.btnOK.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.btnOK.Location = new System.Drawing.Point(30, 24);
+ this.btnOK.Name = "btnOK";
+ this.btnOK.Size = new System.Drawing.Size(199, 23);
+ this.btnOK.Style.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnOK.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnOK.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnOK.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+ this.btnOK.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+ this.btnOK.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
+ this.btnOK.Style.ForeColor.Color = System.Drawing.Color.White;
+ this.btnOK.Style.GradientAngle = 90;
+ this.btnOK.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnOK.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+ this.btnOK.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+ this.btnOK.TabIndex = 753;
+ this.btnOK.Text = "确 定";
+ this.btnOK.Click += new System.EventHandler(this.btnOK_Click);
//
- this.progressBarX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- this.progressBarX1.Location = new System.Drawing.Point(32, 119);
- this.progressBarX1.Name = "progressBarX1";
- this.progressBarX1.Size = new System.Drawing.Size(168, 15);
- this.progressBarX1.TabIndex = 38;
- this.progressBarX1.TabStop = false;
- this.progressBarX1.Text = "progressBarX1";
+ // chkRemember
+ //
+ this.chkRemember.AutoSize = true;
+ this.chkRemember.Location = new System.Drawing.Point(163, 0);
+ this.chkRemember.Name = "chkRemember";
+ this.chkRemember.Size = new System.Drawing.Size(75, 21);
+ this.chkRemember.TabIndex = 28;
+ this.chkRemember.Text = "自动选择";
+ this.chkRemember.UseVisualStyleBackColor = true;
+ this.chkRemember.CheckedChanged += new System.EventHandler(this.chkRemember_CheckedChanged);
+ //
+ // rbTemu
+ //
+ this.rbTemu.AutoSize = true;
+ this.rbTemu.Checked = true;
+ this.rbTemu.ForeColor = System.Drawing.SystemColors.InfoText;
+ this.rbTemu.Location = new System.Drawing.Point(31, 0);
+ this.rbTemu.Name = "rbTemu";
+ this.rbTemu.Size = new System.Drawing.Size(58, 21);
+ this.rbTemu.TabIndex = 26;
+ this.rbTemu.TabStop = true;
+ this.rbTemu.Text = "Temu";
+ this.rbTemu.UseVisualStyleBackColor = true;
+ this.rbTemu.CheckedChanged += new System.EventHandler(this.rbTemu_CheckedChanged);
+ //
+ // rbPdd
+ //
+ this.rbPdd.AutoSize = true;
+ this.rbPdd.ForeColor = System.Drawing.SystemColors.InfoText;
+ this.rbPdd.Location = new System.Drawing.Point(95, 0);
+ this.rbPdd.Name = "rbPdd";
+ this.rbPdd.Size = new System.Drawing.Size(62, 21);
+ this.rbPdd.TabIndex = 27;
+ this.rbPdd.Text = "拼多多";
+ this.rbPdd.UseVisualStyleBackColor = true;
+ //
+ // panel3
+ //
+ this.panel3.Controls.Add(this.pbShopLoading);
+ this.panel3.Controls.Add(this.label1);
+ this.panel3.Controls.Add(this.progressBarX1);
+ this.panel3.Location = new System.Drawing.Point(4, 27);
+ this.panel3.Name = "panel3";
+ this.panel3.Size = new System.Drawing.Size(257, 125);
+ this.panel3.TabIndex = 39;
//
// pbShopLoading
//
@@ -70,7 +145,7 @@
this.pbShopLoading.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247)))));
this.pbShopLoading.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.pbShopLoading.Image = global::TemuKJD.Properties.Resources.loading_blue;
- this.pbShopLoading.Location = new System.Drawing.Point(84, 49);
+ this.pbShopLoading.Location = new System.Drawing.Point(96, 35);
this.pbShopLoading.Name = "pbShopLoading";
this.pbShopLoading.Size = new System.Drawing.Size(64, 64);
this.pbShopLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -81,18 +156,33 @@
//
this.label1.AutoSize = true;
this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label1.Location = new System.Drawing.Point(42, 18);
+ this.label1.Location = new System.Drawing.Point(54, 9);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(150, 21);
this.label1.TabIndex = 0;
this.label1.Text = "初始化中，请稍候...";
//
+ // progressBarX1
+ //
+ this.progressBarX1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ //
+ //
+ //
+ this.progressBarX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ this.progressBarX1.Location = new System.Drawing.Point(29, 105);
+ this.progressBarX1.Name = "progressBarX1";
+ this.progressBarX1.Size = new System.Drawing.Size(199, 15);
+ this.progressBarX1.TabIndex = 38;
+ this.progressBarX1.TabStop = false;
+ this.progressBarX1.Text = "progressBarX1";
+ //
// InitForm
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
- this.ClientSize = new System.Drawing.Size(236, 185);
+ this.ClientSize = new System.Drawing.Size(267, 224);
this.Controls.Add(this.panel2);
+ this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "InitForm";
this.ShowIcon = false;
@@ -101,7 +191,10 @@
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.InitForm_FormClosed);
this.Controls.SetChildIndex(this.panel2, 0);
this.panel2.ResumeLayout(false);
- this.panel2.PerformLayout();
+ this.panel4.ResumeLayout(false);
+ this.panel4.PerformLayout();
+ this.panel3.ResumeLayout(false);
+ this.panel3.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.pbShopLoading)).EndInit();
this.ResumeLayout(false);
@@ -113,5 +206,11 @@
private System.Windows.Forms.PictureBox pbShopLoading;
private System.Windows.Forms.Label label1;
private DevComponents.DotNetBar.Controls.ProgressBarX progressBarX1;
+ private System.Windows.Forms.Panel panel3;
+ private UserComponent.UcCheckBox chkRemember;
+ private System.Windows.Forms.RadioButton rbPdd;
+ private System.Windows.Forms.RadioButton rbTemu;
+ private DevComponents.DotNetBar.PanelEx btnOK;
+ private System.Windows.Forms.Panel panel4;
}
}
\ No newline at end of file
diff --git a/TEMUKJD/InitForm.cs b/TEMUKJD/InitForm.cs
index 2383a5f..5b40dbd 100644
--- a/TEMUKJD/InitForm.cs
+++ b/TEMUKJD/InitForm.cs
@@ -10,11 +10,14 @@ using System.Text;
using System.Threading;
using System.Threading.Tasks;
using System.Windows.Forms;
+using AllBase.Helper;
+using NaiBa.Util.Helper;
namespace TemuKJD
{
public partial class InitForm : LRBaseForm
{
+ InitFormSettings initFormSettings = new InitFormSettings();
public InitForm()
{
InitializeComponent();
@@ -24,6 +27,17 @@ namespace TemuKJD
private void InitForm_Load(object sender, EventArgs e)
{
+#if DEBUG
+ this.panel3.Location = new Point(4, 4);
+ this.panel4.Visible=true;
+#endif
+ initFormSettings = ConfigHelper.LoadConfig("initFormSettings");
+ if (initFormSettings == null)
+ initFormSettings = new InitFormSettings();
+ this.chkRemember.Checked = initFormSettings.Remember;
+ this.rbTemu.Checked = initFormSettings.LoginType.ToLower() == "temu";
+ this.rbPdd.Checked = initFormSettings.LoginType.ToLower() != "temu";
+
Task.Run(() =>
{
while (!Work.Initialization.IsCheckFilesFinish || !Program.IsInit || this.progressBarX1.Value < 50)
@@ -38,31 +52,66 @@ namespace TemuKJD
if (this.progressBarX1.Value >= 50)
Thread.Sleep(300);
}
+ if (initFormSettings.Remember)
+ Thread.Sleep(500);
Invoke(new Action(() =>
{
- try
- {
- if (!Work.Initialization.IsCheckFilesSuccesss)
- {
- BaseMsgForm.ShowError("文件初始化失败，请检查是否有程序占用并使用管理员权限运行本程序！");
- Process.GetCurrentProcess().Kill();
- }
-
- this.Hide();
- new MainForm().ShowDialog();
- }
- catch (Exception ex)
- {
- BaseMsgForm.ShowError(ex.Message);
- Process.GetCurrentProcess().Kill();
+ if(initFormSettings.Remember)
+ {
+ OpenNewMainForm();
}
}));
});
}
+ void OpenNewMainForm()
+ {
+ try
+ {
+ if (!Work.Initialization.IsCheckFilesSuccesss)
+ {
+ BaseMsgForm.ShowError("文件初始化失败，请检查是否有程序占用并使用管理员权限运行本程序！");
+ Process.GetCurrentProcess().Kill();
+ }
+ this.Hide();
+ new MainForm(initFormSettings.LoginType).ShowDialog();
+ }
+ catch (Exception ex)
+ {
+ BaseMsgForm.ShowError(ex.Message);
+ Process.GetCurrentProcess().Kill();
+ }
+ }
+
private void InitForm_FormClosed(object sender, FormClosedEventArgs e)
{
Process.GetCurrentProcess().Kill();
}
+
+ private void btnOK_Click(object sender, EventArgs e)
+ {
+ OpenNewMainForm();
+ }
+
+ private void chkRemember_CheckedChanged(object sender, EventArgs e)
+ {
+ initFormSettings.Remember = chkRemember.Checked;
+ ConfigHelper.SaveConfig("initFormSettings", initFormSettings);
+ }
+
+ private void rbTemu_CheckedChanged(object sender, EventArgs e)
+ {
+ if (rbTemu.Checked)
+ initFormSettings.LoginType = "Temu";
+ else
+ initFormSettings.LoginType = "Pdd";
+ ConfigHelper.SaveConfig("initFormSettings", initFormSettings);
+ }
+ }
+
+ class InitFormSettings
+ {
+ public string LoginType { get; set; } = "Temu";
+ public bool Remember { get; set; } = true;
}
}
diff --git a/TEMUKJD/KJD.csproj b/TEMUKJD/KJD.csproj
index 75eea9f..6a87714 100644
--- a/TEMUKJD/KJD.csproj
+++ b/TEMUKJD/KJD.csproj
@@ -942,6 +942,9 @@
Work
+
+
+
diff --git a/TEMUKJD/KJD.csproj.user b/TEMUKJD/KJD.csproj.user
index 9b86104..c10e84b 100644
--- a/TEMUKJD/KJD.csproj.user
+++ b/TEMUKJD/KJD.csproj.user
@@ -1,6 +1,6 @@
- ShowAllFiles
+ ProjectFiles
\ No newline at end of file
diff --git a/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.Designer.cs b/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.Designer.cs
index 3809925..c938d71 100644
--- a/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.Designer.cs
+++ b/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.Designer.cs
@@ -38,17 +38,10 @@ namespace TemuKJD.KJDForms.AdminForms
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
- this.splitContainer3 = new System.Windows.Forms.SplitContainer();
- this.splitContainer2 = new System.Windows.Forms.SplitContainer();
- this.pbShopLoading = new System.Windows.Forms.PictureBox();
- this.panel1 = new System.Windows.Forms.Panel();
- this.textBox1 = new System.Windows.Forms.TextBox();
- this.btnClose = new DevComponents.DotNetBar.PanelEx();
- this.pbLoading = new System.Windows.Forms.PictureBox();
- this.panelEx1 = new DevComponents.DotNetBar.PanelEx();
- this.btnClear = new DevComponents.DotNetBar.PanelEx();
- this.splitContainer4 = new System.Windows.Forms.SplitContainer();
this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
+ this.btnResetExtCode = new DevComponents.DotNetBar.PanelEx();
+ this.txtExtCode = new System.Windows.Forms.TextBox();
+ this.label12 = new System.Windows.Forms.Label();
this.numJudgeWeight = new System.Windows.Forms.NumericUpDown();
this.numJudgeLen = new System.Windows.Forms.NumericUpDown();
this.label8 = new System.Windows.Forms.Label();
@@ -97,6 +90,9 @@ namespace TemuKJD.KJDForms.AdminForms
this.label20 = new System.Windows.Forms.Label();
this.label9 = new System.Windows.Forms.Label();
this.label11 = new System.Windows.Forms.Label();
+ this.splitContainer3 = new System.Windows.Forms.SplitContainer();
+ this.splitContainer2 = new System.Windows.Forms.SplitContainer();
+ this.pbShopLoading = new System.Windows.Forms.PictureBox();
this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx();
this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.colUser = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -107,9 +103,13 @@ namespace TemuKJD.KJDForms.AdminForms
this.colLoginStatus = new System.Windows.Forms.DataGridViewLinkColumn();
this.colCanUse = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.pnlSpecDetail = new System.Windows.Forms.Panel();
+ this.textBox1 = new System.Windows.Forms.TextBox();
+ this.btnClose = new DevComponents.DotNetBar.PanelEx();
+ this.pbLoading = new System.Windows.Forms.PictureBox();
+ this.panelEx1 = new DevComponents.DotNetBar.PanelEx();
+ this.btnClear = new DevComponents.DotNetBar.PanelEx();
this.dgvPriceCheck = new TemuKJD.UserComponent.DataGridViewEx();
- 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();
@@ -132,25 +132,13 @@ namespace TemuKJD.KJDForms.AdminForms
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();
- ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).BeginInit();
- this.splitContainer3.Panel1.SuspendLayout();
- this.splitContainer3.Panel2.SuspendLayout();
- this.splitContainer3.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit();
- this.splitContainer2.Panel1.SuspendLayout();
- this.splitContainer2.Panel2.SuspendLayout();
- this.splitContainer2.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.pbShopLoading)).BeginInit();
- this.panel1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.splitContainer4)).BeginInit();
- this.splitContainer4.Panel1.SuspendLayout();
- this.splitContainer4.Panel2.SuspendLayout();
- this.splitContainer4.SuspendLayout();
this.ucGroupBoxEx1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.numJudgeWeight)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.numJudgeLen)).BeginInit();
@@ -164,8 +152,23 @@ namespace TemuKJD.KJDForms.AdminForms
((System.ComponentModel.ISupportInitialize)(this.numLen1)).BeginInit();
this.pnlDetailOperate1.SuspendLayout();
this.pnlDetailOperate2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).BeginInit();
+ this.splitContainer3.Panel1.SuspendLayout();
+ this.splitContainer3.Panel2.SuspendLayout();
+ this.splitContainer3.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit();
+ this.splitContainer2.Panel1.SuspendLayout();
+ this.splitContainer2.Panel2.SuspendLayout();
+ this.splitContainer2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pbShopLoading)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.dgvShop)).BeginInit();
+ this.pnlSpecDetail.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.dgvPriceCheck)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainer4)).BeginInit();
+ this.splitContainer4.Panel1.SuspendLayout();
+ this.splitContainer4.Panel2.SuspendLayout();
+ this.splitContainer4.SuspendLayout();
this.SuspendLayout();
//
// splitContainer1
@@ -188,194 +191,6 @@ namespace TemuKJD.KJDForms.AdminForms
this.splitContainer1.SplitterDistance = 130;
this.splitContainer1.TabIndex = 11;
//
- // splitContainer3
- //
- this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill;
- this.splitContainer3.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
- this.splitContainer3.Location = new System.Drawing.Point(0, 0);
- this.splitContainer3.Name = "splitContainer3";
- this.splitContainer3.Orientation = System.Windows.Forms.Orientation.Horizontal;
- //
- // splitContainer3.Panel1
- //
- this.splitContainer3.Panel1.Controls.Add(this.splitContainer2);
- //
- // splitContainer3.Panel2
- //
- this.splitContainer3.Panel2.Controls.Add(this.splitContainer4);
- this.splitContainer3.Size = new System.Drawing.Size(1350, 477);
- this.splitContainer3.SplitterDistance = 447;
- this.splitContainer3.TabIndex = 1;
- //
- // splitContainer2
- //
- this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.splitContainer2.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
- this.splitContainer2.Location = new System.Drawing.Point(0, 0);
- this.splitContainer2.Name = "splitContainer2";
- //
- // splitContainer2.Panel1
- //
- this.splitContainer2.Panel1.Controls.Add(this.pbShopLoading);
- this.splitContainer2.Panel1.Controls.Add(this.dgvShop);
- this.splitContainer2.Panel1.Padding = new System.Windows.Forms.Padding(4, 0, 0, 0);
- //
- // splitContainer2.Panel2
- //
- this.splitContainer2.Panel2.Controls.Add(this.panel1);
- this.splitContainer2.Panel2.Controls.Add(this.pbLoading);
- this.splitContainer2.Panel2.Controls.Add(this.panelEx1);
- this.splitContainer2.Panel2.Controls.Add(this.btnClear);
- this.splitContainer2.Panel2.Controls.Add(this.dgvPriceCheck);
- this.splitContainer2.Panel2.Padding = new System.Windows.Forms.Padding(0, 0, 4, 0);
- this.splitContainer2.Size = new System.Drawing.Size(1350, 447);
- this.splitContainer2.SplitterDistance = 280;
- this.splitContainer2.TabIndex = 0;
- //
- // pbShopLoading
- //
- this.pbShopLoading.Anchor = System.Windows.Forms.AnchorStyles.None;
- this.pbShopLoading.Image = global::TemuKJD.Properties.Resources.loading_blue;
- this.pbShopLoading.Location = new System.Drawing.Point(115, 198);
- this.pbShopLoading.Name = "pbShopLoading";
- this.pbShopLoading.Size = new System.Drawing.Size(50, 50);
- this.pbShopLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
- this.pbShopLoading.TabIndex = 676;
- this.pbShopLoading.TabStop = false;
- this.pbShopLoading.Visible = false;
- //
- // panel1
- //
- this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
- | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.panel1.Controls.Add(this.textBox1);
- this.panel1.Controls.Add(this.btnClose);
- this.panel1.Location = new System.Drawing.Point(113, 58);
- this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(837, 134);
- this.panel1.TabIndex = 682;
- this.panel1.Visible = false;
- //
- // textBox1
- //
- this.textBox1.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.textBox1.Location = new System.Drawing.Point(28, 17);
- this.textBox1.Multiline = true;
- this.textBox1.Name = "textBox1";
- this.textBox1.ScrollBars = System.Windows.Forms.ScrollBars.Both;
- this.textBox1.Size = new System.Drawing.Size(778, 75);
- this.textBox1.TabIndex = 690;
- //
- // btnClose
- //
- this.btnClose.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.btnClose.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
- this.btnClose.Cursor = System.Windows.Forms.Cursors.Hand;
- this.btnClose.DisabledBackColor = System.Drawing.Color.Empty;
- this.btnClose.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnClose.Location = new System.Drawing.Point(748, 98);
- this.btnClose.Name = "btnClose";
- this.btnClose.Size = new System.Drawing.Size(58, 23);
- this.btnClose.Style.Alignment = System.Drawing.StringAlignment.Center;
- this.btnClose.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- this.btnClose.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- this.btnClose.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
- this.btnClose.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
- this.btnClose.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
- this.btnClose.Style.ForeColor.Color = System.Drawing.Color.White;
- this.btnClose.Style.GradientAngle = 90;
- this.btnClose.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
- this.btnClose.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
- this.btnClose.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
- this.btnClose.TabIndex = 435;
- this.btnClose.Text = "关闭";
- this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
- //
- // 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(492, 198);
- this.pbLoading.Name = "pbLoading";
- this.pbLoading.Size = new System.Drawing.Size(50, 50);
- this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
- this.pbLoading.TabIndex = 675;
- this.pbLoading.TabStop = false;
- this.pbLoading.Visible = false;
- //
- // panelEx1
- //
- this.panelEx1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control;
- this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
- this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty;
- this.panelEx1.Location = new System.Drawing.Point(801, 383);
- this.panelEx1.Name = "panelEx1";
- this.panelEx1.Size = new System.Drawing.Size(115, 21);
- this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center;
- this.panelEx1.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
- this.panelEx1.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
- this.panelEx1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
- this.panelEx1.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- this.panelEx1.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
- this.panelEx1.Style.GradientAngle = 90;
- this.panelEx1.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
- this.panelEx1.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
- this.panelEx1.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- this.panelEx1.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- this.panelEx1.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
- this.panelEx1.TabIndex = 668;
- this.panelEx1.Text = "停止当前操作";
- this.panelEx1.Visible = false;
- //
- // btnClear
- //
- this.btnClear.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.btnClear.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
- this.btnClear.Cursor = System.Windows.Forms.Cursors.Hand;
- this.btnClear.DisabledBackColor = System.Drawing.Color.Empty;
- this.btnClear.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnClear.Location = new System.Drawing.Point(692, 383);
- this.btnClear.Name = "btnClear";
- this.btnClear.Size = new System.Drawing.Size(90, 21);
- this.btnClear.Style.Alignment = System.Drawing.StringAlignment.Center;
- this.btnClear.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- this.btnClear.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- this.btnClear.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
- this.btnClear.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
- this.btnClear.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
- this.btnClear.Style.ForeColor.Color = System.Drawing.Color.White;
- this.btnClear.Style.GradientAngle = 90;
- this.btnClear.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
- this.btnClear.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
- this.btnClear.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
- this.btnClear.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
- this.btnClear.TabIndex = 440;
- this.btnClear.Text = "清空结果";
- this.btnClear.Visible = false;
- //
- // 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(1350, 26);
- this.splitContainer4.SplitterDistance = 282;
- this.splitContainer4.TabIndex = 3;
- //
// ucGroupBoxEx1
//
this.ucGroupBoxEx1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
@@ -383,6 +198,9 @@ 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.btnResetExtCode);
+ this.ucGroupBoxEx1.Controls.Add(this.txtExtCode);
+ this.ucGroupBoxEx1.Controls.Add(this.label12);
this.ucGroupBoxEx1.Controls.Add(this.numJudgeWeight);
this.ucGroupBoxEx1.Controls.Add(this.numJudgeLen);
this.ucGroupBoxEx1.Controls.Add(this.label8);
@@ -430,6 +248,46 @@ namespace TemuKJD.KJDForms.AdminForms
this.ucGroupBoxEx1.TabStop = false;
this.ucGroupBoxEx1.Text = "参数设置";
//
+ // btnResetExtCode
+ //
+ this.btnResetExtCode.CanvasColor = System.Drawing.SystemColors.Control;
+ this.btnResetExtCode.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+ this.btnResetExtCode.DisabledBackColor = System.Drawing.Color.Empty;
+ this.btnResetExtCode.Location = new System.Drawing.Point(631, 42);
+ this.btnResetExtCode.Name = "btnResetExtCode";
+ this.btnResetExtCode.Size = new System.Drawing.Size(66, 23);
+ this.btnResetExtCode.Style.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnResetExtCode.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
+ this.btnResetExtCode.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
+ this.btnResetExtCode.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+ this.btnResetExtCode.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnResetExtCode.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+ this.btnResetExtCode.Style.GradientAngle = 90;
+ this.btnResetExtCode.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnResetExtCode.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnResetExtCode.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnResetExtCode.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnResetExtCode.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
+ this.btnResetExtCode.TabIndex = 958;
+ this.btnResetExtCode.Text = "重置";
+ this.btnResetExtCode.Click += new System.EventHandler(this.btnResetExtCode_Click);
+ //
+ // txtExtCode
+ //
+ this.txtExtCode.Location = new System.Drawing.Point(446, 42);
+ this.txtExtCode.Name = "txtExtCode";
+ this.txtExtCode.Size = new System.Drawing.Size(182, 23);
+ this.txtExtCode.TabIndex = 953;
+ //
+ // label12
+ //
+ this.label12.AutoSize = true;
+ this.label12.Location = new System.Drawing.Point(412, 45);
+ this.label12.Name = "label12";
+ this.label12.Size = new System.Drawing.Size(44, 17);
+ this.label12.TabIndex = 954;
+ this.label12.Text = "货号：";
+ //
// numJudgeWeight
//
this.numJudgeWeight.Location = new System.Drawing.Point(808, 98);
@@ -595,7 +453,7 @@ namespace TemuKJD.KJDForms.AdminForms
this.chkSearchTime.AutoSize = true;
this.chkSearchTime.Checked = true;
this.chkSearchTime.CheckState = System.Windows.Forms.CheckState.Checked;
- this.chkSearchTime.Location = new System.Drawing.Point(407, 62);
+ this.chkSearchTime.Location = new System.Drawing.Point(407, 74);
this.chkSearchTime.Name = "chkSearchTime";
this.chkSearchTime.Size = new System.Drawing.Size(15, 14);
this.chkSearchTime.TabIndex = 827;
@@ -603,7 +461,7 @@ namespace TemuKJD.KJDForms.AdminForms
//
// dtpEndTime
//
- this.dtpEndTime.Location = new System.Drawing.Point(561, 58);
+ this.dtpEndTime.Location = new System.Drawing.Point(561, 70);
this.dtpEndTime.Name = "dtpEndTime";
this.dtpEndTime.Size = new System.Drawing.Size(136, 23);
this.dtpEndTime.TabIndex = 826;
@@ -628,7 +486,7 @@ namespace TemuKJD.KJDForms.AdminForms
//
// dtpStartTime
//
- this.dtpStartTime.Location = new System.Drawing.Point(423, 58);
+ this.dtpStartTime.Location = new System.Drawing.Point(423, 70);
this.dtpStartTime.Name = "dtpStartTime";
this.dtpStartTime.Size = new System.Drawing.Size(136, 23);
this.dtpStartTime.TabIndex = 825;
@@ -666,7 +524,7 @@ namespace TemuKJD.KJDForms.AdminForms
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(631, 88);
+ this.btnStop.Location = new System.Drawing.Point(631, 98);
this.btnStop.Name = "btnStop";
this.btnStop.Size = new System.Drawing.Size(66, 23);
this.btnStop.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -709,7 +567,7 @@ 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(516, 88);
+ this.btnSearchPrice2.Location = new System.Drawing.Point(516, 98);
this.btnSearchPrice2.Name = "btnSearchPrice2";
this.btnSearchPrice2.Size = new System.Drawing.Size(112, 23);
this.btnSearchPrice2.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -763,7 +621,7 @@ namespace TemuKJD.KJDForms.AdminForms
//
// txtSkcId
//
- this.txtSkcId.Location = new System.Drawing.Point(446, 27);
+ this.txtSkcId.Location = new System.Drawing.Point(446, 14);
this.txtSkcId.Name = "txtSkcId";
this.txtSkcId.Size = new System.Drawing.Size(251, 23);
this.txtSkcId.TabIndex = 733;
@@ -808,7 +666,7 @@ namespace TemuKJD.KJDForms.AdminForms
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(407, 88);
+ this.btnSearchPrice.Location = new System.Drawing.Point(407, 98);
this.btnSearchPrice.Name = "btnSearchPrice";
this.btnSearchPrice.Size = new System.Drawing.Size(106, 23);
this.btnSearchPrice.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -910,7 +768,7 @@ namespace TemuKJD.KJDForms.AdminForms
// label7
//
this.label7.AutoSize = true;
- this.label7.Location = new System.Drawing.Point(404, 30);
+ this.label7.Location = new System.Drawing.Point(404, 17);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(52, 17);
this.label7.TabIndex = 734;
@@ -1123,6 +981,62 @@ namespace TemuKJD.KJDForms.AdminForms
this.label11.TabIndex = 932;
this.label11.Text = "需要还原并标红";
//
+ // splitContainer3
+ //
+ this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.splitContainer3.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
+ this.splitContainer3.Location = new System.Drawing.Point(0, 0);
+ this.splitContainer3.Name = "splitContainer3";
+ this.splitContainer3.Orientation = System.Windows.Forms.Orientation.Horizontal;
+ //
+ // splitContainer3.Panel1
+ //
+ this.splitContainer3.Panel1.Controls.Add(this.splitContainer2);
+ //
+ // splitContainer3.Panel2
+ //
+ this.splitContainer3.Panel2.Controls.Add(this.splitContainer4);
+ this.splitContainer3.Size = new System.Drawing.Size(1350, 477);
+ this.splitContainer3.SplitterDistance = 447;
+ this.splitContainer3.TabIndex = 1;
+ //
+ // splitContainer2
+ //
+ this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.splitContainer2.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
+ this.splitContainer2.Location = new System.Drawing.Point(0, 0);
+ this.splitContainer2.Name = "splitContainer2";
+ //
+ // splitContainer2.Panel1
+ //
+ this.splitContainer2.Panel1.Controls.Add(this.pbShopLoading);
+ this.splitContainer2.Panel1.Controls.Add(this.dgvShop);
+ this.splitContainer2.Panel1.Padding = new System.Windows.Forms.Padding(4, 0, 0, 0);
+ //
+ // splitContainer2.Panel2
+ //
+ this.splitContainer2.Panel2.Controls.Add(this.pnlSpecDetail);
+ this.splitContainer2.Panel2.Controls.Add(this.pbLoading);
+ this.splitContainer2.Panel2.Controls.Add(this.panelEx1);
+ this.splitContainer2.Panel2.Controls.Add(this.btnClear);
+ this.splitContainer2.Panel2.Controls.Add(this.dgvPriceCheck);
+ this.splitContainer2.Panel2.Padding = new System.Windows.Forms.Padding(0, 0, 4, 0);
+ this.splitContainer2.Size = new System.Drawing.Size(1350, 447);
+ this.splitContainer2.SplitterDistance = 280;
+ this.splitContainer2.TabIndex = 0;
+ //
+ // pbShopLoading
+ //
+ this.pbShopLoading.Anchor = System.Windows.Forms.AnchorStyles.None;
+ this.pbShopLoading.Image = global::TemuKJD.Properties.Resources.loading_blue;
+ this.pbShopLoading.Location = new System.Drawing.Point(115, 198);
+ this.pbShopLoading.Name = "pbShopLoading";
+ this.pbShopLoading.Size = new System.Drawing.Size(50, 50);
+ this.pbShopLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.pbShopLoading.TabIndex = 676;
+ this.pbShopLoading.TabStop = false;
+ this.pbShopLoading.Visible = false;
+ //
// dgvShop
//
this.dgvShop.AllowUserToAddRows = false;
@@ -1231,6 +1145,120 @@ namespace TemuKJD.KJDForms.AdminForms
this.colMessage.Name = "colMessage";
this.colMessage.ReadOnly = true;
//
+ // pnlSpecDetail
+ //
+ this.pnlSpecDetail.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.pnlSpecDetail.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.pnlSpecDetail.Controls.Add(this.textBox1);
+ this.pnlSpecDetail.Controls.Add(this.btnClose);
+ this.pnlSpecDetail.Location = new System.Drawing.Point(113, 58);
+ this.pnlSpecDetail.Name = "pnlSpecDetail";
+ this.pnlSpecDetail.Size = new System.Drawing.Size(837, 134);
+ this.pnlSpecDetail.TabIndex = 682;
+ this.pnlSpecDetail.Visible = false;
+ //
+ // textBox1
+ //
+ this.textBox1.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.textBox1.Location = new System.Drawing.Point(28, 17);
+ this.textBox1.Multiline = true;
+ this.textBox1.Name = "textBox1";
+ this.textBox1.ScrollBars = System.Windows.Forms.ScrollBars.Both;
+ this.textBox1.Size = new System.Drawing.Size(778, 75);
+ this.textBox1.TabIndex = 690;
+ //
+ // btnClose
+ //
+ this.btnClose.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.btnClose.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+ this.btnClose.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.btnClose.DisabledBackColor = System.Drawing.Color.Empty;
+ this.btnClose.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.btnClose.Location = new System.Drawing.Point(748, 98);
+ this.btnClose.Name = "btnClose";
+ this.btnClose.Size = new System.Drawing.Size(58, 23);
+ this.btnClose.Style.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnClose.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnClose.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnClose.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+ this.btnClose.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+ this.btnClose.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
+ this.btnClose.Style.ForeColor.Color = System.Drawing.Color.White;
+ this.btnClose.Style.GradientAngle = 90;
+ this.btnClose.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnClose.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+ this.btnClose.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+ this.btnClose.TabIndex = 435;
+ this.btnClose.Text = "关闭";
+ this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
+ //
+ // 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(492, 198);
+ this.pbLoading.Name = "pbLoading";
+ this.pbLoading.Size = new System.Drawing.Size(50, 50);
+ this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.pbLoading.TabIndex = 675;
+ this.pbLoading.TabStop = false;
+ this.pbLoading.Visible = false;
+ //
+ // panelEx1
+ //
+ this.panelEx1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control;
+ this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+ this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty;
+ this.panelEx1.Location = new System.Drawing.Point(801, 383);
+ this.panelEx1.Name = "panelEx1";
+ this.panelEx1.Size = new System.Drawing.Size(115, 21);
+ this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center;
+ this.panelEx1.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
+ this.panelEx1.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
+ this.panelEx1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+ this.panelEx1.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.panelEx1.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+ this.panelEx1.Style.GradientAngle = 90;
+ this.panelEx1.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
+ this.panelEx1.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+ this.panelEx1.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.panelEx1.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.panelEx1.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
+ this.panelEx1.TabIndex = 668;
+ this.panelEx1.Text = "停止当前操作";
+ this.panelEx1.Visible = false;
+ //
+ // btnClear
+ //
+ this.btnClear.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.btnClear.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+ this.btnClear.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.btnClear.DisabledBackColor = System.Drawing.Color.Empty;
+ this.btnClear.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.btnClear.Location = new System.Drawing.Point(692, 383);
+ this.btnClear.Name = "btnClear";
+ this.btnClear.Size = new System.Drawing.Size(90, 21);
+ this.btnClear.Style.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnClear.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnClear.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnClear.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+ this.btnClear.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+ this.btnClear.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
+ this.btnClear.Style.ForeColor.Color = System.Drawing.Color.White;
+ this.btnClear.Style.GradientAngle = 90;
+ this.btnClear.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnClear.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+ this.btnClear.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+ this.btnClear.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
+ this.btnClear.TabIndex = 440;
+ this.btnClear.Text = "清空结果";
+ this.btnClear.Visible = false;
+ //
// dgvPriceCheck
//
this.dgvPriceCheck.AllowUserToAddRows = false;
@@ -1287,31 +1315,6 @@ namespace TemuKJD.KJDForms.AdminForms
this.dgvPriceCheck.Scroll += new System.Windows.Forms.ScrollEventHandler(this.dgvPriceCheck_Scroll);
this.dgvPriceCheck.MouseUp += new System.Windows.Forms.MouseEventHandler(this.dgvPriceCheck_MouseUp);
//
- // ucSplitPage1
- //
- this.ucSplitPage1.CurrentPage = 1;
- this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Left;
- this.ucSplitPage1.IsShowPageSize = false;
- this.ucSplitPage1.Location = new System.Drawing.Point(0, 0);
- this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0);
- this.ucSplitPage1.Name = "ucSplitPage1";
- this.ucSplitPage1.PageSize = 50;
- this.ucSplitPage1.Size = new System.Drawing.Size(282, 26);
- this.ucSplitPage1.TabIndex = 5;
- this.ucSplitPage1.TotalPage = 1;
- this.ucSplitPage1.PageChange += new System.Action