diff --git a/KJDService/KJD_WebService/BLL/BXX/BXXProductManage.cs b/KJDService/KJD_WebService/BLL/BXX/BXXProductManage.cs index 60f8388..2ecd86c 100644 --- a/KJDService/KJD_WebService/BLL/BXX/BXXProductManage.cs +++ b/KJDService/KJD_WebService/BLL/BXX/BXXProductManage.cs @@ -505,6 +505,8 @@ namespace KJD_Web.BLL.BXX var sort_field = RegexUtils.GetStringQuery(ref inputData, "sort_field")?.Replace("'", "\\'"); var wx_safe_status = RegexUtils.GetStringQuery(ref inputData, "wx_safe_status")?.Replace("'", "\\'"); var special_prod_type = RegexUtils.GetStringQuery(ref inputData, "special_prod_type")?.Replace("'", "\\'"); + if (special_prod_type.IsNullOrEmpty()) + special_prod_type = "普通商品,书籍"; var is_supplier_prod_ok = RegexUtils.GetStringQuery(ref inputData, "is_supplier_prod_ok")?.Replace("'", "\\'"); var has_wx_cat = RegexUtils.GetStringQuery(ref inputData, "has_wx_cat")?.Replace("'", "\\'"); var send_to_out_server = RegexUtils.GetStringQuery(ref inputData, "send_to_out_server")?.Replace("'", "\\'"); @@ -563,7 +565,7 @@ namespace KJD_Web.BLL.BXX // where += ") "; //} if (!string.IsNullOrEmpty(special_prod_type)) - where += " and p.special_prod_type ='" + special_prod_type + "'"; + where += " and p.special_prod_type in ('" + special_prod_type.Replace(",", "','") + "')"; if (!string.IsNullOrWhiteSpace(search_spu)) { diff --git a/KJDService/KJD_WebService/KJD_WebService.csproj b/KJDService/KJD_WebService/KJD_WebService.csproj index 42f473c..987c748 100644 --- a/KJDService/KJD_WebService/KJD_WebService.csproj +++ b/KJDService/KJD_WebService/KJD_WebService.csproj @@ -75,6 +75,7 @@ + @@ -132,8 +133,18 @@ + + + + WXProdHot.aspx + ASPXCodeBehind + + + WXProdHot.aspx + WXProd.aspx + ASPXCodeBehind WXProd.aspx diff --git a/KJDService/KJD_WebService/Upload/Prod/BaseClass.cs b/KJDService/KJD_WebService/Upload/Prod/BaseClass.cs new file mode 100644 index 0000000..3f04d58 --- /dev/null +++ b/KJDService/KJD_WebService/Upload/Prod/BaseClass.cs @@ -0,0 +1,54 @@ +using KJD_Web.Utils; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; + +namespace KJD_Web.Upload.Prod +{ + + public class BaseClass + { + public static string BuildPDDObjString(string file, bool IsLoginDef = false) + { + string LoginApiUrl = "http://1.13.195.131:9001"; + string MainPath = "kuajingda"; + return LoginApiUrl + "/bxx_" + file + "?obj=" + MainPath + "/bxx_" + file; + } + + public static int TimeDifferent = 0; + public static int VersionCount = 99999999; + public static int CompanyId = 1; + public static string CompanyName = "1"; + public static string UserKey = "1"; + public static string Mobile = "18888888888"; + public static string UserName = "18888888888"; + public static string ShopId = "18888888888"; + public static string ShopName = "18888888888"; + } + + public class UserLogin + { + /// + /// 获取签名字符串，新版 + /// + /// + public static string GetSignaturex() + { + return GetSignaturex(BaseClass.ShopId, BaseClass.ShopName); + } + public static string GetSignaturex(string shopId, string shopName) + { + if (string.IsNullOrEmpty(shopId)) + shopId = "11111111"; + if (string.IsNullOrEmpty(shopName)) + shopName = "wx11111111"; + int time = TimeUtils.DateTimeToTimestampSeconds(DateTime.Now) + BaseClass.TimeDifferent; + string time1 = EncrypUtil.Encryption(time); + return "time=" + time + "&code=" + time1 + "&NbCodeVersion=1" + "&version=" + BaseClass.VersionCount + + "&company_id=" + BaseClass.CompanyId + "&company=" + HtmlUtils.UrlEncodeUtf8(BaseClass.CompanyName) + + "&user_name=" + BaseClass.UserName + "&user_key=" + BaseClass.UserKey + "&mobile=" + BaseClass.Mobile + + "&sid=" + shopId + "&shop=" + HtmlUtils.UrlEncodeUtf8(shopName); + } + } +} \ No newline at end of file diff --git a/KJDService/KJD_WebService/Upload/Prod/BaseWxProd.cs b/KJDService/KJD_WebService/Upload/Prod/BaseWxProd.cs new file mode 100644 index 0000000..2793530 --- /dev/null +++ b/KJDService/KJD_WebService/Upload/Prod/BaseWxProd.cs @@ -0,0 +1,408 @@ +using KJD_Web.Utils; +using KJD_WebService.Model.WxModel; +using NaiBa.Util.Extension; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Web; + +namespace KJD_Web.Upload.Prod +{ + public class BaseWxProd + { + public string getProd(string prodStr, string special_prod_type = null) + { + var reducePer = 0m; + var realPricePer = 1m - reducePer * 0.01m; + if (realPricePer < 0.1m) + realPricePer = 0.1m; + + WXClientProductInfoLite wxClientProd = new WXClientProductInfoLite(); + + var str_lst = RegexUtils.GetJsonObjStrJson(ref prodStr, "product_key"); + try + { + var regex_str = str_lst.OrderByDescending(s => s.Length).FirstOrDefault(); + wxClientProd.product_key = JsonUtils.DeserializeJsonToObject(regex_str); + if (wxClientProd.product_key == null) + return "解析失败product_key"; + } + catch + { + return "解析失败product_key"; + } + + //商品详情格式 + wxClientProd.info = new wx_client_prod_info(); + + //主标题 + wxClientProd.info.title = RegexUtils.GetStringJson(ref prodStr, "title"); + if (wxClientProd.info.title.IsNullOrEmpty()) + return "解析失败title"; + + //副标题 + wxClientProd.info.sub_title = RegexUtils.GetStringJson(ref prodStr, "sub_title"); + + str_lst = RegexUtils.GetJsonArrStrJson(ref prodStr, "head_img"); + try + { + var regex_str = str_lst.OrderByDescending(s => s.Length).FirstOrDefault(); + wxClientProd.info.head_img = JsonUtils.DeserializeJsonToListNullable(regex_str); + if (wxClientProd.info.head_img == null) + return "解析失败head_img"; + } + catch + { + return "解析失败head_img"; + } + + var nodeCatId = RegexUtils.GetStringJson(ref prodStr, "nodeCatId"); + + str_lst = RegexUtils.GetJsonArrStrJson(ref prodStr, "category"); + try + { + var regex_str = str_lst.OrderByDescending(s => s.Length).FirstOrDefault(); + wxClientProd.info.category = JsonUtils.DeserializeJsonToListNullable(regex_str); + if (wxClientProd.info.category != null && !str_lst.IsNullOrEmpty() && !wxClientProd.info.category.Any(c => c.catIdStr == nodeCatId)) + { + wxClientProd.info.category.Add(new wx_client_category() { catId = nodeCatId, cat_id = nodeCatId }); + } + //if (wxClientProd.info.category == null) + // return "解析失败"; + } + catch + { + return "解析失败category"; + } + + str_lst = RegexUtils.GetJsonObjStrJson(ref prodStr, "detail"); + try + { + var regex_str = str_lst.OrderByDescending(s => s.Length).FirstOrDefault(); + wxClientProd.info.detail = JsonUtils.DeserializeJsonToObjectNullable(regex_str); + if (wxClientProd.info.detail == null) + { + wxClientProd.info.detail = new wx_client_prod_detail(); + wxClientProd.info.detail.detail_img.Add(wxClientProd.info.head_img.FirstOrDefault()); + } + + //if (wxClientProd.info.detail == null) + // return "解析失败"; + } + catch + { + return "解析失败detail"; + } + + str_lst = RegexUtils.GetJsonArrStrJson(ref prodStr, "param"); + try + { + var regex_str = str_lst.OrderByDescending(s => s.Length).FirstOrDefault(); + wxClientProd.info.param = JsonUtils.DeserializeJsonToListNullable(regex_str); + if (wxClientProd.info.param == null) + wxClientProd.info.param = new List(); + //if (wxClientProd.info.param == null) + // return "解析失败"; + } + catch + { + return "解析失败param"; + } + + //品牌id + wxClientProd.info.brand_id = RegexUtils.GetStringJson(ref prodStr, "brand_id"); + //if (wxClientProd.info.brand_id.IsNullOrEmpty()) + // return "解析失败"; + + str_lst = RegexUtils.GetJsonObjStrJson(ref prodStr, "sku_id_list"); + try + { + var regex_str = str_lst.OrderByDescending(s => s.Length).FirstOrDefault(); + wxClientProd.info.sku_id_list = JsonUtils.DeserializeJsonToObjectNullable(regex_str); + //if (wxClientProd.info.sku_id_list == null) + // return "解析失败"; + } + catch + { + return "解析失败sku_id_list"; + } + + str_lst = RegexUtils.GetJsonObjStrJson(ref prodStr, "sku_list"); + try + { + var regex_str = str_lst.OrderByDescending(s => s.Length).FirstOrDefault(); + wxClientProd.info.sku_list = JsonUtils.DeserializeJsonToObjectNullable(regex_str); + //if (wxClientProd.info.sku_list == null) + // return "解析失败"; + } + catch + { + return "解析失败sku_list"; + } + + if (wxClientProd.info.sku_list == null) + { + str_lst = RegexUtils.GetJsonArrStrJson(ref prodStr, "sku_info"); + try + { + var regex_str = str_lst.OrderByDescending(s => s.Length).FirstOrDefault(); + var sku_infos = JsonUtils.DeserializeJsonToListNullable(regex_str); + if (sku_infos != null) + { + wxClientProd.info.sku_list = new wx_sku(); + wxClientProd.info.sku_list.sku_info = sku_infos; + } + } + catch + { + return "解析失败sku_info"; + } + } + + // 佣金商品 根据折扣价格和佣金比例减去佣金 + if (wxClientProd.info.sku_list != null) + { + foreach (var sku in wxClientProd.info.sku_list.sku_info) + { + sku.price = (sku.price - (sku.price - sku.discounted_price) * (1m - realPricePer)).ParseToInt(); + } + } + + str_lst = RegexUtils.GetJsonArrStrJson(ref prodStr, "product_sale_attrs"); + try + { + var regex_str = str_lst.OrderByDescending(s => s.Length).FirstOrDefault(); + wxClientProd.info.product_sale_attrs = JsonUtils.DeserializeJsonToListNullable(regex_str); + //if (wxClientProd.info.product_sale_attrs == null) + // return "解析失败"; + } + catch + { + return "解析失败product_sale_attrs"; + } + + + //总销量 + wxClientProd.info.total_sold_num = RegexUtils.GetStringJson(ref prodStr, "total_sold_num"); + //if (wxClientProd.info.total_sold_num.IsNullOrEmpty()) + // return "解析失败"; + + str_lst = RegexUtils.GetJsonObjStrJson(ref prodStr, "service_desc"); + try + { + var regex_str = str_lst.OrderByDescending(s => s.Length).FirstOrDefault(); + wxClientProd.info.service_desc = JsonUtils.DeserializeJsonToObjectNullable(regex_str); + //if (wxClientProd.info.service_desc == null) + // return "解析失败"; + } + catch + { + return "解析失败service_desc"; + } + + str_lst = RegexUtils.GetJsonObjStrJson(ref prodStr, "express_info"); + try + { + var regex_str = str_lst.OrderByDescending(s => s.Length).FirstOrDefault(); + wxClientProd.info.express_info = JsonUtils.DeserializeJsonToObjectNullable(regex_str); + //if (wxClientProd.info.express_info == null) + // return; + } + catch + { + return "解析失败express_info"; + } + + str_lst = RegexUtils.GetJsonArrStrJson(ref prodStr, "headVideoInfo"); + try + { + var regex_str = str_lst.OrderByDescending(s => s.Length).FirstOrDefault(); + wxClientProd.info.headVideoInfo = JsonUtils.DeserializeJsonToListNullable(regex_str); + //if (wxClientProd.info.headVideoInfo == null) + // return "解析失败"; + } + catch + { + return "解析失败headVideoInfo"; + } + + str_lst = RegexUtils.GetJsonObjStrJson(ref prodStr, "afterSaleInfo"); + try + { + var regex_str = str_lst.OrderByDescending(s => s.Length).FirstOrDefault(); + wxClientProd.info.afterSaleInfo = JsonUtils.DeserializeJsonToObjectNullable(regex_str); + //if (wxClientProd.info.afterSaleInfo == null) + // return "解析失败"; + } + catch + { + return "解析失败afterSaleInfo"; + } + + str_lst = RegexUtils.GetJsonArrStrJson(ref prodStr, "deliveryExpressFee"); + try + { + var regex_str = str_lst.OrderByDescending(s => s.Length).FirstOrDefault(); + wxClientProd.info.deliveryExpressFee = JsonUtils.DeserializeJsonToListNullable(regex_str); + //if (wxClientProd.info.deliveryExpressFee == null) + // return "解析失败"; + } + catch + { + return "解析失败deliveryExpressFee"; + } + + str_lst = RegexUtils.GetJsonArrStrJson(ref prodStr, "templateInfo"); + try + { + var regex_str = str_lst.OrderByDescending(s => s.Length).FirstOrDefault(); + wxClientProd.info.templateInfo = JsonUtils.DeserializeJsonToListNullable(regex_str); + //if (wxClientProd.info.templateInfo == null) + // return "解析失败"; + } + catch + { + return "解析失败templateInfo"; + } + + wxClientProd.info.spuCode = RegexUtils.GetStringJson(ref prodStr, "spuCode"); + + str_lst = RegexUtils.GetJsonArrStrJson(ref prodStr, "productSkus"); + try + { + var regex_str = str_lst.OrderByDescending(s => s.Length).FirstOrDefault(); + wxClientProd.productSkus = JsonUtils.DeserializeJsonToList(regex_str); + if (wxClientProd.productSkus == null) + return "解析失败productSkus"; + } + catch + { + return "解析失败productSkus"; + } + + // 佣金商品 根据价格给售卖价格赋值，如果价格丢失，直接在售卖价上计算 + foreach (var sku in wxClientProd.productSkus) + { + var wxDisSku = wxClientProd.info.sku_list?.sku_info?.FirstOrDefault(s => s.sku_id == sku.skuKey.skuId); + if (wxDisSku != null) + sku.productSkuInfo.salePrice = wxDisSku.price; + else + sku.productSkuInfo.salePrice = (sku.productSkuInfo.salePrice - sku.productSkuInfo.salePrice * realPricePer).ParseToInt(); + } + + if (wxClientProd.productSkus.Min(s => s.productSkuInfo.salePrice * 0.01m) == 0) + { + return "解析失败Sku价格为0"; + } + + return SaveWxProd(wxClientProd.product_key.product_id, wxClientProd, prodStr, special_prod_type); + } + + public string SaveWxProd(string prodId, WXClientProductInfoLite wxClientProdInfoLite, string baseProdStr, string special_prod_type = null) + { + bool isExist = false; + var existUrl = BaseClass.BuildPDDObjString("product/get_product_spu_id_list"); + string existData = UserLogin.GetSignaturex() + "&search_spu_ids=" + prodId; + //if (!string.IsNullOrEmpty(prod.dbProduct.real_spu_id)) + // existData = UserLogin.GetSignaturex() + "&search_spu_ids=" + prod.spuId + "," + prod.dbProduct.real_spu_id; + string html = HtmlUtils.PostUtf8(existUrl, existData); + if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) + html = HtmlUtils.PostUtf8(existUrl, existData); + if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) + { + return "采集入库失败，产品数据库连接失败"; + } + else + { + if (html.Contains("\"data\":[") && !html.Contains("\"data\":[]")) + isExist = true; + } + + var url = BaseClass.BuildPDDObjString("product/add_product"); + if (isExist) + url = BaseClass.BuildPDDObjString("product/mdy_product"); + + var skus = wxClientProdInfoLite.productSkus; + + var product_json = "{\"wxxdData\":" + JsonUtils.SerializeObject(wxClientProdInfoLite) + ",\"baseData\":" + JsonUtils.SerializeObject(baseProdStr) + "}"; + var data = UserLogin.GetSignaturex() + + "&from_shop_id=" + wxClientProdInfoLite.product_key.appid + + "&from_shop_name=" + wxClientProdInfoLite.product_key.appid + + "&spu_id=" + prodId + + "&skc_id=" + prodId + + "&price_text=" + skus.Min(s => s.productSkuInfo.salePrice * 0.01m) + " - " + skus.Max(s => s.productSkuInfo.salePrice * 0.01m) + + "&ext_code=" + wxClientProdInfoLite.info.spuCode + + "&product_name=" + HttpUtility.UrlEncode(wxClientProdInfoLite.info.title, Encoding.UTF8) + + "&product_json=" + HttpUtility.UrlEncode(product_json, Encoding.UTF8) + // product_json /*HttpUtility.UrlEncode(JsonUtils.SerializeObject(wxClientProdInfoLite), Encoding.UTF8)*/ + "&sale_count=" + wxClientProdInfoLite.info.total_sold_num + + "&sale_count_text=" + wxClientProdInfoLite.info.total_sold_num + + "&main_img=" + HttpUtility.UrlEncode(wxClientProdInfoLite.info.head_img.FirstOrDefault(), Encoding.UTF8) + + "&wx_safe_status=" + HttpUtility.UrlEncode("安全商品", Encoding.UTF8) + + "&product_get_type=" + HttpUtility.UrlEncode("微信小店", Encoding.UTF8); + + if (wxClientProdInfoLite.info.category.Count > 0) + { + data += "&wx_cat_1=" + wxClientProdInfoLite.info.category[0].catIdStr; + data += "&main_cat_id=" + wxClientProdInfoLite.info.category[0].catIdStr; + data += "&main_cat_name=" + wxClientProdInfoLite.info.category[0].name; + + data += "&wx_cat_leaf=" + wxClientProdInfoLite.info.category.LastOrDefault()?.catIdStr; + data += "&cat_id=" + wxClientProdInfoLite.info.category.LastOrDefault()?.catIdStr; + data += "&cat_name=" + HttpUtility.UrlEncode((wxClientProdInfoLite.info.category.LastOrDefault()?.name).ParseToString(), Encoding.UTF8); + } + if (wxClientProdInfoLite.info.category.Count > 1) + { + data += "&wx_cat_2=" + wxClientProdInfoLite.info.category[1].catIdStr; + } + if (wxClientProdInfoLite.info.category.Count > 2) + { + data += "&wx_cat_3=" + wxClientProdInfoLite.info.category[2].catIdStr; + } + + //if (wxClientProdInfoLite.info.category.FirstOrDefault().name == "图书") + //{ + // data += "&special_prod_type=" + HttpUtility.UrlEncode("书籍", Encoding.UTF8); + //} + if (special_prod_type != null) + { + data += "&special_prod_type=" + special_prod_type; + } + + html = HtmlUtils.PostUtf8(url, data); + if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) + html = HtmlUtils.PostUtf8(url, data); + if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) + { + string msg = "商品入库失败!请检查网络连接：" + RegexUtils.GetStringJson(ref html, "msg"); + //Invoke(new Action(() => + //{ + // row.Cells["colMsg"].Value = msg; + //})); + return msg; + } + else + { + //prod.getProductMsg = "商品入库成功!"; + //Invoke(new Action(() => + //{ + // row.Cells["colMsg"].Value = prod.getProductMsg; + //})); + if (!isExist) + { + url = BaseClass.BuildPDDObjString("product/mdy_product"); + html = HtmlUtils.PostUtf8(url, data); + if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) + html = HtmlUtils.PostUtf8(url, data); + if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) + { + string msg = "商品入库失败!请检查网络连接：" + RegexUtils.GetStringJson(ref html, "msg"); + return msg; + } + } + + return "微信商品采集入库成功!"; + } + } + } +} \ No newline at end of file diff --git a/KJDService/KJD_WebService/Upload/Prod/WXProd.aspx.cs b/KJDService/KJD_WebService/Upload/Prod/WXProd.aspx.cs index b2bafef..f56978d 100644 --- a/KJDService/KJD_WebService/Upload/Prod/WXProd.aspx.cs +++ b/KJDService/KJD_WebService/Upload/Prod/WXProd.aspx.cs @@ -15,51 +15,6 @@ using System.Web.UI.WebControls; namespace KJD_Web.Upload.Prod { - public class BaseClass - { - public static string BuildPDDObjString(string file, bool IsLoginDef = false) - { - string LoginApiUrl = "http://1.13.195.131:9001"; - string MainPath = "kuajingda"; - return LoginApiUrl + "/bxx_" + file + "?obj=" + MainPath + "/bxx_" + file; - } - - public static int TimeDifferent = 0; - public static int VersionCount = 99999999; - public static int CompanyId = 1; - public static string CompanyName = "1"; - public static string UserKey = "1"; - public static string Mobile = "18888888888"; - public static string UserName = "18888888888"; - public static string ShopId = "18888888888"; - public static string ShopName = "18888888888"; - } - - public class UserLogin - { - /// - /// 获取签名字符串，新版 - /// - /// - public static string GetSignaturex() - { - return GetSignaturex(BaseClass.ShopId, BaseClass.ShopName); - } - public static string GetSignaturex(string shopId, string shopName) - { - if (string.IsNullOrEmpty(shopId)) - shopId = "11111111"; - if (string.IsNullOrEmpty(shopName)) - shopName = "wx11111111"; - int time = TimeUtils.DateTimeToTimestampSeconds(DateTime.Now) + BaseClass.TimeDifferent; - string time1 = EncrypUtil.Encryption(time); - return "time=" + time + "&code=" + time1 + "&NbCodeVersion=1" + "&version=" + BaseClass.VersionCount + - "&company_id=" + BaseClass.CompanyId + "&company=" + HtmlUtils.UrlEncodeUtf8(BaseClass.CompanyName) + - "&user_name=" + BaseClass.UserName + "&user_key=" + BaseClass.UserKey + "&mobile=" + BaseClass.Mobile + - "&sid=" + shopId + "&shop=" + HtmlUtils.UrlEncodeUtf8(shopName); - } - } - public partial class WXProd : System.Web.UI.Page { protected void Page_Load(object sender, EventArgs e) @@ -83,401 +38,7 @@ namespace KJD_Web.Upload.Prod { string prodStr = Encoding.UTF8.GetString(this.FileUpload1.FileBytes); prodStr = TextBox2.Text.Trim(); - return getProd(prodStr); - } - - public static string getProd(string prodStr, string special_prod_type = null) - { - var reducePer = 0m; - var realPricePer = 1m - reducePer * 0.01m; - if (realPricePer < 0.1m) - realPricePer = 0.1m; - - WXClientProductInfoLite wxClientProd = new WXClientProductInfoLite(); - - var str_lst = RegexUtils.GetJsonObjStrJson(ref prodStr, "product_key"); - try - { - var regex_str = str_lst.OrderByDescending(s => s.Length).FirstOrDefault(); - wxClientProd.product_key = JsonUtils.DeserializeJsonToObject(regex_str); - if (wxClientProd.product_key == null) - return "解析失败product_key"; - } - catch - { - return "解析失败product_key"; - } - - //商品详情格式 - wxClientProd.info = new wx_client_prod_info(); - - //主标题 - wxClientProd.info.title = RegexUtils.GetStringJson(ref prodStr, "title"); - if (wxClientProd.info.title.IsNullOrEmpty()) - return "解析失败title"; - - //副标题 - wxClientProd.info.sub_title = RegexUtils.GetStringJson(ref prodStr, "sub_title"); - - str_lst = RegexUtils.GetJsonArrStrJson(ref prodStr, "head_img"); - try - { - var regex_str = str_lst.OrderByDescending(s => s.Length).FirstOrDefault(); - wxClientProd.info.head_img = JsonUtils.DeserializeJsonToListNullable(regex_str); - if (wxClientProd.info.head_img == null) - return "解析失败head_img"; - } - catch - { - return "解析失败head_img"; - } - - var nodeCatId = RegexUtils.GetStringJson(ref prodStr, "nodeCatId"); - - str_lst = RegexUtils.GetJsonArrStrJson(ref prodStr, "category"); - try - { - var regex_str = str_lst.OrderByDescending(s => s.Length).FirstOrDefault(); - wxClientProd.info.category = JsonUtils.DeserializeJsonToListNullable(regex_str); - if (wxClientProd.info.category != null && !str_lst.IsNullOrEmpty() && !wxClientProd.info.category.Any(c => c.catIdStr == nodeCatId)) - { - wxClientProd.info.category.Add(new wx_client_category() { catId = nodeCatId, cat_id = nodeCatId }); - } - //if (wxClientProd.info.category == null) - // return "解析失败"; - } - catch - { - return "解析失败category"; - } - - str_lst = RegexUtils.GetJsonObjStrJson(ref prodStr, "detail"); - try - { - var regex_str = str_lst.OrderByDescending(s => s.Length).FirstOrDefault(); - wxClientProd.info.detail = JsonUtils.DeserializeJsonToObjectNullable(regex_str); - if (wxClientProd.info.detail == null) - { - wxClientProd.info.detail = new wx_client_prod_detail(); - wxClientProd.info.detail.detail_img.Add(wxClientProd.info.head_img.FirstOrDefault()); - } - - //if (wxClientProd.info.detail == null) - // return "解析失败"; - } - catch - { - return "解析失败detail"; - } - - str_lst = RegexUtils.GetJsonArrStrJson(ref prodStr, "param"); - try - { - var regex_str = str_lst.OrderByDescending(s => s.Length).FirstOrDefault(); - wxClientProd.info.param = JsonUtils.DeserializeJsonToListNullable(regex_str); - if (wxClientProd.info.param == null) - wxClientProd.info.param = new List(); - //if (wxClientProd.info.param == null) - // return "解析失败"; - } - catch - { - return "解析失败param"; - } - - //品牌id - wxClientProd.info.brand_id = RegexUtils.GetStringJson(ref prodStr, "brand_id"); - //if (wxClientProd.info.brand_id.IsNullOrEmpty()) - // return "解析失败"; - - str_lst = RegexUtils.GetJsonObjStrJson(ref prodStr, "sku_id_list"); - try - { - var regex_str = str_lst.OrderByDescending(s => s.Length).FirstOrDefault(); - wxClientProd.info.sku_id_list = JsonUtils.DeserializeJsonToObjectNullable(regex_str); - //if (wxClientProd.info.sku_id_list == null) - // return "解析失败"; - } - catch - { - return "解析失败sku_id_list"; - } - - str_lst = RegexUtils.GetJsonObjStrJson(ref prodStr, "sku_list"); - try - { - var regex_str = str_lst.OrderByDescending(s => s.Length).FirstOrDefault(); - wxClientProd.info.sku_list = JsonUtils.DeserializeJsonToObjectNullable(regex_str); - //if (wxClientProd.info.sku_list == null) - // return "解析失败"; - } - catch - { - return "解析失败sku_list"; - } - - if (wxClientProd.info.sku_list == null) - { - str_lst = RegexUtils.GetJsonArrStrJson(ref prodStr, "sku_info"); - try - { - var regex_str = str_lst.OrderByDescending(s => s.Length).FirstOrDefault(); - var sku_infos = JsonUtils.DeserializeJsonToListNullable(regex_str); - if (sku_infos != null) - { - wxClientProd.info.sku_list = new wx_sku(); - wxClientProd.info.sku_list.sku_info = sku_infos; - } - } - catch - { - return "解析失败sku_info"; - } - } - - // 佣金商品 根据折扣价格和佣金比例减去佣金 - if (wxClientProd.info.sku_list != null) - { - foreach (var sku in wxClientProd.info.sku_list.sku_info) - { - sku.price = (sku.price - (sku.price - sku.discounted_price) * (1m - realPricePer)).ParseToInt(); - } - } - - str_lst = RegexUtils.GetJsonArrStrJson(ref prodStr, "product_sale_attrs"); - try - { - var regex_str = str_lst.OrderByDescending(s => s.Length).FirstOrDefault(); - wxClientProd.info.product_sale_attrs = JsonUtils.DeserializeJsonToListNullable(regex_str); - //if (wxClientProd.info.product_sale_attrs == null) - // return "解析失败"; - } - catch - { - return "解析失败product_sale_attrs"; - } - - - //总销量 - wxClientProd.info.total_sold_num = RegexUtils.GetStringJson(ref prodStr, "total_sold_num"); - //if (wxClientProd.info.total_sold_num.IsNullOrEmpty()) - // return "解析失败"; - - str_lst = RegexUtils.GetJsonObjStrJson(ref prodStr, "service_desc"); - try - { - var regex_str = str_lst.OrderByDescending(s => s.Length).FirstOrDefault(); - wxClientProd.info.service_desc = JsonUtils.DeserializeJsonToObjectNullable(regex_str); - //if (wxClientProd.info.service_desc == null) - // return "解析失败"; - } - catch - { - return "解析失败service_desc"; - } - - str_lst = RegexUtils.GetJsonObjStrJson(ref prodStr, "express_info"); - try - { - var regex_str = str_lst.OrderByDescending(s => s.Length).FirstOrDefault(); - wxClientProd.info.express_info = JsonUtils.DeserializeJsonToObjectNullable(regex_str); - //if (wxClientProd.info.express_info == null) - // return; - } - catch - { - return "解析失败express_info"; - } - - str_lst = RegexUtils.GetJsonArrStrJson(ref prodStr, "headVideoInfo"); - try - { - var regex_str = str_lst.OrderByDescending(s => s.Length).FirstOrDefault(); - wxClientProd.info.headVideoInfo = JsonUtils.DeserializeJsonToListNullable(regex_str); - //if (wxClientProd.info.headVideoInfo == null) - // return "解析失败"; - } - catch - { - return "解析失败headVideoInfo"; - } - - str_lst = RegexUtils.GetJsonObjStrJson(ref prodStr, "afterSaleInfo"); - try - { - var regex_str = str_lst.OrderByDescending(s => s.Length).FirstOrDefault(); - wxClientProd.info.afterSaleInfo = JsonUtils.DeserializeJsonToObjectNullable(regex_str); - //if (wxClientProd.info.afterSaleInfo == null) - // return "解析失败"; - } - catch - { - return "解析失败afterSaleInfo"; - } - - str_lst = RegexUtils.GetJsonArrStrJson(ref prodStr, "deliveryExpressFee"); - try - { - var regex_str = str_lst.OrderByDescending(s => s.Length).FirstOrDefault(); - wxClientProd.info.deliveryExpressFee = JsonUtils.DeserializeJsonToListNullable(regex_str); - //if (wxClientProd.info.deliveryExpressFee == null) - // return "解析失败"; - } - catch - { - return "解析失败deliveryExpressFee"; - } - - str_lst = RegexUtils.GetJsonArrStrJson(ref prodStr, "templateInfo"); - try - { - var regex_str = str_lst.OrderByDescending(s => s.Length).FirstOrDefault(); - wxClientProd.info.templateInfo = JsonUtils.DeserializeJsonToListNullable(regex_str); - //if (wxClientProd.info.templateInfo == null) - // return "解析失败"; - } - catch - { - return "解析失败templateInfo"; - } - - wxClientProd.info.spuCode = RegexUtils.GetStringJson(ref prodStr, "spuCode"); - - str_lst = RegexUtils.GetJsonArrStrJson(ref prodStr, "productSkus"); - try - { - var regex_str = str_lst.OrderByDescending(s => s.Length).FirstOrDefault(); - wxClientProd.productSkus = JsonUtils.DeserializeJsonToList(regex_str); - if (wxClientProd.productSkus == null) - return "解析失败productSkus"; - } - catch - { - return "解析失败productSkus"; - } - - // 佣金商品 根据价格给售卖价格赋值，如果价格丢失，直接在售卖价上计算 - foreach (var sku in wxClientProd.productSkus) - { - var wxDisSku = wxClientProd.info.sku_list?.sku_info?.FirstOrDefault(s => s.sku_id == sku.skuKey.skuId); - if (wxDisSku != null) - sku.productSkuInfo.salePrice = wxDisSku.price; - else - sku.productSkuInfo.salePrice = (sku.productSkuInfo.salePrice - sku.productSkuInfo.salePrice * realPricePer).ParseToInt(); - } - - if (wxClientProd.productSkus.Min(s => s.productSkuInfo.salePrice * 0.01m) == 0) - { - return "解析失败Sku价格为0"; - } - - return SaveWxProd(wxClientProd.product_key.product_id, wxClientProd, prodStr, special_prod_type); - } - - public static string SaveWxProd(string prodId, WXClientProductInfoLite wxClientProdInfoLite, string baseProdStr, string special_prod_type = null) - { - bool isExist = false; - var existUrl = BaseClass.BuildPDDObjString("product/get_product_spu_id_list"); - string existData = UserLogin.GetSignaturex() + "&search_spu_ids=" + prodId; - //if (!string.IsNullOrEmpty(prod.dbProduct.real_spu_id)) - // existData = UserLogin.GetSignaturex() + "&search_spu_ids=" + prod.spuId + "," + prod.dbProduct.real_spu_id; - string html = HtmlUtils.PostUtf8(existUrl, existData); - if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) - html = HtmlUtils.PostUtf8(existUrl, existData); - if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) - { - return "采集入库失败，产品数据库连接失败"; - } - else - { - if (html.Contains("\"data\":[") && !html.Contains("\"data\":[]")) - isExist = true; - } - - var url = BaseClass.BuildPDDObjString("product/add_product"); - if (isExist) - url = BaseClass.BuildPDDObjString("product/mdy_product"); - - var skus = wxClientProdInfoLite.productSkus; - - var product_json = "{\"wxxdData\":" + JsonUtils.SerializeObject(wxClientProdInfoLite) + ",\"baseData\":" + JsonUtils.SerializeObject(baseProdStr) + "}"; - var data = UserLogin.GetSignaturex() + - "&from_shop_id=" + wxClientProdInfoLite.product_key.appid + - "&from_shop_name=" + wxClientProdInfoLite.product_key.appid + - "&spu_id=" + prodId + - "&skc_id=" + prodId + - "&price_text=" + skus.Min(s => s.productSkuInfo.salePrice * 0.01m) + " - " + skus.Max(s => s.productSkuInfo.salePrice * 0.01m) + - "&ext_code=" + wxClientProdInfoLite.info.spuCode + - "&product_name=" + HttpUtility.UrlEncode(wxClientProdInfoLite.info.title, Encoding.UTF8) + - "&product_json=" + HttpUtility.UrlEncode(product_json, Encoding.UTF8) + // product_json /*HttpUtility.UrlEncode(JsonUtils.SerializeObject(wxClientProdInfoLite), Encoding.UTF8)*/ - "&sale_count=" + wxClientProdInfoLite.info.total_sold_num + - "&sale_count_text=" + wxClientProdInfoLite.info.total_sold_num + - "&main_img=" + HttpUtility.UrlEncode(wxClientProdInfoLite.info.head_img.FirstOrDefault(), Encoding.UTF8) + - "&wx_safe_status=" + HttpUtility.UrlEncode("安全商品", Encoding.UTF8) + - "&product_get_type=" + HttpUtility.UrlEncode("微信小店", Encoding.UTF8); - - if (wxClientProdInfoLite.info.category.Count > 0) - { - data += "&wx_cat_1=" + wxClientProdInfoLite.info.category[0].catIdStr; - data += "&main_cat_id=" + wxClientProdInfoLite.info.category[0].catIdStr; - data += "&main_cat_name=" + wxClientProdInfoLite.info.category[0].name; - - data += "&wx_cat_leaf=" + wxClientProdInfoLite.info.category.LastOrDefault()?.catIdStr; - data += "&cat_id=" + wxClientProdInfoLite.info.category.LastOrDefault()?.catIdStr; - data += "&cat_name=" + HttpUtility.UrlEncode((wxClientProdInfoLite.info.category.LastOrDefault()?.name).ParseToString(), Encoding.UTF8); - } - if (wxClientProdInfoLite.info.category.Count > 1) - { - data += "&wx_cat_2=" + wxClientProdInfoLite.info.category[1].catIdStr; - } - if (wxClientProdInfoLite.info.category.Count > 2) - { - data += "&wx_cat_3=" + wxClientProdInfoLite.info.category[2].catIdStr; - } - - //if (wxClientProdInfoLite.info.category.FirstOrDefault().name == "图书") - //{ - // data += "&special_prod_type=" + HttpUtility.UrlEncode("书籍", Encoding.UTF8); - //} - if (special_prod_type != null) - { - data += "&special_prod_type=" + special_prod_type; - } - - html = HtmlUtils.PostUtf8(url, data); - if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) - html = HtmlUtils.PostUtf8(url, data); - if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) - { - string msg = "商品入库失败!请检查网络连接：" + RegexUtils.GetStringJson(ref html, "msg"); - //Invoke(new Action(() => - //{ - // row.Cells["colMsg"].Value = msg; - //})); - return msg; - } - else - { - //prod.getProductMsg = "商品入库成功!"; - //Invoke(new Action(() => - //{ - // row.Cells["colMsg"].Value = prod.getProductMsg; - //})); - if (!isExist) - { - url = BaseClass.BuildPDDObjString("product/mdy_product"); - html = HtmlUtils.PostUtf8(url, data); - if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) - html = HtmlUtils.PostUtf8(url, data); - if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) - { - string msg = "商品入库失败!请检查网络连接：" + RegexUtils.GetStringJson(ref html, "msg"); - return msg; - } - } - - return "微信商品采集入库成功!"; - } + return new BaseWxProd().getProd(prodStr); } } } \ No newline at end of file diff --git a/KJDService/KJD_WebService/Upload/Prod/WXProdHot.aspx b/KJDService/KJD_WebService/Upload/Prod/WXProdHot.aspx new file mode 100644 index 0000000..eba4dd4 --- /dev/null +++ b/KJDService/KJD_WebService/Upload/Prod/WXProdHot.aspx @@ -0,0 +1,32 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="WXProdHot.aspx.cs" Inherits="KJD_Web.Upload.Prod.WXProdHot" ValidateRequest="false"%> + + + + + + + + + + + +
+
+
+ +
+
+ +   +
+
+ +
+
+ +   +
+
+
+ + diff --git a/KJDService/KJD_WebService/Upload/Prod/WXProdHot.aspx.cs b/KJDService/KJD_WebService/Upload/Prod/WXProdHot.aspx.cs new file mode 100644 index 0000000..c5a486b --- /dev/null +++ b/KJDService/KJD_WebService/Upload/Prod/WXProdHot.aspx.cs @@ -0,0 +1,44 @@ +using KJD_Web.Model; +using KJD_Web.Utils; +using KJD_WebService.Model; +using KJD_WebService.Model.WxModel; +using NaiBa.Util.Extension; +using NaiBa.Util.Helper; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Security.Cryptography.X509Certificates; +using System.Text; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace KJD_Web.Upload.Prod +{ + public partial class WXProdHot : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) + { + FileUpload1.Visible = false; + } + + protected void btnSubmit_Click(object sender, EventArgs e) + { + Label1.Text = ""; + Label2.Text = ""; + + string rst = getProd(); + Label1.Text = rst; + Label2.Text = rst; + TextBox2.Text = ""; + FileUpload1.Visible = false; + } + + string getProd() + { + string prodStr = Encoding.UTF8.GetString(this.FileUpload1.FileBytes); + prodStr = TextBox2.Text.Trim(); + return new BaseWxProd().getProd(prodStr, "爆款数据"); + } + } +} \ No newline at end of file diff --git a/KJDService/KJD_WebService/Upload/Prod/WXProdHot.aspx.designer.cs b/KJDService/KJD_WebService/Upload/Prod/WXProdHot.aspx.designer.cs new file mode 100644 index 0000000..634c566 --- /dev/null +++ b/KJDService/KJD_WebService/Upload/Prod/WXProdHot.aspx.designer.cs @@ -0,0 +1,80 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace KJD_Web.Upload.Prod +{ + + + public partial class WXProdHot + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// FileUpload1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.FileUpload FileUpload1; + + /// + /// btnSubmit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Button btnSubmit; + + /// + /// Label1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label1; + + /// + /// TextBox2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.TextBox TextBox2; + + /// + /// Button1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Button Button1; + + /// + /// Label2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label2; + } +} diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs index 5a24adc..44ac8df 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs @@ -69,6 +69,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.btnExportTxt = new DevComponents.DotNetBar.PanelEx(); this.tabPage2 = new System.Windows.Forms.TabPage(); this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); + this.label18 = new System.Windows.Forms.Label(); + this.cmbHasReturn = new System.Windows.Forms.ComboBox(); this.btnUpdateReturnServerData = new DevComponents.DotNetBar.PanelEx(); this.btnReturnSecretData = new DevComponents.DotNetBar.PanelEx(); this.btnStopStop = new DevComponents.DotNetBar.PanelEx(); @@ -84,6 +86,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.cmbCat2 = new System.Windows.Forms.ComboBox(); this.label16 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); + this.cmbSpProdType = new System.Windows.Forms.ComboBox(); this.txtSecretStyleCode = new System.Windows.Forms.TextBox(); this.label14 = new System.Windows.Forms.Label(); this.label15 = new System.Windows.Forms.Label(); @@ -91,6 +94,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.cmbSourceType = new System.Windows.Forms.ComboBox(); this.label10 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); + this.label11 = new System.Windows.Forms.Label(); this.txtSPU = new System.Windows.Forms.TextBox(); this.cmbWxCat = new System.Windows.Forms.ComboBox(); this.txtSKC = new System.Windows.Forms.TextBox(); @@ -116,13 +120,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.txtRealCoid = new System.Windows.Forms.TextBox(); this.btnEmpty = new DevComponents.DotNetBar.PanelEx(); this.btnSearch = new DevComponents.DotNetBar.PanelEx(); - this.label18 = new System.Windows.Forms.Label(); - this.cmbHasReturn = new System.Windows.Forms.ComboBox(); this.chkPullAfterPush = new TemuKJD.UserComponent.UcCheckBox(this.components); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.btnGetAllCate = new DevComponents.DotNetBar.PanelEx(); - this.cmbSpProdType = new System.Windows.Forms.ComboBox(); this.pnlEditExtCodePrice = new System.Windows.Forms.Panel(); this.lblExtCode = new System.Windows.Forms.Label(); this.panel2 = new System.Windows.Forms.Panel(); @@ -132,7 +133,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.lblExtCodePrice = new System.Windows.Forms.Label(); this.pbLoading = new System.Windows.Forms.PictureBox(); this.btnSelect = new DevComponents.DotNetBar.PanelEx(); - this.label11 = new System.Windows.Forms.Label(); this.dgvDbProduct = new TemuKJD.UserComponent.DataGridViewEx(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.col_db_id = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -178,6 +178,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.tabPage1.SuspendLayout(); this.tabPage3.SuspendLayout(); this.tabPage2.SuspendLayout(); + this.flowLayoutPanel1.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit(); this.splitContainer2.Panel1.SuspendLayout(); @@ -224,11 +225,11 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.ucTabControlMetro1.Controls.Add(this.tabPage1); this.ucTabControlMetro1.Controls.Add(this.tabPage3); this.ucTabControlMetro1.Controls.Add(this.tabPage2); - this.ucTabControlMetro1.Location = new System.Drawing.Point(986, 3); + this.ucTabControlMetro1.Location = new System.Drawing.Point(1021, 3); this.ucTabControlMetro1.Name = "ucTabControlMetro1"; this.ucTabControlMetro1.SelectedIndex = 0; this.ucTabControlMetro1.ShowCloseButton = false; - this.ucTabControlMetro1.Size = new System.Drawing.Size(450, 105); + this.ucTabControlMetro1.Size = new System.Drawing.Size(415, 105); this.ucTabControlMetro1.TabIndex = 1007; this.ucTabControlMetro1.TabSelectColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.ucTabControlMetro1.TabSelectTextColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -246,7 +247,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.tabPage1.Location = new System.Drawing.Point(4, 26); this.tabPage1.Name = "tabPage1"; this.tabPage1.Padding = new System.Windows.Forms.Padding(3); - this.tabPage1.Size = new System.Drawing.Size(442, 75); + this.tabPage1.Size = new System.Drawing.Size(407, 75); this.tabPage1.TabIndex = 0; this.tabPage1.Text = "数据操作"; this.tabPage1.UseVisualStyleBackColor = true; @@ -258,9 +259,9 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.btnExportIdImg.Cursor = System.Windows.Forms.Cursors.Hand; this.btnExportIdImg.DisabledBackColor = System.Drawing.Color.Empty; this.btnExportIdImg.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnExportIdImg.Location = new System.Drawing.Point(16, 11); + this.btnExportIdImg.Location = new System.Drawing.Point(12, 11); this.btnExportIdImg.Name = "btnExportIdImg"; - this.btnExportIdImg.Size = new System.Drawing.Size(96, 25); + this.btnExportIdImg.Size = new System.Drawing.Size(88, 25); this.btnExportIdImg.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnExportIdImg.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnExportIdImg.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -283,7 +284,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.btnSetGroup.Cursor = System.Windows.Forms.Cursors.Hand; this.btnSetGroup.DisabledBackColor = System.Drawing.Color.Empty; this.btnSetGroup.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSetGroup.Location = new System.Drawing.Point(218, 11); + this.btnSetGroup.Location = new System.Drawing.Point(213, 11); this.btnSetGroup.Name = "btnSetGroup"; this.btnSetGroup.Size = new System.Drawing.Size(84, 25); this.btnSetGroup.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -308,7 +309,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.btnDelSelect.Cursor = System.Windows.Forms.Cursors.Hand; this.btnDelSelect.DisabledBackColor = System.Drawing.Color.Empty; this.btnDelSelect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnDelSelect.Location = new System.Drawing.Point(338, 11); + this.btnDelSelect.Location = new System.Drawing.Point(312, 11); this.btnDelSelect.Name = "btnDelSelect"; this.btnDelSelect.Size = new System.Drawing.Size(84, 25); this.btnDelSelect.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -330,9 +331,9 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.cmbGroup.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.cmbGroup.FormattingEnabled = true; - this.cmbGroup.Location = new System.Drawing.Point(131, 11); + this.cmbGroup.Location = new System.Drawing.Point(119, 11); this.cmbGroup.Name = "cmbGroup"; - this.cmbGroup.Size = new System.Drawing.Size(85, 25); + this.cmbGroup.Size = new System.Drawing.Size(92, 25); this.cmbGroup.TabIndex = 640; // // btnImport @@ -342,7 +343,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.btnImport.Cursor = System.Windows.Forms.Cursors.Hand; this.btnImport.DisabledBackColor = System.Drawing.Color.Empty; this.btnImport.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnImport.Location = new System.Drawing.Point(338, 39); + this.btnImport.Location = new System.Drawing.Point(312, 39); this.btnImport.Name = "btnImport"; this.btnImport.Size = new System.Drawing.Size(84, 25); this.btnImport.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -369,10 +370,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms "安全商品", "违规商品", "未校验"}); - this.cmbSetWxSafe.Location = new System.Drawing.Point(131, 39); + this.cmbSetWxSafe.Location = new System.Drawing.Point(119, 39); this.cmbSetWxSafe.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbSetWxSafe.Name = "cmbSetWxSafe"; - this.cmbSetWxSafe.Size = new System.Drawing.Size(85, 25); + this.cmbSetWxSafe.Size = new System.Drawing.Size(92, 25); this.cmbSetWxSafe.TabIndex = 758; // // btnSetWxSafe @@ -382,7 +383,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.btnSetWxSafe.Cursor = System.Windows.Forms.Cursors.Hand; this.btnSetWxSafe.DisabledBackColor = System.Drawing.Color.Empty; this.btnSetWxSafe.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSetWxSafe.Location = new System.Drawing.Point(218, 39); + this.btnSetWxSafe.Location = new System.Drawing.Point(213, 39); this.btnSetWxSafe.Name = "btnSetWxSafe"; this.btnSetWxSafe.Size = new System.Drawing.Size(84, 25); this.btnSetWxSafe.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -413,19 +414,18 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.tabPage3.Controls.Add(this.btnExportTxt); this.tabPage3.Location = new System.Drawing.Point(4, 26); this.tabPage3.Name = "tabPage3"; - this.tabPage3.Size = new System.Drawing.Size(442, 75); + this.tabPage3.Size = new System.Drawing.Size(407, 75); this.tabPage3.TabIndex = 2; this.tabPage3.Text = "商品导出"; // // chkHighestPriceSku // this.chkHighestPriceSku.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.chkHighestPriceSku.AutoSize = true; this.chkHighestPriceSku.Checked = true; this.chkHighestPriceSku.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkHighestPriceSku.Location = new System.Drawing.Point(319, 46); + this.chkHighestPriceSku.Location = new System.Drawing.Point(291, 46); this.chkHighestPriceSku.Name = "chkHighestPriceSku"; - this.chkHighestPriceSku.Size = new System.Drawing.Size(119, 21); + this.chkHighestPriceSku.Size = new System.Drawing.Size(113, 21); this.chkHighestPriceSku.TabIndex = 728; this.chkHighestPriceSku.Text = "只保留最高价sku"; this.chkHighestPriceSku.UseVisualStyleBackColor = true; @@ -433,20 +433,20 @@ namespace TemuKJD.PDDForms.ProductSelectForms // txtMinPrice // this.txtMinPrice.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.txtMinPrice.Location = new System.Drawing.Point(103, 44); + this.txtMinPrice.Location = new System.Drawing.Point(99, 44); this.txtMinPrice.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.txtMinPrice.Name = "txtMinPrice"; - this.txtMinPrice.Size = new System.Drawing.Size(33, 23); + this.txtMinPrice.Size = new System.Drawing.Size(25, 23); this.txtMinPrice.TabIndex = 707; this.txtMinPrice.Text = "10"; // // txtReplaceText // this.txtReplaceText.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.txtReplaceText.Location = new System.Drawing.Point(103, 12); + this.txtReplaceText.Location = new System.Drawing.Point(99, 12); this.txtReplaceText.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.txtReplaceText.Name = "txtReplaceText"; - this.txtReplaceText.Size = new System.Drawing.Size(253, 23); + this.txtReplaceText.Size = new System.Drawing.Size(228, 23); this.txtReplaceText.TabIndex = 689; this.txtReplaceText.TextChanged += new System.EventHandler(this.txtReplaceText_TextChanged); // @@ -454,7 +454,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.label7.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(6, 15); + this.label7.Location = new System.Drawing.Point(2, 15); this.label7.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(104, 17); @@ -465,7 +465,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.label8.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(6, 47); + this.label8.Location = new System.Drawing.Point(2, 47); this.label8.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(104, 17); @@ -478,7 +478,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.chkSameSpecPrice.AutoSize = true; this.chkSameSpecPrice.Checked = true; this.chkSameSpecPrice.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkSameSpecPrice.Location = new System.Drawing.Point(219, 46); + this.chkSameSpecPrice.Location = new System.Drawing.Point(199, 46); this.chkSameSpecPrice.Name = "chkSameSpecPrice"; this.chkSameSpecPrice.Size = new System.Drawing.Size(99, 21); this.chkSameSpecPrice.TabIndex = 718; @@ -489,7 +489,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.label9.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(136, 47); + this.label9.Location = new System.Drawing.Point(123, 47); this.label9.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(76, 17); @@ -503,7 +503,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.btnExportTxt.Cursor = System.Windows.Forms.Cursors.Hand; this.btnExportTxt.DisabledBackColor = System.Drawing.Color.Empty; this.btnExportTxt.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnExportTxt.Location = new System.Drawing.Point(362, 11); + this.btnExportTxt.Location = new System.Drawing.Point(333, 11); this.btnExportTxt.Name = "btnExportTxt"; this.btnExportTxt.Size = new System.Drawing.Size(67, 25); this.btnExportTxt.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -530,17 +530,46 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.tabPage2.Location = new System.Drawing.Point(4, 26); this.tabPage2.Name = "tabPage2"; this.tabPage2.Padding = new System.Windows.Forms.Padding(3); - this.tabPage2.Size = new System.Drawing.Size(442, 75); + this.tabPage2.Size = new System.Drawing.Size(407, 75); this.tabPage2.TabIndex = 1; this.tabPage2.Text = "数据修复 3.15前"; // // flowLayoutPanel1 // - this.flowLayoutPanel1.Location = new System.Drawing.Point(113, 6); + this.flowLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.flowLayoutPanel1.Controls.Add(this.label18); + this.flowLayoutPanel1.Controls.Add(this.cmbHasReturn); + this.flowLayoutPanel1.Location = new System.Drawing.Point(171, 6); this.flowLayoutPanel1.Name = "flowLayoutPanel1"; - this.flowLayoutPanel1.Size = new System.Drawing.Size(325, 29); + this.flowLayoutPanel1.Size = new System.Drawing.Size(229, 29); this.flowLayoutPanel1.TabIndex = 989; // + // label18 + // + this.label18.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.label18.AutoSize = true; + this.label18.Location = new System.Drawing.Point(3, 9); + this.label18.Margin = new System.Windows.Forms.Padding(3, 5, 0, 0); + this.label18.Name = "label18"; + this.label18.Size = new System.Drawing.Size(68, 17); + this.label18.TabIndex = 803; + this.label18.Text = "数据修复："; + // + // cmbHasReturn + // + this.cmbHasReturn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.cmbHasReturn.FormattingEnabled = true; + this.cmbHasReturn.Items.AddRange(new object[] { + "", + "是", + "否", + "修复回传未拉回"}); + this.cmbHasReturn.Location = new System.Drawing.Point(71, 3); + this.cmbHasReturn.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); + this.cmbHasReturn.Name = "cmbHasReturn"; + this.cmbHasReturn.Size = new System.Drawing.Size(155, 25); + this.cmbHasReturn.TabIndex = 804; + // // btnUpdateReturnServerData // this.btnUpdateReturnServerData.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -548,7 +577,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.btnUpdateReturnServerData.Cursor = System.Windows.Forms.Cursors.Hand; this.btnUpdateReturnServerData.DisabledBackColor = System.Drawing.Color.Empty; this.btnUpdateReturnServerData.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnUpdateReturnServerData.Location = new System.Drawing.Point(319, 41); + this.btnUpdateReturnServerData.Location = new System.Drawing.Point(287, 41); this.btnUpdateReturnServerData.Name = "btnUpdateReturnServerData"; this.btnUpdateReturnServerData.Size = new System.Drawing.Size(110, 25); this.btnUpdateReturnServerData.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -573,7 +602,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.btnReturnSecretData.Cursor = System.Windows.Forms.Cursors.Hand; this.btnReturnSecretData.DisabledBackColor = System.Drawing.Color.Empty; this.btnReturnSecretData.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnReturnSecretData.Location = new System.Drawing.Point(203, 41); + this.btnReturnSecretData.Location = new System.Drawing.Point(171, 41); this.btnReturnSecretData.Name = "btnReturnSecretData"; this.btnReturnSecretData.Size = new System.Drawing.Size(110, 25); this.btnReturnSecretData.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -597,7 +626,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.btnStopStop.CanvasColor = System.Drawing.SystemColors.Control; this.btnStopStop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnStopStop.DisabledBackColor = System.Drawing.Color.Empty; - this.btnStopStop.Location = new System.Drawing.Point(874, 81); + this.btnStopStop.Location = new System.Drawing.Point(913, 81); this.btnStopStop.Name = "btnStopStop"; this.btnStopStop.Size = new System.Drawing.Size(90, 25); this.btnStopStop.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -623,7 +652,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.btnPull.Cursor = System.Windows.Forms.Cursors.Hand; this.btnPull.DisabledBackColor = System.Drawing.Color.Empty; this.btnPull.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnPull.Location = new System.Drawing.Point(932, 33); + this.btnPull.Location = new System.Drawing.Point(971, 33); this.btnPull.Name = "btnPull"; this.btnPull.Size = new System.Drawing.Size(32, 25); this.btnPull.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -648,7 +677,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.btnPushToOutServer.Cursor = System.Windows.Forms.Cursors.Hand; this.btnPushToOutServer.DisabledBackColor = System.Drawing.Color.Empty; this.btnPushToOutServer.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnPushToOutServer.Location = new System.Drawing.Point(874, 33); + this.btnPushToOutServer.Location = new System.Drawing.Point(913, 33); this.btnPushToOutServer.Name = "btnPushToOutServer"; this.btnPushToOutServer.Size = new System.Drawing.Size(56, 25); this.btnPushToOutServer.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -673,7 +702,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.btnGetProdWxCate.Cursor = System.Windows.Forms.Cursors.Hand; this.btnGetProdWxCate.DisabledBackColor = System.Drawing.Color.Empty; this.btnGetProdWxCate.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnGetProdWxCate.Location = new System.Drawing.Point(874, 5); + this.btnGetProdWxCate.Location = new System.Drawing.Point(913, 5); this.btnGetProdWxCate.Name = "btnGetProdWxCate"; this.btnGetProdWxCate.Size = new System.Drawing.Size(90, 25); this.btnGetProdWxCate.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -720,6 +749,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.tableLayoutPanel1.Controls.Add(this.cmbCat2, 5, 2); this.tableLayoutPanel1.Controls.Add(this.label16, 0, 1); this.tableLayoutPanel1.Controls.Add(this.label1, 0, 2); + this.tableLayoutPanel1.Controls.Add(this.cmbSpProdType, 13, 1); this.tableLayoutPanel1.Controls.Add(this.txtSecretStyleCode, 5, 0); this.tableLayoutPanel1.Controls.Add(this.label14, 4, 2); this.tableLayoutPanel1.Controls.Add(this.label15, 4, 0); @@ -727,6 +757,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.tableLayoutPanel1.Controls.Add(this.cmbSourceType, 5, 1); this.tableLayoutPanel1.Controls.Add(this.label10, 4, 1); this.tableLayoutPanel1.Controls.Add(this.label5, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.label11, 12, 1); this.tableLayoutPanel1.Controls.Add(this.txtSPU, 1, 0); this.tableLayoutPanel1.Controls.Add(this.cmbWxCat, 11, 0); this.tableLayoutPanel1.Controls.Add(this.txtSKC, 1, 1); @@ -752,8 +783,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.tableLayoutPanel1.Controls.Add(this.txtRealCoid, 1, 2); this.tableLayoutPanel1.Controls.Add(this.btnEmpty, 14, 1); this.tableLayoutPanel1.Controls.Add(this.btnSearch, 14, 0); - this.tableLayoutPanel1.Controls.Add(this.label18, 12, 1); - this.tableLayoutPanel1.Controls.Add(this.cmbHasReturn, 13, 1); this.tableLayoutPanel1.Location = new System.Drawing.Point(4, 4); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.RowCount = 3; @@ -761,7 +790,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33445F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33112F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(849, 105); + this.tableLayoutPanel1.Size = new System.Drawing.Size(885, 105); this.tableLayoutPanel1.TabIndex = 679; // // cmbPddRelation @@ -772,17 +801,17 @@ namespace TemuKJD.PDDForms.ProductSelectForms "", "是", "否"}); - this.cmbPddRelation.Location = new System.Drawing.Point(743, 7); + this.cmbPddRelation.Location = new System.Drawing.Point(777, 7); 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); + this.cmbPddRelation.Size = new System.Drawing.Size(52, 25); this.cmbPddRelation.TabIndex = 805; // // label19 // this.label19.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(675, 9); + this.label19.Location = new System.Drawing.Point(709, 9); this.label19.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label19.Name = "label19"; this.label19.Size = new System.Drawing.Size(68, 17); @@ -795,10 +824,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.tableLayoutPanel1.SetColumnSpan(this.dtpEnd, 2); this.dtpEnd.CustomFormat = "yyyy-MM-dd HH:mm"; this.dtpEnd.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - this.dtpEnd.Location = new System.Drawing.Point(622, 76); + this.dtpEnd.Location = new System.Drawing.Point(651, 76); this.dtpEnd.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.dtpEnd.Name = "dtpEnd"; - this.dtpEnd.Size = new System.Drawing.Size(118, 23); + this.dtpEnd.Size = new System.Drawing.Size(123, 23); this.dtpEnd.TabIndex = 979; // // dtpStart @@ -807,16 +836,16 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.tableLayoutPanel1.SetColumnSpan(this.dtpStart, 2); this.dtpStart.CustomFormat = "yyyy-MM-dd HH:mm"; this.dtpStart.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - this.dtpStart.Location = new System.Drawing.Point(501, 76); + this.dtpStart.Location = new System.Drawing.Point(525, 76); this.dtpStart.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.dtpStart.Name = "dtpStart"; - this.dtpStart.Size = new System.Drawing.Size(118, 23); + this.dtpStart.Size = new System.Drawing.Size(123, 23); this.dtpStart.TabIndex = 978; // // ucCheckBox1 // this.ucCheckBox1.Anchor = System.Windows.Forms.AnchorStyles.None; - this.ucCheckBox1.Location = new System.Drawing.Point(433, 77); + this.ucCheckBox1.Location = new System.Drawing.Point(457, 77); this.ucCheckBox1.Name = "ucCheckBox1"; this.ucCheckBox1.Size = new System.Drawing.Size(65, 21); this.ucCheckBox1.TabIndex = 977; @@ -827,10 +856,10 @@ 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(290, 75); 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); + this.cmbCat2.Size = new System.Drawing.Size(52, 25); this.cmbCat2.TabIndex = 804; this.cmbCat2.SelectedIndexChanged += new System.EventHandler(this.cmbCateFilter2_SelectedIndexChanged); // @@ -856,20 +885,34 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.label1.TabIndex = 813; this.label1.Text = "真实coid："; // + // cmbSpProdType + // + this.cmbSpProdType.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.cmbSpProdType.FormattingEnabled = true; + this.cmbSpProdType.Items.AddRange(new object[] { + "", + "普通商品", + "爆款数据"}); + this.cmbSpProdType.Location = new System.Drawing.Point(777, 42); + this.cmbSpProdType.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); + this.cmbSpProdType.Name = "cmbSpProdType"; + this.cmbSpProdType.Size = new System.Drawing.Size(52, 25); + this.cmbSpProdType.TabIndex = 677; + // // txtSecretStyleCode // this.txtSecretStyleCode.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtSecretStyleCode.Location = new System.Drawing.Point(278, 6); + this.txtSecretStyleCode.Location = new System.Drawing.Point(290, 6); this.txtSecretStyleCode.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.txtSecretStyleCode.Name = "txtSecretStyleCode"; - this.txtSecretStyleCode.Size = new System.Drawing.Size(46, 23); + this.txtSecretStyleCode.Size = new System.Drawing.Size(52, 23); this.txtSecretStyleCode.TabIndex = 812; // // label14 // this.label14.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label14.AutoSize = true; - this.label14.Location = new System.Drawing.Point(227, 79); + this.label14.Location = new System.Drawing.Point(239, 79); this.label14.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label14.Name = "label14"; this.label14.Size = new System.Drawing.Size(51, 17); @@ -880,7 +923,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.label15.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(234, 9); + this.label15.Location = new System.Drawing.Point(246, 9); this.label15.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(44, 17); @@ -891,7 +934,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.label13.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(554, 44); + this.label13.Location = new System.Drawing.Point(583, 44); this.label13.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label13.Name = "label13"; this.label13.Size = new System.Drawing.Size(68, 17); @@ -912,10 +955,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms "机会商品", "以图搜品", "外部数据"}); - this.cmbSourceType.Location = new System.Drawing.Point(278, 40); + this.cmbSourceType.Location = new System.Drawing.Point(290, 40); 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); + this.cmbSourceType.Size = new System.Drawing.Size(52, 25); this.cmbSourceType.TabIndex = 654; this.cmbSourceType.SelectedIndexChanged += new System.EventHandler(this.cmbSourceType_SelectedIndexChanged); // @@ -923,7 +966,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.label10.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(234, 44); + this.label10.Location = new System.Drawing.Point(246, 44); this.label10.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label10.Name = "label10"; this.label10.Size = new System.Drawing.Size(44, 17); @@ -941,13 +984,24 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.label5.TabIndex = 435; this.label5.Text = "商品ID："; // + // label11 + // + this.label11.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.label11.AutoSize = true; + this.label11.Location = new System.Drawing.Point(709, 44); + this.label11.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); + this.label11.Name = "label11"; + this.label11.Size = new System.Drawing.Size(68, 17); + this.label11.TabIndex = 651; + this.label11.Text = "商品类型："; + // // txtSPU // this.txtSPU.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.txtSPU.Location = new System.Drawing.Point(72, 6); this.txtSPU.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.txtSPU.Name = "txtSPU"; - this.txtSPU.Size = new System.Drawing.Size(46, 23); + this.txtSPU.Size = new System.Drawing.Size(52, 23); this.txtSPU.TabIndex = 434; // // cmbWxCat @@ -958,10 +1012,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms "", "是", "否"}); - this.cmbWxCat.Location = new System.Drawing.Point(622, 5); + this.cmbWxCat.Location = new System.Drawing.Point(651, 5); 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); + this.cmbWxCat.Size = new System.Drawing.Size(52, 25); this.cmbWxCat.TabIndex = 802; // // txtSKC @@ -970,7 +1024,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.txtSKC.Location = new System.Drawing.Point(72, 41); this.txtSKC.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.txtSKC.Name = "txtSKC"; - this.txtSKC.Size = new System.Drawing.Size(46, 23); + this.txtSKC.Size = new System.Drawing.Size(52, 23); this.txtSKC.TabIndex = 432; // // cmbSort @@ -980,10 +1034,10 @@ 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(399, 40); 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); + this.cmbSort.Size = new System.Drawing.Size(52, 25); this.cmbSort.TabIndex = 448; this.cmbSort.Text = "入库时间"; // @@ -991,7 +1045,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.label6.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(337, 44); + this.label6.Location = new System.Drawing.Point(355, 44); this.label6.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(44, 17); @@ -1002,7 +1056,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.label4.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(337, 9); + this.label4.Location = new System.Drawing.Point(355, 9); this.label4.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(44, 17); @@ -1013,7 +1067,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.chkWXComplateProd.Anchor = System.Windows.Forms.AnchorStyles.Left; this.tableLayoutPanel1.SetColumnSpan(this.chkWXComplateProd, 2); - this.chkWXComplateProd.Location = new System.Drawing.Point(749, 77); + this.chkWXComplateProd.Location = new System.Drawing.Point(783, 77); this.chkWXComplateProd.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3); this.chkWXComplateProd.Name = "chkWXComplateProd"; this.chkWXComplateProd.Size = new System.Drawing.Size(87, 21); @@ -1025,7 +1079,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.label12.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(554, 9); + this.label12.Location = new System.Drawing.Point(583, 9); this.label12.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label12.Name = "label12"; this.label12.Size = new System.Drawing.Size(68, 17); @@ -1035,17 +1089,17 @@ namespace TemuKJD.PDDForms.ProductSelectForms // txtExtCode // this.txtExtCode.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtExtCode.Location = new System.Drawing.Point(381, 6); + this.txtExtCode.Location = new System.Drawing.Point(399, 6); this.txtExtCode.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.txtExtCode.Name = "txtExtCode"; - this.txtExtCode.Size = new System.Drawing.Size(46, 23); + this.txtExtCode.Size = new System.Drawing.Size(52, 23); this.txtExtCode.TabIndex = 429; // // lblGroup // this.lblGroup.Anchor = System.Windows.Forms.AnchorStyles.Right; this.lblGroup.AutoSize = true; - this.lblGroup.Location = new System.Drawing.Point(131, 44); + this.lblGroup.Location = new System.Drawing.Point(137, 44); this.lblGroup.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.lblGroup.Name = "lblGroup"; this.lblGroup.Size = new System.Drawing.Size(44, 17); @@ -1056,10 +1110,10 @@ 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(181, 40); 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); + this.cmbGroupFilter.Size = new System.Drawing.Size(52, 25); this.cmbGroupFilter.TabIndex = 653; // // cmbExportToOutServer @@ -1071,17 +1125,17 @@ namespace TemuKJD.PDDForms.ProductSelectForms "是", "否", "导出未拉回"}); - this.cmbExportToOutServer.Location = new System.Drawing.Point(622, 40); + this.cmbExportToOutServer.Location = new System.Drawing.Point(651, 40); 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); + this.cmbExportToOutServer.Size = new System.Drawing.Size(52, 25); this.cmbExportToOutServer.TabIndex = 803; // // label3 // this.label3.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(433, 9); + this.label3.Location = new System.Drawing.Point(457, 9); this.label3.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(68, 17); @@ -1091,10 +1145,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms // txtProdName // this.txtProdName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtProdName.Location = new System.Drawing.Point(501, 6); + this.txtProdName.Location = new System.Drawing.Point(525, 6); this.txtProdName.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.txtProdName.Name = "txtProdName"; - this.txtProdName.Size = new System.Drawing.Size(47, 23); + this.txtProdName.Size = new System.Drawing.Size(52, 23); this.txtProdName.TabIndex = 427; // // cmbWxSafe @@ -1107,10 +1161,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms "安全商品", "违规商品", "未校验"}); - this.cmbWxSafe.Location = new System.Drawing.Point(501, 40); + this.cmbWxSafe.Location = new System.Drawing.Point(525, 40); 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); + this.cmbWxSafe.Size = new System.Drawing.Size(52, 25); this.cmbWxSafe.TabIndex = 676; this.cmbWxSafe.Text = "安全+未校验"; // @@ -1118,7 +1172,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.lblWxSafe.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lblWxSafe.AutoSize = true; - this.lblWxSafe.Location = new System.Drawing.Point(433, 44); + this.lblWxSafe.Location = new System.Drawing.Point(457, 44); this.lblWxSafe.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.lblWxSafe.Name = "lblWxSafe"; this.lblWxSafe.Size = new System.Drawing.Size(68, 17); @@ -1129,7 +1183,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.lblNotes.Anchor = System.Windows.Forms.AnchorStyles.Right; this.lblNotes.AutoSize = true; - this.lblNotes.Location = new System.Drawing.Point(131, 9); + this.lblNotes.Location = new System.Drawing.Point(137, 9); this.lblNotes.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.lblNotes.Name = "lblNotes"; this.lblNotes.Size = new System.Drawing.Size(44, 17); @@ -1139,20 +1193,20 @@ namespace TemuKJD.PDDForms.ProductSelectForms // txtNotes // this.txtNotes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtNotes.Location = new System.Drawing.Point(175, 6); + this.txtNotes.Location = new System.Drawing.Point(181, 6); this.txtNotes.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.txtNotes.Name = "txtNotes"; - this.txtNotes.Size = new System.Drawing.Size(46, 23); + this.txtNotes.Size = new System.Drawing.Size(52, 23); this.txtNotes.TabIndex = 439; // // cmbCat1 // 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(181, 75); 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); + this.cmbCat1.Size = new System.Drawing.Size(52, 25); this.cmbCat1.TabIndex = 805; this.cmbCat1.SelectedIndexChanged += new System.EventHandler(this.cmbCateFilter1_SelectedIndexChanged); // @@ -1160,7 +1214,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.label2.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(124, 79); + this.label2.Location = new System.Drawing.Point(130, 79); this.label2.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(51, 17); @@ -1171,10 +1225,10 @@ 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(399, 75); 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); + this.cmbCat3.Size = new System.Drawing.Size(52, 25); this.cmbCat3.TabIndex = 811; this.cmbCat3.SelectedIndexChanged += new System.EventHandler(this.cmbCateFilter3_SelectedIndexChanged); // @@ -1182,7 +1236,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.label17.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label17.AutoSize = true; - this.label17.Location = new System.Drawing.Point(330, 79); + this.label17.Location = new System.Drawing.Point(348, 79); this.label17.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label17.Name = "label17"; this.label17.Size = new System.Drawing.Size(51, 17); @@ -1195,7 +1249,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.txtRealCoid.Location = new System.Drawing.Point(72, 76); this.txtRealCoid.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.txtRealCoid.Name = "txtRealCoid"; - this.txtRealCoid.Size = new System.Drawing.Size(46, 23); + this.txtRealCoid.Size = new System.Drawing.Size(52, 23); this.txtRealCoid.TabIndex = 814; // // btnEmpty @@ -1204,7 +1258,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.btnEmpty.CanvasColor = System.Drawing.SystemColors.Control; this.btnEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnEmpty.DisabledBackColor = System.Drawing.Color.Empty; - this.btnEmpty.Location = new System.Drawing.Point(796, 40); + this.btnEmpty.Location = new System.Drawing.Point(835, 40); this.btnEmpty.Name = "btnEmpty"; this.btnEmpty.Size = new System.Drawing.Size(46, 25); this.btnEmpty.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -1230,7 +1284,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.btnSearch.Cursor = System.Windows.Forms.Cursors.Hand; this.btnSearch.DisabledBackColor = System.Drawing.Color.Empty; this.btnSearch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSearch.Location = new System.Drawing.Point(796, 5); + this.btnSearch.Location = new System.Drawing.Point(835, 5); this.btnSearch.Name = "btnSearch"; this.btnSearch.Size = new System.Drawing.Size(46, 25); this.btnSearch.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -1248,39 +1302,13 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.btnSearch.Text = "搜索"; this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click); // - // label18 - // - this.label18.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.label18.AutoSize = true; - this.label18.Location = new System.Drawing.Point(675, 44); - this.label18.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); - this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(68, 17); - this.label18.TabIndex = 803; - this.label18.Text = "数据修复："; - // - // cmbHasReturn - // - this.cmbHasReturn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.cmbHasReturn.FormattingEnabled = true; - this.cmbHasReturn.Items.AddRange(new object[] { - "", - "是", - "否", - "修复回传未拉回"}); - this.cmbHasReturn.Location = new System.Drawing.Point(743, 40); - 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); - this.cmbHasReturn.TabIndex = 804; - // // chkPullAfterPush // this.chkPullAfterPush.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.chkPullAfterPush.AutoSize = true; this.chkPullAfterPush.Checked = true; this.chkPullAfterPush.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkPullAfterPush.Location = new System.Drawing.Point(875, 59); + this.chkPullAfterPush.Location = new System.Drawing.Point(914, 59); this.chkPullAfterPush.Name = "chkPullAfterPush"; this.chkPullAfterPush.Size = new System.Drawing.Size(99, 21); this.chkPullAfterPush.TabIndex = 874; @@ -1299,11 +1327,9 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.splitContainer2.Panel1.Controls.Add(this.panelEx1); this.splitContainer2.Panel1.Controls.Add(this.btnGetAllCate); - this.splitContainer2.Panel1.Controls.Add(this.cmbSpProdType); this.splitContainer2.Panel1.Controls.Add(this.pnlEditExtCodePrice); this.splitContainer2.Panel1.Controls.Add(this.pbLoading); this.splitContainer2.Panel1.Controls.Add(this.btnSelect); - this.splitContainer2.Panel1.Controls.Add(this.label11); this.splitContainer2.Panel1.Controls.Add(this.dgvDbProduct); this.splitContainer2.Panel1.Padding = new System.Windows.Forms.Padding(4, 0, 4, 0); // @@ -1365,21 +1391,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.btnGetAllCate.Visible = false; this.btnGetAllCate.Click += new System.EventHandler(this.btnGetAllCate_Click); // - // cmbSpProdType - // - this.cmbSpProdType.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.cmbSpProdType.FormattingEnabled = true; - this.cmbSpProdType.Items.AddRange(new object[] { - "", - "普通商品", - "书籍"}); - this.cmbSpProdType.Location = new System.Drawing.Point(82, 75); - this.cmbSpProdType.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); - this.cmbSpProdType.Name = "cmbSpProdType"; - this.cmbSpProdType.Size = new System.Drawing.Size(37, 25); - this.cmbSpProdType.TabIndex = 677; - this.cmbSpProdType.Visible = false; - // // pnlEditExtCodePrice // this.pnlEditExtCodePrice.Anchor = System.Windows.Forms.AnchorStyles.None; @@ -1513,18 +1524,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.btnSelect.Text = "认领选中商品"; this.btnSelect.Click += new System.EventHandler(this.btnSelect_Click); // - // label11 - // - this.label11.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(14, 79); - this.label11.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); - this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(68, 17); - this.label11.TabIndex = 651; - this.label11.Text = "商品类型："; - this.label11.Visible = false; - // // dgvDbProduct // this.dgvDbProduct.AllowUserToAddRows = false; @@ -1924,10 +1923,11 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.tabPage3.ResumeLayout(false); this.tabPage3.PerformLayout(); this.tabPage2.ResumeLayout(false); + this.flowLayoutPanel1.ResumeLayout(false); + this.flowLayoutPanel1.PerformLayout(); this.tableLayoutPanel1.ResumeLayout(false); this.tableLayoutPanel1.PerformLayout(); this.splitContainer2.Panel1.ResumeLayout(false); - this.splitContainer2.Panel1.PerformLayout(); this.splitContainer2.Panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit(); this.splitContainer2.ResumeLayout(false); diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs index 6f52d1e..0af918d 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs @@ -330,7 +330,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms "&search_group=" + cmbGroupFilter.Text.Trim() + "&search_prod_name=" + GetHtml.UrlEncodeUtf8(txtProdName.Text.Trim()) + "&wx_safe_status=" + cmbWxSafe.Text.Trim().Replace("安全+未校验", "安全商品,未校验") + - "&special_prod_type=" + cmbSpProdType.Text.Trim(); + "&special_prod_type=" + (cmbSpProdType.Text.Trim().IsNullOrEmpty() ? "普通商品,书籍,爆款数据" : cmbSpProdType.Text.Trim()); if (ucCheckBox1.Checked) { diff --git a/TEMUKJD/WXForms/ProductForms/WXUserProdListForm.Designer.cs b/TEMUKJD/WXForms/ProductForms/WXUserProdListForm.Designer.cs index 8af1b54..5524ccb 100644 --- a/TEMUKJD/WXForms/ProductForms/WXUserProdListForm.Designer.cs +++ b/TEMUKJD/WXForms/ProductForms/WXUserProdListForm.Designer.cs @@ -420,7 +420,7 @@ namespace TemuKJD.WXForms.ProductForms this.cmbCat3.DropDownWidth = 1; this.cmbCat3.FormattingEnabled = true; this.cmbCat3.IntegralHeight = false; - this.cmbCat3.Location = new System.Drawing.Point(718, 7); + this.cmbCat3.Location = new System.Drawing.Point(718, 5); this.cmbCat3.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbCat3.Name = "cmbCat3"; this.cmbCat3.Size = new System.Drawing.Size(146, 25); @@ -448,7 +448,7 @@ namespace TemuKJD.WXForms.ProductForms this.cmbCat2.DropDownWidth = 1; this.cmbCat2.FormattingEnabled = true; this.cmbCat2.IntegralHeight = false; - this.cmbCat2.Location = new System.Drawing.Point(515, 7); + this.cmbCat2.Location = new System.Drawing.Point(515, 5); this.cmbCat2.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbCat2.Name = "cmbCat2"; this.cmbCat2.Size = new System.Drawing.Size(146, 25); @@ -476,7 +476,7 @@ namespace TemuKJD.WXForms.ProductForms this.cmbCat1.DropDownWidth = 1; this.cmbCat1.FormattingEnabled = true; this.cmbCat1.IntegralHeight = false; - this.cmbCat1.Location = new System.Drawing.Point(293, 5); + this.cmbCat1.Location = new System.Drawing.Point(293, 7); this.cmbCat1.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbCat1.Name = "cmbCat1"; this.cmbCat1.Size = new System.Drawing.Size(146, 25); @@ -536,7 +536,7 @@ namespace TemuKJD.WXForms.ProductForms "安全+未校验", "安全商品", "未校验"}); - this.cmbWxSafe.Location = new System.Drawing.Point(71, 40); + this.cmbWxSafe.Location = new System.Drawing.Point(71, 42); this.cmbWxSafe.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbWxSafe.Name = "cmbWxSafe"; this.cmbWxSafe.Size = new System.Drawing.Size(146, 25); @@ -559,7 +559,7 @@ namespace TemuKJD.WXForms.ProductForms // 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(938, 7); + this.cmbGroupFilter.Location = new System.Drawing.Point(938, 5); this.cmbGroupFilter.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbGroupFilter.Name = "cmbGroupFilter"; this.cmbGroupFilter.Size = new System.Drawing.Size(146, 25); @@ -580,7 +580,7 @@ namespace TemuKJD.WXForms.ProductForms "机会商品", "以图搜品", "外部数据"}); - this.cmbSourceType.Location = new System.Drawing.Point(718, 42); + this.cmbSourceType.Location = new System.Drawing.Point(718, 40); this.cmbSourceType.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbSourceType.Name = "cmbSourceType"; this.cmbSourceType.Size = new System.Drawing.Size(146, 25); @@ -610,7 +610,7 @@ namespace TemuKJD.WXForms.ProductForms "", "是", "否"}); - this.cmbRelation.Location = new System.Drawing.Point(938, 42); + this.cmbRelation.Location = new System.Drawing.Point(938, 40); this.cmbRelation.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbRelation.Name = "cmbRelation"; this.cmbRelation.Size = new System.Drawing.Size(146, 25); diff --git a/TEMUKJD/WXForms/ShopForms/WXShopListForm.Designer.cs b/TEMUKJD/WXForms/ShopForms/WXShopListForm.Designer.cs index 7ef4e6f..70b482d 100644 --- a/TEMUKJD/WXForms/ShopForms/WXShopListForm.Designer.cs +++ b/TEMUKJD/WXForms/ShopForms/WXShopListForm.Designer.cs @@ -289,7 +289,7 @@ this.cmbGroup.DropDownWidth = 1; this.cmbGroup.FormattingEnabled = true; this.cmbGroup.IntegralHeight = false; - this.cmbGroup.Location = new System.Drawing.Point(385, 5); + this.cmbGroup.Location = new System.Drawing.Point(385, 8); this.cmbGroup.Margin = new System.Windows.Forms.Padding(0, 0, 0, 4); this.cmbGroup.Name = "cmbGroup"; this.cmbGroup.Size = new System.Drawing.Size(74, 25); @@ -315,7 +315,7 @@ this.cmbNotes.DropDownWidth = 1; this.cmbNotes.FormattingEnabled = true; this.cmbNotes.IntegralHeight = false; - this.cmbNotes.Location = new System.Drawing.Point(276, 5); + this.cmbNotes.Location = new System.Drawing.Point(276, 8); this.cmbNotes.Margin = new System.Windows.Forms.Padding(0, 0, 0, 4); this.cmbNotes.Name = "cmbNotes"; this.cmbNotes.Size = new System.Drawing.Size(74, 25); @@ -448,7 +448,7 @@ this.cmbSubAccount.DropDownWidth = 1; this.cmbSubAccount.FormattingEnabled = true; this.cmbSubAccount.IntegralHeight = false; - this.cmbSubAccount.Location = new System.Drawing.Point(506, 5); + this.cmbSubAccount.Location = new System.Drawing.Point(506, 8); this.cmbSubAccount.Margin = new System.Windows.Forms.Padding(0, 0, 0, 4); this.cmbSubAccount.Name = "cmbSubAccount"; this.cmbSubAccount.Size = new System.Drawing.Size(74, 25);