diff --git a/TEMUKJD/KJD.csproj b/TEMUKJD/KJD.csproj
index 077d6a7..0856cde 100644
--- a/TEMUKJD/KJD.csproj
+++ b/TEMUKJD/KJD.csproj
@@ -172,6 +172,12 @@
JstBanPlatformForm.cs
+
+ Form
+
+
+ PDDFissionProdByChanceImgForm.cs
+
Form
@@ -1265,6 +1271,9 @@
JstBanPlatformForm.cs
+
+ PDDFissionProdByChanceImgForm.cs
+
PDDGetChanceProdByImgForm.cs
diff --git a/TEMUKJD/PDDForms/AdminForms/PDDAdminForm.cs b/TEMUKJD/PDDForms/AdminForms/PDDAdminForm.cs
index a0fe956..a35e915 100644
--- a/TEMUKJD/PDDForms/AdminForms/PDDAdminForm.cs
+++ b/TEMUKJD/PDDForms/AdminForms/PDDAdminForm.cs
@@ -110,6 +110,9 @@ namespace TemuKJD.PDDForms.AdminForms
case "以图搜品采集":
SetForm(getChanceProdByImgForm.Value);
break;
+ case "以图搜品裂变":
+ SetForm(getChanceProdByImgForm.Value);
+ break;
case "厂家商品采集":
SetForm(getJuShuitanProdForm.Value);
break;
diff --git a/TEMUKJD/PDDForms/ProductForms/ActivityForms/PDDAddActivityForm.cs b/TEMUKJD/PDDForms/ProductForms/ActivityForms/PDDAddActivityForm.cs
index 8b3ed6b..85e8663 100644
--- a/TEMUKJD/PDDForms/ProductForms/ActivityForms/PDDAddActivityForm.cs
+++ b/TEMUKJD/PDDForms/ProductForms/ActivityForms/PDDAddActivityForm.cs
@@ -658,8 +658,10 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms
}
}
- activityRst1 = activity_goods_info(shop, prodParams.Select(p => p.goods_id.ParseToString()).ToList(), "20981");
- //activityRst1 = activity_goods_price_rule(shop, string.Join(",", prodParams.Select(p => p.goods_id.ParseToString()).ToList()), 20981, 27);
+ // 老接口
+ //activityRst1 = activity_goods_info(shop, prodParams.Select(p => p.goods_id.ParseToString()).ToList(), "20981");
+ // 新接口
+ activityRst1 = activity_goods_price_rule(shop, string.Join(",", prodParams.Select(p => p.goods_id.ParseToString()).ToList()), 20981, 27);
Thread.Sleep(Randomx.GetId(1000, 2000));
Thread.Sleep((moreSleepTime * 1000).ParseToInt());
}
@@ -678,34 +680,70 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms
try
{
var jObj = JObject.Parse(activityRst1);
- var jStr = JsonHelper.SerializeObject(jObj["result"]["result"]);
- var queryActivityInfoRstLst = (JsonHelper.DeserializeJsonToObject(jStr)?.theme_activity_quick_enroll_goods_render_form_list).ToList();
- if (queryActivityInfoRstLst == null)
- queryActivityInfoRstLst = new List();
+
+ // 老接口
+ //var jStr = JsonHelper.SerializeObject(jObj["result"]["result"]);
+ //var queryActivityInfoRstLst = (JsonHelper.DeserializeJsonToObject(jStr)?.theme_activity_quick_enroll_goods_render_form_list).ToList();
+ //if (queryActivityInfoRstLst == null)
+ // queryActivityInfoRstLst = new List();
+
+ //foreach (var prodParam in prodParams)
+ //{
+ // var pddActivitiInfo = queryActivityInfoRstLst.FirstOrDefault(act => act.goods_id == prodParam.goods_id);
+ // if (pddActivitiInfo == null)
+ // {
+ // addActivityFailLst.Add(new AddActivityFailInfo { goods_id = prodParam.goods_id, error_msg = "校验失败 981查询/新建失败 商品未提交成功或不满足参加活动条件" });
+ // continue;
+ // }
+ // foreach (var activitySku in pddActivitiInfo.activity_price_render.sku_activity_price_render_dtolist)
+ // {
+ // var sku = prodParam.skus.FirstOrDefault(sk => string.Join(",", sk.spec.Select(s => s.spec_name)) == activitySku.sku_name);
+ // if (sku == null)
+ // {
+ // addActivityFailLst.Add(new AddActivityFailInfo { goods_id = prodParam.goods_id, error_msg = "校验失败 981sku丢失 " + activitySku.sku_name });
+ // break;
+ // }
+ // if (sku.multi_price > activitySku.suggest_price)
+ // {
+ // // 此处临时用sku69_code记录一下需要改动库存的sku,库存为0的也记录后面再处理
+ // sku.sku69_code = "yes";
+ // sku.multi_price = activitySku.suggest_price;
+ // }
+ // }
+ // if (prodParam.skus.All(s => s.sku69_code == "yes"))
+ // {
+ // addActivityFailLst.Add(new AddActivityFailInfo { goods_id = prodParam.goods_id, error_msg = "校验失败 所有活动报价均低于产品期望价格" });
+ // }
+ //}
+
+ var jStr = JsonHelper.SerializeObject(jObj["result"]);
+ var pddActivitiPriceInfo = JsonHelper.DeserializeJsonToObject(jStr);
foreach (var prodParam in prodParams)
{
- var pddActivitiInfo = queryActivityInfoRstLst.FirstOrDefault(act => act.goods_id == prodParam.goods_id);
- if (pddActivitiInfo == null)
+ var pddActivitiPriceProd = pddActivitiPriceInfo.enroll_goods_rule_vos.FirstOrDefault(p => p.goods_id == prodParam.goods_id);
+ if (pddActivitiPriceProd == null)
{
- addActivityFailLst.Add(new AddActivityFailInfo { goods_id = prodParam.goods_id, error_msg = "校验失败 981查询/新建失败 商品未提交成功或不满足参加活动条件" });
+ activityErr = "校验失败 981查询/新建失败 商品未提交成功或不满足参加活动条件";
+ addActivityFailLst.Add(new AddActivityFailInfo { goods_id = prodParam.goods_id, error_msg = activityErr });
continue;
}
- foreach (var activitySku in pddActivitiInfo.activity_price_render.sku_activity_price_render_dtolist)
+ foreach (var activitySkuInfo in pddActivitiPriceProd.enroll_rule_param.enroll_goods_big_sale_price.sku_info_list)
{
- var sku = prodParam.skus.FirstOrDefault(sk => string.Join(",", sk.spec.Select(s => s.spec_name)) == activitySku.sku_name);
+ var sku = prodParam.skus.FirstOrDefault(sk => string.Join(",", sk.spec.Select(s => s.spec_name)) == activitySkuInfo.spec_info_str);
if (sku == null)
{
- addActivityFailLst.Add(new AddActivityFailInfo { goods_id = prodParam.goods_id, error_msg = "校验失败 981sku丢失 " + activitySku.sku_name });
+ addActivityFailLst.Add(new AddActivityFailInfo { goods_id = prodParam.goods_id, error_msg = "校验失败 981sku丢失 " + activitySkuInfo.spec_info_str });
break;
}
- if (sku.multi_price > activitySku.suggest_price)
+ if (sku.multi_price > activitySkuInfo.require_price)
{
// 此处临时用sku69_code记录一下需要改动库存的sku,库存为0的也记录后面再处理
sku.sku69_code = "yes";
- sku.multi_price = activitySku.suggest_price;
+ sku.multi_price = activitySkuInfo.require_price;
}
}
+
if (prodParam.skus.All(s => s.sku69_code == "yes"))
{
addActivityFailLst.Add(new AddActivityFailInfo { goods_id = prodParam.goods_id, error_msg = "校验失败 所有活动报价均低于产品期望价格" });
@@ -754,8 +792,10 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms
}
}
- activityRst1 = activity_goods_info(shop, prodParams.Select(p => p.goods_id.ParseToString()).ToList(), "20981");
- //activityRst1 = activity_goods_price_rule(shop, string.Join(",", prodParams.Select(p => p.goods_id.ParseToString()).ToList()), 20981, 27);
+ // 老接口
+ //activityRst1 = activity_goods_info(shop, prodParams.Select(p => p.goods_id.ParseToString()).ToList(), "20981");
+ // 新接口
+ activityRst1 = activity_goods_price_rule(shop, string.Join(",", prodParams.Select(p => p.goods_id.ParseToString()).ToList()), 20981, 27);
Thread.Sleep(Randomx.GetId(1000, 2000));
Thread.Sleep((moreSleepTime * 1000).ParseToInt());
}
@@ -773,41 +813,105 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms
}
try
{
- var jObj = JObject.Parse(activityRst1);
- var jStr = JsonHelper.SerializeObject(jObj["result"]["result"]);
- var queryActivityInfoRstLst = (JsonHelper.DeserializeJsonToObject(jStr)?.theme_activity_quick_enroll_goods_render_form_list).ToList();
- if (queryActivityInfoRstLst == null)
- queryActivityInfoRstLst = new List();
-
PDDActivitySubmitParam actSubmitParam = new PDDActivitySubmitParam();
actSubmitParam.activity_id = 20981;
- actSubmitParam.enroll_source_ctx.enroll_type = 34; //入口1
- //actSubmitParam.enroll_source_ctx.enroll_type = 3; //入口2
- actSubmitParam.enroll_source_ctx.scene_full_coverage = "mmsActQuickEnrollMultiActivityRealTableV1"; //入口1
- //actSubmitParam.enroll_source_ctx.scene_full_coverage = "mmsActBatchEnrollV1"; //入口2
- actSubmitParam.enroll_source_ctx.source_type = "OwnHome_MultiActEnrollMMS"; //入口1
- //actSubmitParam.enroll_source_ctx.source_type = "MMSActicon"; //入口2
- actSubmitParam.enroll_source_ctx.scene_type = null; //入口1
- //actSubmitParam.enroll_source_ctx.scene_type = "ActivityCard"; //入口2
+ // 入口1
+ //actSubmitParam.enroll_source_ctx.enroll_type = 34; //入口1
+ //actSubmitParam.enroll_source_ctx.scene_full_coverage = "mmsActQuickEnrollMultiActivityRealTableV1"; //入口1
+ //actSubmitParam.enroll_source_ctx.source_type = "OwnHome_MultiActEnrollMMS"; //入口1
+ //actSubmitParam.enroll_source_ctx.scene_type = null; //入口1
+ // 入口2
+ actSubmitParam.enroll_source_ctx.enroll_type = 3; //入口2
+ actSubmitParam.enroll_source_ctx.scene_full_coverage = "mmsActBatchEnrollV1"; //入口2
+ actSubmitParam.enroll_source_ctx.source_type = "MMSActicon"; //入口2
+ actSubmitParam.enroll_source_ctx.scene_type = "ActivityCard"; //入口2
+
actSubmitParam.create_protocol_vo.need_create_cost_template = true;
+ var jObj = JObject.Parse(activityRst1);
+
+ //var jStr = JsonHelper.SerializeObject(jObj["result"]["result"]);
+ //var queryActivityInfoRstLst = (JsonHelper.DeserializeJsonToObject(jStr)?.theme_activity_quick_enroll_goods_render_form_list).ToList();
+ //if (queryActivityInfoRstLst == null)
+ // queryActivityInfoRstLst = new List();
+
+ //foreach (var prodParam in prodParams)
+ //{
+ // var pddActivitiInfo = queryActivityInfoRstLst.FirstOrDefault(act => act.goods_id == prodParam.goods_id);
+ // if (pddActivitiInfo == null)
+ // {
+ // addActivityFailLst.Add(new AddActivityFailInfo { goods_id = prodParam.goods_id, error_msg = "报名错误 981查询/新建失败 商品未提交成功或不满足参加活动条件" });
+ // continue;
+ // }
+ // foreach (var activitySku in pddActivitiInfo.activity_price_render.sku_activity_price_render_dtolist)
+ // {
+ // //var sku = prodParam.skus.FirstOrDefault(s => s.sku_id == activitySku.sku_id);
+ // var sku = prodParam.skus.FirstOrDefault(sk => string.Join(",", sk.spec.Select(s => s.spec_name)) == activitySku.sku_name);
+ // if (sku != null && sku.multi_price == activitySku.suggest_price + 1)
+ // sku.multi_price -= 1;
+ // if (sku == null || sku.multi_price > activitySku.suggest_price)
+ // {
+ // activityErr = "报名错误 981价格低于产品价 " + activitySku.suggest_price + " < " + sku.multi_price;
+ // addActivityFailLst.Add(new AddActivityFailInfo { goods_id = prodParam.goods_id, error_msg = activityErr });
+ // break;
+ // }
+ // }
+ // if (addActivityFailLst.Any(aa => aa.goods_id == prodParam.goods_id))
+ // continue;
+
+ // var goods_vo_item = new goods_vo_param();
+ // goods_vo_item.goods_id = prodParam.goods_id;
+ // var skuSamePrice = prodParam.skus.Max(s => s.multi_price);
+ // foreach (var activitySku in pddActivitiInfo.activity_price_render.sku_activity_price_render_dtolist)
+ // {
+ // //var sku = prodParam.skus.FirstOrDefault(s => s.sku_id == activitySku.sku_id);
+ // var sku = prodParam.skus.FirstOrDefault(sk => string.Join(",", sk.spec.Select(s => s.spec_name)) == activitySku.sku_name);
+ // if (sku == null)
+ // {
+ // activityErr = "报名错误 981价格sku未找到";
+ // addActivityFailLst.Add(new AddActivityFailInfo { goods_id = prodParam.goods_id, error_msg = activityErr });
+ // break;
+ // }
+
+ // create_sku_vo_param sku_vo_item = new create_sku_vo_param();
+ // sku_vo_item.sku_id = activitySku.sku_id;
+ // sku_vo_item.sku_activity_price = sku.multi_price; //skuSamePrice; //sku.multi_price; //activitySku.suggest_price;
+ // sku_vo_item.sku_front_ctx_vo = new sku_front_ctx_vo_param()
+ // {
+ // filling_sku_price = sku.multi_price, //skuSamePrice, //sku.multi_price, //activitySku.suggest_price,
+ // gear_rule = activitySku.gear_rule,
+ // require_price = sku.multi_price, //skuSamePrice, //sku.multi_price, //activitySku.suggest_price,
+ // };
+ // goods_vo_item.create_activity_price_vo.create_sku_vos.Add(sku_vo_item);
+ // }
+ // if (addActivityFailLst.Any(aa => aa.goods_id == prodParam.goods_id))
+ // continue;
+
+ // if (pddActivitiInfo.need_goods_activity_price == true)
+ // goods_vo_item.view_confirmed_goods_protocol_vo.confirm_hit_cut_price = true;
+
+ // actSubmitParam.goods_volist.Add(goods_vo_item);
+ //}
+
+ var jStr = JsonHelper.SerializeObject(jObj["result"]);
+ var pddActivitiPriceInfo = JsonHelper.DeserializeJsonToObject(jStr);
foreach (var prodParam in prodParams)
{
- var pddActivitiInfo = queryActivityInfoRstLst.FirstOrDefault(act => act.goods_id == prodParam.goods_id);
- if (pddActivitiInfo == null)
+ var pddActivitiPriceProd = pddActivitiPriceInfo.enroll_goods_rule_vos.FirstOrDefault(p => p.goods_id == prodParam.goods_id);
+ if (pddActivitiPriceProd == null)
{
- addActivityFailLst.Add(new AddActivityFailInfo { goods_id = prodParam.goods_id, error_msg = "报名错误 981查询/新建失败 商品未提交成功或不满足参加活动条件" });
+ activityErr = "报名错误 347查询/新建失败 商品未提交成功或不满足参加活动条件";
+ addActivityFailLst.Add(new AddActivityFailInfo { goods_id = prodParam.goods_id, error_msg = activityErr });
continue;
}
- foreach (var activitySku in pddActivitiInfo.activity_price_render.sku_activity_price_render_dtolist)
+
+ foreach (var activitySkuInfo in pddActivitiPriceProd.enroll_rule_param.enroll_goods_big_sale_price.sku_info_list)
{
//var sku = prodParam.skus.FirstOrDefault(s => s.sku_id == activitySku.sku_id);
- var sku = prodParam.skus.FirstOrDefault(sk => string.Join(",", sk.spec.Select(s => s.spec_name)) == activitySku.sku_name);
- if (sku != null && sku.multi_price == activitySku.suggest_price + 1)
- sku.multi_price -= 1;
- if (sku == null || sku.multi_price > activitySku.suggest_price)
+ var sku = prodParam.skus.FirstOrDefault(sk => string.Join(",", sk.spec.Select(s => s.spec_name)) == activitySkuInfo.spec_info_str);
+ if (sku == null || sku.multi_price > activitySkuInfo.require_price)
{
- activityErr = "报名错误 981价格低于产品价 " + activitySku.suggest_price + " < " + sku.multi_price;
+ activityErr = "报名错误 981价格低于产品价 " + activitySkuInfo.require_price + " < " + sku.multi_price;
addActivityFailLst.Add(new AddActivityFailInfo { goods_id = prodParam.goods_id, error_msg = activityErr });
break;
}
@@ -818,10 +922,10 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms
var goods_vo_item = new goods_vo_param();
goods_vo_item.goods_id = prodParam.goods_id;
var skuSamePrice = prodParam.skus.Max(s => s.multi_price);
- foreach (var activitySku in pddActivitiInfo.activity_price_render.sku_activity_price_render_dtolist)
+ foreach (var activitySkuInfo in pddActivitiPriceProd.enroll_rule_param.enroll_goods_big_sale_price.sku_info_list)
{
//var sku = prodParam.skus.FirstOrDefault(s => s.sku_id == activitySku.sku_id);
- var sku = prodParam.skus.FirstOrDefault(sk => string.Join(",", sk.spec.Select(s => s.spec_name)) == activitySku.sku_name);
+ var sku = prodParam.skus.FirstOrDefault(sk => string.Join(",", sk.spec.Select(s => s.spec_name)) == activitySkuInfo.spec_info_str);
if (sku == null)
{
activityErr = "报名错误 981价格sku未找到";
@@ -830,24 +934,26 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms
}
create_sku_vo_param sku_vo_item = new create_sku_vo_param();
- sku_vo_item.sku_id = activitySku.sku_id;
+ sku_vo_item.sku_id = activitySkuInfo.sku_id;
sku_vo_item.sku_activity_price = sku.multi_price; //skuSamePrice; //sku.multi_price; //activitySku.suggest_price;
sku_vo_item.sku_front_ctx_vo = new sku_front_ctx_vo_param()
{
- filling_sku_price = sku.multi_price, //skuSamePrice, //sku.multi_price, //activitySku.suggest_price,
- gear_rule = activitySku.gear_rule,
- require_price = sku.multi_price, //skuSamePrice, //sku.multi_price, //activitySku.suggest_price,
+ filling_sku_price = sku.multi_price,
+ gear_rule = activitySkuInfo.gear_rule,
+ require_price = sku.multi_price,
+ filling_sku_price_gear_rule = activitySkuInfo.filling_sku_price_gear_rule,
};
goods_vo_item.create_activity_price_vo.create_sku_vos.Add(sku_vo_item);
}
if (addActivityFailLst.Any(aa => aa.goods_id == prodParam.goods_id))
continue;
- if (pddActivitiInfo.need_goods_activity_price == true)
- goods_vo_item.view_confirmed_goods_protocol_vo.confirm_hit_cut_price = true;
+ //if (pddActivitiInfo.need_goods_activity_price == true)
+ goods_vo_item.view_confirmed_goods_protocol_vo.confirm_hit_cut_price = true;
actSubmitParam.goods_volist.Add(goods_vo_item);
}
+
if (actSubmitParam.goods_volist.Count == 0)
{
return "{\"success\":true,\"msg\":\"" + activityErr + "\",\"fail_list\":" + JsonHelper.SerializeObject(addActivityFailLst) + "}";
@@ -1214,7 +1320,7 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms
Thread.Sleep((moreSleepTime * 1000).ParseToInt());
if (!activityRst2.Contains("\"success\":true"))
{
- activity_goods_price_rule(shop, prodParam.goods_id.ParseToString(), 23513, 414);
+ activityRst2 = activity_goods_price_rule(shop, prodParam.goods_id.ParseToString(), 23513, 414);
Thread.Sleep(Randomx.GetId(1000, 2000));
Thread.Sleep((moreSleepTime * 1000).ParseToInt());
}
diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs
index d59a893..ccfd99b 100644
--- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs
+++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs
@@ -772,7 +772,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
"",
"是",
"否"});
- this.cmbPddRelation.Location = new System.Drawing.Point(743, 7);
+ this.cmbPddRelation.Location = new System.Drawing.Point(743, 5);
this.cmbPddRelation.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.cmbPddRelation.Name = "cmbPddRelation";
this.cmbPddRelation.Size = new System.Drawing.Size(47, 25);
@@ -827,7 +827,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
//
this.cmbCat2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
this.cmbCat2.FormattingEnabled = true;
- this.cmbCat2.Location = new System.Drawing.Point(278, 75);
+ this.cmbCat2.Location = new System.Drawing.Point(278, 77);
this.cmbCat2.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.cmbCat2.Name = "cmbCat2";
this.cmbCat2.Size = new System.Drawing.Size(46, 25);
@@ -912,7 +912,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
"机会商品",
"以图搜品",
"外部数据"});
- this.cmbSourceType.Location = new System.Drawing.Point(278, 40);
+ this.cmbSourceType.Location = new System.Drawing.Point(278, 42);
this.cmbSourceType.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.cmbSourceType.Name = "cmbSourceType";
this.cmbSourceType.Size = new System.Drawing.Size(46, 25);
@@ -958,7 +958,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
"",
"是",
"否"});
- this.cmbWxCat.Location = new System.Drawing.Point(622, 5);
+ this.cmbWxCat.Location = new System.Drawing.Point(622, 7);
this.cmbWxCat.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.cmbWxCat.Name = "cmbWxCat";
this.cmbWxCat.Size = new System.Drawing.Size(47, 25);
@@ -980,7 +980,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
this.cmbSort.Items.AddRange(new object[] {
"入库时间",
"认领总数"});
- this.cmbSort.Location = new System.Drawing.Point(381, 40);
+ this.cmbSort.Location = new System.Drawing.Point(381, 42);
this.cmbSort.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.cmbSort.Name = "cmbSort";
this.cmbSort.Size = new System.Drawing.Size(46, 25);
@@ -1056,7 +1056,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
//
this.cmbGroupFilter.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
this.cmbGroupFilter.FormattingEnabled = true;
- this.cmbGroupFilter.Location = new System.Drawing.Point(175, 40);
+ this.cmbGroupFilter.Location = new System.Drawing.Point(175, 42);
this.cmbGroupFilter.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.cmbGroupFilter.Name = "cmbGroupFilter";
this.cmbGroupFilter.Size = new System.Drawing.Size(46, 25);
@@ -1071,7 +1071,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
"是",
"否",
"导出未拉回"});
- this.cmbExportToOutServer.Location = new System.Drawing.Point(622, 40);
+ this.cmbExportToOutServer.Location = new System.Drawing.Point(622, 42);
this.cmbExportToOutServer.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.cmbExportToOutServer.Name = "cmbExportToOutServer";
this.cmbExportToOutServer.Size = new System.Drawing.Size(47, 25);
@@ -1107,7 +1107,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
"安全商品",
"违规商品",
"未校验"});
- this.cmbWxSafe.Location = new System.Drawing.Point(501, 40);
+ this.cmbWxSafe.Location = new System.Drawing.Point(501, 42);
this.cmbWxSafe.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.cmbWxSafe.Name = "cmbWxSafe";
this.cmbWxSafe.Size = new System.Drawing.Size(47, 25);
@@ -1149,7 +1149,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
//
this.cmbCat1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
this.cmbCat1.FormattingEnabled = true;
- this.cmbCat1.Location = new System.Drawing.Point(175, 75);
+ this.cmbCat1.Location = new System.Drawing.Point(175, 77);
this.cmbCat1.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.cmbCat1.Name = "cmbCat1";
this.cmbCat1.Size = new System.Drawing.Size(46, 25);
@@ -1171,7 +1171,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
//
this.cmbCat3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
this.cmbCat3.FormattingEnabled = true;
- this.cmbCat3.Location = new System.Drawing.Point(381, 75);
+ this.cmbCat3.Location = new System.Drawing.Point(381, 77);
this.cmbCat3.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.cmbCat3.Name = "cmbCat3";
this.cmbCat3.Size = new System.Drawing.Size(46, 25);
@@ -1268,7 +1268,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
"是",
"否",
"修复回传未拉回"});
- this.cmbHasReturn.Location = new System.Drawing.Point(743, 40);
+ this.cmbHasReturn.Location = new System.Drawing.Point(743, 42);
this.cmbHasReturn.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.cmbHasReturn.Name = "cmbHasReturn";
this.cmbHasReturn.Size = new System.Drawing.Size(47, 25);
diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.cs
index 7ad6b7f..02310ca 100644
--- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.cs
+++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.cs
@@ -1638,7 +1638,12 @@ namespace TemuKJD.PDDForms.ProductSelectForms
prodParam.nutrition_gallery = new List