jit制造商报错问题修复 temu已报名直通车商品查询优化 jit数据库商品查询全部商品bug修复 jit订单数据库逻辑优化 拼多多上传加入直通车等待时间延长 其他部分优化

This commit is contained in:
wule committed 2025-12-08 17:35:51 +08:00
1 parent 85d0c2d86a
commit 4dde0936ed
24 files changed
+1905 -585

No files matched your search

@@ -46,14 +46,15 @@ namespace TemuKJD.KJDForms.JITForms
var data = UserLogin.GetSignaturex();
data += "&file_md5=" + temuDBOrderInfo.barCodeMd5;
data += "&shop_id=" + temuDBOrderInfo.supplierId;
data += "&purchaseTime=" + temuDBOrderInfo.purchaseTime;
var html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
{
var errMsg = BaseRegex.GetStringJson(ref html, "msg");
BaseMsgForm.ShowError(errMsg);
return;
}
else
{
@@ -74,14 +75,16 @@ namespace TemuKJD.KJDForms.JITForms
var data = UserLogin.GetSignaturex();
data += "&file_md5=" + temuDBOrderInfo.shippingMarkMd5;
data += "&shop_id=" + temuDBOrderInfo.supplierId;
data += "&purchaseTime=" + temuDBOrderInfo.purchaseTime;
var html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
{
var errMsg = BaseRegex.GetStringJson(ref html, "msg");
BaseMsgForm.ShowError(errMsg);
return;
}
else
{
@@ -144,15 +147,15 @@ namespace TemuKJD.KJDForms.JITForms
data += "&file_base64=" + file_base64;
data += "&file_md5=" + file_md5;
data += "&shop_id=" + temuDBOrderInfo.supplierId;
data += "&purchaseTime=" + temuDBOrderInfo.purchaseTime;
var html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
{
BaseMsgForm.ShowError("文件上传服务端失败,请重试!" + BaseRegex.GetStringJson(ref html, "msg"));
var errMsg = BaseRegex.GetStringJson(ref html, "msg");
BaseMsgForm.ShowError("文件上传服务端失败,请重试!" + errMsg);
return false;
}
else
@@ -194,10 +197,9 @@ namespace TemuKJD.KJDForms.JITForms
data += "&shipping_mark_md5=" + shippingMarkMd5;
data += "&sub_order_sn=" + temuDBOrderInfo.subPurchaseOrderSn;
data += "&shop_id=" + temuDBOrderInfo.supplierId;
data += "&purchaseTime=" + temuDBOrderInfo.purchaseTime;
var html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
+322 -61
View File
@@ -41,12 +41,28 @@ namespace TemuKJD.KJDForms.JITForms
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
this.btnGetDbOrder = new DevComponents.DotNetBar.PanelEx();
this.pnlStatistics = new System.Windows.Forms.Panel();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.lblOriginalOrderNumber = new System.Windows.Forms.Label();
this.label13 = new System.Windows.Forms.Label();
this.lblOrderTotalCost = new System.Windows.Forms.Label();
this.lblOrderTotalPrice = new System.Windows.Forms.Label();
this.label14 = new System.Windows.Forms.Label();
this.label16 = new System.Windows.Forms.Label();
this.lblOrderNumber = new System.Windows.Forms.Label();
this.label22 = new System.Windows.Forms.Label();
this.lblOrderTotalProfit = new System.Windows.Forms.Label();
this.label23 = new System.Windows.Forms.Label();
this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
this.lblRefreshAmount = new System.Windows.Forms.Label();
this.lblAuthorizedAmount = new System.Windows.Forms.Label();
this.label10 = new System.Windows.Forms.Label();
this.pnlGetNewOrder = new System.Windows.Forms.Panel();
this.txtErr = new System.Windows.Forms.TextBox();
this.btnStop = new DevComponents.DotNetBar.PanelEx();
this.btnSearchOrder = new DevComponents.DotNetBar.PanelEx();
this.lblNextGetTime = new System.Windows.Forms.Label();
@@ -84,18 +100,20 @@ namespace TemuKJD.KJDForms.JITForms
this.colLoginStatus = new System.Windows.Forms.DataGridViewLinkColumn();
this.colJitStatus = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colCanUse = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.colOrderToday = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colOrder7Days = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.panel1 = new System.Windows.Forms.Panel();
this.label7 = new System.Windows.Forms.Label();
this.chkSearchTime = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.txtSkcId = new System.Windows.Forms.TextBox();
this.txtSpuId = new System.Windows.Forms.TextBox();
this.label1 = new System.Windows.Forms.Label();
this.dtpStartTime = new System.Windows.Forms.DateTimePicker();
this.dtpEndTime = new System.Windows.Forms.DateTimePicker();
this.label12 = new System.Windows.Forms.Label();
this.txtExtCode = new System.Windows.Forms.TextBox();
this.btnResetExtCode = new DevComponents.DotNetBar.PanelEx();
this.label12 = new System.Windows.Forms.Label();
this.chkSearchTime = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.btnRestoreSizeAndNumber = new DevComponents.DotNetBar.PanelEx();
this.numJudgeWeight = new System.Windows.Forms.NumericUpDown();
this.numJudgeLen = new System.Windows.Forms.NumericUpDown();
@@ -142,6 +160,7 @@ namespace TemuKJD.KJDForms.JITForms
this.colCost = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colPrcie = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colStockUpNum = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colCreateTimeTick = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colCreateTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colUploadCode = new System.Windows.Forms.DataGridViewLinkColumn();
this.colUploadOrder = new System.Windows.Forms.DataGridViewLinkColumn();
@@ -156,6 +175,8 @@ namespace TemuKJD.KJDForms.JITForms
this.splitContainer1.SuspendLayout();
this.ucGroupBoxEx1.SuspendLayout();
this.pnlStatistics.SuspendLayout();
this.tableLayoutPanel1.SuspendLayout();
this.flowLayoutPanel1.SuspendLayout();
this.pnlGetNewOrder.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).BeginInit();
this.splitContainer3.Panel1.SuspendLayout();
@@ -243,7 +264,6 @@ namespace TemuKJD.KJDForms.JITForms
this.ucGroupBoxEx1.TabIndex = 399;
this.ucGroupBoxEx1.TabStop = false;
this.ucGroupBoxEx1.Text = "参数设置";
this.ucGroupBoxEx1.Enter += new System.EventHandler(this.ucGroupBoxEx1_Enter);
//
// btnGetDbOrder
//
@@ -251,9 +271,9 @@ namespace TemuKJD.KJDForms.JITForms
this.btnGetDbOrder.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnGetDbOrder.DisabledBackColor = System.Drawing.Color.Empty;
this.btnGetDbOrder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnGetDbOrder.Location = new System.Drawing.Point(400, 103);
this.btnGetDbOrder.Location = new System.Drawing.Point(350, 103);
this.btnGetDbOrder.Name = "btnGetDbOrder";
this.btnGetDbOrder.Size = new System.Drawing.Size(86, 23);
this.btnGetDbOrder.Size = new System.Drawing.Size(109, 23);
this.btnGetDbOrder.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnGetDbOrder.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnGetDbOrder.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
@@ -271,24 +291,206 @@ namespace TemuKJD.KJDForms.JITForms
//
// pnlStatistics
//
this.pnlStatistics.Controls.Add(this.lblAuthorizedAmount);
this.pnlStatistics.Location = new System.Drawing.Point(880, 13);
this.pnlStatistics.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.pnlStatistics.Controls.Add(this.tableLayoutPanel1);
this.pnlStatistics.Controls.Add(this.flowLayoutPanel1);
this.pnlStatistics.Location = new System.Drawing.Point(870, 13);
this.pnlStatistics.Name = "pnlStatistics";
this.pnlStatistics.Size = new System.Drawing.Size(577, 119);
this.pnlStatistics.Size = new System.Drawing.Size(610, 119);
this.pnlStatistics.TabIndex = 1367;
//
// tableLayoutPanel1
//
this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.tableLayoutPanel1.ColumnCount = 5;
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20.00105F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 19.99974F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 19.99974F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 19.99974F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 19.99974F));
this.tableLayoutPanel1.Controls.Add(this.lblOriginalOrderNumber, 0, 1);
this.tableLayoutPanel1.Controls.Add(this.label13, 0, 0);
this.tableLayoutPanel1.Controls.Add(this.lblOrderTotalCost, 3, 1);
this.tableLayoutPanel1.Controls.Add(this.lblOrderTotalPrice, 2, 1);
this.tableLayoutPanel1.Controls.Add(this.label14, 2, 0);
this.tableLayoutPanel1.Controls.Add(this.label16, 1, 0);
this.tableLayoutPanel1.Controls.Add(this.lblOrderNumber, 1, 1);
this.tableLayoutPanel1.Controls.Add(this.label22, 4, 0);
this.tableLayoutPanel1.Controls.Add(this.lblOrderTotalProfit, 4, 1);
this.tableLayoutPanel1.Controls.Add(this.label23, 3, 0);
this.tableLayoutPanel1.Location = new System.Drawing.Point(30, 35);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
this.tableLayoutPanel1.RowCount = 4;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 23F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 27F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 23F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 27F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(557, 134);
this.tableLayoutPanel1.TabIndex = 1172;
//
// lblOriginalOrderNumber
//
this.lblOriginalOrderNumber.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.lblOriginalOrderNumber.AutoSize = true;
this.lblOriginalOrderNumber.Font = new System.Drawing.Font("微软雅黑", 11F);
this.lblOriginalOrderNumber.Location = new System.Drawing.Point(3, 38);
this.lblOriginalOrderNumber.Name = "lblOriginalOrderNumber";
this.lblOriginalOrderNumber.Size = new System.Drawing.Size(18, 20);
this.lblOriginalOrderNumber.TabIndex = 1172;
this.lblOriginalOrderNumber.Text = "0";
//
// label13
//
this.label13.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.label13.AutoSize = true;
this.label13.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
this.label13.Location = new System.Drawing.Point(3, 6);
this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(92, 17);
this.label13.TabIndex = 1172;
this.label13.Text = "列表母订单总数";
//
// lblOrderTotalCost
//
this.lblOrderTotalCost.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.lblOrderTotalCost.AutoSize = true;
this.lblOrderTotalCost.Font = new System.Drawing.Font("微软雅黑", 11F);
this.lblOrderTotalCost.Location = new System.Drawing.Point(336, 38);
this.lblOrderTotalCost.Name = "lblOrderTotalCost";
this.lblOrderTotalCost.Size = new System.Drawing.Size(18, 20);
this.lblOrderTotalCost.TabIndex = 16;
this.lblOrderTotalCost.Text = "0";
//
// lblOrderTotalPrice
//
this.lblOrderTotalPrice.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.lblOrderTotalPrice.AutoSize = true;
this.lblOrderTotalPrice.Font = new System.Drawing.Font("微软雅黑", 11F);
this.lblOrderTotalPrice.Location = new System.Drawing.Point(225, 38);
this.lblOrderTotalPrice.Name = "lblOrderTotalPrice";
this.lblOrderTotalPrice.Size = new System.Drawing.Size(18, 20);
this.lblOrderTotalPrice.TabIndex = 15;
this.lblOrderTotalPrice.Text = "0";
//
// label14
//
this.label14.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.label14.AutoSize = true;
this.label14.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
this.label14.Location = new System.Drawing.Point(225, 6);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(92, 17);
this.label14.TabIndex = 7;
this.label14.Text = "列表订单总金额";
//
// label16
//
this.label16.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.label16.AutoSize = true;
this.label16.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
this.label16.Location = new System.Drawing.Point(114, 6);
this.label16.Name = "label16";
this.label16.Size = new System.Drawing.Size(80, 17);
this.label16.TabIndex = 0;
this.label16.Text = "列表订单总数";
//
// lblOrderNumber
//
this.lblOrderNumber.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.lblOrderNumber.AutoSize = true;
this.lblOrderNumber.Font = new System.Drawing.Font("微软雅黑", 11F);
this.lblOrderNumber.Location = new System.Drawing.Point(114, 38);
this.lblOrderNumber.Name = "lblOrderNumber";
this.lblOrderNumber.Size = new System.Drawing.Size(18, 20);
this.lblOrderNumber.TabIndex = 14;
this.lblOrderNumber.Text = "0";
//
// label22
//
this.label22.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.label22.AutoSize = true;
this.label22.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
this.label22.Location = new System.Drawing.Point(447, 6);
this.label22.Name = "label22";
this.label22.Size = new System.Drawing.Size(92, 17);
this.label22.TabIndex = 14;
this.label22.Text = "列表订单总利润";
//
// lblOrderTotalProfit
//
this.lblOrderTotalProfit.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.lblOrderTotalProfit.AutoSize = true;
this.lblOrderTotalProfit.Font = new System.Drawing.Font("微软雅黑", 11F);
this.lblOrderTotalProfit.Location = new System.Drawing.Point(447, 38);
this.lblOrderTotalProfit.Name = "lblOrderTotalProfit";
this.lblOrderTotalProfit.Size = new System.Drawing.Size(18, 20);
this.lblOrderTotalProfit.TabIndex = 16;
this.lblOrderTotalProfit.Text = "0";
//
// label23
//
this.label23.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.label23.AutoSize = true;
this.label23.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
this.label23.Location = new System.Drawing.Point(336, 6);
this.label23.Name = "label23";
this.label23.Size = new System.Drawing.Size(92, 17);
this.label23.TabIndex = 14;
this.label23.Text = "列表订单总成本";
//
// flowLayoutPanel1
//
this.flowLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.flowLayoutPanel1.Controls.Add(this.lblRefreshAmount);
this.flowLayoutPanel1.Controls.Add(this.lblAuthorizedAmount);
this.flowLayoutPanel1.Controls.Add(this.label10);
this.flowLayoutPanel1.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft;
this.flowLayoutPanel1.Location = new System.Drawing.Point(326, 2);
this.flowLayoutPanel1.Name = "flowLayoutPanel1";
this.flowLayoutPanel1.Size = new System.Drawing.Size(284, 17);
this.flowLayoutPanel1.TabIndex = 1337;
//
// lblRefreshAmount
//
this.lblRefreshAmount.AutoSize = true;
this.lblRefreshAmount.Cursor = System.Windows.Forms.Cursors.Hand;
this.lblRefreshAmount.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblRefreshAmount.ForeColor = System.Drawing.Color.Blue;
this.lblRefreshAmount.Location = new System.Drawing.Point(228, 0);
this.lblRefreshAmount.Margin = new System.Windows.Forms.Padding(10, 0, 0, 0);
this.lblRefreshAmount.Name = "lblRefreshAmount";
this.lblRefreshAmount.Size = new System.Drawing.Size(56, 17);
this.lblRefreshAmount.TabIndex = 1336;
this.lblRefreshAmount.Text = "点击刷新";
this.lblRefreshAmount.Click += new System.EventHandler(this.lblRefreshAmount_Click);
//
// lblAuthorizedAmount
//
this.lblAuthorizedAmount.AutoSize = true;
this.lblAuthorizedAmount.Location = new System.Drawing.Point(21, 15);
this.lblAuthorizedAmount.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
this.lblAuthorizedAmount.ForeColor = System.Drawing.Color.OrangeRed;
this.lblAuthorizedAmount.Location = new System.Drawing.Point(203, 0);
this.lblAuthorizedAmount.Margin = new System.Windows.Forms.Padding(0);
this.lblAuthorizedAmount.Name = "lblAuthorizedAmount";
this.lblAuthorizedAmount.Size = new System.Drawing.Size(104, 17);
this.lblAuthorizedAmount.Size = new System.Drawing.Size(15, 17);
this.lblAuthorizedAmount.TabIndex = 1335;
this.lblAuthorizedAmount.Text = "账号剩余授权金:";
this.lblAuthorizedAmount.Text = "0";
//
// label10
//
this.label10.AutoSize = true;
this.label10.Location = new System.Drawing.Point(99, 0);
this.label10.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(104, 17);
this.label10.TabIndex = 1337;
this.label10.Text = "账号剩余授权金:";
//
// pnlGetNewOrder
//
this.pnlGetNewOrder.Controls.Add(this.txtErr);
this.pnlGetNewOrder.Controls.Add(this.btnStop);
this.pnlGetNewOrder.Controls.Add(this.btnSearchOrder);
this.pnlGetNewOrder.Controls.Add(this.lblNextGetTime);
@@ -298,12 +500,21 @@ namespace TemuKJD.KJDForms.JITForms
this.pnlGetNewOrder.Size = new System.Drawing.Size(249, 119);
this.pnlGetNewOrder.TabIndex = 1354;
//
// txtErr
//
this.txtErr.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.txtErr.Location = new System.Drawing.Point(13, 40);
this.txtErr.Multiline = true;
this.txtErr.Name = "txtErr";
this.txtErr.Size = new System.Drawing.Size(194, 49);
this.txtErr.TabIndex = 1308;
//
// btnStop
//
this.btnStop.CanvasColor = System.Drawing.SystemColors.Control;
this.btnStop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnStop.DisabledBackColor = System.Drawing.Color.Empty;
this.btnStop.Location = new System.Drawing.Point(18, 29);
this.btnStop.Location = new System.Drawing.Point(13, 10);
this.btnStop.Name = "btnStop";
this.btnStop.Size = new System.Drawing.Size(45, 23);
this.btnStop.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -328,7 +539,7 @@ namespace TemuKJD.KJDForms.JITForms
this.btnSearchOrder.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnSearchOrder.DisabledBackColor = System.Drawing.Color.Empty;
this.btnSearchOrder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSearchOrder.Location = new System.Drawing.Point(65, 29);
this.btnSearchOrder.Location = new System.Drawing.Point(60, 10);
this.btnSearchOrder.Name = "btnSearchOrder";
this.btnSearchOrder.Size = new System.Drawing.Size(147, 23);
this.btnSearchOrder.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -343,22 +554,22 @@ namespace TemuKJD.KJDForms.JITForms
this.btnSearchOrder.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
this.btnSearchOrder.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
this.btnSearchOrder.TabIndex = 996;
this.btnSearchOrder.Text = "查询待发货订单";
this.btnSearchOrder.Text = "循环读取待发货订单";
this.btnSearchOrder.Click += new System.EventHandler(this.btnSearchOrder_Click);
//
// lblNextGetTime
//
this.lblNextGetTime.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
this.lblNextGetTime.Location = new System.Drawing.Point(16, 58);
this.lblNextGetTime.Location = new System.Drawing.Point(11, 93);
this.lblNextGetTime.Name = "lblNextGetTime";
this.lblNextGetTime.Size = new System.Drawing.Size(201, 45);
this.lblNextGetTime.Size = new System.Drawing.Size(201, 18);
this.lblNextGetTime.TabIndex = 1291;
this.lblNextGetTime.Text = "这里显示距离下次读取订单剩余时间间隔数字";
//
// line1
//
this.line1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.line1.Location = new System.Drawing.Point(233, 9);
this.line1.Location = new System.Drawing.Point(235, 9);
this.line1.Name = "line1";
this.line1.Size = new System.Drawing.Size(11, 104);
this.line1.TabIndex = 1263;
@@ -426,9 +637,9 @@ namespace TemuKJD.KJDForms.JITForms
this.btnFilter.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnFilter.DisabledBackColor = System.Drawing.Color.Empty;
this.btnFilter.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnFilter.Location = new System.Drawing.Point(491, 103);
this.btnFilter.Location = new System.Drawing.Point(462, 103);
this.btnFilter.Name = "btnFilter";
this.btnFilter.Size = new System.Drawing.Size(80, 23);
this.btnFilter.Size = new System.Drawing.Size(109, 23);
this.btnFilter.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnFilter.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnFilter.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
@@ -441,7 +652,7 @@ namespace TemuKJD.KJDForms.JITForms
this.btnFilter.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
this.btnFilter.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
this.btnFilter.TabIndex = 1290;
this.btnFilter.Text = "筛选订单";
this.btnFilter.Text = "筛选订单列表";
this.btnFilter.Click += new System.EventHandler(this.btnFilter_Click);
//
// line2
@@ -637,14 +848,14 @@ namespace TemuKJD.KJDForms.JITForms
this.splitContainer2.Panel2.Controls.Add(this.dgvStock);
this.splitContainer2.Panel2.Padding = new System.Windows.Forms.Padding(0, 0, 4, 0);
this.splitContainer2.Size = new System.Drawing.Size(1489, 437);
this.splitContainer2.SplitterDistance = 325;
this.splitContainer2.SplitterDistance = 430;
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(137, 193);
this.pbShopLoading.Location = new System.Drawing.Point(190, 193);
this.pbShopLoading.Name = "pbShopLoading";
this.pbShopLoading.Size = new System.Drawing.Size(50, 50);
this.pbShopLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -691,6 +902,8 @@ namespace TemuKJD.KJDForms.JITForms
this.colLoginStatus,
this.colJitStatus,
this.colCanUse,
this.colOrderToday,
this.colOrder7Days,
this.colMessage});
this.dgvShop.Dock = System.Windows.Forms.DockStyle.Fill;
this.dgvShop.Location = new System.Drawing.Point(4, 0);
@@ -698,7 +911,7 @@ namespace TemuKJD.KJDForms.JITForms
this.dgvShop.ReadOnly = true;
this.dgvShop.RowHeadersWidth = 25;
this.dgvShop.RowTemplate.Height = 23;
this.dgvShop.Size = new System.Drawing.Size(321, 437);
this.dgvShop.Size = new System.Drawing.Size(426, 437);
this.dgvShop.TabIndex = 6;
this.dgvShop.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellContentClick);
//
@@ -774,6 +987,20 @@ namespace TemuKJD.KJDForms.JITForms
this.colCanUse.Visible = false;
this.colCanUse.Width = 28;
//
// colOrderToday
//
this.colOrderToday.HeaderText = "日订单";
this.colOrderToday.Name = "colOrderToday";
this.colOrderToday.ReadOnly = true;
this.colOrderToday.Width = 58;
//
// colOrder7Days
//
this.colOrder7Days.HeaderText = "7日订单";
this.colOrder7Days.Name = "colOrder7Days";
this.colOrder7Days.ReadOnly = true;
this.colOrder7Days.Width = 58;
//
// colMessage
//
this.colMessage.HeaderText = "消息";
@@ -783,15 +1010,15 @@ namespace TemuKJD.KJDForms.JITForms
// panel1
//
this.panel1.Controls.Add(this.label7);
this.panel1.Controls.Add(this.chkSearchTime);
this.panel1.Controls.Add(this.txtSkcId);
this.panel1.Controls.Add(this.txtSpuId);
this.panel1.Controls.Add(this.label1);
this.panel1.Controls.Add(this.dtpStartTime);
this.panel1.Controls.Add(this.dtpEndTime);
this.panel1.Controls.Add(this.label12);
this.panel1.Controls.Add(this.txtExtCode);
this.panel1.Controls.Add(this.btnResetExtCode);
this.panel1.Controls.Add(this.label12);
this.panel1.Controls.Add(this.chkSearchTime);
this.panel1.Location = new System.Drawing.Point(22, 151);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(278, 152);
@@ -807,18 +1034,6 @@ namespace TemuKJD.KJDForms.JITForms
this.label7.TabIndex = 998;
this.label7.Text = "SpuId:";
//
// chkSearchTime
//
this.chkSearchTime.AutoSize = true;
this.chkSearchTime.Checked = true;
this.chkSearchTime.CheckState = System.Windows.Forms.CheckState.Checked;
this.chkSearchTime.Location = new System.Drawing.Point(4, 86);
this.chkSearchTime.Name = "chkSearchTime";
this.chkSearchTime.Size = new System.Drawing.Size(63, 21);
this.chkSearchTime.TabIndex = 1002;
this.chkSearchTime.Text = "日期:";
this.chkSearchTime.UseVisualStyleBackColor = true;
//
// txtSkcId
//
this.txtSkcId.Location = new System.Drawing.Point(51, 37);
@@ -856,15 +1071,6 @@ namespace TemuKJD.KJDForms.JITForms
this.dtpEndTime.Size = new System.Drawing.Size(110, 23);
this.dtpEndTime.TabIndex = 1001;
//
// label12
//
this.label12.AutoSize = true;
this.label12.Location = new System.Drawing.Point(17, 64);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(44, 17);
this.label12.TabIndex = 1004;
this.label12.Text = "货号:";
//
// txtExtCode
//
this.txtExtCode.Location = new System.Drawing.Point(51, 61);
@@ -895,6 +1101,27 @@ namespace TemuKJD.KJDForms.JITForms
this.btnResetExtCode.TabIndex = 1005;
this.btnResetExtCode.Text = "重置";
//
// label12
//
this.label12.AutoSize = true;
this.label12.Location = new System.Drawing.Point(17, 64);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(44, 17);
this.label12.TabIndex = 1004;
this.label12.Text = "货号:";
//
// chkSearchTime
//
this.chkSearchTime.AutoSize = true;
this.chkSearchTime.Checked = true;
this.chkSearchTime.CheckState = System.Windows.Forms.CheckState.Checked;
this.chkSearchTime.Location = new System.Drawing.Point(4, 86);
this.chkSearchTime.Name = "chkSearchTime";
this.chkSearchTime.Size = new System.Drawing.Size(63, 21);
this.chkSearchTime.TabIndex = 1002;
this.chkSearchTime.Text = "日期:";
this.chkSearchTime.UseVisualStyleBackColor = true;
//
// btnRestoreSizeAndNumber
//
this.btnRestoreSizeAndNumber.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -1241,7 +1468,7 @@ namespace TemuKJD.KJDForms.JITForms
//
this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None;
this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue;
this.pbLoading.Location = new System.Drawing.Point(539, 193);
this.pbLoading.Location = new System.Drawing.Point(486, 193);
this.pbLoading.Name = "pbLoading";
this.pbLoading.Size = new System.Drawing.Size(50, 50);
this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -1290,6 +1517,7 @@ namespace TemuKJD.KJDForms.JITForms
this.colCost,
this.colPrcie,
this.colStockUpNum,
this.colCreateTimeTick,
this.colCreateTime,
this.colUploadCode,
this.colUploadOrder,
@@ -1299,8 +1527,9 @@ namespace TemuKJD.KJDForms.JITForms
this.dgvStock.Name = "dgvStock";
this.dgvStock.ReadOnly = true;
this.dgvStock.RowTemplate.Height = 23;
this.dgvStock.Size = new System.Drawing.Size(1156, 437);
this.dgvStock.Size = new System.Drawing.Size(1051, 437);
this.dgvStock.TabIndex = 676;
this.dgvStock.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvStock_CellClick);
this.dgvStock.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvStock_CellContentClick);
//
// colCheck
@@ -1495,6 +1724,13 @@ namespace TemuKJD.KJDForms.JITForms
this.colStockUpNum.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
this.colStockUpNum.Width = 65;
//
// colCreateTimeTick
//
this.colCreateTimeTick.HeaderText = "创建时间戳";
this.colCreateTimeTick.Name = "colCreateTimeTick";
this.colCreateTimeTick.ReadOnly = true;
this.colCreateTimeTick.Visible = false;
//
// colCreateTime
//
dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
@@ -1510,14 +1746,17 @@ namespace TemuKJD.KJDForms.JITForms
this.colUploadCode.Name = "colUploadCode";
this.colUploadCode.ReadOnly = true;
this.colUploadCode.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.colUploadCode.Width = 95;
//
// colUploadOrder
//
dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colUploadOrder.DefaultCellStyle = dataGridViewCellStyle12;
this.colUploadOrder.HeaderText = "上传订单";
this.colUploadOrder.Name = "colUploadOrder";
this.colUploadOrder.ReadOnly = true;
this.colUploadOrder.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.colUploadOrder.Width = 80;
this.colUploadOrder.Width = 65;
//
// colMsg
//
@@ -1614,8 +1853,12 @@ namespace TemuKJD.KJDForms.JITForms
this.ucGroupBoxEx1.ResumeLayout(false);
this.ucGroupBoxEx1.PerformLayout();
this.pnlStatistics.ResumeLayout(false);
this.pnlStatistics.PerformLayout();
this.tableLayoutPanel1.ResumeLayout(false);
this.tableLayoutPanel1.PerformLayout();
this.flowLayoutPanel1.ResumeLayout(false);
this.flowLayoutPanel1.PerformLayout();
this.pnlGetNewOrder.ResumeLayout(false);
this.pnlGetNewOrder.PerformLayout();
this.splitContainer3.Panel1.ResumeLayout(false);
this.splitContainer3.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).EndInit();
@@ -1681,16 +1924,6 @@ namespace TemuKJD.KJDForms.JITForms
private System.Windows.Forms.PictureBox pbShopLoading;
private UserComponent.UcCheckBox chkSearchAllShop;
private UserComponent.DataGridViewEx dgvShop;
private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect;
private System.Windows.Forms.DataGridViewTextBoxColumn colUser;
private System.Windows.Forms.DataGridViewTextBoxColumn colLoginName;
private System.Windows.Forms.DataGridViewTextBoxColumn colShopId;
private System.Windows.Forms.DataGridViewTextBoxColumn colShopName;
private System.Windows.Forms.DataGridViewTextBoxColumn colShopNotes;
private System.Windows.Forms.DataGridViewLinkColumn colLoginStatus;
private System.Windows.Forms.DataGridViewTextBoxColumn colJitStatus;
private System.Windows.Forms.DataGridViewCheckBoxColumn colCanUse;
private System.Windows.Forms.DataGridViewTextBoxColumn colMessage;
private System.Windows.Forms.PictureBox pbLoading;
private System.Windows.Forms.SplitContainer splitContainer4;
private UserControls.UcSplitPage ucSplitPage1;
@@ -1738,6 +1971,22 @@ namespace TemuKJD.KJDForms.JITForms
private System.Windows.Forms.Label lblNextGetTime;
private System.Windows.Forms.Panel pnlStatistics;
private DevComponents.DotNetBar.PanelEx btnGetDbOrder;
private System.Windows.Forms.TextBox txtErr;
private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;
private System.Windows.Forms.Label lblRefreshAmount;
private System.Windows.Forms.Label label10;
private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect;
private System.Windows.Forms.DataGridViewTextBoxColumn colUser;
private System.Windows.Forms.DataGridViewTextBoxColumn colLoginName;
private System.Windows.Forms.DataGridViewTextBoxColumn colShopId;
private System.Windows.Forms.DataGridViewTextBoxColumn colShopName;
private System.Windows.Forms.DataGridViewTextBoxColumn colShopNotes;
private System.Windows.Forms.DataGridViewLinkColumn colLoginStatus;
private System.Windows.Forms.DataGridViewTextBoxColumn colJitStatus;
private System.Windows.Forms.DataGridViewCheckBoxColumn colCanUse;
private System.Windows.Forms.DataGridViewTextBoxColumn colOrderToday;
private System.Windows.Forms.DataGridViewTextBoxColumn colOrder7Days;
private System.Windows.Forms.DataGridViewTextBoxColumn colMessage;
private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck;
private System.Windows.Forms.DataGridViewTextBoxColumn colIndexId;
private System.Windows.Forms.DataGridViewTextBoxColumn colSupplierId;
@@ -1760,9 +2009,21 @@ namespace TemuKJD.KJDForms.JITForms
private System.Windows.Forms.DataGridViewTextBoxColumn colCost;
private System.Windows.Forms.DataGridViewTextBoxColumn colPrcie;
private System.Windows.Forms.DataGridViewTextBoxColumn colStockUpNum;
private System.Windows.Forms.DataGridViewTextBoxColumn colCreateTimeTick;
private System.Windows.Forms.DataGridViewTextBoxColumn colCreateTime;
private System.Windows.Forms.DataGridViewLinkColumn colUploadCode;
private System.Windows.Forms.DataGridViewLinkColumn colUploadOrder;
private System.Windows.Forms.DataGridViewTextBoxColumn colMsg;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
private System.Windows.Forms.Label lblOrderTotalCost;
private System.Windows.Forms.Label lblOrderTotalPrice;
private System.Windows.Forms.Label label14;
private System.Windows.Forms.Label label16;
private System.Windows.Forms.Label lblOrderNumber;
private System.Windows.Forms.Label label22;
private System.Windows.Forms.Label lblOrderTotalProfit;
private System.Windows.Forms.Label label23;
private System.Windows.Forms.Label lblOriginalOrderNumber;
private System.Windows.Forms.Label label13;
}
}
+480 -194
View File
@@ -20,6 +20,7 @@ using TemuKJD.Extension;
using TemuKJD.KJDForms.AdminForms;
using TemuKJD.KJDForms.ProductForms;
using TemuKJD.KJDForms.ShopForms;
using TemuKJD.KJDForms.ShopForms.Statistics;
using TemuKJD.ToolForms;
using Work;
@@ -60,18 +61,24 @@ namespace TemuKJD.KJDForms.JITForms
if (!IsClientJit)
{
ucSplitPage1.Visible = true;
btnGetDbOrder.Visible = true;
//btnGetDbOrder.Visible = true;
btnGetDbOrder.Text = "拉取已上传订单";
pnlGetNewOrder.Visible = false;
pnlStatistics.Visible = false;
colJitStatus.Visible = false;
dgvShop.Columns["colOrderToday"].Visible = false;
dgvShop.Columns["colOrder7days"].Visible = false;
splitContainer2.SplitterDistance = 320;
}
else
{
ucSplitPage1.Visible = false;
btnGetDbOrder.Visible = false;
//btnGetDbOrder.Visible = false;
btnGetDbOrder.Text = "刷新已读取订单";
pnlGetNewOrder.Visible = true;
pnlStatistics.Visible = true;
}
splitContainer4.SplitterDistance = splitContainer2.SplitterDistance - 4;
lblNextGetTime.Text = "";
@@ -110,10 +117,10 @@ namespace TemuKJD.KJDForms.JITForms
this.txtExtCode.TextChanged += Txt_TextChanged;
this.chkSearchTime.CheckedChanged += Txt_TextChanged;
lblAuthorizedAmount.Text = "剩余授权金:" + BaseClass.AuthorizedAmount;
lblAuthorizedAmount.Text = "" + BaseClass.AuthorizedAmount.ParseToDecimal().ToString("0.0");
if (IsClientJit)
loadServerDbOrder();
btnGetDbOrder_Click(null, null);
}
private void chkSelectAll_CheckedChanged(object sender, EventArgs e)
{
@@ -218,6 +225,8 @@ namespace TemuKJD.KJDForms.JITForms
shop.Notes,
canUse ? "在线" : "掉线",
canUse,
string.Empty,
string.Empty,
string.Empty
);
displayShopStatus(shop);
@@ -516,6 +525,9 @@ namespace TemuKJD.KJDForms.JITForms
row.Cells["colMessage"].Value = "";
}
txtErr.Text = "状态正常";
txtErr.ForeColor = Color.Black;
cancellationTokenSource = new CancellationTokenSource();
Task.Run(() =>
{
@@ -532,15 +544,18 @@ namespace TemuKJD.KJDForms.JITForms
{
Task.Run(() =>
{
Task.Run(() => { GetMainStatics(lstShopId, cancellationTokenSource); });
lstOrderForSupplierInfo.Clear();
GetNewOrder(lstShopId, cancellationTokenSource);
statisticsListOrder();
});
nextReadTime = DateTime.Now.AddMinutes(30);
}
Thread.Sleep(1000);
Invoke(new Action(() => {
var ticks = nextReadTime - DateTime.Now;
lblNextGetTime.Text = "距离下次读取剩余:" + ticks.Minutes + "分" + ticks.Seconds + "秒";
lblNextGetTime.Text = "下次读取:" + nextReadTime.ToString("HH:mm") + ",剩余:" + ticks.Minutes + "分" + ticks.Seconds + "秒";
}));
if (cancellationTokenSource?.IsCancellationRequested == true)
{
@@ -554,9 +569,76 @@ namespace TemuKJD.KJDForms.JITForms
}
}
void GetMainStatics(List<string> lstShopId, CancellationTokenSource _cancellationTokenSource)
{
var lstShopIdTemp = new ConcurrentList<string>();
lstShopIdTemp.AddRange(lstShopId);
foreach (var shopId in lstShopIdTemp)
{
if (_cancellationTokenSource.IsCancellationRequested)
break;
bool rst = true;
ShopLoginInfo shop = GetAndCheckShopLogin(shopId, ref rst);
if (!rst)
{
continue;
}
ShopOrderStatisticsInfo statistics = new ShopOrderStatisticsInfo();
string html = ShopOrderStatisticsForm.GetMainStatistics(shop);
if (!html.Contains("\"success\":true"))
html = ShopOrderStatisticsForm.GetMainStatistics(shop);
if (html.Contains("\"success\":true"))
{
statistics.aboutToSellOutNumber = BaseRegex.GetNullableIntJson(ref html, "aboutToSellOutNumber");
statistics.adjustPrice = BaseRegex.GetNullableIntJson(ref html, "adjustPrice");
statistics.advicePrepareSkcNumber = BaseRegex.GetNullableIntJson(ref html, "advicePrepareSkcNumber");
statistics.alreadySoldOutNumber = BaseRegex.GetNullableIntJson(ref html, "alreadySoldOutNumber");
statistics.havePublishProduct = BaseRegex.GetNullableBoolJson(ref html, "havePublishProduct");
statistics.highPriceLimitNumber = BaseRegex.GetNullableIntJson(ref html, "highPriceLimitNumber");
statistics.lackSkcNumber = BaseRegex.GetNullableIntJson(ref html, "lackSkcNumber");
statistics.onSaleProductNumber = BaseRegex.GetNullableIntJson(ref html, "onSaleProductNumber");
statistics.qualityAfterSaleRatio90d = BaseRegex.GetNullableIntJson(ref html, "qualityAfterSaleRatio90d");
statistics.reviewAdjustPrice = BaseRegex.GetNullableIntJson(ref html, "reviewAdjustPrice");
statistics.saleVolume = BaseRegex.GetNullableIntJson(ref html, "saleVolume");
statistics.sevenDaysSaleVolume = BaseRegex.GetNullableIntJson(ref html, "sevenDaysSaleVolume");
statistics.thirtyDaysSaleVolume = BaseRegex.GetNullableIntJson(ref html, "thirtyDaysSaleVolume");
statistics.waitProductNumber = BaseRegex.GetNullableIntJson(ref html, "waitProductNumber");
statistics.is_search_1 = true;
Invoke(new Action(() =>
{
var rows = this.dgvShop.Rows.Cast<DataGridViewRow>().Where(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId);
foreach (var row in rows)
{
row.Cells["colOrderToday"].Value = statistics.saleVolume;
row.Cells["colOrder7Days"].Value = statistics.sevenDaysSaleVolume;
}
}));
}
else
{
string errStr = BaseRegex.GetStringJson(ref html, "errorMsg");
if (string.IsNullOrEmpty(errStr))
errStr = BaseRegex.GetStringJson(ref html, "error_msg");
if (string.IsNullOrEmpty(errStr))
errStr = html;
if (errStr.Contains("Invalid Login State"))
{
ShopListForm.Instance.CheckShopLogin(new string[] { shop.LoginName }, false);
}
Thread.Sleep(Randomx.GetId(100, 200));
statistics.err_msg = errStr;
continue;
}
}
}
void GetNewOrder(List<string> lstShopId, CancellationTokenSource _cancellationTokenSource)
{
var lstShopIdTemp = new List<string>();
var lstShopIdTemp = new ConcurrentList<string>();
lstShopIdTemp.AddRange(lstShopId);
int i = 0;
foreach (var shopId in lstShopIdTemp)
@@ -569,49 +651,15 @@ namespace TemuKJD.KJDForms.JITForms
i++;
}));
if (cancellationTokenSource.IsCancellationRequested)
if (_cancellationTokenSource.IsCancellationRequested)
break;
ShopLoginInfo shop = null;
if (!IsClientJit)
{
shop = this.lstAdminShopInfo.FirstOrDefault(s => s.ShopId == shopId);
}
else
{
shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId);
}
if (shop == null)
continue;
#region 检测登录
if (shop.LoginStatus2 != "国际版在线")
bool rst = true;
ShopLoginInfo shop = GetAndCheckShopLogin(shopId, ref rst);
if (!rst)
{
continue;
}
if (!IsClientJit)
{
AdminShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false);
}
else
{
ShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false);
}
if (shop.LoginStatus2 != "国际版在线")
{
Invoke(new Action(() =>
{
var rows = this.dgvShop.Rows.Cast<DataGridViewRow>().Where(r => r.Cells["colLoginName"].Value.ToString() == shop.LoginName);
foreach (var row in rows)
{
row.Cells["colMessage"].Value = "店铺掉线";
row.Cells["colLoginStatus"].Value = "未登录";
row.Cells["colCanUse"].Value = false;
}
}));
continue;
}
#endregion
Invoke(new Action(() =>
{
@@ -629,7 +677,7 @@ namespace TemuKJD.KJDForms.JITForms
string errorMsg = "";
while (page <= totalPage)
{
if (cancellationTokenSource.IsCancellationRequested)
if (_cancellationTokenSource.IsCancellationRequested)
break;
Thread.Sleep(100 + Randomx.GetId(200));
@@ -651,6 +699,9 @@ namespace TemuKJD.KJDForms.JITForms
ConcurrentList<subOrderForSupplier> subOrderInfoLst = new ConcurrentList<subOrderForSupplier>();
if (jsonStr.Contains("\"success\":true"))
{
int total = BaseRegex.GetStringJson(ref jsonStr, "total").ParseToInt();
totalPage = Math.Ceiling(1.0m * total / pageSize).ParseToInt();
var jArr = new JArray();
try
{
@@ -740,46 +791,43 @@ namespace TemuKJD.KJDForms.JITForms
var url = BaseClass.BuildObjString("order/add_order");
var data = UserLogin.GetSignaturex() +
//"&page=" + page +
//"&page_size=" + pageSize +
"&shop_id=" + dbOrderInfo.supplierId +
"&order_data=" + HttpUtility.UrlEncode(JsonHelper.SerializeObject(dbOrderInfo), Encoding.UTF8);
//if (BaseClass.SaLevel > 1 && !chkSearchAllShop.Checked)
// data += "&operate_sub_sa_name=" + BaseClass.UserName;
var html = GetHtml.PostUtf8(url, data);
//if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
// html = GetHtml.PostUtf8(url, data);
//if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
// html = GetHtml.PostUtf8(url, data);
if (!string.IsNullOrEmpty(html) && html.Contains("\"code\":200"))
#if RELEASE
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
html = GetHtml.PostUtf8(url, data);
#endif
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
{
var errMsg = BaseRegex.GetStringJson(ref html, "msg");
Invoke(new Action(() =>
{
txtErr.Text = "订单入库失败,请检查网络" + errMsg;
txtErr.ForeColor = Color.Red;
}));
}
Invoke(new Action(() =>
{
int rowId = 0;
var rows = this.dgvStock.Rows.Cast<DataGridViewRow>();
foreach (var r in rows)
var rw = this.dgvStock.Rows.Cast<DataGridViewRow>().LastOrDefault(r =>
r.Cells["colSupplierId"].Value.ParseToString() == shop.ShopId &&
r.Cells["colCreateTimeTick"].Value.ParseToLong() > dbOrderInfo.purchaseTime
);
if (rw != null)
{
if (r.Cells["colSupplierId"].Value.ParseToString() == shop.ShopId && r.Cells["colCreateTime"].Value.ParseToLong() <= dbOrderInfo.purchaseTime)
{
rowId = r.Index;
break;
}
rowId = rw.Index + 1;
}
InsertRow(rowId, dbOrderInfo);
if (dbOrderInfo.costPrice > 0)
InsertRow(rowId, dbOrderInfo);
}));
}
int total = BaseRegex.GetStringJson(ref jsonStr, "total").ParseToInt();
totalPage = Math.Ceiling(1.0m * total / pageSize).ParseToInt();
}
page++;
}
InsertRowEnd(); // 处理合并单元格恰在好最后一行的情况
Invoke(new Action(() =>
{
@@ -804,7 +852,7 @@ namespace TemuKJD.KJDForms.JITForms
Invoke(new Action(() =>
{
string sRst = "查询结束!";
if (cancellationTokenSource.IsCancellationRequested)
if (_cancellationTokenSource.IsCancellationRequested)
sRst = "已取消查询!";
//BaseMsgForm.ShowInfo(sRst);
@@ -812,6 +860,8 @@ namespace TemuKJD.KJDForms.JITForms
}));
}
Dictionary<string, ConcurrentList<DataGridViewCell>> dicMergeInfoCells = new Dictionary<string, ConcurrentList<DataGridViewCell>>();
Dictionary<string, ConcurrentList<DataGridViewCell>> dicMergeImgCells = new Dictionary<string, ConcurrentList<DataGridViewCell>>();
ConcurrentList<DataGridViewCell> MergeInfoCells = new ConcurrentList<DataGridViewCell>();
ConcurrentList<DataGridViewCell> MergeImgCells = new ConcurrentList<DataGridViewCell>();
void InsertRow(int rowId, TemuDBOrderInfo dbOrderInfo)
@@ -851,6 +901,7 @@ namespace TemuKJD.KJDForms.JITForms
dbOrderInfo.supplierPrice / 100m,
dbOrderInfo.purchaseQuantity, // 备货件数
dbOrderInfo.purchaseTime,
BaseClass.StampToDateTime((dbOrderInfo.purchaseTime / 1000).ParseToInt()).ToString("yyyy-MM-dd HH:mm:ss"), // 备货单创建时间
"",
""
@@ -868,13 +919,13 @@ namespace TemuKJD.KJDForms.JITForms
if (MergeInfoCells.Count > 1)
{
ConcurrentList<DataGridViewCell> cells = new ConcurrentList<DataGridViewCell>();
cells.AddRange(MergeInfoCells);
cells.AddRange(MergeInfoCells.OrderBy(c => c.RowIndex));
dgvStock.AddVerticalMergeCell(cells);
}
if (MergeImgCells.Count > 1)
{
ConcurrentList<DataGridViewCell> cells = new ConcurrentList<DataGridViewCell>();
cells.AddRange(MergeImgCells);
cells.AddRange(MergeImgCells.OrderBy(c => c.RowIndex));
dgvStock.AddVerticalMergeCell(cells);
}
MergeInfoCells.Clear();
@@ -886,12 +937,15 @@ namespace TemuKJD.KJDForms.JITForms
{
MergeInfoCells.Insert(0, dgvStock.Rows[rowId].Cells["colProdInfo"]);
MergeImgCells.Insert(0, dgvStock.Rows[rowId].Cells["colProductSkcPic"]);
if (dgvStock.Rows.Count > rowId + 1)
{
//dgvStock.Rows[rowId + 1].Cells["colProdInfo"].Value = "";
dgvStock.Rows[rowId + 1].Cells["colProductSkcPic"].Value = this.defaultBitmap;
}
}
//if (!dicMergeInfoCells.ContainsKey(dbOrderInfo.originalPurchaseOrderSn))
// dicMergeInfoCells.Add(dbOrderInfo.originalPurchaseOrderSn, new ConcurrentList<DataGridViewCell>());
//dicMergeInfoCells["dbOrderInfo.originalPurchaseOrderSn"].Add(dgvStock.Rows[rowId].Cells["colProdInfo"]);
//if (!dicMergeImgCells.ContainsKey(dbOrderInfo.originalPurchaseOrderSn))
// dicMergeImgCells.Add(dbOrderInfo.originalPurchaseOrderSn, new ConcurrentList<DataGridViewCell>());
//dicMergeImgCells["dbOrderInfo.originalPurchaseOrderSn"].Add(dgvStock.Rows[rowId].Cells["colProductSkcPic"]);
if (indexId % 2 == 1)
row.DefaultCellStyle.BackColor = Color.White;
else
@@ -900,10 +954,28 @@ namespace TemuKJD.KJDForms.JITForms
FilterRow(row);
}
void InsertRowEnd()
{
if (MergeInfoCells.Count > 1)
{
ConcurrentList<DataGridViewCell> cells = new ConcurrentList<DataGridViewCell>();
cells.AddRange(MergeInfoCells.OrderBy(c => c.RowIndex));
dgvStock.AddVerticalMergeCell(cells);
}
if (MergeImgCells.Count > 1)
{
ConcurrentList<DataGridViewCell> cells = new ConcurrentList<DataGridViewCell>();
cells.AddRange(MergeImgCells.OrderBy(c => c.RowIndex));
dgvStock.AddVerticalMergeCell(cells);
}
MergeInfoCells.Clear();
MergeImgCells.Clear();
}
void SetRowLinkCellText(TemuDBOrderInfo dbOrderInfo, DataGridViewRow row)
{
string upLoadCodeText = "";
//if (dbOrderInfo.upLoadStatus < 2)
if(IsClientJit)
{
upLoadCodeText = "上传";
if (!string.IsNullOrWhiteSpace(dbOrderInfo.jiaTongCode) && !string.IsNullOrWhiteSpace(dbOrderInfo.barCodeMd5) &&
@@ -912,102 +984,125 @@ namespace TemuKJD.KJDForms.JITForms
upLoadCodeText = "修改上传";
}
}
if (!IsClientJit)
else
{
upLoadCodeText = "查看";
}
string upLoadOrderText = "";
if (dbOrderInfo.upLoadStatus < 2 && upLoadCodeText == "修改上传")
if (IsClientJit)
{
upLoadOrderText = "上传订单";
if (dbOrderInfo.upLoadStatus < 2)
{
if (!string.IsNullOrWhiteSpace(dbOrderInfo.jiaTongCode) && !string.IsNullOrWhiteSpace(dbOrderInfo.barCodeMd5) &&
!string.IsNullOrWhiteSpace(dbOrderInfo.shippingMarkMd5))
{
upLoadOrderText = "上传订单";
}
}
if (dbOrderInfo.upLoadStatus == 2)
{
upLoadOrderText = "已上传";
}
if (dbOrderInfo.upLoadStatus == 3)
{
upLoadOrderText = "已打单";
}
if (dbOrderInfo.upLoadStatus == 4)
{
upLoadOrderText = "已发货";
}
}
if (dbOrderInfo.upLoadStatus >= 2)
else
{
upLoadOrderText = "已上传";
if (dbOrderInfo.upLoadStatus == 2)
{
upLoadOrderText = "已上传 点击打单";
}
if (dbOrderInfo.upLoadStatus == 3)
{
upLoadOrderText = "已打单 点击发货";
}
if (dbOrderInfo.upLoadStatus == 4)
{
upLoadOrderText = "已发货";
}
}
row.Cells["colUploadCode"].Value = upLoadCodeText;
row.Cells["colUploadOrder"].Value = upLoadOrderText;
}
void loadServerDbOrder()
void clientLoadServerDbOrder()
{
Task.Run(() =>
var shops = GlobalConfig.ShopLoginList;
for (int i = shops.Count - 1; i >= 0; i--)
{
var shops = GlobalConfig.ShopLoginList;
if (!IsClientJit)
var shop = shops[i];
if (shop.jit_expire_time >= DateTime.Now.Date)
{
var lstShopId = dgvShop.Rows.Cast<DataGridViewRow>().Where(row
=> row.Cells["colSelect"]?.Value.ParseToBool() == true).Select(r => r.Cells["colShopId"]?.Value.ToString()).ToList();
if (lstShopId.Count == 0)
loadServerDbOrder(shop);
}
}
statisticsListOrder();
}
void loadServerDbOrder(ShopLoginInfo shop)
{
int page = 0;
int totalPage = 1;
int pageSize = 200;
while (page < totalPage)
{
page++;
var url = BaseClass.BuildObjString("order/get_order_list");
var data = UserLogin.GetSignaturex() +
"&page_size=" + pageSize +
"&page=" + page;
if (shop != null)
data += "&shop_id=" + shop.ShopId;
if (!IsClientJit)
data += "&upload_order_status=2";
var html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
html = GetHtml.PostUtf8(url, data);
Thread.Sleep(50);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
{
var errMsg = BaseRegex.GetStringJson(ref html, "msg");
Invoke(new Action(() =>
{
txtErr.Text = "拉取入库订单失败,请检查网络" + errMsg;
txtErr.ForeColor = Color.Red;
}));
}
else
{
int total = BaseRegex.GetStringJson(ref html, "count").ParseToInt();
totalPage = Math.Ceiling(1.0m * total / pageSize).ParseToInt();
var jObj = JObject.Parse(html);
var list = JsonHelper.DeserializeJsonToList<TemuDBOrderInfo>(jObj["data"].ToString());
list = list.Where(s => !lstTemuDBOrderInfo.Any(o => o.subPurchaseOrderSn == s.subPurchaseOrderSn)).ToList();
lstTemuDBOrderInfo.AddRange(list);
foreach (var dbOrderInfo in list)
{
Invoke(new Action(() =>
{
BaseMsgForm.ShowInfo("请选择店铺!");
}));
return;
}
lstTemuDBOrderInfo.Clear();
Invoke(new Action(() =>
{
dgvStock.Rows.Clear();
}));
shops.Clear();
foreach (var shopId in lstShopId)
{
shops.Add(this.lstAdminShopInfo.FirstOrDefault(s => s.ShopId == shopId));
}
}
for (int i = shops.Count - 1; i >= 0; i--)
{
var shop = shops[i];
if (shop.jit_expire_time >= DateTime.Now.Date)
{
int page = 0;
int totalPage = 1;
int pageSize = 50;
while (page < totalPage)
{
page++;
var url = BaseClass.BuildObjString("order/get_order_list");
var data = UserLogin.GetSignaturex() +
//"&page=" + page +
//"&page_size=" + pageSize +
"&shop_id=" + shop.ShopId +
"&page=" + page;
if (!IsClientJit)
data += "&upload_order_status=2";
//if (BaseClass.SaLevel > 1 && !chkSearchAllShop.Checked)
// data += "&operate_sub_sa_name=" + BaseClass.UserName;
var html = GetHtml.PostUtf8(url, data);
//if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
// html = GetHtml.PostUtf8(url, data);
//if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
// html = GetHtml.PostUtf8(url, data);
if (!string.IsNullOrEmpty(html) && html.Contains("\"code\":200"))
int rowId = 0;
var rw = this.dgvStock.Rows.Cast<DataGridViewRow>().LastOrDefault(r =>
r.Cells["colSupplierId"].Value.ParseToString() == shop.ShopId &&
r.Cells["colCreateTimeTick"].Value.ParseToLong() > dbOrderInfo.purchaseTime
);
if (rw != null)
{
//lstTemuDBOrderInfo.AddRange()
var jObj = JObject.Parse(html);
var list = JsonHelper.DeserializeJsonToList<TemuDBOrderInfo>(jObj["data"].ToString());
list = list.Where(s => !lstTemuDBOrderInfo.Any(o => o.subPurchaseOrderSn == s.subPurchaseOrderSn)).ToList();
lstTemuDBOrderInfo.AddRange(list);
foreach (var dbOrderInfo in list)
{
Invoke(new Action(() =>
{
int rowId = 0;
InsertRow(rowId, dbOrderInfo);
}));
}
int total = BaseRegex.GetStringJson(ref html, "count").ParseToInt();
totalPage = Math.Ceiling(1.0m * total / pageSize).ParseToInt();
rowId = rw.Index + 1;
}
}
if(dbOrderInfo.costPrice > 0)
InsertRow(rowId, dbOrderInfo);
}));
}
}
});
}
InsertRowEnd(); // 处理合并单元格恰在好最后一行的情况
}
string getLength2312Str(string text, int length = 30)
@@ -1083,17 +1178,18 @@ namespace TemuKJD.KJDForms.JITForms
{
if (!checkNeedRestoreSizeAndNumber(priceInfo))
{
// todo 更改不用再修商品并改参数提交到数据库;
//不用再修尺寸的商品提交到数据库更新所有同id商品,已废弃;
var url = BaseClass.BuildObjString("order/update_order_status1");
var data = UserLogin.GetSignaturex() +
"&shop_id=" + shop.ShopId +
"&product_id=" + priceInfo.productId;
var html = GetHtml.PostUtf8(url, data);
//if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
// html = GetHtml.PostUtf8(url, data);
//if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
// html = GetHtml.PostUtf8(url, data);
if (!string.IsNullOrEmpty(html) && html.Contains("\"code\":200"))
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
{
}
else
{
foreach(var o in lstTemuDBOrderInfo)
{
@@ -1285,7 +1381,10 @@ namespace TemuKJD.KJDForms.JITForms
html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
html = GetHtml.PostUtf8(url, data);
if (!string.IsNullOrEmpty(html) && html.Contains("\"code\":200"))
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
{
}
else
{
try
{
@@ -1294,7 +1393,9 @@ namespace TemuKJD.KJDForms.JITForms
if (cateSizeWeightConfig != null)
lstCateSizeWeightConfig.Add(cateSizeWeightConfig);
}
catch { }
catch
{
}
}
}
@@ -1551,12 +1652,88 @@ namespace TemuKJD.KJDForms.JITForms
else
ShopListForm.Instance.CheckShopLogin(shops, isShowProgress);
}
ShopLoginInfo GetAndCheckShopLogin(string shopId, ref bool chkRst)
{
ShopLoginInfo shop = null;
if (!IsClientJit)
{
shop = this.lstAdminShopInfo.FirstOrDefault(s => s.ShopId == shopId);
}
else
{
shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId);
}
if (shop == null)
{
chkRst = false;
return shop;
}
#region 检测登录
if (shop.LoginStatus2 != "国际版在线")
{
chkRst = false;
return shop;
}
this.CheckShopLogin(new ShopLoginInfo[] { shop }, false);
if (shop.LoginStatus2 != "国际版在线")
{
Invoke(new Action(() =>
{
var rows = this.dgvShop.Rows.Cast<DataGridViewRow>().Where(r => r.Cells["colLoginName"].Value.ToString() == shop.LoginName);
foreach (var row in rows)
{
row.Cells["colMessage"].Value = "店铺掉线";
row.Cells["colLoginStatus"].Value = "未登录";
row.Cells["colCanUse"].Value = false;
}
}));
chkRst = false;
return shop;
}
#endregion
chkRst = true;
return shop;
}
public static int sleepTime = 300;
void commonSleep()
{
Thread.Sleep(sleepTime);
}
private void dgvStock_CellClick(object sender, DataGridViewCellEventArgs e)
{
if (e.ColumnIndex < 0 || e.RowIndex < 0)
return;
string headerText = dgvStock.Columns[e.ColumnIndex].HeaderText;
string shopId = dgvStock.Rows[e.RowIndex].Cells["colSupplierId"].Value.ParseToString();
string prodId = dgvStock.Rows[e.RowIndex].Cells["colProductId"].Value.ParseToString();
string subOrderId = dgvStock.Rows[e.RowIndex].Cells["colSubOrderSn"].Value.ParseToString(); // 备货单号
switch (headerText)
{
case "Skc图":
case "SKC图":
{
string url = dgvStock.Rows[e.RowIndex].Cells["colImgUrl"].Value.ParseToString().Replace("img.kwcdn.com", "img.cdnfe.com").Split('?').FirstOrDefault();
url = url.IndexOf("?") < 0 ? url : url.Substring(0, url.IndexOf("?"));
ShowImgForm imgFrom = new ShowImgForm(url);
imgFrom.ShowDialog();
}
break;
case "SKU图":
{
string url = dgvStock.Rows[e.RowIndex].Cells["colSkuImgUrl"].Value.ParseToString().Replace("img.kwcdn.com", "img.cdnfe.com").Split('?').FirstOrDefault();
url = url.IndexOf("?") < 0 ? url : url.Substring(0, url.IndexOf("?"));
ShowImgForm imgFrom = new ShowImgForm(url);
imgFrom.ShowDialog();
}
break;
}
}
private void dgvStock_CellContentClick(object sender, DataGridViewCellEventArgs e)
{
if (e.ColumnIndex < 0 || e.RowIndex < 0)
@@ -1568,14 +1745,6 @@ namespace TemuKJD.KJDForms.JITForms
switch (headerText)
{
case "Skc图片111":
{
string url = dgvStock.Rows[e.RowIndex].Cells["colImgUrl"].Value.ParseToString().Replace("img.kwcdn.com", "img.cdnfe.com").Split('?').FirstOrDefault();
url = url.IndexOf("?") < 0 ? url : url.Substring(0, url.IndexOf("?"));
ShowImgForm imgFrom = new ShowImgForm(url);
imgFrom.ShowDialog();
}
break;
case "上传条码/箱唛":
{
var dbOrder = this.lstTemuDBOrderInfo.FirstOrDefault(o => o.subPurchaseOrderSn == subOrderId);
@@ -1585,6 +1754,13 @@ namespace TemuKJD.KJDForms.JITForms
BaseMsgForm.ShowError("订单不存在!");
return;
}
decimal fee = (dbOrder.costPrice.ParseToDecimal() * 0.01m + dbOrder.deliveryFee.ParseToDecimal() * 0.01m +
dbOrder.markFee.ParseToDecimal() * 0.01m) * dbOrder.purchaseQuantity;
if (fee <= 0)
{
BaseMsgForm.ShowError("该订单类型不支持操作!");
return;
}
JitOrderUploadFileForm uploadFileForm = new JitOrderUploadFileForm(dbOrder);
uploadFileForm.isClientJit = this.IsClientJit;
uploadFileForm.ShowDialog();
@@ -1595,25 +1771,44 @@ namespace TemuKJD.KJDForms.JITForms
{
var dbOrder = this.lstTemuDBOrderInfo.FirstOrDefault(o => o.subPurchaseOrderSn == subOrderId);
var row = dgvStock.Rows[e.RowIndex];
if (row.Cells["colUploadOrder"].Value.ParseToString() != "上传订单")
if (IsClientJit)
{
//BaseMsgForm.ShowError("订单状态不可上传!");
return;
}
if (BaseMsgForm.ShowConfirm("确定上传?将扣除授权金!").DialogResult == DialogResult.OK)
{
decimal fee = (dbOrder.deliveryFee.ParseToDecimal() * 0.01m + dbOrder.markFee.ParseToDecimal() * 0.01m) * dbOrder.purchaseQuantity;
var url = BaseClass.BuildObjString("order/upload_order");
var data = UserLogin.GetSignaturex();
data += "&shop_id=" + dbOrder.supplierId;
data += "&subPurchaseOrderSn=" + dbOrder.subPurchaseOrderSn;
data += "&fee=" + fee;
var html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
html = GetHtml.PostUtf8(url, data);
if (!string.IsNullOrEmpty(html) && html.Contains("\"code\":200"))
if (row.Cells["colUploadOrder"].Value.ParseToString() != "上传订单")
{
try
//BaseMsgForm.ShowError("订单状态不可上传!");
return;
}
if (BaseMsgForm.ShowConfirm("确定上传?将扣除授权金!").DialogResult == DialogResult.OK)
{
decimal fee = (dbOrder.costPrice.ParseToDecimal() * 0.01m + dbOrder.deliveryFee.ParseToDecimal() * 0.01m +
dbOrder.markFee.ParseToDecimal() * 0.01m) * dbOrder.purchaseQuantity;
if (fee < 0)
{
BaseMsgForm.ShowError("该订单类型不支持操作!");
return;
}
if (fee > BaseClass.AuthorizedAmount)
{
BaseMsgForm.ShowError("剩余授权金不足,请联系管理员!");
return;
}
var url = BaseClass.BuildObjString("order/upload_order");
var data = UserLogin.GetSignaturex();
data += "&shop_id=" + dbOrder.supplierId;
data += "&subPurchaseOrderSn=" + dbOrder.subPurchaseOrderSn;
data += "&purchaseTime=" + dbOrder.purchaseTime;
data += "&fee=" + fee;
var html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
{
var errMsg = BaseRegex.GetStringJson(ref html, "msg");
BaseMsgForm.ShowError(errMsg);
return;
}
else
{
BaseClass.AuthorizedAmount -= fee;
this.lblAuthorizedAmount.Text = "剩余授权金:" + BaseClass.AuthorizedAmount;
@@ -1621,12 +1816,65 @@ namespace TemuKJD.KJDForms.JITForms
dbOrder.upLoadStatus = 2;
SetRowLinkCellText(dbOrder, row);
}
catch { }
}
else
}
else
{
if (row.Cells["colUploadOrder"].Value.ParseToString() == "已上传 点击打单")
{
var errMsg = BaseRegex.GetStringJson(ref html, "msg");
BaseMsgForm.ShowError(errMsg);
if (BaseMsgForm.ShowConfirm("确定更改状态为发货?").DialogResult == DialogResult.OK)
{
decimal fee = (dbOrder.deliveryFee.ParseToDecimal() * 0.01m + dbOrder.markFee.ParseToDecimal() * 0.01m) * dbOrder.purchaseQuantity;
var url = BaseClass.BuildObjString("order/update_order_status");
var data = UserLogin.GetSignaturex();
data += "&shop_id=" + dbOrder.supplierId;
data += "&subPurchaseOrderSn=" + dbOrder.subPurchaseOrderSn;
data += "&purchaseTime=" + dbOrder.purchaseTime;
data += "&new_status=3";
data += "&old_status=2";
var html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
{
var errMsg = BaseRegex.GetStringJson(ref html, "msg");
BaseMsgForm.ShowError(errMsg);
return;
}
else
{
dbOrder.upLoadStatus = 3;
SetRowLinkCellText(dbOrder, row);
}
}
}
else if (row.Cells["colUploadOrder"].Value.ParseToString() == "已打单 点击发货")
{
if (BaseMsgForm.ShowConfirm("确定更改状态为发货?").DialogResult == DialogResult.OK)
{
decimal fee = (dbOrder.deliveryFee.ParseToDecimal() * 0.01m + dbOrder.markFee.ParseToDecimal() * 0.01m) * dbOrder.purchaseQuantity;
var url = BaseClass.BuildObjString("order/update_order_status");
var data = UserLogin.GetSignaturex();
data += "&shop_id=" + dbOrder.supplierId;
data += "&subPurchaseOrderSn=" + dbOrder.subPurchaseOrderSn;
data += "&purchaseTime=" + dbOrder.purchaseTime;
data += "&new_status=4";
data += "&old_status=3";
var html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
{
var errMsg = BaseRegex.GetStringJson(ref html, "msg");
BaseMsgForm.ShowError(errMsg);
return;
}
else
{
dbOrder.upLoadStatus = 4;
SetRowLinkCellText(dbOrder, row);
}
}
}
}
}
@@ -1667,11 +1915,6 @@ namespace TemuKJD.KJDForms.JITForms
}
}
private void ucGroupBoxEx1_Enter(object sender, EventArgs e)
{
}
private void btnRestore_Click(object sender, EventArgs e)
{
txtSubOrderSn.Text = txtProductSn.Text = txtProductId.Text = "";
@@ -1679,7 +1922,18 @@ namespace TemuKJD.KJDForms.JITForms
private void btnGetDbOrder_Click(object sender, EventArgs e)
{
loadServerDbOrder();
lstTemuDBOrderInfo.Clear();
dgvStock.Rows.Clear();
this.pbLoading.Visible = true;
Task.Run(() =>
{
if(IsClientJit)
clientLoadServerDbOrder();
else
loadServerDbOrder(null);
Invoke(new Action(() => { this.pbLoading.Visible = false; }));
});
}
private void ucSplitPage1_PageChange(object obj)
@@ -1689,5 +1943,37 @@ namespace TemuKJD.KJDForms.JITForms
SearchShop(this.ucSplitPage1.CurrentPage);
}
}
private void lblRefreshAmount_Click(object sender, EventArgs e)
{
var url = BaseClass.BuildObjString("user/get_user_amount");
var data = UserLogin.GetSignaturex();
var html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
{
var errMsg = BaseRegex.GetStringJson(ref html, "msg");
BaseMsgForm.ShowError(errMsg);
return;
}
else
{
BaseClass.AuthorizedAmount = BaseRegex.GetStringJson(ref html, "data").ParseToDecimal();
this.lblAuthorizedAmount.Text = "" + BaseClass.AuthorizedAmount.ParseToDecimal().ToString("0.0");
}
}
void statisticsListOrder()
{
Invoke(new Action(() =>
{
lblOriginalOrderNumber.Text = this.dgvStock.Rows.Cast<DataGridViewRow>().Select(r => r.Cells["colParentStockId"].Value.ParseToString()).Distinct().Count().ToString();
lblOrderNumber.Text = this.dgvStock.Rows.Cast<DataGridViewRow>().Select(r => r.Cells["colSubOrderSn"].Value.ParseToString()).Distinct().Count().ToString();
lblOrderTotalPrice.Text = lstTemuDBOrderInfo.Where(o => o.costPrice > 0).Sum(o => o.supplierPrice * o.purchaseQuantity * 0.01).ToString("0.00");
lblOrderTotalCost.Text = lstTemuDBOrderInfo.Where(o => o.costPrice > 0).Sum(o => (o.costPrice + o.deliveryFee + o.markFee) * o.purchaseQuantity * 0.01).ParseToDecimal().ToString("0.00");
lblOrderTotalProfit.Text = (lblOrderTotalPrice.Text.ParseToDecimal() - lblOrderTotalCost.Text.ParseToDecimal()).ToString("0.00");
}));
}
}
}
@@ -141,6 +141,12 @@
<metadata name="colCanUse.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="colOrderToday.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="colOrder7Days.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="colMessage.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
@@ -207,6 +213,9 @@
<metadata name="colStockUpNum.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="colCreateTimeTick.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="colCreateTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>