diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs
index c011813..e7c2ca9 100644
--- a/AllBase/BaseClass.cs
+++ b/AllBase/BaseClass.cs
@@ -27,7 +27,7 @@ namespace AllBase
///
/// 版本ID
///
- public static int VersionCount = 1101;
+ public static int VersionCount = 1103;
//public static int VersionCount = 613;
///
diff --git a/TEMUKJD/MainForm.cs b/TEMUKJD/MainForm.cs
index 8eb3c06..43683f9 100644
--- a/TEMUKJD/MainForm.cs
+++ b/TEMUKJD/MainForm.cs
@@ -329,7 +329,7 @@ namespace TemuKJD
}
catch (Exception ex)
{
- BaseMsgForm.ShowError("商品列表获取失败：" + ex.Message);
+ BaseMsgForm.ShowError("微信类目列表获取失败：" + ex.Message);
}
if (GlobalConfig.WxCatList == null)
GlobalConfig.WxCatList = new ConcurrentList();
@@ -350,7 +350,7 @@ namespace TemuKJD
}
catch (Exception ex)
{
- BaseMsgForm.ShowError("商品列表获取失败：" + ex.Message);
+ BaseMsgForm.ShowError("拼多多类目列表获取失败：" + ex.Message);
}
if (GlobalConfig.PddCatList == null)
GlobalConfig.PddCatList = new ConcurrentList();
diff --git a/TEMUKJD/ToolForms/Get1688ProductForm.cs b/TEMUKJD/ToolForms/Get1688ProductForm.cs
index 8ee92f4..52efc73 100644
--- a/TEMUKJD/ToolForms/Get1688ProductForm.cs
+++ b/TEMUKJD/ToolForms/Get1688ProductForm.cs
@@ -229,7 +229,7 @@ namespace TemuKJD.ToolForms
if (url.Contains("https://detail.1688.com/offer/"))
{
- currentDetailData = responseData;
+ Task.Run(() => { currentDetailData = responseData; });
}
if (responseData.Contains("赛龙宠物"))
diff --git a/TEMUKJD/WXForms/OrderForms/WXOrderListForm.Designer.cs b/TEMUKJD/WXForms/OrderForms/WXOrderListForm.Designer.cs
index cbd5b8f..cc11a00 100644
--- a/TEMUKJD/WXForms/OrderForms/WXOrderListForm.Designer.cs
+++ b/TEMUKJD/WXForms/OrderForms/WXOrderListForm.Designer.cs
@@ -58,8 +58,12 @@ namespace TemuKJD.WXForms.OrderForms
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.ucGroupBoxEx3 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
+ this.btnBatchNotes = new DevComponents.DotNetBar.PanelEx();
+ this.txtFilterPriceNotContainWords = new System.Windows.Forms.TextBox();
+ this.label21 = new System.Windows.Forms.Label();
this.btnStopBatchOnlieWaybill = new DevComponents.DotNetBar.PanelEx();
this.btnBatchOnlieWaybill = new DevComponents.DotNetBar.PanelEx();
this.btnRefreshPrintId = new DevComponents.DotNetBar.PanelEx();
@@ -156,7 +160,6 @@ namespace TemuKJD.WXForms.OrderForms
this.ucCheckBox3 = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.ucCheckBox2 = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.ucCheckBox1 = new TemuKJD.UserComponent.UcCheckBox(this.components);
- this.lblShopId = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.txtNotes = new System.Windows.Forms.TextBox();
this.btnNotesCancel = new DevComponents.DotNetBar.PanelEx();
@@ -165,10 +168,6 @@ namespace TemuKJD.WXForms.OrderForms
this.lblShopName = new System.Windows.Forms.Label();
this.label5 = new System.Windows.Forms.Label();
this.dgvOrder = new TemuKJD.UserComponent.DataGridViewEx();
- this.splitContainer4 = new System.Windows.Forms.SplitContainer();
- this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
- this.btnClear = new DevComponents.DotNetBar.PanelEx();
- this.panelEx1 = new DevComponents.DotNetBar.PanelEx();
this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.colSupplierId = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colSupplierName = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -200,6 +199,7 @@ namespace TemuKJD.WXForms.OrderForms
this.colOptimizeOrderProduct = new System.Windows.Forms.DataGridViewLinkColumn();
this.colEndDiscount = new System.Windows.Forms.DataGridViewLinkColumn();
this.colOrderStatus = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.colUpdateStatus = new System.Windows.Forms.DataGridViewLinkColumn();
this.colBuyUrl = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colEditBuyPath = new System.Windows.Forms.DataGridViewLinkColumn();
this.colReceiveInfo = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -212,6 +212,10 @@ namespace TemuKJD.WXForms.OrderForms
this.colNotesColor = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colEditNotes = new System.Windows.Forms.DataGridViewLinkColumn();
this.colOpResult = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.splitContainer4 = new System.Windows.Forms.SplitContainer();
+ this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
+ this.btnClear = new DevComponents.DotNetBar.PanelEx();
+ this.panelEx1 = new DevComponents.DotNetBar.PanelEx();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@@ -257,7 +261,7 @@ namespace TemuKJD.WXForms.OrderForms
// splitContainer1.Panel2
//
this.splitContainer1.Panel2.Controls.Add(this.splitContainer3);
- this.splitContainer1.Size = new System.Drawing.Size(2136, 641);
+ this.splitContainer1.Size = new System.Drawing.Size(1684, 641);
this.splitContainer1.SplitterDistance = 165;
this.splitContainer1.TabIndex = 11;
//
@@ -269,6 +273,9 @@ namespace TemuKJD.WXForms.OrderForms
this.ucGroupBoxEx3.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
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.btnBatchNotes);
+ this.ucGroupBoxEx3.Controls.Add(this.txtFilterPriceNotContainWords);
+ this.ucGroupBoxEx3.Controls.Add(this.label21);
this.ucGroupBoxEx3.Controls.Add(this.btnStopBatchOnlieWaybill);
this.ucGroupBoxEx3.Controls.Add(this.btnBatchOnlieWaybill);
this.ucGroupBoxEx3.Controls.Add(this.btnRefreshPrintId);
@@ -297,11 +304,54 @@ namespace TemuKJD.WXForms.OrderForms
this.ucGroupBoxEx3.Controls.Add(this.chkFilterEndTime);
this.ucGroupBoxEx3.Location = new System.Drawing.Point(495, 2);
this.ucGroupBoxEx3.Name = "ucGroupBoxEx3";
- this.ucGroupBoxEx3.Size = new System.Drawing.Size(1639, 165);
+ this.ucGroupBoxEx3.Size = new System.Drawing.Size(1187, 165);
this.ucGroupBoxEx3.TabIndex = 668;
this.ucGroupBoxEx3.TabStop = false;
this.ucGroupBoxEx3.Text = "订单操作";
//
+ // btnBatchNotes
+ //
+ this.btnBatchNotes.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+ this.btnBatchNotes.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.btnBatchNotes.DisabledBackColor = System.Drawing.Color.Empty;
+ this.btnBatchNotes.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.btnBatchNotes.Location = new System.Drawing.Point(420, 129);
+ this.btnBatchNotes.Name = "btnBatchNotes";
+ this.btnBatchNotes.Size = new System.Drawing.Size(84, 23);
+ this.btnBatchNotes.Style.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnBatchNotes.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnBatchNotes.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnBatchNotes.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+ this.btnBatchNotes.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+ this.btnBatchNotes.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
+ this.btnBatchNotes.Style.ForeColor.Color = System.Drawing.Color.White;
+ this.btnBatchNotes.Style.GradientAngle = 90;
+ this.btnBatchNotes.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnBatchNotes.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+ this.btnBatchNotes.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+ this.btnBatchNotes.TabIndex = 1120;
+ this.btnBatchNotes.Text = "批量备注订单";
+ this.btnBatchNotes.Click += new System.EventHandler(this.btnBatchNotes_Click);
+ //
+ // txtFilterPriceNotContainWords
+ //
+ this.txtFilterPriceNotContainWords.Font = new System.Drawing.Font("微软雅黑", 10F);
+ this.txtFilterPriceNotContainWords.Location = new System.Drawing.Point(831, 29);
+ this.txtFilterPriceNotContainWords.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
+ this.txtFilterPriceNotContainWords.Name = "txtFilterPriceNotContainWords";
+ this.txtFilterPriceNotContainWords.Size = new System.Drawing.Size(178, 25);
+ this.txtFilterPriceNotContainWords.TabIndex = 1094;
+ //
+ // label21
+ //
+ this.label21.AutoSize = true;
+ this.label21.Location = new System.Drawing.Point(764, 33);
+ this.label21.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
+ this.label21.Name = "label21";
+ this.label21.Size = new System.Drawing.Size(68, 17);
+ this.label21.TabIndex = 1093;
+ this.label21.Text = "价格不包含";
+ //
// btnStopBatchOnlieWaybill
//
this.btnStopBatchOnlieWaybill.CanvasColor = System.Drawing.SystemColors.Control;
@@ -325,7 +375,8 @@ namespace TemuKJD.WXForms.OrderForms
this.btnStopBatchOnlieWaybill.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
this.btnStopBatchOnlieWaybill.TabIndex = 1070;
this.btnStopBatchOnlieWaybill.Text = "停止批量寄件";
- this.btnStopBatchOnlieWaybill.Click += new System.EventHandler(this.panelEx2_Click);
+ this.btnStopBatchOnlieWaybill.Visible = false;
+ this.btnStopBatchOnlieWaybill.Click += new System.EventHandler(this.btnStopBatchOnlineWaybill_Click);
//
// btnBatchOnlieWaybill
//
@@ -349,6 +400,7 @@ namespace TemuKJD.WXForms.OrderForms
this.btnBatchOnlieWaybill.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
this.btnBatchOnlieWaybill.TabIndex = 1035;
this.btnBatchOnlieWaybill.Text = "批量在线寄件";
+ this.btnBatchOnlieWaybill.Visible = false;
this.btnBatchOnlieWaybill.Click += new System.EventHandler(this.btnBatchOnlieWaybill_Click);
//
// btnRefreshPrintId
@@ -501,7 +553,7 @@ namespace TemuKJD.WXForms.OrderForms
this.btnRestore.CanvasColor = System.Drawing.SystemColors.Control;
this.btnRestore.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnRestore.DisabledBackColor = System.Drawing.Color.Empty;
- this.btnRestore.Location = new System.Drawing.Point(759, 59);
+ this.btnRestore.Location = new System.Drawing.Point(1020, 59);
this.btnRestore.Name = "btnRestore";
this.btnRestore.Size = new System.Drawing.Size(60, 25);
this.btnRestore.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -526,7 +578,7 @@ namespace TemuKJD.WXForms.OrderForms
this.btnFilterOrder.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnFilterOrder.DisabledBackColor = System.Drawing.Color.Empty;
this.btnFilterOrder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnFilterOrder.Location = new System.Drawing.Point(759, 30);
+ this.btnFilterOrder.Location = new System.Drawing.Point(1020, 30);
this.btnFilterOrder.Name = "btnFilterOrder";
this.btnFilterOrder.Size = new System.Drawing.Size(60, 25);
this.btnFilterOrder.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -586,7 +638,7 @@ namespace TemuKJD.WXForms.OrderForms
//
this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(1412, 130);
+ this.label4.Location = new System.Drawing.Point(960, 130);
this.label4.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(116, 17);
@@ -601,7 +653,7 @@ namespace TemuKJD.WXForms.OrderForms
this.btnFiltSelect.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnFiltSelect.DisabledBackColor = System.Drawing.Color.Empty;
this.btnFiltSelect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnFiltSelect.Location = new System.Drawing.Point(1326, 127);
+ this.btnFiltSelect.Location = new System.Drawing.Point(874, 127);
this.btnFiltSelect.Name = "btnFiltSelect";
this.btnFiltSelect.Size = new System.Drawing.Size(84, 23);
this.btnFiltSelect.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -626,7 +678,7 @@ namespace TemuKJD.WXForms.OrderForms
this.btnClearList.CanvasColor = System.Drawing.SystemColors.Control;
this.btnClearList.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnClearList.DisabledBackColor = System.Drawing.Color.Empty;
- this.btnClearList.Location = new System.Drawing.Point(1532, 127);
+ this.btnClearList.Location = new System.Drawing.Point(1080, 127);
this.btnClearList.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2);
this.btnClearList.Name = "btnClearList";
this.btnClearList.Size = new System.Drawing.Size(84, 23);
@@ -1097,7 +1149,7 @@ namespace TemuKJD.WXForms.OrderForms
// splitContainer3.Panel2
//
this.splitContainer3.Panel2.Controls.Add(this.splitContainer4);
- this.splitContainer3.Size = new System.Drawing.Size(2136, 472);
+ this.splitContainer3.Size = new System.Drawing.Size(1684, 472);
this.splitContainer3.SplitterDistance = 442;
this.splitContainer3.TabIndex = 1;
//
@@ -1122,7 +1174,7 @@ namespace TemuKJD.WXForms.OrderForms
this.splitContainer2.Panel2.Controls.Add(this.pnlUpdateNotes);
this.splitContainer2.Panel2.Controls.Add(this.dgvOrder);
this.splitContainer2.Panel2.Padding = new System.Windows.Forms.Padding(0, 0, 4, 0);
- this.splitContainer2.Size = new System.Drawing.Size(2136, 442);
+ this.splitContainer2.Size = new System.Drawing.Size(1684, 442);
this.splitContainer2.SplitterDistance = 350;
this.splitContainer2.TabIndex = 0;
//
@@ -1304,7 +1356,7 @@ namespace TemuKJD.WXForms.OrderForms
//
this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None;
this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue;
- this.pbLoading.Location = new System.Drawing.Point(866, 196);
+ this.pbLoading.Location = new System.Drawing.Point(640, 196);
this.pbLoading.Name = "pbLoading";
this.pbLoading.Size = new System.Drawing.Size(50, 50);
this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -1326,7 +1378,7 @@ namespace TemuKJD.WXForms.OrderForms
this.pnlBuyUrl.Controls.Add(this.lblBuyUrlShopName);
this.pnlBuyUrl.Controls.Add(this.label12);
this.pnlBuyUrl.Controls.Add(this.label6);
- this.pnlBuyUrl.Location = new System.Drawing.Point(913, 252);
+ this.pnlBuyUrl.Location = new System.Drawing.Point(687, 252);
this.pnlBuyUrl.Name = "pnlBuyUrl";
this.pnlBuyUrl.Size = new System.Drawing.Size(474, 146);
this.pnlBuyUrl.TabIndex = 784;
@@ -1424,7 +1476,7 @@ namespace TemuKJD.WXForms.OrderForms
// lblBuyUrlOrderId
//
this.lblBuyUrlOrderId.AutoSize = true;
- this.lblBuyUrlOrderId.Location = new System.Drawing.Point(255, 19);
+ this.lblBuyUrlOrderId.Location = new System.Drawing.Point(245, 19);
this.lblBuyUrlOrderId.Name = "lblBuyUrlOrderId";
this.lblBuyUrlOrderId.Size = new System.Drawing.Size(55, 17);
this.lblBuyUrlOrderId.TabIndex = 456;
@@ -1442,7 +1494,7 @@ namespace TemuKJD.WXForms.OrderForms
// label12
//
this.label12.AutoSize = true;
- this.label12.Location = new System.Drawing.Point(223, 19);
+ this.label12.Location = new System.Drawing.Point(213, 19);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(44, 17);
this.label12.TabIndex = 482;
@@ -1471,7 +1523,7 @@ namespace TemuKJD.WXForms.OrderForms
this.pnlEditReceiveInfo.Controls.Add(this.lblEditReceiveInfoOrderId);
this.pnlEditReceiveInfo.Controls.Add(this.lblEditReceiveInfoShopName);
this.pnlEditReceiveInfo.Controls.Add(this.label11);
- this.pnlEditReceiveInfo.Location = new System.Drawing.Point(398, 248);
+ this.pnlEditReceiveInfo.Location = new System.Drawing.Point(172, 248);
this.pnlEditReceiveInfo.Name = "pnlEditReceiveInfo";
this.pnlEditReceiveInfo.Size = new System.Drawing.Size(474, 191);
this.pnlEditReceiveInfo.TabIndex = 783;
@@ -1583,7 +1635,7 @@ namespace TemuKJD.WXForms.OrderForms
// lblEditReceiveInfoOrderId
//
this.lblEditReceiveInfoOrderId.AutoSize = true;
- this.lblEditReceiveInfoOrderId.Location = new System.Drawing.Point(255, 19);
+ this.lblEditReceiveInfoOrderId.Location = new System.Drawing.Point(245, 19);
this.lblEditReceiveInfoOrderId.Name = "lblEditReceiveInfoOrderId";
this.lblEditReceiveInfoOrderId.Size = new System.Drawing.Size(55, 17);
this.lblEditReceiveInfoOrderId.TabIndex = 456;
@@ -1601,7 +1653,7 @@ namespace TemuKJD.WXForms.OrderForms
// label11
//
this.label11.AutoSize = true;
- this.label11.Location = new System.Drawing.Point(223, 19);
+ this.label11.Location = new System.Drawing.Point(213, 19);
this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(44, 17);
this.label11.TabIndex = 482;
@@ -1617,7 +1669,6 @@ namespace TemuKJD.WXForms.OrderForms
this.pnlUpdateNotes.Controls.Add(this.ucCheckBox3);
this.pnlUpdateNotes.Controls.Add(this.ucCheckBox2);
this.pnlUpdateNotes.Controls.Add(this.ucCheckBox1);
- this.pnlUpdateNotes.Controls.Add(this.lblShopId);
this.pnlUpdateNotes.Controls.Add(this.label2);
this.pnlUpdateNotes.Controls.Add(this.txtNotes);
this.pnlUpdateNotes.Controls.Add(this.btnNotesCancel);
@@ -1625,7 +1676,7 @@ namespace TemuKJD.WXForms.OrderForms
this.pnlUpdateNotes.Controls.Add(this.lblOrderId);
this.pnlUpdateNotes.Controls.Add(this.lblShopName);
this.pnlUpdateNotes.Controls.Add(this.label5);
- this.pnlUpdateNotes.Location = new System.Drawing.Point(654, 64);
+ this.pnlUpdateNotes.Location = new System.Drawing.Point(428, 64);
this.pnlUpdateNotes.Name = "pnlUpdateNotes";
this.pnlUpdateNotes.Size = new System.Drawing.Size(474, 146);
this.pnlUpdateNotes.TabIndex = 782;
@@ -1693,16 +1744,6 @@ namespace TemuKJD.WXForms.OrderForms
this.ucCheckBox1.UseVisualStyleBackColor = true;
this.ucCheckBox1.Click += new System.EventHandler(this.ucCheckBox_Click);
//
- // lblShopId
- //
- this.lblShopId.AutoSize = true;
- this.lblShopId.Location = new System.Drawing.Point(126, 19);
- this.lblShopId.Name = "lblShopId";
- this.lblShopId.Size = new System.Drawing.Size(50, 17);
- this.lblShopId.TabIndex = 475;
- this.lblShopId.Text = "ShopId";
- this.lblShopId.Visible = false;
- //
// label2
//
this.label2.AutoSize = true;
@@ -1770,26 +1811,24 @@ namespace TemuKJD.WXForms.OrderForms
//
// lblOrderId
//
- this.lblOrderId.AutoSize = true;
- this.lblOrderId.Location = new System.Drawing.Point(255, 19);
+ this.lblOrderId.Location = new System.Drawing.Point(245, 19);
this.lblOrderId.Name = "lblOrderId";
- this.lblOrderId.Size = new System.Drawing.Size(55, 17);
+ this.lblOrderId.Size = new System.Drawing.Size(217, 17);
this.lblOrderId.TabIndex = 456;
this.lblOrderId.Text = "OrderId";
//
// lblShopName
//
- this.lblShopName.AutoSize = true;
this.lblShopName.Location = new System.Drawing.Point(20, 19);
this.lblShopName.Name = "lblShopName";
- this.lblShopName.Size = new System.Drawing.Size(73, 17);
+ this.lblShopName.Size = new System.Drawing.Size(190, 17);
this.lblShopName.TabIndex = 455;
this.lblShopName.Text = "ShopName";
//
// label5
//
this.label5.AutoSize = true;
- this.label5.Location = new System.Drawing.Point(223, 19);
+ this.label5.Location = new System.Drawing.Point(213, 19);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(44, 17);
this.label5.TabIndex = 482;
@@ -1845,6 +1884,7 @@ namespace TemuKJD.WXForms.OrderForms
this.colOptimizeOrderProduct,
this.colEndDiscount,
this.colOrderStatus,
+ this.colUpdateStatus,
this.colBuyUrl,
this.colEditBuyPath,
this.colReceiveInfo,
@@ -1863,90 +1903,10 @@ namespace TemuKJD.WXForms.OrderForms
this.dgvOrder.Name = "dgvOrder";
this.dgvOrder.ReadOnly = true;
this.dgvOrder.RowTemplate.Height = 23;
- this.dgvOrder.Size = new System.Drawing.Size(1778, 442);
+ this.dgvOrder.Size = new System.Drawing.Size(1326, 442);
this.dgvOrder.TabIndex = 187;
this.dgvOrder.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvSelectProduct_CellContentClick);
//
- // splitContainer4
- //
- this.splitContainer4.Dock = System.Windows.Forms.DockStyle.Fill;
- this.splitContainer4.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
- this.splitContainer4.Location = new System.Drawing.Point(0, 0);
- this.splitContainer4.Name = "splitContainer4";
- //
- // splitContainer4.Panel1
- //
- this.splitContainer4.Panel1.Controls.Add(this.statusBar);
- //
- // splitContainer4.Panel2
- //
- this.splitContainer4.Panel2.Controls.Add(this.btnClear);
- this.splitContainer4.Panel2.Controls.Add(this.panelEx1);
- this.splitContainer4.Size = new System.Drawing.Size(2136, 26);
- this.splitContainer4.SplitterDistance = 1445;
- this.splitContainer4.TabIndex = 3;
- //
- // statusBar
- //
- this.statusBar.BackColor = System.Drawing.Color.White;
- this.statusBar.Dock = System.Windows.Forms.DockStyle.Fill;
- this.statusBar.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.statusBar.Location = new System.Drawing.Point(0, 0);
- this.statusBar.Margin = new System.Windows.Forms.Padding(0);
- this.statusBar.Name = "statusBar";
- this.statusBar.Size = new System.Drawing.Size(1445, 26);
- this.statusBar.TabIndex = 2;
- //
- // btnClear
- //
- this.btnClear.Anchor = System.Windows.Forms.AnchorStyles.Right;
- this.btnClear.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
- this.btnClear.Cursor = System.Windows.Forms.Cursors.Hand;
- this.btnClear.DisabledBackColor = System.Drawing.Color.Empty;
- this.btnClear.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnClear.Location = new System.Drawing.Point(475, 2);
- 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;
- //
- // panelEx1
- //
- this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control;
- this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
- this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty;
- this.panelEx1.Location = new System.Drawing.Point(568, 2);
- 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;
- //
// colCheck
//
this.colCheck.Frozen = true;
@@ -2218,12 +2178,23 @@ namespace TemuKJD.WXForms.OrderForms
this.colOrderStatus.HeaderText = "状态";
this.colOrderStatus.Name = "colOrderStatus";
this.colOrderStatus.ReadOnly = true;
- this.colOrderStatus.Width = 50;
+ this.colOrderStatus.Width = 45;
+ //
+ // colUpdateStatus
+ //
+ dataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.colUpdateStatus.DefaultCellStyle = dataGridViewCellStyle19;
+ this.colUpdateStatus.HeaderText = "刷新";
+ this.colUpdateStatus.Name = "colUpdateStatus";
+ this.colUpdateStatus.ReadOnly = true;
+ this.colUpdateStatus.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+ this.colUpdateStatus.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+ this.colUpdateStatus.Width = 37;
//
// colBuyUrl
//
- dataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.colBuyUrl.DefaultCellStyle = dataGridViewCellStyle19;
+ dataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.colBuyUrl.DefaultCellStyle = dataGridViewCellStyle20;
this.colBuyUrl.HeaderText = "采购地址";
this.colBuyUrl.Name = "colBuyUrl";
this.colBuyUrl.ReadOnly = true;
@@ -2239,8 +2210,8 @@ namespace TemuKJD.WXForms.OrderForms
//
// colReceiveInfo
//
- dataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.colReceiveInfo.DefaultCellStyle = dataGridViewCellStyle20;
+ dataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.colReceiveInfo.DefaultCellStyle = dataGridViewCellStyle21;
this.colReceiveInfo.HeaderText = "收货信息";
this.colReceiveInfo.Name = "colReceiveInfo";
this.colReceiveInfo.ReadOnly = true;
@@ -2248,8 +2219,8 @@ namespace TemuKJD.WXForms.OrderForms
//
// colDecrypt
//
- dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
- this.colDecrypt.DefaultCellStyle = dataGridViewCellStyle21;
+ dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ this.colDecrypt.DefaultCellStyle = dataGridViewCellStyle22;
this.colDecrypt.HeaderText = "👁";
this.colDecrypt.Name = "colDecrypt";
this.colDecrypt.ReadOnly = true;
@@ -2259,8 +2230,8 @@ namespace TemuKJD.WXForms.OrderForms
//
// colAddReceiveInfo
//
- dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
- this.colAddReceiveInfo.DefaultCellStyle = dataGridViewCellStyle22;
+ dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ this.colAddReceiveInfo.DefaultCellStyle = dataGridViewCellStyle23;
this.colAddReceiveInfo.HeaderText = "填";
this.colAddReceiveInfo.Name = "colAddReceiveInfo";
this.colAddReceiveInfo.ReadOnly = true;
@@ -2281,8 +2252,8 @@ namespace TemuKJD.WXForms.OrderForms
//
// colOnlineWaybill
//
- dataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.colOnlineWaybill.DefaultCellStyle = dataGridViewCellStyle23;
+ dataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.colOnlineWaybill.DefaultCellStyle = dataGridViewCellStyle24;
this.colOnlineWaybill.HeaderText = "打印";
this.colOnlineWaybill.Name = "colOnlineWaybill";
this.colOnlineWaybill.ReadOnly = true;
@@ -2292,8 +2263,8 @@ namespace TemuKJD.WXForms.OrderForms
//
// colNotes
//
- dataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.colNotes.DefaultCellStyle = dataGridViewCellStyle24;
+ dataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.colNotes.DefaultCellStyle = dataGridViewCellStyle25;
this.colNotes.HeaderText = "备注";
this.colNotes.Name = "colNotes";
this.colNotes.ReadOnly = true;
@@ -2308,8 +2279,8 @@ namespace TemuKJD.WXForms.OrderForms
//
// colEditNotes
//
- dataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.colEditNotes.DefaultCellStyle = dataGridViewCellStyle25;
+ dataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.colEditNotes.DefaultCellStyle = dataGridViewCellStyle26;
this.colEditNotes.HeaderText = "修改";
this.colEditNotes.Name = "colEditNotes";
this.colEditNotes.ReadOnly = true;
@@ -2317,18 +2288,98 @@ namespace TemuKJD.WXForms.OrderForms
//
// colOpResult
//
- dataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.colOpResult.DefaultCellStyle = dataGridViewCellStyle26;
+ dataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.colOpResult.DefaultCellStyle = dataGridViewCellStyle27;
this.colOpResult.HeaderText = "操作结果";
this.colOpResult.Name = "colOpResult";
this.colOpResult.ReadOnly = true;
this.colOpResult.Width = 120;
//
+ // splitContainer4
+ //
+ this.splitContainer4.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.splitContainer4.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
+ this.splitContainer4.Location = new System.Drawing.Point(0, 0);
+ this.splitContainer4.Name = "splitContainer4";
+ //
+ // splitContainer4.Panel1
+ //
+ this.splitContainer4.Panel1.Controls.Add(this.statusBar);
+ //
+ // splitContainer4.Panel2
+ //
+ this.splitContainer4.Panel2.Controls.Add(this.btnClear);
+ this.splitContainer4.Panel2.Controls.Add(this.panelEx1);
+ this.splitContainer4.Size = new System.Drawing.Size(1684, 26);
+ this.splitContainer4.SplitterDistance = 993;
+ this.splitContainer4.TabIndex = 3;
+ //
+ // statusBar
+ //
+ this.statusBar.BackColor = System.Drawing.Color.White;
+ this.statusBar.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.statusBar.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.statusBar.Location = new System.Drawing.Point(0, 0);
+ this.statusBar.Margin = new System.Windows.Forms.Padding(0);
+ this.statusBar.Name = "statusBar";
+ this.statusBar.Size = new System.Drawing.Size(993, 26);
+ this.statusBar.TabIndex = 2;
+ //
+ // btnClear
+ //
+ this.btnClear.Anchor = System.Windows.Forms.AnchorStyles.Right;
+ this.btnClear.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+ this.btnClear.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.btnClear.DisabledBackColor = System.Drawing.Color.Empty;
+ this.btnClear.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.btnClear.Location = new System.Drawing.Point(475, 2);
+ 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;
+ //
+ // panelEx1
+ //
+ this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control;
+ this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+ this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty;
+ this.panelEx1.Location = new System.Drawing.Point(568, 2);
+ 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;
+ //
// WXOrderListForm
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.BackColor = System.Drawing.Color.White;
- this.ClientSize = new System.Drawing.Size(2136, 641);
+ this.ClientSize = new System.Drawing.Size(1684, 641);
this.Controls.Add(this.splitContainer1);
this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.KeyPreview = true;
@@ -2426,7 +2477,6 @@ namespace TemuKJD.WXForms.OrderForms
private UserComponent.UcCheckBox chkHasSend;
private UserComponent.UcCheckBox chkWaitSend;
private System.Windows.Forms.Panel pnlUpdateNotes;
- private System.Windows.Forms.Label lblShopId;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.TextBox txtNotes;
private DevComponents.DotNetBar.PanelEx btnNotesCancel;
@@ -2485,6 +2535,8 @@ namespace TemuKJD.WXForms.OrderForms
private System.Windows.Forms.Label label20;
private System.Windows.Forms.TextBox txtEditReceiveInfoOldAddress;
private DevComponents.DotNetBar.PanelEx btnStopBatchOnlieWaybill;
+ private System.Windows.Forms.TextBox txtFilterPriceNotContainWords;
+ private System.Windows.Forms.Label label21;
private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck;
private System.Windows.Forms.DataGridViewTextBoxColumn colSupplierId;
private System.Windows.Forms.DataGridViewTextBoxColumn colSupplierName;
@@ -2516,6 +2568,7 @@ namespace TemuKJD.WXForms.OrderForms
private System.Windows.Forms.DataGridViewLinkColumn colOptimizeOrderProduct;
private System.Windows.Forms.DataGridViewLinkColumn colEndDiscount;
private System.Windows.Forms.DataGridViewTextBoxColumn colOrderStatus;
+ private System.Windows.Forms.DataGridViewLinkColumn colUpdateStatus;
private System.Windows.Forms.DataGridViewTextBoxColumn colBuyUrl;
private System.Windows.Forms.DataGridViewLinkColumn colEditBuyPath;
private System.Windows.Forms.DataGridViewTextBoxColumn colReceiveInfo;
@@ -2528,5 +2581,6 @@ namespace TemuKJD.WXForms.OrderForms
private System.Windows.Forms.DataGridViewTextBoxColumn colNotesColor;
private System.Windows.Forms.DataGridViewLinkColumn colEditNotes;
private System.Windows.Forms.DataGridViewTextBoxColumn colOpResult;
+ private DevComponents.DotNetBar.PanelEx btnBatchNotes;
}
}
\ No newline at end of file
diff --git a/TEMUKJD/WXForms/OrderForms/WXOrderListForm.cs b/TEMUKJD/WXForms/OrderForms/WXOrderListForm.cs
index cf0b503..6c35247 100644
--- a/TEMUKJD/WXForms/OrderForms/WXOrderListForm.cs
+++ b/TEMUKJD/WXForms/OrderForms/WXOrderListForm.cs
@@ -61,6 +61,9 @@ namespace TemuKJD.WXForms.OrderForms
private void UserSelectDbProductForm_Load(object sender, EventArgs e)
{
+ dgvOrder.AddMergeColumn(new List() { "colOrderStatus" , "colUpdateStatus" });
+ dgvOrder.AddMergeColumnHeader(new List() { "colOrderStatus" , "colUpdateStatus" }, "订单状态");
+
this.splitContainer1.Dock = DockStyle.Fill;
pnlEditReceiveInfo.Location = new Point(pnlUpdateNotes.Location.X, pnlUpdateNotes.Location.Y);
pnlBuyUrl.Location = new Point(pnlUpdateNotes.Location.X, pnlUpdateNotes.Location.Y);
@@ -95,8 +98,8 @@ namespace TemuKJD.WXForms.OrderForms
this.dgvOrder.Columns["colOnlineWaybillOrderId"].Visible = true;
this.dgvOrder.Columns["colOnlineWaybill"].Visible = true;
this.btnRefreshPrintId.Visible = true;
- this.btnBatchOnlieWaybill.Visible = true;
- this.btnStopBatchOnlieWaybill.Visible = true;
+ //this.btnBatchOnlieWaybill.Visible = true;
+ //this.btnStopBatchOnlieWaybill.Visible = true;
}
else
{
@@ -353,6 +356,7 @@ namespace TemuKJD.WXForms.OrderForms
var spuId = dgvOrder.Rows[e.RowIndex].Cells["colSpuId"].Value.ParseToString();
var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId);
var row = dgvOrder.Rows[e.RowIndex];
+ var cell = row.Cells[e.ColumnIndex];
var orderId = row.Cells["colOrderId"].Value.ParseToString();
switch (headerText)
@@ -556,7 +560,6 @@ namespace TemuKJD.WXForms.OrderForms
pnlEditReceiveInfo.Visible = false;
pnlBuyUrl.Visible = false;
lblShopName.Text = shop.ShopAccount;
- lblShopId.Text = shop.ShopId;
lblOrderId.Text = orderId;
txtNotes.Text = row.Cells["colNotes"].Value.ParseToString();
lblColorTag.Text = row.Cells["colNotesColor"].Value.ParseToString();
@@ -579,39 +582,77 @@ namespace TemuKJD.WXForms.OrderForms
break;
case "👁":
{
- var deRst = "测试地址写入{\"code\"0}";
- deRst = WXOrderList.decryptOrder(shop, orderId);
- if (deRst.Contains("\"code\":0"))
+ //cell.Value = "查询中…";
+ pbLoading.Visible = true;
+ Task.Run(() =>
{
- var url = BaseClass.BuildObjString("shop/wx_add_mdy_order_address");
- var data = UserLogin.GetSignaturex();
- data += "&shop_id=" + shop.ShopId;
- data += "&order_id=" + orderId;
- data += "&order_address=" + GetHtml.UrlEncodeUtf8(deRst);
- var html = GetHtml.PostUtf8(url, data);
- if (!html.Contains("\"code\":200"))
- html = GetHtml.PostUtf8(url, data);
- if (!html.Contains("\"code\":200"))
+ var rows = dgvOrder.Rows.Cast().Where(r => r.Cells["colOrderId"].Value.ParseToString() == orderId);
+ var currentStatus = UpdateOrderStatus(shop, orderId);
+ Invoke(new Action(() =>
{
- var errMsg = BaseRegex.GetStringJsonByRegs(ref html, html, "msg");
- BaseMsgForm.ShowError("查看地址成功但保存到服务端失败：" + errMsg);
- row.Cells["colOpResult"].Value = errMsg;
- row.Cells["colReceiveInfo"].Value = GetDecryptOrder(deRst);
- row.Cells["colReceiveInfo"].Style.ForeColor = DefaultForeColor;
+ foreach (var rw in rows)
+ {
+ rw.Cells["colOrderStatus"].Value = currentStatus;
+ }
+ }));
+ if (currentStatus != "待发货" && currentStatus != "已发货")
+ {
+ Invoke(new Action(() => { pbLoading.Visible = false; }));
+ BaseMsgForm.ShowError("订单状态已变化，请勿拍单");
+ return;
+ }
+
+ var deRst = "测试地址写入{\"code\"0}";
+ deRst = WXOrderList.decryptOrder(shop, orderId);
+ if (deRst.Contains("\"code\":0"))
+ {
+ var url = BaseClass.BuildObjString("shop/wx_add_mdy_order_address");
+ var data = UserLogin.GetSignaturex();
+ data += "&shop_id=" + shop.ShopId;
+ data += "&order_id=" + orderId;
+ data += "&order_address=" + GetHtml.UrlEncodeUtf8(deRst);
+ var html = GetHtml.PostUtf8(url, data);
+ if (!html.Contains("\"code\":200"))
+ html = GetHtml.PostUtf8(url, data);
+ if (!html.Contains("\"code\":200"))
+ {
+ var errMsg = BaseRegex.GetStringJsonByRegs(ref html, html, "msg");
+ Invoke(new Action(() =>
+ {
+ foreach (var rw in rows)
+ {
+ rw.Cells["colOpResult"].Value = errMsg;
+ rw.Cells["colReceiveInfo"].Value = GetDecryptOrder(deRst);
+ rw.Cells["colReceiveInfo"].Style.ForeColor = DefaultForeColor;
+ }
+ BaseMsgForm.ShowError("查看地址成功但保存到服务端失败：" + errMsg);
+ }));
+ }
+ else
+ {
+ Invoke(new Action(() =>
+ {
+ foreach(var rw in rows)
+ {
+ rw.Cells["colReceiveInfo"].Value = GetDecryptOrder(deRst);
+ rw.Cells["colReceiveInfo"].Style.ForeColor = DefaultForeColor;
+ rw.Cells["colOpResult"].Value = "查看地址成功";
+ }
+ }));
+ }
}
else
{
- row.Cells["colOpResult"].Value = "查看地址成功";
- row.Cells["colReceiveInfo"].Value = GetDecryptOrder(deRst);
- row.Cells["colReceiveInfo"].Style.ForeColor = DefaultForeColor;
+ var error = BaseRegex.GetStringJsonByRegs(ref deRst, deRst, "err_msg", "error_msg", "errMsg", "errorMsg", "msg");
+ Invoke(new Action(() =>
+ {
+ row.Cells["colOpResult"].Value = "查看地址失败：" + error;
+ BaseMsgForm.ShowError("查看地址失败：" + error);
+ }));
}
- }
- else
- {
- var error = BaseRegex.GetStringJsonByRegs(ref deRst, deRst, "err_msg", "error_msg", "errMsg", "errorMsg", "msg");
- row.Cells["colOpResult"].Value = "查看地址失败：" + error;
- BaseMsgForm.ShowError("查看地址失败：" + error);
- }
+ //Invoke(new Action(() => { cell.Value = "👁"; }));
+ Invoke(new Action(() => { pbLoading.Visible = false; }));
+ });
}
break;
case "填":
@@ -642,7 +683,48 @@ namespace TemuKJD.WXForms.OrderForms
break;
case "打印":
{
- Task.Run(() => { GetOnlineWayBill(shop, row); });
+ Task.Run(() =>
+ {
+ var rows = dgvOrder.Rows.Cast().Where(r => r.Cells["colOrderId"].Value.ParseToString() == orderId);
+ var currentStatus = UpdateOrderStatus(shop, orderId);
+ Invoke(new Action(() =>
+ {
+ foreach (var rw in rows)
+ {
+ rw.Cells["colOrderStatus"].Value = currentStatus;
+ }
+ }));
+ if (currentStatus != "待发货" && currentStatus != "已发货")
+ {
+ BaseMsgForm.ShowError("订单状态已变化，请勿拍单");
+ return;
+ }
+ GetOnlineWayBill(shop, row);
+ });
+ }
+ break;
+ case "刷新":
+ {
+ pbLoading.Visible = true;
+ Task.Run(() =>
+ {
+ var rows = dgvOrder.Rows.Cast().Where(r => r.Cells["colOrderId"].Value.ParseToString() == orderId);
+ var currentStatus = UpdateOrderStatus(shop, orderId);
+ Invoke(new Action(() =>
+ {
+ foreach (var rw in rows)
+ {
+ rw.Cells["colOrderStatus"].Value = currentStatus;
+ rw.Cells["colOpResult"].Value = "订单刷新：" + DateTime.Now.ToString("HH:mm:ss");
+ }
+ pbLoading.Visible = false;
+ }));
+ if (currentStatus != "待发货" && currentStatus != "已发货")
+ {
+ BaseMsgForm.ShowError("订单状态已变化，请勿拍单");
+ return;
+ }
+ });
}
break;
case "":
@@ -1030,7 +1112,8 @@ namespace TemuKJD.WXForms.OrderForms
{
return sourceOrderAddressStr;
}
- return userName + "（" + extension + "），" + virtualNumber + "-" + extension + "，" + provinceName + cityName + countyName + detailInfo + "（拨打请输入分机号" + extension + "）";
+ //return userName + "（" + extension + "），" + virtualNumber + "-" + extension + "，" + provinceName + cityName + countyName + detailInfo + "（拨打请输入分机号" + extension + "）";
+ return userName + "" + extension + "，" + virtualNumber + "-" + extension + "，" + provinceName + cityName + countyName + detailInfo + "拨打请输入分机号" + extension + "";
}
private void btnStop_Click(object sender, EventArgs e)
@@ -1121,7 +1204,7 @@ namespace TemuKJD.WXForms.OrderForms
// 查找订单
pageSize = 30;
- var result = WXOrderList.orderSearch(shop, orderStatus, page, pageSize);
+ var result = WXOrderList.orderListSearch(shop, orderStatus, page, pageSize);
if (!result.Contains("\"code\":0"))
{
ShowShopError(shop, result);
@@ -1291,6 +1374,7 @@ namespace TemuKJD.WXForms.OrderForms
"取消优惠",
order.commonInfo.statusStr, // 订单状态
+ "刷新",
buyUrlNotes?.buy_url_notes, // 采购地址
"编辑",
@@ -1603,40 +1687,55 @@ namespace TemuKJD.WXForms.OrderForms
private void btnNotesOK_Click(object sender, EventArgs e)
{
- var orderId = lblOrderId.Text;
- var notes = txtNotes.Text.Trim();
- var tagColor = lblColorTag.Text.ParseToInt();
- var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == lblShopId.Text);
- var rows = dgvOrder.Rows.Cast().Where(r => r.Cells["colOrderId"].Value.ParseToString() == orderId);
- if (shop != null)
+ var orderIds = lblOrderId.Text.Split(';');
+ Task.Run(() =>
{
- var notesRst = WXOrderList.addNotes(shop, orderId, notes, tagColor);
- if (notesRst.Contains("\"code\":0"))
+ foreach (var orderId in orderIds)
{
- pnlUpdateNotes.Visible = false;
- foreach (var row in rows)
- {
- row.Cells["colNotes"].Value = notes;
- row.Cells["colNotesColor"].Value = tagColor;
- row.Cells["colOpResult"].Value = "修改备注成功";
+ var notes = txtNotes.Text.Trim();
+ var tagColor = lblColorTag.Text.ParseToInt();
+ var rows = dgvOrder.Rows.Cast().Where(r => r.Cells["colOrderId"].Value.ParseToString() == orderId).ToList();
+ if (rows.Count == 0)
+ continue;
- row.Cells["colNotes"].Style.ForeColor = DefaultForeColor;
- if (tagColor == 1)
- row.Cells["colNotes"].Style.ForeColor = Color.Red;
- if (tagColor == 2)
- row.Cells["colNotes"].Style.ForeColor = Color.Orange;
- if (tagColor == 3)
- row.Cells["colNotes"].Style.ForeColor = Color.Green;
- if (tagColor == 4)
- row.Cells["colNotes"].Style.ForeColor = Color.Blue;
+ var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == rows[0].Cells["colSupplierId"].Value.ParseToString());
+ if (shop != null)
+ {
+ var notesRst = WXOrderList.addNotes(shop, orderId, notes, tagColor);
+ if (notesRst.Contains("\"code\":0"))
+ {
+ Invoke(new Action(() =>
+ {
+ foreach (var row in rows)
+ {
+ row.Cells["colNotes"].Value = notes;
+ row.Cells["colNotesColor"].Value = tagColor;
+ row.Cells["colOpResult"].Value = "修改备注成功";
+
+ row.Cells["colNotes"].Style.ForeColor = DefaultForeColor;
+ if (tagColor == 1)
+ row.Cells["colNotes"].Style.ForeColor = Color.Red;
+ if (tagColor == 2)
+ row.Cells["colNotes"].Style.ForeColor = Color.Orange;
+ if (tagColor == 3)
+ row.Cells["colNotes"].Style.ForeColor = Color.Green;
+ if (tagColor == 4)
+ row.Cells["colNotes"].Style.ForeColor = Color.Blue;
+ }
+ pnlUpdateNotes.Visible = false;
+ }));
+ }
+ else
+ {
+ ShowShopError(shop, notesRst, true);
+ }
}
}
- else
+ Invoke(new Action(() =>
{
pnlUpdateNotes.Visible = false;
- ShowShopError(shop, notesRst, true);
- }
- }
+ }));
+ });
}
private void btnEditReceiveInfoCancel_Click(object sender, EventArgs e)
@@ -1779,6 +1878,7 @@ namespace TemuKJD.WXForms.OrderForms
var filterStatus = cmbFilterOrderStatus.Text.Trim();
var filterNotesNotContainWords = txtFilterNotesNotContainWords.Text.Trim().Split(new string[] { ",", "，", " " }, StringSplitOptions.RemoveEmptyEntries).ToList();
var filterTitleNotContainWords = txtFilterTitleNotContainWords.Text.Trim().Split(new string[] { ",", "，", " " }, StringSplitOptions.RemoveEmptyEntries).ToList();
+ var filterPriceNotContainWords = txtFilterPriceNotContainWords.Text.Trim().Split(new string[] { ",", "，", " " }, StringSplitOptions.RemoveEmptyEntries).ToList();
string group = cmbFilterOrderShopGroup.Text.Trim().Trim(';');
if (group == "全部")
group = "";
@@ -1833,6 +1933,13 @@ namespace TemuKJD.WXForms.OrderForms
row.Visible = false;
continue;
}
+ string orderGoodsPrice = row.Cells["colSalePrice"].Value.ParseToString();
+ if (filterPriceNotContainWords.Count > 0 && filterPriceNotContainWords.Any(w => orderGoodsPrice.ParseToDecimal() == w.ParseToDecimal()))
+ {
+ row.Cells["colCheck"].Value = false;
+ row.Visible = false;
+ continue;
+ }
if (chkFilterBeginTime.Checked && row.Cells["colOrderTimeFull"].Value.ParseToString().ParseToDateTime() < dtpFilterBeginTime.Value)
{
row.Cells["colCheck"].Value = false;
@@ -1858,6 +1965,7 @@ namespace TemuKJD.WXForms.OrderForms
txtFilterNotesNotContainWords.Text = "";
txtFilterTitleNotContainWords.Text = "";
txtFilterOrderShopName.Text = "";
+ txtFilterPriceNotContainWords.Text = "";
cmbFilterOrderShopGroup.Text = "全部";
chkFilterEndTime.Checked = false;
chkFilterBeginTime.Checked = false;
@@ -1984,13 +2092,59 @@ namespace TemuKJD.WXForms.OrderForms
txtEditReceiveInfoAddress.TextChanged += txtEditReceiveInfoAddress_TextChanged;
}
- private void panelEx2_Click(object sender, EventArgs e)
+ private void btnStopBatchOnlineWaybill_Click(object sender, EventArgs e)
{
if (this.cancellationTokenSource != null)
this.cancellationTokenSource.Cancel();
isOnlineWayBill = false;
}
+
+ string UpdateOrderStatus(ShopLoginInfo shop, string orderId)
+ {
+ var rst = WXOrderList.orderSearch(shop, orderId);
+ if (!rst.Contains("\"code\":0"))
+ {
+ ShowShopError(shop, rst);
+ return "获取\r\n失败";
+ }
+ var statusStr = BaseRegex.GetStringJson(ref rst, "statusStr");
+ if (string.IsNullOrEmpty(statusStr))
+ statusStr = "不存在";
+ return statusStr;
+ }
+
+ private void btnBatchNotes_Click(object sender, EventArgs e)
+ {
+ var rows = dgvOrder.Rows.Cast().Where(r => r.Cells["colCheck"].Value.ParseToBool() == true).ToList();
+ if (rows.Count == 0)
+ {
+ BaseMsgForm.ShowError("请选择订单");
+ return;
+ }
+ pnlUpdateNotes.Visible = true;
+ pnlEditReceiveInfo.Visible = false;
+ pnlBuyUrl.Visible = false;
+ lblShopName.Text = string.Join(";", rows.Select(r => r.Cells["colSupplierName"].Value.ParseToString()).Distinct().ToList());
+ lblOrderId.Text = string.Join(";", rows.Select(r => r.Cells["colOrderId"].Value.ParseToString()).Distinct().ToList());
+ txtNotes.Text = rows[0].Cells["colNotes"].Value.ParseToString();
+ lblColorTag.Text = rows[0].Cells["colNotesColor"].Value.ParseToString();
+ ucCheckBox1.CheckBoxCheckColor = Color.Gray;
+ ucCheckBox1.CheckBoxBorderColor = Color.Gray;
+ ucCheckBox2.CheckBoxCheckColor = Color.Red;
+ ucCheckBox2.CheckBoxBorderColor = Color.Red;
+ ucCheckBox3.CheckBoxCheckColor = Color.Orange;
+ ucCheckBox3.CheckBoxBorderColor = Color.Orange;
+ ucCheckBox4.CheckBoxCheckColor = Color.Green;
+ ucCheckBox4.CheckBoxBorderColor = Color.Green;
+ ucCheckBox5.CheckBoxCheckColor = Color.Blue;
+ ucCheckBox5.CheckBoxBorderColor = Color.Blue;
+ ucCheckBox1.Checked = lblColorTag.Text == "0";
+ ucCheckBox2.Checked = lblColorTag.Text == "1";
+ ucCheckBox3.Checked = lblColorTag.Text == "2";
+ ucCheckBox4.Checked = lblColorTag.Text == "3";
+ ucCheckBox5.Checked = lblColorTag.Text == "4";
+ }
}
public class WXOrderList
@@ -2001,7 +2155,7 @@ namespace TemuKJD.WXForms.OrderForms
///
/// 订单状态 20待发货 30已发货
///
- public static string orderSearch(ShopLoginInfo shop, int orderStatus = 20, int pageNum = 1, int pageSize = 30)
+ public static string orderListSearch(ShopLoginInfo shop, int orderStatus = 20, int pageNum = 1, int pageSize = 30)
{
string url = "https://store.weixin.qq.com/shop-faas/mmchannelstradeorder/list/cgi/orderSearch?token=&lang=zh_CN";
string body = @"{""isSearch"":false,""pageSize"":" + pageSize +
@@ -2015,6 +2169,19 @@ namespace TemuKJD.WXForms.OrderForms
var result = WXHttpResponseBLL.WeiXinPostResponse(shop, url, body, refere);
return result;
}
+ public static string orderSearch(ShopLoginInfo shop, string orderId)
+ {
+ string url = "https://store.weixin.qq.com/shop-faas/mmchannelstradeorder/list/cgi/orderSearch?token=&lang=zh_CN";
+ string body = @"{""isSearch"":true,""pageSize"":30,""overTime"":0,""pengingShipOneDay"":0,""pengingShipSixHour"":0,""expediteDelivery"":0,""stockoutPunishAlert"":0,
+""waybillStatus"":0,""pageNum"":1,""onAftersaleOrderExist"":0,""orderStatus"":0,""orderId"":""" + orderId + @""",
+""orderTime"":{""type"":0,""time"":[null,null]},""telNumber"":"""",""title"":"""",""receiverName"":"""",""finderNickName"":"""",
+""merchantNotes"":"""",""merchantNotesTagColor"":0,""waybillId"":"""",""productCode"":"""",""inspectStatus"":"""",""finderWay"":0,
+""searchOrderType"":0,""payMethod"":0,""orderChannel"":0,""bulkbuyActivityId"":"""",""deliveryNegotiationFlag"":0,""transactionId"":"""",
+""page"":1,""startCreateTime"":null,""endCreateTime"":null}";
+ string refere = "https://store.weixin.qq.com/shop/order/list";
+ var result = WXHttpResponseBLL.WeiXinPostResponse(shop, url, body, refere);
+ return result;
+ }
public static string addNotes(ShopLoginInfo shop, string orderId, string notes, int tagColor = 0)
{
diff --git a/TEMUKJD/WXForms/OrderForms/WXOrderListForm.resx b/TEMUKJD/WXForms/OrderForms/WXOrderListForm.resx
index 5e0bfb2..47c7016 100644
--- a/TEMUKJD/WXForms/OrderForms/WXOrderListForm.resx
+++ b/TEMUKJD/WXForms/OrderForms/WXOrderListForm.resx
@@ -249,6 +249,9 @@
True
+
+ True
+
True
diff --git a/TEMUKJD/WXForms/ProductForms/ActivityForms/WXActivity618Form.cs b/TEMUKJD/WXForms/ProductForms/ActivityForms/WXActivity618Form.cs
index 535daba..a946a17 100644
--- a/TEMUKJD/WXForms/ProductForms/ActivityForms/WXActivity618Form.cs
+++ b/TEMUKJD/WXForms/ProductForms/ActivityForms/WXActivity618Form.cs
@@ -819,6 +819,13 @@ namespace TemuKJD.WXForms.ProductForms
Thread.Sleep(Randomx.GetId(10, 20));
var prodId = row.Cells["colDraftId"].Value.ParseToString();
var skus = this.wxActivityData.requestProductInfoList.resultList.Where(p => p.product.productId == prodId).ToList();
+
+ if (chkSkipPriceEnd.Checked && txtSkipPriceEnd.Text.Trim().Length > 0 && skus.Any(s => (s.salePrice.ParseToInt() * 0.01m).ParseToString().EndsWith(txtSkipPriceEnd.Text.Trim())))
+ {
+ row.Cells["colOpResult"].Value = "价格尾数命中跳过";
+ continue;
+ }
+
if (skus.All(s => s.isAdded == true))
{
Invoke(new Action(() => { row.Cells["colOpResult"].Value = "已报名"; }));
@@ -829,13 +836,6 @@ namespace TemuKJD.WXForms.ProductForms
Invoke(new Action(() => { row.Cells["colOpResult"].Value = "正在报名"; }));
}
- if (chkSkipPriceEnd.Checked && txtSkipPriceEnd.Text.Trim().Length > 0 && skus.Any(s => (s.salePrice.ParseToInt() * 0.01m).ParseToString().EndsWith(txtSkipPriceEnd.Text.Trim())))
- {
- hasProdForActivity = false;
- row.Cells["colOpResult"].Value = "价格尾数命中跳过";
- break;
- }
-
skus = skus.Where(s => s.isAdded != true).ToList();
foreach (var sku in skus)
{
@@ -907,7 +907,7 @@ namespace TemuKJD.WXForms.ProductForms
{
foreach (var row in rowLstTmp)
{
- if (row.Cells["colOpResult"].Value.ParseToString() == "已报名")
+ if (row.Cells["colOpResult"].Value.ParseToString() == "已报名" || row.Cells["colOpResult"].Value.ParseToString() == "价格尾数命中跳过")
continue;
var errStr = "";
diff --git a/TEMUKJD/WXForms/TalkForms/PDDBuyerOrderListForm.cs b/TEMUKJD/WXForms/TalkForms/PDDBuyerOrderListForm.cs
index a1b2f44..84c33c4 100644
--- a/TEMUKJD/WXForms/TalkForms/PDDBuyerOrderListForm.cs
+++ b/TEMUKJD/WXForms/TalkForms/PDDBuyerOrderListForm.cs
@@ -186,7 +186,7 @@ namespace TemuKJD.WXForms.TalkForms
order.buyerId,
order.buyerName,
order.order_sn,
- order.order_time == null ? "" : BaseClass.StampToDateTime(order.order_time.ParseToInt()).ToString("yy-MM-dd HH:ss"),
+ order.order_time == null ? "" : BaseClass.StampToDateTime(order.order_time.ParseToInt()).ToString("yy-MM-dd HH:mm"),
"", // 图片路径,
DataGridViewExtension.defaultBitmap, // 订单图片
order.order_Goods == null ? "" : string.Join("\r\n", order.order_Goods.Select(g => g.goods_name + " x" + g.goods_number)), // 商品信息