diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs
index e324dcb..12614af 100644
--- a/AllBase/BaseClass.cs
+++ b/AllBase/BaseClass.cs
@@ -27,8 +27,8 @@ namespace AllBase
///
/// 版本ID
///
- public static int VersionCount = 518;
- //public static int VersionCount = 518;
+ public static int VersionCount = 520;
+ //public static int VersionCount = 520;
///
/// 版本号
diff --git a/TEMUKJD/KJDForms/ProductSelectForms/DbProductListForm.cs b/TEMUKJD/KJDForms/ProductSelectForms/DbProductListForm.cs
index 39667f7..6a01a54 100644
--- a/TEMUKJD/KJDForms/ProductSelectForms/DbProductListForm.cs
+++ b/TEMUKJD/KJDForms/ProductSelectForms/DbProductListForm.cs
@@ -158,8 +158,20 @@ namespace TemuKJD.KJDForms.ProductSelectForms
{
foreach (DataGridViewRow row in this.dgvDbProduct.Rows)
{
- if (row.Cells["colMainImg"].Displayed == false)
+ if (row.Index > 0 && row.Cells["colMainImg"].Displayed == false)
+ {
+ try
+ {
+ Invoke(new Action(() =>
+ {
+ row.Cells["colMainImg"].Value = defaultBitmap;
+ }));
+ }
+ catch
+ {
+ }
continue;
+ }
if (row.Cells["colMainImg"].Value != null && row.Cells["colMainImg"].Value != defaultBitmap)
continue;
diff --git a/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs b/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs
index 0eda055..cdcc08e 100644
--- a/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs
+++ b/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs
@@ -177,8 +177,20 @@ namespace TemuKJD.KJDForms.ProductSelectForms
{
foreach (DataGridViewRow row in this.dgvSelectProduct.Rows)
{
- if (row.Cells["colProductSkcPic"].Displayed == false)
+ if (row.Index > 0 && row.Cells["colProductSkcPic"].Displayed == false)
+ {
+ try
+ {
+ Invoke(new Action(() =>
+ {
+ row.Cells["colProductSkcPic"].Value = defaultBitmap;
+ }));
+ }
+ catch
+ {
+ }
continue;
+ }
if (row.Cells["colProductSkcPic"].Value != null && row.Cells["colProductSkcPic"].Value != defaultBitmap)
continue;
@@ -660,13 +672,13 @@ namespace TemuKJD.KJDForms.ProductSelectForms
Invoke(new Action(() =>
{
- BaseMsgForm.ShowInfo("上传草稿完成！");
+ BaseMsgForm.ShowInfo("上传" + (this.chkUploadProd.Checked ? "" : "草稿") + "完成！");
}));
Invoke(new Action(() =>
{
this.pbLoading.Visible = false;
- this.statusBar.lblTaskStatus.Text = "上传草稿完成";
+ this.statusBar.lblTaskStatus.Text = "上传" + (this.chkUploadProd.Checked ? "" : "草稿") + "完成";
this.statusBar.UpdateProgressBar(prodSelect.Length);
}));
}
@@ -1224,7 +1236,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms
{
if (!chkUploadProd.Checked)
{
- return "{\"success\":true,\"status\":\"已上传\"," +
+ return "{\"success\":true,\"status\":\"草稿箱\"," +
"\"productDraftId\":\"" + prodParam.productDraftId.ParseToString() + "\"," +
"\"errMsg\":\"" + sizeError + "\"}";
}
diff --git a/TEMUKJD/KJDForms/ProductSelectForms/DbProductUserSelectForm.Designer.cs b/TEMUKJD/KJDForms/ProductSelectForms/DbProductUserSelectForm.Designer.cs
index 09ba633..a3807c8 100644
--- a/TEMUKJD/KJDForms/ProductSelectForms/DbProductUserSelectForm.Designer.cs
+++ b/TEMUKJD/KJDForms/ProductSelectForms/DbProductUserSelectForm.Designer.cs
@@ -30,13 +30,18 @@ namespace TemuKJD.KJDForms.ProductSelectForms
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.ucGroupBoxEx4 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
+ this.pnlEmpty = new DevComponents.DotNetBar.PanelEx();
+ this.label5 = new System.Windows.Forms.Label();
+ this.txtSKC = new System.Windows.Forms.TextBox();
+ this.txtSPU = new System.Windows.Forms.TextBox();
+ this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.txtExtCode = new System.Windows.Forms.TextBox();
this.label13 = new System.Windows.Forms.Label();
@@ -69,15 +74,6 @@ namespace TemuKJD.KJDForms.ProductSelectForms
this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.pbLoading = new System.Windows.Forms.PictureBox();
this.dgvSelectProduct = 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.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage();
- this.label1 = new System.Windows.Forms.Label();
- this.txtSPU = new System.Windows.Forms.TextBox();
- this.txtSKC = new System.Windows.Forms.TextBox();
- this.label5 = new System.Windows.Forms.Label();
this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.colSelectId = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colSupplierId = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -95,7 +91,11 @@ namespace TemuKJD.KJDForms.ProductSelectForms
this.colNotes = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colUserNotes = new System.Windows.Forms.DataGridViewLinkColumn();
this.ColDelete = new System.Windows.Forms.DataGridViewLinkColumn();
- this.pnlEmpty = new DevComponents.DotNetBar.PanelEx();
+ 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.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@@ -174,6 +174,67 @@ namespace TemuKJD.KJDForms.ProductSelectForms
this.ucGroupBoxEx4.TabStop = false;
this.ucGroupBoxEx4.Text = "认领商品查询";
//
+ // pnlEmpty
+ //
+ this.pnlEmpty.CanvasColor = System.Drawing.SystemColors.Control;
+ this.pnlEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+ this.pnlEmpty.DisabledBackColor = System.Drawing.Color.Empty;
+ this.pnlEmpty.Location = new System.Drawing.Point(705, 32);
+ this.pnlEmpty.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2);
+ this.pnlEmpty.Name = "pnlEmpty";
+ this.pnlEmpty.Size = new System.Drawing.Size(56, 23);
+ this.pnlEmpty.Style.Alignment = System.Drawing.StringAlignment.Center;
+ this.pnlEmpty.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
+ this.pnlEmpty.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
+ this.pnlEmpty.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+ this.pnlEmpty.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.pnlEmpty.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+ this.pnlEmpty.Style.GradientAngle = 90;
+ this.pnlEmpty.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
+ this.pnlEmpty.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+ this.pnlEmpty.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.pnlEmpty.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.pnlEmpty.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
+ this.pnlEmpty.TabIndex = 504;
+ this.pnlEmpty.Text = "清空条件";
+ this.pnlEmpty.Click += new System.EventHandler(this.pnlEmpty_Click);
+ //
+ // label5
+ //
+ this.label5.AutoSize = true;
+ this.label5.Location = new System.Drawing.Point(319, 35);
+ this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
+ this.label5.Name = "label5";
+ this.label5.Size = new System.Drawing.Size(31, 17);
+ this.label5.TabIndex = 500;
+ this.label5.Text = "SPU";
+ //
+ // txtSKC
+ //
+ this.txtSKC.Location = new System.Drawing.Point(473, 32);
+ this.txtSKC.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
+ this.txtSKC.Name = "txtSKC";
+ this.txtSKC.Size = new System.Drawing.Size(86, 23);
+ this.txtSKC.TabIndex = 497;
+ //
+ // txtSPU
+ //
+ this.txtSPU.Location = new System.Drawing.Point(351, 32);
+ this.txtSPU.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
+ this.txtSPU.Name = "txtSPU";
+ this.txtSPU.Size = new System.Drawing.Size(86, 23);
+ this.txtSPU.TabIndex = 499;
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(442, 35);
+ this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(31, 17);
+ this.label1.TabIndex = 498;
+ this.label1.Text = "SKC";
+ //
// label2
//
this.label2.AutoSize = true;
@@ -453,18 +514,18 @@ namespace TemuKJD.KJDForms.ProductSelectForms
//
this.dgvShop.AllowUserToAddRows = false;
this.dgvShop.AllowUserToDeleteRows = false;
- dataGridViewCellStyle6.BackColor = System.Drawing.Color.WhiteSmoke;
- this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle6;
+ dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke;
+ this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
this.dgvShop.BackgroundColor = System.Drawing.Color.White;
this.dgvShop.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
- this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7;
+ dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+ this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colSelect,
@@ -573,18 +634,18 @@ namespace TemuKJD.KJDForms.ProductSelectForms
//
this.dgvSelectProduct.AllowUserToAddRows = false;
this.dgvSelectProduct.AllowUserToDeleteRows = false;
- dataGridViewCellStyle8.BackColor = System.Drawing.Color.WhiteSmoke;
- this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle8;
+ dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke;
+ this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3;
this.dgvSelectProduct.BackgroundColor = System.Drawing.Color.White;
this.dgvSelectProduct.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle9.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- dataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
- this.dgvSelectProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle9;
+ dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+ this.dgvSelectProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4;
this.dgvSelectProduct.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvSelectProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colCheck,
@@ -613,6 +674,143 @@ namespace TemuKJD.KJDForms.ProductSelectForms
this.dgvSelectProduct.TabIndex = 187;
this.dgvSelectProduct.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvSelectProduct_CellContentClick);
//
+ // colCheck
+ //
+ this.colCheck.Frozen = true;
+ this.colCheck.HeaderText = "选择";
+ this.colCheck.Name = "colCheck";
+ this.colCheck.ReadOnly = true;
+ this.colCheck.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+ this.colCheck.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+ this.colCheck.Width = 30;
+ //
+ // colSelectId
+ //
+ this.colSelectId.HeaderText = "认领Id";
+ this.colSelectId.Name = "colSelectId";
+ this.colSelectId.ReadOnly = true;
+ this.colSelectId.Visible = false;
+ //
+ // colSupplierId
+ //
+ this.colSupplierId.Frozen = true;
+ this.colSupplierId.HeaderText = "店铺Id";
+ this.colSupplierId.Name = "colSupplierId";
+ this.colSupplierId.ReadOnly = true;
+ //
+ // colSupplierName
+ //
+ this.colSupplierName.Frozen = true;
+ this.colSupplierName.HeaderText = "店铺名称";
+ this.colSupplierName.Name = "colSupplierName";
+ this.colSupplierName.ReadOnly = true;
+ this.colSupplierName.Width = 110;
+ //
+ // colInShop
+ //
+ this.colInShop.Frozen = true;
+ this.colInShop.HeaderText = "进店";
+ this.colInShop.Name = "colInShop";
+ this.colInShop.ReadOnly = true;
+ this.colInShop.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+ this.colInShop.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+ this.colInShop.Width = 45;
+ //
+ // colLogin
+ //
+ this.colLogin.HeaderText = "登录";
+ this.colLogin.Name = "colLogin";
+ this.colLogin.ReadOnly = true;
+ this.colLogin.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+ this.colLogin.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+ this.colLogin.Visible = false;
+ this.colLogin.Width = 45;
+ //
+ // colSpuId
+ //
+ this.colSpuId.HeaderText = "商品SPU";
+ this.colSpuId.Name = "colSpuId";
+ this.colSpuId.ReadOnly = true;
+ this.colSpuId.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+ this.colSpuId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+ this.colSpuId.Width = 80;
+ //
+ // colSkcId
+ //
+ this.colSkcId.FillWeight = 150F;
+ this.colSkcId.HeaderText = "商品SKC";
+ this.colSkcId.Name = "colSkcId";
+ this.colSkcId.ReadOnly = true;
+ this.colSkcId.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+ this.colSkcId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+ this.colSkcId.Width = 80;
+ //
+ // colProductSkcPic
+ //
+ this.colProductSkcPic.HeaderText = "图片";
+ this.colProductSkcPic.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Zoom;
+ this.colProductSkcPic.Name = "colProductSkcPic";
+ this.colProductSkcPic.ReadOnly = true;
+ this.colProductSkcPic.Width = 60;
+ //
+ // colProductName
+ //
+ dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.colProductName.DefaultCellStyle = dataGridViewCellStyle5;
+ this.colProductName.HeaderText = "商品标题";
+ this.colProductName.Name = "colProductName";
+ this.colProductName.ReadOnly = true;
+ this.colProductName.Width = 200;
+ //
+ // colProductCat
+ //
+ this.colProductCat.HeaderText = "商品类目";
+ this.colProductCat.Name = "colProductCat";
+ this.colProductCat.ReadOnly = true;
+ this.colProductCat.Width = 90;
+ //
+ // colExtCode
+ //
+ this.colExtCode.HeaderText = "商品货号";
+ this.colExtCode.Name = "colExtCode";
+ this.colExtCode.ReadOnly = true;
+ //
+ // colMsg
+ //
+ this.colMsg.HeaderText = "状态";
+ this.colMsg.Name = "colMsg";
+ this.colMsg.ReadOnly = true;
+ //
+ // colDraftId
+ //
+ this.colDraftId.HeaderText = "上传商品Id";
+ this.colDraftId.Name = "colDraftId";
+ this.colDraftId.ReadOnly = true;
+ this.colDraftId.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+ this.colDraftId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+ this.colDraftId.Width = 80;
+ //
+ // colNotes
+ //
+ this.colNotes.HeaderText = "上传备注";
+ this.colNotes.Name = "colNotes";
+ this.colNotes.ReadOnly = true;
+ //
+ // colUserNotes
+ //
+ this.colUserNotes.HeaderText = "重上/已买";
+ this.colUserNotes.Name = "colUserNotes";
+ this.colUserNotes.ReadOnly = true;
+ this.colUserNotes.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+ this.colUserNotes.Width = 75;
+ //
+ // ColDelete
+ //
+ this.ColDelete.HeaderText = "删除";
+ this.ColDelete.Name = "ColDelete";
+ this.ColDelete.ReadOnly = true;
+ this.ColDelete.Width = 75;
+ //
// splitContainer4
//
this.splitContainer4.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -706,205 +904,6 @@ namespace TemuKJD.KJDForms.ProductSelectForms
this.ucSplitPage1.TabIndex = 675;
this.ucSplitPage1.TotalPage = 1;
//
- // label1
- //
- this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(442, 35);
- this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
- this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(31, 17);
- this.label1.TabIndex = 498;
- this.label1.Text = "SKC";
- //
- // txtSPU
- //
- this.txtSPU.Location = new System.Drawing.Point(351, 32);
- this.txtSPU.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
- this.txtSPU.Name = "txtSPU";
- this.txtSPU.Size = new System.Drawing.Size(86, 23);
- this.txtSPU.TabIndex = 499;
- //
- // txtSKC
- //
- this.txtSKC.Location = new System.Drawing.Point(473, 32);
- this.txtSKC.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
- this.txtSKC.Name = "txtSKC";
- this.txtSKC.Size = new System.Drawing.Size(86, 23);
- this.txtSKC.TabIndex = 497;
- //
- // label5
- //
- this.label5.AutoSize = true;
- this.label5.Location = new System.Drawing.Point(319, 35);
- this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
- this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(31, 17);
- this.label5.TabIndex = 500;
- this.label5.Text = "SPU";
- //
- // colCheck
- //
- this.colCheck.Frozen = true;
- this.colCheck.HeaderText = "选择";
- this.colCheck.Name = "colCheck";
- this.colCheck.ReadOnly = true;
- this.colCheck.Resizable = System.Windows.Forms.DataGridViewTriState.True;
- this.colCheck.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
- this.colCheck.Width = 30;
- //
- // colSelectId
- //
- this.colSelectId.HeaderText = "认领Id";
- this.colSelectId.Name = "colSelectId";
- this.colSelectId.ReadOnly = true;
- this.colSelectId.Visible = false;
- //
- // colSupplierId
- //
- this.colSupplierId.Frozen = true;
- this.colSupplierId.HeaderText = "店铺Id";
- this.colSupplierId.Name = "colSupplierId";
- this.colSupplierId.ReadOnly = true;
- //
- // colSupplierName
- //
- this.colSupplierName.Frozen = true;
- this.colSupplierName.HeaderText = "店铺名称";
- this.colSupplierName.Name = "colSupplierName";
- this.colSupplierName.ReadOnly = true;
- this.colSupplierName.Width = 110;
- //
- // colInShop
- //
- this.colInShop.Frozen = true;
- this.colInShop.HeaderText = "进店";
- this.colInShop.Name = "colInShop";
- this.colInShop.ReadOnly = true;
- this.colInShop.Resizable = System.Windows.Forms.DataGridViewTriState.True;
- this.colInShop.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
- this.colInShop.Width = 45;
- //
- // colLogin
- //
- this.colLogin.HeaderText = "登录";
- this.colLogin.Name = "colLogin";
- this.colLogin.ReadOnly = true;
- this.colLogin.Resizable = System.Windows.Forms.DataGridViewTriState.True;
- this.colLogin.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
- this.colLogin.Visible = false;
- this.colLogin.Width = 45;
- //
- // colSpuId
- //
- this.colSpuId.HeaderText = "商品SPU";
- this.colSpuId.Name = "colSpuId";
- this.colSpuId.ReadOnly = true;
- this.colSpuId.Resizable = System.Windows.Forms.DataGridViewTriState.True;
- this.colSpuId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
- this.colSpuId.Width = 80;
- //
- // colSkcId
- //
- this.colSkcId.FillWeight = 150F;
- this.colSkcId.HeaderText = "商品SKC";
- this.colSkcId.Name = "colSkcId";
- this.colSkcId.ReadOnly = true;
- this.colSkcId.Resizable = System.Windows.Forms.DataGridViewTriState.True;
- this.colSkcId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
- this.colSkcId.Width = 80;
- //
- // colProductSkcPic
- //
- this.colProductSkcPic.HeaderText = "图片";
- this.colProductSkcPic.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Zoom;
- this.colProductSkcPic.Name = "colProductSkcPic";
- this.colProductSkcPic.ReadOnly = true;
- this.colProductSkcPic.Width = 60;
- //
- // colProductName
- //
- dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.colProductName.DefaultCellStyle = dataGridViewCellStyle10;
- this.colProductName.HeaderText = "商品标题";
- this.colProductName.Name = "colProductName";
- this.colProductName.ReadOnly = true;
- this.colProductName.Width = 200;
- //
- // colProductCat
- //
- this.colProductCat.HeaderText = "商品类目";
- this.colProductCat.Name = "colProductCat";
- this.colProductCat.ReadOnly = true;
- this.colProductCat.Width = 90;
- //
- // colExtCode
- //
- this.colExtCode.HeaderText = "商品货号";
- this.colExtCode.Name = "colExtCode";
- this.colExtCode.ReadOnly = true;
- //
- // colMsg
- //
- this.colMsg.HeaderText = "状态";
- this.colMsg.Name = "colMsg";
- this.colMsg.ReadOnly = true;
- //
- // colDraftId
- //
- this.colDraftId.HeaderText = "上传商品Id";
- this.colDraftId.Name = "colDraftId";
- this.colDraftId.ReadOnly = true;
- this.colDraftId.Resizable = System.Windows.Forms.DataGridViewTriState.True;
- this.colDraftId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
- this.colDraftId.Width = 80;
- //
- // colNotes
- //
- this.colNotes.HeaderText = "上传备注";
- this.colNotes.Name = "colNotes";
- this.colNotes.ReadOnly = true;
- //
- // colUserNotes
- //
- this.colUserNotes.HeaderText = "重上/已买";
- this.colUserNotes.Name = "colUserNotes";
- this.colUserNotes.ReadOnly = true;
- this.colUserNotes.Resizable = System.Windows.Forms.DataGridViewTriState.True;
- this.colUserNotes.Width = 75;
- //
- // ColDelete
- //
- this.ColDelete.HeaderText = "删除";
- this.ColDelete.Name = "ColDelete";
- this.ColDelete.ReadOnly = true;
- this.ColDelete.Width = 75;
- //
- // pnlEmpty
- //
- this.pnlEmpty.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
- this.pnlEmpty.CanvasColor = System.Drawing.SystemColors.Control;
- this.pnlEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
- this.pnlEmpty.DisabledBackColor = System.Drawing.Color.Empty;
- this.pnlEmpty.Location = new System.Drawing.Point(705, 32);
- this.pnlEmpty.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2);
- this.pnlEmpty.Name = "pnlEmpty";
- this.pnlEmpty.Size = new System.Drawing.Size(56, 23);
- this.pnlEmpty.Style.Alignment = System.Drawing.StringAlignment.Center;
- this.pnlEmpty.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
- this.pnlEmpty.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
- this.pnlEmpty.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
- this.pnlEmpty.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- this.pnlEmpty.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
- this.pnlEmpty.Style.GradientAngle = 90;
- this.pnlEmpty.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
- this.pnlEmpty.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
- this.pnlEmpty.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- this.pnlEmpty.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- this.pnlEmpty.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
- this.pnlEmpty.TabIndex = 504;
- this.pnlEmpty.Text = "清空条件";
- this.pnlEmpty.Click += new System.EventHandler(this.pnlEmpty_Click);
- //
// DbProductUserSelectForm
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
diff --git a/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.cs b/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.cs
index 98584e5..e5c56d1 100644
--- a/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.cs
+++ b/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.cs
@@ -180,8 +180,20 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
{
foreach (DataGridViewRow row in this.dgvSelectProduct.Rows)
{
- if (row.Cells["colProductSkcPic"].Displayed == false)
+ if (row.Index > 0 && row.Cells["colProductSkcPic"].Displayed == false)
+ {
+ try
+ {
+ Invoke(new Action(() =>
+ {
+ row.Cells["colProductSkcPic"].Value = defaultBitmap;
+ }));
+ }
+ catch
+ {
+ }
continue;
+ }
if (row.Cells["colProductSkcPic"].Value != null && row.Cells["colProductSkcPic"].Value != defaultBitmap)
continue;
@@ -667,13 +679,13 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
Invoke(new Action(() =>
{
- BaseMsgForm.ShowInfo("上传完成！");
+ BaseMsgForm.ShowInfo("上传" + (this.chkUploadProd.Checked ? "" : "草稿") + "完成！");
}));
Invoke(new Action(() =>
{
this.pbLoading.Visible = false;
- this.statusBar.lblTaskStatus.Text = "上传完成";
+ this.statusBar.lblTaskStatus.Text = "上传" + (this.chkUploadProd.Checked ? "" : "草稿") + "完成";
this.statusBar.UpdateProgressBar(prodSelect.Length);
}));
}
@@ -1229,7 +1241,7 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
{
if (!chkUploadProd.Checked)
{
- return "{\"success\":true,\"status\":\"已上传\"," +
+ return "{\"success\":true,\"status\":\"草稿箱\"," +
"\"productDraftId\":\"" + prodParam.productDraftId.ParseToString() + "\"," +
"\"errMsg\":\"" + sizeError + "\"}";
}
diff --git a/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdUserSelectForm.Designer.cs b/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdUserSelectForm.Designer.cs
index 444e666..cd979fa 100644
--- a/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdUserSelectForm.Designer.cs
+++ b/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdUserSelectForm.Designer.cs
@@ -30,13 +30,18 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.ucGroupBoxEx4 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
+ this.pnlEmpty = new DevComponents.DotNetBar.PanelEx();
+ this.label5 = new System.Windows.Forms.Label();
+ this.txtSKC = new System.Windows.Forms.TextBox();
+ this.txtSPU = new System.Windows.Forms.TextBox();
+ this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.txtExtCode = new System.Windows.Forms.TextBox();
this.label13 = new System.Windows.Forms.Label();
@@ -69,15 +74,6 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.pbLoading = new System.Windows.Forms.PictureBox();
this.dgvSelectProduct = 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.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage();
- this.label5 = new System.Windows.Forms.Label();
- this.txtSKC = new System.Windows.Forms.TextBox();
- this.txtSPU = new System.Windows.Forms.TextBox();
- this.label1 = new System.Windows.Forms.Label();
this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.colSelectId = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colSupplierId = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -95,7 +91,11 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
this.colNotes = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colUserNotes = new System.Windows.Forms.DataGridViewLinkColumn();
this.ColDelete = new System.Windows.Forms.DataGridViewLinkColumn();
- this.pnlEmpty = new DevComponents.DotNetBar.PanelEx();
+ 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.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@@ -174,6 +174,67 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
this.ucGroupBoxEx4.TabStop = false;
this.ucGroupBoxEx4.Text = "库存商品查询";
//
+ // pnlEmpty
+ //
+ this.pnlEmpty.CanvasColor = System.Drawing.SystemColors.Control;
+ this.pnlEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+ this.pnlEmpty.DisabledBackColor = System.Drawing.Color.Empty;
+ this.pnlEmpty.Location = new System.Drawing.Point(705, 32);
+ this.pnlEmpty.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2);
+ this.pnlEmpty.Name = "pnlEmpty";
+ this.pnlEmpty.Size = new System.Drawing.Size(56, 23);
+ this.pnlEmpty.Style.Alignment = System.Drawing.StringAlignment.Center;
+ this.pnlEmpty.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
+ this.pnlEmpty.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
+ this.pnlEmpty.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+ this.pnlEmpty.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.pnlEmpty.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+ this.pnlEmpty.Style.GradientAngle = 90;
+ this.pnlEmpty.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
+ this.pnlEmpty.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+ this.pnlEmpty.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.pnlEmpty.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.pnlEmpty.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
+ this.pnlEmpty.TabIndex = 508;
+ this.pnlEmpty.Text = "清空条件";
+ this.pnlEmpty.Click += new System.EventHandler(this.pnlEmpty_Click);
+ //
+ // label5
+ //
+ this.label5.AutoSize = true;
+ this.label5.Location = new System.Drawing.Point(319, 35);
+ this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
+ this.label5.Name = "label5";
+ this.label5.Size = new System.Drawing.Size(31, 17);
+ this.label5.TabIndex = 512;
+ this.label5.Text = "SPU";
+ //
+ // txtSKC
+ //
+ this.txtSKC.Location = new System.Drawing.Point(473, 32);
+ this.txtSKC.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
+ this.txtSKC.Name = "txtSKC";
+ this.txtSKC.Size = new System.Drawing.Size(86, 23);
+ this.txtSKC.TabIndex = 509;
+ //
+ // txtSPU
+ //
+ this.txtSPU.Location = new System.Drawing.Point(351, 32);
+ this.txtSPU.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
+ this.txtSPU.Name = "txtSPU";
+ this.txtSPU.Size = new System.Drawing.Size(86, 23);
+ this.txtSPU.TabIndex = 511;
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(442, 35);
+ this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(31, 17);
+ this.label1.TabIndex = 510;
+ this.label1.Text = "SKC";
+ //
// label2
//
this.label2.AutoSize = true;
@@ -453,18 +514,18 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
//
this.dgvShop.AllowUserToAddRows = false;
this.dgvShop.AllowUserToDeleteRows = false;
- dataGridViewCellStyle6.BackColor = System.Drawing.Color.WhiteSmoke;
- this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle6;
+ dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke;
+ this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
this.dgvShop.BackgroundColor = System.Drawing.Color.White;
this.dgvShop.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
- this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7;
+ dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+ this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colSelect,
@@ -574,18 +635,18 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
//
this.dgvSelectProduct.AllowUserToAddRows = false;
this.dgvSelectProduct.AllowUserToDeleteRows = false;
- dataGridViewCellStyle8.BackColor = System.Drawing.Color.WhiteSmoke;
- this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle8;
+ dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke;
+ this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3;
this.dgvSelectProduct.BackgroundColor = System.Drawing.Color.White;
this.dgvSelectProduct.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle9.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- dataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
- this.dgvSelectProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle9;
+ dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+ this.dgvSelectProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4;
this.dgvSelectProduct.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvSelectProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colCheck,
@@ -614,6 +675,140 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
this.dgvSelectProduct.TabIndex = 187;
this.dgvSelectProduct.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvSelectProduct_CellContentClick);
//
+ // colCheck
+ //
+ this.colCheck.HeaderText = "选择";
+ this.colCheck.Name = "colCheck";
+ this.colCheck.ReadOnly = true;
+ this.colCheck.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+ this.colCheck.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+ this.colCheck.Width = 30;
+ //
+ // colSelectId
+ //
+ this.colSelectId.HeaderText = "认领Id";
+ this.colSelectId.Name = "colSelectId";
+ this.colSelectId.ReadOnly = true;
+ this.colSelectId.Visible = false;
+ //
+ // colSupplierId
+ //
+ this.colSupplierId.HeaderText = "店铺Id";
+ this.colSupplierId.Name = "colSupplierId";
+ this.colSupplierId.ReadOnly = true;
+ //
+ // colSupplierName
+ //
+ this.colSupplierName.HeaderText = "店铺名称";
+ this.colSupplierName.Name = "colSupplierName";
+ this.colSupplierName.ReadOnly = true;
+ this.colSupplierName.Width = 110;
+ //
+ // colInShop
+ //
+ this.colInShop.HeaderText = "进店";
+ this.colInShop.Name = "colInShop";
+ this.colInShop.ReadOnly = true;
+ this.colInShop.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+ this.colInShop.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+ this.colInShop.Width = 45;
+ //
+ // colLogin
+ //
+ this.colLogin.HeaderText = "登录";
+ this.colLogin.Name = "colLogin";
+ this.colLogin.ReadOnly = true;
+ this.colLogin.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+ this.colLogin.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+ this.colLogin.Visible = false;
+ this.colLogin.Width = 45;
+ //
+ // colSpuId
+ //
+ this.colSpuId.HeaderText = "商品SPU";
+ this.colSpuId.Name = "colSpuId";
+ this.colSpuId.ReadOnly = true;
+ this.colSpuId.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+ this.colSpuId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+ this.colSpuId.Width = 80;
+ //
+ // colSkcId
+ //
+ this.colSkcId.FillWeight = 150F;
+ this.colSkcId.HeaderText = "商品SKC";
+ this.colSkcId.Name = "colSkcId";
+ this.colSkcId.ReadOnly = true;
+ this.colSkcId.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+ this.colSkcId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+ this.colSkcId.Width = 80;
+ //
+ // colProductSkcPic
+ //
+ this.colProductSkcPic.HeaderText = "图片";
+ this.colProductSkcPic.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Zoom;
+ this.colProductSkcPic.Name = "colProductSkcPic";
+ this.colProductSkcPic.ReadOnly = true;
+ this.colProductSkcPic.Width = 60;
+ //
+ // colProductName
+ //
+ dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.colProductName.DefaultCellStyle = dataGridViewCellStyle5;
+ this.colProductName.HeaderText = "商品标题";
+ this.colProductName.Name = "colProductName";
+ this.colProductName.ReadOnly = true;
+ this.colProductName.Width = 200;
+ //
+ // colProductCat
+ //
+ this.colProductCat.HeaderText = "商品类目";
+ this.colProductCat.Name = "colProductCat";
+ this.colProductCat.ReadOnly = true;
+ this.colProductCat.Width = 90;
+ //
+ // colExtCode
+ //
+ this.colExtCode.HeaderText = "商品货号";
+ this.colExtCode.Name = "colExtCode";
+ this.colExtCode.ReadOnly = true;
+ //
+ // colMsg
+ //
+ this.colMsg.HeaderText = "状态";
+ this.colMsg.Name = "colMsg";
+ this.colMsg.ReadOnly = true;
+ //
+ // colDraftId
+ //
+ this.colDraftId.HeaderText = "上传商品Id";
+ this.colDraftId.Name = "colDraftId";
+ this.colDraftId.ReadOnly = true;
+ this.colDraftId.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+ this.colDraftId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+ this.colDraftId.Width = 80;
+ //
+ // colNotes
+ //
+ this.colNotes.HeaderText = "上传备注";
+ this.colNotes.Name = "colNotes";
+ this.colNotes.ReadOnly = true;
+ //
+ // colUserNotes
+ //
+ this.colUserNotes.HeaderText = "重上/已买";
+ this.colUserNotes.Name = "colUserNotes";
+ this.colUserNotes.ReadOnly = true;
+ this.colUserNotes.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+ this.colUserNotes.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+ this.colUserNotes.Width = 75;
+ //
+ // ColDelete
+ //
+ this.ColDelete.HeaderText = "删除";
+ this.ColDelete.Name = "ColDelete";
+ this.ColDelete.ReadOnly = true;
+ this.ColDelete.Width = 75;
+ //
// splitContainer4
//
this.splitContainer4.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -707,202 +902,6 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
this.ucSplitPage1.TabIndex = 675;
this.ucSplitPage1.TotalPage = 1;
//
- // label5
- //
- this.label5.AutoSize = true;
- this.label5.Location = new System.Drawing.Point(319, 35);
- this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
- this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(31, 17);
- this.label5.TabIndex = 512;
- this.label5.Text = "SPU";
- //
- // txtSKC
- //
- this.txtSKC.Location = new System.Drawing.Point(473, 32);
- this.txtSKC.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
- this.txtSKC.Name = "txtSKC";
- this.txtSKC.Size = new System.Drawing.Size(86, 23);
- this.txtSKC.TabIndex = 509;
- //
- // txtSPU
- //
- this.txtSPU.Location = new System.Drawing.Point(351, 32);
- this.txtSPU.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
- this.txtSPU.Name = "txtSPU";
- this.txtSPU.Size = new System.Drawing.Size(86, 23);
- this.txtSPU.TabIndex = 511;
- //
- // label1
- //
- this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(442, 35);
- this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
- this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(31, 17);
- this.label1.TabIndex = 510;
- this.label1.Text = "SKC";
- //
- // colCheck
- //
- this.colCheck.HeaderText = "选择";
- this.colCheck.Name = "colCheck";
- this.colCheck.ReadOnly = true;
- this.colCheck.Resizable = System.Windows.Forms.DataGridViewTriState.True;
- this.colCheck.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
- this.colCheck.Width = 30;
- //
- // colSelectId
- //
- this.colSelectId.HeaderText = "认领Id";
- this.colSelectId.Name = "colSelectId";
- this.colSelectId.ReadOnly = true;
- this.colSelectId.Visible = false;
- //
- // colSupplierId
- //
- this.colSupplierId.HeaderText = "店铺Id";
- this.colSupplierId.Name = "colSupplierId";
- this.colSupplierId.ReadOnly = true;
- //
- // colSupplierName
- //
- this.colSupplierName.HeaderText = "店铺名称";
- this.colSupplierName.Name = "colSupplierName";
- this.colSupplierName.ReadOnly = true;
- this.colSupplierName.Width = 110;
- //
- // colInShop
- //
- this.colInShop.HeaderText = "进店";
- this.colInShop.Name = "colInShop";
- this.colInShop.ReadOnly = true;
- this.colInShop.Resizable = System.Windows.Forms.DataGridViewTriState.True;
- this.colInShop.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
- this.colInShop.Width = 45;
- //
- // colLogin
- //
- this.colLogin.HeaderText = "登录";
- this.colLogin.Name = "colLogin";
- this.colLogin.ReadOnly = true;
- this.colLogin.Resizable = System.Windows.Forms.DataGridViewTriState.True;
- this.colLogin.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
- this.colLogin.Visible = false;
- this.colLogin.Width = 45;
- //
- // colSpuId
- //
- this.colSpuId.HeaderText = "商品SPU";
- this.colSpuId.Name = "colSpuId";
- this.colSpuId.ReadOnly = true;
- this.colSpuId.Resizable = System.Windows.Forms.DataGridViewTriState.True;
- this.colSpuId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
- this.colSpuId.Width = 80;
- //
- // colSkcId
- //
- this.colSkcId.FillWeight = 150F;
- this.colSkcId.HeaderText = "商品SKC";
- this.colSkcId.Name = "colSkcId";
- this.colSkcId.ReadOnly = true;
- this.colSkcId.Resizable = System.Windows.Forms.DataGridViewTriState.True;
- this.colSkcId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
- this.colSkcId.Width = 80;
- //
- // colProductSkcPic
- //
- this.colProductSkcPic.HeaderText = "图片";
- this.colProductSkcPic.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Zoom;
- this.colProductSkcPic.Name = "colProductSkcPic";
- this.colProductSkcPic.ReadOnly = true;
- this.colProductSkcPic.Width = 60;
- //
- // colProductName
- //
- dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.colProductName.DefaultCellStyle = dataGridViewCellStyle10;
- this.colProductName.HeaderText = "商品标题";
- this.colProductName.Name = "colProductName";
- this.colProductName.ReadOnly = true;
- this.colProductName.Width = 200;
- //
- // colProductCat
- //
- this.colProductCat.HeaderText = "商品类目";
- this.colProductCat.Name = "colProductCat";
- this.colProductCat.ReadOnly = true;
- this.colProductCat.Width = 90;
- //
- // colExtCode
- //
- this.colExtCode.HeaderText = "商品货号";
- this.colExtCode.Name = "colExtCode";
- this.colExtCode.ReadOnly = true;
- //
- // colMsg
- //
- this.colMsg.HeaderText = "状态";
- this.colMsg.Name = "colMsg";
- this.colMsg.ReadOnly = true;
- //
- // colDraftId
- //
- this.colDraftId.HeaderText = "上传商品Id";
- this.colDraftId.Name = "colDraftId";
- this.colDraftId.ReadOnly = true;
- this.colDraftId.Resizable = System.Windows.Forms.DataGridViewTriState.True;
- this.colDraftId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
- this.colDraftId.Width = 80;
- //
- // colNotes
- //
- this.colNotes.HeaderText = "上传备注";
- this.colNotes.Name = "colNotes";
- this.colNotes.ReadOnly = true;
- //
- // colUserNotes
- //
- this.colUserNotes.HeaderText = "重上/已买";
- this.colUserNotes.Name = "colUserNotes";
- this.colUserNotes.ReadOnly = true;
- this.colUserNotes.Resizable = System.Windows.Forms.DataGridViewTriState.True;
- this.colUserNotes.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
- this.colUserNotes.Width = 75;
- //
- // ColDelete
- //
- this.ColDelete.HeaderText = "删除";
- this.ColDelete.Name = "ColDelete";
- this.ColDelete.ReadOnly = true;
- this.ColDelete.Width = 75;
- //
- // pnlEmpty
- //
- this.pnlEmpty.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
- this.pnlEmpty.CanvasColor = System.Drawing.SystemColors.Control;
- this.pnlEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
- this.pnlEmpty.DisabledBackColor = System.Drawing.Color.Empty;
- this.pnlEmpty.Location = new System.Drawing.Point(705, 32);
- this.pnlEmpty.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2);
- this.pnlEmpty.Name = "pnlEmpty";
- this.pnlEmpty.Size = new System.Drawing.Size(56, 23);
- this.pnlEmpty.Style.Alignment = System.Drawing.StringAlignment.Center;
- this.pnlEmpty.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
- this.pnlEmpty.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
- this.pnlEmpty.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
- this.pnlEmpty.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- this.pnlEmpty.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
- this.pnlEmpty.Style.GradientAngle = 90;
- this.pnlEmpty.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
- this.pnlEmpty.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
- this.pnlEmpty.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- this.pnlEmpty.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- this.pnlEmpty.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
- this.pnlEmpty.TabIndex = 508;
- this.pnlEmpty.Text = "清空条件";
- this.pnlEmpty.Click += new System.EventHandler(this.pnlEmpty_Click);
- //
// ProductThirdUserSelectForm
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
diff --git a/TEMUKJD/KJDForms/SalesCenterForms/MarketingActivityForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/MarketingActivityForm.cs
index 210bf73..43c1c95 100644
--- a/TEMUKJD/KJDForms/SalesCenterForms/MarketingActivityForm.cs
+++ b/TEMUKJD/KJDForms/SalesCenterForms/MarketingActivityForm.cs
@@ -836,7 +836,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms
if ((jsonRst.Contains("当前操作人数太多，请稍后重试") || jsonRst.Contains("too quickly")) && tryCount < 5)
{
tryCount++;
- Thread.Sleep(500 + Randomx.GetId(500));
+ Thread.Sleep(Randomx.GetId(3000, 5000));
goto tryAgain;
}
@@ -938,7 +938,13 @@ namespace TemuKJD.KJDForms.SalesCenterForms
}
string data = JsonHelper.SerializeObject(activityParam);
string submitRst = "";
+ Thread.Sleep(Randomx.GetId(1000, 5000));
submitRst = SubmitActivity(shop, activityParam.activityThematicId, data);
+ for (int j = 0; j < 4 && (jsonRst.Contains("当前操作人数太多，请稍后重试") || jsonRst.Contains("too quickly")); j++)
+ {
+ Thread.Sleep(Randomx.GetId(5000, 7500));
+ submitRst = SubmitActivity(shop, activityParam.activityThematicId, data);
+ }
if (!submitRst.Contains("\"success\":true"))
{
@@ -964,7 +970,6 @@ namespace TemuKJD.KJDForms.SalesCenterForms
submitRow.Cells["colMsg"].Value = "提交活动成功";
}
}));
- Thread.Sleep(Randomx.GetId(1000, 2000));
// 如果提交成功且还有更多商品可报名，继续重复报名(已报名商品不会出现在搜索结果列表)
if (submitRst.Contains("\"success\":true") && jsonRst.Contains("\"hasMore\":true"))
diff --git a/TEMUKJD/KJDForms/ShopForms/ReturnPackageDetailForm.cs b/TEMUKJD/KJDForms/ShopForms/ReturnPackageDetailForm.cs
index 14f8b62..7cb1c7b 100644
--- a/TEMUKJD/KJDForms/ShopForms/ReturnPackageDetailForm.cs
+++ b/TEMUKJD/KJDForms/ShopForms/ReturnPackageDetailForm.cs
@@ -52,6 +52,9 @@ namespace TemuKJD.KJDForms.ShopForms
void GetReturnPackage()
{
+ if (defaultBitmap == null)
+ defaultBitmap = new Bitmap(80, 80);
+
lstReturnPackageInfo.Clear();
dgvSelectProduct.Rows.Clear();
@@ -96,35 +99,19 @@ namespace TemuKJD.KJDForms.ShopForms
continue;
#region 检测登录
- if (shop.LoginStatus2 != "国际版在线")
+ if (shop.LoginStatus != "登录成功" || shop.LoginStatus2 != "国际版在线")
{
Invoke(new Action(() =>
{
- //var rows = this.dgvShop.Rows.Cast().Where(r => r.Cells["colShopLoginName"].Value.ToString() == shop.LoginName);
- //foreach (var row in rows)
- //{
- // row.Cells["colMessage"].Value = "店铺掉线";
- // row.Cells["colLoginStatus"].Value = "国际版未登录";
- // row.Cells["colCanUse"].Value = false;
- //}
BaseMsgForm.ShowError("店铺掉线，请重新登录");
}));
return;
}
- if (ShopListForm.Instance == null)
- ShopListForm.Instance = new ShopListForm();
- ShopListForm.Instance.CheckShopLogin(new string[] { shop.LoginName }, false);
- if (shop.LoginStatus2 != "国际版在线")
+ AdminForms.AdminShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false);
+ if (shop.LoginStatus != "登录成功" || shop.LoginStatus2 != "国际版在线")
{
Invoke(new Action(() =>
{
- //var rows = this.dgvShop.Rows.Cast().Where(r => r.Cells["colShopLoginName"].Value.ToString() == shop.LoginName);
- //foreach (var row in rows)
- //{
- // row.Cells["colMessage"].Value = "店铺掉线";
- // row.Cells["colLoginStatus"].Value = "国际版未登录";
- // row.Cells["colCanUse"].Value = false;
- //}
BaseMsgForm.ShowError("店铺掉线，请重新登录");
}));
return;
@@ -175,7 +162,6 @@ namespace TemuKJD.KJDForms.ShopForms
string sErr = BaseRegex.GetStringJson(ref jsonStr, "errorMsg");
if (!string.IsNullOrWhiteSpace(sErr) && !errMsg.Contains(sErr))
errMsg += sErr + " ";
- page++;
continue;
}
@@ -227,7 +213,7 @@ namespace TemuKJD.KJDForms.ShopForms
pack.extCode = extCode;
}
- foreach(var sku in prod["productSkuSummaries"])
+ foreach (var sku in prod["productSkuSummaries"])
{
long skuId = sku["productSkuId"].ParseToLong();
foreach (var pack in packageLstTmp)
@@ -245,6 +231,20 @@ namespace TemuKJD.KJDForms.ShopForms
}
catch (Exception ex) { BaseMsgForm.ShowError(ex.Message); }
}
+ else
+ {
+ AdminForms.AdminShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false);
+ if (shop.LoginStatus != "登录成功" || shop.LoginStatus2 != "国际版在线")
+ {
+ Invoke(new Action(() =>
+ {
+ BaseMsgForm.ShowError("店铺掉线，请重新登录");
+ }));
+ //将查询到的数组内容清空掉，防止后续商品未获取到仍然匹配并往仓库后台服务端送
+ packageLstTmp.Clear();
+ break;
+ }
+ }
}
}
@@ -277,8 +277,18 @@ namespace TemuKJD.KJDForms.ShopForms
foreach (var pack in packageLst)
{
- if (defaultBitmap == null)
- defaultBitmap = new Bitmap(80, 80);
+ if (string.IsNullOrWhiteSpace(pack.extCode))
+ pack.extCode = "无";
+ if (pack.spec1 == null)
+ pack.spec1 = new TemuProductSkcSpec()
+ {
+ specName = string.IsNullOrWhiteSpace(pack.mainSaleSpec) ? pack.secondarySaleSpec : pack.mainSaleSpec
+ };
+ if (pack.spec2 == null)
+ pack.spec2 = new TemuProductSkcSpec()
+ {
+ specName = string.IsNullOrWhiteSpace(pack.secondarySaleSpec) ? pack.mainSaleSpec : pack.secondarySaleSpec
+ };
Image image = null;
string getImgError = "";
@@ -330,7 +340,7 @@ namespace TemuKJD.KJDForms.ShopForms
signHtml = GetHtml.PostUtf8(url, data);
string sign = BaseRegex.GetStringJson(ref signHtml, "sign");
- string html = "\"code\":200";
+ string html = "\"code\":201201201";
string url2 = "https://temu.tuihuocangku.cn/prod-api/api/return/addReturnGoods";
string referer2 = "https://temu.tuihuocangku.cn/prod-api/api/return";
string postData = JsonHelper.SerializeObject(packageParam);
@@ -342,6 +352,10 @@ namespace TemuKJD.KJDForms.ShopForms
{
rst = "退货订单插入成功";
}
+ else if (html.Contains("\"code\":201201201"))
+ {
+ rst = "（模拟）退货订单插入成功";
+ }
else
{
rst = BaseRegex.GetStringJson(ref html, "msg");