diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs
index c652433..9a465f2 100644
--- a/AllBase/BaseClass.cs
+++ b/AllBase/BaseClass.cs
@@ -27,8 +27,8 @@ namespace AllBase
///
/// 版本ID
///
- public static int VersionCount = 503;
- //public static int VersionCount = 503;
+ public static int VersionCount = 505;
+ //public static int VersionCount = 505;
///
/// 版本号
diff --git a/AllBase/Model/Param/TemuProductManage/TemuProductParam.cs b/AllBase/Model/Param/TemuProductManage/TemuProductParam.cs
index 02debd4..9c4171d 100644
--- a/AllBase/Model/Param/TemuProductManage/TemuProductParam.cs
+++ b/AllBase/Model/Param/TemuProductManage/TemuProductParam.cs
@@ -47,6 +47,8 @@ namespace AllBase.Model.Param.TemuProductManage
///
///
public string numberInputValue { get; set; }
+
+ public int? controlType { get; set; }
}
public class MainProductSkuSpecReqsItem
diff --git a/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.Designer.cs b/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.Designer.cs
index 5e874d5..28ad49e 100644
--- a/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.Designer.cs
+++ b/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.Designer.cs
@@ -280,7 +280,7 @@
"待上传",
"已上传",
"全部"});
- this.cmbStatus.Location = new System.Drawing.Point(702, 2);
+ this.cmbStatus.Location = new System.Drawing.Point(702, 4);
this.cmbStatus.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
this.cmbStatus.Name = "cmbStatus";
this.cmbStatus.Size = new System.Drawing.Size(49, 25);
diff --git a/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs b/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs
index 8dd0821..3e53908 100644
--- a/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs
+++ b/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs
@@ -606,9 +606,9 @@ namespace TemuKJD.KJDForms.ProductSelectForms
}
Thread.Sleep(200);
+ var error = BaseRegex.GetStringJson(ref result, "errMsg");
if (result.Contains("\"status\":\"未上传\""))
{
- var error = BaseRegex.GetStringJson(ref result, "errMsg");
if (string.IsNullOrWhiteSpace(error))
error = result;
Invoke(new Action(() =>
@@ -638,7 +638,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms
Invoke(new Action(() =>
{
string opRst = prod.status == "已上传" ? "已成功上传" : "已上传草稿箱";
- row.Cells["colOpResult"].Value = opRst + "但保存到服务端失败:" + BaseRegex.GetStringJson(ref html, "msg") + "; ";
+ row.Cells["colOpResult"].Value = opRst + "但保存到服务端失败:" + BaseRegex.GetStringJson(ref html, "msg") + (" " + error).Trim(' ');
row.Cells["colStatus"].Value = prod.status;
}));
}
@@ -646,10 +646,9 @@ namespace TemuKJD.KJDForms.ProductSelectForms
{
Invoke(new Action(() =>
{
- string opRst = prod.status == "已上传" ? "已成功上传" : "已上传草稿箱";
row.Cells["colDraftId"].Value = productDraftId; // 草稿箱id
- row.Cells["colOpResult"].Value = opRst + BaseRegex.GetStringJson(ref result, "msg") + "; ";
- row.Cells["colStatus"].Value = "已上传";
+ row.Cells["colOpResult"].Value = prod.status == "已上传" ? "已成功上传" : "已上传草稿箱" + (" " + error).Trim(' ');
+ row.Cells["colStatus"].Value = prod.status;
}));
}
}
@@ -870,6 +869,21 @@ namespace TemuKJD.KJDForms.ProductSelectForms
vid = propInfo.vid,
});
}
+ if (prodParam.productPropertyReqs.Any(p => p.propValue == "织物") && !prodParam.productPropertyReqs.Any(p => p.propName == "织物材质成分"))
+ {
+ prodParam.productPropertyReqs.Add(new ProductPropertyReqsItem
+ {
+ valueUnit = "",
+ propValue = "人造纤维",
+ propName = "织物材质成分",
+ refPid = 7550,
+ vid = 329529,
+ controlType = 1,
+ pid = 2335,
+ templatePid = 1580208,
+ valueExtendInfo = ""
+ });
+ }
prodParam.productSaleExtAttrReq = new ProductSaleExtAttrReq
{
bodyShape = prodInfo.productSaleExtAttr.bodyShape,
diff --git a/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.cs b/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.cs
index 7b65226..8179361 100644
--- a/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.cs
+++ b/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.cs
@@ -617,9 +617,9 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
}
Thread.Sleep(200);
+ var error = BaseRegex.GetStringJson(ref result, "errMsg");
if (result.Contains("\"status\":\"未上传\""))
{
- var error = BaseRegex.GetStringJson(ref result, "errMsg");
if (string.IsNullOrWhiteSpace(error))
error = result;
Invoke(new Action(() =>
@@ -649,7 +649,7 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
Invoke(new Action(() =>
{
string opRst = prod.status == "已上传" ? "已成功上传" : "已上传草稿箱";
- row.Cells["colOpResult"].Value = opRst + "但保存到服务端失败:" + BaseRegex.GetStringJson(ref html, "msg") + "; ";
+ row.Cells["colOpResult"].Value = opRst + "但保存到服务端失败:" + BaseRegex.GetStringJson(ref html, "msg") + (" " + error).Trim(' ');
row.Cells["colStatus"].Value = prod.status;
}));
}
@@ -658,7 +658,7 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
Invoke(new Action(() =>
{
row.Cells["colDraftId"].Value = productDraftId; // 草稿箱id
- row.Cells["colOpResult"].Value = prod.status == "已上传" ? "已成功上传" : "已上传草稿箱";
+ row.Cells["colOpResult"].Value = prod.status == "已上传" ? "已成功上传" : "已上传草稿箱" + (" " + error).Trim(' ');
row.Cells["colStatus"].Value = prod.status;
}));
}