diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs index b0cc175..d38fdb6 100644 --- a/AllBase/BaseClass.cs +++ b/AllBase/BaseClass.cs @@ -27,7 +27,7 @@ namespace AllBase /// /// 版本ID /// - public static int VersionCount = 811; + public static int VersionCount = 815; //public static int VersionCount = 613; /// diff --git a/AllBase/Helper/GlobalConfig.cs b/AllBase/Helper/GlobalConfig.cs index b469ae0..be6e543 100644 --- a/AllBase/Helper/GlobalConfig.cs +++ b/AllBase/Helper/GlobalConfig.cs @@ -22,6 +22,7 @@ namespace AllBase.Helper public static ConcurrentList WxTokenList { get; set; } = new ConcurrentList(); public static ConcurrentList WxCatList { get; set; } = new ConcurrentList(); + public static ConcurrentList WxCatBoundList { get; set; } = new ConcurrentList(); /// /// 店铺设置参数 /// diff --git a/AllBase/Model/Result/TemuDBProductSelect.cs b/AllBase/Model/Result/TemuDBProductSelect.cs index ba0c2b7..6fa752e 100644 --- a/AllBase/Model/Result/TemuDBProductSelect.cs +++ b/AllBase/Model/Result/TemuDBProductSelect.cs @@ -41,6 +41,7 @@ namespace AllBase.Model.Result public string cat_name { get; set; } public string change_cat_id { get; set; } public string change_cat_name { get; set; } + public string wx_cat_leaf { get; set; } public string ext_code { get; set; } public string product_name { get; set; } public string main_img { get; set; } diff --git a/AllBase/Model/Result/WXResult/WxCatInfo.cs b/AllBase/Model/Result/WXResult/WxCatInfo.cs index 5fa7d06..3b0e7f9 100644 --- a/AllBase/Model/Result/WXResult/WxCatInfo.cs +++ b/AllBase/Model/Result/WXResult/WxCatInfo.cs @@ -6,6 +6,20 @@ using System.Threading.Tasks; namespace AllBase.Model.Result.WXResult { + /// + /// 微信类目保证金 + /// + public class WxCatBoundInfo + { + public long? leaf_id { get; set; } // 547106 + public string leaf_name { get; set; } // 摩托车骑行鞋 + public string full_cat_name { get; set; } // 汽摩电动/摩托车及配件/摩托车装备/摩托车骑行鞋 + /// + /// 保证金，金额元 + /// + public int cat_bound { get; set; } // 2000 + } + public class WxCatInfo { public string cat_id { get; set; } // "545263", @@ -15,4 +29,22 @@ namespace AllBase.Model.Result.WXResult public bool leaf { get; set; } // true, public bool is_local_life { get; set; } // false } + + public class WxCatAndQuaInfo + { + public WxCatInfo cat { get; set; } + public List product_qua_list { get; set; } + public bool? is_confidence_require_bad_must_pay { get; set; } // false + } + + public class product_qua + { + public string qua_id { get; set; } // "1111491", + public bool? need_to_apply { get; set; } // true, + public string tips { get; set; } // "若为进口商品，需提供中华人民共和国海关进口货物报关单，展现对应品牌名称及商品名称", + public bool? mandatory { get; set; } // false, + public string name { get; set; } // "报关单", + public List cert_group_list { get; set; } // [] + + } } diff --git a/KJDService/KJD_WebService/BLL/BXX/BXXProductManage.cs b/KJDService/KJD_WebService/BLL/BXX/BXXProductManage.cs index a5d0da4..e0e678d 100644 --- a/KJDService/KJD_WebService/BLL/BXX/BXXProductManage.cs +++ b/KJDService/KJD_WebService/BLL/BXX/BXXProductManage.cs @@ -284,7 +284,7 @@ namespace KJD_Web.BLL.BXX if (!string.IsNullOrEmpty(product_get_type)) where += " and p.product_get_type ='" + product_get_type + "'"; if (!string.IsNullOrEmpty(wx_safe_status)) - where += " and p.wx_safe_status ='" + wx_safe_status + "'"; + where += " and p.wx_safe_status in ('" + wx_safe_status.Replace(",", "','") + "')"; if (!string.IsNullOrEmpty(special_prod_type)) where += " and p.special_prod_type ='" + special_prod_type + "'"; @@ -684,6 +684,9 @@ namespace KJD_Web.BLL.BXX var in_skc_ids = RegexUtils.GetStringQuery(ref inputData, "in_skc_ids")?.Replace("'", "\\'"); var in_groups = RegexUtils.GetStringQuery(ref inputData, "in_groups")?.Replace("'", "\\'"); var in_cates = RegexUtils.GetStringQuery(ref inputData, "in_cates")?.Replace("'", "\\'"); + var wx_cat_1 = RegexUtils.GetStringQuery(ref inputData, "wx_cat_1")?.Replace("'", "\\'"); + var wx_cat_2 = RegexUtils.GetStringQuery(ref inputData, "wx_cat_2")?.Replace("'", "\\'"); + var wx_cat_3 = RegexUtils.GetStringQuery(ref inputData, "wx_cat_3")?.Replace("'", "\\'"); var product_get_type = RegexUtils.GetStringQuery(ref inputData, "product_get_type")?.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("'", "\\'"); @@ -723,11 +726,23 @@ namespace KJD_Web.BLL.BXX in_cates = "'" + string.Join("','", in_cates.Split(new string[] { ",", "，", " " }, StringSplitOptions.RemoveEmptyEntries)) + "'"; where += " and (p.cat_name in (" + in_cates + ") or p.main_cat_name in (" + in_cates + "))"; } + if (!string.IsNullOrEmpty(wx_cat_1)) + { + where += " and p.wx_cat_1=" + wx_cat_1 + ""; + } + if (!string.IsNullOrEmpty(wx_cat_2)) + { + where += " and p.wx_cat_2=" + wx_cat_2 + ""; + } + if (!string.IsNullOrEmpty(wx_cat_3)) + { + where += " and p.wx_cat_3=" + wx_cat_3 + ""; + } if (!string.IsNullOrEmpty(product_get_type)) where += " and p.product_get_type ='" + product_get_type + "'"; if (!string.IsNullOrEmpty(wx_safe_status)) - where += " and p.wx_safe_status ='" + wx_safe_status + "'"; - if (!string.IsNullOrEmpty(special_prod_type)) + where += " and p.wx_safe_status in ('" + wx_safe_status.Replace(",", "','") + "')"; + if (!string.IsNullOrEmpty(special_prod_type)) // 图书，普通商品 where += " and p.special_prod_type ='" + special_prod_type + "'"; // 供应商货源是否已完成初始设置 if (!string.IsNullOrEmpty(is_supplier_prod_ok)) diff --git a/KJDService/KJD_WebService/BLL/KJD/ProductThirdManage.cs b/KJDService/KJD_WebService/BLL/KJD/ProductThirdManage.cs index 09dcdba..9c72c98 100644 --- a/KJDService/KJD_WebService/BLL/KJD/ProductThirdManage.cs +++ b/KJDService/KJD_WebService/BLL/KJD/ProductThirdManage.cs @@ -893,7 +893,8 @@ namespace KJD_Web.BLL string where = ""; if (!isAdmin) - where += " and (s.user_name='" + user_name + "' or s.sub_user_name like '%" + user_name + "%')"; + //where += " and (s.user_name='" + user_name + "' or s.sub_user_name like '%" + user_name + "%')"; + where += " and s.user_name='" + user_name + "'"; if (!string.IsNullOrEmpty(operate_sub_sa_name)) { where += " and s.operate_sub_sa_name = '" + operate_sub_sa_name + "'"; @@ -907,7 +908,7 @@ namespace KJD_Web.BLL if (!string.IsNullOrWhiteSpace(status)) where += " and s.status = '" + status + "'"; if (!string.IsNullOrWhiteSpace(search_shop_id)) - where += " and s.shop_id like '%" + search_shop_id + "%'"; + where += " and s.shop_id like '" + search_shop_id + "%'"; if (!string.IsNullOrWhiteSpace(search_shop_account)) where += " and s.shop_account like @search_shop_account"; if (!string.IsNullOrWhiteSpace(search_notes)) @@ -927,25 +928,25 @@ namespace KJD_Web.BLL if (!string.IsNullOrWhiteSpace(search_user_notes)) where += " and s.user_notes like '" + search_user_notes + "%'"; if (!string.IsNullOrWhiteSpace(search_spu)) - where += " and p.spu_id like '%" + search_spu + "%'"; + where += " and p.spu_id like '" + search_spu + "%'"; if (!string.IsNullOrWhiteSpace(search_skc)) - where += " and p.skc_id like '%" + search_skc + "%'"; + where += " and p.skc_id like '" + search_skc + "%'"; if (!string.IsNullOrWhiteSpace(search_cat)) - where += " and p.cat_name like '%" + search_cat + "%'"; + where += " and p.cat_name like '" + search_cat + "%'"; if (!string.IsNullOrWhiteSpace(search_ext_code)) - where += " and p.ext_code like '%" + search_ext_code + "%'"; + where += " and p.ext_code like '" + search_ext_code + "%'"; if (!string.IsNullOrWhiteSpace(search_prod_name)) where += " and p.product_name like @search_prod_name"; if (!string.IsNullOrEmpty(search_sub_sa_name)) { - where += " and (s.operate_sub_sa_name like '%" + search_sub_sa_name + "%'"; - where += " or u.nick_name like '%" + operate_sub_sa_name + "%')"; + where += " and (s.operate_sub_sa_name like '" + search_sub_sa_name + "%'"; + where += " or u.nick_name like '" + operate_sub_sa_name + "%')"; } sql += where; List paramLst = new List(); - paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "@search_shop_account", Value = "%" + search_shop_account + "%", }); + paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "@search_shop_account", Value = "" + search_shop_account + "%", }); paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "@search_prod_name", Value = "%" + search_prod_name + "%", }); var count = mySql.ExecuteRowCount(sql, paramLst.ToArray()); diff --git a/KJDService/KJD_WebService/BLL/WXXD/WXProductManage.cs b/KJDService/KJD_WebService/BLL/WXXD/WXProductManage.cs index 80d5f85..df92df7 100644 --- a/KJDService/KJD_WebService/BLL/WXXD/WXProductManage.cs +++ b/KJDService/KJD_WebService/BLL/WXXD/WXProductManage.cs @@ -252,7 +252,8 @@ namespace KJD_Web.BLL.WXXD string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; MysqlUtils mySql = new MysqlUtils(conn); - string sql = "SELECT DISTINCT p.cat_name FROM `bxx`.`product` p where p.is_del=0"; + //string sql = "SELECT DISTINCT p.cat_name FROM `bxx`.`product` p where p.is_del=0"; + string sql = "SELECT DISTINCT p.main_cat_name FROM `bxx`.`product` p where p.is_del=0"; string where = ""; sql += where; @@ -267,7 +268,7 @@ namespace KJD_Web.BLL.WXXD string group_data = ""; foreach (DataRow row in dt.Rows) { - group_data += row["cat_name"].ToString() + ","; + group_data += row["main_cat_name"].ToString() + ","; } var data = group_data.Trim(','); return "{\"code\":200,\"msg\":\"success\",\"data\":\"" + data + "\"}"; @@ -530,6 +531,137 @@ namespace KJD_Web.BLL.WXXD break; } var data = group_data.Trim(','); + if (data.IsNullOrEmpty()) + data = "\"\""; + return "{\"code\":200,\"msg\":\"success\",\"data\":" + data + "}"; + } + catch (Exception ex) + { + return "{\"code\":50002,\"msg\":\"" + ex.Message + "\",\"data\":\"\"}"; + } + } + else + { + return "{\"code\":50003,\"msg\":\"" + mySql.Message + "\",\"data\":\"\"}"; + } + } + return "{\"code\":19999,\"msg\":\"输入为空\"}"; + } + + + public string WXAddMdyShippingTemplate(string inputData) + { + if (!string.IsNullOrEmpty(inputData)) + { + var time = RegexUtils.GetStringQuery(ref inputData, "time").ParseToInt(); + string time1 = RegexUtils.GetStringQuery(ref inputData, "code"); + if (time1 != EncrypUtil.Encryption(time)) + return "{\"code\":50000,\"msg\":\"校验失败\"}"; + + var user_name = RegexUtils.GetStringQuery(ref inputData, "user_name")?.Replace("'", "\\'"); + if (string.IsNullOrEmpty(user_name)) + { + return "{\"code\":50001,\"msg\":\"没有用户名\"}"; + } + + //int page = RegexUtils.GetStringQuery(ref inputData, "page").ParseToInt(); + //int page_size = RegexUtils.GetStringQuery(ref inputData, "page_size").ParseToInt(50); + string coid = RegexUtils.GetStringQuery(ref inputData, "coid")?.Replace("'", "\\'"); + string shipping_template_json = RegexUtils.GetStringQuery(ref inputData, "shipping_template_json")?.Replace("'", "\\'"); + if (string.IsNullOrEmpty("coid")) + return "{\"code\":50001,\"msg\":\"没有运费编号\"}"; + if (string.IsNullOrEmpty("shipping_template_json")) + return "{\"code\":50001,\"msg\":\"没有运费信息\"}"; + + string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; + MysqlUtils mySql = new MysqlUtils(conn); + + string sql = "SELECT * FROM `wxxd`.`shipping_template` where coid='" + coid + "'"; + + string where = ""; + sql += where; + + var dt = mySql.ExecuteDataTable(sql); + mySql.Close(); + + if (dt != null) + { + conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; + mySql = new MysqlUtils(conn); + if (dt.Rows.Count == 0) + { + sql = "INSERT INTO `wxxd`.`shipping_template` (coid,shipping_template_json) VALUES (@coid,@shipping_template_json);"; + } + else + { + sql = "UPDATE `wxxd`.`shipping_template` SET shipping_template_json=@shipping_template_json WHERE coid=@coid;"; + } + + List paramLst = new List(); + paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "coid", Value = coid, }); + paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "shipping_template_json", Value = shipping_template_json, }); + mySql.ExecuteNonQuery(sql, paramLst.ToArray()); + mySql.Close(); + if (string.IsNullOrEmpty(mySql.Message)) + { + return "{\"code\":200,\"msg\":\"success\",\"data\":\"\"}"; + } + else + { + return "{\"code\":50003,\"msg\":\"" + mySql.Message + "\",\"data\":\"\"}"; + } + } + else + { + return "{\"code\":50003,\"msg\":\"" + mySql.Message + "\",\"data\":\"\"}"; + } + } + return "{\"code\":19999,\"msg\":\"输入为空\"}"; + } + + public string WXGetShippingTemplate(string inputData) + { + if (!string.IsNullOrEmpty(inputData)) + { + var time = RegexUtils.GetStringQuery(ref inputData, "time").ParseToInt(); + string time1 = RegexUtils.GetStringQuery(ref inputData, "code"); + if (time1 != EncrypUtil.Encryption(time)) + return "{\"code\":50000,\"msg\":\"校验失败\"}"; + + var user_name = RegexUtils.GetStringQuery(ref inputData, "user_name")?.Replace("'", "\\'"); + if (string.IsNullOrEmpty(user_name)) + { + return "{\"code\":50001,\"msg\":\"没有用户名\"}"; + } + + //int page = RegexUtils.GetStringQuery(ref inputData, "page").ParseToInt(); + //int page_size = RegexUtils.GetStringQuery(ref inputData, "page_size").ParseToInt(50); + string coid = RegexUtils.GetStringQuery(ref inputData, "coid")?.Replace("'", "\\'"); + + string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; + MysqlUtils mySql = new MysqlUtils(conn); + + string sql = "SELECT * FROM `wxxd`.`shipping_template` where coid='" + coid + "'"; + + string where = ""; + sql += where; + + var dt = mySql.ExecuteDataTable(sql); + mySql.Close(); + + if (dt != null) + { + try + { + string group_data = ""; + foreach (DataRow row in dt.Rows) + { + group_data += row["shipping_template_json"].ToString(); + break; + } + var data = group_data.Trim(','); + if (data.IsNullOrEmpty()) + data = "\"\""; return "{\"code\":200,\"msg\":\"success\",\"data\":" + data + "}"; } catch (Exception ex) diff --git a/KJDService/KJD_WebService/BLL/WXXD/WXShopManage.cs b/KJDService/KJD_WebService/BLL/WXXD/WXShopManage.cs index 5cc84bb..48d3e35 100644 --- a/KJDService/KJD_WebService/BLL/WXXD/WXShopManage.cs +++ b/KJDService/KJD_WebService/BLL/WXXD/WXShopManage.cs @@ -95,7 +95,7 @@ namespace KJD_Web.BLL.WXXD else { sql = "SELECT s.id,s.login_name,s.login_pass,s.cookie,s.cookie2,s.anti_contents,s.openid,s.shop_id,s.shop_account,s.sub_user_name," + - "s.user_name,s.company_name,s.notes,s.login_status,s.login_status2,c.add_product_remaining,c.add_product_month," + + "s.user_name,s.company_name,s.notes,s.group_name,s.login_status,s.login_status2,c.add_product_remaining,c.add_product_month," + "s.add_time,s.mdy_time,s.add_sub_sa_time,s.operate_sub_sa_name"; //sql += " FROM wxxd.shop s WHERE 1=1"; sql += " FROM wxxd.shop s LEFT JOIN wxxd.shop_add_prod_count c ON s.shop_id=c.shop_id WHERE 1=1"; @@ -133,6 +133,7 @@ namespace KJD_Web.BLL.WXXD add_product_month = row["add_product_month"].ParseToInt(), operate_sub_sa_name = row["operate_sub_sa_name"].ParseToString(), openid = row["openid"].ParseToString(), + group_name = row["group_name"].ParseToString(), }; shopList.Add(shop); } @@ -274,7 +275,7 @@ namespace KJD_Web.BLL.WXXD else { sql = "SELECT s.id,s.login_name,s.login_pass,s.cookie,s.cookie2,s.anti_contents,s.shop_id,s.openid,s.shop_account,s.sub_user_name,s.user_name," + - "s.company_name,s.notes,s.login_status,s.login_status2,c.add_product_remaining,c.add_product_month,s.add_time,s.mdy_time," + + "s.company_name,s.notes,s.group_name,s.login_status,s.login_status2,c.add_product_remaining,c.add_product_month,s.add_time,s.mdy_time," + "s.add_sub_sa_time,s.operate_sub_sa_name"; sql += " FROM wxxd.shop s LEFT JOIN wxxd.shop_add_prod_count c ON s.shop_id=c.shop_id WHERE 1=1"; @@ -311,6 +312,7 @@ namespace KJD_Web.BLL.WXXD add_product_month = row["add_product_month"].ParseToInt(), operate_sub_sa_name = row["operate_sub_sa_name"].ParseToString(), openid = row["openid"].ToString(), + group_name = row["group_name"].ToString(), }; shopList.Add(shop); } diff --git a/KJDService/KJD_WebService/KJD_WebService.csproj.user b/KJDService/KJD_WebService/KJD_WebService.csproj.user index 1b87364..4bcdc04 100644 --- a/KJDService/KJD_WebService/KJD_WebService.csproj.user +++ b/KJDService/KJD_WebService/KJD_WebService.csproj.user @@ -8,7 +8,7 @@ - Debug|Any CPU + Release|Any CPU ShowAllFiles diff --git a/KJDService/KJD_WebService/Model/ShopModel/ShopParam.cs b/KJDService/KJD_WebService/Model/ShopModel/ShopParam.cs index 256a0c1..ed504e3 100644 --- a/KJDService/KJD_WebService/Model/ShopModel/ShopParam.cs +++ b/KJDService/KJD_WebService/Model/ShopModel/ShopParam.cs @@ -34,6 +34,7 @@ namespace KJD_Web.Model.ShopModel /// 备注 /// public string notes { get; set; } + public string group_name { get; set; } public string login_status { get; set; } public string login_status2 { get; set; } public int add_product_remaining { get; set; } diff --git a/KJDService/KJD_WebService/WXProductService.asmx.cs b/KJDService/KJD_WebService/WXProductService.asmx.cs index d9364a3..af5b1eb 100644 --- a/KJDService/KJD_WebService/WXProductService.asmx.cs +++ b/KJDService/KJD_WebService/WXProductService.asmx.cs @@ -145,5 +145,29 @@ namespace KJD_Web Context.Response.Write(result); Context.Response.End(); } + + //WXAddMdyAfterSale + [WebMethod] + public void wx_add_mdy_shipping_template() + { + string jsontext = GetRequestJsonString(); + + var result = jsontext; + result = new WXProductManage().WXAddMdyShippingTemplate(jsontext); + + Context.Response.Write(result); + Context.Response.End(); + } + [WebMethod] + public void wx_get_shipping_template() + { + string jsontext = GetRequestJsonString(); + + var result = jsontext; + result = new WXProductManage().WXGetShippingTemplate(jsontext); + + Context.Response.Write(result); + Context.Response.End(); + } } } diff --git a/TEMUKJD/BLL/PDDProdFormConverter.cs b/TEMUKJD/BLL/PDDProdFormConverter.cs index b0d1037..cb94c42 100644 --- a/TEMUKJD/BLL/PDDProdFormConverter.cs +++ b/TEMUKJD/BLL/PDDProdFormConverter.cs @@ -400,7 +400,7 @@ namespace TemuKJD.BLL var jstGoodsObj = prodObj["pddData"]; var jstPddPropMapLst = JsonHelper.DeserializeJsonToList(JsonHelper.SerializeObject(prodObj["pddPropMap"])); //{"goodsId":"2016474712785620994","warehouseGoodsId":"C7108311198A4217B022DCA87B6A5863","spuCode":"3783056947394249077","skus":[{"skuId":"2016692758292738050","warehouseSkuId":"C742B3FCB0364448AF92332F8F6005A6","skuCode":"ZH-XP-YWQYW-010"},{"skuId":"2016692758317903874","warehouseSkuId":"703E87F1B7774C14923821A57EEE6EFA","skuCode":"ZH-XP-YWQYW-010-111"},{"skuId":"2016692758338875394","warehouseSkuId":"895EDCDF6ECC4FAE8AD4DB9503719002","skuCode":"ZH-XP-YWQYW-010-222"}]} - var jstSecretCodeLst = JsonHelper.JObjectParse(dbProd.sku_secret_json); + var jstSecretCodeLst = JsonHelper.JObjectParse(dbProd.sku_secret_json.TrimStart('[').TrimEnd(']')); PDDProductInfo prodInfo = new PDDProductInfo() { @@ -624,7 +624,7 @@ namespace TemuKJD.BLL thumb_url_is_deleted = null, quantity_delta = 0, spec = new List(), - // sku货号 + // sku货号下面单独设置 out_sku_sn = "", batch_id = null, priority = 1, diff --git a/TEMUKJD/BLL/ShopBLL.cs b/TEMUKJD/BLL/ShopBLL.cs index 1f238a4..fcd6958 100644 --- a/TEMUKJD/BLL/ShopBLL.cs +++ b/TEMUKJD/BLL/ShopBLL.cs @@ -24,7 +24,7 @@ namespace TemuKJD.BLL + "&shop_account=" + _shop.ShopAccount + "&cookie=" + _shop.Cookies + "&cookie2=" + _shop.Cookies2 - + "&shop_group=" + GetHtml.UrlEncodeUtf8(_shop.GroupName) + + "&group_name=" + GetHtml.UrlEncodeUtf8(_shop.GroupName) + "&sub_user_name=" + GetHtml.UrlEncodeUtf8(_shop.SubUserName) + "¬es=" + GetHtml.UrlEncodeUtf8(_shop.Notes) + "&login_status=" + _shop.LoginStatus @@ -91,7 +91,7 @@ namespace TemuKJD.BLL data += "&login_name=" + _shop.LoginName; data += "&login_pass=" + GetHtml.UrlEncodeUtf8(_shop.Password); data += "¬es=" + GetHtml.UrlEncodeUtf8(_shop.Notes); - data += "&shop_group=" + GetHtml.UrlEncodeUtf8(_shop.GroupName); + data += "&group_name=" + GetHtml.UrlEncodeUtf8(_shop.GroupName); data += "&sub_user_name=" + GetHtml.UrlEncodeUtf8(_shop.SubUserName); @@ -276,6 +276,7 @@ namespace TemuKJD.BLL shop.Cookies2 = jObj["cookie2"].ParseToString().Replace("＆", "&").Replace("％", "%").Replace("＋", "+").Replace("＂", "\""); shop.CompanyName = BaseRegex.GetStringJson(ref shopStr, "company_name"); shop.Notes = BaseRegex.GetStringJson(ref shopStr, "notes"); + shop.GroupName = BaseRegex.GetStringJson(ref shopStr, "group_name"); shop.LoginStatus = BaseRegex.GetStringJson(ref shopStr, "login_status"); shop.LoginStatus2 = BaseRegex.GetStringJson(ref shopStr, "login_status2"); shop.OperateSubSaName = BaseRegex.GetStringJson(ref shopStr, "operate_sub_sa_name"); diff --git a/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.Designer.cs b/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.Designer.cs index 14ef73f..93b72bd 100644 --- a/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.Designer.cs +++ b/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.Designer.cs @@ -29,6 +29,8 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); @@ -38,8 +40,6 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ProductThirdSelectListManageForm)); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.numMaxWaitSecond = new System.Windows.Forms.NumericUpDown(); @@ -52,7 +52,6 @@ this.btnAdd = new DevComponents.DotNetBar.PanelEx(); this.btnReFission = new DevComponents.DotNetBar.PanelEx(); this.chkShowDel = new TemuKJD.UserComponent.UcCheckBox(this.components); - this.chkNoSubSa = new TemuKJD.UserComponent.UcCheckBox(this.components); this.chkUploadProd = new TemuKJD.UserComponent.UcCheckBox(this.components); this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); this.label9 = new System.Windows.Forms.Label(); @@ -117,6 +116,7 @@ this.txtProdName = new System.Windows.Forms.TextBox(); this.lblUserNotes = new System.Windows.Forms.Label(); this.chkUseGlobalFissionSetting = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.chkNoSubSa = new TemuKJD.UserComponent.UcCheckBox(this.components); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); this.pbLoading = new System.Windows.Forms.PictureBox(); this.panel2 = new System.Windows.Forms.Panel(); @@ -210,7 +210,6 @@ this.splitContainer1.Panel1.Controls.Add(this.btnAdd); this.splitContainer1.Panel1.Controls.Add(this.btnReFission); this.splitContainer1.Panel1.Controls.Add(this.chkShowDel); - this.splitContainer1.Panel1.Controls.Add(this.chkNoSubSa); this.splitContainer1.Panel1.Controls.Add(this.chkUploadProd); this.splitContainer1.Panel1.Controls.Add(this.flowLayoutPanel1); this.splitContainer1.Panel1.Controls.Add(this.label21); @@ -240,6 +239,7 @@ this.splitContainer1.Panel1.Controls.Add(this.btnDel); this.splitContainer1.Panel1.Controls.Add(this.tableLayoutPanel1); this.splitContainer1.Panel1.Controls.Add(this.chkUseGlobalFissionSetting); + this.splitContainer1.Panel1.Controls.Add(this.chkNoSubSa); // // splitContainer1.Panel2 // @@ -447,18 +447,6 @@ this.chkShowDel.UseVisualStyleBackColor = true; this.chkShowDel.CheckedChanged += new System.EventHandler(this.chkShowDel_CheckedChanged); // - // chkNoSubSa - // - this.chkNoSubSa.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.chkNoSubSa.AutoSize = true; - this.chkNoSubSa.Location = new System.Drawing.Point(1079, 11); - this.chkNoSubSa.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.chkNoSubSa.Name = "chkNoSubSa"; - this.chkNoSubSa.Size = new System.Drawing.Size(87, 21); - this.chkNoSubSa.TabIndex = 470; - this.chkNoSubSa.Text = "未分配超管"; - this.chkNoSubSa.UseVisualStyleBackColor = true; - // // chkUploadProd // this.chkUploadProd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -1154,7 +1142,7 @@ "全部", "重上", "已买"}); - this.cmbUserNotes.Location = new System.Drawing.Point(927, 11); + this.cmbUserNotes.Location = new System.Drawing.Point(927, 8); this.cmbUserNotes.Margin = new System.Windows.Forms.Padding(0); this.cmbUserNotes.Name = "cmbUserNotes"; this.cmbUserNotes.Size = new System.Drawing.Size(52, 25); @@ -1171,7 +1159,7 @@ "核价成功", "核价成功（重复）", "重复"}); - this.cmbNotes.Location = new System.Drawing.Point(813, 11); + this.cmbNotes.Location = new System.Drawing.Point(813, 8); this.cmbNotes.Margin = new System.Windows.Forms.Padding(0); this.cmbNotes.Name = "cmbNotes"; this.cmbNotes.Size = new System.Drawing.Size(52, 25); @@ -1198,7 +1186,7 @@ "已上传", "草稿箱", "全部"}); - this.cmbStatus.Location = new System.Drawing.Point(723, 11); + this.cmbStatus.Location = new System.Drawing.Point(723, 8); this.cmbStatus.Margin = new System.Windows.Forms.Padding(0); this.cmbStatus.Name = "cmbStatus"; this.cmbStatus.Size = new System.Drawing.Size(52, 25); @@ -1382,6 +1370,18 @@ this.chkUseGlobalFissionSetting.Text = "使用全局\r\n重组标题"; this.chkUseGlobalFissionSetting.UseVisualStyleBackColor = true; // + // chkNoSubSa + // + this.chkNoSubSa.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.chkNoSubSa.AutoSize = true; + this.chkNoSubSa.Location = new System.Drawing.Point(1079, 11); + this.chkNoSubSa.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.chkNoSubSa.Name = "chkNoSubSa"; + this.chkNoSubSa.Size = new System.Drawing.Size(87, 21); + this.chkNoSubSa.TabIndex = 470; + this.chkNoSubSa.Text = "未分配超管"; + this.chkNoSubSa.UseVisualStyleBackColor = true; + // // splitContainer2 // this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill; @@ -1392,9 +1392,9 @@ // // splitContainer2.Panel1 // + this.splitContainer2.Panel1.Controls.Add(this.dgvSelectProduct); this.splitContainer2.Panel1.Controls.Add(this.pbLoading); this.splitContainer2.Panel1.Controls.Add(this.panel2); - this.splitContainer2.Panel1.Controls.Add(this.dgvSelectProduct); this.splitContainer2.Panel1.Padding = new System.Windows.Forms.Padding(4, 0, 4, 0); // // splitContainer2.Panel2 @@ -1457,19 +1457,19 @@ // this.dgvMapDraftIds.AllowUserToAddRows = false; this.dgvMapDraftIds.AllowUserToDeleteRows = false; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvMapDraftIds.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle10.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvMapDraftIds.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle10; this.dgvMapDraftIds.AutoRowNumber = true; this.dgvMapDraftIds.BackgroundColor = System.Drawing.Color.White; this.dgvMapDraftIds.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvMapDraftIds.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvMapDraftIds.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11; this.dgvMapDraftIds.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvMapDraftIds.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.dataGridViewCheckBoxColumn1, @@ -1544,19 +1544,19 @@ // this.dgvSelectProduct.AllowUserToAddRows = false; this.dgvSelectProduct.AllowUserToDeleteRows = false; - dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; this.dgvSelectProduct.AutoRowNumber = true; this.dgvSelectProduct.BackgroundColor = System.Drawing.Color.White; this.dgvSelectProduct.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvSelectProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvSelectProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; this.dgvSelectProduct.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvSelectProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colSelect, @@ -1623,8 +1623,8 @@ // // colSupplierName // - dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle3; this.colSupplierName.HeaderText = "店铺名称"; this.colSupplierName.Name = "colSupplierName"; this.colSupplierName.ReadOnly = true; @@ -1704,8 +1704,8 @@ // // colProductName // - dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colProductName.DefaultCellStyle = dataGridViewCellStyle6; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colProductName.DefaultCellStyle = dataGridViewCellStyle4; this.colProductName.HeaderText = "商品标题"; this.colProductName.Name = "colProductName"; this.colProductName.ReadOnly = true; @@ -1713,8 +1713,8 @@ // // colProductCat // - dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colProductCat.DefaultCellStyle = dataGridViewCellStyle7; + dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colProductCat.DefaultCellStyle = dataGridViewCellStyle5; this.colProductCat.HeaderText = "商品类目"; this.colProductCat.Name = "colProductCat"; this.colProductCat.ReadOnly = true; @@ -1747,8 +1747,8 @@ // // colAddTime // - dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colAddTime.DefaultCellStyle = dataGridViewCellStyle8; + dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colAddTime.DefaultCellStyle = dataGridViewCellStyle6; this.colAddTime.HeaderText = "添加时间"; this.colAddTime.Name = "colAddTime"; this.colAddTime.ReadOnly = true; @@ -1756,8 +1756,8 @@ // // colMdyTime // - dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colMdyTime.DefaultCellStyle = dataGridViewCellStyle9; + dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colMdyTime.DefaultCellStyle = dataGridViewCellStyle7; this.colMdyTime.HeaderText = "上传时间"; this.colMdyTime.Name = "colMdyTime"; this.colMdyTime.ReadOnly = true; @@ -1772,8 +1772,8 @@ // // colSubSaNick // - dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colSubSaNick.DefaultCellStyle = dataGridViewCellStyle10; + dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colSubSaNick.DefaultCellStyle = dataGridViewCellStyle8; this.colSubSaNick.HeaderText = "二级超管"; this.colSubSaNick.Name = "colSubSaNick"; this.colSubSaNick.ReadOnly = true; @@ -1788,8 +1788,8 @@ // // colNotes // - dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colNotes.DefaultCellStyle = dataGridViewCellStyle11; + dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colNotes.DefaultCellStyle = dataGridViewCellStyle9; this.colNotes.HeaderText = "备注"; this.colNotes.Name = "colNotes"; this.colNotes.ReadOnly = true; diff --git a/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.cs b/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.cs index 0711016..1b53ceb 100644 --- a/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.cs +++ b/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.cs @@ -95,10 +95,15 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms colUserNotes.Visible = false; ucSplitPage1.IsShowPageSize = true; var columnStyles = tableLayoutPanel1.ColumnStyles.Cast().ToList(); - columnStyles[columnStyles.Count - 1].SizeType = SizeType.Absolute; - columnStyles[columnStyles.Count - 1].Width = 0; - columnStyles[columnStyles.Count - 2].SizeType = SizeType.Absolute; - columnStyles[columnStyles.Count - 2].Width = 0; + //lblUserNotes + //columnStyles[columnStyles.Count - 1].SizeType = SizeType.Absolute; + //columnStyles[columnStyles.Count - 1].Width = 0; + //columnStyles[columnStyles.Count - 2].SizeType = SizeType.Absolute; + //columnStyles[columnStyles.Count - 2].Width = 0; + columnStyles[tableLayoutPanel1.GetColumn(lblUserNotes)].SizeType = SizeType.Absolute; + columnStyles[tableLayoutPanel1.GetColumn(lblUserNotes)].Width = 0; + columnStyles[tableLayoutPanel1.GetColumn(cmbUserNotes)].SizeType = SizeType.Absolute; + columnStyles[tableLayoutPanel1.GetColumn(cmbUserNotes)].Width = 0; int colsWidth = 0; foreach (DataGridViewColumn col in dgvSelectProduct.Columns) { @@ -314,8 +319,12 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms data += "&no_sub_sa=true"; if (ClientMode != EnumClientMode.Admin) { - string shopIds = string.Join(",", GlobalConfig.ShopLoginList.Where(s => !s.ShopId.IsNullOrEmpty()).Select(s => s.ShopId).Distinct()) ?? "default"; - data += "&shop_ids=" + shopIds; + //string shopIds = string.Join(",", GlobalConfig.ShopLoginList.Where(s => !s.ShopId.IsNullOrEmpty()).Select(s => s.ShopId).Distinct()); + //// 传默认值防止没有店铺的账号查询到所有信息 + //if (string.IsNullOrEmpty(shopIds)) + // shopIds = "0"; + //data += "&shop_ids=" + shopIds; + data += "&shop_ids=\"" + string.Join("\",\"", GlobalConfig.ShopLoginList.Where(s => !s.ShopId.IsNullOrEmpty()).Select(s => s.ShopId).Distinct()) + "\""; } })); var html = GetHtml.PostUtf8(url, data); diff --git a/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.resx b/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.resx index 75682ef..255feb5 100644 --- a/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.resx +++ b/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.resx @@ -117,24 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True - - - True - - - True - - - True - - - True - - - True - True @@ -213,6 +195,24 @@ True + + True + + + True + + + True + + + True + + + True + + + True + diff --git a/TEMUKJD/MainForm.cs b/TEMUKJD/MainForm.cs index d923479..5352c0c 100644 --- a/TEMUKJD/MainForm.cs +++ b/TEMUKJD/MainForm.cs @@ -308,6 +308,7 @@ namespace TemuKJD Task.Run(()=> { ReadWxCate(); + ReadWxCateBound(); }); } @@ -332,6 +333,36 @@ namespace TemuKJD } } + void ReadWxCateBound() + { + string filePath = Path.Combine(Environment.CurrentDirectory, "temp\\wxCatBound"); + if (!File.Exists(filePath)) + return; + try + { + var catTxts = FileBase.ReadAllLines(filePath); + foreach (var catTxt in catTxts) + { + if (catTxt.StartsWith("类目id")) + continue; + var catTxtArr = catTxt.Split(','); + GlobalConfig.WxCatBoundList.Add(new WxCatBoundInfo() + { + cat_bound = catTxtArr[3].ParseToInt(), + full_cat_name = catTxtArr[2], + leaf_id = catTxtArr[0].ParseToLong(), + leaf_name = catTxtArr[1], + }); + } + } + catch (Exception ex) + { + BaseMsgForm.ShowError("类目价格获取失败：" + ex.Message); + } + if (GlobalConfig.WxCatBoundList == null) + GlobalConfig.WxCatBoundList = new ConcurrentList(); + } + public void SetTitle() { lblVersionInfo.Text = BaseClass.ToolName + " V" + BaseClass.Varsion + " - " + BaseClass.NickName; diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs index 1c7f7ed..57e86ac 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs @@ -1279,7 +1279,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms try { var url3 = BaseClass.BuildPDDObjString("product/mdy_product"); - string skuSecretJson = JsonHelper.SerializeObject(JsonHelper.JObjectParse(getRst)["data"]); + string skuSecretJson = JsonHelper.SerializeObject(JsonHelper.JObjectParse(getRst)["data"].FirstOrDefault()); if (skuSecretJson.Contains("warehouseGoodsId") && skuSecretJson.Contains("goodsId") && skuSecretJson.Contains("warehouseSkuId") && skuSecretJson.Contains("skuId")) { @@ -1330,15 +1330,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms } //Thread.Sleep(500); - // 获取售后地址 - //https://po.e57.cn/prod-api/api/sys-api/system/open/api/afterSale/info?warehouseNum=10361546&shopId=46568955 - //var url2 = "https://po.e57.cn/prod-api/api/sys-api/system/open/api/afterSale/info?warehouseNum=" + dbProd.skc_id; //+ "&userName=阿杰账户"; - //var exportRst2 = WXHttpResponseBLL.e57GetResponse(url2, ""); - // 获取运费模板 - //"https://po.e57.cn/prod-api/api/sys-api/system/open/api/freightTemplate/list?warehouseNum=10361546"; - //var url3 = "https://po.e57.cn/prod-api/api/sys-api/system/open/api/freightTemplate/list?warehouseNum=" + dbProd.skc_id; - //var exportRst3 = WXHttpResponseBLL.e57GetResponse(url3, ""); - // 查询微信接口token //url = "https://po.e57.cn/prod-api/api/sys-api/system/open/api/shop/list?userName=阿杰账户"; //exportRst = WXHttpResponseBLL.e57PostResponse(url, "&warehouseNum=123456&shopId=46568955", ""); diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectCacheForm.Designer.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectCacheForm.Designer.cs index b966eb5..035e3fa 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectCacheForm.Designer.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectCacheForm.Designer.cs @@ -44,6 +44,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.colProductSkcPic = new System.Windows.Forms.DataGridViewImageColumn(); this.colProductName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colProductCat = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colBound = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colExtCode = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colNotes = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.ColDelete = new System.Windows.Forms.DataGridViewLinkColumn(); @@ -127,6 +128,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.dgvSelectProduct.AllowUserToDeleteRows = false; dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke; this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + this.dgvSelectProduct.AutoRowNumber = true; this.dgvSelectProduct.BackgroundColor = System.Drawing.Color.White; this.dgvSelectProduct.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; @@ -146,6 +148,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.colProductSkcPic, this.colProductName, this.colProductCat, + this.colBound, this.colExtCode, this.colNotes, this.ColDelete}); @@ -205,7 +208,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.colProductName.HeaderText = "商品标题"; this.colProductName.Name = "colProductName"; this.colProductName.ReadOnly = true; - this.colProductName.Width = 390; + this.colProductName.Width = 320; // // colProductCat // @@ -214,6 +217,12 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.colProductCat.ReadOnly = true; this.colProductCat.Width = 120; // + // colBound + // + this.colBound.HeaderText = "保证金"; + this.colBound.Name = "colBound"; + this.colBound.ReadOnly = true; + // // colExtCode // this.colExtCode.HeaderText = "商品货号"; @@ -271,6 +280,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms private System.Windows.Forms.DataGridViewImageColumn colProductSkcPic; private System.Windows.Forms.DataGridViewTextBoxColumn colProductName; private System.Windows.Forms.DataGridViewTextBoxColumn colProductCat; + private System.Windows.Forms.DataGridViewTextBoxColumn colBound; private System.Windows.Forms.DataGridViewTextBoxColumn colExtCode; private System.Windows.Forms.DataGridViewTextBoxColumn colNotes; private System.Windows.Forms.DataGridViewLinkColumn ColDelete; diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectCacheForm.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectCacheForm.cs index aced236..9a02793 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectCacheForm.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectCacheForm.cs @@ -1,4 +1,5 @@ using AllBase; +using AllBase.Helper; using AllBase.Model.Result; using NaiBa.Util.Extension; using System; @@ -35,15 +36,17 @@ namespace TemuKJD.PDDForms.ProductSelectForms { foreach (var prodSelect in lstTemuDBProductSelect) { + var catBound = GlobalConfig.WxCatBoundList.FirstOrDefault(b => b.leaf_id.ParseToString() == prodSelect.wx_cat_leaf); int rowIndex = this.dgvSelectProduct.Rows.Add( false, prodSelect.id, - prodSelect.spu_id, + BaseClass.SaLevel > 0 ? prodSelect.spu_id : prodSelect.spu_id.ParseToString().GetHashCode().ParseToString().Trim('-'), prodSelect.main_img, - null, //DataGridViewExtension.defaultBitmap, + DataGridViewExtension.defaultBitmap, prodSelect.product_name, // 商品名称 prodSelect.cat_name, - prodSelect.ext_code, + catBound?.cat_bound, + BaseClass.SaLevel > 0 ? prodSelect.spu_id : prodSelect.ext_code.ParseToString().GetHashCode().ParseToString().Trim('-'), prodSelect.notes, "删除" ); diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectCacheForm.resx b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectCacheForm.resx index 05d1891..a066be7 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectCacheForm.resx +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectCacheForm.resx @@ -138,6 +138,9 @@ True + + True + True diff --git a/TEMUKJD/ToolForms/GetJuShuitanProdForm.Designer.cs b/TEMUKJD/ToolForms/GetJuShuitanProdForm.Designer.cs index b7da879..b112d48 100644 --- a/TEMUKJD/ToolForms/GetJuShuitanProdForm.Designer.cs +++ b/TEMUKJD/ToolForms/GetJuShuitanProdForm.Designer.cs @@ -30,11 +30,11 @@ namespace TemuKJD.ToolForms private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); this.btnNext = new System.Windows.Forms.Button(); this.btnPrev = new System.Windows.Forms.Button(); @@ -60,6 +60,7 @@ namespace TemuKJD.ToolForms this.cmbMultiCookieName = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.btnMultiLogin = new DevComponents.DotNetBar.PanelEx(); this.btnDel = new DevComponents.DotNetBar.PanelEx(); + this.btnCancelSelect = new DevComponents.DotNetBar.PanelEx(); this.txtTitle = new System.Windows.Forms.TextBox(); this.btnSearchTitle = new DevComponents.DotNetBar.PanelEx(); this.chkSkip = new TemuKJD.UserComponent.UcCheckBox(this.components); @@ -113,7 +114,7 @@ namespace TemuKJD.ToolForms this.splitContainer2.Panel1.Controls.Add(this.btnNext); this.splitContainer2.Panel1.Controls.Add(this.btnPrev); this.splitContainer2.Panel1.Controls.Add(this.txtAddress); - this.splitContainer2.Size = new System.Drawing.Size(1390, 438); + this.splitContainer2.Size = new System.Drawing.Size(1390, 440); this.splitContainer2.SplitterDistance = 26; this.splitContainer2.TabIndex = 6; // @@ -152,7 +153,7 @@ namespace TemuKJD.ToolForms // this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None; this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue; - this.pbLoading.Location = new System.Drawing.Point(673, 196); + this.pbLoading.Location = new System.Drawing.Point(673, 194); this.pbLoading.Name = "pbLoading"; this.pbLoading.Size = new System.Drawing.Size(50, 50); this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -164,20 +165,20 @@ namespace TemuKJD.ToolForms // this.dgvProduct.AllowUserToAddRows = false; this.dgvProduct.AllowUserToDeleteRows = false; - dataGridViewCellStyle6.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle6; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; this.dgvProduct.AutoRowNumber = true; this.dgvProduct.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.dgvProduct.BackgroundColor = System.Drawing.Color.White; this.dgvProduct.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; this.dgvProduct.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colCheck, @@ -196,7 +197,7 @@ namespace TemuKJD.ToolForms this.dgvProduct.Name = "dgvProduct"; this.dgvProduct.ReadOnly = true; this.dgvProduct.RowTemplate.Height = 23; - this.dgvProduct.Size = new System.Drawing.Size(1390, 437); + this.dgvProduct.Size = new System.Drawing.Size(1390, 433); this.dgvProduct.TabIndex = 7; this.dgvProduct.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvProduct_CellContentClick); // @@ -236,8 +237,8 @@ namespace TemuKJD.ToolForms // // colGoodsName // - dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colGoodsName.DefaultCellStyle = dataGridViewCellStyle8; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colGoodsName.DefaultCellStyle = dataGridViewCellStyle3; this.colGoodsName.FillWeight = 120F; this.colGoodsName.HeaderText = "商品名称"; this.colGoodsName.Name = "colGoodsName"; @@ -265,8 +266,8 @@ namespace TemuKJD.ToolForms // // colPrice // - dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colPrice.DefaultCellStyle = dataGridViewCellStyle9; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colPrice.DefaultCellStyle = dataGridViewCellStyle4; this.colPrice.FillWeight = 70F; this.colPrice.HeaderText = "价格"; this.colPrice.Name = "colPrice"; @@ -281,8 +282,8 @@ namespace TemuKJD.ToolForms // // colMsg // - dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colMsg.DefaultCellStyle = dataGridViewCellStyle10; + dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colMsg.DefaultCellStyle = dataGridViewCellStyle5; this.colMsg.FillWeight = 200F; this.colMsg.HeaderText = "操作结果"; this.colMsg.Name = "colMsg"; @@ -306,6 +307,7 @@ namespace TemuKJD.ToolForms // splitContainer1.Panel2 // this.splitContainer1.Panel2.BackColor = System.Drawing.Color.White; + this.splitContainer1.Panel2.Controls.Add(this.btnCancelSelect); this.splitContainer1.Panel2.Controls.Add(this.txtTitle); this.splitContainer1.Panel2.Controls.Add(this.btnSearchTitle); this.splitContainer1.Panel2.Controls.Add(this.chkSkip); @@ -331,7 +333,7 @@ namespace TemuKJD.ToolForms this.splitContainer1.Panel2.Controls.Add(this.btnImportCookie); this.splitContainer1.Panel2.Controls.Add(this.label2); this.splitContainer1.Size = new System.Drawing.Size(1404, 561); - this.splitContainer1.SplitterDistance = 474; + this.splitContainer1.SplitterDistance = 469; this.splitContainer1.SplitterWidth = 3; this.splitContainer1.TabIndex = 4; // @@ -346,7 +348,7 @@ namespace TemuKJD.ToolForms this.ucTabControlMetro1.Name = "ucTabControlMetro1"; this.ucTabControlMetro1.SelectedIndex = 0; this.ucTabControlMetro1.ShowCloseButton = false; - this.ucTabControlMetro1.Size = new System.Drawing.Size(1404, 474); + this.ucTabControlMetro1.Size = new System.Drawing.Size(1404, 469); this.ucTabControlMetro1.TabIndex = 462; this.ucTabControlMetro1.TabSelectColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.ucTabControlMetro1.TabSelectTextColor = System.Drawing.Color.Gray; @@ -358,7 +360,7 @@ namespace TemuKJD.ToolForms 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(1396, 444); + this.tabPage1.Size = new System.Drawing.Size(1396, 446); this.tabPage1.TabIndex = 0; this.tabPage1.Text = "商品页面"; this.tabPage1.UseVisualStyleBackColor = true; @@ -370,7 +372,7 @@ namespace TemuKJD.ToolForms 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(1396, 443); + this.tabPage2.Size = new System.Drawing.Size(1396, 439); this.tabPage2.TabIndex = 1; this.tabPage2.Text = "采集列表"; this.tabPage2.UseVisualStyleBackColor = true; @@ -447,6 +449,31 @@ namespace TemuKJD.ToolForms this.btnDel.TabIndex = 409; this.btnDel.Text = "删"; // + // btnCancelSelect + // + this.btnCancelSelect.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnCancelSelect.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnCancelSelect.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnCancelSelect.DisabledBackColor = System.Drawing.Color.Empty; + this.btnCancelSelect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnCancelSelect.Location = new System.Drawing.Point(581, 33); + this.btnCancelSelect.Name = "btnCancelSelect"; + this.btnCancelSelect.Size = new System.Drawing.Size(115, 23); + this.btnCancelSelect.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnCancelSelect.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnCancelSelect.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnCancelSelect.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnCancelSelect.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnCancelSelect.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnCancelSelect.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnCancelSelect.Style.GradientAngle = 90; + this.btnCancelSelect.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnCancelSelect.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnCancelSelect.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnCancelSelect.TabIndex = 999; + this.btnCancelSelect.Text = "取消选中已入库"; + this.btnCancelSelect.Click += new System.EventHandler(this.btnCancelSelect_Click); + // // txtTitle // this.txtTitle.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -628,7 +655,7 @@ namespace TemuKJD.ToolForms this.statusBar.Location = new System.Drawing.Point(317, 60); this.statusBar.Margin = new System.Windows.Forms.Padding(0); this.statusBar.Name = "statusBar"; - this.statusBar.Size = new System.Drawing.Size(740, 25); + this.statusBar.Size = new System.Drawing.Size(739, 25); this.statusBar.TabIndex = 823; // // label4 @@ -901,5 +928,6 @@ namespace TemuKJD.ToolForms private System.Windows.Forms.TabPage tabPage2; private System.Windows.Forms.TextBox txtTitle; private DevComponents.DotNetBar.PanelEx btnSearchTitle; + private DevComponents.DotNetBar.PanelEx btnCancelSelect; } } \ No newline at end of file diff --git a/TEMUKJD/ToolForms/GetJuShuitanProdForm.cs b/TEMUKJD/ToolForms/GetJuShuitanProdForm.cs index f0cb291..96fde6d 100644 --- a/TEMUKJD/ToolForms/GetJuShuitanProdForm.cs +++ b/TEMUKJD/ToolForms/GetJuShuitanProdForm.cs @@ -523,6 +523,9 @@ namespace TemuKJD.ToolForms if (cancellationTokenSource.IsCancellationRequested) break; + if (row.Index % 20 == 0) + NaiBa.Util.Helper.ConfigHelper.SaveConfig("supplier_product_list_" + MainForm.ProcessCount, lstJSTListProductInfo); + Invoke(new Action(() => { this.statusBar.lblTaskStatus.Text = "正在入库表格第 " + (row.Index + 1) + " 行数据"; @@ -533,7 +536,13 @@ namespace TemuKJD.ToolForms if (prod == null || prod.dbProduct == null || prod.dbProduct.product_json.Length < 10) continue; var dbProd = prod.dbProduct; - + + if (prod.getProductMsg.Contains("入库成功") || prod.getProductMsg.Contains("已存在相同id商品")) + { + if (!chkOverride.Checked) + continue; + } + bool isExist = false; var existUrl = BaseClass.BuildObjString("product/get_product_list"); string existData = UserLogin.GetSignaturex() + "&search_spu=" + prod.spuId; @@ -564,9 +573,11 @@ namespace TemuKJD.ToolForms } else { + //入库成功 已存在相同id商品 + prod.getProductMsg = "已存在相同id商品，跳过"; Invoke(new Action(() => { - row.Cells["colMsg"].Value = "已存在相同id商品，跳过"; + row.Cells["colMsg"].Value = prod.getProductMsg; })); continue; } @@ -606,6 +617,7 @@ namespace TemuKJD.ToolForms "&sale_count=" + dbProd.sale_count + "&sale_count_text=" + HttpUtility.UrlEncode(dbProd.sale_count_text, Encoding.UTF8) + "&main_img=" + HttpUtility.UrlEncode(dbProd.main_img, Encoding.UTF8) + + "&wx_safe_status=" + HttpUtility.UrlEncode("安全商品", Encoding.UTF8) + "&product_get_type=" + HttpUtility.UrlEncode("厂商直采", Encoding.UTF8); if (!isExist) { @@ -640,13 +652,14 @@ namespace TemuKJD.ToolForms } else { - string msg = "商品入库成功!"; + prod.getProductMsg = "商品入库成功!"; Invoke(new Action(() => { - row.Cells["colMsg"].Value = msg; + row.Cells["colMsg"].Value = prod.getProductMsg; })); } } + NaiBa.Util.Helper.ConfigHelper.SaveConfig("supplier_product_list_" + MainForm.ProcessCount, lstJSTListProductInfo); Invoke(new Action(() => { @@ -712,6 +725,9 @@ namespace TemuKJD.ToolForms if (cancellationTokenSource.IsCancellationRequested) break; + if (row.Index % 20 == 0) + NaiBa.Util.Helper.ConfigHelper.SaveConfig("supplier_product_list_" + MainForm.ProcessCount, lstJSTListProductInfo); + Invoke(new Action(() => { this.statusBar.lblTaskStatus.Text = "正在采集表格第 " + (row.Index + 1) + " 行详情数据"; @@ -727,6 +743,8 @@ namespace TemuKJD.ToolForms { if (prod.getProductMsg == "商品已存在，跳过详情采集") continue; + if (prod.getProductMsg.Contains("入库成功") || prod.getProductMsg.Contains("已存在相同id商品")) + continue; bool isExist = false; var existUrl = BaseClass.BuildObjString("product/get_product_list"); @@ -858,9 +876,6 @@ namespace TemuKJD.ToolForms try { row.Cells["colMsg"].Value = prod.getProductMsg; } catch { } })); } - - if (row.Index % 20 == 0 ) - NaiBa.Util.Helper.ConfigHelper.SaveConfig("supplier_product_list_" + MainForm.ProcessCount, lstJSTListProductInfo); } NaiBa.Util.Helper.ConfigHelper.SaveConfig("supplier_product_list_" + MainForm.ProcessCount, lstJSTListProductInfo); Invoke(new Action(() => @@ -1068,5 +1083,22 @@ namespace TemuKJD.ToolForms })); }); } + + private void btnCancelSelect_Click(object sender, EventArgs e) + { + Task.Run(() => { + + foreach(DataGridViewRow row in dgvProduct.Rows) + { + if (row.Cells["colMsg"].Value.ParseToString().Contains("入库成功") || row.Cells["colMsg"].Value.ParseToString().Contains("已存在相同id商品")) + { + Invoke(new Action(() => + { + row.Cells["colcheck"].Value = false; + })); + } + } + }); + } } } diff --git a/TEMUKJD/WXForms/AdminForms/WXAdminShopListForm.Designer.cs b/TEMUKJD/WXForms/AdminForms/WXAdminShopListForm.Designer.cs index 085080f..3689bd6 100644 --- a/TEMUKJD/WXForms/AdminForms/WXAdminShopListForm.Designer.cs +++ b/TEMUKJD/WXForms/AdminForms/WXAdminShopListForm.Designer.cs @@ -72,13 +72,13 @@ namespace TemuKJD.WXForms.AdminForms this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colShopAccount = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colNotes = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colGroupName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colMinus = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colProductRemaining = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colPlus = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colCookie = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colUser = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colSubUser = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colGroupName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colUploadAccount = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colBuyAccount = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colChatAccount = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -509,6 +509,7 @@ namespace TemuKJD.WXForms.AdminForms this.dgvShop.AllowUserToDeleteRows = false; dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke; this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + this.dgvShop.AutoRowNumber = true; this.dgvShop.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.dgvShop.BackgroundColor = System.Drawing.Color.White; this.dgvShop.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -527,13 +528,13 @@ namespace TemuKJD.WXForms.AdminForms this.colShopId, this.colShopAccount, this.colNotes, + this.colGroupName, this.colMinus, this.colProductRemaining, this.colPlus, this.colCookie, this.colUser, this.colSubUser, - this.colGroupName, this.colUploadAccount, this.colBuyAccount, this.colChatAccount, @@ -634,6 +635,13 @@ namespace TemuKJD.WXForms.AdminForms this.colNotes.Name = "colNotes"; this.colNotes.ReadOnly = true; // + // colGroupName + // + this.colGroupName.FillWeight = 70F; + this.colGroupName.HeaderText = "店铺分组"; + this.colGroupName.Name = "colGroupName"; + this.colGroupName.ReadOnly = true; + // // colMinus // dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; @@ -683,14 +691,6 @@ namespace TemuKJD.WXForms.AdminForms this.colSubUser.Name = "colSubUser"; this.colSubUser.ReadOnly = true; // - // colGroupName - // - this.colGroupName.FillWeight = 70F; - this.colGroupName.HeaderText = "店铺分组"; - this.colGroupName.Name = "colGroupName"; - this.colGroupName.ReadOnly = true; - this.colGroupName.Visible = false; - // // colUploadAccount // this.colUploadAccount.FillWeight = 70F; @@ -842,13 +842,13 @@ namespace TemuKJD.WXForms.AdminForms this.colDelete.ReadOnly = true; this.colDelete.Visible = false; // - // PDDAdminShopListForm + // WXAdminShopListForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.ClientSize = new System.Drawing.Size(1273, 610); this.Controls.Add(this.splitContainer1); this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.Name = "PDDAdminShopListForm"; + this.Name = "WXAdminShopListForm"; this.Text = "AdminShopForm"; this.Load += new System.EventHandler(this.AdminShopForm_Load); this.VisibleChanged += new System.EventHandler(this.AdminShopForm_VisibleChanged); @@ -916,13 +916,13 @@ namespace TemuKJD.WXForms.AdminForms private System.Windows.Forms.DataGridViewTextBoxColumn colShopId; private System.Windows.Forms.DataGridViewTextBoxColumn colShopAccount; private System.Windows.Forms.DataGridViewTextBoxColumn colNotes; + private System.Windows.Forms.DataGridViewTextBoxColumn colGroupName; private System.Windows.Forms.DataGridViewTextBoxColumn colMinus; private System.Windows.Forms.DataGridViewTextBoxColumn colProductRemaining; private System.Windows.Forms.DataGridViewTextBoxColumn colPlus; private System.Windows.Forms.DataGridViewTextBoxColumn colCookie; private System.Windows.Forms.DataGridViewTextBoxColumn colUser; private System.Windows.Forms.DataGridViewTextBoxColumn colSubUser; - private System.Windows.Forms.DataGridViewTextBoxColumn colGroupName; private System.Windows.Forms.DataGridViewTextBoxColumn colUploadAccount; private System.Windows.Forms.DataGridViewTextBoxColumn colBuyAccount; private System.Windows.Forms.DataGridViewTextBoxColumn colChatAccount; diff --git a/TEMUKJD/WXForms/AdminForms/WXAdminShopListForm.cs b/TEMUKJD/WXForms/AdminForms/WXAdminShopListForm.cs index ba24842..df2aa1c 100644 --- a/TEMUKJD/WXForms/AdminForms/WXAdminShopListForm.cs +++ b/TEMUKJD/WXForms/AdminForms/WXAdminShopListForm.cs @@ -114,6 +114,7 @@ namespace TemuKJD.WXForms.AdminForms shop.ShopId, shop.ShopAccount, shop.Notes, + shop.GroupName, "－", shop.AddProductRemaining, "＋", @@ -121,7 +122,6 @@ namespace TemuKJD.WXForms.AdminForms shop.Cookies, shop.UserName, shop.SubUserName, - shop.GroupName, shop.UploadAccount, shop.BuyAccount, shop.ChatAccount, diff --git a/TEMUKJD/WXForms/AdminForms/WXAdminShopListForm.resx b/TEMUKJD/WXForms/AdminForms/WXAdminShopListForm.resx index 33b62f2..bf45c0b 100644 --- a/TEMUKJD/WXForms/AdminForms/WXAdminShopListForm.resx +++ b/TEMUKJD/WXForms/AdminForms/WXAdminShopListForm.resx @@ -132,6 +132,9 @@ True + + True + True @@ -150,9 +153,6 @@ True - - True - True diff --git a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.Designer.cs b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.Designer.cs index 1ec12dc..554e3a4 100644 --- a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.Designer.cs +++ b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.Designer.cs @@ -32,14 +32,16 @@ namespace TemuKJD.WXForms.ProductForms private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.ucGroupBoxEx2 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); + this.txtShippingPriceTimes = new System.Windows.Forms.TextBox(); + this.label13 = new System.Windows.Forms.Label(); this.label18 = new System.Windows.Forms.Label(); this.txtPreDays = new System.Windows.Forms.TextBox(); this.chkPreSale = new TemuKJD.UserComponent.UcCheckBox(this.components); @@ -75,33 +77,45 @@ namespace TemuKJD.WXForms.ProductForms this.label9 = new System.Windows.Forms.Label(); this.chkStepAddPrice = new TemuKJD.UserComponent.UcCheckBox(this.components); this.ucGroupBoxEx4 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); - this.cmbSet = new System.Windows.Forms.ComboBox(); - this.lblSet = new System.Windows.Forms.Label(); - this.cmbSpProdType = new System.Windows.Forms.ComboBox(); - this.label17 = new System.Windows.Forms.Label(); - this.cmbWxSafe = new System.Windows.Forms.ComboBox(); - this.label13 = new System.Windows.Forms.Label(); - this.cmbSourceType = new System.Windows.Forms.ComboBox(); + this.btnFilterBound = new DevComponents.DotNetBar.PanelEx(); this.label12 = new System.Windows.Forms.Label(); + this.txtFilterBound = new System.Windows.Forms.TextBox(); + this.label1 = new System.Windows.Forms.Label(); + this.cmbCateFilter3 = new System.Windows.Forms.ComboBox(); + this.txtExtCodeFilter = new System.Windows.Forms.TextBox(); + this.label21 = new System.Windows.Forms.Label(); + this.cmbGroupFilter = new System.Windows.Forms.ComboBox(); + this.txtIdFilter = new System.Windows.Forms.TextBox(); + this.cmbJstInitSet = new System.Windows.Forms.ComboBox(); + this.lblIdFilter = new System.Windows.Forms.Label(); + this.cmbCateFilter2 = new System.Windows.Forms.ComboBox(); + this.lblExtCodeFilter = new System.Windows.Forms.Label(); + this.lblJstInitSet = new System.Windows.Forms.Label(); + this.lblGroupFilter = new System.Windows.Forms.Label(); + this.label19 = new System.Windows.Forms.Label(); + this.cmbSourceType = new System.Windows.Forms.ComboBox(); + this.lblSourceType = new System.Windows.Forms.Label(); this.btnClearFilter = new DevComponents.DotNetBar.PanelEx(); this.lblGoodsCount = new System.Windows.Forms.Label(); + this.cmbWxSafe = new System.Windows.Forms.ComboBox(); + this.lblWxSafe = new System.Windows.Forms.Label(); this.btnClearUpload = new DevComponents.DotNetBar.PanelEx(); - this.txtIdFilter = new System.Windows.Forms.TextBox(); - this.label1 = new System.Windows.Forms.Label(); - this.cmbCateFilter = new System.Windows.Forms.ComboBox(); + this.cmbCateFilter1 = new System.Windows.Forms.ComboBox(); this.label2 = new System.Windows.Forms.Label(); - this.cmbGroupFilter = new System.Windows.Forms.ComboBox(); - this.label20 = new System.Windows.Forms.Label(); - this.txtExtCodeFilter = new System.Windows.Forms.TextBox(); this.lblWaitToUp = new System.Windows.Forms.Label(); this.txtAddCount = new System.Windows.Forms.TextBox(); this.panelEx2 = new DevComponents.DotNetBar.PanelEx(); - this.label16 = new System.Windows.Forms.Label(); this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); - this.btnRefreshNum = new DevComponents.DotNetBar.PanelEx(); + this.btnEmptyShop = new DevComponents.DotNetBar.PanelEx(); + this.btnFilterShop = new DevComponents.DotNetBar.PanelEx(); + this.label17 = new System.Windows.Forms.Label(); + this.txtFilterShopNotes = new System.Windows.Forms.TextBox(); + this.label16 = new System.Windows.Forms.Label(); + this.txtFilterShopName = new System.Windows.Forms.TextBox(); this.btnRefreshShop = new DevComponents.DotNetBar.PanelEx(); this.splitContainer3 = new System.Windows.Forms.SplitContainer(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); + this.btnRefreshNum = new DevComponents.DotNetBar.PanelEx(); this.pbLoadingShop = new System.Windows.Forms.PictureBox(); this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); @@ -116,8 +130,8 @@ namespace TemuKJD.WXForms.ProductForms this.colOnSaleNum = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colRemaining = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.并发上传 = new DevComponents.DotNetBar.PanelEx(); this.pbLoading = new System.Windows.Forms.PictureBox(); + this.并发上传 = new DevComponents.DotNetBar.PanelEx(); this.label11 = new System.Windows.Forms.Label(); this.txtSinglePriceAdd = new System.Windows.Forms.TextBox(); this.chkTestNoAuditUpload = new TemuKJD.UserComponent.UcCheckBox(this.components); @@ -194,7 +208,7 @@ namespace TemuKJD.WXForms.ProductForms // this.splitContainer1.Panel2.Controls.Add(this.splitContainer3); this.splitContainer1.Size = new System.Drawing.Size(1523, 546); - this.splitContainer1.SplitterDistance = 152; + this.splitContainer1.SplitterDistance = 158; this.splitContainer1.TabIndex = 11; // // ucGroupBoxEx2 @@ -204,6 +218,8 @@ namespace TemuKJD.WXForms.ProductForms | System.Windows.Forms.AnchorStyles.Right))); this.ucGroupBoxEx2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.ucGroupBoxEx2.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx2.Controls.Add(this.txtShippingPriceTimes); + this.ucGroupBoxEx2.Controls.Add(this.label13); this.ucGroupBoxEx2.Controls.Add(this.label18); this.ucGroupBoxEx2.Controls.Add(this.txtPreDays); this.ucGroupBoxEx2.Controls.Add(this.chkPreSale); @@ -234,13 +250,34 @@ namespace TemuKJD.WXForms.ProductForms this.ucGroupBoxEx2.Controls.Add(this.label4); this.ucGroupBoxEx2.Controls.Add(this.label9); this.ucGroupBoxEx2.Controls.Add(this.chkStepAddPrice); - this.ucGroupBoxEx2.Location = new System.Drawing.Point(459, 2); + this.ucGroupBoxEx2.Location = new System.Drawing.Point(549, 2); this.ucGroupBoxEx2.Name = "ucGroupBoxEx2"; - this.ucGroupBoxEx2.Size = new System.Drawing.Size(1062, 152); + this.ucGroupBoxEx2.Size = new System.Drawing.Size(972, 158); this.ucGroupBoxEx2.TabIndex = 667; this.ucGroupBoxEx2.TabStop = false; this.ucGroupBoxEx2.Text = "商品上传"; // + // txtShippingPrice + // + this.txtShippingPriceTimes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.txtShippingPriceTimes.Location = new System.Drawing.Point(344, 128); + this.txtShippingPriceTimes.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtShippingPriceTimes.Name = "txtShippingPrice"; + this.txtShippingPriceTimes.Size = new System.Drawing.Size(32, 23); + this.txtShippingPriceTimes.TabIndex = 810; + this.txtShippingPriceTimes.Text = "1.5"; + // + // label13 + // + this.label13.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.label13.AutoSize = true; + this.label13.Location = new System.Drawing.Point(307, 131); + this.label13.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(41, 17); + this.label13.TabIndex = 811; + this.label13.Text = "运费×"; + // // label18 // this.label18.AutoSize = true; @@ -376,7 +413,7 @@ namespace TemuKJD.WXForms.ProductForms // 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(935, 34); + this.label7.Location = new System.Drawing.Point(845, 34); this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(20, 17); @@ -386,7 +423,7 @@ namespace TemuKJD.WXForms.ProductForms // txtWaitSeconds // this.txtWaitSeconds.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.txtWaitSeconds.Location = new System.Drawing.Point(903, 31); + this.txtWaitSeconds.Location = new System.Drawing.Point(813, 31); this.txtWaitSeconds.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtWaitSeconds.Name = "txtWaitSeconds"; this.txtWaitSeconds.Size = new System.Drawing.Size(32, 23); @@ -398,7 +435,7 @@ namespace TemuKJD.WXForms.ProductForms // this.label6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(849, 34); + this.label6.Location = new System.Drawing.Point(759, 34); this.label6.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(56, 17); @@ -411,7 +448,7 @@ namespace TemuKJD.WXForms.ProductForms this.btnStop.CanvasColor = System.Drawing.SystemColors.Control; this.btnStop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnStop.DisabledBackColor = System.Drawing.Color.Empty; - this.btnStop.Location = new System.Drawing.Point(956, 59); + this.btnStop.Location = new System.Drawing.Point(866, 59); this.btnStop.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); this.btnStop.Name = "btnStop"; this.btnStop.Size = new System.Drawing.Size(84, 23); @@ -435,7 +472,7 @@ namespace TemuKJD.WXForms.ProductForms // this.chkAddMorePriceFirst.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.chkAddMorePriceFirst.AutoSize = true; - this.chkAddMorePriceFirst.Location = new System.Drawing.Point(213, 123); + this.chkAddMorePriceFirst.Location = new System.Drawing.Point(201, 129); this.chkAddMorePriceFirst.Name = "chkAddMorePriceFirst"; this.chkAddMorePriceFirst.Size = new System.Drawing.Size(111, 21); this.chkAddMorePriceFirst.TabIndex = 625; @@ -449,7 +486,7 @@ namespace TemuKJD.WXForms.ProductForms this.btnClearDgv.CanvasColor = System.Drawing.SystemColors.Control; this.btnClearDgv.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnClearDgv.DisabledBackColor = System.Drawing.Color.Empty; - this.btnClearDgv.Location = new System.Drawing.Point(956, 87); + this.btnClearDgv.Location = new System.Drawing.Point(866, 87); this.btnClearDgv.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); this.btnClearDgv.Name = "btnClearDgv"; this.btnClearDgv.Size = new System.Drawing.Size(84, 23); @@ -474,7 +511,7 @@ namespace TemuKJD.WXForms.ProductForms this.label14.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.label14.AutoSize = true; this.label14.ForeColor = System.Drawing.SystemColors.GrayText; - this.label14.Location = new System.Drawing.Point(8, 68); + this.label14.Location = new System.Drawing.Point(8, 74); this.label14.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label14.Name = "label14"; this.label14.Size = new System.Drawing.Size(68, 51); @@ -485,7 +522,7 @@ namespace TemuKJD.WXForms.ProductForms // this.label15.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(184, 125); + this.label15.Location = new System.Drawing.Point(180, 131); this.label15.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(20, 17); @@ -500,7 +537,7 @@ namespace TemuKJD.WXForms.ProductForms this.panel4.Controls.Add(this.panel3); this.panel4.Location = new System.Drawing.Point(76, 17); this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(366, 101); + this.panel4.Size = new System.Drawing.Size(366, 107); this.panel4.TabIndex = 577; // // panel3 @@ -513,7 +550,7 @@ namespace TemuKJD.WXForms.ProductForms this.panel3.Controls.Add(this.fPnlPriceRule); this.panel3.Location = new System.Drawing.Point(1, 1); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(364, 99); + this.panel3.Size = new System.Drawing.Size(364, 105); this.panel3.TabIndex = 541; // // fPnlPriceRule @@ -618,7 +655,7 @@ namespace TemuKJD.WXForms.ProductForms // txtAddMorePrice // this.txtAddMorePrice.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.txtAddMorePrice.Location = new System.Drawing.Point(153, 122); + this.txtAddMorePrice.Location = new System.Drawing.Point(149, 128); this.txtAddMorePrice.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtAddMorePrice.Name = "txtAddMorePrice"; this.txtAddMorePrice.Size = new System.Drawing.Size(31, 23); @@ -629,7 +666,7 @@ namespace TemuKJD.WXForms.ProductForms // txtAddTimes // this.txtAddTimes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.txtAddTimes.Location = new System.Drawing.Point(78, 122); + this.txtAddTimes.Location = new System.Drawing.Point(76, 128); this.txtAddTimes.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtAddTimes.Name = "txtAddTimes"; this.txtAddTimes.Size = new System.Drawing.Size(31, 23); @@ -641,7 +678,7 @@ namespace TemuKJD.WXForms.ProductForms // this.label10.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(109, 125); + this.label10.Location = new System.Drawing.Point(107, 131); this.label10.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label10.Name = "label10"; this.label10.Size = new System.Drawing.Size(44, 17); @@ -655,7 +692,7 @@ namespace TemuKJD.WXForms.ProductForms this.btnUpload.Cursor = System.Windows.Forms.Cursors.Hand; this.btnUpload.DisabledBackColor = System.Drawing.Color.Empty; this.btnUpload.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnUpload.Location = new System.Drawing.Point(956, 31); + this.btnUpload.Location = new System.Drawing.Point(866, 31); this.btnUpload.Name = "btnUpload"; this.btnUpload.Size = new System.Drawing.Size(84, 23); this.btnUpload.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -676,7 +713,7 @@ namespace TemuKJD.WXForms.ProductForms // txtStockNum // this.txtStockNum.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.txtStockNum.Location = new System.Drawing.Point(393, 122); + this.txtStockNum.Location = new System.Drawing.Point(410, 128); this.txtStockNum.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtStockNum.Name = "txtStockNum"; this.txtStockNum.Size = new System.Drawing.Size(32, 23); @@ -688,18 +725,18 @@ namespace TemuKJD.WXForms.ProductForms // this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(337, 125); + this.label4.Location = new System.Drawing.Point(379, 131); this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(56, 17); + this.label4.Size = new System.Drawing.Size(32, 17); this.label4.TabIndex = 531; - this.label4.Text = "库存数量"; + this.label4.Text = "库存"; // // label9 // this.label9.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(8, 125); + this.label9.Location = new System.Drawing.Point(8, 131); this.label9.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(68, 17); @@ -723,124 +760,246 @@ namespace TemuKJD.WXForms.ProductForms | System.Windows.Forms.AnchorStyles.Left))); this.ucGroupBoxEx4.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.ucGroupBoxEx4.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; - this.ucGroupBoxEx4.Controls.Add(this.cmbSet); - this.ucGroupBoxEx4.Controls.Add(this.lblSet); - this.ucGroupBoxEx4.Controls.Add(this.cmbSpProdType); - this.ucGroupBoxEx4.Controls.Add(this.label17); - this.ucGroupBoxEx4.Controls.Add(this.cmbWxSafe); - this.ucGroupBoxEx4.Controls.Add(this.label13); - this.ucGroupBoxEx4.Controls.Add(this.cmbSourceType); + this.ucGroupBoxEx4.Controls.Add(this.btnFilterBound); this.ucGroupBoxEx4.Controls.Add(this.label12); + this.ucGroupBoxEx4.Controls.Add(this.txtFilterBound); + this.ucGroupBoxEx4.Controls.Add(this.label1); + this.ucGroupBoxEx4.Controls.Add(this.cmbCateFilter3); + this.ucGroupBoxEx4.Controls.Add(this.txtExtCodeFilter); + this.ucGroupBoxEx4.Controls.Add(this.label21); + this.ucGroupBoxEx4.Controls.Add(this.cmbGroupFilter); + this.ucGroupBoxEx4.Controls.Add(this.txtIdFilter); + this.ucGroupBoxEx4.Controls.Add(this.cmbJstInitSet); + this.ucGroupBoxEx4.Controls.Add(this.lblIdFilter); + this.ucGroupBoxEx4.Controls.Add(this.cmbCateFilter2); + this.ucGroupBoxEx4.Controls.Add(this.lblExtCodeFilter); + this.ucGroupBoxEx4.Controls.Add(this.lblJstInitSet); + this.ucGroupBoxEx4.Controls.Add(this.lblGroupFilter); + this.ucGroupBoxEx4.Controls.Add(this.label19); + this.ucGroupBoxEx4.Controls.Add(this.cmbSourceType); + this.ucGroupBoxEx4.Controls.Add(this.lblSourceType); this.ucGroupBoxEx4.Controls.Add(this.btnClearFilter); this.ucGroupBoxEx4.Controls.Add(this.lblGoodsCount); + this.ucGroupBoxEx4.Controls.Add(this.cmbWxSafe); + this.ucGroupBoxEx4.Controls.Add(this.lblWxSafe); this.ucGroupBoxEx4.Controls.Add(this.btnClearUpload); - this.ucGroupBoxEx4.Controls.Add(this.txtIdFilter); - this.ucGroupBoxEx4.Controls.Add(this.label1); - this.ucGroupBoxEx4.Controls.Add(this.cmbCateFilter); + this.ucGroupBoxEx4.Controls.Add(this.cmbCateFilter1); this.ucGroupBoxEx4.Controls.Add(this.label2); - this.ucGroupBoxEx4.Controls.Add(this.cmbGroupFilter); - this.ucGroupBoxEx4.Controls.Add(this.label20); - this.ucGroupBoxEx4.Controls.Add(this.txtExtCodeFilter); this.ucGroupBoxEx4.Controls.Add(this.lblWaitToUp); this.ucGroupBoxEx4.Controls.Add(this.txtAddCount); this.ucGroupBoxEx4.Controls.Add(this.panelEx2); - this.ucGroupBoxEx4.Controls.Add(this.label16); this.ucGroupBoxEx4.Location = new System.Drawing.Point(139, 2); this.ucGroupBoxEx4.Name = "ucGroupBoxEx4"; - this.ucGroupBoxEx4.Size = new System.Drawing.Size(320, 152); + this.ucGroupBoxEx4.Size = new System.Drawing.Size(410, 158); this.ucGroupBoxEx4.TabIndex = 666; this.ucGroupBoxEx4.TabStop = false; this.ucGroupBoxEx4.Text = "待传商品"; // - // cmbSet + // btnFilterBound // - this.cmbSet.FormattingEnabled = true; - this.cmbSet.Items.AddRange(new object[] { + this.btnFilterBound.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnFilterBound.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnFilterBound.DisabledBackColor = System.Drawing.Color.Empty; + this.btnFilterBound.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnFilterBound.Location = new System.Drawing.Point(264, 101); + this.btnFilterBound.Name = "btnFilterBound"; + this.btnFilterBound.Size = new System.Drawing.Size(42, 21); + this.btnFilterBound.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnFilterBound.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnFilterBound.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnFilterBound.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnFilterBound.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnFilterBound.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnFilterBound.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnFilterBound.Style.GradientAngle = 90; + this.btnFilterBound.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnFilterBound.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnFilterBound.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnFilterBound.TabIndex = 726; + this.btnFilterBound.Text = "过滤"; + this.btnFilterBound.Click += new System.EventHandler(this.btnFilterBound_Click); + // + // label12 + // + this.label12.AutoSize = true; + this.label12.Location = new System.Drawing.Point(221, 103); + this.label12.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(44, 17); + this.label12.TabIndex = 722; + this.label12.Text = "元商品"; + // + // txtFilterBound + // + this.txtFilterBound.Font = new System.Drawing.Font("微软雅黑", 10F); + this.txtFilterBound.Location = new System.Drawing.Point(178, 99); + this.txtFilterBound.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtFilterBound.Name = "txtFilterBound"; + this.txtFilterBound.Size = new System.Drawing.Size(43, 25); + this.txtFilterBound.TabIndex = 721; + this.txtFilterBound.Text = "1000"; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(4, 103); + this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(176, 17); + this.label1.TabIndex = 720; + this.label1.Text = "过滤待上传列表类目保证金超过"; + // + // cmbCateFilter3 + // + this.cmbCateFilter3.FormattingEnabled = true; + this.cmbCateFilter3.Location = new System.Drawing.Point(309, 18); + this.cmbCateFilter3.Name = "cmbCateFilter3"; + this.cmbCateFilter3.Size = new System.Drawing.Size(92, 25); + this.cmbCateFilter3.TabIndex = 710; + this.cmbCateFilter3.SelectedIndexChanged += new System.EventHandler(this.cmbCateFilter3_SelectedIndexChanged); + // + // txtExtCodeFilter + // + this.txtExtCodeFilter.Font = new System.Drawing.Font("微软雅黑", 10F); + this.txtExtCodeFilter.Location = new System.Drawing.Point(310, 72); + this.txtExtCodeFilter.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtExtCodeFilter.Name = "txtExtCodeFilter"; + this.txtExtCodeFilter.Size = new System.Drawing.Size(92, 25); + this.txtExtCodeFilter.TabIndex = 555; + this.txtExtCodeFilter.Visible = false; + // + // label21 + // + this.label21.AutoSize = true; + this.label21.Location = new System.Drawing.Point(271, 22); + this.label21.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label21.Name = "label21"; + this.label21.Size = new System.Drawing.Size(39, 17); + this.label21.TabIndex = 709; + this.label21.Text = "类目3"; + // + // cmbGroupFilter + // + this.cmbGroupFilter.FormattingEnabled = true; + this.cmbGroupFilter.Location = new System.Drawing.Point(48, 72); + this.cmbGroupFilter.Name = "cmbGroupFilter"; + this.cmbGroupFilter.Size = new System.Drawing.Size(92, 25); + this.cmbGroupFilter.TabIndex = 641; + this.cmbGroupFilter.Visible = false; + // + // txtIdFilter + // + this.txtIdFilter.Font = new System.Drawing.Font("微软雅黑", 10F); + this.txtIdFilter.Location = new System.Drawing.Point(179, 72); + this.txtIdFilter.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtIdFilter.Name = "txtIdFilter"; + this.txtIdFilter.Size = new System.Drawing.Size(92, 25); + this.txtIdFilter.TabIndex = 652; + this.txtIdFilter.Visible = false; + // + // cmbJstInitSet + // + this.cmbJstInitSet.FormattingEnabled = true; + this.cmbJstInitSet.Items.AddRange(new object[] { "", "已设置", "未设置"}); - this.cmbSet.Location = new System.Drawing.Point(182, 96); - this.cmbSet.Name = "cmbSet"; - this.cmbSet.Size = new System.Drawing.Size(67, 25); - this.cmbSet.TabIndex = 697; + this.cmbJstInitSet.Location = new System.Drawing.Point(178, 45); + this.cmbJstInitSet.Name = "cmbJstInitSet"; + this.cmbJstInitSet.Size = new System.Drawing.Size(92, 25); + this.cmbJstInitSet.TabIndex = 697; + this.cmbJstInitSet.Text = "已设置"; // - // lblSet + // lblIdFilter // - this.lblSet.AutoSize = true; - this.lblSet.Location = new System.Drawing.Point(128, 100); - this.lblSet.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.lblSet.Name = "lblSet"; - this.lblSet.Size = new System.Drawing.Size(56, 17); - this.lblSet.TabIndex = 696; - this.lblSet.Text = "分销设置"; + this.lblIdFilter.AutoSize = true; + this.lblIdFilter.Location = new System.Drawing.Point(159, 76); + this.lblIdFilter.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.lblIdFilter.Name = "lblIdFilter"; + this.lblIdFilter.Size = new System.Drawing.Size(21, 17); + this.lblIdFilter.TabIndex = 651; + this.lblIdFilter.Text = "ID"; + this.lblIdFilter.Visible = false; // - // cmbSpProdType + // cmbCateFilter2 // - this.cmbSpProdType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cmbSpProdType.FormattingEnabled = true; - this.cmbSpProdType.Items.AddRange(new object[] { - "普通商品", - "书籍"}); - this.cmbSpProdType.Location = new System.Drawing.Point(36, 96); - this.cmbSpProdType.Name = "cmbSpProdType"; - this.cmbSpProdType.Size = new System.Drawing.Size(92, 25); - this.cmbSpProdType.TabIndex = 686; + this.cmbCateFilter2.FormattingEnabled = true; + this.cmbCateFilter2.Location = new System.Drawing.Point(178, 18); + this.cmbCateFilter2.Name = "cmbCateFilter2"; + this.cmbCateFilter2.Size = new System.Drawing.Size(92, 25); + this.cmbCateFilter2.TabIndex = 708; + this.cmbCateFilter2.SelectedIndexChanged += new System.EventHandler(this.cmbCateFilter2_SelectedIndexChanged); // - // label17 + // lblExtCodeFilter // - this.label17.AutoSize = true; - this.label17.Location = new System.Drawing.Point(7, 100); - this.label17.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(32, 17); - this.label17.TabIndex = 685; - this.label17.Text = "类别"; + this.lblExtCodeFilter.AutoSize = true; + this.lblExtCodeFilter.Location = new System.Drawing.Point(279, 76); + this.lblExtCodeFilter.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.lblExtCodeFilter.Name = "lblExtCodeFilter"; + this.lblExtCodeFilter.Size = new System.Drawing.Size(32, 17); + this.lblExtCodeFilter.TabIndex = 560; + this.lblExtCodeFilter.Text = "货号"; + this.lblExtCodeFilter.Visible = false; // - // cmbWxSafe + // lblJstInitSet // - this.cmbWxSafe.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cmbWxSafe.FormattingEnabled = true; - this.cmbWxSafe.Items.AddRange(new object[] { - "安全商品", - "未校验"}); - this.cmbWxSafe.Location = new System.Drawing.Point(182, 69); - this.cmbWxSafe.Name = "cmbWxSafe"; - this.cmbWxSafe.Size = new System.Drawing.Size(67, 25); - this.cmbWxSafe.TabIndex = 675; + this.lblJstInitSet.AutoSize = true; + this.lblJstInitSet.Location = new System.Drawing.Point(147, 49); + this.lblJstInitSet.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.lblJstInitSet.Name = "lblJstInitSet"; + this.lblJstInitSet.Size = new System.Drawing.Size(32, 17); + this.lblJstInitSet.TabIndex = 696; + this.lblJstInitSet.Text = "分销"; // - // label13 + // lblGroupFilter // - this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(128, 73); - this.label13.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(56, 17); - this.label13.TabIndex = 674; - this.label13.Text = "微信安检"; + this.lblGroupFilter.AutoSize = true; + this.lblGroupFilter.Location = new System.Drawing.Point(16, 76); + this.lblGroupFilter.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.lblGroupFilter.Name = "lblGroupFilter"; + this.lblGroupFilter.Size = new System.Drawing.Size(32, 17); + this.lblGroupFilter.TabIndex = 570; + this.lblGroupFilter.Text = "分组"; + this.lblGroupFilter.Visible = false; + // + // label19 + // + this.label19.AutoSize = true; + this.label19.Location = new System.Drawing.Point(140, 22); + this.label19.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label19.Name = "label19"; + this.label19.Size = new System.Drawing.Size(39, 17); + this.label19.TabIndex = 707; + this.label19.Text = "类目2"; // // cmbSourceType // this.cmbSourceType.FormattingEnabled = true; this.cmbSourceType.Items.AddRange(new object[] { "", - "店铺采集", "厂商直采", + "店铺采集", "机会商品", "外部数据"}); - this.cmbSourceType.Location = new System.Drawing.Point(36, 69); + this.cmbSourceType.Location = new System.Drawing.Point(309, 45); this.cmbSourceType.Name = "cmbSourceType"; this.cmbSourceType.Size = new System.Drawing.Size(92, 25); this.cmbSourceType.TabIndex = 673; + this.cmbSourceType.Text = "厂商直采"; + this.cmbSourceType.Visible = false; + this.cmbSourceType.SelectedIndexChanged += new System.EventHandler(this.cmbSourceType_SelectedIndexChanged); + this.cmbSourceType.TextChanged += new System.EventHandler(this.cmbSourceType_TextChanged); // - // label12 + // lblSourceType // - this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(7, 73); - this.label12.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(32, 17); - this.label12.TabIndex = 672; - this.label12.Text = "来源"; + this.lblSourceType.AutoSize = true; + this.lblSourceType.Location = new System.Drawing.Point(278, 48); + this.lblSourceType.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.lblSourceType.Name = "lblSourceType"; + this.lblSourceType.Size = new System.Drawing.Size(32, 17); + this.lblSourceType.TabIndex = 672; + this.lblSourceType.Text = "来源"; + this.lblSourceType.Visible = false; // // btnClearFilter // @@ -848,10 +1007,10 @@ namespace TemuKJD.WXForms.ProductForms this.btnClearFilter.CanvasColor = System.Drawing.SystemColors.Control; this.btnClearFilter.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnClearFilter.DisabledBackColor = System.Drawing.Color.Empty; - this.btnClearFilter.Location = new System.Drawing.Point(253, 17); + this.btnClearFilter.Location = new System.Drawing.Point(343, 99); this.btnClearFilter.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); this.btnClearFilter.Name = "btnClearFilter"; - this.btnClearFilter.Size = new System.Drawing.Size(58, 50); + this.btnClearFilter.Size = new System.Drawing.Size(58, 25); this.btnClearFilter.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnClearFilter.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); this.btnClearFilter.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); @@ -865,13 +1024,13 @@ namespace TemuKJD.WXForms.ProductForms this.btnClearFilter.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnClearFilter.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; this.btnClearFilter.TabIndex = 559; - this.btnClearFilter.Text = "清除\r\n筛选"; + this.btnClearFilter.Text = "清除筛选"; this.btnClearFilter.Click += new System.EventHandler(this.btnClearFilter_Click); // // lblGoodsCount // this.lblGoodsCount.AutoSize = true; - this.lblGoodsCount.Location = new System.Drawing.Point(9, 126); + this.lblGoodsCount.Location = new System.Drawing.Point(9, 130); this.lblGoodsCount.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.lblGoodsCount.Name = "lblGoodsCount"; this.lblGoodsCount.Size = new System.Drawing.Size(71, 17); @@ -879,16 +1038,39 @@ namespace TemuKJD.WXForms.ProductForms this.lblGoodsCount.Text = "产品库 0 件"; this.lblGoodsCount.Click += new System.EventHandler(this.lblGoodsCount_Click); // + // cmbWxSafe + // + this.cmbWxSafe.FormattingEnabled = true; + this.cmbWxSafe.Items.AddRange(new object[] { + "安全商品+未校验", + "安全商品", + "未校验"}); + this.cmbWxSafe.Location = new System.Drawing.Point(47, 45); + this.cmbWxSafe.Name = "cmbWxSafe"; + this.cmbWxSafe.Size = new System.Drawing.Size(92, 25); + this.cmbWxSafe.TabIndex = 675; + this.cmbWxSafe.Text = "安全+未校验"; + // + // lblWxSafe + // + this.lblWxSafe.AutoSize = true; + this.lblWxSafe.Location = new System.Drawing.Point(4, 48); + this.lblWxSafe.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.lblWxSafe.Name = "lblWxSafe"; + this.lblWxSafe.Size = new System.Drawing.Size(44, 17); + this.lblWxSafe.TabIndex = 674; + this.lblWxSafe.Text = "微安检"; + // // btnClearUpload // this.btnClearUpload.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.btnClearUpload.CanvasColor = System.Drawing.SystemColors.Control; this.btnClearUpload.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnClearUpload.DisabledBackColor = System.Drawing.Color.Empty; - this.btnClearUpload.Location = new System.Drawing.Point(253, 98); + this.btnClearUpload.Location = new System.Drawing.Point(343, 126); this.btnClearUpload.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); this.btnClearUpload.Name = "btnClearUpload"; - this.btnClearUpload.Size = new System.Drawing.Size(58, 23); + this.btnClearUpload.Size = new System.Drawing.Size(58, 25); this.btnClearUpload.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnClearUpload.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); this.btnClearUpload.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); @@ -905,67 +1087,24 @@ namespace TemuKJD.WXForms.ProductForms this.btnClearUpload.Text = "清空待传"; this.btnClearUpload.Click += new System.EventHandler(this.btnClearUpload_Click); // - // txtIdFilter + // cmbCateFilter1 // - this.txtIdFilter.Location = new System.Drawing.Point(157, 44); - this.txtIdFilter.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); - this.txtIdFilter.Name = "txtIdFilter"; - this.txtIdFilter.Size = new System.Drawing.Size(92, 23); - this.txtIdFilter.TabIndex = 652; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(129, 48); - this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(32, 17); - this.label1.TabIndex = 651; - this.label1.Text = "编号"; - // - // cmbCateFilter - // - this.cmbCateFilter.FormattingEnabled = true; - this.cmbCateFilter.Location = new System.Drawing.Point(157, 17); - this.cmbCateFilter.Name = "cmbCateFilter"; - this.cmbCateFilter.Size = new System.Drawing.Size(92, 25); - this.cmbCateFilter.TabIndex = 663; + this.cmbCateFilter1.FormattingEnabled = true; + this.cmbCateFilter1.Location = new System.Drawing.Point(47, 18); + this.cmbCateFilter1.Name = "cmbCateFilter1"; + this.cmbCateFilter1.Size = new System.Drawing.Size(92, 25); + this.cmbCateFilter1.TabIndex = 663; + this.cmbCateFilter1.SelectedIndexChanged += new System.EventHandler(this.cmbCateFilter1_SelectedIndexChanged); // // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(129, 23); + this.label2.Location = new System.Drawing.Point(9, 22); this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(32, 17); + this.label2.Size = new System.Drawing.Size(39, 17); this.label2.TabIndex = 662; - this.label2.Text = "类目"; - // - // cmbGroupFilter - // - this.cmbGroupFilter.FormattingEnabled = true; - this.cmbGroupFilter.Location = new System.Drawing.Point(36, 17); - this.cmbGroupFilter.Name = "cmbGroupFilter"; - this.cmbGroupFilter.Size = new System.Drawing.Size(92, 25); - this.cmbGroupFilter.TabIndex = 641; - // - // label20 - // - this.label20.AutoSize = true; - this.label20.Location = new System.Drawing.Point(7, 20); - this.label20.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(32, 17); - this.label20.TabIndex = 570; - this.label20.Text = "分组"; - // - // txtExtCodeFilter - // - this.txtExtCodeFilter.Location = new System.Drawing.Point(36, 44); - this.txtExtCodeFilter.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); - this.txtExtCodeFilter.Name = "txtExtCodeFilter"; - this.txtExtCodeFilter.Size = new System.Drawing.Size(92, 23); - this.txtExtCodeFilter.TabIndex = 555; + this.label2.Text = "类目1"; // // lblWaitToUp // @@ -973,7 +1112,7 @@ namespace TemuKJD.WXForms.ProductForms this.lblWaitToUp.Cursor = System.Windows.Forms.Cursors.Hand; this.lblWaitToUp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblWaitToUp.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.lblWaitToUp.Location = new System.Drawing.Point(119, 126); + this.lblWaitToUp.Location = new System.Drawing.Point(120, 130); this.lblWaitToUp.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.lblWaitToUp.Name = "lblWaitToUp"; this.lblWaitToUp.Size = new System.Drawing.Size(71, 17); @@ -983,10 +1122,11 @@ namespace TemuKJD.WXForms.ProductForms // // txtAddCount // - this.txtAddCount.Location = new System.Drawing.Point(213, 123); + this.txtAddCount.Font = new System.Drawing.Font("微软雅黑", 10F); + this.txtAddCount.Location = new System.Drawing.Point(245, 126); this.txtAddCount.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtAddCount.Name = "txtAddCount"; - this.txtAddCount.Size = new System.Drawing.Size(36, 23); + this.txtAddCount.Size = new System.Drawing.Size(36, 25); this.txtAddCount.TabIndex = 536; this.txtAddCount.Text = "500"; // @@ -996,9 +1136,9 @@ namespace TemuKJD.WXForms.ProductForms this.panelEx2.Cursor = System.Windows.Forms.Cursors.Hand; this.panelEx2.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.panelEx2.Location = new System.Drawing.Point(253, 123); + this.panelEx2.Location = new System.Drawing.Point(283, 126); this.panelEx2.Name = "panelEx2"; - this.panelEx2.Size = new System.Drawing.Size(58, 23); + this.panelEx2.Size = new System.Drawing.Size(58, 25); this.panelEx2.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelEx2.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.panelEx2.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -1014,55 +1154,114 @@ namespace TemuKJD.WXForms.ProductForms this.panelEx2.Text = "随机添加"; this.panelEx2.Click += new System.EventHandler(this.btnRandomAdd_Click); // - // label16 - // - this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(7, 47); - this.label16.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(32, 17); - this.label16.TabIndex = 560; - this.label16.Text = "货号"; - // // ucGroupBoxEx1 // this.ucGroupBoxEx1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; - this.ucGroupBoxEx1.Controls.Add(this.btnRefreshNum); + this.ucGroupBoxEx1.Controls.Add(this.btnEmptyShop); + this.ucGroupBoxEx1.Controls.Add(this.btnFilterShop); + this.ucGroupBoxEx1.Controls.Add(this.label17); + this.ucGroupBoxEx1.Controls.Add(this.txtFilterShopNotes); + this.ucGroupBoxEx1.Controls.Add(this.label16); + this.ucGroupBoxEx1.Controls.Add(this.txtFilterShopName); this.ucGroupBoxEx1.Controls.Add(this.btnRefreshShop); this.ucGroupBoxEx1.Location = new System.Drawing.Point(3, 2); this.ucGroupBoxEx1.Name = "ucGroupBoxEx1"; - this.ucGroupBoxEx1.Size = new System.Drawing.Size(136, 152); + this.ucGroupBoxEx1.Size = new System.Drawing.Size(136, 158); this.ucGroupBoxEx1.TabIndex = 399; this.ucGroupBoxEx1.TabStop = false; this.ucGroupBoxEx1.Text = "基础"; // - // btnRefreshNum + // btnEmptyShop // - this.btnRefreshNum.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btnRefreshNum.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnRefreshNum.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnRefreshNum.DisabledBackColor = System.Drawing.Color.Empty; - this.btnRefreshNum.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnRefreshNum.Location = new System.Drawing.Point(17, 99); - this.btnRefreshNum.Name = "btnRefreshNum"; - this.btnRefreshNum.Size = new System.Drawing.Size(102, 24); - this.btnRefreshNum.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnRefreshNum.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnRefreshNum.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnRefreshNum.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.btnRefreshNum.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.btnRefreshNum.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.btnRefreshNum.Style.ForeColor.Color = System.Drawing.Color.White; - this.btnRefreshNum.Style.GradientAngle = 90; - this.btnRefreshNum.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnRefreshNum.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnRefreshNum.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnRefreshNum.TabIndex = 438; - this.btnRefreshNum.Text = "刷新在售数"; - this.btnRefreshNum.Click += new System.EventHandler(this.btnRefreshNum_Click); + this.btnEmptyShop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnEmptyShop.CanvasColor = System.Drawing.SystemColors.Control; + this.btnEmptyShop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnEmptyShop.DisabledBackColor = System.Drawing.Color.Empty; + this.btnEmptyShop.Location = new System.Drawing.Point(19, 119); + this.btnEmptyShop.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); + this.btnEmptyShop.Name = "btnEmptyShop"; + this.btnEmptyShop.Size = new System.Drawing.Size(37, 24); + this.btnEmptyShop.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnEmptyShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnEmptyShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnEmptyShop.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.btnEmptyShop.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnEmptyShop.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.btnEmptyShop.Style.GradientAngle = 90; + this.btnEmptyShop.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; + this.btnEmptyShop.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnEmptyShop.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnEmptyShop.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnEmptyShop.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.btnEmptyShop.TabIndex = 713; + this.btnEmptyShop.Text = "清空"; + this.btnEmptyShop.Click += new System.EventHandler(this.btnEmptyShop_Click); + // + // btnFilterShop + // + this.btnFilterShop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnFilterShop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnFilterShop.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnFilterShop.DisabledBackColor = System.Drawing.Color.Empty; + this.btnFilterShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnFilterShop.Location = new System.Drawing.Point(58, 119); + this.btnFilterShop.Name = "btnFilterShop"; + this.btnFilterShop.Size = new System.Drawing.Size(61, 24); + this.btnFilterShop.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnFilterShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnFilterShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnFilterShop.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnFilterShop.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnFilterShop.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnFilterShop.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnFilterShop.Style.GradientAngle = 90; + this.btnFilterShop.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnFilterShop.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnFilterShop.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnFilterShop.TabIndex = 703; + this.btnFilterShop.Text = "过滤店铺"; + this.btnFilterShop.Click += new System.EventHandler(this.btnFilterShop_Click); + // + // label17 + // + this.label17.AutoSize = true; + this.label17.Location = new System.Drawing.Point(16, 64); + this.label17.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label17.Name = "label17"; + this.label17.Size = new System.Drawing.Size(32, 17); + this.label17.TabIndex = 699; + this.label17.Text = "名称"; + // + // txtFilterShopNotes + // + this.txtFilterShopNotes.Font = new System.Drawing.Font("微软雅黑", 10F); + this.txtFilterShopNotes.Location = new System.Drawing.Point(48, 90); + this.txtFilterShopNotes.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtFilterShopNotes.Name = "txtFilterShopNotes"; + this.txtFilterShopNotes.Size = new System.Drawing.Size(71, 25); + this.txtFilterShopNotes.TabIndex = 698; + // + // label16 + // + this.label16.AutoSize = true; + this.label16.Location = new System.Drawing.Point(16, 94); + this.label16.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label16.Name = "label16"; + this.label16.Size = new System.Drawing.Size(32, 17); + this.label16.TabIndex = 697; + this.label16.Text = "备注"; + // + // txtFilterShopName + // + this.txtFilterShopName.Font = new System.Drawing.Font("微软雅黑", 10F); + this.txtFilterShopName.Location = new System.Drawing.Point(48, 60); + this.txtFilterShopName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtFilterShopName.Name = "txtFilterShopName"; + this.txtFilterShopName.Size = new System.Drawing.Size(71, 25); + this.txtFilterShopName.TabIndex = 653; // // btnRefreshShop // @@ -1104,8 +1303,8 @@ namespace TemuKJD.WXForms.ProductForms // splitContainer3.Panel2 // this.splitContainer3.Panel2.Controls.Add(this.splitContainer4); - this.splitContainer3.Size = new System.Drawing.Size(1523, 390); - this.splitContainer3.SplitterDistance = 360; + this.splitContainer3.Size = new System.Drawing.Size(1523, 384); + this.splitContainer3.SplitterDistance = 354; this.splitContainer3.TabIndex = 1; // // splitContainer2 @@ -1117,28 +1316,55 @@ namespace TemuKJD.WXForms.ProductForms // // splitContainer2.Panel1 // + this.splitContainer2.Panel1.Controls.Add(this.btnRefreshNum); this.splitContainer2.Panel1.Controls.Add(this.pbLoadingShop); this.splitContainer2.Panel1.Controls.Add(this.dgvShop); this.splitContainer2.Panel1.Padding = new System.Windows.Forms.Padding(4, 0, 0, 0); // // splitContainer2.Panel2 // - this.splitContainer2.Panel2.Controls.Add(this.并发上传); this.splitContainer2.Panel2.Controls.Add(this.pbLoading); + this.splitContainer2.Panel2.Controls.Add(this.并发上传); this.splitContainer2.Panel2.Controls.Add(this.label11); this.splitContainer2.Panel2.Controls.Add(this.txtSinglePriceAdd); this.splitContainer2.Panel2.Controls.Add(this.chkTestNoAuditUpload); this.splitContainer2.Panel2.Controls.Add(this.dgvSelectProduct); this.splitContainer2.Panel2.Padding = new System.Windows.Forms.Padding(0, 0, 4, 0); - this.splitContainer2.Size = new System.Drawing.Size(1523, 360); + this.splitContainer2.Size = new System.Drawing.Size(1523, 354); this.splitContainer2.SplitterDistance = 350; this.splitContainer2.TabIndex = 0; // + // btnRefreshNum + // + this.btnRefreshNum.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnRefreshNum.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnRefreshNum.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnRefreshNum.DisabledBackColor = System.Drawing.Color.Empty; + this.btnRefreshNum.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnRefreshNum.Location = new System.Drawing.Point(12, 33); + this.btnRefreshNum.Name = "btnRefreshNum"; + this.btnRefreshNum.Size = new System.Drawing.Size(102, 24); + this.btnRefreshNum.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnRefreshNum.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnRefreshNum.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnRefreshNum.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnRefreshNum.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnRefreshNum.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnRefreshNum.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnRefreshNum.Style.GradientAngle = 90; + this.btnRefreshNum.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnRefreshNum.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnRefreshNum.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnRefreshNum.TabIndex = 438; + this.btnRefreshNum.Text = "刷新在售数"; + this.btnRefreshNum.Visible = false; + this.btnRefreshNum.Click += new System.EventHandler(this.btnRefreshNum_Click); + // // pbLoadingShop // this.pbLoadingShop.Anchor = System.Windows.Forms.AnchorStyles.None; this.pbLoadingShop.Image = global::TemuKJD.Properties.Resources.loading_blue; - this.pbLoadingShop.Location = new System.Drawing.Point(150, 155); + this.pbLoadingShop.Location = new System.Drawing.Point(150, 152); this.pbLoadingShop.Name = "pbLoadingShop"; this.pbLoadingShop.Size = new System.Drawing.Size(50, 50); this.pbLoadingShop.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -1150,19 +1376,19 @@ namespace TemuKJD.WXForms.ProductForms // this.dgvShop.AllowUserToAddRows = false; this.dgvShop.AllowUserToDeleteRows = false; - dataGridViewCellStyle19.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle19; + dataGridViewCellStyle7.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle7; this.dgvShop.AutoRowNumber = true; this.dgvShop.BackgroundColor = System.Drawing.Color.White; this.dgvShop.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle20.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle20.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle20.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle20.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle20.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle20; + dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle8; this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colSelect, @@ -1183,7 +1409,7 @@ namespace TemuKJD.WXForms.ProductForms this.dgvShop.ReadOnly = true; this.dgvShop.RowHeadersWidth = 25; this.dgvShop.RowTemplate.Height = 23; - this.dgvShop.Size = new System.Drawing.Size(346, 360); + this.dgvShop.Size = new System.Drawing.Size(346, 354); this.dgvShop.TabIndex = 6; this.dgvShop.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellContentClick); // @@ -1222,7 +1448,7 @@ namespace TemuKJD.WXForms.ProductForms // // colShopNotes // - this.colShopNotes.HeaderText = "分组"; + this.colShopNotes.HeaderText = "备注"; this.colShopNotes.Name = "colShopNotes"; this.colShopNotes.ReadOnly = true; this.colShopNotes.Width = 66; @@ -1283,6 +1509,18 @@ namespace TemuKJD.WXForms.ProductForms this.colMessage.Name = "colMessage"; this.colMessage.ReadOnly = true; // + // pbLoading + // + this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None; + this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue; + this.pbLoading.Location = new System.Drawing.Point(559, 152); + this.pbLoading.Name = "pbLoading"; + this.pbLoading.Size = new System.Drawing.Size(50, 50); + this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pbLoading.TabIndex = 780; + this.pbLoading.TabStop = false; + this.pbLoading.Visible = false; + // // 并发上传 // this.并发上传.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -1309,23 +1547,11 @@ namespace TemuKJD.WXForms.ProductForms this.并发上传.Visible = false; this.并发上传.Click += new System.EventHandler(this.并发上传_Click); // - // pbLoading - // - this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None; - this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue; - this.pbLoading.Location = new System.Drawing.Point(559, 155); - this.pbLoading.Name = "pbLoading"; - this.pbLoading.Size = new System.Drawing.Size(50, 50); - this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.pbLoading.TabIndex = 188; - this.pbLoading.TabStop = false; - this.pbLoading.Visible = false; - // // label11 // this.label11.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(25, 35); + this.label11.Location = new System.Drawing.Point(8, 33); this.label11.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label11.Name = "label11"; this.label11.Size = new System.Drawing.Size(68, 17); @@ -1336,7 +1562,7 @@ namespace TemuKJD.WXForms.ProductForms // txtSinglePriceAdd // this.txtSinglePriceAdd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.txtSinglePriceAdd.Location = new System.Drawing.Point(93, 32); + this.txtSinglePriceAdd.Location = new System.Drawing.Point(76, 30); this.txtSinglePriceAdd.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtSinglePriceAdd.Name = "txtSinglePriceAdd"; this.txtSinglePriceAdd.Size = new System.Drawing.Size(31, 23); @@ -1360,19 +1586,19 @@ namespace TemuKJD.WXForms.ProductForms // this.dgvSelectProduct.AllowUserToAddRows = false; this.dgvSelectProduct.AllowUserToDeleteRows = false; - dataGridViewCellStyle21.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle21; + dataGridViewCellStyle9.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle9; this.dgvSelectProduct.AutoRowNumber = true; this.dgvSelectProduct.BackgroundColor = System.Drawing.Color.White; this.dgvSelectProduct.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle22.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvSelectProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle22; + dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle10.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvSelectProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle10; this.dgvSelectProduct.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvSelectProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colCheck, @@ -1402,7 +1628,7 @@ namespace TemuKJD.WXForms.ProductForms this.dgvSelectProduct.Name = "dgvSelectProduct"; this.dgvSelectProduct.ReadOnly = true; this.dgvSelectProduct.RowTemplate.Height = 23; - this.dgvSelectProduct.Size = new System.Drawing.Size(1165, 360); + this.dgvSelectProduct.Size = new System.Drawing.Size(1165, 354); this.dgvSelectProduct.TabIndex = 187; this.dgvSelectProduct.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvSelectProduct_CellContentClick); // @@ -1432,8 +1658,8 @@ namespace TemuKJD.WXForms.ProductForms // // colSupplierName // - dataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle23; + dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle11; this.colSupplierName.Frozen = true; this.colSupplierName.HeaderText = "店铺名称"; this.colSupplierName.Name = "colSupplierName"; @@ -1511,8 +1737,8 @@ namespace TemuKJD.WXForms.ProductForms // // colProductName // - dataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colProductName.DefaultCellStyle = dataGridViewCellStyle24; + dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colProductName.DefaultCellStyle = dataGridViewCellStyle12; this.colProductName.HeaderText = "商品标题"; this.colProductName.Name = "colProductName"; this.colProductName.ReadOnly = true; @@ -1701,6 +1927,7 @@ namespace TemuKJD.WXForms.ProductForms this.ucGroupBoxEx4.ResumeLayout(false); this.ucGroupBoxEx4.PerformLayout(); this.ucGroupBoxEx1.ResumeLayout(false); + this.ucGroupBoxEx1.PerformLayout(); this.splitContainer3.Panel1.ResumeLayout(false); this.splitContainer3.Panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).EndInit(); @@ -1734,7 +1961,6 @@ namespace TemuKJD.WXForms.ProductForms private UserComponent.DataGridViewEx dgvSelectProduct; private System.Windows.Forms.SplitContainer splitContainer4; private UserControls.StatusBarUserControl statusBar; - private System.Windows.Forms.PictureBox pbLoading; private DevComponents.DotNetBar.PanelEx btnUpload; private System.Windows.Forms.Panel panel1; private UserComponent.UcGroupBoxEx ucGroupBoxEx2; @@ -1763,15 +1989,15 @@ namespace TemuKJD.WXForms.ProductForms private System.Windows.Forms.Label label10; private DevComponents.DotNetBar.PanelEx btnClearFilter; private System.Windows.Forms.TextBox txtExtCodeFilter; - private System.Windows.Forms.Label label16; + private System.Windows.Forms.Label lblExtCodeFilter; private System.Windows.Forms.Label label9; - private System.Windows.Forms.Label label20; + private System.Windows.Forms.Label lblGroupFilter; private System.Windows.Forms.ComboBox cmbGroupFilter; private DevComponents.DotNetBar.PanelEx btnClear; private DevComponents.DotNetBar.PanelEx panelEx1; private System.Windows.Forms.TextBox txtIdFilter; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.ComboBox cmbCateFilter; + private System.Windows.Forms.Label lblIdFilter; + private System.Windows.Forms.ComboBox cmbCateFilter1; private System.Windows.Forms.Label label2; public System.Windows.Forms.Label lblWaitToUp; private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck; @@ -1807,20 +2033,32 @@ namespace TemuKJD.WXForms.ProductForms private System.Windows.Forms.Label label8; private UserComponent.UcCheckBox chkSameSpecPrice; private System.Windows.Forms.ComboBox cmbSourceType; - private System.Windows.Forms.Label label12; + private System.Windows.Forms.Label lblSourceType; private System.Windows.Forms.ComboBox cmbWxSafe; - private System.Windows.Forms.Label label13; + private System.Windows.Forms.Label lblWxSafe; private UserComponent.UcCheckBox chkSkipUploaded; private DevComponents.DotNetBar.PanelEx 并发上传; private UserComponent.UcCheckBox chkUpDraft; - private System.Windows.Forms.ComboBox cmbSpProdType; - private System.Windows.Forms.Label label17; private UserComponent.UcCheckBox chkTestNoAuditUpload; private System.Windows.Forms.TextBox txtPreDays; private UserComponent.UcCheckBox chkPreSale; private System.Windows.Forms.Label label18; private DevComponents.DotNetBar.PanelEx btnRefreshNum; private System.Windows.Forms.PictureBox pbLoadingShop; + private System.Windows.Forms.ComboBox cmbJstInitSet; + private System.Windows.Forms.Label lblJstInitSet; + private System.Windows.Forms.ComboBox cmbCateFilter3; + private System.Windows.Forms.Label label21; + private System.Windows.Forms.ComboBox cmbCateFilter2; + private System.Windows.Forms.Label label19; + private System.Windows.Forms.PictureBox pbLoading; + private DevComponents.DotNetBar.PanelEx btnFilterBound; + private System.Windows.Forms.Label label12; + private System.Windows.Forms.TextBox txtFilterBound; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.TextBox txtShippingPriceTimes; + private System.Windows.Forms.Label label13; + private System.Windows.Forms.TextBox txtFilterShopName; private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect; private System.Windows.Forms.DataGridViewTextBoxColumn colShopLoginName; private System.Windows.Forms.DataGridViewTextBoxColumn colShopId; @@ -1833,7 +2071,10 @@ namespace TemuKJD.WXForms.ProductForms private System.Windows.Forms.DataGridViewTextBoxColumn colOnSaleNum; private System.Windows.Forms.DataGridViewTextBoxColumn colRemaining; private System.Windows.Forms.DataGridViewTextBoxColumn colMessage; - private System.Windows.Forms.ComboBox cmbSet; - private System.Windows.Forms.Label lblSet; + private DevComponents.DotNetBar.PanelEx btnFilterShop; + private System.Windows.Forms.Label label17; + private System.Windows.Forms.TextBox txtFilterShopNotes; + private System.Windows.Forms.Label label16; + private DevComponents.DotNetBar.PanelEx btnEmptyShop; } } \ No newline at end of file diff --git a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs index 902c348..2fa0c71 100644 --- a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs +++ b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs @@ -48,6 +48,7 @@ namespace TemuKJD.WXForms.ProductForms //public Dictionary> dicCheckedShopIdList = new Dictionary>(); public Dictionary dicCheckedShopId = new Dictionary(); public Dictionary dicShopUpload = new Dictionary(); + public string pdd_product_cates = ""; public WXDBProdUploadForm() { InitializeComponent(); @@ -55,15 +56,12 @@ namespace TemuKJD.WXForms.ProductForms private void UserSelectDbProductForm_Load(object sender, EventArgs e) { - cmbSpProdType.SelectedIndex = 0; this.splitContainer1.Dock = DockStyle.Fill; this.panel1.Location = new Point(40, 30); this.panel1.Width = this.Width - 80; this.panel1.Height = this.Height - 60; this.panel1.SendToBack(); - cmbWxSafe.SelectedIndex = 0; - lstTemuDBProductSelect = NaiBa.Util.Helper.ConfigHelper.LoadConfig>("wx_db_prod_upload_list"); if (lstTemuDBProductSelect == null) lstTemuDBProductSelect = new NaiBa.Util.ConcurrentList(); @@ -116,6 +114,7 @@ namespace TemuKJD.WXForms.ProductForms txtAddMorePrice.TextChanged -= txtAddPrice_TextChanged; txtSinglePriceAdd.TextChanged -= txtAddPrice_TextChanged; txtStockNum.TextChanged -= txtAddPrice_TextChanged; + txtShippingPriceTimes.TextChanged -= txtAddPrice_TextChanged; chkAddMorePriceFirst.CheckedChanged -= chkAddMorePriceFirst_CheckedChanged; chkStepAddPrice.CheckedChanged -= chkStepAddPrice_CheckedChanged; @@ -123,6 +122,7 @@ namespace TemuKJD.WXForms.ProductForms this.txtAddMorePrice.Text = defaultAddPriceRule.AddMorePrice.ToString(); this.txtSinglePriceAdd.Text = defaultAddPriceRule.SinglePriceAdd.ToString(); this.txtStockNum.Text = defaultAddPriceRule.StockNum.ToString(); + this.txtShippingPriceTimes.Text = defaultAddPriceRule.ShippingPriceTimes.ToString(); this.chkAddMorePriceFirst.Checked = defaultAddPriceRule.AddMorePriceFirst; this.chkStepAddPrice.Checked = defaultAddPriceRule.IsStepAddPrice; @@ -130,6 +130,7 @@ namespace TemuKJD.WXForms.ProductForms txtAddMorePrice.TextChanged += txtAddPrice_TextChanged; txtSinglePriceAdd.TextChanged += txtAddPrice_TextChanged; txtStockNum.TextChanged += txtAddPrice_TextChanged; + txtShippingPriceTimes.TextChanged += txtAddPrice_TextChanged; chkAddMorePriceFirst.CheckedChanged += chkAddMorePriceFirst_CheckedChanged; chkStepAddPrice.CheckedChanged += chkStepAddPrice_CheckedChanged; @@ -251,7 +252,8 @@ namespace TemuKJD.WXForms.ProductForms foreach (DataGridViewRow row in dgvShop.Rows) { //if (list.Any(l => l == row.Cells["colShopId"]?.Value?.ToString())) - row.Cells["colSelect"].Value = true; + if(row.Visible == true) + row.Cells["colSelect"].Value = true; } } @@ -324,20 +326,52 @@ namespace TemuKJD.WXForms.ProductForms html = GetHtml.PostUtf8(url, data); if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) { - //BaseMsgForm.ShowError("商品分组获取失败，请重试！" + BaseRegex.GetStringJson(ref html, "msg")); + BaseMsgForm.ShowError("商品类目获取失败，请重试！" + BaseRegex.GetStringJson(ref html, "msg")); } else { - Invoke(new Action(() => + pdd_product_cates = BaseRegex.GetStringJson(ref html, "data"); + } + + Invoke(new Action(() => + { + if (cmbSourceType.Text != "厂商直采") { - cmbCateFilter.Items.Clear(); - var groups = BaseRegex.GetStringJson(ref html, "data"); - foreach (var item in groups.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries)) - { - cmbCateFilter.Items.Add(item); - } - cmbCateFilter.Items.Add(""); - })); + fillPddCate(); + } + else + { + fillWxCate(); + } + })); + } + + void fillPddCate() + { + cmbCateFilter1.Items.Clear(); + cmbCateFilter2.Items.Clear(); + cmbCateFilter3.Items.Clear(); + cmbCateFilter1.Text = ""; + cmbCateFilter2.Text = ""; + cmbCateFilter3.Text = ""; + foreach (var item in pdd_product_cates.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries)) + { + cmbCateFilter1.Items.Add(item); + } + cmbCateFilter1.Items.Add(""); + } + + void fillWxCate() + { + cmbCateFilter1.Items.Clear(); + cmbCateFilter2.Items.Clear(); + cmbCateFilter3.Items.Clear(); + cmbCateFilter1.Text = ""; + cmbCateFilter2.Text = ""; + cmbCateFilter3.Text = ""; + foreach (var cate in GlobalConfig.WxCatList.Where(c => c.level == 1).ToList()) + { + cmbCateFilter1.Items.Add(cate.name); } } @@ -1449,6 +1483,95 @@ namespace TemuKJD.WXForms.ProductForms upProdParam.product.info.aiGenShortTitle = upProdParam.product.info.shortTitle; #endregion + #region 获取推单运费模板，计算运费加价。 + + var shippingTemplateJson = ""; + var shipPrice = 0; + + if (dbProd.wx_cat_leaf != null) + { + var urlShipping = BaseClass.BuildObjString("product/wx_get_shipping_template"); + var dataShipping = Work.UserLogin.GetSignaturex() + + "&coid=" + dbProd.skc_id; + var htmlShipping = GetHtml.PostUtf8(urlShipping, dataShipping); + if (string.IsNullOrEmpty(htmlShipping) || !htmlShipping.Contains("\"code\":200")) + htmlShipping = GetHtml.PostUtf8(urlShipping, dataShipping); + if (string.IsNullOrEmpty(htmlShipping) || !htmlShipping.Contains("\"code\":200")) + { + } + else + { + if (htmlShipping.Contains("\"data\":\"\"")) + { + } + else + { + try + { + shippingTemplateJson = JsonHelper.SerializeObject(JsonHelper.JObjectParse(htmlShipping)["data"]); + } + catch + { + + } + } + } + + if (string.IsNullOrEmpty(shippingTemplateJson)) + { + + // 获取运费模板 + //"https://po.e57.cn/prod-api/api/sys-api/system/open/api/freightTemplate/list?warehouseNum=10361546"; + var urlShip = "https://po.e57.cn/prod-api/api/sys-api/system/open/api/freightTemplate/list?warehouseNum=" + dbProd.skc_id; + var shipRst = WXHttpResponseBLL.e57GetResponse(urlShip, ""); + try + { + //[{"id":"204","warehouseNum":"15016108","freightType":0,"provinces":"香港特别行政区,台湾省,澳门特别行政区","freightPrice":9999900,"createBy":"vmslin","createTime":"2026-01-30T16:45:03+08:00","updateBy":"vmslin","updateTime":"2026-01-30T16:45:03+08:00"},{"id":"205","warehouseNum":"15016108","freightType":3,"provinces":"海南省,新疆维吾尔自治区,西藏自治区,内蒙古自治区","freightPrice":1530,"createBy":"vmslin","createTime":"2026-01-30T16:45:51+08:00","updateBy":"vmslin","updateTime":"2026-01-30T16:45:51+08:00"},{"id":"206","warehouseNum":"15016108","freightType":1,"provinces":"北京市,上海市","freightPrice":410,"createBy":"vmslin","createTime":"2026-01-30T16:46:04+08:00","updateBy":"vmslin","updateTime":"2026-01-30T16:46:04+08:00"},{"id":"207","warehouseNum":"15016108","freightType":1,"provinces":"安徽省,重庆市,福建省,广东省,甘肃省,广西壮族自治区,贵州省,河北省,湖北省,黑龙江省,河南省,湖南省,吉林省,江苏省,江西省,辽宁省,宁夏回族自治区,青海省,四川省,山东省,山西省,陕西省,天津市,云南省,浙江省","freightPrice":310,"createBy":"vmslin","createTime":"2026-01-30T16:46:17+08:00","updateBy":"vmslin","updateTime":"2026-01-30T16:46:17+08:00"}] + shippingTemplateJson = JsonHelper.SerializeObject(JsonHelper.JObjectParse(shipRst)["data"]); + if (shipRst.Contains("\"code\":0") && !string.IsNullOrEmpty(shippingTemplateJson)) + { + urlShipping = BaseClass.BuildObjString("product/wx_add_mdy_shipping_template"); + dataShipping = Work.UserLogin.GetSignaturex() + + "&coid=" + dbProd.skc_id + + "&shipping_template_json=" + shippingTemplateJson; + htmlShipping = GetHtml.PostUtf8(urlShipping, dataShipping); + if (string.IsNullOrEmpty(htmlShipping) || !htmlShipping.Contains("\"code\":200")) + htmlShipping = GetHtml.PostUtf8(urlShipping, dataShipping); + } + } + catch (Exception ex) + { + } + } + + if (!string.IsNullOrEmpty(shippingTemplateJson)) + { + try + { + int count = 0; + var shipObjs = JArray.Parse(shippingTemplateJson); + foreach (var shipObj in shipObjs) + { + var provincesStr = shipObj["provinces"].ParseToString(); + if (provincesStr.Split(',').Length > count) + { + count = provincesStr.Split(',').Length; + shipPrice = shipObj["freightPrice"].ParseToInt(); + } + } + } + catch (Exception ex) + { + return "{\"success\":false,\"draftId\":0,\"status\":\"未上传\",\"errMsg\":\"运费模板获取失败 " + ex.Message + "\"}"; + } + } + if (shipPrice <=0) + { + return "{\"success\":false,\"draftId\":0,\"status\":\"未上传\",\"errMsg\":\"运费模板获取失败 未获取到\"}"; + } + } + #endregion + #region 售后信息 var afterSaleAddress = ""; @@ -1497,7 +1620,8 @@ namespace TemuKJD.WXForms.ProductForms { urlAfterSale = BaseClass.BuildObjString("product/wx_add_mdy_after_sale"); dataAfterSale = Work.UserLogin.GetSignaturex() + - "&coid=" + dbProd.skc_id + "&after_sale_json=" + afterSaleAddress; + "&coid=" + dbProd.skc_id + + "&after_sale_json=" + afterSaleAddress; htmlAfterSale = GetHtml.PostUtf8(urlAfterSale, dataAfterSale); if (string.IsNullOrEmpty(htmlAfterSale) || !htmlAfterSale.Contains("\"code\":200")) htmlAfterSale = GetHtml.PostUtf8(urlAfterSale, dataAfterSale); @@ -1936,6 +2060,8 @@ namespace TemuKJD.WXForms.ProductForms } } } + // 聚水潭上微信小店，加运费（其他平台shipPrice默认为0） + skuParam.productSkuInfo.salePrice += (shipPrice * defaultAddPriceRule.ShippingPriceTimes).ParseToInt(); // sku图 skuParam.productSkuInfo.thumbImg = upProdParam.product.info.productSaleAttrs[0].items.FirstOrDefault(a => a.value == skuInfo.spec[0].spec_name)?.imgUrl; skuParam.productSkuInfo.skuCode = skuInfo.out_sku_sn; @@ -2448,11 +2574,26 @@ namespace TemuKJD.WXForms.ProductForms data += "&in_ext_codes=" + txtExtCodeFilter.Text; data += "&in_spu_ids=" + txtIdFilter.Text; data += "&in_groups=" + cmbGroupFilter.Text; - data += "&in_cates=" + cmbCateFilter.Text; + if (cmbSourceType.Text != "厂商直采") + data += "&in_cates=" + cmbCateFilter1.Text; + else + { + var cate1 = GlobalConfig.WxCatList.FirstOrDefault(c => c.level == 1 && c.name == cmbCateFilter1.Text.Trim()); + var cates2 = GlobalConfig.WxCatList.Where(c => c.f_cat_id == cate1?.cat_id).ToList(); + var cate2 = cates2.FirstOrDefault(c => c.level == 2 && c.name == cmbCateFilter2.Text.Trim()); + var cates3 = GlobalConfig.WxCatList.Where(c => c.f_cat_id == cate2?.cat_id).ToList(); + var cate3 = cates3.FirstOrDefault(c => c.level == 3 && c.name == cmbCateFilter3.Text.Trim()); + + if (!string.IsNullOrEmpty(cmbCateFilter1.Text) && cate1 != null) + data += "&wx_cat_1=" + cate1.cat_id; + if (!string.IsNullOrEmpty(cmbCateFilter2.Text) && cate2 != null) + data += "&wx_cat_2=" + cate2.cat_id; + if (!string.IsNullOrEmpty(cmbCateFilter3.Text) && cate3 != null) + data += "&wx_cat_3=" + cate3.cat_id; + } data += "&product_get_type=" + cmbSourceType.Text.Trim(); - data += "&wx_safe_status=" + cmbWxSafe.Text.Trim(); - data += "&special_prod_type=" + cmbSpProdType.Text.Trim(); - data += "&is_supplier_prod_ok=" + cmbSet.Text.Trim(); + data += "&wx_safe_status=" + cmbWxSafe.Text.Trim().Replace("安全+未校验", "安全商品,未校验"); + data += "&is_supplier_prod_ok=" + cmbJstInitSet.Text.Trim(); })); var html = GetHtml.PostUtf8(url, data); if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) @@ -2546,6 +2687,7 @@ namespace TemuKJD.WXForms.ProductForms defaultAddPriceRule.AddMorePrice = txtAddMorePrice.Text.Trim().ParseToDecimal(); defaultAddPriceRule.SinglePriceAdd = txtSinglePriceAdd.Text.Trim().ParseToDecimal(); defaultAddPriceRule.StockNum = txtStockNum.Text.Trim().ParseToInt(); + defaultAddPriceRule.ShippingPriceTimes = txtShippingPriceTimes.Text.Trim().ParseToDecimal(); NaiBa.Util.Helper.ConfigHelper.SaveConfig("wx_default_add_price_rule", defaultAddPriceRule); } } @@ -2604,9 +2746,9 @@ namespace TemuKJD.WXForms.ProductForms txtIdFilter.Text = ""; txtExtCodeFilter.Text = ""; cmbGroupFilter.Text = ""; - cmbCateFilter.Text = ""; - cmbWxSafe.SelectedIndex = 0; - cmbSpProdType.SelectedIndex = 0; + cmbCateFilter1.Text = ""; + cmbWxSafe.Text = "安全+未校验"; + cmbSourceType.Text = "厂商直采"; int prodCount; GetRandomProductList(out prodCount, 1, 1); lblGoodsCount.Text = "产品库 " + prodCount + " 件"; @@ -2764,6 +2906,98 @@ namespace TemuKJD.WXForms.ProductForms { } + + private void cmbSourceType_SelectedIndexChanged(object sender, EventArgs e) + { + if (cmbSourceType.Text != "厂商直采") + fillPddCate(); + else + fillWxCate(); + } + + private void cmbSourceType_TextChanged(object sender, EventArgs e) + { + + } + + private void cmbCateFilter1_SelectedIndexChanged(object sender, EventArgs e) + { + if (cmbSourceType.Text != "厂商直采") + return; + + cmbCateFilter2.Text = ""; + cmbCateFilter2.Items.Clear(); + var cate1 = GlobalConfig.WxCatList.FirstOrDefault(c => c.level == 1 && c.name == cmbCateFilter1.Text.Trim()); + var cates2 = GlobalConfig.WxCatList.Where(c => c.f_cat_id == cate1?.cat_id).ToList(); + foreach (var cate2 in cates2) + { + cmbCateFilter2.Items.Add(cate2.name); + } + + } + + private void cmbCateFilter2_SelectedIndexChanged(object sender, EventArgs e) + { + if (cmbSourceType.Text != "厂商直采") + return; + + cmbCateFilter3.Text = ""; + cmbCateFilter3.Items.Clear(); + var cate1 = GlobalConfig.WxCatList.FirstOrDefault(c => c.level == 1 && c.name == cmbCateFilter1.Text.Trim()); + var cates2 = GlobalConfig.WxCatList.Where(c => c.f_cat_id == cate1?.cat_id).ToList(); + var cate2 = cates2.FirstOrDefault(c => c.level == 2 && c.name == cmbCateFilter2.Text.Trim()); + var cates3 = GlobalConfig.WxCatList.Where(c => c.f_cat_id == cate2?.cat_id).ToList(); + foreach (var cate3 in cates3) + { + cmbCateFilter3.Items.Add(cate3.name); + } + } + + private void cmbCateFilter3_SelectedIndexChanged(object sender, EventArgs e) + { + var cate1 = GlobalConfig.WxCatList.FirstOrDefault(c => c.level == 1 && c.name == cmbCateFilter1.Text.Trim()); + var cates2 = GlobalConfig.WxCatList.Where(c => c.f_cat_id == cate1?.cat_id).ToList(); + var cate2 = cates2.FirstOrDefault(c => c.level == 2 && c.name == cmbCateFilter2.Text.Trim()); + var cates3 = GlobalConfig.WxCatList.Where(c => c.f_cat_id == cate2?.cat_id).ToList(); + var cate3 = cates3.FirstOrDefault(c => c.level == 3 && c.name == cmbCateFilter3.Text.Trim()); + } + + private void btnFilterBound_Click(object sender, EventArgs e) + { + var bound = txtFilterBound.Text.Trim().ParseToInt(); + var cates = GlobalConfig.WxCatBoundList.Where(b => b.cat_bound <= bound); + lstTemuDBProductSelect.RemoveAll(p => !cates.Any(c => c.leaf_id.ParseToString() == p.wx_cat_leaf)); + + NaiBa.Util.Helper.ConfigHelper.SaveConfig("wx_db_prod_upload_list", this.lstTemuDBProductSelect); + lblWaitToUp.Text = "待上传 " + lstTemuDBProductSelect.Count + " 件"; + } + + private void btnFilterShop_Click(object sender, EventArgs e) + { + foreach(DataGridViewRow row in dgvShop.Rows) + { + if (!row.Cells["colShopName"].Value.ParseToString().Contains(txtFilterShopName.Text.Trim())) + { + row.Visible = false; + row.Cells["colSelect"].Value = false; + continue; + } + if (!row.Cells["colShopNotes"].Value.ParseToString().Contains(txtFilterShopNotes.Text.Trim())) + { + row.Visible = false; + row.Cells["colSelect"].Value = false; + continue; + } + row.Visible = true; + } + } + + private void btnEmptyShop_Click(object sender, EventArgs e) + { + txtFilterShopName.Text = ""; + txtFilterShopNotes.Text = ""; + btnFilterShop_Click(null, null); + } } public class WXUpload @@ -3113,6 +3347,10 @@ Content-Type: application/octet-stream /// public int StockNum { get; set; } = 0; public bool IsStepAddPrice { get; set; } = false; + /// + /// 运费倍率 + /// + public decimal ShippingPriceTimes { get; set; } = 1.0m; } public class WXUploadRule diff --git a/TEMUKJD/WXForms/ShopForms/WXShopAddEditForm.Designer.cs b/TEMUKJD/WXForms/ShopForms/WXShopAddEditForm.Designer.cs index fa0b962..965c37a 100644 --- a/TEMUKJD/WXForms/ShopForms/WXShopAddEditForm.Designer.cs +++ b/TEMUKJD/WXForms/ShopForms/WXShopAddEditForm.Designer.cs @@ -28,8 +28,9 @@ /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WXShopAddEditForm)); this.panel2 = new System.Windows.Forms.Panel(); + this.label8 = new System.Windows.Forms.Label(); + this.txtNotes = new DevComponents.DotNetBar.Controls.TextBoxX(); this.label7 = new System.Windows.Forms.Label(); this.cmbGroup = new System.Windows.Forms.ComboBox(); this.txtBuyAccount = new DevComponents.DotNetBar.Controls.TextBoxX(); @@ -44,8 +45,6 @@ this.label1 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); this.btnOk = new TemuKJD.UserControls.ButtonEx(); - this.txtNotes = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.label8 = new System.Windows.Forms.Label(); this.panel2.SuspendLayout(); this.SuspendLayout(); // @@ -75,6 +74,35 @@ this.panel2.TabIndex = 1; this.panel2.Paint += new System.Windows.Forms.PaintEventHandler(this.panel2_Paint); // + // label8 + // + this.label8.AutoSize = true; + this.label8.Location = new System.Drawing.Point(29, 135); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(56, 17); + this.label8.TabIndex = 386; + this.label8.Text = " 备注"; + // + // txtNotes + // + // + // + // + this.txtNotes.Border.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.txtNotes.Border.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.txtNotes.Border.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.txtNotes.Border.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.txtNotes.Border.Class = "CrumbBarBackgroundKey"; + this.txtNotes.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.txtNotes.Border.PaddingBottom = 2; + this.txtNotes.Border.PaddingLeft = 2; + this.txtNotes.Border.PaddingRight = 2; + this.txtNotes.Border.PaddingTop = 2; + this.txtNotes.Location = new System.Drawing.Point(91, 133); + this.txtNotes.Name = "txtNotes"; + this.txtNotes.Size = new System.Drawing.Size(172, 23); + this.txtNotes.TabIndex = 385; + // // label7 // this.label7.AutoSize = true; @@ -95,11 +123,10 @@ "上货", "数据", "登录"}); - this.cmbGroup.Location = new System.Drawing.Point(91, 257); + this.cmbGroup.Location = new System.Drawing.Point(91, 166); this.cmbGroup.Name = "cmbGroup"; this.cmbGroup.Size = new System.Drawing.Size(172, 25); this.cmbGroup.TabIndex = 383; - this.cmbGroup.Visible = false; // // txtBuyAccount // @@ -228,12 +255,11 @@ // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(29, 260); + this.label5.Location = new System.Drawing.Point(29, 169); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(56, 17); this.label5.TabIndex = 377; this.label5.Text = "店铺分组"; - this.label5.Visible = false; // // btnOk // @@ -251,43 +277,13 @@ this.btnOk.UseVisualStyleBackColor = false; this.btnOk.Click += new System.EventHandler(this.btnOk_Click); // - // txtNotes - // - // - // - // - this.txtNotes.Border.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.txtNotes.Border.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.txtNotes.Border.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.txtNotes.Border.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.txtNotes.Border.Class = "CrumbBarBackgroundKey"; - this.txtNotes.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.txtNotes.Border.PaddingBottom = 2; - this.txtNotes.Border.PaddingLeft = 2; - this.txtNotes.Border.PaddingRight = 2; - this.txtNotes.Border.PaddingTop = 2; - this.txtNotes.Location = new System.Drawing.Point(91, 133); - this.txtNotes.Name = "txtNotes"; - this.txtNotes.Size = new System.Drawing.Size(172, 23); - this.txtNotes.TabIndex = 385; - // - // label8 - // - this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(29, 135); - this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(56, 17); - this.label8.TabIndex = 386; - this.label8.Text = " 备注"; - // - // ShopAddEditForm + // WXShopAddEditForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.ClientSize = new System.Drawing.Size(297, 319); this.Controls.Add(this.panel2); this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.Name = "ShopAddEditForm"; + this.Name = "WXShopAddEditForm"; this.Text = "添加店铺"; this.TitleText = "添加店铺"; this.Load += new System.EventHandler(this.ShopAddEditForm_Load); diff --git a/TEMUKJD/WXForms/ShopForms/WXShopListForm.Designer.cs b/TEMUKJD/WXForms/ShopForms/WXShopListForm.Designer.cs index f728cee..457ac96 100644 --- a/TEMUKJD/WXForms/ShopForms/WXShopListForm.Designer.cs +++ b/TEMUKJD/WXForms/ShopForms/WXShopListForm.Designer.cs @@ -38,6 +38,7 @@ this.btnLoginSelect = new TemuKJD.UserControls.ButtonEx(); this.btnCheck = new TemuKJD.UserControls.ButtonEx(); this.panel4 = new System.Windows.Forms.Panel(); + this.btnAddShop = new TemuKJD.UserControls.ButtonEx(); this.cmbNotes = new System.Windows.Forms.ComboBox(); this.pnlEmpty = new DevComponents.DotNetBar.PanelEx(); this.btnSearch = new TemuKJD.UserControls.ButtonEx(); @@ -47,7 +48,6 @@ this.txtShopId = new System.Windows.Forms.TextBox(); this.label2 = new System.Windows.Forms.Label(); this.btnImport = new TemuKJD.UserControls.ButtonEx(); - this.btnAddShop = new TemuKJD.UserControls.ButtonEx(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); this.btnRefreshAuth = new TemuKJD.UserControls.ButtonEx(); this.pbLoading = new System.Windows.Forms.PictureBox(); @@ -59,9 +59,9 @@ this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colShopAccount = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colNotes = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colGroupName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colCookie = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colSubUser = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colGroupName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colUploadAccount = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colBuyAccount = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colChatAccount = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -213,6 +213,22 @@ this.panel4.Size = new System.Drawing.Size(1023, 40); this.panel4.TabIndex = 0; // + // btnAddShop + // + this.btnAddShop.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnAddShop.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnAddShop.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnAddShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnAddShop.ForeColor = System.Drawing.Color.White; + this.btnAddShop.Location = new System.Drawing.Point(1, 9); + this.btnAddShop.Margin = new System.Windows.Forms.Padding(2); + this.btnAddShop.Name = "btnAddShop"; + this.btnAddShop.Size = new System.Drawing.Size(107, 26); + this.btnAddShop.TabIndex = 370; + this.btnAddShop.Text = "扫码添加店铺"; + this.btnAddShop.UseVisualStyleBackColor = false; + this.btnAddShop.Click += new System.EventHandler(this.btnAddShop_Click); + // // cmbNotes // this.cmbNotes.FormattingEnabled = true; @@ -320,22 +336,6 @@ this.btnImport.Visible = false; this.btnImport.Click += new System.EventHandler(this.btnImport_Click); // - // btnAddShop - // - this.btnAddShop.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnAddShop.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnAddShop.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnAddShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnAddShop.ForeColor = System.Drawing.Color.White; - this.btnAddShop.Location = new System.Drawing.Point(1, 9); - this.btnAddShop.Margin = new System.Windows.Forms.Padding(2); - this.btnAddShop.Name = "btnAddShop"; - this.btnAddShop.Size = new System.Drawing.Size(107, 26); - this.btnAddShop.TabIndex = 370; - this.btnAddShop.Text = "扫码添加店铺"; - this.btnAddShop.UseVisualStyleBackColor = false; - this.btnAddShop.Click += new System.EventHandler(this.btnAddShop_Click); - // // splitContainer2 // this.splitContainer2.BackColor = System.Drawing.Color.White; @@ -413,9 +413,9 @@ this.colShopId, this.colShopAccount, this.colNotes, + this.colGroupName, this.colCookie, this.colSubUser, - this.colGroupName, this.colUploadAccount, this.colBuyAccount, this.colChatAccount, @@ -490,16 +490,25 @@ // // colShopAccount // + this.colShopAccount.FillWeight = 90F; this.colShopAccount.HeaderText = "店铺账号"; this.colShopAccount.Name = "colShopAccount"; this.colShopAccount.ReadOnly = true; // // colNotes // + this.colNotes.FillWeight = 90F; this.colNotes.HeaderText = "备注"; this.colNotes.Name = "colNotes"; this.colNotes.ReadOnly = true; // + // colGroupName + // + this.colGroupName.FillWeight = 80F; + this.colGroupName.HeaderText = "店铺分组"; + this.colGroupName.Name = "colGroupName"; + this.colGroupName.ReadOnly = true; + // // colCookie // this.colCookie.HeaderText = "店铺Cookie"; @@ -514,14 +523,6 @@ this.colSubUser.Name = "colSubUser"; this.colSubUser.ReadOnly = true; // - // colGroupName - // - this.colGroupName.FillWeight = 69.42599F; - this.colGroupName.HeaderText = "店铺分组"; - this.colGroupName.Name = "colGroupName"; - this.colGroupName.ReadOnly = true; - this.colGroupName.Visible = false; - // // colUploadAccount // this.colUploadAccount.FillWeight = 69.42599F; @@ -717,9 +718,9 @@ private System.Windows.Forms.DataGridViewTextBoxColumn colShopId; private System.Windows.Forms.DataGridViewTextBoxColumn colShopAccount; private System.Windows.Forms.DataGridViewTextBoxColumn colNotes; + private System.Windows.Forms.DataGridViewTextBoxColumn colGroupName; private System.Windows.Forms.DataGridViewTextBoxColumn colCookie; private System.Windows.Forms.DataGridViewTextBoxColumn colSubUser; - private System.Windows.Forms.DataGridViewTextBoxColumn colGroupName; private System.Windows.Forms.DataGridViewTextBoxColumn colUploadAccount; private System.Windows.Forms.DataGridViewTextBoxColumn colBuyAccount; private System.Windows.Forms.DataGridViewTextBoxColumn colChatAccount; diff --git a/TEMUKJD/WXForms/ShopForms/WXShopListForm.cs b/TEMUKJD/WXForms/ShopForms/WXShopListForm.cs index a98eb02..a89b05d 100644 --- a/TEMUKJD/WXForms/ShopForms/WXShopListForm.cs +++ b/TEMUKJD/WXForms/ShopForms/WXShopListForm.cs @@ -480,9 +480,9 @@ namespace TemuKJD.WXForms.ShopForms param.ShopId, param.ShopAccount, param.Notes, + param.GroupName, param.Cookies, param.SubUserName, - param.GroupName, param.UploadAccount, param.BuyAccount, param.ChatAccount, diff --git a/TEMUKJD/WXForms/ShopForms/WXShopListForm.resx b/TEMUKJD/WXForms/ShopForms/WXShopListForm.resx index 1635e91..5d11a9a 100644 --- a/TEMUKJD/WXForms/ShopForms/WXShopListForm.resx +++ b/TEMUKJD/WXForms/ShopForms/WXShopListForm.resx @@ -132,15 +132,15 @@ True + + True + True True - - True - True diff --git a/Work/Initialization.cs b/Work/Initialization.cs index ddd51d3..ce8a234 100644 --- a/Work/Initialization.cs +++ b/Work/Initialization.cs @@ -716,6 +716,15 @@ offCountPara,false;offProductPara,100;IrregularitiesPara,true;noNeerPara,true;no File.Delete(Path.Combine(Environment.CurrentDirectory, "temp\\wxCat.zip")); } } + if (!FileBase.Exists("temp\\wxCatBound")) + { + if (GetHtml.DownloadFile(BaseClass.ServerUrl + "/Download/" + "wxCatBound.zip", "temp\\wxCatBound.dll" + ".bak")) + { + FileBase.Move("temp\\wxCatBound.dll" + ".bak", "temp\\wxCatBound.zip"); + ZipFile.ExtractToDirectory(Path.Combine(Environment.CurrentDirectory, "temp\\wxCatBound.zip"), Path.Combine(Environment.CurrentDirectory, "temp")); + File.Delete(Path.Combine(Environment.CurrentDirectory, "temp\\wxCatBound.zip")); + } + } /* List files = new List();