优化部分食品类目上传
This commit is contained in:
1 parent
0d882571c1
commit
c8f586d8fc
6 files changed
+101
-56
No files matched your search
@@ -457,9 +457,11 @@ namespace TemuKJD.WXForms.AdminForms
|
|||||||
"支付宝充值",
|
"支付宝充值",
|
||||||
"礼物单支出/礼物单退费",
|
"礼物单支出/礼物单退费",
|
||||||
"拍单扣除/作废返还",
|
"拍单扣除/作废返还",
|
||||||
|
"额外包裹扣费支出/返还",
|
||||||
|
"退货包裹扣费支出/返还",
|
||||||
|
"云仓退货扣费支出/返还",
|
||||||
"超重扣费支出",
|
"超重扣费支出",
|
||||||
"退货包裹扣费支出",
|
"同步物流"});
|
||||||
"云仓退货扣费支出"});
|
|
||||||
this.cmbType.Location = new System.Drawing.Point(63, 50);
|
this.cmbType.Location = new System.Drawing.Point(63, 50);
|
||||||
this.cmbType.Name = "cmbType";
|
this.cmbType.Name = "cmbType";
|
||||||
this.cmbType.Size = new System.Drawing.Size(90, 25);
|
this.cmbType.Size = new System.Drawing.Size(90, 25);
|
||||||
|
|||||||
@@ -102,12 +102,16 @@ namespace TemuKJD.WXForms.AdminForms
|
|||||||
data3 += "&type_in=16,34";
|
data3 += "&type_in=16,34";
|
||||||
else if (cmbType.Text == "拍单扣除/作废返还")
|
else if (cmbType.Text == "拍单扣除/作废返还")
|
||||||
data3 += "&type_in=20,23";
|
data3 += "&type_in=20,23";
|
||||||
else if (cmbType.Text == "超重扣费支出")
|
else if (cmbType.Text == "退货包裹扣费支出/返还")
|
||||||
data3 += "&type_in=24";
|
data3 += "&type_in=26,38";
|
||||||
else if (cmbType.Text == "退货包裹扣费支出")
|
else if (cmbType.Text == "额外包裹扣费支出/返还")
|
||||||
data3 += "&type_in=26";
|
data3 += "&type_in=35,36";
|
||||||
else if (cmbType.Text == "云仓退货扣费支出")
|
else if (cmbType.Text == "云仓退货扣费支出")
|
||||||
data3 += "&type_in=31";
|
data3 += "&type_in=31,32";
|
||||||
|
else if (cmbType.Text == "超重扣费支出")
|
||||||
|
data3 += "&type_in=24,28,33,37,41";
|
||||||
|
else if (cmbType.Text == "同步物流")
|
||||||
|
data3 += "&type_in=55";
|
||||||
else if (!string.IsNullOrEmpty(cmbType.Text))
|
else if (!string.IsNullOrEmpty(cmbType.Text))
|
||||||
data3 += "&type_in=" + cmbType.Text;
|
data3 += "&type_in=" + cmbType.Text;
|
||||||
if (!string.IsNullOrEmpty(txtOutOrderId.Text.Trim()))
|
if (!string.IsNullOrEmpty(txtOutOrderId.Text.Trim()))
|
||||||
|
|||||||
+28
-28
@@ -73,6 +73,7 @@ namespace TemuKJD.WXForms.ProductForms
|
|||||||
this.chkStepAddPrice = new TemuKJD.UserComponent.UcCheckBox(this.components);
|
this.chkStepAddPrice = new TemuKJD.UserComponent.UcCheckBox(this.components);
|
||||||
this.ucTabControlMetro1 = new TemuKJD.UserControls.UcTabControlMetro();
|
this.ucTabControlMetro1 = new TemuKJD.UserControls.UcTabControlMetro();
|
||||||
this.上传参数1 = new System.Windows.Forms.TabPage();
|
this.上传参数1 = new System.Windows.Forms.TabPage();
|
||||||
|
this.btnLoadConfig = new DevComponents.DotNetBar.PanelEx();
|
||||||
this.chkRejectSevenDayReturn = new TemuKJD.UserComponent.UcCheckBox(this.components);
|
this.chkRejectSevenDayReturn = new TemuKJD.UserComponent.UcCheckBox(this.components);
|
||||||
this.label43 = new System.Windows.Forms.Label();
|
this.label43 = new System.Windows.Forms.Label();
|
||||||
this.numNotUploadShopProdMoreThan = new System.Windows.Forms.NumericUpDown();
|
this.numNotUploadShopProdMoreThan = new System.Windows.Forms.NumericUpDown();
|
||||||
@@ -271,7 +272,6 @@ namespace TemuKJD.WXForms.ProductForms
|
|||||||
this.btnClear = new DevComponents.DotNetBar.PanelEx();
|
this.btnClear = new DevComponents.DotNetBar.PanelEx();
|
||||||
this.panelEx1 = new DevComponents.DotNetBar.PanelEx();
|
this.panelEx1 = new DevComponents.DotNetBar.PanelEx();
|
||||||
this.panelEx2 = new DevComponents.DotNetBar.PanelEx();
|
this.panelEx2 = new DevComponents.DotNetBar.PanelEx();
|
||||||
this.btnLoadConfig = new DevComponents.DotNetBar.PanelEx();
|
|
||||||
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
|
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
|
||||||
this.splitContainer1.Panel1.SuspendLayout();
|
this.splitContainer1.Panel1.SuspendLayout();
|
||||||
this.splitContainer1.Panel2.SuspendLayout();
|
this.splitContainer1.Panel2.SuspendLayout();
|
||||||
@@ -879,6 +879,32 @@ namespace TemuKJD.WXForms.ProductForms
|
|||||||
this.上传参数1.Text = "上传参数";
|
this.上传参数1.Text = "上传参数";
|
||||||
this.上传参数1.UseVisualStyleBackColor = true;
|
this.上传参数1.UseVisualStyleBackColor = true;
|
||||||
//
|
//
|
||||||
|
// btnLoadConfig
|
||||||
|
//
|
||||||
|
this.btnLoadConfig.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||||
|
this.btnLoadConfig.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||||
|
this.btnLoadConfig.DisabledBackColor = System.Drawing.Color.Empty;
|
||||||
|
this.btnLoadConfig.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||||
|
this.btnLoadConfig.Location = new System.Drawing.Point(570, 119);
|
||||||
|
this.btnLoadConfig.Name = "btnLoadConfig";
|
||||||
|
this.btnLoadConfig.Size = new System.Drawing.Size(25, 22);
|
||||||
|
this.btnLoadConfig.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||||
|
this.btnLoadConfig.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||||
|
this.btnLoadConfig.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||||
|
this.btnLoadConfig.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
|
||||||
|
this.btnLoadConfig.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
|
||||||
|
this.btnLoadConfig.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
|
||||||
|
this.btnLoadConfig.Style.CornerDiameter = 3;
|
||||||
|
this.btnLoadConfig.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
|
||||||
|
this.btnLoadConfig.Style.ForeColor.Color = System.Drawing.Color.White;
|
||||||
|
this.btnLoadConfig.Style.GradientAngle = 90;
|
||||||
|
this.btnLoadConfig.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
|
||||||
|
this.btnLoadConfig.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||||
|
this.btnLoadConfig.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||||
|
this.btnLoadConfig.TabIndex = 730;
|
||||||
|
this.btnLoadConfig.Text = "R";
|
||||||
|
this.btnLoadConfig.Click += new System.EventHandler(this.btnLoadConfig_Click);
|
||||||
|
//
|
||||||
// chkRejectSevenDayReturn
|
// chkRejectSevenDayReturn
|
||||||
//
|
//
|
||||||
this.chkRejectSevenDayReturn.AutoSize = true;
|
this.chkRejectSevenDayReturn.AutoSize = true;
|
||||||
@@ -1354,7 +1380,7 @@ namespace TemuKJD.WXForms.ProductForms
|
|||||||
//
|
//
|
||||||
this.lblSpBrand.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
|
this.lblSpBrand.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
|
||||||
this.lblSpBrand.AutoSize = true;
|
this.lblSpBrand.AutoSize = true;
|
||||||
this.lblSpBrand.Location = new System.Drawing.Point(7, 41);
|
this.lblSpBrand.Location = new System.Drawing.Point(7, 15);
|
||||||
this.lblSpBrand.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
|
this.lblSpBrand.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
|
||||||
this.lblSpBrand.Name = "lblSpBrand";
|
this.lblSpBrand.Name = "lblSpBrand";
|
||||||
this.lblSpBrand.Size = new System.Drawing.Size(56, 17);
|
this.lblSpBrand.Size = new System.Drawing.Size(56, 17);
|
||||||
@@ -3512,32 +3538,6 @@ namespace TemuKJD.WXForms.ProductForms
|
|||||||
this.panelEx2.Text = "立即过滤";
|
this.panelEx2.Text = "立即过滤";
|
||||||
this.panelEx2.Click += new System.EventHandler(this.btnFilterBound_Click);
|
this.panelEx2.Click += new System.EventHandler(this.btnFilterBound_Click);
|
||||||
//
|
//
|
||||||
// btnLoadConfig
|
|
||||||
//
|
|
||||||
this.btnLoadConfig.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
|
||||||
this.btnLoadConfig.Cursor = System.Windows.Forms.Cursors.Hand;
|
|
||||||
this.btnLoadConfig.DisabledBackColor = System.Drawing.Color.Empty;
|
|
||||||
this.btnLoadConfig.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
|
||||||
this.btnLoadConfig.Location = new System.Drawing.Point(570, 119);
|
|
||||||
this.btnLoadConfig.Name = "btnLoadConfig";
|
|
||||||
this.btnLoadConfig.Size = new System.Drawing.Size(25, 22);
|
|
||||||
this.btnLoadConfig.Style.Alignment = System.Drawing.StringAlignment.Center;
|
|
||||||
this.btnLoadConfig.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
|
||||||
this.btnLoadConfig.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
|
||||||
this.btnLoadConfig.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
|
|
||||||
this.btnLoadConfig.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
|
|
||||||
this.btnLoadConfig.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
|
|
||||||
this.btnLoadConfig.Style.CornerDiameter = 3;
|
|
||||||
this.btnLoadConfig.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
|
|
||||||
this.btnLoadConfig.Style.ForeColor.Color = System.Drawing.Color.White;
|
|
||||||
this.btnLoadConfig.Style.GradientAngle = 90;
|
|
||||||
this.btnLoadConfig.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
|
|
||||||
this.btnLoadConfig.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
|
||||||
this.btnLoadConfig.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
|
||||||
this.btnLoadConfig.TabIndex = 730;
|
|
||||||
this.btnLoadConfig.Text = "R";
|
|
||||||
this.btnLoadConfig.Click += new System.EventHandler(this.btnLoadConfig_Click);
|
|
||||||
//
|
|
||||||
// WXDBProdUploadForm
|
// WXDBProdUploadForm
|
||||||
//
|
//
|
||||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
|
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
|
||||||
|
|||||||
@@ -3845,7 +3845,8 @@ namespace TemuKJD.WXForms.ProductForms
|
|||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
WXUploadProductInfoRecommendParam recommendParamRst = new WXUploadProductInfoRecommendParam();
|
WXUploadProductInfoRecommendParam recommendParamRst = new WXUploadProductInfoRecommendParam();
|
||||||
if (chkUseRecommand.Checked)
|
WXUploadProductInfoRecommendParam foodRecommendParamRst = new WXUploadProductInfoRecommendParam();
|
||||||
|
if (chkUseRecommand.Checked || upProdParam.product.info.category.FirstOrDefault()?.name == "食品饮料")
|
||||||
{
|
{
|
||||||
WXUploadProductInfoRecommendParam recommendParam = new WXUploadProductInfoRecommendParam();
|
WXUploadProductInfoRecommendParam recommendParam = new WXUploadProductInfoRecommendParam();
|
||||||
//recommendParam.productId = upProdParam.product.productKey.productId;
|
//recommendParam.productId = upProdParam.product.productKey.productId;
|
||||||
@@ -3860,13 +3861,19 @@ namespace TemuKJD.WXForms.ProductForms
|
|||||||
var recommendRst = WXUpload.generalProductInfoRecommend(shop, recommendParam);
|
var recommendRst = WXUpload.generalProductInfoRecommend(shop, recommendParam);
|
||||||
if (recommendRst.Contains("\"code\":0"))
|
if (recommendRst.Contains("\"code\":0"))
|
||||||
{
|
{
|
||||||
|
if (chkUseRecommand.Checked)
|
||||||
recommendParamRst = JsonHelper.DeserializeJsonToObject<WXUploadProductInfoRecommendParam>(recommendRst);
|
recommendParamRst = JsonHelper.DeserializeJsonToObject<WXUploadProductInfoRecommendParam>(recommendRst);
|
||||||
|
foodRecommendParamRst = JsonHelper.DeserializeJsonToObject<WXUploadProductInfoRecommendParam>(recommendRst);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (recommendParamRst.productInfo == null)
|
if (recommendParamRst.productInfo == null)
|
||||||
recommendParamRst.productInfo = new RecommendProductInfoParam();
|
recommendParamRst.productInfo = new RecommendProductInfoParam();
|
||||||
if (recommendParamRst.productInfo.param == null)
|
if (recommendParamRst.productInfo.param == null)
|
||||||
recommendParamRst.productInfo.param = new List<RecommendProductInfoParamResult>();
|
recommendParamRst.productInfo.param = new List<RecommendProductInfoParamResult>();
|
||||||
|
if (foodRecommendParamRst.productInfo == null)
|
||||||
|
foodRecommendParamRst.productInfo = new RecommendProductInfoParam();
|
||||||
|
if (foodRecommendParamRst.productInfo.param == null)
|
||||||
|
foodRecommendParamRst.productInfo.param = new List<RecommendProductInfoParamResult>();
|
||||||
|
|
||||||
#region 匹配产品属性
|
#region 匹配产品属性
|
||||||
//真丝、蚕丝、香云纱、羊绒、羊毛、羊羔毛、羽绒、皮草
|
//真丝、蚕丝、香云纱、羊绒、羊毛、羊羔毛、羽绒、皮草
|
||||||
@@ -3996,7 +4003,9 @@ namespace TemuKJD.WXForms.ProductForms
|
|||||||
else if (propInfo.name == "食品生产许可证编号")
|
else if (propInfo.name == "食品生产许可证编号")
|
||||||
attr = productAttr.attr.FirstOrDefault(r => r.name == "食品生产许可证编号");
|
attr = productAttr.attr.FirstOrDefault(r => r.name == "食品生产许可证编号");
|
||||||
else if (propInfo.name == "产品标准号")
|
else if (propInfo.name == "产品标准号")
|
||||||
|
{
|
||||||
attr = productAttr.attr.FirstOrDefault(r => r.name == "产品标准号");
|
attr = productAttr.attr.FirstOrDefault(r => r.name == "产品标准号");
|
||||||
|
}
|
||||||
else if (propInfo.name == "保质期")
|
else if (propInfo.name == "保质期")
|
||||||
attr = productAttr.attr.FirstOrDefault(r => r.name == "保质期");
|
attr = productAttr.attr.FirstOrDefault(r => r.name == "保质期");
|
||||||
else if (propInfo.name == "生产日期")
|
else if (propInfo.name == "生产日期")
|
||||||
@@ -4370,7 +4379,7 @@ namespace TemuKJD.WXForms.ProductForms
|
|||||||
|
|
||||||
if (attr.isRequired != true)
|
if (attr.isRequired != true)
|
||||||
continue;
|
continue;
|
||||||
// 已填写内没有但是必填属性
|
// 已填写的属性里没有 但 是必填属性
|
||||||
if (upProdParam.product.info.param.Any(p => p.categorys.FirstOrDefault()?.name == attr.name))
|
if (upProdParam.product.info.param.Any(p => p.categorys.FirstOrDefault()?.name == attr.name))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
@@ -4582,6 +4591,30 @@ namespace TemuKJD.WXForms.ProductForms
|
|||||||
wxPropParam.categorys.Add(wxCategoryParam1);
|
wxPropParam.categorys.Add(wxCategoryParam1);
|
||||||
wxPropParam.categorys.Add(wxCategoryParam2);
|
wxPropParam.categorys.Add(wxCategoryParam2);
|
||||||
}
|
}
|
||||||
|
// 产品标准号单独处理
|
||||||
|
if (upProdParam.product.info.category.FirstOrDefault()?.name == "食品饮料")
|
||||||
|
{
|
||||||
|
List<string> illegalValueList = new List<string> { "见包装", "见外包装", "见详情", "其他" };
|
||||||
|
foreach (var param in upProdParam.product.info.param.ToList())
|
||||||
|
{
|
||||||
|
var propName = param.categorys.FirstOrDefault()?.name;
|
||||||
|
var propValue = param.categorys.LastOrDefault()?.name.ParseToString();
|
||||||
|
if (propName == "产品标准号" && (propValue.IsNullOrEmpty() || propValue.Length <= 5 || illegalValueList.Any(v => propValue.Contains(v))))
|
||||||
|
{
|
||||||
|
var recommendParam = foodRecommendParamRst.productInfo.param.FirstOrDefault(p => p.categorys?.FirstOrDefault()?.name == propName);
|
||||||
|
if (recommendParam != null && recommendParam.categorys.Count == 2)
|
||||||
|
{
|
||||||
|
if (param.categorys.LastOrDefault() != null)
|
||||||
|
param.categorys.LastOrDefault().name = recommendParam.categorys[1].name;
|
||||||
|
}
|
||||||
|
else if (upProdParam.product.info.category.LastOrDefault()?.name == "巧克力")
|
||||||
|
{
|
||||||
|
if (param.categorys.LastOrDefault() != null)
|
||||||
|
param.categorys.LastOrDefault().name = "QB/T19343";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
if (upProdParam.product.info.category.FirstOrDefault()?.name == "图书" || prodInfo.detail.cats.FirstOrDefault() == "书籍/杂志/报纸")
|
if (upProdParam.product.info.category.FirstOrDefault()?.name == "图书" || prodInfo.detail.cats.FirstOrDefault() == "书籍/杂志/报纸")
|
||||||
{
|
{
|
||||||
foreach (var param in upProdParam.product.info.param.ToList())
|
foreach (var param in upProdParam.product.info.param.ToList())
|
||||||
@@ -5571,16 +5604,17 @@ namespace TemuKJD.WXForms.ProductForms
|
|||||||
string address = "地址:见包装";
|
string address = "地址:见包装";
|
||||||
string Storage = "贮存条件:常温";
|
string Storage = "贮存条件:常温";
|
||||||
|
|
||||||
|
List<string> illegalValueList = new List<string> { "见包装", "见外包装", "见详情", "其他" };
|
||||||
foreach (var propParam in upProdParam.product.info.param)
|
foreach (var propParam in upProdParam.product.info.param)
|
||||||
{
|
{
|
||||||
if (propParam.categorys[0].name.Contains("食品名称") && !propParam.categorys[1].name.Contains("见包装") && !propParam.categorys[1].name.Contains("见外包装") &&
|
if (propParam.categorys[0].name.Contains("食品名称") && !illegalValueList.Any(v => propParam.categorys[1].name.Contains(v)) &&
|
||||||
!propParam.categorys[1].name.Contains("1") && propParam.categorys[1].name.Length > 5)
|
!propParam.categorys[1].name.Contains("1") && propParam.categorys[1].name.Length > 5)
|
||||||
foodName = "食品名称:" + propParam.categorys[1].name;
|
foodName = "食品名称:" + propParam.categorys[1].name;
|
||||||
else if (propParam.categorys[0].name.Contains("生产企业名称") && !propParam.categorys[1].name.Contains("见包装") && !propParam.categorys[1].name.Contains("见外包装"))
|
else if (propParam.categorys[0].name.Contains("生产企业名称") && !illegalValueList.Any(v => propParam.categorys[1].name.Contains(v)))
|
||||||
companyName = "生产商名称:" + propParam.categorys[1].name;
|
companyName = "生产商名称:" + propParam.categorys[1].name;
|
||||||
else if (propParam.categorys[0].name.Contains("食品生产许可证编号") && !propParam.categorys[1].name.Contains("见包装") && !propParam.categorys[1].name.Contains("见外包装"))
|
else if (propParam.categorys[0].name.Contains("食品生产许可证编号") && !illegalValueList.Any(v => propParam.categorys[1].name.Contains(v)))
|
||||||
SCID = "食品生产许可证编号:" + propParam.categorys[1].name;
|
SCID = "食品生产许可证编号:" + propParam.categorys[1].name;
|
||||||
else if (propParam.categorys[0].name.Contains("产品标准号") && !propParam.categorys[1].name.Contains("见包装") && !propParam.categorys[1].name.Contains("见外包装"))
|
else if (propParam.categorys[0].name.Contains("产品标准号") && !illegalValueList.Any(v => propParam.categorys[1].name.Contains(v)))
|
||||||
GBID = "产品标准号:" + propParam.categorys[1].name;
|
GBID = "产品标准号:" + propParam.categorys[1].name;
|
||||||
else if (propParam.categorys[0].name.Contains("保质期"))
|
else if (propParam.categorys[0].name.Contains("保质期"))
|
||||||
ExpDate = "保质期:" + propParam.categorys[1].name;
|
ExpDate = "保质期:" + propParam.categorys[1].name;
|
||||||
@@ -5590,7 +5624,7 @@ namespace TemuKJD.WXForms.ProductForms
|
|||||||
NetContent = "净含量:" + propParam.categorys[1].name;
|
NetContent = "净含量:" + propParam.categorys[1].name;
|
||||||
else if (propParam.categorys[0].name.Contains("包装方式"))
|
else if (propParam.categorys[0].name.Contains("包装方式"))
|
||||||
Pack = "包装方式:" + propParam.categorys[1].name;
|
Pack = "包装方式:" + propParam.categorys[1].name;
|
||||||
else if (propParam.categorys[0].name.Contains("配料表"))
|
else if (propParam.categorys[0].name.Contains("配料表") && !illegalValueList.Any(v => propParam.categorys[1].name.Contains(v)))
|
||||||
inList = "配料表:" + propParam.categorys[1].name;
|
inList = "配料表:" + propParam.categorys[1].name;
|
||||||
else if (propParam.categorys[0].name.Contains("联系方式"))
|
else if (propParam.categorys[0].name.Contains("联系方式"))
|
||||||
contact = "联系方式:" + propParam.categorys[1].name;
|
contact = "联系方式:" + propParam.categorys[1].name;
|
||||||
|
|||||||
@@ -401,9 +401,10 @@ namespace Work._29Tools.Forms.UserForms
|
|||||||
"支付宝充值",
|
"支付宝充值",
|
||||||
"礼物单支出/礼物单退费",
|
"礼物单支出/礼物单退费",
|
||||||
"拍单扣除/作废返还",
|
"拍单扣除/作废返还",
|
||||||
|
"额外包裹扣费支出/返还",
|
||||||
|
"退货包裹扣费支出/返还",
|
||||||
|
"云仓退货扣费支出/返还",
|
||||||
"超重扣费支出",
|
"超重扣费支出",
|
||||||
"退货包裹扣费支出",
|
|
||||||
"云仓退货扣费支出",
|
|
||||||
"同步物流"});
|
"同步物流"});
|
||||||
this.cmbType.Location = new System.Drawing.Point(55, 20);
|
this.cmbType.Location = new System.Drawing.Point(55, 20);
|
||||||
this.cmbType.Name = "cmbType";
|
this.cmbType.Name = "cmbType";
|
||||||
|
|||||||
@@ -145,12 +145,14 @@ namespace Work._29Tools.Forms.UserForms
|
|||||||
data3 += "&type_in=16,34";
|
data3 += "&type_in=16,34";
|
||||||
else if (cmbType.Text == "拍单扣除/作废返还")
|
else if (cmbType.Text == "拍单扣除/作废返还")
|
||||||
data3 += "&type_in=20,23";
|
data3 += "&type_in=20,23";
|
||||||
else if (cmbType.Text == "超重扣费支出")
|
else if (cmbType.Text == "退货包裹扣费支出/返还")
|
||||||
data3 += "&type_in=24";
|
data3 += "&type_in=26,38";
|
||||||
else if(cmbType.Text == "退货包裹扣费支出")
|
else if (cmbType.Text == "额外包裹扣费支出/返还")
|
||||||
data3 += "&type_in=26";
|
data3 += "&type_in=35,36";
|
||||||
else if (cmbType.Text == "云仓退货扣费支出")
|
else if (cmbType.Text == "云仓退货扣费支出")
|
||||||
data3 += "&type_in=31";
|
data3 += "&type_in=31,32";
|
||||||
|
else if (cmbType.Text == "超重扣费支出")
|
||||||
|
data3 += "&type_in=24,28,33,37,41";
|
||||||
else if (cmbType.Text == "同步物流")
|
else if (cmbType.Text == "同步物流")
|
||||||
data3 += "&type_in=55";
|
data3 += "&type_in=55";
|
||||||
else if (!string.IsNullOrEmpty(cmbType.Text))
|
else if (!string.IsNullOrEmpty(cmbType.Text))
|
||||||
@@ -239,14 +241,16 @@ namespace Work._29Tools.Forms.UserForms
|
|||||||
data3 += "&type_in=16,34";
|
data3 += "&type_in=16,34";
|
||||||
else if (cmbType.Text == "拍单扣除/作废返还")
|
else if (cmbType.Text == "拍单扣除/作废返还")
|
||||||
data3 += "&type_in=20,23";
|
data3 += "&type_in=20,23";
|
||||||
else if (cmbType.Text == "超重扣费支出")
|
else if (cmbType.Text == "退货包裹扣费支出/返还")
|
||||||
data3 += "&type_in=24";
|
data3 += "&type_in=26,38";
|
||||||
else if (cmbType.Text == "退货包裹扣费支出")
|
else if (cmbType.Text == "额外包裹扣费支出/返还")
|
||||||
data3 += "&type_in=26";
|
data3 += "&type_in=35,36";
|
||||||
else if (cmbType.Text == "云仓退货扣费支出")
|
else if (cmbType.Text == "云仓退货扣费支出")
|
||||||
data3 += "&type_in=31";
|
data3 += "&type_in=31,32";
|
||||||
else if (!string.IsNullOrEmpty(cmbType.Text))
|
else if (cmbType.Text == "超重扣费支出")
|
||||||
data3 += "&type_in=" + cmbType.Text;
|
data3 += "&type_in=24,28,33,37,41";
|
||||||
|
else if (cmbType.Text == "同步物流")
|
||||||
|
data3 += "&type_in=55";
|
||||||
//if (!string.IsNullOrEmpty(txtOutOrderId.Text.Trim()))
|
//if (!string.IsNullOrEmpty(txtOutOrderId.Text.Trim()))
|
||||||
// data3 += "&order_id_in=" + txtOutOrderId.Text.Trim();
|
// data3 += "&order_id_in=" + txtOutOrderId.Text.Trim();
|
||||||
//if (!string.IsNullOrEmpty(txtShopOrderNo.Text.Trim()))
|
//if (!string.IsNullOrEmpty(txtShopOrderNo.Text.Trim()))
|
||||||
|
|||||||
Reference in new issue
Block a user