diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs index bad4028..f566d38 100644 --- a/AllBase/BaseClass.cs +++ b/AllBase/BaseClass.cs @@ -27,7 +27,7 @@ namespace AllBase /// /// 版本ID /// - public static int VersionCount = 696; + public static int VersionCount = 702; //public static int VersionCount = 613; /// diff --git a/AllBase/Model/Param/PDDProdParam/PDDActivitySubmitParam20981.cs b/AllBase/Model/Param/PDDProdParam/PDDActivitySubmitParam20981.cs index e9313ea..294a768 100644 --- a/AllBase/Model/Param/PDDProdParam/PDDActivitySubmitParam20981.cs +++ b/AllBase/Model/Param/PDDProdParam/PDDActivitySubmitParam20981.cs @@ -48,7 +48,7 @@ namespace AllBase.Model.Param.PDDProdParam20981 public object create_quantity_vo { get; set; } = new object(); } - public class create_traffic_protect_vo_item + public class create_traffic_protect_vo_item //如果流量降低降价多少维持活动 { public int? max_cut_price_amount { get; set; } = 50; } diff --git a/AllBase/Model/Result/PDDResult/PDDActivitiInfo.cs b/AllBase/Model/Result/PDDResult/PDDActivitiInfo.cs index eaedcf4..34d3719 100644 --- a/AllBase/Model/Result/PDDResult/PDDActivitiInfo.cs +++ b/AllBase/Model/Result/PDDResult/PDDActivitiInfo.cs @@ -19,6 +19,7 @@ namespace AllBase.Model.Result.PDDResult public GoodsInfoRenderItem goods_info_render { get; set; } public GoodsPromotionBenefitRenderItem goods_promotion_benefit_render { get; set; } public GoodsPromotionProtocolRenderItem goods_promotion_protocol_render { get; set; } + public bool? need_goods_activity_price { get; set; } public ActivityPriceRenderItem activity_price_render { get; set; } public List sku_info_render_list { get; set; } public ActivityQuantityRenderItem activity_quantity_render { get; set; } diff --git a/AllBase/Model/Result/TemuResult/AdsMallGoodsInfo.cs b/AllBase/Model/Result/TemuResult/AdsMallGoodsInfo.cs index 11225aa..88dc332 100644 --- a/AllBase/Model/Result/TemuResult/AdsMallGoodsInfo.cs +++ b/AllBase/Model/Result/TemuResult/AdsMallGoodsInfo.cs @@ -47,7 +47,7 @@ namespace AllBase.Model.Result.TemuResult public int? sku_total_quantity { get; set; } // 1, public int? sales { get; set; } // 7, public List site_list { get; set; } // [ 129, 130, 131, 132, 134, ... ] - public object gray_reason { get; set; } // null + public List gray_reason { get; set; } // null public List site_name_list { get; set; } // [ "泰国", "卡塔尔", "约旦", "巴西", "阿曼", ... ] public object site_price_info_list { get; set; } // null, public object coupon_discount { get; set; } // null, @@ -56,4 +56,10 @@ namespace AllBase.Model.Result.TemuResult // 自定义参数 public string shopId { get; set; } } + + public class gray_reason_info + { + public int? type { get; set; } // 3, + public string reason { get; set; } // "审核不通过：涉及易引发议论的内容" + } } diff --git a/KJDService/KJD_WebService/BLL/BXX/BXXProductManage.cs b/KJDService/KJD_WebService/BLL/BXX/BXXProductManage.cs index 9217747..ff61944 100644 --- a/KJDService/KJD_WebService/BLL/BXX/BXXProductManage.cs +++ b/KJDService/KJD_WebService/BLL/BXX/BXXProductManage.cs @@ -1093,8 +1093,9 @@ namespace KJD_Web.BLL.BXX { sql += "insert into kjd_map.spu_map_" + l_spu_map_table_id + " (draft_id,from_spu_id,shop_id) values(" + draft_id + "," + up_spu_id + ",'" + shop_id + "');\r\n"; - sql += "insert into kjd_map.product_select_map_" + l_select_map_table_id + - " (product_id,product_select_db_id,shop_id) values(" + draft_id + "," + id + ",'" + shop_id + "');\r\n"; + // temu商品反复上传后记录一件选品商品上传的所有DraftId记录，pdd不需要 + //sql += "insert into kjd_map.product_select_map_" + l_select_map_table_id + + // " (product_id,product_select_db_id,shop_id) values(" + draft_id + "," + id + ",'" + shop_id + "');\r\n"; } sql += "update bxx.product_select set"; if (draft_id != null) diff --git a/KJDService/KJD_WebService/BLL/KJD/ProductManage.cs b/KJDService/KJD_WebService/BLL/KJD/ProductManage.cs index 91c561e..b592eb0 100644 --- a/KJDService/KJD_WebService/BLL/KJD/ProductManage.cs +++ b/KJDService/KJD_WebService/BLL/KJD/ProductManage.cs @@ -169,6 +169,10 @@ namespace KJD_Web.BLL sql += " and p.product_get_type=" + product_get_type; string where = ""; + if (!string.IsNullOrEmpty(search_db_ids)) + where += " and p.id in (" + search_db_ids + ")"; + if (!string.IsNullOrWhiteSpace(search_group)) + where += " and p.group = '" + search_group + "'"; if (!string.IsNullOrWhiteSpace(search_spu)) where += " and p.spu_id like '%" + search_spu + "%'"; if (!string.IsNullOrWhiteSpace(search_skc)) @@ -181,10 +185,6 @@ namespace KJD_Web.BLL where += " and p.product_name like '%" + search_prod_name + "%'"; if (!string.IsNullOrWhiteSpace(search_notes)) where += " and p.notes like '%" + search_notes + "%'"; - if (!string.IsNullOrWhiteSpace(search_group)) - where += " and p.group like '%" + search_group + "%'"; - if (!string.IsNullOrEmpty(search_db_ids)) - where += " and p.id in (" + search_db_ids + ")"; sql += where; var count = mySql.ExecuteRowCount(sql); @@ -442,7 +442,7 @@ namespace KJD_Web.BLL var status = RegexUtils.GetStringQuery(ref inputData, "status")?.Replace("'", "\\'"); var add_product_remaining = RegexUtils.GetStringQuery(ref inputData, "add_product_remaining").ParseToInt(); var add_fission_product_name = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "add_fission_product_name").ParseToString())?.Replace("'", "\\'"); - + if (string.IsNullOrEmpty(user_name)) { return "{\"code\":500,\"msg\":\"没有用户名\"}"; @@ -452,12 +452,17 @@ namespace KJD_Web.BLL return "{\"code\":500,\"msg\":\"没有店铺信息\"}"; } - + var is_client_jit = RegexUtils.GetStringQuery(ref inputData, "is_client_jit").ParseToBool(); + string tableName = "kjd.product_select"; + if (is_client_jit) + { + tableName = "kjd.jit_product_select"; + } string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; MysqlUtils mySql = new MysqlUtils(conn); - string sql = "insert into kjd.product_select " + - "(out_product_Id,shop_id,shop_account,user_name,sub_user_name,notes,status,fission_product_name,add_time,mdy_time) values " + - "('" + out_product_Id + "','" + shop_id + "','" + shop_account + "','" + user_name + "','" + sub_user_name + "','" + + string sql = "insert into " + tableName + + " (out_product_Id,shop_id,shop_account,user_name,sub_user_name,notes,status,fission_product_name,add_time,mdy_time) values" + + " ('" + out_product_Id + "','" + shop_id + "','" + shop_account + "','" + user_name + "','" + sub_user_name + "','" + notes + "','" + status + "','" + add_fission_product_name + "','" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "','" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "');"; @@ -501,6 +506,13 @@ namespace KJD_Web.BLL var status = RegexUtils.GetStringQuery(ref inputData, "status")?.Replace("'", "\\'"); var add_times = RegexUtils.GetStringQuery(ref inputData, "add_times")?.Replace("'", "\\'"); + var is_client_jit = RegexUtils.GetStringQuery(ref inputData, "is_client_jit").ParseToBool(); + string tableName = "kjd.product_select"; + if (is_client_jit) + { + tableName = "kjd.jit_product_select"; + } + long l_draft_id = draft_id.ParseToLong(); long l_spu_map_table_id = l_draft_id % 128; long l_select_map_table_id = id.ParseToLong() % 64; @@ -515,10 +527,18 @@ namespace KJD_Web.BLL { sql += "insert into kjd_map.spu_map_" + l_spu_map_table_id + " (draft_id,from_spu_id,shop_id) values(" + draft_id + "," + up_spu_id + ",'" + shop_id + "');\r\n"; - sql += "insert into kjd_map.product_select_map_" + l_select_map_table_id + - " (product_id,product_select_db_id,shop_id) values(" + draft_id + "," + id + ",'" + shop_id + "');\r\n"; + if (is_client_jit) + { + sql += "insert into kjd_map.jit_product_select_map_" + l_select_map_table_id + + " (product_id,product_select_db_id,shop_id) values(" + draft_id + "," + id + ",'" + shop_id + "');\r\n"; + } + else + { + sql += "insert into kjd_map.product_select_map_" + l_select_map_table_id + + " (product_id,product_select_db_id,shop_id) values(" + draft_id + "," + id + ",'" + shop_id + "');\r\n"; + } } - sql += "update kjd.product_select set"; + sql += "update " + tableName + " set"; if (draft_id != null) sql += " draft_id='" + draft_id + "',"; if (status != null) @@ -583,16 +603,23 @@ namespace KJD_Web.BLL int page = RegexUtils.GetStringQuery(ref inputData, "page").ParseToInt(); int page_size = RegexUtils.GetStringQuery(ref inputData, "page_size").ParseToInt(50); + var is_client_jit = RegexUtils.GetStringQuery(ref inputData, "is_client_jit").ParseToBool(); + string tableName = "kjd.product_select"; + if (is_client_jit) + { + tableName = "kjd.jit_product_select"; + } + string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; MysqlUtils mySql = new MysqlUtils(conn); - string sql = "select count(s.id) from kjd.product_select s " + + string sql = "select count(s.id) from " + tableName + " s " + "left join kjd.product p on s.out_product_id=p.id " + "left join kjd.user u on s.operate_sub_sa_name=u.user_name " + "where 1=1"; string where = ""; - if (!isAdmin) + if (!isAdmin || is_client_jit) where += " and (s.user_name='" + user_name + "' or s.sub_user_name like'%" + user_name + "%')"; if (!string.IsNullOrEmpty(operate_sub_sa_name)) { @@ -656,14 +683,14 @@ namespace KJD_Web.BLL else { //if (isDetail) - //sql = "select * from kjd.product_select where 1=1"; + //sql = "select * from " + tableName + " where 1=1"; //else sql = "select s.id,s.out_product_id,s.shop_id,s.shop_account,s.user_name," + "s.sub_user_name,s.notes,s.user_notes,s.status,s.draft_id,s.add_times,s.add_time,s.mdy_time," + "s.fission_product_name,s.operate_sub_sa_name,s.add_sub_sa_time," + "p.spu_id,p.skc_id,p.cat_id,p.cat_name,p.ext_code,p.product_name,p.main_img," + "p.product_get_type,u.nick_name as operate_sub_sa_nick " + - "from kjd.product_select s left join kjd.product p on s.out_product_id=p.id " + + "from " + tableName + " s left join kjd.product p on s.out_product_id=p.id " + "left join kjd.user u on u.user_name=s.operate_sub_sa_name " + "where 1=1"; @@ -747,9 +774,16 @@ namespace KJD_Web.BLL return "{\"code\":500,\"msg\":\"没有用户名\"}"; } + var is_client_jit = RegexUtils.GetStringQuery(ref inputData, "is_client_jit").ParseToBool(); + string tableName = "kjd.product_select"; + if (is_client_jit) + { + tableName = "kjd.jit_product_select"; + } + string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; MysqlUtils mySql = new MysqlUtils(conn); - string sql = "delete from kjd.product_select where id='" + string sql = "delete from " + tableName + " where id='" + id + "'"; var rst = mySql.ExecuteNonQuery(sql); @@ -793,9 +827,16 @@ namespace KJD_Web.BLL return "{\"code\":50002,\"msg\":\"未选择任何待上传\"}"; } + var is_client_jit = RegexUtils.GetStringQuery(ref inputData, "is_client_jit").ParseToBool(); + string tableName = "kjd.product_select"; + if (is_client_jit) + { + tableName = "kjd.jit_product_select"; + } + string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; MysqlUtils mySql = new MysqlUtils(conn); - string sql = "update kjd.product_select set"; + string sql = "update " + tableName + " set"; if (operate_sub_sa_name != null) sql += " operate_sub_sa_name='" + operate_sub_sa_name + "',"; sql += " add_sub_sa_time='" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "',"; @@ -842,9 +883,16 @@ namespace KJD_Web.BLL return "{\"code\":500,\"msg\":\"没有用户名\"}"; } + var is_client_jit = RegexUtils.GetStringQuery(ref inputData, "is_client_jit").ParseToBool(); + string tableName = "kjd.product_select"; + if (is_client_jit) + { + tableName = "kjd.jit_product_select"; + } + string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; MysqlUtils mySql = new MysqlUtils(conn); - string sql = "update kjd.product_select set"; + string sql = "update " + tableName + " set"; if (notes != null) sql += " notes=@notes,"; if (user_notes != null) @@ -895,6 +943,14 @@ namespace KJD_Web.BLL { return "{\"code\":50002,\"msg\":\"未选择选品数据\"}"; } + + var is_client_jit = RegexUtils.GetStringQuery(ref inputData, "is_client_jit").ParseToBool(); + string tableName = "kjd_map.product_select_map_"; + if (is_client_jit) + { + tableName = "kjd_map.jit_product_select_map_"; + } + long l_select_map_table_id = select_db_id.ParseToLong() % 64; int page = RegexUtils.GetStringQuery(ref inputData, "page").ParseToInt(); @@ -903,7 +959,7 @@ namespace KJD_Web.BLL string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; MysqlUtils mySql = new MysqlUtils(conn); - string sql = "select count(id) from kjd_map.product_select_map_" + l_select_map_table_id + " where 1=1"; + string sql = "select count(id) from " + tableName + l_select_map_table_id + " where 1=1"; string where = " and product_select_db_id=" + select_db_id; sql += where; @@ -916,7 +972,7 @@ namespace KJD_Web.BLL } else { - sql = "select * from kjd_map.product_select_map_" + l_select_map_table_id + " where 1=1"; + sql = "select * from " + tableName + l_select_map_table_id + " where 1=1"; //where子句 sql += where; sql += " order by id desc"; diff --git a/KJDService/KJD_WebService/BLL/KJD/ShopManage.cs b/KJDService/KJD_WebService/BLL/KJD/ShopManage.cs index 6d98c0a..d5c06ee 100644 --- a/KJDService/KJD_WebService/BLL/KJD/ShopManage.cs +++ b/KJDService/KJD_WebService/BLL/KJD/ShopManage.cs @@ -97,7 +97,7 @@ namespace KJD_Web.BLL { sql = "SELECT s.*,c.add_product_remaining add_remaining,c.add_product_month add_month,cc.jit_expire_time FROM kjd.shop s" + " LEFT JOIN kjd.shop_add_prod_count c ON s.shop_id=c.shop_id" + - " LEFT JOIN (SELECT shop_id, MAX(expire_time) as jit_expire_time FROM kjd.card_code GROUP BY shop_id) cc ON s.shop_id=cc.shop_id" + + " LEFT JOIN (SELECT shop_id, MAX(expire_time) as jit_expire_time FROM kjd.jit_card_code GROUP BY shop_id) cc ON s.shop_id=cc.shop_id" + " WHERE 1=1"; sql += where; // where 子句 @@ -860,7 +860,7 @@ namespace KJD_Web.BLL string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; MysqlUtils mySql = new MysqlUtils(conn); - string sql = "SELECT COUNT(s.id) FROM kjd.card_code s WHERE 1=1"; + string sql = "SELECT COUNT(s.id) FROM kjd.jit_card_code s WHERE 1=1"; //where子句 string where = ""; @@ -891,7 +891,7 @@ namespace KJD_Web.BLL } else { - sql = "SELECT s.* FROM kjd.card_code s WHERE 1=1"; + sql = "SELECT s.* FROM kjd.jit_card_code s WHERE 1=1"; sql += where; // where 子句 @@ -956,7 +956,7 @@ namespace KJD_Web.BLL string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; MysqlUtils mySql = new MysqlUtils(conn); - string sql = "insert into kjd.card_code (card_code_id) values "; + string sql = "insert into kjd.jit_card_code (card_code_id) values "; Random random = new Random(Guid.NewGuid().GetHashCode()); for (int i = 0; i < create_count.ParseToInt(); i++) { @@ -1001,7 +1001,7 @@ namespace KJD_Web.BLL string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; MysqlUtils mySql = new MysqlUtils(conn); - string sql = "delete from kjd.card_code where id in (" + del_ids + ");"; + string sql = "delete from kjd.jit_card_code where id in (" + del_ids + ");"; var rst = mySql.ExecuteNonQuery(sql); mySql.Close(); if (rst) @@ -1016,6 +1016,95 @@ namespace KJD_Web.BLL return "{\"code\":19999,\"msg\":\"输入为空\"}"; } + public string ActiveJitCardCode(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\":\"没有用户名\"}"; + } + + var shop_id = RegexUtils.GetStringQuery(ref inputData, "shop_id")?.Replace("'", "\\'"); + var card_code_id = RegexUtils.GetStringQuery(ref inputData, "card_code_id")?.Replace("'", "\\'"); + var shop_account = RegexUtils.GetStringQuery(ref inputData, "shop_account")?.Replace("'", "\\'"); + if (string.IsNullOrEmpty(shop_id)) + { + return "{\"code\":50002,\"msg\":\"未输入店铺\"}"; + } + if (string.IsNullOrEmpty(card_code_id)) + { + return "{\"code\":50002,\"msg\":\"未输入卡密\"}"; + } + + string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; + MysqlUtils mySql = new MysqlUtils(conn); + string sql = "select card_code_id from kjd.jit_card_code where card_code_id = \'" + card_code_id + "\' and active_time is null;"; + var rst = mySql.ExecuteExists(sql); + if (!rst) + { + mySql.Close(); + if (string.IsNullOrEmpty(mySql.Message)) + { + return "{\"code\":500,\"msg\":\"JIT卡密不存在或已激活\"}"; + } + else + { + return "{\"code\":500,\"msg\":\"" + mySql.Message + "\"}"; + } + } + sql = "select s.shop_id,cc.jit_expire_time from kjd.shop s" + + " LEFT JOIN (SELECT shop_id, MAX(expire_time) as jit_expire_time FROM kjd.jit_card_code GROUP BY shop_id) cc ON s.shop_id=cc.shop_id" + + " where s.shop_id = '" + shop_id + "';"; + var dt = mySql.ExecuteDataTable(sql); + if (dt == null || !mySql.Message.IsNullOrEmpty()) + { + mySql.Close(); + return "{\"code\":500,\"msg\":\"" + mySql.Message + "\"}"; + } + else if (dt.Rows.Count == 0) + { + mySql.Close(); + return "{\"code\":500,\"msg\":\"店铺不存在\"}"; + } + + var row = dt.Rows[0]; + ShopParam shop = new ShopParam + { + shop_id = row["shop_id"].ToString(), + jit_expire_time = row["jit_expire_time"].IsNullOrEmpty() ? new DateTime?() : Convert.ToDateTime(row["jit_expire_time"]), + }; + DateTime activeTime = DateTime.Now; + DateTime expireTime = DateTime.Now.Date.AddMonths(1); + if (shop.jit_expire_time != null && shop.jit_expire_time.Value.Date > DateTime.Now.Date) + expireTime = shop.jit_expire_time.Value.Date.AddMonths(1); + shop.jit_expire_time = expireTime; + + sql = "update kjd.jit_card_code set active_time='" + activeTime.ToString("yyyy/MM/dd HH:mm:ss") + "'," + + "expire_time='" + expireTime.ToString("yyyy/MM/dd HH:mm:ss") + "'," + + "shop_id='" + shop_id + "',shop_account='" + shop_account + "'" + + " where card_code_id='" + card_code_id + "';"; + rst = mySql.ExecuteNonQuery(sql); + + mySql.Close(); + if (rst) + { + return "{\"code\":200,\"expire_time\":\"" + expireTime + "\",\"msg\":\"success\"}"; + } + else + { + return "{\"code\":500,\"msg\":\"" + mySql.Message + "\"}"; + } + } + return "{\"code\":19999,\"msg\":\"输入为空\"}"; + } + private static readonly char[] chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789".ToCharArray(); // 增加特殊字符 public static string GenerateCardCode(Random random, int length) diff --git a/KJDService/KJD_WebService/BLL/KJD/ToolManage.cs b/KJDService/KJD_WebService/BLL/KJD/ToolManage.cs index 20dbc9e..2623c0a 100644 --- a/KJDService/KJD_WebService/BLL/KJD/ToolManage.cs +++ b/KJDService/KJD_WebService/BLL/KJD/ToolManage.cs @@ -39,17 +39,17 @@ namespace KJD_Web.BLL // for (int i = 0; i < 64; i++) // { // //sql = @"drop table if exists kjd_map.spu_map_" + i + ";\r\n"; -// sql = @"CREATE TABLE IF NOT EXISTS kjd_map.product_third_select_map_" + i + @" ( +// sql = @"CREATE TABLE IF NOT EXISTS kjd_map.jit_product_select_map_" + i + @" ( // `id` int NOT NULL AUTO_INCREMENT, // `product_id` bigint NOT NULL COMMENT '草稿箱/商品Id', // `product_select_db_id` bigint NOT NULL COMMENT '选品上传数据库Id', // `shop_id` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '上传的店铺', // PRIMARY KEY (`id`) -//) ENGINE = InnoDB AUTO_INCREMENT = 1 DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '上传商品与母店商品spu映射关系';"; +//) ENGINE = InnoDB AUTO_INCREMENT = 1 DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '上传商品kjd库Id与商品DraftId映射关系';"; // sql += @" //ALTER TABLE -// kjd_map.product_third_select_map_" + i + @" +// kjd_map.jit_product_select_map_" + i + @" //ADD // COLUMN `add_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP"; // var rst = mySql.ExecuteNonQuery(sql); diff --git a/KJDService/KJD_WebService/ShopService.asmx.cs b/KJDService/KJD_WebService/ShopService.asmx.cs index 6c56c87..6aa6321 100644 --- a/KJDService/KJD_WebService/ShopService.asmx.cs +++ b/KJDService/KJD_WebService/ShopService.asmx.cs @@ -254,5 +254,18 @@ namespace KJD_Web Context.Response.Write(result); Context.Response.End(); } + + ///ActiveJitCardCode + [WebMethod] + public void active_jit_card_code() + { + string jsontext = GetRequestJsonString(); + + var result = jsontext; + result = new ShopManage().ActiveJitCardCode(jsontext); + + Context.Response.Write(result); + Context.Response.End(); + } } } diff --git a/TEMUKJD/KJD.csproj b/TEMUKJD/KJD.csproj index 948facf..a57014c 100644 --- a/TEMUKJD/KJD.csproj +++ b/TEMUKJD/KJD.csproj @@ -911,6 +911,9 @@ JITForm.cs + + JitShopActiveForm.cs + Fission.cs diff --git a/TEMUKJD/KJDForms/AdminForms/AdminCardCodeForm.Designer.cs b/TEMUKJD/KJDForms/AdminForms/AdminCardCodeForm.Designer.cs index b42d40c..e1b9b8d 100644 --- a/TEMUKJD/KJDForms/AdminForms/AdminCardCodeForm.Designer.cs +++ b/TEMUKJD/KJDForms/AdminForms/AdminCardCodeForm.Designer.cs @@ -32,7 +32,12 @@ namespace TemuKJD.KJDForms.AdminForms 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(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.txtCardCode = new System.Windows.Forms.TextBox(); + this.label1 = new System.Windows.Forms.Label(); this.txtCreateCount = new System.Windows.Forms.TextBox(); this.btnCreate = new DevComponents.DotNetBar.PanelEx(); this.cmbCardCodeStatus = new System.Windows.Forms.ComboBox(); @@ -50,6 +55,8 @@ namespace TemuKJD.KJDForms.AdminForms this.splitContainer2 = new System.Windows.Forms.SplitContainer(); this.pbLoading = new System.Windows.Forms.PictureBox(); this.dgvCardCode = new TemuKJD.UserComponent.DataGridViewEx(); + this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colCardCode = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -61,10 +68,6 @@ namespace TemuKJD.KJDForms.AdminForms this.conNotes = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colEdit = new System.Windows.Forms.DataGridViewLinkColumn(); this.colDelete = new System.Windows.Forms.DataGridViewLinkColumn(); - this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage(); - this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); - this.txtCardCode = new System.Windows.Forms.TextBox(); - this.label1 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -112,6 +115,22 @@ namespace TemuKJD.KJDForms.AdminForms this.splitContainer1.Size = new System.Drawing.Size(1221, 530); this.splitContainer1.TabIndex = 35; // + // txtCardCode + // + this.txtCardCode.Location = new System.Drawing.Point(41, 14); + this.txtCardCode.Name = "txtCardCode"; + this.txtCardCode.Size = new System.Drawing.Size(90, 23); + this.txtCardCode.TabIndex = 468; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(8, 17); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(44, 17); + this.label1.TabIndex = 469; + this.label1.Text = "卡密："; + // // txtCreateCount // this.txtCreateCount.Location = new System.Drawing.Point(949, 14); @@ -372,6 +391,32 @@ namespace TemuKJD.KJDForms.AdminForms this.dgvCardCode.TabIndex = 5; this.dgvCardCode.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvCardCode_CellContentClick); // + // ucSplitPage1 + // + this.ucSplitPage1.CurrentPage = 1; + this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Right; + this.ucSplitPage1.IsShowPageSize = false; + this.ucSplitPage1.Location = new System.Drawing.Point(859, 0); + this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0); + this.ucSplitPage1.Name = "ucSplitPage1"; + this.ucSplitPage1.PageSize = 50; + this.ucSplitPage1.Size = new System.Drawing.Size(362, 25); + this.ucSplitPage1.TabIndex = 4; + this.ucSplitPage1.TotalPage = 1; + this.ucSplitPage1.PageChange += new System.Action(this.ucSplitPage1_PageChange); + // + // statusBar + // + this.statusBar.BackColor = System.Drawing.Color.White; + this.statusBar.Dock = System.Windows.Forms.DockStyle.Fill; + this.statusBar.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.statusBar.Location = new System.Drawing.Point(0, 0); + this.statusBar.Margin = new System.Windows.Forms.Padding(0); + this.statusBar.Name = "statusBar"; + this.statusBar.Size = new System.Drawing.Size(1221, 25); + this.statusBar.TabIndex = 1; + this.statusBar.Visible = false; + // // colSelect // this.colSelect.FillWeight = 26F; @@ -398,18 +443,27 @@ namespace TemuKJD.KJDForms.AdminForms // // colAddTime // + dataGridViewCellStyle4.Format = "F"; + dataGridViewCellStyle4.NullValue = null; + this.colAddTime.DefaultCellStyle = dataGridViewCellStyle4; this.colAddTime.HeaderText = "生成时间"; this.colAddTime.Name = "colAddTime"; this.colAddTime.ReadOnly = true; // // colActiveTime // + dataGridViewCellStyle5.Format = "F"; + dataGridViewCellStyle5.NullValue = null; + this.colActiveTime.DefaultCellStyle = dataGridViewCellStyle5; this.colActiveTime.HeaderText = "激活时间"; this.colActiveTime.Name = "colActiveTime"; this.colActiveTime.ReadOnly = true; // // colExpires // + dataGridViewCellStyle6.Format = "D"; + dataGridViewCellStyle6.NullValue = null; + this.colExpires.DefaultCellStyle = dataGridViewCellStyle6; this.colExpires.HeaderText = "到期时间"; this.colExpires.Name = "colExpires"; this.colExpires.ReadOnly = true; @@ -448,48 +502,6 @@ namespace TemuKJD.KJDForms.AdminForms this.colDelete.Name = "colDelete"; this.colDelete.ReadOnly = true; // - // ucSplitPage1 - // - this.ucSplitPage1.CurrentPage = 1; - this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Right; - this.ucSplitPage1.IsShowPageSize = false; - this.ucSplitPage1.Location = new System.Drawing.Point(859, 0); - this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0); - this.ucSplitPage1.Name = "ucSplitPage1"; - this.ucSplitPage1.PageSize = 50; - this.ucSplitPage1.Size = new System.Drawing.Size(362, 25); - this.ucSplitPage1.TabIndex = 4; - this.ucSplitPage1.TotalPage = 1; - this.ucSplitPage1.PageChange += new System.Action(this.ucSplitPage1_PageChange); - // - // statusBar - // - this.statusBar.BackColor = System.Drawing.Color.White; - this.statusBar.Dock = System.Windows.Forms.DockStyle.Fill; - this.statusBar.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.statusBar.Location = new System.Drawing.Point(0, 0); - this.statusBar.Margin = new System.Windows.Forms.Padding(0); - this.statusBar.Name = "statusBar"; - this.statusBar.Size = new System.Drawing.Size(1221, 25); - this.statusBar.TabIndex = 1; - this.statusBar.Visible = false; - // - // txtCardCode - // - this.txtCardCode.Location = new System.Drawing.Point(41, 14); - this.txtCardCode.Name = "txtCardCode"; - this.txtCardCode.Size = new System.Drawing.Size(90, 23); - this.txtCardCode.TabIndex = 468; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(8, 17); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(44, 17); - this.label1.TabIndex = 469; - this.label1.Text = "卡密："; - // // AdminCardCodeForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -537,6 +549,8 @@ namespace TemuKJD.KJDForms.AdminForms private System.Windows.Forms.TextBox txtCreateCount; private DevComponents.DotNetBar.PanelEx btnCreate; private System.Windows.Forms.Label label5; + private System.Windows.Forms.TextBox txtCardCode; + private System.Windows.Forms.Label label1; private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect; private System.Windows.Forms.DataGridViewTextBoxColumn colId; private System.Windows.Forms.DataGridViewTextBoxColumn colCardCode; @@ -548,7 +562,5 @@ namespace TemuKJD.KJDForms.AdminForms private System.Windows.Forms.DataGridViewTextBoxColumn conNotes; private System.Windows.Forms.DataGridViewLinkColumn colEdit; private System.Windows.Forms.DataGridViewLinkColumn colDelete; - private System.Windows.Forms.TextBox txtCardCode; - private System.Windows.Forms.Label label1; } } \ No newline at end of file diff --git a/TEMUKJD/KJDForms/AdminForms/AdminForm.cs b/TEMUKJD/KJDForms/AdminForms/AdminForm.cs index 22ce179..0833709 100644 --- a/TEMUKJD/KJDForms/AdminForms/AdminForm.cs +++ b/TEMUKJD/KJDForms/AdminForms/AdminForm.cs @@ -55,7 +55,8 @@ namespace TemuKJD.KJDForms.AdminForms hideName.Remove("库存上传"); hideName.Remove("商品核价"); hideName.Remove("加入发货台"); - //hideName.Remove("JIT卡密管理"); + if (MainForm.instance.pnlJit.Visible == true) + hideName.Remove("JIT卡密管理"); hideName.Remove("开通JIT"); } if (BaseClass.SaLevel==2) @@ -105,12 +106,14 @@ namespace TemuKJD.KJDForms.AdminForms SetForm(dbPriceMarkUpForm.Value); break; case "认领待上传": + dbProductSelectListManageForm.Value.IsClientJit = false; SetForm(dbProductSelectListManageForm.Value); break; case "库存上传": SetForm(productThirdSelectListManageForm.Value); break; case "商品核价": + adminProductPriceCheckForm.Value.IsClientJit = false; SetForm(adminProductPriceCheckForm.Value); break; case "加入发货台": @@ -118,7 +121,7 @@ namespace TemuKJD.KJDForms.AdminForms SetForm(joinDeliveryFrom.Value); break; case "开通JIT": - jitForm.Value.IsAdmin = true; + jitForm.Value.IsClientJit = false; SetForm(jitForm.Value); break; case "JIT卡密管理": diff --git a/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.Designer.cs b/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.Designer.cs index 464c5ae..025fef9 100644 --- a/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.Designer.cs +++ b/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.Designer.cs @@ -110,15 +110,6 @@ namespace TemuKJD.KJDForms.AdminForms this.splitContainer2 = new System.Windows.Forms.SplitContainer(); this.pbShopLoading = new System.Windows.Forms.PictureBox(); this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx(); - this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.colUser = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colLoginName = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colShopNotes = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colLoginStatus = new System.Windows.Forms.DataGridViewLinkColumn(); - this.colCanUse = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.pnlSpecDetail = new System.Windows.Forms.Panel(); this.textBox1 = new System.Windows.Forms.TextBox(); this.btnClose = new DevComponents.DotNetBar.PanelEx(); @@ -151,6 +142,16 @@ namespace TemuKJD.KJDForms.AdminForms this.splitContainer4 = new System.Windows.Forms.SplitContainer(); this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage(); this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); + this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.colUser = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colLoginName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colShopNotes = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colLoginStatus = new System.Windows.Forms.DataGridViewLinkColumn(); + this.colJitStatus = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colCanUse = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -1255,14 +1256,14 @@ namespace TemuKJD.KJDForms.AdminForms this.splitContainer2.Panel2.Controls.Add(this.dgvPriceCheck); this.splitContainer2.Panel2.Padding = new System.Windows.Forms.Padding(0, 0, 4, 0); this.splitContainer2.Size = new System.Drawing.Size(1484, 437); - this.splitContainer2.SplitterDistance = 280; + this.splitContainer2.SplitterDistance = 325; this.splitContainer2.TabIndex = 0; // // pbShopLoading // this.pbShopLoading.Anchor = System.Windows.Forms.AnchorStyles.None; this.pbShopLoading.Image = global::TemuKJD.Properties.Resources.loading_blue; - this.pbShopLoading.Location = new System.Drawing.Point(115, 193); + this.pbShopLoading.Location = new System.Drawing.Point(137, 193); this.pbShopLoading.Name = "pbShopLoading"; this.pbShopLoading.Size = new System.Drawing.Size(50, 50); this.pbShopLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -1296,6 +1297,7 @@ namespace TemuKJD.KJDForms.AdminForms this.colShopName, this.colShopNotes, this.colLoginStatus, + this.colJitStatus, this.colCanUse, this.colMessage}); this.dgvShop.Dock = System.Windows.Forms.DockStyle.Fill; @@ -1304,81 +1306,10 @@ namespace TemuKJD.KJDForms.AdminForms this.dgvShop.ReadOnly = true; this.dgvShop.RowHeadersWidth = 25; this.dgvShop.RowTemplate.Height = 23; - this.dgvShop.Size = new System.Drawing.Size(276, 437); + this.dgvShop.Size = new System.Drawing.Size(321, 437); this.dgvShop.TabIndex = 6; this.dgvShop.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellContentClick); // - // colSelect - // - this.colSelect.HeaderText = "全选"; - this.colSelect.Name = "colSelect"; - this.colSelect.ReadOnly = true; - this.colSelect.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.colSelect.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colSelect.Width = 28; - // - // colUser - // - this.colUser.HeaderText = "店铺账户"; - this.colUser.Name = "colUser"; - this.colUser.ReadOnly = true; - this.colUser.Visible = false; - // - // colLoginName - // - this.colLoginName.HeaderText = "店铺登录名"; - this.colLoginName.Name = "colLoginName"; - this.colLoginName.ReadOnly = true; - this.colLoginName.Visible = false; - // - // colShopId - // - this.colShopId.HeaderText = "店铺Id"; - this.colShopId.Name = "colShopId"; - this.colShopId.ReadOnly = true; - this.colShopId.Visible = false; - this.colShopId.Width = 55; - // - // colShopName - // - this.colShopName.HeaderText = "店铺名称"; - this.colShopName.Name = "colShopName"; - this.colShopName.ReadOnly = true; - this.colShopName.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.colShopName.Width = 70; - // - // colShopNotes - // - this.colShopNotes.HeaderText = "分组"; - this.colShopNotes.Name = "colShopNotes"; - this.colShopNotes.ReadOnly = true; - this.colShopNotes.Width = 70; - // - // colLoginStatus - // - this.colLoginStatus.HeaderText = "状态"; - this.colLoginStatus.Name = "colLoginStatus"; - this.colLoginStatus.ReadOnly = true; - this.colLoginStatus.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.colLoginStatus.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colLoginStatus.Width = 38; - // - // colCanUse - // - this.colCanUse.HeaderText = "可用"; - this.colCanUse.Name = "colCanUse"; - this.colCanUse.ReadOnly = true; - this.colCanUse.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.colCanUse.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colCanUse.Visible = false; - this.colCanUse.Width = 28; - // - // colMessage - // - this.colMessage.HeaderText = "消息"; - this.colMessage.Name = "colMessage"; - this.colMessage.ReadOnly = true; - // // pnlSpecDetail // this.pnlSpecDetail.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) @@ -1389,7 +1320,7 @@ namespace TemuKJD.KJDForms.AdminForms this.pnlSpecDetail.Controls.Add(this.btnClose); this.pnlSpecDetail.Location = new System.Drawing.Point(113, 58); this.pnlSpecDetail.Name = "pnlSpecDetail"; - this.pnlSpecDetail.Size = new System.Drawing.Size(971, 124); + this.pnlSpecDetail.Size = new System.Drawing.Size(926, 124); this.pnlSpecDetail.TabIndex = 682; this.pnlSpecDetail.Visible = false; // @@ -1412,7 +1343,7 @@ namespace TemuKJD.KJDForms.AdminForms this.btnClose.Cursor = System.Windows.Forms.Cursors.Hand; this.btnClose.DisabledBackColor = System.Drawing.Color.Empty; this.btnClose.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnClose.Location = new System.Drawing.Point(882, 88); + this.btnClose.Location = new System.Drawing.Point(837, 88); this.btnClose.Name = "btnClose"; this.btnClose.Size = new System.Drawing.Size(58, 23); this.btnClose.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -1434,7 +1365,7 @@ namespace TemuKJD.KJDForms.AdminForms // 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, 193); + this.pbLoading.Location = new System.Drawing.Point(536, 193); this.pbLoading.Name = "pbLoading"; this.pbLoading.Size = new System.Drawing.Size(50, 50); this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -1448,7 +1379,7 @@ namespace TemuKJD.KJDForms.AdminForms this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty; - this.panelEx1.Location = new System.Drawing.Point(935, 373); + this.panelEx1.Location = new System.Drawing.Point(890, 373); this.panelEx1.Name = "panelEx1"; this.panelEx1.Size = new System.Drawing.Size(115, 21); this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -1474,7 +1405,7 @@ namespace TemuKJD.KJDForms.AdminForms this.btnClear.Cursor = System.Windows.Forms.Cursors.Hand; this.btnClear.DisabledBackColor = System.Drawing.Color.Empty; this.btnClear.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnClear.Location = new System.Drawing.Point(826, 373); + this.btnClear.Location = new System.Drawing.Point(781, 373); this.btnClear.Name = "btnClear"; this.btnClear.Size = new System.Drawing.Size(90, 21); this.btnClear.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -1540,7 +1471,7 @@ namespace TemuKJD.KJDForms.AdminForms this.dgvPriceCheck.ReadOnly = true; this.dgvPriceCheck.RowHeadersWidth = 36; this.dgvPriceCheck.RowTemplate.Height = 23; - this.dgvPriceCheck.Size = new System.Drawing.Size(1196, 437); + this.dgvPriceCheck.Size = new System.Drawing.Size(1151, 437); this.dgvPriceCheck.TabIndex = 187; this.dgvPriceCheck.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvCheckPrice_CellContentClick); this.dgvPriceCheck.CellMouseDown += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dgvPriceCheck_CellMouseDown); @@ -1766,6 +1697,84 @@ namespace TemuKJD.KJDForms.AdminForms this.statusBar.Size = new System.Drawing.Size(1198, 26); this.statusBar.TabIndex = 2; // + // colSelect + // + this.colSelect.HeaderText = "全选"; + this.colSelect.Name = "colSelect"; + this.colSelect.ReadOnly = true; + this.colSelect.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colSelect.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colSelect.Width = 28; + // + // colUser + // + this.colUser.HeaderText = "店铺账户"; + this.colUser.Name = "colUser"; + this.colUser.ReadOnly = true; + this.colUser.Visible = false; + // + // colLoginName + // + this.colLoginName.HeaderText = "店铺登录名"; + this.colLoginName.Name = "colLoginName"; + this.colLoginName.ReadOnly = true; + this.colLoginName.Visible = false; + // + // colShopId + // + this.colShopId.HeaderText = "店铺Id"; + this.colShopId.Name = "colShopId"; + this.colShopId.ReadOnly = true; + this.colShopId.Visible = false; + this.colShopId.Width = 55; + // + // colShopName + // + this.colShopName.HeaderText = "店铺名称"; + this.colShopName.Name = "colShopName"; + this.colShopName.ReadOnly = true; + this.colShopName.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colShopName.Width = 70; + // + // colShopNotes + // + this.colShopNotes.HeaderText = "分组"; + this.colShopNotes.Name = "colShopNotes"; + this.colShopNotes.ReadOnly = true; + this.colShopNotes.Width = 70; + // + // colLoginStatus + // + this.colLoginStatus.HeaderText = "状态"; + this.colLoginStatus.Name = "colLoginStatus"; + this.colLoginStatus.ReadOnly = true; + this.colLoginStatus.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colLoginStatus.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colLoginStatus.Width = 38; + // + // colJitStatus + // + this.colJitStatus.HeaderText = "JIT"; + this.colJitStatus.Name = "colJitStatus"; + this.colJitStatus.ReadOnly = true; + this.colJitStatus.Width = 38; + // + // colCanUse + // + this.colCanUse.HeaderText = "可用"; + this.colCanUse.Name = "colCanUse"; + this.colCanUse.ReadOnly = true; + this.colCanUse.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colCanUse.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colCanUse.Visible = false; + this.colCanUse.Width = 28; + // + // colMessage + // + this.colMessage.HeaderText = "消息"; + this.colMessage.Name = "colMessage"; + this.colMessage.ReadOnly = true; + // // AdminProductPriceCheckForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -1856,15 +1865,6 @@ namespace TemuKJD.KJDForms.AdminForms private DevComponents.DotNetBar.PanelEx btnRestoreProdName; private DevComponents.DotNetBar.PanelEx btnMutliCancel; private DevComponents.DotNetBar.PanelEx btnMutliOk; - private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect; - private System.Windows.Forms.DataGridViewTextBoxColumn colUser; - private System.Windows.Forms.DataGridViewTextBoxColumn colLoginName; - private System.Windows.Forms.DataGridViewTextBoxColumn colShopId; - private System.Windows.Forms.DataGridViewTextBoxColumn colShopName; - private System.Windows.Forms.DataGridViewTextBoxColumn colShopNotes; - private System.Windows.Forms.DataGridViewLinkColumn colLoginStatus; - private System.Windows.Forms.DataGridViewCheckBoxColumn colCanUse; - private System.Windows.Forms.DataGridViewTextBoxColumn colMessage; private DevComponents.DotNetBar.PanelEx btnSearchPrice2; private DevComponents.DotNetBar.PanelEx btnStop; private System.Windows.Forms.DateTimePicker dtpEndTime; @@ -1935,5 +1935,15 @@ namespace TemuKJD.KJDForms.AdminForms private UserComponent.UcCheckBox chkFilterSize; private System.Windows.Forms.NumericUpDown numSleep; private System.Windows.Forms.Label lblSleep; + private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect; + private System.Windows.Forms.DataGridViewTextBoxColumn colUser; + private System.Windows.Forms.DataGridViewTextBoxColumn colLoginName; + private System.Windows.Forms.DataGridViewTextBoxColumn colShopId; + private System.Windows.Forms.DataGridViewTextBoxColumn colShopName; + private System.Windows.Forms.DataGridViewTextBoxColumn colShopNotes; + private System.Windows.Forms.DataGridViewLinkColumn colLoginStatus; + private System.Windows.Forms.DataGridViewTextBoxColumn colJitStatus; + private System.Windows.Forms.DataGridViewCheckBoxColumn colCanUse; + private System.Windows.Forms.DataGridViewTextBoxColumn colMessage; } } \ No newline at end of file diff --git a/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.cs b/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.cs index 9145487..b19335b 100644 --- a/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.cs +++ b/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.cs @@ -19,11 +19,15 @@ using TemuKJD.BaseForms; using TemuKJD.ToolForms; using TemuKJD.KJDForms.ShopForms; using Work; +using TemuKJD.KJDForms.JITForms; +using AllBase.Helper; namespace TemuKJD.KJDForms.AdminForms { public partial class AdminProductPriceCheckForm : BaseForm { + public bool IsClientJit { get; set; } = false; + CheckBox chkSelectAll; PriceCheckConfig priceCheckConfig = null; List lstPriceCheckFilterConfig = new List(); public CancellationTokenSource cancellationTokenSource { get; set; } = null; @@ -41,25 +45,42 @@ namespace TemuKJD.KJDForms.AdminForms if (lstPriceCheckFilterConfig == null) lstPriceCheckFilterConfig = new List(); - this.dgvShop.AddSelectorColumn("colSelect"); + //this.dgvShop.AddSelectorColumn("colSelect"); + chkSelectAll = dgvShop.Columns["colSelect"].AddHeaderCheckBox(HorizontalAlignment.Center, 0, 0, null, null, false, null, true); + chkSelectAll.CheckedChanged += chkSelectAll_CheckedChanged; this.dgvPriceCheck.AddSelectorColumn("colCheck"); - this.dgvPriceCheck.AddMergeColumnHeader(new List() { "colOk", "colCancel" }, "同意/拒绝报价"); - this.dgvPriceCheck.AddImgColumn("colProductSkcPic", "colImgUrl"); var chkSelectExtCode = this.dgvExtCode.AddSelectorColumn("colSelectExtCode"); chkSelectExtCode.CheckedChanged += ChkSelectExtCode_CheckedChanged; + this.dgvPriceCheck.AddMergeColumnHeader(new List() { "colOk", "colCancel" }, "同意/拒绝报价"); + this.dgvPriceCheck.AddImgColumn("colProductSkcPic", "colImgUrl"); + this.colJitStatus.Visible = false; + + if (!IsClientJit) + ucSplitPage1.Visible = true; + else + ucSplitPage1.Visible = false; + this.dtpEndTime.Value = DateTime.Now.Date.AddDays(1).AddMilliseconds(-1); this.dtpStartTime.Value = DateTime.Now.Date.AddDays(-7); if (BaseClass.SaLevel != 1) { //this.chkShowDelete.Visible = false; - //dgvShop.Columns["colSubSa"].Visible = false; //btnSetSubSa.Visible = false; } + if (IsClientJit) + { + chkSearchAllShop.Visible = false; + ucSplitPage1.Visible = false; + this.colJitStatus.Visible = true; + } - priceCheckConfig = NaiBa.Util.Helper.ConfigHelper.LoadConfig("price_check_config"); + if (IsClientJit) + priceCheckConfig = NaiBa.Util.Helper.ConfigHelper.LoadConfig("client_price_check_config"); + else + priceCheckConfig = NaiBa.Util.Helper.ConfigHelper.LoadConfig("price_check_config"); if (priceCheckConfig == null) priceCheckConfig = new PriceCheckConfig(); this.txtNotes.Text = priceCheckConfig.SearchNotes; @@ -74,6 +95,29 @@ namespace TemuKJD.KJDForms.AdminForms this.txtPriceDown.TextChanged += Txt_TextChanged; this.chkSearchAllShop.CheckedChanged += Txt_TextChanged; } + + private void chkSelectAll_CheckedChanged(object sender, EventArgs e) + { + if (!chkSelectAll.Checked) + { + foreach (DataGridViewRow row in dgvShop.Rows) + { + row.Cells["colSelect"].Value = false; + } + } + else + { + var list = lstAdminShopInfo.Where(s => s.LoginStatus2 == "国际版在线").ToList(); + if (IsClientJit) + list = list.Where(s => s.LoginStatus2 == "国际版在线" && s.jit_expire_time >= DateTime.Now.Date).ToList(); + foreach (DataGridViewRow row in dgvShop.Rows) + { + if (list.Any(l => l.ShopId == row.Cells["colShopId"]?.Value?.ToString())) + row.Cells["colSelect"].Value = true; + } + } + } + private void ChkSelectExtCode_CheckedChanged(object sender, EventArgs e) { FilterRows(); @@ -87,7 +131,10 @@ namespace TemuKJD.KJDForms.AdminForms priceCheckConfig.PriceDown = this.txtPriceDown.Text.Trim(); priceCheckConfig.SearchAllShop = this.chkSearchAllShop.Checked; - NaiBa.Util.Helper.ConfigHelper.SaveConfig("price_check_config", priceCheckConfig); + if (IsClientJit) + NaiBa.Util.Helper.ConfigHelper.SaveConfig("client_price_check_config", priceCheckConfig); + else + NaiBa.Util.Helper.ConfigHelper.SaveConfig("price_check_config", priceCheckConfig); } //bool firstLoad = true; @@ -96,17 +143,104 @@ namespace TemuKJD.KJDForms.AdminForms if (this.Visible /*&& this.firstLoad*/) { //firstLoad = false; - this.pbShopLoading.Visible = true; - SearchShop(this.ucSplitPage1.CurrentPage); + if (IsClientJit) + { + RefreshShop(); + } + else + { + this.pbShopLoading.Visible = true; + SearchShop(this.ucSplitPage1.CurrentPage); + } } } private void btnRefreshShop_Click(object sender, EventArgs e) { - if (this.ucSplitPage1.CurrentPage != 1) - this.ucSplitPage1.CurrentPage = 1; + if (IsClientJit) + { + RefreshShop(); + } else - SearchShop(1); + { + if (this.ucSplitPage1.CurrentPage != 1) + this.ucSplitPage1.CurrentPage = 1; + else + SearchShop(1); + } + } + + private void RefreshShop() + { + // 店铺Id + var selectIds = dgvShop.Rows.Cast().Where(row + => row.Cells["colSelect"]?.Value.ParseToBool() == true).Select(r => r.Cells["colShopId"]?.Value.ToString()).ToList(); + + var shopLst = GlobalConfig.ShopLoginList.ToList(); + if (!string.IsNullOrWhiteSpace(txtShopId.Text.Trim())) + { + shopLst = shopLst.Where(s => ("," + txtShopId.Text.Trim() + ",").Contains("," + s.ShopId + ",") || s.ShopId.Contains(txtShopId.Text.Trim())).ToList(); + } + if (!string.IsNullOrWhiteSpace(txtShopName.Text.Trim())) + { + shopLst = shopLst.Where(s => ("," + txtShopName.Text.Trim() + ",").Contains("," + s.ShopAccount + ",") || s.ShopAccount.ToLower().Contains(txtShopName.Text.Trim().ToLower())).ToList(); + } + if (!string.IsNullOrWhiteSpace(txtNotes.Text.Trim())) + { + shopLst = shopLst.Where(s => ("," + txtNotes.Text.Trim() + ",").Contains("," + s.Notes + ",") || s.Notes.ToLower().Contains(txtNotes.Text.Trim().ToLower())).ToList(); + } + + // 获取被删除的店铺 + List dgvRowList = dgvShop.Rows.Cast().Where(row + => !shopLst.Any(s => s.ShopId == row.Cells["colShopId"]?.Value?.ToString())).ToList(); + // 更新被删除的店铺列表 + foreach (var row in dgvRowList) + { + dgvShop.Rows.Remove(row); + } + // 绑定其他店铺（含新导入的店铺） + foreach (ShopLoginInfo shopEntity in shopLst) + { + if (!string.IsNullOrEmpty(shopEntity.ShopId)) + BindShop(shopEntity, selectIds); + } + } + + private void BindShop(ShopLoginInfo shopEntity, List selectShopId = null) + { + if (shopEntity == null) + return; + if (selectShopId == null) + selectShopId = new List(); + + bool canUse = shopEntity.LoginStatus2 == "国际版在线"; + var row = dgvShop.Rows.Cast().FirstOrDefault(p => p.Cells.GetCellValueFromColumnName("colShopId").ParseToString() == shopEntity.ShopId); + if (row == null) + { + int id = this.dgvShop.Rows.Add( + selectShopId.Contains(shopEntity.ShopId) && canUse, + shopEntity.UserName, + shopEntity.LoginName, + shopEntity.ShopId, + shopEntity.ShopAccount, + shopEntity.Notes, + canUse ? "在线" : "掉线", + shopEntity.jit_expire_time >= DateTime.Now.Date ? "可用" : "失效", + canUse, + string.Empty + ); + displayShopStatus(shopEntity); + } + else + { + row.Cells["colSelect"].Value = selectShopId.Contains(shopEntity.ShopId) && canUse; + row.Cells["colLoginName"].Value = shopEntity.LoginName; + row.Cells["colShopName"].Value = shopEntity.ShopAccount; + row.Cells["colShopNotes"].Value = shopEntity.Notes; + row.Cells["colLoginStatus"].Value = canUse ? "在线" : "掉线"; + row.Cells["colJitStatus"].Value = shopEntity.jit_expire_time >= DateTime.Now.Date ? "可用" : "失效"; + displayShopStatus(shopEntity); + } } private void ucSplitPage1_PageChange(object obj) @@ -154,6 +288,7 @@ namespace TemuKJD.KJDForms.AdminForms shop.ShopAccount, shop.Notes, canUse ? "在线" : "掉线", + "Jit", canUse, string.Empty ); @@ -219,6 +354,12 @@ namespace TemuKJD.KJDForms.AdminForms (row.Cells["colLoginStatus"] as DataGridViewLinkCell).LinkColor = canUse ? Color.Green : Color.Red; (row.Cells["colLoginStatus"] as DataGridViewLinkCell).ActiveLinkColor = canUse ? Color.LightGreen : Color.OrangeRed; (row.Cells["colLoginStatus"] as DataGridViewLinkCell).VisitedLinkColor = canUse ? Color.DarkGreen : Color.DarkRed; + + } + if (IsClientJit) + { + var jitRow = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ParseToString() == shop?.ShopId); + jitRow.Cells["colJitStatus"].Style.ForeColor = JitShopActiveForm.GetJitStatusStyleColor(shop); } } @@ -229,7 +370,11 @@ namespace TemuKJD.KJDForms.AdminForms string headerText = dgvShop.Columns[e.ColumnIndex].HeaderText; string loginName = dgvShop.Rows[e.RowIndex].Cells["colLoginName"].Value.ParseToString(); string accountId = dgvShop.Rows[e.RowIndex].Cells["colShopId"].Value.ParseToString(); - var shop = lstAdminShopInfo.FirstOrDefault(v => v.LoginName == loginName && v.ShopId == accountId); + ShopLoginInfo shop; + if (!IsClientJit) + shop = lstAdminShopInfo.FirstOrDefault(s => s.LoginName == loginName && s.ShopId == accountId); + else + shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == accountId); switch (headerText) { @@ -240,27 +385,69 @@ namespace TemuKJD.KJDForms.AdminForms //shopLoginForm.openType = EnumOpenType.login; //shopLoginForm.SaveComplete += shopLoginForm_SaveComplete; //shopLoginForm.ShowDialog(); - AdminShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false); - if (shop.LoginStatus2 == "国际版在线") + if (!IsClientJit) { - AdminShopLoginForm adminLoginForm = new AdminShopLoginForm(shop); - adminLoginForm.openType = EnumOpenType.manage; - adminLoginForm.WindowState = FormWindowState.Maximized; - adminLoginForm.InitUrl = "https://agentseller.temu.com"; - adminLoginForm.Show(); + CheckShopLogin(new ShopLoginInfo[] { shop }, false); + if (shop.LoginStatus2 == "国际版在线") + { + AdminShopLoginForm adminLoginForm = new AdminShopLoginForm(shop); + adminLoginForm.openType = EnumOpenType.manage; + adminLoginForm.WindowState = FormWindowState.Maximized; + adminLoginForm.InitUrl = "https://agentseller.temu.com"; + adminLoginForm.Show(); + } + else + { + AdminShopLoginForm shopLoginForm = new AdminShopLoginForm(shop); + shopLoginForm.openType = EnumOpenType.login; + shopLoginForm.SaveComplete += shopLoginForm_SaveComplete; + shopLoginForm.ShowDialog(); + } } else { - AdminShopLoginForm shopLoginForm = new AdminShopLoginForm(shop); - shopLoginForm.openType = EnumOpenType.login; - shopLoginForm.SaveComplete += shopLoginForm_SaveComplete; - shopLoginForm.ShowDialog(); + CheckShopLogin(new ShopLoginInfo[] { shop }, false); + if (shop.LoginStatus2 == "国际版在线") + { + ShopLoginForm loginForm = new ShopLoginForm(shop); + loginForm.openType = EnumOpenType.manage; + loginForm.WindowState = FormWindowState.Maximized; + loginForm.InitUrl = "https://agentseller.temu.com"; + loginForm.Show(); + } + else + { + ShopLoginForm shopLoginForm = new ShopLoginForm(shop); + shopLoginForm.openType = EnumOpenType.login; + shopLoginForm.SaveComplete += shopLoginForm_SaveComplete; + shopLoginForm.ShowDialog(); + } } } break; - default: + case "": + if (IsClientJit) + { + if (shop != null && shop.jit_expire_time > DateTime.Now.Date) + { + if (shop.LoginStatus2 != "国际版在线") + { + dgvShop.Rows[e.RowIndex].Cells["colSelect"].Value = false; + BaseMsgForm.ShowError("店铺未登录", "JIT商品核价-操作失败"); + return; + } + } + else + { + dgvShop.Rows[e.RowIndex].Cells["colSelect"].Value = false; + BaseMsgForm.ShowError("JIT卡密过期或未开通", "JIT商品核价-操作失败"); + return; + } + } dgvShop.Rows[e.RowIndex].Cells["colSelect"].Value = !(bool)dgvShop.Rows[e.RowIndex].Cells["colSelect"].Value; break; + default: + break; } } private void shopLoginForm_SaveComplete(object obj) @@ -281,7 +468,9 @@ namespace TemuKJD.KJDForms.AdminForms string orderId = dgvPriceCheck.Rows[e.RowIndex].Cells["colOrderId"].Value.ParseToString(); string prodId = dgvPriceCheck.Rows[e.RowIndex].Cells["colProductId"].Value.ParseToString(); string accountId = dgvPriceCheck.Rows[e.RowIndex].Cells["colSupplierId"].Value.ParseToString(); - var shop = lstAdminShopInfo.FirstOrDefault(v => v.ShopId == accountId); + var shop = lstAdminShopInfo.FirstOrDefault(s => s.ShopId == accountId); + if (IsClientJit) + shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == accountId); switch (headerText) { @@ -378,7 +567,7 @@ namespace TemuKJD.KJDForms.AdminForms var rst = applyPrice(shop, orderId, data); if (rst.Contains("登录过期") || rst.Contains("Invalid Login State")) { - AdminShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false); + CheckShopLogin(new ShopLoginInfo[] { shop }, false); Invoke(new Action(() => { displayShopStatus(shop); @@ -427,7 +616,7 @@ namespace TemuKJD.KJDForms.AdminForms var rst = rePrice(shop, orderId, data); if (rst.Contains("登录过期") || rst.Contains("Invalid Login State")) { - AdminShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false); + CheckShopLogin(new ShopLoginInfo[] { shop }, false); Invoke(new Action(() => { displayShopStatus(shop); @@ -493,7 +682,7 @@ namespace TemuKJD.KJDForms.AdminForms var rst = priceAdjust(shop, data); if (rst.Contains("登录过期") || rst.Contains("Invalid Login State")) { - AdminShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false); + CheckShopLogin(new ShopLoginInfo[] { shop }, false); Invoke(new Action(() => { displayShopStatus(shop); @@ -519,7 +708,7 @@ namespace TemuKJD.KJDForms.AdminForms var rst = this.cancelPrice(shop, orderId); if (rst.Contains("登录过期") || rst.Contains("Invalid Login State")) { - AdminShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false); + CheckShopLogin(new ShopLoginInfo[] { shop }, false); Invoke(new Action(() => { displayShopStatus(shop); @@ -563,7 +752,11 @@ namespace TemuKJD.KJDForms.AdminForms { var selectShopIdLst = this.dgvShop.Rows.Cast().Where(r => r.Cells["colSelect"].Value.ParseToBool() == true) .Select(r => r.Cells["colShopId"].Value.ParseToString()).Distinct().ToList(); - var shops = this.lstAdminShopInfo.Where(s => selectShopIdLst.Contains(s.ShopId)).ToList(); + List shops = new List(); + if (!IsClientJit) + shops = this.lstAdminShopInfo.Where(s => selectShopIdLst.Contains(s.ShopId)).ToList(); + else + shops = GlobalConfig.ShopLoginList.Where(s => selectShopIdLst.Contains(s.ShopId)).ToList(); if (shops.Count == 0) { BaseMsgForm.ShowError("没有选择店铺！"); @@ -592,11 +785,13 @@ namespace TemuKJD.KJDForms.AdminForms foreach (var shopId in selectShopIdLst) { shopIndex++; - var shop = this.lstAdminShopInfo.Where(s => shopId == s.ShopId).ToList().FirstOrDefault(); + var shop = this.lstAdminShopInfo.FirstOrDefault(s => shopId == s.ShopId); + if (IsClientJit) + shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => shopId == s.ShopId); if (shop == null) continue; - AdminShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false); + CheckShopLogin(new ShopLoginInfo[] { shop }, false); if (shop.LoginStatus2 != "国际版在线") { Invoke(new Action(() => @@ -622,7 +817,7 @@ namespace TemuKJD.KJDForms.AdminForms commonSleep(); if (searchRst.Contains("登录过期") || searchRst.Contains("Invalid Login State")) { - AdminShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false); + CheckShopLogin(new ShopLoginInfo[] { shop }, false); Invoke(new Action(() => { displayShopStatus(shop); @@ -711,7 +906,7 @@ namespace TemuKJD.KJDForms.AdminForms //Thread.Sleep(Randomx.GetId(20, 50)); //if (orderPriceRst.Contains("登录过期") || orderPriceRst.Contains("Invalid Login State")) //{ - // AdminShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false); + // CheckShopLogin(new ShopLoginInfo[] { shop }, false); //} //reviewInfo.suggestSupplyPrice = BaseRegex.GetIntJson(ref orderPriceRst, "suggestSupplyPrice"); //reviewInfo.supplyPrice = BaseRegex.GetIntJson(ref orderPriceRst, "supplyPrice"); @@ -986,6 +1181,8 @@ namespace TemuKJD.KJDForms.AdminForms { var rows = this.dgvPriceCheck.Rows.Cast().Where(r => r.Cells["colProductId"].Value.ParseToString() == price.productId.ParseToString()).ToList(); var shop = lstAdminShopInfo.FirstOrDefault(s => s.ShopId == price.supplierId.ParseToString()); + if (IsClientJit) + shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == price.supplierId.ParseToString()); if (shop == null) continue; if (shop.LoginStatus2 != "国际版在线") @@ -1027,7 +1224,7 @@ namespace TemuKJD.KJDForms.AdminForms { if (html.Contains("登录过期") || html.Contains("Invalid Login State")) { - AdminShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false); + CheckShopLogin(new ShopLoginInfo[] { shop }, false); Invoke(new Action(() => { displayShopStatus(shop); @@ -1075,7 +1272,7 @@ namespace TemuKJD.KJDForms.AdminForms { if (html.Contains("登录过期") || html.Contains("Invalid Login State")) { - AdminShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false); + CheckShopLogin(new ShopLoginInfo[] { shop }, false); Invoke(new Action(() => { displayShopStatus(shop); @@ -1130,6 +1327,8 @@ namespace TemuKJD.KJDForms.AdminForms { var orderId = row.Cells["colOrderId"].Value.ParseToString(); var shop = lstAdminShopInfo.FirstOrDefault(s => s.ShopId == row.Cells["colSupplierId"].Value.ParseToString()); + if (IsClientJit) + shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == row.Cells["colSupplierId"].Value.ParseToString()); if (shop == null) continue; @@ -1162,6 +1361,8 @@ namespace TemuKJD.KJDForms.AdminForms { var orderId = row.Cells["colOrderId"].Value.ParseToString(); var shop = lstAdminShopInfo.FirstOrDefault(s => s.ShopId == row.Cells["colSupplierId"].Value.ParseToString()); + if (IsClientJit) + shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == row.Cells["colSupplierId"].Value.ParseToString()); if (shop == null) continue; @@ -1194,6 +1395,8 @@ namespace TemuKJD.KJDForms.AdminForms { var orderId = row.Cells["colOrderId"].Value.ParseToString(); var shop = lstAdminShopInfo.FirstOrDefault(s => s.ShopId == row.Cells["colSupplierId"].Value.ParseToString()); + if (IsClientJit) + shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == row.Cells["colSupplierId"].Value.ParseToString()); if (shop == null) continue; @@ -1268,6 +1471,8 @@ namespace TemuKJD.KJDForms.AdminForms if (row == null) continue; var shop = lstAdminShopInfo.FirstOrDefault(s => s.ShopId == row.Cells["colSupplierId"].Value.ParseToString()); + if (IsClientJit) + shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == row.Cells["colSupplierId"].Value.ParseToString()); if (shop == null) continue; @@ -1431,254 +1636,60 @@ namespace TemuKJD.KJDForms.AdminForms { foreach (var price in prices) { - var rows = this.dgvPriceCheck.Rows.Cast().Where(r => r.Cells["colProductId"].Value.ParseToString() == price.productId.ParseToString()).ToList(); - var shop = lstAdminShopInfo.FirstOrDefault(s => s.ShopId == price.supplierId.ParseToString()); - if (shop == null) - continue; - if (shop.LoginStatus2 != "国际版在线") + var t = Task.Run(() => { - Invoke(new Action(() => - { - foreach (var row in rows) - row.Cells["colMsg"].Value = "店铺掉线"; - })); - continue; - } - - //var pName = price.productName; - if (checkRestoreSizeAndNumber(price)) - { - } - else - { - Invoke(new Action(() => - { - foreach (var row in rows) - row.Cells["colMsg"].Value = "无需还原包装规格尺寸与SKU分类数量"; - })); - continue; - } - - var taskUid = ""; - var html = editPriceProductSizeAndNumberBatchAdd(shop, price.productId.ParseToString()); - //{"success":true,"errorCode":1000000,"errorMsg":null,"result":{"handleFailedList":[{"failedBizId":4432690492,"failedReason":"This product has pending or in-progress modification tasks, cannot initiate again"}],"addFailedList":[{"failedBizId":4432690492,"failedReason":"This product has pending or in-progress modification tasks, cannot initiate again","failedReasonType":8}],"successBizId2TaskUidMap":{}}} - if (html.Contains("This product has pending or in-progress modification tasks")) - { - var taskHtml = editPriceProductSizeAndNumberTaskQuery(shop, price.productId.ParseToString()); - taskUid = BaseRegex.GetStringJson(ref taskHtml, "taskUid"); - if (string.IsNullOrEmpty(taskUid) || !taskHtml.Contains("\"productEditTaskItems\":[{\"editItem\":4,\"editAdvice\":\"优化\"},{\"editItem\":8,\"editAdvice\":\"优化\"}]")) + var rows = this.dgvPriceCheck.Rows.Cast().Where(r => r.Cells["colProductId"].Value.ParseToString() == price.productId.ParseToString()).ToList(); + var shop = lstAdminShopInfo.FirstOrDefault(s => s.ShopId == price.supplierId.ParseToString()); + if (IsClientJit) + shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == price.supplierId.ParseToString()); + if (shop == null) + return; // continue; + if (shop.LoginStatus2 != "国际版在线") { Invoke(new Action(() => { foreach (var row in rows) - row.Cells["colMsg"].Value = "已提交过修改任务或商品有其他修改任务"; + row.Cells["colMsg"].Value = "店铺掉线"; })); - continue; + return; //continue; } - } - if (!html.Contains("\"success\":true")) - { - if (html.Contains("登录过期") || html.Contains("Invalid Login State")) + + //var pName = price.productName; + if (checkRestoreSizeAndNumber(price)) { - AdminShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false); - Invoke(new Action(() => - { - displayShopStatus(shop); - })); - } - string sErrMsg = BaseRegex.GetStringJson(ref html, "errorMsg").ParseToString(); - if (string.IsNullOrEmpty(sErrMsg)) - { - sErrMsg = BaseRegex.GetStringJson(ref html, "error_msg").ParseToString(); - } - Invoke(new Action(() => - { - foreach (var row in rows) - row.Cells["colMsg"].Value = "修改请求失败 " + sErrMsg; - })); - continue; - } - try - { - if (string.IsNullOrEmpty(taskUid)) - { - JObject jObj = JObject.Parse(html); - taskUid = jObj["result"]["successBizId2TaskUidMap"].LastOrDefault().LastOrDefault().ParseToString(); - } - } - catch (Exception ex) - { - Invoke(new Action(() => - { - foreach (var row in rows) - row.Cells["colMsg"].Value = "修改请求失败 " + ex.Message; - })); - continue; - } - - - html = editPriceProductQuery(shop, price.productId.ParseToString(), taskUid); - if (html.Contains("This product has pending or in-progress modification tasks")) - { - Invoke(new Action(() => - { - foreach (var row in rows) - row.Cells["colMsg"].Value = "已提交过修改任务"; - })); - continue; - } - if (!html.Contains("\"success\":true")) - { - if (html.Contains("登录过期") || html.Contains("Invalid Login State")) - { - AdminShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false); - Invoke(new Action(() => - { - displayShopStatus(shop); - })); - } - string sErrMsg = BaseRegex.GetStringJson(ref html, "errorMsg").ParseToString(); - if (string.IsNullOrEmpty(sErrMsg)) - { - sErrMsg = BaseRegex.GetStringJson(ref html, "error_msg").ParseToString(); - } - Invoke(new Action(() => - { - foreach (var row in rows) - row.Cells["colMsg"].Value = "修改请求失败 " + sErrMsg; - })); - continue; - } - - try - { - //int len = Randomx.GetId(15, 31); //300 - //int width = Randomx.GetId(10, 15); //200 - //int height = Randomx.GetId(5, 10); //100 - //int weight = Randomx.GetId(100, 200); //500000 - //int numberOfPieces = Randomx.GetId(450, 601);// 单品数量 - int len = Randomx.GetId(numLen1.Value.ParseToInt(), numLen2.Value.ParseToInt() + 1); - int width = Randomx.GetId(numWidth1.Value.ParseToInt(), Math.Min(len, numWidth2.Value.ParseToInt() + 1)); - int height = Randomx.GetId(numHeight1.Value.ParseToInt(), Math.Min(width, numHeight2.Value.ParseToInt() + 1)); - int weight = Randomx.GetId(numWeight1.Value.ParseToInt(), numWeight2.Value.ParseToInt() + 1); - int numberOfPieces = 1; - - JObject obj = JObject.Parse(html); - var result = JsonHelper.SerializeObject(obj["result"]); - TemuDetailProductInfo prodInfo = JsonHelper.DeserializeJsonToObject(result); - - - //JObject jPost = new JObject(); - //jPost.Add("productId", price.productId); - //jPost.Add("taskUid", taskUid.ParseToString()); - //jPost.Add("taskVersion", 0); - //jPost.Add("refuseEdit", false); - //var jProductSkcMainReqs = new JArray(); - //jPost.Add("productSkcReqs", jProductSkcMainReqs); - //JObject jProductSkcMainReq = new JObject(); - //jProductSkcMainReqs.Add(jProductSkcMainReq); - //var jMainProductSkuSpecReqs = new JArray(); - //jProductSkcMainReq.Add("mainProductSkuSpecReqs", jMainProductSkuSpecReqs); - //jMainProductSkuSpecReqs.Add(new JObject() { - // new JProperty("parentSpecId",0), - // new JProperty("parentSpecName",""), - // new JProperty("specId",0), - // new JProperty("specName",""), - //}); - - var jStr = "{"; - jStr += "\r\n\"productId\":" + price.productId + ","; - jStr += "\r\n\"taskUid\":\"" + taskUid.ParseToString() + "\","; - jStr += "\r\n\"taskVersion\":" + 0 + ","; - jStr += "\r\n\"refuseEdit\":false,"; - jStr += "\r\n\"productSkcReqs\":[{"; - jStr += " \r\n\"mainProductSkuSpecReqs\":[{".Trim(); - jStr += " \r\n\"parentSpecId\":0,".Trim(); - jStr += " \r\n\"parentSpecName\":\"\",".Trim(); - jStr += " \r\n\"specId\":0,".Trim(); - jStr += " \r\n\"specName\":\"\"".Trim(); - jStr += " \r\n}],".Trim(); - - - jStr += " \r\n\"productSkuReqs\":[".Trim(); - - foreach (var sku in prodInfo.productSkcList.FirstOrDefault().productSkuList) - { - jStr += " \r\n{".Trim(); - - //productSkuSpecReqs - jStr += " \r\n\"productSkuSpecReqs\":[".Trim(); - foreach (var spec in sku.productSkuSpecList) - { - jStr += "{"; - jStr += "\"parentSpecId\":" + spec.parentSpecId + ","; - jStr += "\"parentSpecName\":\"" + spec.parentSpecName + "\","; - jStr += "\"specId\":" + spec.specId + ","; - jStr += "\"specName\":\"" + spec.specName + "\","; - var specProp = prodInfo.productSpecPropertyVOS.FirstOrDefault(p => p.parentSpecId == spec.parentSpecId); - if (!string.IsNullOrEmpty(specProp?.valueGroupId.ParseToString())) - jStr += "\"groupId\":" + specProp?.valueGroupId.ParseToString() + ","; - if (!string.IsNullOrEmpty(specProp?.vid.ParseToString())) - jStr += "\"vid\":" + specProp?.vid.ParseToString() + ","; - jStr = jStr.TrimEnd(','); - jStr += "},"; - } - jStr = jStr.TrimEnd(','); - jStr += " \r\n],".Trim(); - - //productSkuWhExtAttrReq - jStr += "\"productSkuWhExtAttrReq\":{"; - jStr += " \"productSkuWeightReq\":{\"value\":" + (weight * 1000) + "},"; - jStr += " \"productSkuVolumeReq\":{"; - jStr += " \"len\":" + (len * 10) + ","; - jStr += " \"width\":" + (width * 10) + ","; - jStr += " \"height\":" + (height * 10); - jStr += " }"; - jStr += "},"; - - //productSkuMultiPackReq - jStr += "\"productSkuMultiPackReq\":{"; - jStr += " \"skuClassification\":1,"; - jStr += " \"numberOfPieces\":1,"; - jStr += " \"pieceUnitCode\":" + Math.Max(1, sku.productSkuMultiPack.pieceUnitCode.ParseToInt()) + ","; - jStr += " \"productSkuNetContentReq\":{"; - jStr += " },"; - jStr += " \"individuallyPacked\":-1"; - jStr += "},"; - - //productSkuAccessoriesReq - jStr += "\"productSkuAccessoriesReq\":{"; - jStr += "\"productSkuAccessories\":["; - jStr += "]"; - jStr += "}"; - - jStr += " \r\n},".Trim(); - } - jStr = jStr.TrimEnd(','); - jStr += " \r\n]".Trim(); - - jStr += "\r\n}]"; - jStr += "\r\n}"; - - var jStrObj = JObject.Parse(jStr); - jStr = JsonHelper.SerializeObject(jStrObj); - - html = editPriceProductSizeAndNumber(shop, taskUid.ParseToString(), price.productId.ParseToString(), jStr); - Thread.Sleep(Randomx.GetId(25, 75)); - commonSleep(); - if (html.Contains("\"success\":true")) - { - Invoke(new Action(() => - { - foreach (var row in rows) - row.Cells["colMsg"].Value = "修改请求成功"; - })); } else + { + Invoke(new Action(() => + { + foreach (var row in rows) + row.Cells["colMsg"].Value = "无需还原包装规格尺寸与SKU分类数量"; + })); + return; //continue; + } + + var taskUid = ""; + var html = editPriceProductSizeAndNumberBatchAdd(shop, price.productId.ParseToString()); + //{"success":true,"errorCode":1000000,"errorMsg":null,"result":{"handleFailedList":[{"failedBizId":4432690492,"failedReason":"This product has pending or in-progress modification tasks, cannot initiate again"}],"addFailedList":[{"failedBizId":4432690492,"failedReason":"This product has pending or in-progress modification tasks, cannot initiate again","failedReasonType":8}],"successBizId2TaskUidMap":{}}} + if (html.Contains("This product has pending or in-progress modification tasks")) + { + var taskHtml = editPriceProductSizeAndNumberTaskQuery(shop, price.productId.ParseToString()); + taskUid = BaseRegex.GetStringJson(ref taskHtml, "taskUid"); + if (string.IsNullOrEmpty(taskUid) || !taskHtml.Contains("\"productEditTaskItems\":[{\"editItem\":4,\"editAdvice\":\"优化\"},{\"editItem\":8,\"editAdvice\":\"优化\"}]")) + { + Invoke(new Action(() => + { + foreach (var row in rows) + row.Cells["colMsg"].Value = "已提交过修改任务或商品有其他修改任务"; + })); + return; //continue; + } + } + if (!html.Contains("\"success\":true")) { if (html.Contains("登录过期") || html.Contains("Invalid Login State")) { - AdminShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false); + CheckShopLogin(new ShopLoginInfo[] { shop }, false); Invoke(new Action(() => { displayShopStatus(shop); @@ -1686,26 +1697,226 @@ namespace TemuKJD.KJDForms.AdminForms } string sErrMsg = BaseRegex.GetStringJson(ref html, "errorMsg").ParseToString(); if (string.IsNullOrEmpty(sErrMsg)) + { sErrMsg = BaseRegex.GetStringJson(ref html, "error_msg").ParseToString(); - if (string.IsNullOrEmpty(sErrMsg)) - sErrMsg = html; + } Invoke(new Action(() => { foreach (var row in rows) row.Cells["colMsg"].Value = "修改请求失败 " + sErrMsg; })); - continue; + return; //continue; } - } - catch (Exception ex) - { - Invoke(new Action(() => + try { - foreach (var row in rows) - row.Cells["colMsg"].Value = "修改请求失败 " + ex.Message; - })); - continue; - } + if (string.IsNullOrEmpty(taskUid)) + { + JObject jObj = JObject.Parse(html); + taskUid = jObj["result"]["successBizId2TaskUidMap"].LastOrDefault().LastOrDefault().ParseToString(); + } + } + catch (Exception ex) + { + Invoke(new Action(() => + { + foreach (var row in rows) + row.Cells["colMsg"].Value = "修改请求失败 " + ex.Message; + })); + return; // continue; + } + + + html = editPriceProductQuery(shop, price.productId.ParseToString(), taskUid).ParseToString(); + if (html.Contains("This product has pending or in-progress modification tasks")) + { + Invoke(new Action(() => + { + foreach (var row in rows) + row.Cells["colMsg"].Value = "已提交过修改任务"; + })); + return; // continue; + } + if (!html.Contains("\"success\":true")) + { + if (html.Contains("登录过期") || html.Contains("Invalid Login State")) + { + CheckShopLogin(new ShopLoginInfo[] { shop }, false); + Invoke(new Action(() => + { + displayShopStatus(shop); + })); + } + string sErrMsg = BaseRegex.GetStringJson(ref html, "errorMsg").ParseToString(); + if (string.IsNullOrEmpty(sErrMsg)) + { + sErrMsg = BaseRegex.GetStringJson(ref html, "error_msg").ParseToString(); + } + Invoke(new Action(() => + { + foreach (var row in rows) + row.Cells["colMsg"].Value = "修改请求失败 " + sErrMsg; + })); + return; // continue; + } + + try + { + //int len = Randomx.GetId(15, 31); //300 + //int width = Randomx.GetId(10, 15); //200 + //int height = Randomx.GetId(5, 10); //100 + //int weight = Randomx.GetId(100, 200); //500000 + //int numberOfPieces = Randomx.GetId(450, 601);// 单品数量 + int len = Randomx.GetId(numLen1.Value.ParseToInt(), numLen2.Value.ParseToInt() + 1); + int width = Randomx.GetId(numWidth1.Value.ParseToInt(), Math.Min(len, numWidth2.Value.ParseToInt() + 1)); + int height = Randomx.GetId(numHeight1.Value.ParseToInt(), Math.Min(width, numHeight2.Value.ParseToInt() + 1)); + int weight = Randomx.GetId(numWeight1.Value.ParseToInt(), numWeight2.Value.ParseToInt() + 1); + int numberOfPieces = 1; + + JObject obj = JObject.Parse(html); + var result = JsonHelper.SerializeObject(obj["result"]); + TemuDetailProductInfo prodInfo = JsonHelper.DeserializeJsonToObject(result); + + + //JObject jPost = new JObject(); + //jPost.Add("productId", price.productId); + //jPost.Add("taskUid", taskUid.ParseToString()); + //jPost.Add("taskVersion", 0); + //jPost.Add("refuseEdit", false); + //var jProductSkcMainReqs = new JArray(); + //jPost.Add("productSkcReqs", jProductSkcMainReqs); + //JObject jProductSkcMainReq = new JObject(); + //jProductSkcMainReqs.Add(jProductSkcMainReq); + //var jMainProductSkuSpecReqs = new JArray(); + //jProductSkcMainReq.Add("mainProductSkuSpecReqs", jMainProductSkuSpecReqs); + //jMainProductSkuSpecReqs.Add(new JObject() { + // new JProperty("parentSpecId",0), + // new JProperty("parentSpecName",""), + // new JProperty("specId",0), + // new JProperty("specName",""), + //}); + + var jStr = "{"; + jStr += "\r\n\"productId\":" + price.productId + ","; + jStr += "\r\n\"taskUid\":\"" + taskUid.ParseToString() + "\","; + jStr += "\r\n\"taskVersion\":" + 0 + ","; + jStr += "\r\n\"refuseEdit\":false,"; + jStr += "\r\n\"productSkcReqs\":[{"; + jStr += " \r\n\"mainProductSkuSpecReqs\":[{".Trim(); + jStr += " \r\n\"parentSpecId\":0,".Trim(); + jStr += " \r\n\"parentSpecName\":\"\",".Trim(); + jStr += " \r\n\"specId\":0,".Trim(); + jStr += " \r\n\"specName\":\"\"".Trim(); + jStr += " \r\n}],".Trim(); + + + jStr += " \r\n\"productSkuReqs\":[".Trim(); + + foreach (var sku in prodInfo.productSkcList.FirstOrDefault().productSkuList) + { + jStr += " \r\n{".Trim(); + + //productSkuSpecReqs + jStr += " \r\n\"productSkuSpecReqs\":[".Trim(); + foreach (var spec in sku.productSkuSpecList) + { + jStr += "{"; + jStr += "\"parentSpecId\":" + spec.parentSpecId + ","; + jStr += "\"parentSpecName\":\"" + spec.parentSpecName + "\","; + jStr += "\"specId\":" + spec.specId + ","; + jStr += "\"specName\":\"" + spec.specName + "\","; + var specProp = prodInfo.productSpecPropertyVOS.FirstOrDefault(p => p.parentSpecId == spec.parentSpecId); + if (!string.IsNullOrEmpty(specProp?.valueGroupId.ParseToString())) + jStr += "\"groupId\":" + specProp?.valueGroupId.ParseToString() + ","; + if (!string.IsNullOrEmpty(specProp?.vid.ParseToString())) + jStr += "\"vid\":" + specProp?.vid.ParseToString() + ","; + jStr = jStr.TrimEnd(','); + jStr += "},"; + } + jStr = jStr.TrimEnd(','); + jStr += " \r\n],".Trim(); + + //productSkuWhExtAttrReq + jStr += "\"productSkuWhExtAttrReq\":{"; + jStr += " \"productSkuWeightReq\":{\"value\":" + (weight * 1000) + "},"; + jStr += " \"productSkuVolumeReq\":{"; + jStr += " \"len\":" + (len * 10) + ","; + jStr += " \"width\":" + (width * 10) + ","; + jStr += " \"height\":" + (height * 10); + jStr += " }"; + jStr += "},"; + + //productSkuMultiPackReq + jStr += "\"productSkuMultiPackReq\":{"; + jStr += " \"skuClassification\":1,"; + jStr += " \"numberOfPieces\":1,"; + jStr += " \"pieceUnitCode\":" + Math.Max(1, sku.productSkuMultiPack.pieceUnitCode.ParseToInt()) + ","; + jStr += " \"productSkuNetContentReq\":{"; + jStr += " },"; + jStr += " \"individuallyPacked\":-1"; + jStr += "},"; + + //productSkuAccessoriesReq + jStr += "\"productSkuAccessoriesReq\":{"; + jStr += "\"productSkuAccessories\":["; + jStr += "]"; + jStr += "}"; + + jStr += " \r\n},".Trim(); + } + jStr = jStr.TrimEnd(','); + jStr += " \r\n]".Trim(); + + jStr += "\r\n}]"; + jStr += "\r\n}"; + + var jStrObj = JObject.Parse(jStr); + jStr = JsonHelper.SerializeObject(jStrObj); + + html = editPriceProductSizeAndNumber(shop, taskUid.ParseToString(), price.productId.ParseToString(), jStr); + Thread.Sleep(Randomx.GetId(25, 75)); + commonSleep(); + if (html.Contains("\"success\":true")) + { + Invoke(new Action(() => + { + foreach (var row in rows) + row.Cells["colMsg"].Value = "修改请求成功"; + })); + } + else + { + if (html.Contains("登录过期") || html.Contains("Invalid Login State")) + { + CheckShopLogin(new ShopLoginInfo[] { shop }, false); + Invoke(new Action(() => + { + displayShopStatus(shop); + })); + } + string sErrMsg = BaseRegex.GetStringJson(ref html, "errorMsg").ParseToString(); + if (string.IsNullOrEmpty(sErrMsg)) + sErrMsg = BaseRegex.GetStringJson(ref html, "error_msg").ParseToString(); + if (string.IsNullOrEmpty(sErrMsg)) + sErrMsg = html; + Invoke(new Action(() => + { + foreach (var row in rows) + row.Cells["colMsg"].Value = "修改请求失败 " + sErrMsg; + })); + return; //continue; + } + } + catch (Exception ex) + { + Invoke(new Action(() => + { + foreach (var row in rows) + row.Cells["colMsg"].Value = "修改请求失败 " + ex.Message; + })); + return; //continue; + } + }); + t.Wait(20000); } Invoke(new Action(() => @@ -1962,7 +2173,7 @@ namespace TemuKJD.KJDForms.AdminForms FilterRows(); } - public static int sleepTime = 100; + public static int sleepTime = 300; void commonSleep() { Thread.Sleep(sleepTime); @@ -1972,6 +2183,14 @@ namespace TemuKJD.KJDForms.AdminForms { sleepTime = (this.numSleep.Value * 1000).ParseToInt(); } + + void CheckShopLogin(ShopLoginInfo[] shops, bool isShowProgress) + { + if (!IsClientJit) + AdminShopListForm.Instance.CheckShopLogin(shops, isShowProgress); + else + ShopListForm.Instance.CheckShopLogin(shops, isShowProgress); + } } public class PriceCheckConfig diff --git a/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.resx b/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.resx index 6e0fb6b..01a30ac 100644 --- a/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.resx +++ b/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.resx @@ -144,6 +144,9 @@ True + + True + True diff --git a/TEMUKJD/KJDForms/JITForms/JITForm.cs b/TEMUKJD/KJDForms/JITForms/JITForm.cs index 4a766d5..e74288d 100644 --- a/TEMUKJD/KJDForms/JITForms/JITForm.cs +++ b/TEMUKJD/KJDForms/JITForms/JITForm.cs @@ -54,15 +54,19 @@ namespace TemuKJD.KJDForms.JITForms SetForm(jitShopActiveForm.Value); break; case "JIT商品选品": + dbProductListForm.Value.IsClientJit = true; SetForm(dbProductListForm.Value); break; case "JIT商品上传": + dDbProductSelectListManageForm.Value.IsClientJit = true; SetForm(dDbProductSelectListManageForm.Value); break; case "JIT商品核价": + productPriceCheckForm.Value.IsClientJit = true; SetForm(productPriceCheckForm.Value); break; case "开通JIT": + temuJitForm.Value.IsClientJit = true; SetForm(temuJitForm.Value); break; } diff --git a/TEMUKJD/KJDForms/JITForms/JitShopActiveForm.Designer.cs b/TEMUKJD/KJDForms/JITForms/JitShopActiveForm.Designer.cs index 1beb593..6d15848 100644 --- a/TEMUKJD/KJDForms/JITForms/JitShopActiveForm.Designer.cs +++ b/TEMUKJD/KJDForms/JITForms/JitShopActiveForm.Designer.cs @@ -30,11 +30,644 @@ namespace TemuKJD.KJDForms.JITForms private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(800, 450); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + this.splitContainer3 = new System.Windows.Forms.SplitContainer(); + this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); + this.btnEmpty = new DevComponents.DotNetBar.PanelEx(); + this.btnRefreshShop = new DevComponents.DotNetBar.PanelEx(); + this.txtNotes = new System.Windows.Forms.TextBox(); + this.label14 = new System.Windows.Forms.Label(); + this.txtShopName = new System.Windows.Forms.TextBox(); + this.label21 = new System.Windows.Forms.Label(); + this.txtShopId = new System.Windows.Forms.TextBox(); + this.label22 = new System.Windows.Forms.Label(); + this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx(); + this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.colShopLoginName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colShopNotes = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colLoginStatus = new System.Windows.Forms.DataGridViewLinkColumn(); + this.colJitStatus = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colJitExpireTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colActiveJitCardCode = new System.Windows.Forms.DataGridViewLinkColumn(); + this.colCanUse = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.splitContainer4 = new System.Windows.Forms.SplitContainer(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); + this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); + this.btnClear = new DevComponents.DotNetBar.PanelEx(); + this.pbLoading = new System.Windows.Forms.PictureBox(); + this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.splitContainer2 = new System.Windows.Forms.SplitContainer(); + this.panel1 = new System.Windows.Forms.Panel(); + this.btnActive = new DevComponents.DotNetBar.PanelEx(); + this.txtActiveJitCardCode = new System.Windows.Forms.TextBox(); + this.txtActiveShopName = new System.Windows.Forms.TextBox(); + this.txtAcitveShopId = new System.Windows.Forms.TextBox(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).BeginInit(); + this.splitContainer3.Panel1.SuspendLayout(); + this.splitContainer3.Panel2.SuspendLayout(); + this.splitContainer3.SuspendLayout(); + this.ucGroupBoxEx1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dgvShop)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer4)).BeginInit(); + this.splitContainer4.Panel1.SuspendLayout(); + this.splitContainer4.Panel2.SuspendLayout(); + this.splitContainer4.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); + this.splitContainer1.Panel1.SuspendLayout(); + this.splitContainer1.Panel2.SuspendLayout(); + this.splitContainer1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit(); + this.splitContainer2.Panel1.SuspendLayout(); + this.splitContainer2.Panel2.SuspendLayout(); + this.splitContainer2.SuspendLayout(); + this.panel1.SuspendLayout(); + this.SuspendLayout(); + // + // splitContainer3 + // + this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer3.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; + this.splitContainer3.Location = new System.Drawing.Point(4, 0); + this.splitContainer3.Name = "splitContainer3"; + this.splitContainer3.Orientation = System.Windows.Forms.Orientation.Horizontal; + // + // splitContainer3.Panel1 + // + this.splitContainer3.Panel1.Controls.Add(this.ucGroupBoxEx1); + // + // splitContainer3.Panel2 + // + this.splitContainer3.Panel2.Controls.Add(this.dgvShop); + this.splitContainer3.Size = new System.Drawing.Size(490, 436); + this.splitContainer3.SplitterDistance = 120; + this.splitContainer3.TabIndex = 1; + // + // ucGroupBoxEx1 + // + this.ucGroupBoxEx1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + 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.btnEmpty); + this.ucGroupBoxEx1.Controls.Add(this.btnRefreshShop); + this.ucGroupBoxEx1.Controls.Add(this.txtNotes); + this.ucGroupBoxEx1.Controls.Add(this.label14); + this.ucGroupBoxEx1.Controls.Add(this.txtShopName); + this.ucGroupBoxEx1.Controls.Add(this.label21); + this.ucGroupBoxEx1.Controls.Add(this.txtShopId); + this.ucGroupBoxEx1.Controls.Add(this.label22); + this.ucGroupBoxEx1.Location = new System.Drawing.Point(-2, 2); + this.ucGroupBoxEx1.Name = "ucGroupBoxEx1"; + this.ucGroupBoxEx1.Size = new System.Drawing.Size(494, 120); + this.ucGroupBoxEx1.TabIndex = 400; + this.ucGroupBoxEx1.TabStop = false; + this.ucGroupBoxEx1.Text = "基础"; + // + // btnEmpty + // + this.btnEmpty.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnEmpty.CanvasColor = System.Drawing.SystemColors.Control; + this.btnEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnEmpty.DisabledBackColor = System.Drawing.Color.Empty; + this.btnEmpty.Location = new System.Drawing.Point(387, 90); + this.btnEmpty.Name = "btnEmpty"; + this.btnEmpty.Size = new System.Drawing.Size(88, 23); + this.btnEmpty.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnEmpty.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnEmpty.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnEmpty.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.btnEmpty.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnEmpty.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.btnEmpty.Style.GradientAngle = 90; + this.btnEmpty.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; + this.btnEmpty.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnEmpty.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnEmpty.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnEmpty.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.btnEmpty.TabIndex = 705; + this.btnEmpty.Text = "重置查询条件"; + this.btnEmpty.Click += new System.EventHandler(this.btnEmpty_Click); + // + // btnRefreshShop + // + this.btnRefreshShop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnRefreshShop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnRefreshShop.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnRefreshShop.DisabledBackColor = System.Drawing.Color.Empty; + this.btnRefreshShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnRefreshShop.Location = new System.Drawing.Point(289, 90); + this.btnRefreshShop.Name = "btnRefreshShop"; + this.btnRefreshShop.Size = new System.Drawing.Size(96, 23); + this.btnRefreshShop.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnRefreshShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnRefreshShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnRefreshShop.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnRefreshShop.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnRefreshShop.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnRefreshShop.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnRefreshShop.Style.GradientAngle = 90; + this.btnRefreshShop.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnRefreshShop.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnRefreshShop.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnRefreshShop.TabIndex = 431; + this.btnRefreshShop.Text = "查询/刷新店铺"; + this.btnRefreshShop.Click += new System.EventHandler(this.btnRefreshShop_Click); + // + // txtNotes + // + this.txtNotes.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.txtNotes.Location = new System.Drawing.Point(75, 65); + this.txtNotes.Name = "txtNotes"; + this.txtNotes.Size = new System.Drawing.Size(400, 23); + this.txtNotes.TabIndex = 507; + // + // label14 + // + this.label14.AutoSize = true; + this.label14.Location = new System.Drawing.Point(18, 68); + this.label14.Name = "label14"; + this.label14.Size = new System.Drawing.Size(68, 17); + this.label14.TabIndex = 508; + this.label14.Text = "店铺分组："; + // + // txtShopName + // + this.txtShopName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.txtShopName.Location = new System.Drawing.Point(75, 40); + this.txtShopName.Name = "txtShopName"; + this.txtShopName.Size = new System.Drawing.Size(400, 23); + this.txtShopName.TabIndex = 505; + // + // label21 + // + this.label21.AutoSize = true; + this.label21.Location = new System.Drawing.Point(18, 43); + this.label21.Name = "label21"; + this.label21.Size = new System.Drawing.Size(68, 17); + this.label21.TabIndex = 506; + this.label21.Text = "店铺名称："; + // + // txtShopId + // + this.txtShopId.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.txtShopId.Location = new System.Drawing.Point(75, 15); + this.txtShopId.Name = "txtShopId"; + this.txtShopId.Size = new System.Drawing.Size(400, 23); + this.txtShopId.TabIndex = 503; + // + // label22 + // + this.label22.AutoSize = true; + this.label22.Location = new System.Drawing.Point(29, 18); + this.label22.Name = "label22"; + this.label22.Size = new System.Drawing.Size(57, 17); + this.label22.TabIndex = 504; + this.label22.Text = "店铺ID："; + // + // dgvShop + // + this.dgvShop.AllowUserToAddRows = false; + this.dgvShop.AllowUserToDeleteRows = false; + dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3; + 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))))); + 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.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4; + this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.colSelect, + this.colShopLoginName, + this.colShopId, + this.colShopName, + this.colShopNotes, + this.colLoginStatus, + this.colJitStatus, + this.colJitExpireTime, + this.colActiveJitCardCode, + this.colCanUse, + this.colMessage}); + this.dgvShop.Dock = System.Windows.Forms.DockStyle.Fill; + this.dgvShop.Location = new System.Drawing.Point(0, 0); + this.dgvShop.Name = "dgvShop"; + this.dgvShop.ReadOnly = true; + this.dgvShop.RowHeadersWidth = 25; + this.dgvShop.RowTemplate.Height = 23; + this.dgvShop.Size = new System.Drawing.Size(490, 312); + this.dgvShop.TabIndex = 6; + this.dgvShop.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellContentClick); + // + // colSelect + // + this.colSelect.HeaderText = "全选"; + this.colSelect.Name = "colSelect"; + this.colSelect.ReadOnly = true; + this.colSelect.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colSelect.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colSelect.Visible = false; + this.colSelect.Width = 28; + // + // colShopLoginName + // + this.colShopLoginName.HeaderText = "店铺登录名"; + this.colShopLoginName.Name = "colShopLoginName"; + this.colShopLoginName.ReadOnly = true; + this.colShopLoginName.Visible = false; + // + // colShopId + // + this.colShopId.HeaderText = "店铺Id"; + this.colShopId.Name = "colShopId"; + this.colShopId.ReadOnly = true; + this.colShopId.Visible = false; + this.colShopId.Width = 55; + // + // colShopName + // + this.colShopName.HeaderText = "店铺名称"; + this.colShopName.Name = "colShopName"; + this.colShopName.ReadOnly = true; + this.colShopName.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colShopName.Width = 70; + // + // colShopNotes + // + this.colShopNotes.HeaderText = "分组"; + this.colShopNotes.Name = "colShopNotes"; + this.colShopNotes.ReadOnly = true; + this.colShopNotes.Width = 70; + // + // colLoginStatus + // + this.colLoginStatus.HeaderText = "状态"; + this.colLoginStatus.Name = "colLoginStatus"; + this.colLoginStatus.ReadOnly = true; + this.colLoginStatus.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colLoginStatus.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colLoginStatus.Visible = false; + this.colLoginStatus.Width = 38; + // + // colJitStatus + // + this.colJitStatus.HeaderText = "Jit状态"; + this.colJitStatus.Name = "colJitStatus"; + this.colJitStatus.ReadOnly = true; + this.colJitStatus.Width = 50; + // + // colJitExpireTime + // + this.colJitExpireTime.HeaderText = "过期时间"; + this.colJitExpireTime.Name = "colJitExpireTime"; + this.colJitExpireTime.ReadOnly = true; + // + // colActiveJitCardCode + // + this.colActiveJitCardCode.HeaderText = "激活卡密"; + this.colActiveJitCardCode.Name = "colActiveJitCardCode"; + this.colActiveJitCardCode.ReadOnly = true; + this.colActiveJitCardCode.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colActiveJitCardCode.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colActiveJitCardCode.Width = 70; + // + // colCanUse + // + this.colCanUse.HeaderText = "可用"; + this.colCanUse.Name = "colCanUse"; + this.colCanUse.ReadOnly = true; + this.colCanUse.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colCanUse.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colCanUse.Visible = false; + this.colCanUse.Width = 28; + // + // colMessage + // + this.colMessage.HeaderText = "消息"; + this.colMessage.Name = "colMessage"; + this.colMessage.ReadOnly = true; + // + // splitContainer4 + // + this.splitContainer4.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer4.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; + this.splitContainer4.Location = new System.Drawing.Point(0, 0); + this.splitContainer4.Name = "splitContainer4"; + // + // splitContainer4.Panel1 + // + this.splitContainer4.Panel1.Controls.Add(this.statusBar); + // + // splitContainer4.Panel2 + // + this.splitContainer4.Panel2.Controls.Add(this.panelEx1); + this.splitContainer4.Panel2.Controls.Add(this.btnClear); + this.splitContainer4.Size = new System.Drawing.Size(1098, 26); + this.splitContainer4.SplitterDistance = 873; + this.splitContainer4.TabIndex = 3; + // + // statusBar + // + this.statusBar.BackColor = System.Drawing.Color.White; + this.statusBar.Dock = System.Windows.Forms.DockStyle.Fill; + this.statusBar.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.statusBar.Location = new System.Drawing.Point(0, 0); + this.statusBar.Margin = new System.Windows.Forms.Padding(0); + this.statusBar.Name = "statusBar"; + this.statusBar.Size = new System.Drawing.Size(873, 26); + this.statusBar.TabIndex = 2; + // + // panelEx1 + // + this.panelEx1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; + this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty; + this.panelEx1.Location = new System.Drawing.Point(101, 0); + this.panelEx1.Name = "panelEx1"; + this.panelEx1.Size = new System.Drawing.Size(115, 21); + this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; + this.panelEx1.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.panelEx1.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.panelEx1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.panelEx1.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.panelEx1.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.panelEx1.Style.GradientAngle = 90; + this.panelEx1.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; + this.panelEx1.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.panelEx1.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.panelEx1.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.panelEx1.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.panelEx1.TabIndex = 668; + this.panelEx1.Text = "停止当前操作"; + this.panelEx1.Visible = false; + // + // btnClear + // + this.btnClear.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnClear.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnClear.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnClear.DisabledBackColor = System.Drawing.Color.Empty; + this.btnClear.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnClear.Location = new System.Drawing.Point(6, 0); + this.btnClear.Name = "btnClear"; + this.btnClear.Size = new System.Drawing.Size(90, 21); + this.btnClear.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnClear.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnClear.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnClear.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnClear.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnClear.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnClear.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnClear.Style.GradientAngle = 90; + this.btnClear.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnClear.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnClear.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnClear.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.btnClear.TabIndex = 440; + this.btnClear.Text = "清空结果"; + this.btnClear.Visible = false; + // + // 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(273, 193); + 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; + // + // splitContainer1 + // + this.splitContainer1.BackColor = System.Drawing.Color.White; + this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; + this.splitContainer1.Location = new System.Drawing.Point(0, 0); + this.splitContainer1.Name = "splitContainer1"; + this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal; + // + // splitContainer1.Panel1 + // + this.splitContainer1.Panel1.Controls.Add(this.splitContainer2); + // + // splitContainer1.Panel2 + // + this.splitContainer1.Panel2.Controls.Add(this.splitContainer4); + this.splitContainer1.Size = new System.Drawing.Size(1098, 466); + this.splitContainer1.SplitterDistance = 436; + this.splitContainer1.TabIndex = 11; + // + // splitContainer2 + // + this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer2.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; + this.splitContainer2.Location = new System.Drawing.Point(0, 0); + this.splitContainer2.Name = "splitContainer2"; + // + // splitContainer2.Panel1 + // + this.splitContainer2.Panel1.Controls.Add(this.splitContainer3); + this.splitContainer2.Panel1.Padding = new System.Windows.Forms.Padding(4, 0, 0, 0); + // + // splitContainer2.Panel2 + // + this.splitContainer2.Panel2.Controls.Add(this.panel1); + this.splitContainer2.Panel2.Padding = new System.Windows.Forms.Padding(0, 0, 4, 0); + this.splitContainer2.Size = new System.Drawing.Size(1098, 436); + this.splitContainer2.SplitterDistance = 494; + this.splitContainer2.TabIndex = 0; + // + // panel1 + // + this.panel1.Controls.Add(this.btnActive); + this.panel1.Controls.Add(this.txtActiveJitCardCode); + this.panel1.Controls.Add(this.txtActiveShopName); + this.panel1.Controls.Add(this.txtAcitveShopId); + this.panel1.Controls.Add(this.pbLoading); + this.panel1.Controls.Add(this.label1); + this.panel1.Controls.Add(this.label2); + this.panel1.Controls.Add(this.label3); + this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel1.Location = new System.Drawing.Point(0, 0); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(596, 436); + this.panel1.TabIndex = 189; + // + // btnActive + // + this.btnActive.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnActive.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnActive.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnActive.DisabledBackColor = System.Drawing.Color.Empty; + this.btnActive.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnActive.Location = new System.Drawing.Point(429, 128); + this.btnActive.Name = "btnActive"; + this.btnActive.Size = new System.Drawing.Size(76, 23); + this.btnActive.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnActive.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnActive.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnActive.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnActive.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnActive.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnActive.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnActive.Style.GradientAngle = 90; + this.btnActive.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnActive.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnActive.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnActive.TabIndex = 517; + this.btnActive.Text = "激活"; + this.btnActive.Click += new System.EventHandler(this.btnActive_Click); + // + // txtActiveJitCardCode + // + this.txtActiveJitCardCode.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.txtActiveJitCardCode.Location = new System.Drawing.Point(105, 99); + this.txtActiveJitCardCode.Name = "txtActiveJitCardCode"; + this.txtActiveJitCardCode.Size = new System.Drawing.Size(400, 23); + this.txtActiveJitCardCode.TabIndex = 510; + // + // txtActiveShopName + // + this.txtActiveShopName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.txtActiveShopName.Location = new System.Drawing.Point(105, 70); + this.txtActiveShopName.Name = "txtActiveShopName"; + this.txtActiveShopName.ReadOnly = true; + this.txtActiveShopName.Size = new System.Drawing.Size(400, 23); + this.txtActiveShopName.TabIndex = 509; + // + // txtAcitveShopId + // + this.txtAcitveShopId.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.txtAcitveShopId.Location = new System.Drawing.Point(105, 39); + this.txtAcitveShopId.Name = "txtAcitveShopId"; + this.txtAcitveShopId.ReadOnly = true; + this.txtAcitveShopId.Size = new System.Drawing.Size(400, 23); + this.txtAcitveShopId.TabIndex = 508; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(48, 73); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(68, 17); + this.label1.TabIndex = 512; + this.label1.Text = "店铺名称："; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(59, 42); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(57, 17); + this.label2.TabIndex = 511; + this.label2.Text = "店铺ID："; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(56, 102); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(60, 17); + this.label3.TabIndex = 513; + this.label3.Text = "JIT卡密："; + // + // JitShopActiveForm + // + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; + this.ClientSize = new System.Drawing.Size(1098, 466); + this.Controls.Add(this.splitContainer1); + this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.Name = "JitShopActiveForm"; this.Text = "JitShopActiveForm"; + this.Load += new System.EventHandler(this.JitShopActiveForm_Load); + this.VisibleChanged += new System.EventHandler(this.JitShopActiveForm_VisibleChanged); + this.splitContainer3.Panel1.ResumeLayout(false); + this.splitContainer3.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).EndInit(); + this.splitContainer3.ResumeLayout(false); + this.ucGroupBoxEx1.ResumeLayout(false); + this.ucGroupBoxEx1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dgvShop)).EndInit(); + this.splitContainer4.Panel1.ResumeLayout(false); + this.splitContainer4.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer4)).EndInit(); + this.splitContainer4.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).EndInit(); + this.splitContainer1.Panel1.ResumeLayout(false); + this.splitContainer1.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); + this.splitContainer1.ResumeLayout(false); + this.splitContainer2.Panel1.ResumeLayout(false); + this.splitContainer2.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit(); + this.splitContainer2.ResumeLayout(false); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); + this.ResumeLayout(false); + } #endregion + + private System.Windows.Forms.SplitContainer splitContainer3; + private UserComponent.DataGridViewEx dgvShop; + private System.Windows.Forms.SplitContainer splitContainer4; + private UserControls.StatusBarUserControl statusBar; + private DevComponents.DotNetBar.PanelEx panelEx1; + private System.Windows.Forms.PictureBox pbLoading; + private System.Windows.Forms.SplitContainer splitContainer1; + private System.Windows.Forms.SplitContainer splitContainer2; + private UserComponent.UcGroupBoxEx ucGroupBoxEx1; + private DevComponents.DotNetBar.PanelEx btnEmpty; + private DevComponents.DotNetBar.PanelEx btnRefreshShop; + private System.Windows.Forms.TextBox txtNotes; + private System.Windows.Forms.Label label14; + private System.Windows.Forms.TextBox txtShopName; + private System.Windows.Forms.Label label21; + private System.Windows.Forms.TextBox txtShopId; + private System.Windows.Forms.Label label22; + private DevComponents.DotNetBar.PanelEx btnClear; + private System.Windows.Forms.Panel panel1; + private DevComponents.DotNetBar.PanelEx btnActive; + private System.Windows.Forms.TextBox txtActiveJitCardCode; + private System.Windows.Forms.TextBox txtActiveShopName; + private System.Windows.Forms.TextBox txtAcitveShopId; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect; + private System.Windows.Forms.DataGridViewTextBoxColumn colShopLoginName; + private System.Windows.Forms.DataGridViewTextBoxColumn colShopId; + private System.Windows.Forms.DataGridViewTextBoxColumn colShopName; + private System.Windows.Forms.DataGridViewTextBoxColumn colShopNotes; + private System.Windows.Forms.DataGridViewLinkColumn colLoginStatus; + private System.Windows.Forms.DataGridViewTextBoxColumn colJitStatus; + private System.Windows.Forms.DataGridViewTextBoxColumn colJitExpireTime; + private System.Windows.Forms.DataGridViewLinkColumn colActiveJitCardCode; + private System.Windows.Forms.DataGridViewCheckBoxColumn colCanUse; + private System.Windows.Forms.DataGridViewTextBoxColumn colMessage; } } \ No newline at end of file diff --git a/TEMUKJD/KJDForms/JITForms/JitShopActiveForm.cs b/TEMUKJD/KJDForms/JITForms/JitShopActiveForm.cs index 5a3b4df..b4c6914 100644 --- a/TEMUKJD/KJDForms/JITForms/JitShopActiveForm.cs +++ b/TEMUKJD/KJDForms/JITForms/JitShopActiveForm.cs @@ -1,4 +1,8 @@ -using System; +using AllBase; +using AllBase.Helper; +using AllBase.Model.Result; +using NaiBa.Util.Extension; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -7,14 +11,232 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using TemuKJD.BaseForms; +using TemuKJD.Extension; +using Work; namespace TemuKJD.KJDForms.JITForms { public partial class JitShopActiveForm : Form { + private CheckBox chkSelectAll = new CheckBox(); + public JitShopActiveForm() { InitializeComponent(); } + + private void JitShopActiveForm_Load(object sender, EventArgs e) + { + //chkSelectAll = dgvShop.Columns["colSelect"].AddHeaderCheckBox(HorizontalAlignment.Center, 0, 0, null, null, false); + //dgvShop.Columns["colSelect"].HeaderText = ""; + //chkSelectAll.Width = chkSelectAll.Height = 13; + //chkSelectAll.CheckedChanged += chkSelectAll_CheckedChanged; + } + + private void chkSelectAll_CheckedChanged(object sender, EventArgs e) + { + if (!chkSelectAll.Checked) + { + foreach (DataGridViewRow row in dgvShop.Rows) + { + row.Cells["colSelect"].Value = false; + } + } + else + { + var list = GlobalConfig.ShopLoginList.Where(s => s.LoginStatus == "登录成功").Select(ss => ss.ShopId); + foreach (DataGridViewRow row in dgvShop.Rows) + { + if (list.Any(l => l == row.Cells["colShopId"]?.Value?.ToString())) + row.Cells["colSelect"].Value = true; + } + } + } + + private void JitShopActiveForm_VisibleChanged(object sender, EventArgs e) + { + if (Visible == true) + RefreshShop(); + } + + private void btnRefreshShop_Click(object sender, EventArgs e) + { + RefreshShop(); + } + + private void RefreshShop() + { + // 店铺Id + var selectIds = dgvShop.Rows.Cast().Where(row + => row.Cells["colSelect"]?.Value.ParseToBool() == true).Select(r => r.Cells["colShopId"]?.Value.ToString()).ToList(); + + var shopLst = GlobalConfig.ShopLoginList.ToList(); + if (!string.IsNullOrWhiteSpace(txtShopId.Text.Trim())) + { + shopLst = shopLst.Where(s => ("," + txtShopId.Text.Trim() + ",").Contains("," + s.ShopId + ",") || s.ShopId.Contains(txtShopId.Text.Trim())).ToList(); + } + if (!string.IsNullOrWhiteSpace(txtShopName.Text.Trim())) + { + shopLst = shopLst.Where(s => ("," + txtShopName.Text.Trim() + ",").Contains("," + s.ShopAccount + ",") || s.ShopAccount.ToLower().Contains(txtShopName.Text.Trim().ToLower())).ToList(); + } + if (!string.IsNullOrWhiteSpace(txtNotes.Text.Trim())) + { + shopLst = shopLst.Where(s => ("," + txtNotes.Text.Trim() + ",").Contains("," + s.Notes + ",") || s.Notes.ToLower().Contains(txtNotes.Text.Trim().ToLower())).ToList(); + } + + // 获取被删除的店铺 + List dgvRowList = dgvShop.Rows.Cast().Where(row + => !shopLst.Any(s => s.ShopId == row.Cells["colShopId"]?.Value?.ToString())).ToList(); + // 更新被删除的店铺列表 + foreach (var row in dgvRowList) + { + dgvShop.Rows.Remove(row); + } + // 绑定其他店铺（含新导入的店铺） + foreach (ShopLoginInfo shopEntity in shopLst) + { + if (!string.IsNullOrEmpty(shopEntity.ShopId)) + BindShop(shopEntity, selectIds); + } + } + + private void BindShop(ShopLoginInfo shopEntity, List selectShopId = null) + { + if (shopEntity == null) + return; + if (selectShopId == null) + selectShopId = new List(); + + bool canUse = shopEntity.LoginStatus == "登录成功" && shopEntity.LoginStatus2 == "国际版在线"; + var row = dgvShop.Rows.Cast().FirstOrDefault(p => p.Cells.GetCellValueFromColumnName("colShopId").ParseToString() == shopEntity.ShopId); + if (row == null) + { + int id = this.dgvShop.Rows.Add( + selectShopId.Contains(shopEntity.ShopId) && canUse, + shopEntity.LoginName, + shopEntity.ShopId, + shopEntity.ShopAccount, + shopEntity.Notes, + canUse ? "在线" : "掉线", + GetJitStatus(shopEntity), + shopEntity.jit_expire_time?.ToString("yyyy/MM/dd"), + "激活", + canUse, + string.Empty + ); + row = dgvShop.Rows[id]; + (row.Cells["colLoginStatus"] as DataGridViewLinkCell).Style.ForeColor = canUse ? Color.Green : Color.Red; + (row.Cells["colLoginStatus"] as DataGridViewLinkCell).LinkColor = canUse ? Color.Green : Color.Red; + (row.Cells["colLoginStatus"] as DataGridViewLinkCell).ActiveLinkColor = canUse ? Color.LightGreen : Color.OrangeRed; + (row.Cells["colLoginStatus"] as DataGridViewLinkCell).VisitedLinkColor = canUse ? Color.DarkGreen : Color.DarkRed; + + row.Cells["colJitStatus"].Style.ForeColor = GetJitStatusStyleColor(shopEntity); + } + else + { + row.Cells["colSelect"].Value = selectShopId.Contains(shopEntity.ShopId) && canUse; + row.Cells["colShopLoginName"].Value = shopEntity.LoginName; + row.Cells["colShopName"].Value = shopEntity.ShopAccount; + row.Cells["colShopNotes"].Value = shopEntity.Notes; + row.Cells["colLoginStatus"].Value = canUse ? "在线" : "掉线"; + (row.Cells["colLoginStatus"] as DataGridViewLinkCell).Style.ForeColor = canUse ? Color.Green : Color.Red; + (row.Cells["colLoginStatus"] as DataGridViewLinkCell).LinkColor = canUse ? Color.Green : Color.Red; + (row.Cells["colLoginStatus"] as DataGridViewLinkCell).ActiveLinkColor = canUse ? Color.LightGreen : Color.OrangeRed; + (row.Cells["colLoginStatus"] as DataGridViewLinkCell).VisitedLinkColor = canUse ? Color.DarkGreen : Color.DarkRed; + row.Cells["colCanUse"].Value = canUse; + row.Cells["colJitStatus"].Value = GetJitStatus(shopEntity); + row.Cells["colJitExpireTime"].Value = shopEntity.jit_expire_time?.ToString("yyyy/MM/dd"); + + row.Cells["colJitStatus"].Style.ForeColor = GetJitStatusStyleColor(shopEntity); + } + } + + public static string GetJitStatus(ShopLoginInfo shop) + { + if (shop.jit_expire_time == null) + return "未开通"; + else if (shop.jit_expire_time?.Date >= DateTime.Now.Date) + return "已开通"; + else + return "已过期"; + } + public static Color GetJitStatusStyleColor(ShopLoginInfo shop) + { + if (shop.jit_expire_time == null) + return Color.Orange; + else if (shop.jit_expire_time?.Date >= DateTime.Now.Date) + return Color.Green; + else + return Color.Red; + } + + private void dgvShop_CellContentClick(object sender, DataGridViewCellEventArgs e) + { + if (e.ColumnIndex < 0 || e.RowIndex < 0) + return; + string headerText = dgvShop.Columns[e.ColumnIndex].HeaderText; + string columnName = dgvShop.Columns[e.ColumnIndex].Name; + long shopId = dgvShop.Rows[e.RowIndex].Cells["colShopId"].Value.ParseToLong(); + string shopAccount = dgvShop.Rows[e.RowIndex].Cells["colShopName"].Value.ToString(); + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId.ToString()); + var row = dgvShop.Rows[e.RowIndex]; + switch (columnName) + { + case "colActiveJitCardCode": + if (shop != null) + { + this.txtAcitveShopId.Text = shop.ShopId; + this.txtActiveShopName.Text = shop.ShopAccount; + this.txtActiveJitCardCode.Text = ""; + } + else + { + BaseMsgForm.ShowInfo("店铺不存在！"); + } + break; + } + } + + private void btnEmpty_Click(object sender, EventArgs e) + { + txtNotes.Text = txtShopId.Text = txtShopName.Text = ""; + } + + private void btnActive_Click(object sender, EventArgs e) + { + var url = BaseClass.BuildObjString("shop/active_jit_card_code"); + var data = UserLogin.GetSignaturex() + //+ "&login_name=" + shop.LoginName + //直通车相同账户的不同店铺之间是隔离的，所以只能填店铺id更新一个店铺 + + "&shop_id=" + txtAcitveShopId.Text.Trim() + + "&shop_account=" + txtActiveShopName.Text.Trim() + + "&card_code_id=" + txtActiveJitCardCode.Text.Trim(); + var result = GetHtml.PostUtf8(url, data); + if (!result.Contains("\"code\":200")) + { + var msg = BaseRegex.GetStringJson(ref result, "msg"); + if (string.IsNullOrEmpty(msg)) + msg = "JIT激活失败！"; + BaseMsgForm.ShowError(msg); + } + else + { + var expire_time = BaseRegex.GetStringJson(ref result, "expire_time"); + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == txtAcitveShopId.Text.Trim()); + if (shop != null) + { + try + { + shop.jit_expire_time = Convert.ToDateTime(expire_time); + RefreshShop(); + } + catch + { + } + } + BaseMsgForm.ShowInfo("激活成功！"); + } + } } } diff --git a/TEMUKJD/KJDForms/JITForms/JitShopActiveForm.resx b/TEMUKJD/KJDForms/JITForms/JitShopActiveForm.resx new file mode 100644 index 0000000..d46ecdd --- /dev/null +++ b/TEMUKJD/KJDForms/JITForms/JitShopActiveForm.resx @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + \ No newline at end of file diff --git a/TEMUKJD/KJDForms/ProductForms/ProductChangePriceForm.cs b/TEMUKJD/KJDForms/ProductForms/ProductChangePriceForm.cs index 44ed009..f0848e0 100644 --- a/TEMUKJD/KJDForms/ProductForms/ProductChangePriceForm.cs +++ b/TEMUKJD/KJDForms/ProductForms/ProductChangePriceForm.cs @@ -330,7 +330,7 @@ namespace TemuKJD.KJDForms.ProductForms } if (!dgvOrder.Rows.Cast().Any(r => r.Cells["colSelect"].Value.ParseToBool() == true)) { - BaseMsgForm.ShowError("请至少勾选一项！"); + BaseMsgForm.ShowError("请至少勾选一项！"); // todo return; } foreach (DataGridViewRow r in dgvOrder.Rows) diff --git a/TEMUKJD/KJDForms/ProductForms/TemuAdsForm.Designer.cs b/TEMUKJD/KJDForms/ProductForms/TemuAdsForm.Designer.cs index 1c539cf..7a6c0dc 100644 --- a/TEMUKJD/KJDForms/ProductForms/TemuAdsForm.Designer.cs +++ b/TEMUKJD/KJDForms/ProductForms/TemuAdsForm.Designer.cs @@ -1473,6 +1473,7 @@ namespace TemuKJD.KJDForms.ProductForms this.panelEx1.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; this.panelEx1.TabIndex = 668; this.panelEx1.Text = "停止当前操作"; + this.panelEx1.Click += new System.EventHandler(this.panelEx1_Click); // // btnClear // diff --git a/TEMUKJD/KJDForms/ProductForms/TemuAdsForm.cs b/TEMUKJD/KJDForms/ProductForms/TemuAdsForm.cs index eed2748..b605b9c 100644 --- a/TEMUKJD/KJDForms/ProductForms/TemuAdsForm.cs +++ b/TEMUKJD/KJDForms/ProductForms/TemuAdsForm.cs @@ -903,6 +903,7 @@ namespace TemuKJD.KJDForms.ProductForms tryAgain: Thread.Sleep(100 + Randomx.GetId(200)); string jsonStr = getAdsGoodsList(shop, page, pageSize); + Thread.Sleep(Randomx.GetId(300, 800)); if (jsonStr.Contains("当前操作人数太多，请稍后重试") && tryCount < 5) { tryCount++; @@ -962,21 +963,24 @@ namespace TemuKJD.KJDForms.ProductForms ads_goods_info adsGoodsInfo = JsonHelper.DeserializeJsonToObject(sItem); // 反序列化得到类 if (adsGoodsInfo != null && !lstAdsMallGoodsInfo.Any(a => a.goods_id == adsGoodsInfo.goods_id)) { - if (adsGoodsInfo.gray_reason != null) - continue; + //if (adsGoodsInfo.gray_reason != null) + // continue; adsGoodsInfo.shopId = shop.ShopId; lstAdsMallGoodsInfo.Add(adsGoodsInfo); spuIdLst.Add(adsGoodsInfo.spu_id); - var create_ad_req_param = new create_ad_req_param() + if (adsGoodsInfo.gray_reason == null) { - budget = chkLimitValue.Checked ? (txtBudget.Text.ParseToDecimal() * 100).ParseToInt() : -1, - goods_id = adsGoodsInfo.goods_id.ParseToString(), - site_id = adsGoodsInfo.site_list.FirstOrDefault().ParseToInt(), - roas = (txtSameRoas.Text.ParseToDecimal() * 10000).ParseToInt(), - }; - createAds.create_ad_reqs.Add(create_ad_req_param); + var create_ad_req_param = new create_ad_req_param() + { + budget = chkLimitValue.Checked ? (txtBudget.Text.ParseToDecimal() * 100).ParseToInt() : -1, + goods_id = adsGoodsInfo.goods_id.ParseToString(), + site_id = adsGoodsInfo.site_list.FirstOrDefault().ParseToInt(), + roas = (txtSameRoas.Text.ParseToDecimal() * 10000).ParseToInt(), + }; + createAds.create_ad_reqs.Add(create_ad_req_param); + } Invoke(new Action(() => { @@ -1012,7 +1016,7 @@ namespace TemuKJD.KJDForms.ProductForms "点击率(CTR)", "转化率(CVR)", "加入购物车数", - "" // 操作结果，状态 + adsGoodsInfo.gray_reason == null ? "" : string.Join(",", adsGoodsInfo.gray_reason.Select(g => g.reason)) // 操作结果，状态 ); dgvAds.Rows[rowId].Height = 50; @@ -1130,7 +1134,13 @@ namespace TemuKJD.KJDForms.ProductForms } int total = BaseRegex.GetStringJson(ref jsonStr, "total").ParseToInt(); - totalPage = Math.Ceiling(1.0 * total / pageSize).ParseToInt(); + if (totalPage == 1) + totalPage = Math.Ceiling(1.0 * total / pageSize).ParseToInt(); + bool hasMore = BaseRegex.GetBoolJson(ref jsonStr, "has_more"); + if (hasMore && totalPage == page) + { + totalPage++; + } } page++; } @@ -2344,6 +2354,12 @@ namespace TemuKJD.KJDForms.ProductForms { txtNotes.Text = txtShopId.Text = txtShopName.Text = ""; } + + private void panelEx1_Click(object sender, EventArgs e) + { + if (cancellationTokenSource != null) + cancellationTokenSource.Cancel(); + } } public class CreateAdsParam diff --git a/TEMUKJD/KJDForms/ProductForms/TemuJitForm.Designer.cs b/TEMUKJD/KJDForms/ProductForms/TemuJitForm.Designer.cs index 7a48732..03ebdc4 100644 --- a/TEMUKJD/KJDForms/ProductForms/TemuJitForm.Designer.cs +++ b/TEMUKJD/KJDForms/ProductForms/TemuJitForm.Designer.cs @@ -106,6 +106,7 @@ namespace TemuKJD.KJDForms.ProductForms this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colShopNotes = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colLoginStatus = new System.Windows.Forms.DataGridViewLinkColumn(); + this.colJitStatus = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colCanUse = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.pnlSpecDetail = new System.Windows.Forms.Panel(); @@ -113,6 +114,10 @@ namespace TemuKJD.KJDForms.ProductForms this.btnClose = new DevComponents.DotNetBar.PanelEx(); this.pbLoading = new System.Windows.Forms.PictureBox(); this.dgvOpenJit = new TemuKJD.UserComponent.DataGridViewEx(); + this.splitContainer4 = new System.Windows.Forms.SplitContainer(); + this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage(); + this.btnClear = new DevComponents.DotNetBar.PanelEx(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colProdIndex = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colOrderId = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -135,10 +140,6 @@ namespace TemuKJD.KJDForms.ProductForms this.colStock = new System.Windows.Forms.DataGridViewLinkColumn(); this.colRecevieArea = new System.Windows.Forms.DataGridViewLinkColumn(); this.colMsg = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.splitContainer4 = new System.Windows.Forms.SplitContainer(); - this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage(); - this.btnClear = new DevComponents.DotNetBar.PanelEx(); - this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -940,14 +941,14 @@ namespace TemuKJD.KJDForms.ProductForms this.splitContainer2.Panel2.Controls.Add(this.dgvOpenJit); this.splitContainer2.Panel2.Padding = new System.Windows.Forms.Padding(0, 0, 4, 0); this.splitContainer2.Size = new System.Drawing.Size(1584, 437); - this.splitContainer2.SplitterDistance = 280; + this.splitContainer2.SplitterDistance = 325; this.splitContainer2.TabIndex = 0; // // pbShopLoading // this.pbShopLoading.Anchor = System.Windows.Forms.AnchorStyles.None; this.pbShopLoading.Image = global::TemuKJD.Properties.Resources.loading_blue; - this.pbShopLoading.Location = new System.Drawing.Point(115, 193); + this.pbShopLoading.Location = new System.Drawing.Point(137, 193); this.pbShopLoading.Name = "pbShopLoading"; this.pbShopLoading.Size = new System.Drawing.Size(50, 50); this.pbShopLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -992,6 +993,7 @@ namespace TemuKJD.KJDForms.ProductForms this.colShopName, this.colShopNotes, this.colLoginStatus, + this.colJitStatus, this.colCanUse, this.colMessage}); this.dgvShop.Dock = System.Windows.Forms.DockStyle.Fill; @@ -1000,7 +1002,7 @@ namespace TemuKJD.KJDForms.ProductForms this.dgvShop.ReadOnly = true; this.dgvShop.RowHeadersWidth = 25; this.dgvShop.RowTemplate.Height = 23; - this.dgvShop.Size = new System.Drawing.Size(276, 437); + this.dgvShop.Size = new System.Drawing.Size(321, 437); this.dgvShop.TabIndex = 6; this.dgvShop.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellContentClick); // @@ -1059,6 +1061,13 @@ namespace TemuKJD.KJDForms.ProductForms this.colLoginStatus.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; this.colLoginStatus.Width = 38; // + // colJitStatus + // + this.colJitStatus.HeaderText = "JIT"; + this.colJitStatus.Name = "colJitStatus"; + this.colJitStatus.ReadOnly = true; + this.colJitStatus.Width = 38; + // // colCanUse // this.colCanUse.HeaderText = "可用"; @@ -1085,7 +1094,7 @@ namespace TemuKJD.KJDForms.ProductForms this.pnlSpecDetail.Controls.Add(this.btnClose); this.pnlSpecDetail.Location = new System.Drawing.Point(115, 58); this.pnlSpecDetail.Name = "pnlSpecDetail"; - this.pnlSpecDetail.Size = new System.Drawing.Size(1071, 124); + this.pnlSpecDetail.Size = new System.Drawing.Size(1026, 124); this.pnlSpecDetail.TabIndex = 683; this.pnlSpecDetail.Visible = false; // @@ -1098,7 +1107,7 @@ namespace TemuKJD.KJDForms.ProductForms this.textBox1.Multiline = true; this.textBox1.Name = "textBox1"; this.textBox1.ScrollBars = System.Windows.Forms.ScrollBars.Both; - this.textBox1.Size = new System.Drawing.Size(1012, 65); + this.textBox1.Size = new System.Drawing.Size(967, 65); this.textBox1.TabIndex = 690; // // btnClose @@ -1108,7 +1117,7 @@ namespace TemuKJD.KJDForms.ProductForms this.btnClose.Cursor = System.Windows.Forms.Cursors.Hand; this.btnClose.DisabledBackColor = System.Drawing.Color.Empty; this.btnClose.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnClose.Location = new System.Drawing.Point(982, 88); + this.btnClose.Location = new System.Drawing.Point(937, 88); this.btnClose.Name = "btnClose"; this.btnClose.Size = new System.Drawing.Size(58, 23); this.btnClose.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -1130,7 +1139,7 @@ namespace TemuKJD.KJDForms.ProductForms // this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None; this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue; - this.pbLoading.Location = new System.Drawing.Point(609, 193); + this.pbLoading.Location = new System.Drawing.Point(586, 193); this.pbLoading.Name = "pbLoading"; this.pbLoading.Size = new System.Drawing.Size(50, 50); this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -1185,10 +1194,80 @@ namespace TemuKJD.KJDForms.ProductForms this.dgvOpenJit.ReadOnly = true; this.dgvOpenJit.RowHeadersWidth = 36; this.dgvOpenJit.RowTemplate.Height = 23; - this.dgvOpenJit.Size = new System.Drawing.Size(1296, 437); + this.dgvOpenJit.Size = new System.Drawing.Size(1251, 437); this.dgvOpenJit.TabIndex = 187; this.dgvOpenJit.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvOpenJit_CellContentClick); // + // splitContainer4 + // + this.splitContainer4.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer4.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; + this.splitContainer4.Location = new System.Drawing.Point(0, 0); + this.splitContainer4.Name = "splitContainer4"; + // + // splitContainer4.Panel1 + // + this.splitContainer4.Panel1.Controls.Add(this.ucSplitPage1); + // + // splitContainer4.Panel2 + // + this.splitContainer4.Panel2.Controls.Add(this.btnClear); + this.splitContainer4.Panel2.Controls.Add(this.statusBar); + this.splitContainer4.Size = new System.Drawing.Size(1584, 26); + this.splitContainer4.SplitterDistance = 282; + this.splitContainer4.TabIndex = 3; + // + // ucSplitPage1 + // + this.ucSplitPage1.CurrentPage = 1; + this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Left; + this.ucSplitPage1.IsShowPageSize = false; + this.ucSplitPage1.Location = new System.Drawing.Point(0, 0); + this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0); + this.ucSplitPage1.Name = "ucSplitPage1"; + this.ucSplitPage1.PageSize = 50; + this.ucSplitPage1.Size = new System.Drawing.Size(282, 26); + this.ucSplitPage1.TabIndex = 5; + this.ucSplitPage1.TotalPage = 1; + this.ucSplitPage1.PageChange += new System.Action(this.ucSplitPage1_PageChange); + // + // btnClear + // + this.btnClear.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.btnClear.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnClear.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnClear.DisabledBackColor = System.Drawing.Color.Empty; + this.btnClear.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnClear.Location = new System.Drawing.Point(1204, 0); + this.btnClear.Name = "btnClear"; + this.btnClear.Size = new System.Drawing.Size(90, 21); + this.btnClear.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnClear.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnClear.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnClear.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnClear.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnClear.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnClear.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnClear.Style.GradientAngle = 90; + this.btnClear.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnClear.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnClear.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnClear.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.btnClear.TabIndex = 440; + this.btnClear.Text = "清空结果"; + this.btnClear.Visible = false; + // + // statusBar + // + this.statusBar.BackColor = System.Drawing.Color.White; + this.statusBar.Dock = System.Windows.Forms.DockStyle.Fill; + this.statusBar.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.statusBar.Location = new System.Drawing.Point(0, 0); + this.statusBar.Margin = new System.Windows.Forms.Padding(0); + this.statusBar.Name = "statusBar"; + this.statusBar.Size = new System.Drawing.Size(1298, 26); + this.statusBar.TabIndex = 2; + // // colCheck // this.colCheck.HeaderText = "选择"; @@ -1267,7 +1346,6 @@ namespace TemuKJD.KJDForms.ProductForms this.colProdName.HeaderText = "标题"; this.colProdName.Name = "colProdName"; this.colProdName.ReadOnly = true; - this.colProdName.Width = 120; // // colSkuName // @@ -1293,7 +1371,7 @@ namespace TemuKJD.KJDForms.ProductForms this.colExtCodePrice.HeaderText = "货号进价"; this.colExtCodePrice.Name = "colExtCodePrice"; this.colExtCodePrice.ReadOnly = true; - this.colExtCodePrice.Width = 65; + this.colExtCodePrice.Width = 62; // // colPrcie // @@ -1309,7 +1387,7 @@ namespace TemuKJD.KJDForms.ProductForms this.colCreatTime.HeaderText = "创建时间"; this.colCreatTime.Name = "colCreatTime"; this.colCreatTime.ReadOnly = true; - this.colCreatTime.Width = 65; + this.colCreatTime.Width = 62; // // colChangePrice // @@ -1351,7 +1429,7 @@ namespace TemuKJD.KJDForms.ProductForms this.colStock.Name = "colStock"; this.colStock.ReadOnly = true; this.colStock.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colStock.Width = 65; + this.colStock.Width = 62; // // colRecevieArea // @@ -1361,7 +1439,7 @@ namespace TemuKJD.KJDForms.ProductForms this.colRecevieArea.Name = "colRecevieArea"; this.colRecevieArea.ReadOnly = true; this.colRecevieArea.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colRecevieArea.Width = 65; + this.colRecevieArea.Width = 62; // // colMsg // @@ -1370,76 +1448,6 @@ namespace TemuKJD.KJDForms.ProductForms this.colMsg.ReadOnly = true; this.colMsg.Width = 180; // - // splitContainer4 - // - this.splitContainer4.Dock = System.Windows.Forms.DockStyle.Fill; - this.splitContainer4.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; - this.splitContainer4.Location = new System.Drawing.Point(0, 0); - this.splitContainer4.Name = "splitContainer4"; - // - // splitContainer4.Panel1 - // - this.splitContainer4.Panel1.Controls.Add(this.ucSplitPage1); - // - // splitContainer4.Panel2 - // - this.splitContainer4.Panel2.Controls.Add(this.btnClear); - this.splitContainer4.Panel2.Controls.Add(this.statusBar); - this.splitContainer4.Size = new System.Drawing.Size(1584, 26); - this.splitContainer4.SplitterDistance = 282; - this.splitContainer4.TabIndex = 3; - // - // ucSplitPage1 - // - this.ucSplitPage1.CurrentPage = 1; - this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Left; - this.ucSplitPage1.IsShowPageSize = false; - this.ucSplitPage1.Location = new System.Drawing.Point(0, 0); - this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0); - this.ucSplitPage1.Name = "ucSplitPage1"; - this.ucSplitPage1.PageSize = 50; - this.ucSplitPage1.Size = new System.Drawing.Size(282, 26); - this.ucSplitPage1.TabIndex = 5; - this.ucSplitPage1.TotalPage = 1; - this.ucSplitPage1.PageChange += new System.Action(this.ucSplitPage1_PageChange); - // - // btnClear - // - this.btnClear.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.btnClear.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnClear.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnClear.DisabledBackColor = System.Drawing.Color.Empty; - this.btnClear.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnClear.Location = new System.Drawing.Point(1204, 0); - this.btnClear.Name = "btnClear"; - this.btnClear.Size = new System.Drawing.Size(90, 21); - this.btnClear.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnClear.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnClear.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnClear.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.btnClear.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.btnClear.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.btnClear.Style.ForeColor.Color = System.Drawing.Color.White; - this.btnClear.Style.GradientAngle = 90; - this.btnClear.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnClear.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnClear.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnClear.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; - this.btnClear.TabIndex = 440; - this.btnClear.Text = "清空结果"; - this.btnClear.Visible = false; - // - // statusBar - // - this.statusBar.BackColor = System.Drawing.Color.White; - this.statusBar.Dock = System.Windows.Forms.DockStyle.Fill; - this.statusBar.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.statusBar.Location = new System.Drawing.Point(0, 0); - this.statusBar.Margin = new System.Windows.Forms.Padding(0); - this.statusBar.Name = "statusBar"; - this.statusBar.Size = new System.Drawing.Size(1298, 26); - this.statusBar.TabIndex = 2; - // // TemuJitForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -1498,15 +1506,6 @@ namespace TemuKJD.KJDForms.ProductForms private System.Windows.Forms.SplitContainer splitContainer2; private System.Windows.Forms.PictureBox pbShopLoading; private UserComponent.DataGridViewEx dgvShop; - private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect; - private System.Windows.Forms.DataGridViewTextBoxColumn colUser; - private System.Windows.Forms.DataGridViewTextBoxColumn colLoginName; - private System.Windows.Forms.DataGridViewTextBoxColumn colShopId; - private System.Windows.Forms.DataGridViewTextBoxColumn colShopName; - private System.Windows.Forms.DataGridViewTextBoxColumn colShopNotes; - private System.Windows.Forms.DataGridViewLinkColumn colLoginStatus; - private System.Windows.Forms.DataGridViewCheckBoxColumn colCanUse; - private System.Windows.Forms.DataGridViewTextBoxColumn colMessage; private UserComponent.UcCheckBox chkSearchAllShop; private System.Windows.Forms.PictureBox pbLoading; private DevComponents.DotNetBar.PanelEx btnClear; @@ -1552,6 +1551,21 @@ namespace TemuKJD.KJDForms.ProductForms private DevComponents.DotNetBar.Controls.Line line3; private DevComponents.DotNetBar.Controls.Line line2; private DevComponents.DotNetBar.Controls.Line line1; + private DevComponents.DotNetBar.PanelEx btnSaveExtCodeJitConfig; + private DevComponents.DotNetBar.PanelEx btnRestoreJitParams; + private System.Windows.Forms.DataGridViewCheckBoxColumn colSelectExtCode; + private System.Windows.Forms.DataGridViewTextBoxColumn colFilterExtCode; + private System.Windows.Forms.DataGridViewTextBoxColumn colJitConfig; + private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect; + private System.Windows.Forms.DataGridViewTextBoxColumn colUser; + private System.Windows.Forms.DataGridViewTextBoxColumn colLoginName; + private System.Windows.Forms.DataGridViewTextBoxColumn colShopId; + private System.Windows.Forms.DataGridViewTextBoxColumn colShopName; + private System.Windows.Forms.DataGridViewTextBoxColumn colShopNotes; + private System.Windows.Forms.DataGridViewLinkColumn colLoginStatus; + private System.Windows.Forms.DataGridViewTextBoxColumn colJitStatus; + private System.Windows.Forms.DataGridViewCheckBoxColumn colCanUse; + private System.Windows.Forms.DataGridViewTextBoxColumn colMessage; private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck; private System.Windows.Forms.DataGridViewTextBoxColumn colProdIndex; private System.Windows.Forms.DataGridViewTextBoxColumn colOrderId; @@ -1574,10 +1588,5 @@ namespace TemuKJD.KJDForms.ProductForms private System.Windows.Forms.DataGridViewLinkColumn colStock; private System.Windows.Forms.DataGridViewLinkColumn colRecevieArea; private System.Windows.Forms.DataGridViewTextBoxColumn colMsg; - private DevComponents.DotNetBar.PanelEx btnSaveExtCodeJitConfig; - private DevComponents.DotNetBar.PanelEx btnRestoreJitParams; - private System.Windows.Forms.DataGridViewCheckBoxColumn colSelectExtCode; - private System.Windows.Forms.DataGridViewTextBoxColumn colFilterExtCode; - private System.Windows.Forms.DataGridViewTextBoxColumn colJitConfig; } } \ No newline at end of file diff --git a/TEMUKJD/KJDForms/ProductForms/TemuJitForm.cs b/TEMUKJD/KJDForms/ProductForms/TemuJitForm.cs index 7a25743..729562e 100644 --- a/TEMUKJD/KJDForms/ProductForms/TemuJitForm.cs +++ b/TEMUKJD/KJDForms/ProductForms/TemuJitForm.cs @@ -18,6 +18,7 @@ using TemuKJD.BaseForms; using TemuKJD.BLL; using TemuKJD.Extension; using TemuKJD.KJDForms.AdminForms; +using TemuKJD.KJDForms.JITForms; using TemuKJD.KJDForms.ProductForms.TemuJitSubForms; using TemuKJD.KJDForms.ShopForms; using TemuKJD.ToolForms; @@ -27,7 +28,7 @@ namespace TemuKJD.KJDForms.ProductForms { public partial class TemuJitForm : BaseForm { - public bool IsAdmin = false; + public bool IsClientJit { get; set; } = false; public CancellationTokenSource cancellationTokenSource { get; set; } = null; public List lstAdminShopInfo { get; set; } = new List(); /// @@ -50,7 +51,7 @@ namespace TemuKJD.KJDForms.ProductForms /// 期望到货区域列表 /// public List lstReceiveArea = new List(); - + /// /// 界面参数配置 /// @@ -61,6 +62,8 @@ namespace TemuKJD.KJDForms.ProductForms /// List lstOpenJitParams = null; + CheckBox chkSelectAll; + public TemuJitForm() { InitializeComponent(); @@ -68,21 +71,30 @@ namespace TemuKJD.KJDForms.ProductForms private void TemuJitForm_Load(object sender, EventArgs e) { - if (IsAdmin) + if (!IsClientJit) + { ucSplitPage1.Visible = true; + this.colJitStatus.Visible = false; + } else + { ucSplitPage1.Visible = false; + this.colJitStatus.Visible = true; + } - this.dgvShop.AddSelectorColumn("colSelect"); + //this.dgvShop.AddSelectorColumn("colSelect"); + chkSelectAll = dgvShop.Columns["colSelect"].AddHeaderCheckBox(HorizontalAlignment.Center, 0, 0, null, null, false, null, true); + chkSelectAll.CheckedChanged += chkSelectAll_CheckedChanged; + this.dgvOpenJit.AddSelectorColumn("colCheck"); var chkSelectExtCode = this.dgvExtCode.AddSelectorColumn("colSelectExtCode"); chkSelectExtCode.CheckedChanged += ChkSelectExtCode_CheckedChanged; - this.dgvOpenJit.AddSelectorColumn("colCheck"); + this.dgvOpenJit.AddImgColumn("colProductSkcPic", "colImgUrl"); this.dtpEndTime.Value = DateTime.Now.Date.AddDays(1).AddMilliseconds(-1); this.dtpStartTime.Value = DateTime.Now.Date.AddDays(-7); - if (IsAdmin) + if (!IsClientJit) setJitConfig = NaiBa.Util.Helper.ConfigHelper.LoadConfig("admin_set_jit_config"); else setJitConfig = NaiBa.Util.Helper.ConfigHelper.LoadConfig("set_jit_config"); @@ -113,6 +125,28 @@ namespace TemuKJD.KJDForms.ProductForms lstOpenJitParams = new List(); } + private void chkSelectAll_CheckedChanged(object sender, EventArgs e) + { + if (!chkSelectAll.Checked) + { + foreach (DataGridViewRow row in dgvShop.Rows) + { + row.Cells["colSelect"].Value = false; + } + } + else + { + var list = lstAdminShopInfo.Where(s => s.LoginStatus2 == "国际版在线").ToList(); + if (IsClientJit) + list = list.Where(s => s.LoginStatus2 == "国际版在线" && s.jit_expire_time >= DateTime.Now.Date).ToList(); + foreach (DataGridViewRow row in dgvShop.Rows) + { + if (list.Any(l => l.ShopId == row.Cells["colShopId"]?.Value?.ToString())) + row.Cells["colSelect"].Value = true; + } + } + } + private void Txt_TextChanged(object sender, EventArgs e) { setJitConfig.SearchNotes = this.txtNotes.Text.Trim(); @@ -124,7 +158,7 @@ namespace TemuKJD.KJDForms.ProductForms setJitConfig.SearchExtCode = this.txtExtCode.Text.Trim(); setJitConfig.SearchDuration = this.chkSearchTime.Checked; - if (IsAdmin) + if (!IsClientJit) NaiBa.Util.Helper.ConfigHelper.SaveConfig("admin_set_jit_config", setJitConfig); else NaiBa.Util.Helper.ConfigHelper.SaveConfig("set_jit_config", setJitConfig); @@ -134,7 +168,7 @@ namespace TemuKJD.KJDForms.ProductForms { if (this.Visible) { - if (IsAdmin) + if (!IsClientJit) { this.pbShopLoading.Visible = true; SearchShop(this.ucSplitPage1.CurrentPage); @@ -148,7 +182,7 @@ namespace TemuKJD.KJDForms.ProductForms private void btnRefreshShop_Click(object sender, EventArgs e) { - if (IsAdmin) + if (!IsClientJit) { if (this.ucSplitPage1.CurrentPage != 1) this.ucSplitPage1.CurrentPage = 1; @@ -216,6 +250,7 @@ namespace TemuKJD.KJDForms.ProductForms shopEntity.ShopAccount, shopEntity.Notes, canUse ? "在线" : "掉线", + shopEntity.jit_expire_time >= DateTime.Now.Date ? "可用" : "失效", canUse, string.Empty ); @@ -279,6 +314,7 @@ namespace TemuKJD.KJDForms.ProductForms shop.ShopAccount, shop.Notes, canUse ? "在线" : "掉线", + shop.jit_expire_time >= DateTime.Now.Date ? "可用" : "失效", canUse, string.Empty ); @@ -340,6 +376,11 @@ namespace TemuKJD.KJDForms.ProductForms (row.Cells["colLoginStatus"] as DataGridViewLinkCell).ActiveLinkColor = canUse ? Color.LightGreen : Color.OrangeRed; (row.Cells["colLoginStatus"] as DataGridViewLinkCell).VisitedLinkColor = canUse ? Color.DarkGreen : Color.DarkRed; } + if (IsClientJit) + { + var jitRow = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ParseToString() == shop?.ShopId); + jitRow.Cells["colJitStatus"].Style.ForeColor = JitShopActiveForm.GetJitStatusStyleColor(shop); + } } private void dgvShop_CellContentClick(object sender, DataGridViewCellEventArgs e) @@ -350,7 +391,7 @@ namespace TemuKJD.KJDForms.ProductForms string loginName = dgvShop.Rows[e.RowIndex].Cells["colLoginName"].Value.ParseToString(); string accountId = dgvShop.Rows[e.RowIndex].Cells["colShopId"].Value.ParseToString(); ShopLoginInfo shop = null; - if (IsAdmin) + if (!IsClientJit) shop = lstAdminShopInfo.FirstOrDefault(v => v.LoginName == loginName && v.ShopId == accountId); else shop = GlobalConfig.ShopLoginList.FirstOrDefault(v => v.LoginName == loginName && v.ShopId == accountId); @@ -361,7 +402,7 @@ namespace TemuKJD.KJDForms.ProductForms case "登录": case "状态": { - if (IsAdmin) + if (!IsClientJit) { AdminShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false); if (shop.LoginStatus2 == "国际版在线") @@ -401,9 +442,29 @@ namespace TemuKJD.KJDForms.ProductForms } } break; - default: + case "": + if (IsClientJit) + { + if (shop != null && shop.jit_expire_time > DateTime.Now.Date) + { + if (shop.LoginStatus2 != "国际版在线") + { + dgvShop.Rows[e.RowIndex].Cells["colSelect"].Value = false; + BaseMsgForm.ShowError("店铺未登录", "JIT-操作失败"); + return; + } + } + else + { + dgvShop.Rows[e.RowIndex].Cells["colSelect"].Value = false; + BaseMsgForm.ShowError("JIT卡密过期或未开通", "JIT-操作失败"); + return; + } + } dgvShop.Rows[e.RowIndex].Cells["colSelect"].Value = !(bool)dgvShop.Rows[e.RowIndex].Cells["colSelect"].Value; break; + default: + break; } } private void shopLoginForm_SaveComplete(object obj) @@ -471,7 +532,7 @@ namespace TemuKJD.KJDForms.ProductForms { shopIndex++; ShopLoginInfo shop = null; - if (IsAdmin) + if (!IsClientJit) shop = lstAdminShopInfo.FirstOrDefault(s => shopId == s.ShopId); else shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => shopId == s.ShopId); @@ -479,10 +540,10 @@ namespace TemuKJD.KJDForms.ProductForms continue; // 检测是否掉线 - if (IsAdmin) + if (!IsClientJit) AdminShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false); else - ShopListForm.Instance.CheckShopLogin(new string[] { shop.ShopAccount }, false); + ShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false); if (shop.LoginStatus2 != "国际版在线") { @@ -511,10 +572,10 @@ namespace TemuKJD.KJDForms.ProductForms var searchRst = this.SearchForChainSupplier(shop, page, pageSize, null, searchSpuIds, searchExtCodes, type, startTime, endTime); if (searchRst.Contains("登录过期") || searchRst.Contains("Invalid Login State")) { - if (IsAdmin) + if (!IsClientJit) AdminShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false); else - ShopListForm.Instance.CheckShopLogin(new string[] { shop.ShopAccount }, false); + ShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false); Invoke(new Action(() => { displayShopStatus(shop); @@ -964,7 +1025,7 @@ Content-Disposition: form-data; name=""upload_sign"" string skcId = dgvOpenJit.Rows[e.RowIndex].Cells["colProdSkc"].Value.ParseToString(); string accountId = dgvOpenJit.Rows[e.RowIndex].Cells["colSupplierId"].Value.ParseToString(); ShopLoginInfo shop = null; - if (IsAdmin) + if (!IsClientJit) shop = lstAdminShopInfo.FirstOrDefault(v => v.ShopId == accountId); else shop = GlobalConfig.ShopLoginList.FirstOrDefault(v => v.ShopId == accountId); @@ -1090,6 +1151,7 @@ Content-Disposition: form-data; name=""upload_sign"" } } break; + case "库存": case "修改库存": { var product = lstProductInfo.FirstOrDefault(p => p.productId.ParseToString() == prodId); @@ -1490,7 +1552,7 @@ Content-Disposition: form-data; name=""upload_sign"" string skcId = dgvRow.Cells["colProdSkc"].Value.ParseToString(); string accountId = dgvRow.Cells["colSupplierId"].Value.ParseToString(); ShopLoginInfo shop = null; - if (IsAdmin) + if (!IsClientJit) shop = lstAdminShopInfo.FirstOrDefault(v => v.ShopId == accountId); else shop = GlobalConfig.ShopLoginList.FirstOrDefault(v => v.ShopId == accountId); @@ -2093,7 +2155,7 @@ Content-Disposition: form-data; name=""upload_sign"" { shopIndex++; ShopLoginInfo shop = null; - if (IsAdmin) + if (!IsClientJit) shop = lstAdminShopInfo.FirstOrDefault(s => shopId == s.ShopId); else shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => shopId == s.ShopId); @@ -2101,10 +2163,10 @@ Content-Disposition: form-data; name=""upload_sign"" continue; // 检测是否掉线 - if (IsAdmin) + if (!IsClientJit) AdminShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false); else - ShopListForm.Instance.CheckShopLogin(new string[] { shop.ShopAccount }, false); + ShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false); if (shop.LoginStatus2 != "国际版在线") { @@ -2133,10 +2195,10 @@ Content-Disposition: form-data; name=""upload_sign"" var productReceiveAreaLstRst = this.GetProductReceiveAreaList(shop, page, pageSize); if (productReceiveAreaLstRst.Contains("登录过期") || productReceiveAreaLstRst.Contains("Invalid Login State")) { - if (IsAdmin) + if (!IsClientJit) AdminShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false); else - ShopListForm.Instance.CheckShopLogin(new string[] { shop.ShopAccount }, false); + ShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false); Invoke(new Action(() => { displayShopStatus(shop); diff --git a/TEMUKJD/KJDForms/ProductForms/TemuJitForm.resx b/TEMUKJD/KJDForms/ProductForms/TemuJitForm.resx index f81761e..4f83a17 100644 --- a/TEMUKJD/KJDForms/ProductForms/TemuJitForm.resx +++ b/TEMUKJD/KJDForms/ProductForms/TemuJitForm.resx @@ -144,6 +144,9 @@ True + + True + True diff --git a/TEMUKJD/KJDForms/ProductSelectForms/DbProductListForm.Designer.cs b/TEMUKJD/KJDForms/ProductSelectForms/DbProductListForm.Designer.cs index bef30d9..c058844 100644 --- a/TEMUKJD/KJDForms/ProductSelectForms/DbProductListForm.Designer.cs +++ b/TEMUKJD/KJDForms/ProductSelectForms/DbProductListForm.Designer.cs @@ -69,12 +69,6 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.lblProdName = new System.Windows.Forms.Label(); this.numCount = new System.Windows.Forms.NumericUpDown(); this.dgvSelectShop = new TemuKJD.UserComponent.DataGridViewEx(); - this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.colUserName = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colSubUserName = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colShopNotes = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.btnCancel = new DevComponents.DotNetBar.PanelEx(); this.btnAddToSelectDb = new DevComponents.DotNetBar.PanelEx(); this.btnGetShop = new DevComponents.DotNetBar.PanelEx(); @@ -108,6 +102,13 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.col_select_product = new System.Windows.Forms.DataGridViewLinkColumn(); this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage(); this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); + this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.colUserName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colSubUserName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colShopNotes = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colJitStatus = new System.Windows.Forms.DataGridViewTextBoxColumn(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -468,19 +469,21 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.panel2.Controls.Add(this.label7); this.panel2.Controls.Add(this.txtShopId); this.panel2.Controls.Add(this.label8); - this.panel2.Location = new System.Drawing.Point(406, 53); + this.panel2.Location = new System.Drawing.Point(336, 53); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(508, 447); + this.panel2.Size = new System.Drawing.Size(606, 447); this.panel2.TabIndex = 8; this.panel2.Visible = false; // // lbxProdName // + this.lbxProdName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.lbxProdName.FormattingEnabled = true; this.lbxProdName.ItemHeight = 17; this.lbxProdName.Location = new System.Drawing.Point(19, 258); this.lbxProdName.Name = "lbxProdName"; - this.lbxProdName.Size = new System.Drawing.Size(468, 140); + this.lbxProdName.Size = new System.Drawing.Size(566, 140); this.lbxProdName.TabIndex = 525; // // lblProdName @@ -494,7 +497,8 @@ namespace TemuKJD.KJDForms.ProductSelectForms // // numCount // - this.numCount.Location = new System.Drawing.Point(297, 408); + this.numCount.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.numCount.Location = new System.Drawing.Point(395, 408); this.numCount.Maximum = new decimal(new int[] { 1000, 0, @@ -515,6 +519,8 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.dgvSelectShop.AllowUserToDeleteRows = false; dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke; this.dgvSelectShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + this.dgvSelectShop.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.dgvSelectShop.AutoRowNumber = true; this.dgvSelectShop.BackgroundColor = System.Drawing.Color.White; this.dgvSelectShop.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -533,66 +539,24 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.colSubUserName, this.colShopId, this.colShopName, - this.colShopNotes}); + this.colShopNotes, + this.colJitStatus}); this.dgvSelectShop.Location = new System.Drawing.Point(17, 46); this.dgvSelectShop.Name = "dgvSelectShop"; this.dgvSelectShop.ReadOnly = true; this.dgvSelectShop.RowHeadersWidth = 28; this.dgvSelectShop.RowTemplate.Height = 23; - this.dgvSelectShop.Size = new System.Drawing.Size(470, 184); + this.dgvSelectShop.Size = new System.Drawing.Size(568, 184); this.dgvSelectShop.TabIndex = 504; this.dgvSelectShop.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvSelectShop_CellContentClick); // - // colCheck - // - this.colCheck.HeaderText = "选择"; - this.colCheck.MinimumWidth = 6; - this.colCheck.Name = "colCheck"; - this.colCheck.ReadOnly = true; - this.colCheck.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.colCheck.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colCheck.Width = 30; - // - // colUserName - // - this.colUserName.HeaderText = "用户名称"; - this.colUserName.MinimumWidth = 6; - this.colUserName.Name = "colUserName"; - this.colUserName.ReadOnly = true; - this.colUserName.Width = 90; - // - // colSubUserName - // - this.colSubUserName.HeaderText = "子账户名称"; - this.colSubUserName.Name = "colSubUserName"; - this.colSubUserName.ReadOnly = true; - this.colSubUserName.Visible = false; - this.colSubUserName.Width = 150; - // - // colShopId - // - this.colShopId.HeaderText = "店铺Id"; - this.colShopId.Name = "colShopId"; - this.colShopId.ReadOnly = true; - // - // colShopName - // - this.colShopName.HeaderText = "店铺名称"; - this.colShopName.Name = "colShopName"; - this.colShopName.ReadOnly = true; - // - // colShopNotes - // - this.colShopNotes.HeaderText = "店铺备注"; - this.colShopNotes.Name = "colShopNotes"; - this.colShopNotes.ReadOnly = true; - // // btnCancel // + this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.btnCancel.CanvasColor = System.Drawing.SystemColors.Control; this.btnCancel.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnCancel.DisabledBackColor = System.Drawing.Color.Empty; - this.btnCancel.Location = new System.Drawing.Point(445, 408); + this.btnCancel.Location = new System.Drawing.Point(543, 408); this.btnCancel.Name = "btnCancel"; this.btnCancel.Size = new System.Drawing.Size(42, 23); this.btnCancel.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -613,11 +577,12 @@ namespace TemuKJD.KJDForms.ProductSelectForms // // btnAddToSelectDb // + this.btnAddToSelectDb.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.btnAddToSelectDb.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnAddToSelectDb.Cursor = System.Windows.Forms.Cursors.Hand; this.btnAddToSelectDb.DisabledBackColor = System.Drawing.Color.Empty; this.btnAddToSelectDb.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnAddToSelectDb.Location = new System.Drawing.Point(397, 408); + this.btnAddToSelectDb.Location = new System.Drawing.Point(495, 408); this.btnAddToSelectDb.Name = "btnAddToSelectDb"; this.btnAddToSelectDb.Size = new System.Drawing.Size(42, 23); this.btnAddToSelectDb.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -637,11 +602,12 @@ namespace TemuKJD.KJDForms.ProductSelectForms // // btnGetShop // + this.btnGetShop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.btnGetShop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnGetShop.Cursor = System.Windows.Forms.Cursors.Hand; this.btnGetShop.DisabledBackColor = System.Drawing.Color.Empty; this.btnGetShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnGetShop.Location = new System.Drawing.Point(445, 13); + this.btnGetShop.Location = new System.Drawing.Point(543, 13); this.btnGetShop.Name = "btnGetShop"; this.btnGetShop.Size = new System.Drawing.Size(42, 23); this.btnGetShop.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -661,9 +627,11 @@ namespace TemuKJD.KJDForms.ProductSelectForms // // txtShopName // + this.txtShopName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.txtShopName.Location = new System.Drawing.Point(279, 13); this.txtShopName.Name = "txtShopName"; - this.txtShopName.Size = new System.Drawing.Size(160, 23); + this.txtShopName.Size = new System.Drawing.Size(258, 23); this.txtShopName.TabIndex = 433; // // label7 @@ -951,6 +919,57 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.statusBar.Size = new System.Drawing.Size(1278, 25); this.statusBar.TabIndex = 5; // + // colCheck + // + this.colCheck.HeaderText = "选择"; + this.colCheck.MinimumWidth = 6; + this.colCheck.Name = "colCheck"; + this.colCheck.ReadOnly = true; + this.colCheck.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colCheck.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colCheck.Width = 30; + // + // colUserName + // + this.colUserName.HeaderText = "用户名称"; + this.colUserName.MinimumWidth = 6; + this.colUserName.Name = "colUserName"; + this.colUserName.ReadOnly = true; + this.colUserName.Width = 90; + // + // colSubUserName + // + this.colSubUserName.HeaderText = "子账户名称"; + this.colSubUserName.Name = "colSubUserName"; + this.colSubUserName.ReadOnly = true; + this.colSubUserName.Visible = false; + this.colSubUserName.Width = 150; + // + // colShopId + // + this.colShopId.HeaderText = "店铺Id"; + this.colShopId.Name = "colShopId"; + this.colShopId.ReadOnly = true; + // + // colShopName + // + this.colShopName.HeaderText = "店铺名称"; + this.colShopName.Name = "colShopName"; + this.colShopName.ReadOnly = true; + // + // colShopNotes + // + this.colShopNotes.HeaderText = "店铺备注"; + this.colShopNotes.Name = "colShopNotes"; + this.colShopNotes.ReadOnly = true; + // + // colJitStatus + // + this.colJitStatus.HeaderText = "JIT状态"; + this.colJitStatus.Name = "colJitStatus"; + this.colJitStatus.ReadOnly = true; + this.colJitStatus.Visible = false; + // // DbProductListForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -1024,12 +1043,6 @@ namespace TemuKJD.KJDForms.ProductSelectForms private DevComponents.DotNetBar.PanelEx btnBatchSelect; private DevComponents.DotNetBar.PanelEx btnSearch; private DevComponents.DotNetBar.PanelEx btnSelect; - private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck; - private System.Windows.Forms.DataGridViewTextBoxColumn colUserName; - private System.Windows.Forms.DataGridViewTextBoxColumn colSubUserName; - private System.Windows.Forms.DataGridViewTextBoxColumn colShopId; - private System.Windows.Forms.DataGridViewTextBoxColumn colShopName; - private System.Windows.Forms.DataGridViewTextBoxColumn colShopNotes; private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect; private System.Windows.Forms.DataGridViewTextBoxColumn col_db_id; private System.Windows.Forms.DataGridViewTextBoxColumn col_spu_id; @@ -1053,5 +1066,12 @@ namespace TemuKJD.KJDForms.ProductSelectForms private System.Windows.Forms.DataGridViewLinkColumn col_edit; private System.Windows.Forms.DataGridViewLinkColumn col_delete; private System.Windows.Forms.DataGridViewLinkColumn col_select_product; + private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck; + private System.Windows.Forms.DataGridViewTextBoxColumn colUserName; + private System.Windows.Forms.DataGridViewTextBoxColumn colSubUserName; + private System.Windows.Forms.DataGridViewTextBoxColumn colShopId; + private System.Windows.Forms.DataGridViewTextBoxColumn colShopName; + private System.Windows.Forms.DataGridViewTextBoxColumn colShopNotes; + private System.Windows.Forms.DataGridViewTextBoxColumn colJitStatus; } } \ No newline at end of file diff --git a/TEMUKJD/KJDForms/ProductSelectForms/DbProductListForm.cs b/TEMUKJD/KJDForms/ProductSelectForms/DbProductListForm.cs index e026e88..0195add 100644 --- a/TEMUKJD/KJDForms/ProductSelectForms/DbProductListForm.cs +++ b/TEMUKJD/KJDForms/ProductSelectForms/DbProductListForm.cs @@ -19,6 +19,7 @@ using System.Threading.Tasks; using System.Windows.Forms; using TemuKJD.BaseForms; using TemuKJD.Extension; +using TemuKJD.KJDForms.JITForms; using TemuKJD.KJDForms.ToolForms; using TemuKJD.ToolForms; using Work; @@ -27,11 +28,11 @@ namespace TemuKJD.KJDForms.ProductSelectForms { public partial class DbProductListForm : LRBaseForm { + public bool IsClientJit { get; set; } = false; + ShopLoginInfo shop = null; // 单店认领 List lstAdminShopInfo = new List(); // 服务端直传店铺列表 List lstTemuDbProduct = new List(); - public bool IsAdmin { get; set; } = false; - public bool IsClientJit { get; set; } = false; public DbProductListForm() { @@ -59,8 +60,9 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.cmbGroup.Visible = false; this.btnImportHtml.Visible = false; this.btnBatchSelect.Visible = false; + this.dgvSelectShop.Columns["colJitStatus"].Visible = false; - if (BaseClass.SaLevel == 1 && shop == null) // 一级管理员且不是选品状态 + if (BaseClass.SaLevel == 1 && shop == null && !IsClientJit) // 一级管理员且不是选品状态 { this.dgvDbProduct.Columns["col_delete"].Visible = true; // 删除 this.dgvDbProduct.Columns["col_edit"].Visible = true; // 编辑 @@ -76,7 +78,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.btnImportHtml.Visible = true; // 导入前端直采商品 this.btnBatchSelect.Visible = true; // 批量直传 } - else if (BaseClass.SaLevel > 1 && shop == null) + else if (BaseClass.SaLevel > 1 && shop == null && !IsClientJit) { this.dgvDbProduct.Columns["colHeadWords"].Visible = true; // 头词 this.dgvDbProduct.Columns["colEndWords"].Visible = true; // 尾词 @@ -87,6 +89,13 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.lblGroup.Visible = true; // 分组 this.cmbGroup.Visible = true; // 分组 } + if (IsClientJit) + { + this.dgvDbProduct.Columns["colSelectProd"].Visible = true; // 商品直传（不经过客户选品） + this.btnBatchSelect.Visible = true; // 批量直传 + this.cmbGroup.Text = "jit分组"; + this.dgvSelectShop.Columns["colJitStatus"].Visible = true; + } btnSelect.Visible = false; this.dgvDbProduct.Columns["col_select_product"].Visible = false; @@ -418,7 +427,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms { if (!isDbToDb) BaseMsgForm.ShowError("认领商品不能为空！"); - return "店铺不能为空！"; + return "认领商品不能为空！"; } Invoke(new Action(() => @@ -443,7 +452,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms continue; } - if (selectShop.AddProductRemaining <= 0 && !isDbToDb) // 管理员发起的数据直传不消耗次数 + if (selectShop.AddProductRemaining <= 0 && !isDbToDb) // 数据直传不消耗次数 { Invoke(new Action(() => { @@ -481,10 +490,12 @@ namespace TemuKJD.KJDForms.ProductSelectForms //{ // data += "&main_user_name=" + BaseClass.UserName; //} - if (!isDbToDb) // 管理员发起的数据直传不消耗次数，不计算认领次数 + if (!isDbToDb) // 数据直传不消耗次数，不计算认领次数 data += "&add_product_remaining=" + selectShop.AddProductRemaining; data += "&add_fission_product_name=" + GetHtml.UrlEncodeUtf8(fissionProductName) + "&status=待上传"; + if (IsClientJit) + data += "&is_client_jit=true"; var html = GetHtml.PostUtf8(url, data); if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) html = GetHtml.PostUtf8(url, data); @@ -1133,8 +1144,22 @@ namespace TemuKJD.KJDForms.ProductSelectForms return; string headerText = dgvSelectShop.Columns[e.ColumnIndex].HeaderText; + string shopId = dgvSelectShop.Rows[e.RowIndex].Cells["colShopId"].Value.ParseToString(); if (headerText == "选择") { + if (IsClientJit) + { + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId); + if (shop != null && shop.jit_expire_time > DateTime.Now.Date) + { + } + else + { + dgvSelectShop.Rows[e.RowIndex].Cells["colCheck"].Value = false; + BaseMsgForm.ShowError("JIT卡密过期或未开通", "JIT商品选品-操作失败"); + return; + } + } foreach (DataGridViewRow row in dgvSelectShop.Rows) { row.Cells["colCheck"].Value = false; @@ -1162,10 +1187,15 @@ namespace TemuKJD.KJDForms.ProductSelectForms void GetShop() { - this.pbLoading.Visible = true; this.dgvSelectShop.Rows.Clear(); - var list = GlobalConfig.ShopLoginList.Where(s => s.ShopId.Contains(txtShopId.Text.Trim()) && s.ShopAccount.Contains(txtShopName.Text.Trim())).Take(10).ToList(); - foreach (var shop in lstAdminShopInfo) + string searchShopId = txtShopId.Text.Trim(); + string searchShopAccount = txtShopName.Text.Trim(); + var list = GlobalConfig.ShopLoginList + .Where(s => (searchShopId.IsNullOrEmpty() || s.ShopId.Contains(searchShopId)) && + (searchShopAccount.IsNullOrEmpty() || s.ShopAccount.Contains(searchShopAccount))) + .Where(s => !s.ShopId.IsNullOrEmpty()) + .ToList(); + foreach (var shop in list) { Invoke(new Action(() => { @@ -1175,11 +1205,17 @@ namespace TemuKJD.KJDForms.ProductSelectForms shop.SubUserName, shop.ShopId, shop.ShopAccount, - shop.Notes); - if (rowIndex == 0) + shop.Notes + ); + if (!IsClientJit && rowIndex == 0) { this.dgvSelectShop.Rows[rowIndex].Cells["colCheck"].Value = true; } + if (IsClientJit) + { + this.dgvSelectShop.Rows[rowIndex].Cells["colJitStatus"].Value = JitShopActiveForm.GetJitStatus(shop); + this.dgvSelectShop.Rows[rowIndex].Cells["colJitStatus"].Style.ForeColor = JitShopActiveForm.GetJitStatusStyleColor(shop); + } })); } } @@ -1193,7 +1229,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms { int pageCount; var list = AdminForms.AdminShopListForm.Instance.AdminGetServerShopLst(out pageCount, "", "", "", - txtShopId.Text.Trim(), txtShopName.Text.Trim(), 1, 10); + txtShopId.Text.Trim(), txtShopName.Text.Trim(), 1, 20); lstAdminShopInfo.AddRange(list); foreach (var shop in lstAdminShopInfo) @@ -1231,6 +1267,8 @@ namespace TemuKJD.KJDForms.ProductSelectForms var selectUserNames = this.dgvSelectShop.Rows.Cast() .Where(r => r.Cells["colCheck"].Value.ParseToBool() == true).Select(r => r.Cells["colUserName"].Value.ParseToString()).ToList(); var selectShopLst = lstAdminShopInfo.Where(s => selectShopIds.Contains(s.ShopId) && selectUserNames.Contains(s.UserName)).ToList(); + if (IsClientJit) + selectShopLst = GlobalConfig.ShopLoginList.Where(s => selectShopIds.Contains(s.ShopId) && selectUserNames.Contains(s.UserName)).ToList(); if (selectShopLst.Count <= 0) { BaseMsgForm.ShowError("未选择店铺！"); diff --git a/TEMUKJD/KJDForms/ProductSelectForms/DbProductListForm.resx b/TEMUKJD/KJDForms/ProductSelectForms/DbProductListForm.resx index 69534d6..24c6fc8 100644 --- a/TEMUKJD/KJDForms/ProductSelectForms/DbProductListForm.resx +++ b/TEMUKJD/KJDForms/ProductSelectForms/DbProductListForm.resx @@ -135,6 +135,9 @@ True + + True + True diff --git a/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectEditNotesForm.cs b/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectEditNotesForm.cs index 608f3e8..eaba2fd 100644 --- a/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectEditNotesForm.cs +++ b/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectEditNotesForm.cs @@ -18,6 +18,8 @@ namespace TemuKJD.KJDForms.ProductSelectForms { public partial class DbProductSelectEditNotesForm : LRBaseForm { + public bool IsClientJit { get; set; } = false; + TemuDBProductSelect dbProdSelect = null; SetProductSelectNotesType selectNotesType; @@ -68,6 +70,8 @@ namespace TemuKJD.KJDForms.ProductSelectForms var data = UserLogin.GetSignaturex() + "&db_id=" + dbProdSelect.id + "¬es=" + this.txtNotes.Text.Trim(); data += "&user_notes=" + this.cmbUserNotes.Text.Trim(); + if (IsClientJit) + data += "&is_client_jit=true"; if (selectNotesType == SetProductSelectNotesType.DbProduct) { byte[] bytes = Encoding.GetEncoding("gb2312").GetBytes(txtProdName.Text.Trim()); diff --git a/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.Designer.cs b/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.Designer.cs index 95a8353..7f4192a 100644 --- a/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.Designer.cs +++ b/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.Designer.cs @@ -40,18 +40,41 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DbProductSelectListManageForm)); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.numMaxWaitSecond = new System.Windows.Forms.NumericUpDown(); + this.label22 = new System.Windows.Forms.Label(); this.btnForceEnable = new DevComponents.DotNetBar.PanelEx(); this.txtNotChangeMainImg = new System.Windows.Forms.TextBox(); + this.chkNoSubSa = new TemuKJD.UserComponent.UcCheckBox(this.components); this.chkNotChangeMainImg = new TemuKJD.UserComponent.UcCheckBox(this.components); this.chkAiSkuAndMainImg = new TemuKJD.UserComponent.UcCheckBox(this.components); this.chkLongTitle = new TemuKJD.UserComponent.UcCheckBox(this.components); this.chkSameExtcodeRandomMainImg = new TemuKJD.UserComponent.UcCheckBox(this.components); this.lblSkuRandomLetterNotes = new System.Windows.Forms.Label(); this.btnAdd = new DevComponents.DotNetBar.PanelEx(); - this.label21 = new System.Windows.Forms.Label(); + this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); + this.label9 = new System.Windows.Forms.Label(); + this.txtSkuHeadText = new System.Windows.Forms.TextBox(); + this.label10 = new System.Windows.Forms.Label(); + this.txtSkuEndText = new System.Windows.Forms.TextBox(); + this.chkSkuRandomLetter = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.chkFission = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.chkHeadWords = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.chkEndWords = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.chkReFissionAllProdName = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.chkRandomSkuOrder = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.chkSkuRandomPrice = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.numSkuRandomPrice = new System.Windows.Forms.NumericUpDown(); + this.label11 = new System.Windows.Forms.Label(); + this.chkOriginalPriceMarkUp = new TemuKJD.UserComponent.UcCheckBox(this.components); this.btnSetSubSa = new DevComponents.DotNetBar.PanelEx(); - this.numUnitNum2 = new System.Windows.Forms.NumericUpDown(); this.btnReFission = new DevComponents.DotNetBar.PanelEx(); + this.btnSearch = new DevComponents.DotNetBar.PanelEx(); + this.pnlEmpty = new DevComponents.DotNetBar.PanelEx(); + this.btnDel = new DevComponents.DotNetBar.PanelEx(); + this.chkUploadProd = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.chkShowDel = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.label21 = new System.Windows.Forms.Label(); + this.numUnitNum2 = new System.Windows.Forms.NumericUpDown(); this.numUnitNum1 = new System.Windows.Forms.NumericUpDown(); this.label20 = new System.Windows.Forms.Label(); this.numWeight2 = new System.Windows.Forms.NumericUpDown(); @@ -72,9 +95,7 @@ this.chkChangeSizeAndNumber = new TemuKJD.UserComponent.UcCheckBox(this.components); this.btnStop = new DevComponents.DotNetBar.PanelEx(); this.btnExport = new DevComponents.DotNetBar.PanelEx(); - this.btnDel = new DevComponents.DotNetBar.PanelEx(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.btnSearch = new DevComponents.DotNetBar.PanelEx(); this.label13 = new System.Windows.Forms.Label(); this.label6 = new System.Windows.Forms.Label(); this.cmbNotes = new System.Windows.Forms.ComboBox(); @@ -93,27 +114,8 @@ this.label3 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label(); this.txtProdName = new System.Windows.Forms.TextBox(); - this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); - this.label9 = new System.Windows.Forms.Label(); - this.txtSkuHeadText = new System.Windows.Forms.TextBox(); - this.label10 = new System.Windows.Forms.Label(); - this.txtSkuEndText = new System.Windows.Forms.TextBox(); - this.chkSkuRandomLetter = new TemuKJD.UserComponent.UcCheckBox(this.components); - this.chkFission = new TemuKJD.UserComponent.UcCheckBox(this.components); - this.chkHeadWords = new TemuKJD.UserComponent.UcCheckBox(this.components); - this.chkEndWords = new TemuKJD.UserComponent.UcCheckBox(this.components); - this.chkReFissionAllProdName = new TemuKJD.UserComponent.UcCheckBox(this.components); - this.chkRandomSkuOrder = new TemuKJD.UserComponent.UcCheckBox(this.components); - this.chkSkuRandomPrice = new TemuKJD.UserComponent.UcCheckBox(this.components); - this.numSkuRandomPrice = new System.Windows.Forms.NumericUpDown(); - this.label11 = new System.Windows.Forms.Label(); - this.chkOriginalPriceMarkUp = new TemuKJD.UserComponent.UcCheckBox(this.components); - this.pnlEmpty = new DevComponents.DotNetBar.PanelEx(); this.cmbUserNotes = new System.Windows.Forms.ComboBox(); - this.label12 = new System.Windows.Forms.Label(); - 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.lblUserNotes = new System.Windows.Forms.Label(); this.chkAddPrice = new TemuKJD.UserComponent.UcCheckBox(this.components); this.chkEnglishProdName = new TemuKJD.UserComponent.UcCheckBox(this.components); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); @@ -159,6 +161,9 @@ this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); this.splitContainer1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numMaxWaitSecond)).BeginInit(); + this.flowLayoutPanel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numSkuRandomPrice)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numUnitNum2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numUnitNum1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numWeight2)).BeginInit(); @@ -172,8 +177,6 @@ ((System.ComponentModel.ISupportInitialize)(this.numAddPrice)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numAddPriceTimes)).BeginInit(); this.tableLayoutPanel1.SuspendLayout(); - this.flowLayoutPanel1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.numSkuRandomPrice)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit(); this.splitContainer2.Panel1.SuspendLayout(); this.splitContainer2.Panel2.SuspendLayout(); @@ -195,18 +198,27 @@ // // splitContainer1.Panel1 // + this.splitContainer1.Panel1.Controls.Add(this.numMaxWaitSecond); + this.splitContainer1.Panel1.Controls.Add(this.label22); this.splitContainer1.Panel1.Controls.Add(this.btnForceEnable); this.splitContainer1.Panel1.Controls.Add(this.txtNotChangeMainImg); + this.splitContainer1.Panel1.Controls.Add(this.chkNoSubSa); this.splitContainer1.Panel1.Controls.Add(this.chkNotChangeMainImg); this.splitContainer1.Panel1.Controls.Add(this.chkAiSkuAndMainImg); this.splitContainer1.Panel1.Controls.Add(this.chkLongTitle); this.splitContainer1.Panel1.Controls.Add(this.chkSameExtcodeRandomMainImg); this.splitContainer1.Panel1.Controls.Add(this.lblSkuRandomLetterNotes); this.splitContainer1.Panel1.Controls.Add(this.btnAdd); - this.splitContainer1.Panel1.Controls.Add(this.label21); + this.splitContainer1.Panel1.Controls.Add(this.flowLayoutPanel1); this.splitContainer1.Panel1.Controls.Add(this.btnSetSubSa); - this.splitContainer1.Panel1.Controls.Add(this.numUnitNum2); this.splitContainer1.Panel1.Controls.Add(this.btnReFission); + this.splitContainer1.Panel1.Controls.Add(this.btnSearch); + this.splitContainer1.Panel1.Controls.Add(this.pnlEmpty); + this.splitContainer1.Panel1.Controls.Add(this.btnDel); + this.splitContainer1.Panel1.Controls.Add(this.chkUploadProd); + this.splitContainer1.Panel1.Controls.Add(this.chkShowDel); + this.splitContainer1.Panel1.Controls.Add(this.label21); + this.splitContainer1.Panel1.Controls.Add(this.numUnitNum2); this.splitContainer1.Panel1.Controls.Add(this.numUnitNum1); this.splitContainer1.Panel1.Controls.Add(this.label20); this.splitContainer1.Panel1.Controls.Add(this.numWeight2); @@ -227,7 +239,6 @@ this.splitContainer1.Panel1.Controls.Add(this.chkChangeSizeAndNumber); this.splitContainer1.Panel1.Controls.Add(this.btnStop); this.splitContainer1.Panel1.Controls.Add(this.btnExport); - this.splitContainer1.Panel1.Controls.Add(this.btnDel); this.splitContainer1.Panel1.Controls.Add(this.tableLayoutPanel1); this.splitContainer1.Panel1.Controls.Add(this.chkAddPrice); this.splitContainer1.Panel1.Controls.Add(this.chkEnglishProdName); @@ -235,20 +246,54 @@ // splitContainer1.Panel2 // this.splitContainer1.Panel2.Controls.Add(this.splitContainer2); - this.splitContainer1.Size = new System.Drawing.Size(1558, 638); + this.splitContainer1.Size = new System.Drawing.Size(1518, 638); this.splitContainer1.SplitterDistance = 125; this.splitContainer1.TabIndex = 2; // + // numMaxWaitSecond + // + this.numMaxWaitSecond.Location = new System.Drawing.Point(104, 95); + this.numMaxWaitSecond.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numMaxWaitSecond.Maximum = new decimal(new int[] { + 500, + 0, + 0, + 0}); + this.numMaxWaitSecond.Minimum = new decimal(new int[] { + 100, + 0, + 0, + 0}); + this.numMaxWaitSecond.Name = "numMaxWaitSecond"; + this.numMaxWaitSecond.Size = new System.Drawing.Size(49, 23); + this.numMaxWaitSecond.TabIndex = 745; + this.numMaxWaitSecond.Value = new decimal(new int[] { + 120, + 0, + 0, + 0}); + this.numMaxWaitSecond.ValueChanged += new System.EventHandler(this.numMaxWaitSecond_ValueChanged); + // + // label22 + // + this.label22.AutoSize = true; + this.label22.Location = new System.Drawing.Point(3, 98); + this.label22.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label22.Name = "label22"; + this.label22.Size = new System.Drawing.Size(112, 17); + this.label22.TabIndex = 744; + this.label22.Text = "最大等待时间(秒)："; + // // btnForceEnable // this.btnForceEnable.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.btnForceEnable.CanvasColor = System.Drawing.SystemColors.Control; this.btnForceEnable.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnForceEnable.DisabledBackColor = System.Drawing.Color.Empty; - this.btnForceEnable.Location = new System.Drawing.Point(1372, 70); + this.btnForceEnable.Location = new System.Drawing.Point(1340, 67); this.btnForceEnable.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); this.btnForceEnable.Name = "btnForceEnable"; - this.btnForceEnable.Size = new System.Drawing.Size(182, 22); + this.btnForceEnable.Size = new System.Drawing.Size(174, 24); this.btnForceEnable.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnForceEnable.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); this.btnForceEnable.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); @@ -268,20 +313,32 @@ // txtNotChangeMainImg // this.txtNotChangeMainImg.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.txtNotChangeMainImg.Location = new System.Drawing.Point(1440, 97); + this.txtNotChangeMainImg.Location = new System.Drawing.Point(1400, 95); this.txtNotChangeMainImg.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtNotChangeMainImg.Name = "txtNotChangeMainImg"; this.txtNotChangeMainImg.Size = new System.Drawing.Size(36, 23); this.txtNotChangeMainImg.TabIndex = 700; this.txtNotChangeMainImg.Text = "5"; // + // chkNoSubSa + // + this.chkNoSubSa.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.chkNoSubSa.Location = new System.Drawing.Point(1079, 11); + this.chkNoSubSa.Margin = new System.Windows.Forms.Padding(2, 0, 0, 0); + this.chkNoSubSa.Name = "chkNoSubSa"; + this.chkNoSubSa.Size = new System.Drawing.Size(80, 21); + this.chkNoSubSa.TabIndex = 467; + this.chkNoSubSa.Text = "未分配超管"; + this.chkNoSubSa.UseVisualStyleBackColor = true; + this.chkNoSubSa.Visible = false; + // // chkNotChangeMainImg // this.chkNotChangeMainImg.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.chkNotChangeMainImg.AutoSize = true; this.chkNotChangeMainImg.Checked = true; this.chkNotChangeMainImg.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkNotChangeMainImg.Location = new System.Drawing.Point(1410, 98); + this.chkNotChangeMainImg.Location = new System.Drawing.Point(1370, 96); this.chkNotChangeMainImg.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.chkNotChangeMainImg.Name = "chkNotChangeMainImg"; this.chkNotChangeMainImg.Size = new System.Drawing.Size(151, 21); @@ -293,7 +350,7 @@ // this.chkAiSkuAndMainImg.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.chkAiSkuAndMainImg.AutoSize = true; - this.chkAiSkuAndMainImg.Location = new System.Drawing.Point(1261, 98); + this.chkAiSkuAndMainImg.Location = new System.Drawing.Point(1221, 96); this.chkAiSkuAndMainImg.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.chkAiSkuAndMainImg.Name = "chkAiSkuAndMainImg"; this.chkAiSkuAndMainImg.Size = new System.Drawing.Size(152, 21); @@ -305,7 +362,7 @@ // this.chkLongTitle.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.chkLongTitle.AutoSize = true; - this.chkLongTitle.Location = new System.Drawing.Point(977, 98); + this.chkLongTitle.Location = new System.Drawing.Point(937, 96); this.chkLongTitle.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.chkLongTitle.Name = "chkLongTitle"; this.chkLongTitle.Size = new System.Drawing.Size(96, 21); @@ -317,7 +374,7 @@ // this.chkSameExtcodeRandomMainImg.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.chkSameExtcodeRandomMainImg.AutoSize = true; - this.chkSameExtcodeRandomMainImg.Location = new System.Drawing.Point(1073, 98); + this.chkSameExtcodeRandomMainImg.Location = new System.Drawing.Point(1033, 96); this.chkSameExtcodeRandomMainImg.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.chkSameExtcodeRandomMainImg.Name = "chkSameExtcodeRandomMainImg"; this.chkSameExtcodeRandomMainImg.Size = new System.Drawing.Size(188, 21); @@ -330,7 +387,7 @@ this.lblSkuRandomLetterNotes.AutoSize = true; this.lblSkuRandomLetterNotes.Font = new System.Drawing.Font("微软雅黑", 9F); this.lblSkuRandomLetterNotes.ForeColor = System.Drawing.SystemColors.MenuHighlight; - this.lblSkuRandomLetterNotes.Location = new System.Drawing.Point(959, 75); + this.lblSkuRandomLetterNotes.Location = new System.Drawing.Point(959, 71); this.lblSkuRandomLetterNotes.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.lblSkuRandomLetterNotes.Name = "lblSkuRandomLetterNotes"; this.lblSkuRandomLetterNotes.Size = new System.Drawing.Size(150, 17); @@ -344,9 +401,9 @@ this.btnAdd.Cursor = System.Windows.Forms.Cursors.Hand; this.btnAdd.DisabledBackColor = System.Drawing.Color.Empty; this.btnAdd.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnAdd.Location = new System.Drawing.Point(1464, 8); + this.btnAdd.Location = new System.Drawing.Point(1428, 9); this.btnAdd.Name = "btnAdd"; - this.btnAdd.Size = new System.Drawing.Size(90, 26); + this.btnAdd.Size = new System.Drawing.Size(86, 24); this.btnAdd.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnAdd.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnAdd.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -362,721 +419,10 @@ this.btnAdd.Text = "一键上传"; this.btnAdd.Click += new System.EventHandler(this.btnAdd_Click); // - // label21 - // - this.label21.AutoSize = true; - this.label21.Location = new System.Drawing.Point(621, 75); - this.label21.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.label21.Name = "label21"; - this.label21.Size = new System.Drawing.Size(32, 17); - this.label21.TabIndex = 588; - this.label21.Text = "数量"; - // - // btnSetSubSa - // - this.btnSetSubSa.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btnSetSubSa.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnSetSubSa.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnSetSubSa.DisabledBackColor = System.Drawing.Color.Empty; - this.btnSetSubSa.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSetSubSa.Location = new System.Drawing.Point(1372, 8); - this.btnSetSubSa.Name = "btnSetSubSa"; - this.btnSetSubSa.Size = new System.Drawing.Size(90, 26); - this.btnSetSubSa.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnSetSubSa.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnSetSubSa.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnSetSubSa.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.btnSetSubSa.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.btnSetSubSa.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.btnSetSubSa.Style.ForeColor.Color = System.Drawing.Color.White; - this.btnSetSubSa.Style.GradientAngle = 90; - this.btnSetSubSa.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnSetSubSa.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnSetSubSa.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnSetSubSa.TabIndex = 469; - this.btnSetSubSa.Text = "分配二级超管"; - this.btnSetSubSa.Click += new System.EventHandler(this.btnSetSubSa_Click); - // - // numUnitNum2 - // - this.numUnitNum2.Location = new System.Drawing.Point(696, 72); - this.numUnitNum2.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); - this.numUnitNum2.Maximum = new decimal(new int[] { - 600, - 0, - 0, - 0}); - this.numUnitNum2.Name = "numUnitNum2"; - this.numUnitNum2.Size = new System.Drawing.Size(42, 23); - this.numUnitNum2.TabIndex = 587; - this.numUnitNum2.Value = new decimal(new int[] { - 600, - 0, - 0, - 0}); - // - // btnReFission - // - this.btnReFission.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btnReFission.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnReFission.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnReFission.DisabledBackColor = System.Drawing.Color.Empty; - this.btnReFission.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnReFission.Location = new System.Drawing.Point(1280, 8); - this.btnReFission.Name = "btnReFission"; - this.btnReFission.Size = new System.Drawing.Size(90, 26); - this.btnReFission.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnReFission.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnReFission.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnReFission.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.btnReFission.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.btnReFission.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.btnReFission.Style.ForeColor.Color = System.Drawing.Color.White; - this.btnReFission.Style.GradientAngle = 90; - this.btnReFission.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnReFission.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnReFission.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnReFission.TabIndex = 468; - this.btnReFission.Text = "批量重组标题"; - this.btnReFission.Click += new System.EventHandler(this.btnReFission_Click); - // - // numUnitNum1 - // - this.numUnitNum1.Location = new System.Drawing.Point(653, 72); - this.numUnitNum1.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); - this.numUnitNum1.Maximum = new decimal(new int[] { - 600, - 0, - 0, - 0}); - this.numUnitNum1.Name = "numUnitNum1"; - this.numUnitNum1.Size = new System.Drawing.Size(42, 23); - this.numUnitNum1.TabIndex = 586; - this.numUnitNum1.Value = new decimal(new int[] { - 450, - 0, - 0, - 0}); - // - // label20 - // - this.label20.AutoSize = true; - this.label20.Location = new System.Drawing.Point(487, 75); - this.label20.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(20, 17); - this.label20.TabIndex = 585; - this.label20.Text = "重"; - // - // numWeight2 - // - this.numWeight2.Location = new System.Drawing.Point(563, 72); - this.numWeight2.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); - this.numWeight2.Maximum = new decimal(new int[] { - 99999, - 0, - 0, - 0}); - this.numWeight2.Name = "numWeight2"; - this.numWeight2.Size = new System.Drawing.Size(55, 23); - this.numWeight2.TabIndex = 584; - this.numWeight2.Value = new decimal(new int[] { - 99999, - 0, - 0, - 0}); - // - // numWeight1 - // - this.numWeight1.Location = new System.Drawing.Point(507, 72); - this.numWeight1.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); - this.numWeight1.Maximum = new decimal(new int[] { - 99999, - 0, - 0, - 0}); - this.numWeight1.Name = "numWeight1"; - this.numWeight1.Size = new System.Drawing.Size(55, 23); - this.numWeight1.TabIndex = 583; - this.numWeight1.Value = new decimal(new int[] { - 80000, - 0, - 0, - 0}); - // - // label19 - // - this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(379, 75); - this.label19.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(20, 17); - this.label19.TabIndex = 570; - this.label19.Text = "高"; - // - // numHeight2 - // - this.numHeight2.Location = new System.Drawing.Point(442, 72); - this.numHeight2.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); - this.numHeight2.Maximum = new decimal(new int[] { - 299, - 0, - 0, - 0}); - this.numHeight2.Name = "numHeight2"; - this.numHeight2.Size = new System.Drawing.Size(42, 23); - this.numHeight2.TabIndex = 569; - this.numHeight2.Value = new decimal(new int[] { - 100, - 0, - 0, - 0}); - // - // numHeight1 - // - this.numHeight1.Location = new System.Drawing.Point(399, 72); - this.numHeight1.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); - this.numHeight1.Maximum = new decimal(new int[] { - 299, - 0, - 0, - 0}); - this.numHeight1.Name = "numHeight1"; - this.numHeight1.Size = new System.Drawing.Size(42, 23); - this.numHeight1.TabIndex = 568; - this.numHeight1.Value = new decimal(new int[] { - 50, - 0, - 0, - 0}); - // - // label18 - // - this.label18.AutoSize = true; - this.label18.Location = new System.Drawing.Point(271, 75); - this.label18.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(20, 17); - this.label18.TabIndex = 567; - this.label18.Text = "宽"; - // - // numWidth2 - // - this.numWidth2.Location = new System.Drawing.Point(334, 72); - this.numWidth2.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); - this.numWidth2.Maximum = new decimal(new int[] { - 299, - 0, - 0, - 0}); - this.numWidth2.Name = "numWidth2"; - this.numWidth2.Size = new System.Drawing.Size(42, 23); - this.numWidth2.TabIndex = 566; - this.numWidth2.Value = new decimal(new int[] { - 100, - 0, - 0, - 0}); - // - // numWidth1 - // - this.numWidth1.Location = new System.Drawing.Point(291, 72); - this.numWidth1.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); - this.numWidth1.Maximum = new decimal(new int[] { - 299, - 0, - 0, - 0}); - this.numWidth1.Name = "numWidth1"; - this.numWidth1.Size = new System.Drawing.Size(42, 23); - this.numWidth1.TabIndex = 565; - this.numWidth1.Value = new decimal(new int[] { - 55, - 0, - 0, - 0}); - // - // numLen2 - // - this.numLen2.Location = new System.Drawing.Point(226, 72); - this.numLen2.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); - this.numLen2.Maximum = new decimal(new int[] { - 299, - 0, - 0, - 0}); - this.numLen2.Name = "numLen2"; - this.numLen2.Size = new System.Drawing.Size(42, 23); - this.numLen2.TabIndex = 564; - this.numLen2.Value = new decimal(new int[] { - 100, - 0, - 0, - 0}); - // - // numLen1 - // - this.numLen1.Location = new System.Drawing.Point(183, 72); - this.numLen1.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); - this.numLen1.Maximum = new decimal(new int[] { - 299, - 0, - 0, - 0}); - this.numLen1.Name = "numLen1"; - this.numLen1.Size = new System.Drawing.Size(42, 23); - this.numLen1.TabIndex = 563; - this.numLen1.Value = new decimal(new int[] { - 60, - 0, - 0, - 0}); - // - // label15 - // - this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(164, 75); - 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); - this.label15.TabIndex = 562; - this.label15.Text = "长"; - // - // label17 - // - this.label17.AutoSize = true; - this.label17.Location = new System.Drawing.Point(933, 75); - this.label17.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(20, 17); - this.label17.TabIndex = 549; - this.label17.Text = "元"; - // - // numAddPrice - // - this.numAddPrice.DecimalPlaces = 2; - this.numAddPrice.Increment = new decimal(new int[] { - 1, - 0, - 0, - 131072}); - this.numAddPrice.Location = new System.Drawing.Point(889, 72); - this.numAddPrice.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); - this.numAddPrice.Name = "numAddPrice"; - this.numAddPrice.Size = new System.Drawing.Size(44, 23); - this.numAddPrice.TabIndex = 548; - this.numAddPrice.Value = new decimal(new int[] { - 5, - 0, - 0, - 0}); - // - // label16 - // - this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(843, 75); - this.label16.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(48, 17); - this.label16.TabIndex = 547; - this.label16.Text = "倍 再加"; - // - // numAddPriceTimes - // - this.numAddPriceTimes.DecimalPlaces = 2; - this.numAddPriceTimes.Increment = new decimal(new int[] { - 1, - 0, - 0, - 131072}); - this.numAddPriceTimes.Location = new System.Drawing.Point(799, 72); - this.numAddPriceTimes.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); - this.numAddPriceTimes.Name = "numAddPriceTimes"; - this.numAddPriceTimes.Size = new System.Drawing.Size(44, 23); - this.numAddPriceTimes.TabIndex = 533; - this.numAddPriceTimes.Value = new decimal(new int[] { - 20, - 0, - 0, - 65536}); - // - // chkChangeSizeAndNumber - // - this.chkChangeSizeAndNumber.AutoSize = true; - this.chkChangeSizeAndNumber.Location = new System.Drawing.Point(6, 73); - this.chkChangeSizeAndNumber.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.chkChangeSizeAndNumber.Name = "chkChangeSizeAndNumber"; - this.chkChangeSizeAndNumber.Size = new System.Drawing.Size(159, 21); - this.chkChangeSizeAndNumber.TabIndex = 520; - this.chkChangeSizeAndNumber.Text = "修改包装尺寸和单品数量"; - this.chkChangeSizeAndNumber.UseVisualStyleBackColor = true; - // - // btnStop - // - this.btnStop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - 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(1464, 39); - this.btnStop.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); - this.btnStop.Name = "btnStop"; - this.btnStop.Size = new System.Drawing.Size(90, 26); - this.btnStop.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnStop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); - this.btnStop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); - this.btnStop.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.btnStop.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnStop.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.btnStop.Style.GradientAngle = 90; - this.btnStop.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; - this.btnStop.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnStop.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnStop.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnStop.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; - this.btnStop.TabIndex = 507; - this.btnStop.Text = "停止上传"; - this.btnStop.Click += new System.EventHandler(this.btnStop_Click); - // - // btnExport - // - this.btnExport.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btnExport.CanvasColor = System.Drawing.SystemColors.Control; - this.btnExport.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnExport.DisabledBackColor = System.Drawing.Color.Empty; - this.btnExport.Location = new System.Drawing.Point(1372, 39); - this.btnExport.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); - this.btnExport.Name = "btnExport"; - this.btnExport.Size = new System.Drawing.Size(90, 26); - this.btnExport.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnExport.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); - this.btnExport.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); - this.btnExport.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.btnExport.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnExport.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.btnExport.Style.GradientAngle = 90; - this.btnExport.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; - this.btnExport.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnExport.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnExport.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnExport.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; - this.btnExport.TabIndex = 494; - this.btnExport.Text = "导出数据表格"; - this.btnExport.Click += new System.EventHandler(this.btnExport_Click); - // - // btnDel - // - this.btnDel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btnDel.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnDel.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnDel.DisabledBackColor = System.Drawing.Color.Empty; - this.btnDel.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnDel.Location = new System.Drawing.Point(1280, 39); - this.btnDel.Name = "btnDel"; - this.btnDel.Size = new System.Drawing.Size(90, 26); - this.btnDel.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnDel.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnDel.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnDel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.btnDel.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.btnDel.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.btnDel.Style.ForeColor.Color = System.Drawing.Color.White; - this.btnDel.Style.GradientAngle = 90; - this.btnDel.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnDel.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnDel.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnDel.TabIndex = 473; - this.btnDel.Text = "批量删除选中"; - this.btnDel.Visible = false; - this.btnDel.Click += new System.EventHandler(this.btnDel_Click); - // - // tableLayoutPanel1 - // - this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.tableLayoutPanel1.ColumnCount = 24; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.0001F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.0001F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.0001F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.0001F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.0001F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.0001F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.0001F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.0001F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.0001F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 9.999102F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.Controls.Add(this.btnSearch, 22, 0); - this.tableLayoutPanel1.Controls.Add(this.label13, 16, 0); - this.tableLayoutPanel1.Controls.Add(this.label6, 0, 0); - this.tableLayoutPanel1.Controls.Add(this.cmbNotes, 17, 0); - this.tableLayoutPanel1.Controls.Add(this.txtShopId, 1, 0); - this.tableLayoutPanel1.Controls.Add(this.cmbStatus, 15, 0); - this.tableLayoutPanel1.Controls.Add(this.label7, 2, 0); - this.tableLayoutPanel1.Controls.Add(this.label8, 14, 0); - this.tableLayoutPanel1.Controls.Add(this.txtShopName, 3, 0); - this.tableLayoutPanel1.Controls.Add(this.label5, 4, 0); - this.tableLayoutPanel1.Controls.Add(this.txtSKC, 7, 0); - this.tableLayoutPanel1.Controls.Add(this.txtSPU, 5, 0); - this.tableLayoutPanel1.Controls.Add(this.label1, 6, 0); - this.tableLayoutPanel1.Controls.Add(this.label2, 8, 0); - this.tableLayoutPanel1.Controls.Add(this.txtCat, 9, 0); - this.tableLayoutPanel1.Controls.Add(this.txtExtCode, 13, 0); - this.tableLayoutPanel1.Controls.Add(this.label3, 10, 0); - this.tableLayoutPanel1.Controls.Add(this.label4, 12, 0); - this.tableLayoutPanel1.Controls.Add(this.txtProdName, 11, 0); - this.tableLayoutPanel1.Controls.Add(this.flowLayoutPanel1, 0, 1); - this.tableLayoutPanel1.Controls.Add(this.pnlEmpty, 22, 1); - this.tableLayoutPanel1.Controls.Add(this.cmbUserNotes, 19, 0); - this.tableLayoutPanel1.Controls.Add(this.label12, 18, 0); - this.tableLayoutPanel1.Controls.Add(this.chkShowDel, 23, 1); - this.tableLayoutPanel1.Controls.Add(this.chkNoSubSa, 23, 0); - this.tableLayoutPanel1.Controls.Add(this.chkUploadProd, 18, 1); - this.tableLayoutPanel1.Location = new System.Drawing.Point(3, 2); - this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 2; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(1268, 66); - this.tableLayoutPanel1.TabIndex = 190; - // - // btnSearch - // - this.btnSearch.Anchor = System.Windows.Forms.AnchorStyles.None; - this.btnSearch.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnSearch.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnSearch.DisabledBackColor = System.Drawing.Color.Empty; - this.btnSearch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSearch.Location = new System.Drawing.Point(1112, 6); - this.btnSearch.Name = "btnSearch"; - this.btnSearch.Size = new System.Drawing.Size(56, 24); - this.btnSearch.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnSearch.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnSearch.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnSearch.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.btnSearch.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.btnSearch.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.btnSearch.Style.ForeColor.Color = System.Drawing.Color.White; - this.btnSearch.Style.GradientAngle = 90; - this.btnSearch.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnSearch.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnSearch.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnSearch.TabIndex = 467; - this.btnSearch.Text = "搜索"; - this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click); - // - // label13 - // - this.label13.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(885, 9); - this.label13.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(32, 17); - this.label13.TabIndex = 463; - this.label13.Text = "备注"; - // - // label6 - // - this.label6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(3, 9); - this.label6.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(44, 17); - this.label6.TabIndex = 449; - this.label6.Text = "店铺Id"; - // - // cmbNotes - // - this.cmbNotes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.cmbNotes.FormattingEnabled = true; - this.cmbNotes.Items.AddRange(new object[] { - "全部", - "无备注", - "核价成功", - "核价成功（重复）", - "重复"}); - this.cmbNotes.Location = new System.Drawing.Point(917, 8); - this.cmbNotes.Margin = new System.Windows.Forms.Padding(0); - this.cmbNotes.Name = "cmbNotes"; - this.cmbNotes.Size = new System.Drawing.Size(65, 25); - this.cmbNotes.TabIndex = 464; - this.cmbNotes.Text = "全部"; - // - // txtShopId - // - this.txtShopId.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtShopId.Location = new System.Drawing.Point(47, 6); - this.txtShopId.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); - this.txtShopId.Name = "txtShopId"; - this.txtShopId.Size = new System.Drawing.Size(65, 23); - this.txtShopId.TabIndex = 448; - // - // cmbStatus - // - this.cmbStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.cmbStatus.FormattingEnabled = true; - this.cmbStatus.Items.AddRange(new object[] { - "待上传", - "已上传", - "草稿箱", - "全部"}); - this.cmbStatus.Location = new System.Drawing.Point(814, 8); - this.cmbStatus.Margin = new System.Windows.Forms.Padding(0); - this.cmbStatus.Name = "cmbStatus"; - this.cmbStatus.Size = new System.Drawing.Size(65, 25); - this.cmbStatus.TabIndex = 459; - this.cmbStatus.Text = "待上传"; - // - // label7 - // - this.label7.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(118, 9); - this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(56, 17); - this.label7.TabIndex = 452; - this.label7.Text = "店铺名称"; - // - // label8 - // - this.label8.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(758, 9); - this.label8.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(56, 17); - this.label8.TabIndex = 458; - this.label8.Text = "认领状态"; - // - // txtShopName - // - this.txtShopName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtShopName.Location = new System.Drawing.Point(174, 6); - this.txtShopName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); - this.txtShopName.Name = "txtShopName"; - this.txtShopName.Size = new System.Drawing.Size(65, 23); - this.txtShopName.TabIndex = 451; - // - // label5 - // - this.label5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(245, 9); - this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(31, 17); - this.label5.TabIndex = 435; - this.label5.Text = "SPU"; - // - // txtSKC - // - this.txtSKC.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtSKC.Location = new System.Drawing.Point(378, 6); - this.txtSKC.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); - this.txtSKC.Name = "txtSKC"; - this.txtSKC.Size = new System.Drawing.Size(65, 23); - this.txtSKC.TabIndex = 432; - // - // txtSPU - // - this.txtSPU.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtSPU.Location = new System.Drawing.Point(276, 6); - this.txtSPU.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); - this.txtSPU.Name = "txtSPU"; - this.txtSPU.Size = new System.Drawing.Size(65, 23); - this.txtSPU.TabIndex = 434; - // - // label1 - // - this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(347, 9); - this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(31, 17); - this.label1.TabIndex = 433; - this.label1.Text = "SKC"; - // - // label2 - // - this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(449, 9); - 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.TabIndex = 426; - this.label2.Text = "类目"; - // - // txtCat - // - this.txtCat.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtCat.Location = new System.Drawing.Point(481, 6); - this.txtCat.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); - this.txtCat.Name = "txtCat"; - this.txtCat.Size = new System.Drawing.Size(65, 23); - this.txtCat.TabIndex = 425; - // - // txtExtCode - // - this.txtExtCode.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtExtCode.Location = new System.Drawing.Point(687, 6); - this.txtExtCode.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); - this.txtExtCode.Name = "txtExtCode"; - this.txtExtCode.Size = new System.Drawing.Size(65, 23); - this.txtExtCode.TabIndex = 429; - // - // label3 - // - this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(552, 9); - this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(32, 17); - this.label3.TabIndex = 428; - this.label3.Text = "标题"; - // - // label4 - // - this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(655, 9); - this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(32, 17); - this.label4.TabIndex = 430; - this.label4.Text = "货号"; - // - // txtProdName - // - this.txtProdName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtProdName.Location = new System.Drawing.Point(584, 6); - this.txtProdName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); - this.txtProdName.Name = "txtProdName"; - this.txtProdName.Size = new System.Drawing.Size(65, 23); - this.txtProdName.TabIndex = 427; - // // flowLayoutPanel1 // - this.flowLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.tableLayoutPanel1.SetColumnSpan(this.flowLayoutPanel1, 18); + this.flowLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.flowLayoutPanel1.Controls.Add(this.label9); this.flowLayoutPanel1.Controls.Add(this.txtSkuHeadText); this.flowLayoutPanel1.Controls.Add(this.label10); @@ -1091,10 +437,10 @@ this.flowLayoutPanel1.Controls.Add(this.numSkuRandomPrice); this.flowLayoutPanel1.Controls.Add(this.label11); this.flowLayoutPanel1.Controls.Add(this.chkOriginalPriceMarkUp); - this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 36); + this.flowLayoutPanel1.Location = new System.Drawing.Point(2, 36); this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(0); this.flowLayoutPanel1.Name = "flowLayoutPanel1"; - this.flowLayoutPanel1.Size = new System.Drawing.Size(982, 30); + this.flowLayoutPanel1.Size = new System.Drawing.Size(1072, 29); this.flowLayoutPanel1.TabIndex = 471; // // label9 @@ -1260,7 +606,7 @@ // this.chkOriginalPriceMarkUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.chkOriginalPriceMarkUp.AutoSize = true; - this.chkOriginalPriceMarkUp.Location = new System.Drawing.Point(2, 29); + this.chkOriginalPriceMarkUp.Location = new System.Drawing.Point(939, 4); this.chkOriginalPriceMarkUp.Margin = new System.Windows.Forms.Padding(2, 0, 0, 0); this.chkOriginalPriceMarkUp.Name = "chkOriginalPriceMarkUp"; this.chkOriginalPriceMarkUp.Size = new System.Drawing.Size(95, 21); @@ -1268,16 +614,95 @@ this.chkOriginalPriceMarkUp.Text = "sku原价加价"; this.chkOriginalPriceMarkUp.UseVisualStyleBackColor = true; // + // btnSetSubSa + // + this.btnSetSubSa.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnSetSubSa.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnSetSubSa.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnSetSubSa.DisabledBackColor = System.Drawing.Color.Empty; + this.btnSetSubSa.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnSetSubSa.Location = new System.Drawing.Point(1076, 38); + this.btnSetSubSa.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.btnSetSubSa.Name = "btnSetSubSa"; + this.btnSetSubSa.Size = new System.Drawing.Size(86, 24); + this.btnSetSubSa.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnSetSubSa.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnSetSubSa.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnSetSubSa.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnSetSubSa.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnSetSubSa.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnSetSubSa.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnSetSubSa.Style.GradientAngle = 90; + this.btnSetSubSa.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnSetSubSa.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnSetSubSa.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnSetSubSa.TabIndex = 469; + this.btnSetSubSa.Text = "分配二级超管"; + this.btnSetSubSa.Visible = false; + this.btnSetSubSa.Click += new System.EventHandler(this.btnSetSubSa_Click); + // + // btnReFission + // + this.btnReFission.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnReFission.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnReFission.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnReFission.DisabledBackColor = System.Drawing.Color.Empty; + this.btnReFission.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnReFission.Location = new System.Drawing.Point(1164, 38); + this.btnReFission.Margin = new System.Windows.Forms.Padding(0); + this.btnReFission.Name = "btnReFission"; + this.btnReFission.Size = new System.Drawing.Size(86, 24); + this.btnReFission.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnReFission.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnReFission.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnReFission.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnReFission.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnReFission.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnReFission.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnReFission.Style.GradientAngle = 90; + this.btnReFission.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnReFission.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnReFission.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnReFission.TabIndex = 468; + this.btnReFission.Text = "批量重组标题"; + this.btnReFission.Click += new System.EventHandler(this.btnReFission_Click); + // + // btnSearch + // + this.btnSearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnSearch.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnSearch.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnSearch.DisabledBackColor = System.Drawing.Color.Empty; + this.btnSearch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnSearch.Location = new System.Drawing.Point(1164, 9); + this.btnSearch.Margin = new System.Windows.Forms.Padding(0); + this.btnSearch.Name = "btnSearch"; + this.btnSearch.Size = new System.Drawing.Size(42, 24); + this.btnSearch.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnSearch.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnSearch.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnSearch.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnSearch.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnSearch.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnSearch.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnSearch.Style.GradientAngle = 90; + this.btnSearch.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnSearch.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnSearch.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnSearch.TabIndex = 467; + this.btnSearch.Text = "搜索"; + this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click); + // // pnlEmpty // - this.pnlEmpty.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.pnlEmpty.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.pnlEmpty.CanvasColor = System.Drawing.SystemColors.Control; this.pnlEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.pnlEmpty.DisabledBackColor = System.Drawing.Color.Empty; - this.pnlEmpty.Location = new System.Drawing.Point(1113, 40); - this.pnlEmpty.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); + this.pnlEmpty.Location = new System.Drawing.Point(1208, 9); + this.pnlEmpty.Margin = new System.Windows.Forms.Padding(2, 0, 0, 0); this.pnlEmpty.Name = "pnlEmpty"; - this.pnlEmpty.Size = new System.Drawing.Size(56, 22); + this.pnlEmpty.Size = new System.Drawing.Size(42, 24); this.pnlEmpty.Style.Alignment = System.Drawing.StringAlignment.Center; this.pnlEmpty.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); this.pnlEmpty.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); @@ -1291,9 +716,660 @@ this.pnlEmpty.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.pnlEmpty.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; this.pnlEmpty.TabIndex = 431; - this.pnlEmpty.Text = "清空条件"; + this.pnlEmpty.Text = "清空"; this.pnlEmpty.Click += new System.EventHandler(this.pnlEmpty_Click); // + // btnDel + // + this.btnDel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnDel.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnDel.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnDel.DisabledBackColor = System.Drawing.Color.Empty; + this.btnDel.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnDel.Location = new System.Drawing.Point(1252, 38); + this.btnDel.Name = "btnDel"; + this.btnDel.Size = new System.Drawing.Size(86, 24); + this.btnDel.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnDel.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnDel.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnDel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnDel.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnDel.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnDel.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnDel.Style.GradientAngle = 90; + this.btnDel.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnDel.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnDel.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnDel.TabIndex = 473; + this.btnDel.Text = "批量删除选中"; + this.btnDel.Visible = false; + this.btnDel.Click += new System.EventHandler(this.btnDel_Click); + // + // chkUploadProd + // + this.chkUploadProd.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.chkUploadProd.Checked = true; + this.chkUploadProd.CheckState = System.Windows.Forms.CheckState.Checked; + this.chkUploadProd.Location = new System.Drawing.Point(1343, 11); + this.chkUploadProd.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.chkUploadProd.Name = "chkUploadProd"; + this.chkUploadProd.Size = new System.Drawing.Size(81, 21); + this.chkUploadProd.TabIndex = 470; + this.chkUploadProd.Text = "上传未发布"; + this.chkUploadProd.UseVisualStyleBackColor = true; + // + // chkShowDel + // + this.chkShowDel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.chkShowDel.AutoSize = true; + this.chkShowDel.Location = new System.Drawing.Point(1259, 11); + this.chkShowDel.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.chkShowDel.Name = "chkShowDel"; + this.chkShowDel.Size = new System.Drawing.Size(75, 21); + this.chkShowDel.TabIndex = 468; + this.chkShowDel.Text = "显示删除"; + this.chkShowDel.UseVisualStyleBackColor = true; + this.chkShowDel.CheckedChanged += new System.EventHandler(this.chkShowDel_CheckedChanged); + // + // label21 + // + this.label21.AutoSize = true; + this.label21.Location = new System.Drawing.Point(621, 71); + this.label21.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label21.Name = "label21"; + this.label21.Size = new System.Drawing.Size(32, 17); + this.label21.TabIndex = 588; + this.label21.Text = "数量"; + // + // numUnitNum2 + // + this.numUnitNum2.Location = new System.Drawing.Point(696, 68); + this.numUnitNum2.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numUnitNum2.Maximum = new decimal(new int[] { + 600, + 0, + 0, + 0}); + this.numUnitNum2.Name = "numUnitNum2"; + this.numUnitNum2.Size = new System.Drawing.Size(42, 23); + this.numUnitNum2.TabIndex = 587; + this.numUnitNum2.Value = new decimal(new int[] { + 600, + 0, + 0, + 0}); + // + // numUnitNum1 + // + this.numUnitNum1.Location = new System.Drawing.Point(653, 68); + this.numUnitNum1.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numUnitNum1.Maximum = new decimal(new int[] { + 600, + 0, + 0, + 0}); + this.numUnitNum1.Name = "numUnitNum1"; + this.numUnitNum1.Size = new System.Drawing.Size(42, 23); + this.numUnitNum1.TabIndex = 586; + this.numUnitNum1.Value = new decimal(new int[] { + 450, + 0, + 0, + 0}); + // + // label20 + // + this.label20.AutoSize = true; + this.label20.Location = new System.Drawing.Point(487, 71); + this.label20.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label20.Name = "label20"; + this.label20.Size = new System.Drawing.Size(20, 17); + this.label20.TabIndex = 585; + this.label20.Text = "重"; + // + // numWeight2 + // + this.numWeight2.Location = new System.Drawing.Point(563, 68); + this.numWeight2.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numWeight2.Maximum = new decimal(new int[] { + 99999, + 0, + 0, + 0}); + this.numWeight2.Name = "numWeight2"; + this.numWeight2.Size = new System.Drawing.Size(55, 23); + this.numWeight2.TabIndex = 584; + this.numWeight2.Value = new decimal(new int[] { + 99999, + 0, + 0, + 0}); + // + // numWeight1 + // + this.numWeight1.Location = new System.Drawing.Point(507, 68); + this.numWeight1.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numWeight1.Maximum = new decimal(new int[] { + 99999, + 0, + 0, + 0}); + this.numWeight1.Name = "numWeight1"; + this.numWeight1.Size = new System.Drawing.Size(55, 23); + this.numWeight1.TabIndex = 583; + this.numWeight1.Value = new decimal(new int[] { + 80000, + 0, + 0, + 0}); + // + // label19 + // + this.label19.AutoSize = true; + this.label19.Location = new System.Drawing.Point(379, 71); + this.label19.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label19.Name = "label19"; + this.label19.Size = new System.Drawing.Size(20, 17); + this.label19.TabIndex = 570; + this.label19.Text = "高"; + // + // numHeight2 + // + this.numHeight2.Location = new System.Drawing.Point(442, 68); + this.numHeight2.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numHeight2.Maximum = new decimal(new int[] { + 299, + 0, + 0, + 0}); + this.numHeight2.Name = "numHeight2"; + this.numHeight2.Size = new System.Drawing.Size(42, 23); + this.numHeight2.TabIndex = 569; + this.numHeight2.Value = new decimal(new int[] { + 100, + 0, + 0, + 0}); + // + // numHeight1 + // + this.numHeight1.Location = new System.Drawing.Point(399, 68); + this.numHeight1.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numHeight1.Maximum = new decimal(new int[] { + 299, + 0, + 0, + 0}); + this.numHeight1.Name = "numHeight1"; + this.numHeight1.Size = new System.Drawing.Size(42, 23); + this.numHeight1.TabIndex = 568; + this.numHeight1.Value = new decimal(new int[] { + 50, + 0, + 0, + 0}); + // + // label18 + // + this.label18.AutoSize = true; + this.label18.Location = new System.Drawing.Point(271, 71); + this.label18.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label18.Name = "label18"; + this.label18.Size = new System.Drawing.Size(20, 17); + this.label18.TabIndex = 567; + this.label18.Text = "宽"; + // + // numWidth2 + // + this.numWidth2.Location = new System.Drawing.Point(334, 68); + this.numWidth2.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numWidth2.Maximum = new decimal(new int[] { + 299, + 0, + 0, + 0}); + this.numWidth2.Name = "numWidth2"; + this.numWidth2.Size = new System.Drawing.Size(42, 23); + this.numWidth2.TabIndex = 566; + this.numWidth2.Value = new decimal(new int[] { + 100, + 0, + 0, + 0}); + // + // numWidth1 + // + this.numWidth1.Location = new System.Drawing.Point(291, 68); + this.numWidth1.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numWidth1.Maximum = new decimal(new int[] { + 299, + 0, + 0, + 0}); + this.numWidth1.Name = "numWidth1"; + this.numWidth1.Size = new System.Drawing.Size(42, 23); + this.numWidth1.TabIndex = 565; + this.numWidth1.Value = new decimal(new int[] { + 55, + 0, + 0, + 0}); + // + // numLen2 + // + this.numLen2.Location = new System.Drawing.Point(226, 68); + this.numLen2.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numLen2.Maximum = new decimal(new int[] { + 299, + 0, + 0, + 0}); + this.numLen2.Name = "numLen2"; + this.numLen2.Size = new System.Drawing.Size(42, 23); + this.numLen2.TabIndex = 564; + this.numLen2.Value = new decimal(new int[] { + 100, + 0, + 0, + 0}); + // + // numLen1 + // + this.numLen1.Location = new System.Drawing.Point(183, 68); + this.numLen1.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numLen1.Maximum = new decimal(new int[] { + 299, + 0, + 0, + 0}); + this.numLen1.Name = "numLen1"; + this.numLen1.Size = new System.Drawing.Size(42, 23); + this.numLen1.TabIndex = 563; + this.numLen1.Value = new decimal(new int[] { + 60, + 0, + 0, + 0}); + // + // label15 + // + this.label15.AutoSize = true; + this.label15.Location = new System.Drawing.Point(164, 71); + 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); + this.label15.TabIndex = 562; + this.label15.Text = "长"; + // + // label17 + // + this.label17.AutoSize = true; + this.label17.Location = new System.Drawing.Point(933, 71); + this.label17.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label17.Name = "label17"; + this.label17.Size = new System.Drawing.Size(20, 17); + this.label17.TabIndex = 549; + this.label17.Text = "元"; + // + // numAddPrice + // + this.numAddPrice.DecimalPlaces = 2; + this.numAddPrice.Increment = new decimal(new int[] { + 1, + 0, + 0, + 131072}); + this.numAddPrice.Location = new System.Drawing.Point(889, 68); + this.numAddPrice.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numAddPrice.Name = "numAddPrice"; + this.numAddPrice.Size = new System.Drawing.Size(44, 23); + this.numAddPrice.TabIndex = 548; + this.numAddPrice.Value = new decimal(new int[] { + 5, + 0, + 0, + 0}); + // + // label16 + // + this.label16.AutoSize = true; + this.label16.Location = new System.Drawing.Point(843, 71); + this.label16.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label16.Name = "label16"; + this.label16.Size = new System.Drawing.Size(48, 17); + this.label16.TabIndex = 547; + this.label16.Text = "倍 再加"; + // + // numAddPriceTimes + // + this.numAddPriceTimes.DecimalPlaces = 2; + this.numAddPriceTimes.Increment = new decimal(new int[] { + 1, + 0, + 0, + 131072}); + this.numAddPriceTimes.Location = new System.Drawing.Point(799, 68); + this.numAddPriceTimes.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numAddPriceTimes.Name = "numAddPriceTimes"; + this.numAddPriceTimes.Size = new System.Drawing.Size(44, 23); + this.numAddPriceTimes.TabIndex = 533; + this.numAddPriceTimes.Value = new decimal(new int[] { + 20, + 0, + 0, + 65536}); + // + // chkChangeSizeAndNumber + // + this.chkChangeSizeAndNumber.AutoSize = true; + this.chkChangeSizeAndNumber.Location = new System.Drawing.Point(6, 69); + this.chkChangeSizeAndNumber.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.chkChangeSizeAndNumber.Name = "chkChangeSizeAndNumber"; + this.chkChangeSizeAndNumber.Size = new System.Drawing.Size(159, 21); + this.chkChangeSizeAndNumber.TabIndex = 520; + this.chkChangeSizeAndNumber.Text = "修改包装尺寸和单品数量"; + this.chkChangeSizeAndNumber.UseVisualStyleBackColor = true; + // + // btnStop + // + this.btnStop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + 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(1428, 38); + this.btnStop.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); + this.btnStop.Name = "btnStop"; + this.btnStop.Size = new System.Drawing.Size(86, 24); + this.btnStop.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnStop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnStop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnStop.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.btnStop.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnStop.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.btnStop.Style.GradientAngle = 90; + this.btnStop.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; + this.btnStop.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnStop.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnStop.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnStop.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.btnStop.TabIndex = 507; + this.btnStop.Text = "停止上传"; + this.btnStop.Click += new System.EventHandler(this.btnStop_Click); + // + // btnExport + // + this.btnExport.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnExport.CanvasColor = System.Drawing.SystemColors.Control; + this.btnExport.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnExport.DisabledBackColor = System.Drawing.Color.Empty; + this.btnExport.Location = new System.Drawing.Point(1340, 38); + this.btnExport.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); + this.btnExport.Name = "btnExport"; + this.btnExport.Size = new System.Drawing.Size(86, 24); + this.btnExport.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnExport.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnExport.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnExport.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.btnExport.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnExport.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.btnExport.Style.GradientAngle = 90; + this.btnExport.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; + this.btnExport.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnExport.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnExport.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnExport.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.btnExport.TabIndex = 494; + this.btnExport.Text = "导出数据表格"; + this.btnExport.Click += new System.EventHandler(this.btnExport_Click); + // + // tableLayoutPanel1 + // + this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.tableLayoutPanel1.ColumnCount = 20; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.0001F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.0001F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.0001F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.0001F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.0001F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.0001F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.0001F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.0001F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.0001F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 9.999102F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel1.Controls.Add(this.label13, 16, 0); + this.tableLayoutPanel1.Controls.Add(this.label6, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.cmbNotes, 17, 0); + this.tableLayoutPanel1.Controls.Add(this.txtShopId, 1, 0); + this.tableLayoutPanel1.Controls.Add(this.cmbStatus, 15, 0); + this.tableLayoutPanel1.Controls.Add(this.label7, 2, 0); + this.tableLayoutPanel1.Controls.Add(this.label8, 14, 0); + this.tableLayoutPanel1.Controls.Add(this.txtShopName, 3, 0); + this.tableLayoutPanel1.Controls.Add(this.label5, 4, 0); + this.tableLayoutPanel1.Controls.Add(this.txtSKC, 7, 0); + this.tableLayoutPanel1.Controls.Add(this.txtSPU, 5, 0); + this.tableLayoutPanel1.Controls.Add(this.label1, 6, 0); + this.tableLayoutPanel1.Controls.Add(this.label2, 8, 0); + this.tableLayoutPanel1.Controls.Add(this.txtCat, 9, 0); + this.tableLayoutPanel1.Controls.Add(this.txtExtCode, 13, 0); + this.tableLayoutPanel1.Controls.Add(this.label3, 10, 0); + this.tableLayoutPanel1.Controls.Add(this.label4, 12, 0); + this.tableLayoutPanel1.Controls.Add(this.txtProdName, 11, 0); + this.tableLayoutPanel1.Controls.Add(this.cmbUserNotes, 19, 0); + this.tableLayoutPanel1.Controls.Add(this.lblUserNotes, 18, 0); + this.tableLayoutPanel1.Location = new System.Drawing.Point(2, 0); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 1; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(1072, 42); + this.tableLayoutPanel1.TabIndex = 190; + // + // label13 + // + this.label13.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.label13.AutoSize = true; + this.label13.Location = new System.Drawing.Point(853, 12); + this.label13.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(32, 17); + this.label13.TabIndex = 463; + this.label13.Text = "备注"; + // + // label6 + // + this.label6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(3, 12); + this.label6.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(44, 17); + this.label6.TabIndex = 449; + this.label6.Text = "店铺Id"; + // + // cmbNotes + // + this.cmbNotes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.cmbNotes.FormattingEnabled = true; + this.cmbNotes.Items.AddRange(new object[] { + "全部", + "无备注", + "核价成功", + "核价成功（重复）", + "重复"}); + this.cmbNotes.Location = new System.Drawing.Point(885, 11); + this.cmbNotes.Margin = new System.Windows.Forms.Padding(0); + this.cmbNotes.Name = "cmbNotes"; + this.cmbNotes.Size = new System.Drawing.Size(61, 25); + this.cmbNotes.TabIndex = 464; + this.cmbNotes.Text = "全部"; + // + // txtShopId + // + this.txtShopId.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.txtShopId.Location = new System.Drawing.Point(47, 9); + this.txtShopId.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtShopId.Name = "txtShopId"; + this.txtShopId.Size = new System.Drawing.Size(61, 23); + this.txtShopId.TabIndex = 448; + // + // cmbStatus + // + this.cmbStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.cmbStatus.FormattingEnabled = true; + this.cmbStatus.Items.AddRange(new object[] { + "待上传", + "已上传", + "草稿箱", + "全部"}); + this.cmbStatus.Location = new System.Drawing.Point(786, 11); + this.cmbStatus.Margin = new System.Windows.Forms.Padding(0); + this.cmbStatus.Name = "cmbStatus"; + this.cmbStatus.Size = new System.Drawing.Size(61, 25); + this.cmbStatus.TabIndex = 459; + this.cmbStatus.Text = "待上传"; + // + // label7 + // + this.label7.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.label7.AutoSize = true; + this.label7.Location = new System.Drawing.Point(114, 12); + this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(56, 17); + this.label7.TabIndex = 452; + this.label7.Text = "店铺名称"; + // + // label8 + // + this.label8.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.label8.AutoSize = true; + this.label8.Location = new System.Drawing.Point(730, 12); + this.label8.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(56, 17); + this.label8.TabIndex = 458; + this.label8.Text = "认领状态"; + // + // txtShopName + // + this.txtShopName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.txtShopName.Location = new System.Drawing.Point(170, 9); + this.txtShopName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtShopName.Name = "txtShopName"; + this.txtShopName.Size = new System.Drawing.Size(61, 23); + this.txtShopName.TabIndex = 451; + // + // label5 + // + this.label5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(237, 12); + this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(31, 17); + this.label5.TabIndex = 435; + this.label5.Text = "SPU"; + // + // txtSKC + // + this.txtSKC.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.txtSKC.Location = new System.Drawing.Point(366, 9); + this.txtSKC.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtSKC.Name = "txtSKC"; + this.txtSKC.Size = new System.Drawing.Size(61, 23); + this.txtSKC.TabIndex = 432; + // + // txtSPU + // + this.txtSPU.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.txtSPU.Location = new System.Drawing.Point(268, 9); + this.txtSPU.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtSPU.Name = "txtSPU"; + this.txtSPU.Size = new System.Drawing.Size(61, 23); + this.txtSPU.TabIndex = 434; + // + // label1 + // + this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(335, 12); + this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(31, 17); + this.label1.TabIndex = 433; + this.label1.Text = "SKC"; + // + // label2 + // + this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(433, 12); + 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.TabIndex = 426; + this.label2.Text = "类目"; + // + // txtCat + // + this.txtCat.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.txtCat.Location = new System.Drawing.Point(465, 9); + this.txtCat.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtCat.Name = "txtCat"; + this.txtCat.Size = new System.Drawing.Size(61, 23); + this.txtCat.TabIndex = 425; + // + // txtExtCode + // + this.txtExtCode.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.txtExtCode.Location = new System.Drawing.Point(663, 9); + this.txtExtCode.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtExtCode.Name = "txtExtCode"; + this.txtExtCode.Size = new System.Drawing.Size(61, 23); + this.txtExtCode.TabIndex = 429; + // + // label3 + // + this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(532, 12); + this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(32, 17); + this.label3.TabIndex = 428; + this.label3.Text = "标题"; + // + // label4 + // + this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(631, 12); + this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(32, 17); + this.label4.TabIndex = 430; + this.label4.Text = "货号"; + // + // txtProdName + // + this.txtProdName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.txtProdName.Location = new System.Drawing.Point(564, 9); + this.txtProdName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtProdName.Name = "txtProdName"; + this.txtProdName.Size = new System.Drawing.Size(61, 23); + this.txtProdName.TabIndex = 427; + // // cmbUserNotes // this.cmbUserNotes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); @@ -1302,67 +1378,28 @@ "全部", "重上", "已买"}); - this.cmbUserNotes.Location = new System.Drawing.Point(1044, 8); + this.cmbUserNotes.Location = new System.Drawing.Point(1008, 11); this.cmbUserNotes.Margin = new System.Windows.Forms.Padding(0); this.cmbUserNotes.Name = "cmbUserNotes"; - this.cmbUserNotes.Size = new System.Drawing.Size(65, 25); + this.cmbUserNotes.Size = new System.Drawing.Size(64, 25); this.cmbUserNotes.TabIndex = 460; this.cmbUserNotes.Text = "全部"; // - // label12 + // lblUserNotes // - this.label12.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(988, 9); - this.label12.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(56, 17); - this.label12.TabIndex = 459; - this.label12.Text = "用户备注"; - // - // chkShowDel - // - this.chkShowDel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.chkShowDel.AutoSize = true; - this.chkShowDel.Location = new System.Drawing.Point(1177, 40); - this.chkShowDel.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.chkShowDel.Name = "chkShowDel"; - this.chkShowDel.Size = new System.Drawing.Size(91, 21); - this.chkShowDel.TabIndex = 468; - this.chkShowDel.Text = "显示删除"; - 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.Left | System.Windows.Forms.AnchorStyles.Right))); - this.chkNoSubSa.AutoSize = true; - this.chkNoSubSa.Location = new System.Drawing.Point(1177, 7); - this.chkNoSubSa.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.chkNoSubSa.Name = "chkNoSubSa"; - this.chkNoSubSa.Size = new System.Drawing.Size(91, 21); - this.chkNoSubSa.TabIndex = 467; - this.chkNoSubSa.Text = "未分配超管"; - this.chkNoSubSa.UseVisualStyleBackColor = true; - // - // chkUploadProd - // - this.chkUploadProd.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.chkUploadProd.Checked = true; - this.chkUploadProd.CheckState = System.Windows.Forms.CheckState.Checked; - this.tableLayoutPanel1.SetColumnSpan(this.chkUploadProd, 2); - this.chkUploadProd.Location = new System.Drawing.Point(1019, 40); - this.chkUploadProd.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.chkUploadProd.Name = "chkUploadProd"; - this.chkUploadProd.Size = new System.Drawing.Size(90, 21); - this.chkUploadProd.TabIndex = 470; - this.chkUploadProd.Text = "上传到未发布"; - this.chkUploadProd.UseVisualStyleBackColor = true; + this.lblUserNotes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.lblUserNotes.AutoSize = true; + this.lblUserNotes.Location = new System.Drawing.Point(952, 12); + this.lblUserNotes.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.lblUserNotes.Name = "lblUserNotes"; + this.lblUserNotes.Size = new System.Drawing.Size(56, 17); + this.lblUserNotes.TabIndex = 459; + this.lblUserNotes.Text = "用户备注"; // // chkAddPrice // this.chkAddPrice.AutoSize = true; - this.chkAddPrice.Location = new System.Drawing.Point(755, 73); + this.chkAddPrice.Location = new System.Drawing.Point(755, 69); this.chkAddPrice.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.chkAddPrice.Name = "chkAddPrice"; this.chkAddPrice.Size = new System.Drawing.Size(51, 21); @@ -1374,7 +1411,7 @@ // this.chkEnglishProdName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.chkEnglishProdName.AutoSize = true; - this.chkEnglishProdName.Location = new System.Drawing.Point(904, 98); + this.chkEnglishProdName.Location = new System.Drawing.Point(864, 96); this.chkEnglishProdName.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.chkEnglishProdName.Name = "chkEnglishProdName"; this.chkEnglishProdName.Size = new System.Drawing.Size(75, 21); @@ -1407,7 +1444,7 @@ // this.splitContainer2.Panel2.Controls.Add(this.ucSplitPage1); this.splitContainer2.Panel2.Controls.Add(this.statusBar); - this.splitContainer2.Size = new System.Drawing.Size(1558, 509); + this.splitContainer2.Size = new System.Drawing.Size(1518, 509); this.splitContainer2.SplitterDistance = 480; this.splitContainer2.TabIndex = 0; // @@ -1418,7 +1455,7 @@ this.pnlError.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.pnlError.Controls.Add(this.lblError); this.pnlError.DisabledBackColor = System.Drawing.Color.Empty; - this.pnlError.Location = new System.Drawing.Point(650, 91); + this.pnlError.Location = new System.Drawing.Point(630, 91); this.pnlError.Name = "pnlError"; this.pnlError.Size = new System.Drawing.Size(259, 118); this.pnlError.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -1444,7 +1481,7 @@ // this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None; this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue; - this.pbLoading.Location = new System.Drawing.Point(754, 215); + this.pbLoading.Location = new System.Drawing.Point(734, 215); this.pbLoading.Name = "pbLoading"; this.pbLoading.Size = new System.Drawing.Size(50, 50); this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -1453,8 +1490,9 @@ // // lblCustomImgNum // + this.lblCustomImgNum.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.lblCustomImgNum.AutoSize = true; - this.lblCustomImgNum.Location = new System.Drawing.Point(1447, 43); + this.lblCustomImgNum.Location = new System.Drawing.Point(1408, 43); this.lblCustomImgNum.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.lblCustomImgNum.Name = "lblCustomImgNum"; this.lblCustomImgNum.Size = new System.Drawing.Size(95, 17); @@ -1464,7 +1502,8 @@ // // numSeconds // - this.numSeconds.Location = new System.Drawing.Point(1235, 40); + this.numSeconds.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.numSeconds.Location = new System.Drawing.Point(1196, 40); this.numSeconds.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); this.numSeconds.Maximum = new decimal(new int[] { 1000, @@ -1483,8 +1522,9 @@ // // label14 // + this.label14.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.label14.AutoSize = true; - this.label14.Location = new System.Drawing.Point(1281, 43); + this.label14.Location = new System.Drawing.Point(1242, 43); this.label14.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label14.Name = "label14"; this.label14.Size = new System.Drawing.Size(56, 17); @@ -1494,11 +1534,12 @@ // // btnCustomImg // + this.btnCustomImg.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.btnCustomImg.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnCustomImg.Cursor = System.Windows.Forms.Cursors.Hand; this.btnCustomImg.DisabledBackColor = System.Drawing.Color.Empty; this.btnCustomImg.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnCustomImg.Location = new System.Drawing.Point(1340, 38); + this.btnCustomImg.Location = new System.Drawing.Point(1301, 38); this.btnCustomImg.Name = "btnCustomImg"; this.btnCustomImg.Size = new System.Drawing.Size(106, 26); this.btnCustomImg.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -1519,7 +1560,8 @@ // // chkCustomPic // - this.chkCustomPic.Location = new System.Drawing.Point(1106, 41); + this.chkCustomPic.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.chkCustomPic.Location = new System.Drawing.Point(1067, 41); this.chkCustomPic.Margin = new System.Windows.Forms.Padding(2, 0, 0, 0); this.chkCustomPic.Name = "chkCustomPic"; this.chkCustomPic.Size = new System.Drawing.Size(135, 21); @@ -1580,7 +1622,7 @@ this.dgvSelectProduct.ReadOnly = true; this.dgvSelectProduct.RowHeadersWidth = 40; this.dgvSelectProduct.RowTemplate.Height = 23; - this.dgvSelectProduct.Size = new System.Drawing.Size(1550, 480); + this.dgvSelectProduct.Size = new System.Drawing.Size(1510, 480); this.dgvSelectProduct.TabIndex = 189; this.dgvSelectProduct.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvSelectProduct_CellContentClick); this.dgvSelectProduct.Scroll += new System.Windows.Forms.ScrollEventHandler(this.dgvSelectProduct_Scroll); @@ -1808,7 +1850,7 @@ this.ucSplitPage1.CurrentPage = 1; this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Right; this.ucSplitPage1.IsShowPageSize = true; - this.ucSplitPage1.Location = new System.Drawing.Point(1158, 0); + this.ucSplitPage1.Location = new System.Drawing.Point(1118, 0); this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0); this.ucSplitPage1.Name = "ucSplitPage1"; this.ucSplitPage1.Padding = new System.Windows.Forms.Padding(0, 0, 1, 0); @@ -1825,13 +1867,13 @@ this.statusBar.Location = new System.Drawing.Point(0, 0); this.statusBar.Margin = new System.Windows.Forms.Padding(0); this.statusBar.Name = "statusBar"; - this.statusBar.Size = new System.Drawing.Size(1558, 25); + this.statusBar.Size = new System.Drawing.Size(1518, 25); this.statusBar.TabIndex = 5; // // DbProductSelectListManageForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.ClientSize = new System.Drawing.Size(1560, 672); + this.ClientSize = new System.Drawing.Size(1520, 672); this.Controls.Add(this.splitContainer1); 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"))); @@ -1846,6 +1888,10 @@ this.splitContainer1.Panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); this.splitContainer1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.numMaxWaitSecond)).EndInit(); + this.flowLayoutPanel1.ResumeLayout(false); + this.flowLayoutPanel1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numSkuRandomPrice)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.numUnitNum2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.numUnitNum1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.numWeight2)).EndInit(); @@ -1860,9 +1906,6 @@ ((System.ComponentModel.ISupportInitialize)(this.numAddPriceTimes)).EndInit(); this.tableLayoutPanel1.ResumeLayout(false); this.tableLayoutPanel1.PerformLayout(); - this.flowLayoutPanel1.ResumeLayout(false); - this.flowLayoutPanel1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.numSkuRandomPrice)).EndInit(); this.splitContainer2.Panel1.ResumeLayout(false); this.splitContainer2.Panel1.PerformLayout(); this.splitContainer2.Panel2.ResumeLayout(false); @@ -1919,7 +1962,7 @@ private UserComponent.UcCheckBox chkEndWords; private UserComponent.UcCheckBox chkFission; private System.Windows.Forms.ComboBox cmbUserNotes; - private System.Windows.Forms.Label label12; + private System.Windows.Forms.Label lblUserNotes; private System.Windows.Forms.Label label13; private System.Windows.Forms.ComboBox cmbNotes; private DevComponents.DotNetBar.PanelEx btnDel; @@ -1994,5 +2037,7 @@ private System.Windows.Forms.DataGridViewLinkColumn colDelete; private System.Windows.Forms.DataGridViewTextBoxColumn colOpResult; private DevComponents.DotNetBar.PanelEx btnForceEnable; + private System.Windows.Forms.NumericUpDown numMaxWaitSecond; + private System.Windows.Forms.Label label22; } } \ No newline at end of file diff --git a/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs b/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs index 25d978a..558e217 100644 --- a/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs +++ b/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs @@ -33,6 +33,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms { public partial class DbProductSelectListManageForm : LRBaseForm { + public bool IsClientJit { get; set; } = false; public CancellationTokenSource cancellationTokenSource { get; set; } = null; List skuRandomLetterArr = new List { "~", "#", "￥", "%", "&", "*", "(", ")", "（", "）", "+", "-", "_", "=", "【", "】", "·", "|", "《", "》" }; @@ -120,41 +121,107 @@ namespace TemuKJD.KJDForms.ProductSelectForms private void DbProductSelectListForm_Load(object sender, EventArgs e) { this.ucSplitPage1.PageChange += UcSplitPage1_PageChange; - this.dgvSelectProduct.AddSelectorColumn("colSelect"); + //var chkSel = this.dgvSelectProduct.AddSelectorColumn("colSelect"); + var chkSel = this.dgvSelectProduct.Columns["colSelect"].AddHeaderCheckBox(HorizontalAlignment.Center, 0, 0, null, null, false, null, true); + chkSel.CheckedChanged += ChkSel_CheckedChanged; this.dgvSelectProduct.AddImgColumn("colProductSkcPic", "colImgUrl"); dgvSelectProduct.Columns["colSubSaNick"].Visible = false; dgvSelectProduct.Columns["colDelete"].Visible = false; chkShowDel.Visible = false; + btnReFission.Visible = false; btnSetSubSa.Visible = false; chkNoSubSa.Visible = false; - btnReFission.Visible = false; + tableLayoutPanel1.Width += 86; chkUploadProd.Visible = false; // 直接上传 flowLayoutPanel1.Visible = false; // 一些测试操作项目显示在此处 chkUploadProd.Visible = true; flowLayoutPanel1.Visible = true; - if (BaseClass.SaLevel == 1) + if (BaseClass.SaLevel == 1 && !IsClientJit) { dgvSelectProduct.Columns["colSubSaNick"].Visible = true; chkShowDel.Visible = true; + btnReFission.Visible = true; btnSetSubSa.Visible = true; chkNoSubSa.Visible = true; - btnReFission.Visible = true; + tableLayoutPanel1.Width -= 86; //chkReFissionAllProdName.Checked = true; //chkRandomSkuOrder.Checked = true; //chkSkuRandomPrice.Checked = true; } + if (IsClientJit) + { + chkShowDel.Visible = true; + btnReFission.Visible = true; + cmbUserNotes.Visible = false; + lblUserNotes.Visible = false; + colUserNotes.Visible = false; + 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; + int colsWidth = 0; + foreach(DataGridViewColumn col in dgvSelectProduct.Columns) + { + if (col.Visible) + { + colsWidth += col.Width; + } + } + if (dgvSelectProduct.Width - colsWidth - dgvSelectProduct.RowHeadersWidth > 0) + { + colOpResult.Width += dgvSelectProduct.Width - colsWidth - dgvSelectProduct.RowHeadersWidth; + } + } + this.lblSkuRandomLetterNotes.Text = "备注：SKU特殊字符包括 " + string.Join(" ", skuRandomLetterArr) + " "; } + private void ChkSel_CheckedChanged(object sender, EventArgs e) + { + var chkSelectAll = sender as CheckBox; + if (!chkSelectAll.Checked) + { + foreach (DataGridViewRow row in dgvSelectProduct.Rows) + { + row.Cells["colSelect"].Value = false; + } + } + else + { + if (IsClientJit) + { + foreach (DataGridViewRow row in dgvSelectProduct.Rows) + { + var shopId = row.Cells["colSupplierId"].Value.ParseToString(); + var clientShop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId); + if (clientShop != null && clientShop.jit_expire_time >= DateTime.Now.Date) + { + row.Cells["colSelect"].Value = true; + } + } + } + else + { + foreach (DataGridViewRow row in dgvSelectProduct.Rows) + { + row.Cells["colSelect"].Value = true; + } + } + } + } + + bool isFirst = true; private void DbProductSelectListManageForm_VisibleChanged(object sender, EventArgs e) { - if (this.Visible == true) + if (this.Visible == true && isFirst) { + isFirst = false; this.pbLoading.Visible = true; SearchDbProdSelect(this.ucSplitPage1.CurrentPage); } @@ -246,6 +313,14 @@ namespace TemuKJD.KJDForms.ProductSelectForms dgvSelectProduct.Rows[rowIndex].Height = 60; displayLoginStatusColor(dgvSelectProduct.Rows[rowIndex].Cells["colLogin"], dgvSelectProduct.Rows[rowIndex].Cells["colLogin"].Value.ParseToString()); + if (IsClientJit) + { + var clientShop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == prodSelect.shop_id); + if (clientShop == null || clientShop.jit_expire_time.IsNullOrEmpty() || clientShop.jit_expire_time < DateTime.Now.Date) + { + dgvSelectProduct.Rows[rowIndex].DefaultCellStyle.ForeColor = Color.LightGray; + } + } })); } @@ -286,6 +361,8 @@ namespace TemuKJD.KJDForms.ProductSelectForms data += "&operate_sub_sa_name=" + BaseClass.UserName; if (chkNoSubSa.Checked) data += "&no_sub_sa=true"; + if (IsClientJit) + data += "&is_client_jit=true"; })); var html = GetHtml.PostUtf8(url, data); if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) @@ -333,6 +410,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.cmbStatus.Text = "待上传"; this.cmbNotes.Text = "全部"; this.cmbUserNotes.Text = "全部"; + this.chkNoSubSa.Checked = false; } private void dgvSelectProduct_CellContentClick(object sender, DataGridViewCellEventArgs e) @@ -343,7 +421,17 @@ namespace TemuKJD.KJDForms.ProductSelectForms var dbId = dgvSelectProduct.Rows[e.RowIndex].Cells["colSelectId"].Value.ParseToString(); var dbSelectProduct = lstAdminTemuDBProductSelect.FirstOrDefault(p => p.id.ToString() == dbId); var shopId = dgvSelectProduct.Rows[e.RowIndex].Cells["colSupplierId"].Value.ParseToString(); - var draftId = dgvSelectProduct.Rows[e.RowIndex].Cells["colDraftId"].Value.ParseToString(); + var draftId = dgvSelectProduct.Rows[e.RowIndex].Cells["colDraftId"].Value.ParseToString(); + + if (IsClientJit) + { + var clientShop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId); + if (clientShop == null || clientShop.jit_expire_time.IsNullOrEmpty() || clientShop.jit_expire_time < DateTime.Now.Date) + { + BaseMsgForm.ShowError("JIT卡密过期或未开通", "JIT商品上传-操作失败"); + return; + } + } switch (headerText) { @@ -358,6 +446,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms break; case "编辑备注": DbProductSelectEditNotesForm editForm = new DbProductSelectEditNotesForm(dbSelectProduct); + editForm.IsClientJit = this.IsClientJit; editForm.ShowDialog(); dgvSelectProduct.Rows[e.RowIndex].Cells["colNotes"].Value = dbSelectProduct.notes; dgvSelectProduct.Rows[e.RowIndex].Cells["colUserNotes"].Value = dbSelectProduct.user_notes; @@ -373,57 +462,68 @@ namespace TemuKJD.KJDForms.ProductSelectForms case "草稿箱Id": if (!string.IsNullOrEmpty(draftId)) { - var shop = GetShop(shopId); - AdminShopLoginForm adminLoginForm = new AdminShopLoginForm(shop); - //adminLoginForm.InitUrl = "https://seller.kuajingmaihuo.com/goods/product-create/product-edit?productDraftId=" + - adminLoginForm.InitUrl = "https://agentseller.temu.com/goods/edit?productDraftId=" + - draftId + "&from=productDraftList"; - adminLoginForm.openType = EnumOpenType.manage; - adminLoginForm.WindowState = FormWindowState.Maximized; - adminLoginForm.ShowDialog(); - return; - - var url = BaseClass.BuildObjString("product/get_select_product_map_draft_id_list"); - var data = UserLogin.GetSignaturex() + "&select_db_id=" + dbId; - - var html = GetHtml.PostUtf8(url, data); - if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) - html = GetHtml.PostUtf8(url, data); - if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) - html = GetHtml.PostUtf8(url, data); - if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) - { - } - else + if (!IsClientJit) { + var shop = GetShop(shopId); + AdminShopLoginForm adminLoginForm = new AdminShopLoginForm(shop); + //adminLoginForm.InitUrl = "https://seller.kuajingmaihuo.com/goods/product-create/product-edit?productDraftId=" + + adminLoginForm.InitUrl = "https://agentseller.temu.com/goods/edit?productDraftId=" + + draftId + "&from=productDraftList"; + adminLoginForm.openType = EnumOpenType.manage; + adminLoginForm.WindowState = FormWindowState.Maximized; + adminLoginForm.ShowDialog(); } + // 查看map映射列表 + //return; + //var url = BaseClass.BuildObjString("product/get_select_product_map_draft_id_list"); + //var data = UserLogin.GetSignaturex() + "&select_db_id=" + dbId; + //if (IsClientJit) + // data += "&is_client_jit=true"; + + //var html = GetHtml.PostUtf8(url, data); + //if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) + // html = GetHtml.PostUtf8(url, data); + //if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) + // html = GetHtml.PostUtf8(url, data); + //if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) + //{ + //} + //else + //{ + //} } break; case "进店": { - var shop = GetShop(shopId); - AdminShopLoginForm adminLoginForm = new AdminShopLoginForm(shop); - //adminLoginForm.InitUrl = "https://seller.kuajingmaihuo.com/goods/product/draft"; - adminLoginForm.InitUrl = "https://agentseller.temu.com/goods/draft"; - adminLoginForm.openType = EnumOpenType.manage; - adminLoginForm.WindowState = FormWindowState.Maximized; - adminLoginForm.ShowDialog(); + if (!IsClientJit) + { + var shop = GetShop(shopId); + AdminShopLoginForm adminLoginForm = new AdminShopLoginForm(shop); + //adminLoginForm.InitUrl = "https://seller.kuajingmaihuo.com/goods/product/draft"; + adminLoginForm.InitUrl = "https://agentseller.temu.com/goods/draft"; + adminLoginForm.openType = EnumOpenType.manage; + adminLoginForm.WindowState = FormWindowState.Maximized; + adminLoginForm.ShowDialog(); + } } break; case "登录": { - var shop = GetShop(shopId); - // 登录店铺 - AdminShopLoginForm shopLoginForm = new AdminShopLoginForm(shop); - shopLoginForm.openType = EnumOpenType.login; - shopLoginForm.SaveComplete += ShopLoginForm_SaveComplete; - shopLoginForm.ShowDialog(); - foreach (DataGridViewRow row in this.dgvSelectProduct.Rows) + if (!IsClientJit) { - if (row.Cells["colSupplierId"].Value.ParseToString() == shop.ShopId) + var shop = GetShop(shopId); + // 登录店铺 + AdminShopLoginForm shopLoginForm = new AdminShopLoginForm(shop); + shopLoginForm.openType = EnumOpenType.login; + shopLoginForm.SaveComplete += ShopLoginForm_SaveComplete; + shopLoginForm.ShowDialog(); + foreach (DataGridViewRow row in this.dgvSelectProduct.Rows) { - row.Cells["colLogin"].Value = shop.LoginStatus2 == "国际版在线" ? "在线" : "登录"; - displayLoginStatusColor(row.Cells["colLogin"], row.Cells["colLogin"].Value.ParseToString()); + if (row.Cells["colSupplierId"].Value.ParseToString() == shop.ShopId) + { + row.Cells["colLogin"].Value = shop.LoginStatus2 == "国际版在线" ? "在线" : "登录"; + displayLoginStatusColor(row.Cells["colLogin"], row.Cells["colLogin"].Value.ParseToString()); + } } } } @@ -503,6 +603,8 @@ namespace TemuKJD.KJDForms.ProductSelectForms var url = BaseClass.BuildObjString("product/del_select_product"); var data = UserLogin.GetSignaturex() + "&db_id=" + dbId; + if (IsClientJit) + data += "&is_client_jit=true"; var html = GetHtml.PostUtf8(url, data); if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) html = GetHtml.PostUtf8(url, data); @@ -599,6 +701,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms }); } + int timeOutSeconds = 120; void AddProductDraft(TemuDBProductSelect[] prodSelect) { if (prodSelect == null || prodSelect.Count() == 0) @@ -697,6 +800,8 @@ namespace TemuKJD.KJDForms.ProductSelectForms var empty_data = UserLogin.GetSignaturex() + "&db_id=" + prod.id + "&status=已清除"; + if (IsClientJit) + empty_data += "&is_client_jit=true"; GetHtml.PostUtf8(empty_url, empty_data); } @@ -710,20 +815,28 @@ namespace TemuKJD.KJDForms.ProductSelectForms } var result = ""; - try + var t = Task.Run(() => { - result = UploadProduct(shop, temuDBProd, prod, row.Cells["colOpResult"]); //将商品上传至草稿箱 - - if (result.Contains("登录过期") || result.Contains("Invalid Login State")) + try { - AdminShopListForm.Instance.CheckShopLogin(shopLst.Where(s => s.LoginName == shop.LoginName).ToArray(), false); + result = UploadProduct(shop, temuDBProd, prod, row.Cells["colOpResult"]); //将商品上传至草稿箱 + + if (result.Contains("登录过期") || result.Contains("Invalid Login State")) + { + AdminShopListForm.Instance.CheckShopLogin(shopLst.Where(s => s.LoginName == shop.LoginName).ToArray(), false); + } } - } - catch (Exception ex) + catch (Exception ex) + { + result = "{\"success\":false,\"status\":\"未上传\",\"errMsg\":\"" + ex.Message + "\"}"; + } + }); + t.Wait(timeOutSeconds * 1000); + if (!t.IsCompleted) { - result = "{\"success\":false,\"status\":\"未上传\",\"errMsg\":\"" + ex.Message + "\"}"; + result = "{\"success\":false,\"status\":\"未上传\",\"errMsg\":\"上传超时\"}"; } - Thread.Sleep(200); + Thread.Sleep(Randomx.GetId(200, 500)); var error = BaseRegex.GetStringJson(ref result, "errMsg"); if (!result.Contains("\"success\":true")) @@ -746,6 +859,8 @@ namespace TemuKJD.KJDForms.ProductSelectForms "&up_spu_id=" + prod.spu_id + "&shop_id=" + prod.shop_id + "&status=" + prod.status; + if (IsClientJit) + data += "&is_client_jit=true"; var html = GetHtml.PostUtf8(url, data); if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) @@ -3055,6 +3170,8 @@ Content-Disposition: form-data; name=""sign"" var empty_data = UserLogin.GetSignaturex() + "&db_id=" + prod.id + "&status=已清除"; + if (IsClientJit) + empty_data += "&is_client_jit=true"; GetHtml.PostUtf8(empty_url, empty_data); } @@ -3075,6 +3192,8 @@ Content-Disposition: form-data; name=""sign"" var data = UserLogin.GetSignaturex() + "&db_id=" + prod.id; data += "&fission_product_name=" + GetHtml.UrlEncodeUtf8(fissionProductName.Trim()); + if (IsClientJit) + data += "&is_client_jit=true"; var html = GetHtml.PostUtf8(url, data); if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) html = GetHtml.PostUtf8(url, data); @@ -3293,5 +3412,10 @@ Content-Disposition: form-data; name=""sign"" this.btnAdd.Enabled = true; } } + + private void numMaxWaitSecond_ValueChanged(object sender, EventArgs e) + { + this.timeOutSeconds = numMaxWaitSecond.Value.ParseToInt(); + } } } diff --git a/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.Designer.cs b/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.Designer.cs index 0f52cc5..12aee35 100644 --- a/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.Designer.cs +++ b/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.Designer.cs @@ -42,14 +42,34 @@ 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.btnSearch = new DevComponents.DotNetBar.PanelEx(); this.label14 = new System.Windows.Forms.Label(); - this.btnAdd = new DevComponents.DotNetBar.PanelEx(); this.btnSetSubSa = new DevComponents.DotNetBar.PanelEx(); + this.btnAdd = new DevComponents.DotNetBar.PanelEx(); + this.pbFissionSetting = new System.Windows.Forms.PictureBox(); 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(); + this.txtSkuHeadText = new System.Windows.Forms.TextBox(); + this.label10 = new System.Windows.Forms.Label(); + this.txtSkuEndText = new System.Windows.Forms.TextBox(); + this.chkSkuRandomLetter = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.chkFission = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.chkHeadWords = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.chkEndWords = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.chkDeleteLowPriceSku = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.chkRandomSkuOrder = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.chkSkuRandomPrice = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.numSkuRandomPrice = new System.Windows.Forms.NumericUpDown(); + this.label11 = new System.Windows.Forms.Label(); this.label21 = new System.Windows.Forms.Label(); this.numUnitNum2 = new System.Windows.Forms.NumericUpDown(); this.numUnitNum1 = new System.Windows.Forms.NumericUpDown(); this.label20 = new System.Windows.Forms.Label(); + this.pnlEmpty = new DevComponents.DotNetBar.PanelEx(); this.numWeight2 = new System.Windows.Forms.NumericUpDown(); this.numWeight1 = new System.Windows.Forms.NumericUpDown(); this.label19 = new System.Windows.Forms.Label(); @@ -70,27 +90,11 @@ this.btnStop = new DevComponents.DotNetBar.PanelEx(); this.btnExport = new DevComponents.DotNetBar.PanelEx(); this.btnDel = new DevComponents.DotNetBar.PanelEx(); - this.pbFissionSetting = new System.Windows.Forms.PictureBox(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.btnSearch = new DevComponents.DotNetBar.PanelEx(); this.cmbUserNotes = new System.Windows.Forms.ComboBox(); this.cmbNotes = new System.Windows.Forms.ComboBox(); this.label13 = new System.Windows.Forms.Label(); this.cmbStatus = new System.Windows.Forms.ComboBox(); - this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); - this.label9 = new System.Windows.Forms.Label(); - this.txtSkuHeadText = new System.Windows.Forms.TextBox(); - this.label10 = new System.Windows.Forms.Label(); - this.txtSkuEndText = new System.Windows.Forms.TextBox(); - this.chkSkuRandomLetter = new TemuKJD.UserComponent.UcCheckBox(this.components); - this.chkFission = new TemuKJD.UserComponent.UcCheckBox(this.components); - this.chkHeadWords = new TemuKJD.UserComponent.UcCheckBox(this.components); - this.chkEndWords = new TemuKJD.UserComponent.UcCheckBox(this.components); - this.chkDeleteLowPriceSku = new TemuKJD.UserComponent.UcCheckBox(this.components); - this.chkRandomSkuOrder = new TemuKJD.UserComponent.UcCheckBox(this.components); - this.chkSkuRandomPrice = new TemuKJD.UserComponent.UcCheckBox(this.components); - this.numSkuRandomPrice = new System.Windows.Forms.NumericUpDown(); - this.label11 = new System.Windows.Forms.Label(); this.label6 = new System.Windows.Forms.Label(); this.txtShopId = new System.Windows.Forms.TextBox(); this.label7 = new System.Windows.Forms.Label(); @@ -106,11 +110,7 @@ this.label3 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label(); this.txtProdName = new System.Windows.Forms.TextBox(); - this.pnlEmpty = new DevComponents.DotNetBar.PanelEx(); this.label12 = new System.Windows.Forms.Label(); - this.chkNoSubSa = new TemuKJD.UserComponent.UcCheckBox(this.components); - this.chkShowDel = new TemuKJD.UserComponent.UcCheckBox(this.components); - this.chkUploadProd = 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(); @@ -154,6 +154,9 @@ this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); this.splitContainer1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pbFissionSetting)).BeginInit(); + this.flowLayoutPanel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numSkuRandomPrice)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numUnitNum2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numUnitNum1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numWeight2)).BeginInit(); @@ -166,10 +169,7 @@ ((System.ComponentModel.ISupportInitialize)(this.numLen1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numAddPrice)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numAddPriceTimes)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pbFissionSetting)).BeginInit(); this.tableLayoutPanel1.SuspendLayout(); - this.flowLayoutPanel1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.numSkuRandomPrice)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit(); this.splitContainer2.Panel1.SuspendLayout(); this.splitContainer2.Panel2.SuspendLayout(); @@ -191,14 +191,21 @@ // // splitContainer1.Panel1 // + this.splitContainer1.Panel1.Controls.Add(this.btnSearch); this.splitContainer1.Panel1.Controls.Add(this.label14); - this.splitContainer1.Panel1.Controls.Add(this.btnAdd); this.splitContainer1.Panel1.Controls.Add(this.btnSetSubSa); + this.splitContainer1.Panel1.Controls.Add(this.btnAdd); + this.splitContainer1.Panel1.Controls.Add(this.pbFissionSetting); 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); this.splitContainer1.Panel1.Controls.Add(this.numUnitNum2); this.splitContainer1.Panel1.Controls.Add(this.numUnitNum1); this.splitContainer1.Panel1.Controls.Add(this.label20); + this.splitContainer1.Panel1.Controls.Add(this.pnlEmpty); this.splitContainer1.Panel1.Controls.Add(this.numWeight2); this.splitContainer1.Panel1.Controls.Add(this.numWeight1); this.splitContainer1.Panel1.Controls.Add(this.label19); @@ -219,576 +226,25 @@ this.splitContainer1.Panel1.Controls.Add(this.btnStop); this.splitContainer1.Panel1.Controls.Add(this.btnExport); this.splitContainer1.Panel1.Controls.Add(this.btnDel); - this.splitContainer1.Panel1.Controls.Add(this.pbFissionSetting); this.splitContainer1.Panel1.Controls.Add(this.tableLayoutPanel1); // // splitContainer1.Panel2 // this.splitContainer1.Panel2.Controls.Add(this.splitContainer2); - this.splitContainer1.Size = new System.Drawing.Size(1534, 638); - this.splitContainer1.SplitterDistance = 100; + this.splitContainer1.Size = new System.Drawing.Size(1518, 638); + this.splitContainer1.SplitterDistance = 96; this.splitContainer1.TabIndex = 2; // - // label14 - // - this.label14.AutoSize = true; - this.label14.Font = new System.Drawing.Font("微软雅黑", 8F); - this.label14.ForeColor = System.Drawing.SystemColors.MenuHighlight; - this.label14.Location = new System.Drawing.Point(959, 75); - this.label14.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(277, 16); - this.label14.TabIndex = 640; - this.label14.Text = "备注：新的商品上传货号为固定前缀 EC + 上家商品SKC"; - // - // btnAdd - // - this.btnAdd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btnAdd.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnAdd.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnAdd.DisabledBackColor = System.Drawing.Color.Empty; - this.btnAdd.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnAdd.Location = new System.Drawing.Point(1440, 8); - this.btnAdd.Name = "btnAdd"; - this.btnAdd.Size = new System.Drawing.Size(90, 26); - this.btnAdd.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnAdd.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnAdd.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnAdd.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.btnAdd.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.btnAdd.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.btnAdd.Style.ForeColor.Color = System.Drawing.Color.White; - this.btnAdd.Style.GradientAngle = 90; - this.btnAdd.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnAdd.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnAdd.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnAdd.TabIndex = 457; - this.btnAdd.Text = "一键上传"; - this.btnAdd.Click += new System.EventHandler(this.btnAdd_Click); - // - // btnSetSubSa - // - this.btnSetSubSa.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btnSetSubSa.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnSetSubSa.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnSetSubSa.DisabledBackColor = System.Drawing.Color.Empty; - this.btnSetSubSa.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSetSubSa.Location = new System.Drawing.Point(1348, 8); - this.btnSetSubSa.Name = "btnSetSubSa"; - this.btnSetSubSa.Size = new System.Drawing.Size(90, 26); - this.btnSetSubSa.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnSetSubSa.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnSetSubSa.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnSetSubSa.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.btnSetSubSa.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.btnSetSubSa.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.btnSetSubSa.Style.ForeColor.Color = System.Drawing.Color.White; - this.btnSetSubSa.Style.GradientAngle = 90; - this.btnSetSubSa.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnSetSubSa.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnSetSubSa.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnSetSubSa.TabIndex = 453; - this.btnSetSubSa.Text = "分配二级超管"; - this.btnSetSubSa.Click += new System.EventHandler(this.btnSetSubSa_Click); - // - // btnReFission - // - this.btnReFission.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btnReFission.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnReFission.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnReFission.DisabledBackColor = System.Drawing.Color.Empty; - this.btnReFission.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnReFission.Location = new System.Drawing.Point(1256, 8); - this.btnReFission.Name = "btnReFission"; - this.btnReFission.Size = new System.Drawing.Size(90, 26); - this.btnReFission.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnReFission.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnReFission.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnReFission.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.btnReFission.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.btnReFission.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.btnReFission.Style.ForeColor.Color = System.Drawing.Color.White; - this.btnReFission.Style.GradientAngle = 90; - this.btnReFission.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnReFission.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnReFission.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnReFission.TabIndex = 449; - this.btnReFission.Text = "批量重组标题"; - this.btnReFission.Click += new System.EventHandler(this.btnReFission_Click); - // - // label21 - // - this.label21.AutoSize = true; - this.label21.Location = new System.Drawing.Point(621, 75); - this.label21.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.label21.Name = "label21"; - this.label21.Size = new System.Drawing.Size(32, 17); - this.label21.TabIndex = 630; - this.label21.Text = "数量"; - // - // numUnitNum2 - // - this.numUnitNum2.Location = new System.Drawing.Point(696, 72); - this.numUnitNum2.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); - this.numUnitNum2.Maximum = new decimal(new int[] { - 600, - 0, - 0, - 0}); - this.numUnitNum2.Name = "numUnitNum2"; - this.numUnitNum2.Size = new System.Drawing.Size(42, 23); - this.numUnitNum2.TabIndex = 629; - this.numUnitNum2.Value = new decimal(new int[] { - 600, - 0, - 0, - 0}); - // - // numUnitNum1 - // - this.numUnitNum1.Location = new System.Drawing.Point(653, 72); - this.numUnitNum1.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); - this.numUnitNum1.Maximum = new decimal(new int[] { - 600, - 0, - 0, - 0}); - this.numUnitNum1.Name = "numUnitNum1"; - this.numUnitNum1.Size = new System.Drawing.Size(42, 23); - this.numUnitNum1.TabIndex = 628; - this.numUnitNum1.Value = new decimal(new int[] { - 450, - 0, - 0, - 0}); - // - // label20 - // - this.label20.AutoSize = true; - this.label20.Location = new System.Drawing.Point(487, 75); - this.label20.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(20, 17); - this.label20.TabIndex = 627; - this.label20.Text = "重"; - // - // numWeight2 - // - this.numWeight2.Location = new System.Drawing.Point(563, 72); - this.numWeight2.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); - this.numWeight2.Maximum = new decimal(new int[] { - 99999, - 0, - 0, - 0}); - this.numWeight2.Name = "numWeight2"; - this.numWeight2.Size = new System.Drawing.Size(55, 23); - this.numWeight2.TabIndex = 626; - this.numWeight2.Value = new decimal(new int[] { - 99999, - 0, - 0, - 0}); - // - // numWeight1 - // - this.numWeight1.Location = new System.Drawing.Point(507, 72); - this.numWeight1.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); - this.numWeight1.Maximum = new decimal(new int[] { - 99999, - 0, - 0, - 0}); - this.numWeight1.Name = "numWeight1"; - this.numWeight1.Size = new System.Drawing.Size(55, 23); - this.numWeight1.TabIndex = 625; - this.numWeight1.Value = new decimal(new int[] { - 80000, - 0, - 0, - 0}); - // - // label19 - // - this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(379, 75); - this.label19.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(20, 17); - this.label19.TabIndex = 624; - this.label19.Text = "高"; - // - // numHeight2 - // - this.numHeight2.Location = new System.Drawing.Point(442, 72); - this.numHeight2.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); - this.numHeight2.Maximum = new decimal(new int[] { - 299, - 0, - 0, - 0}); - this.numHeight2.Name = "numHeight2"; - this.numHeight2.Size = new System.Drawing.Size(42, 23); - this.numHeight2.TabIndex = 623; - this.numHeight2.Value = new decimal(new int[] { - 100, - 0, - 0, - 0}); - // - // numHeight1 - // - this.numHeight1.Location = new System.Drawing.Point(399, 72); - this.numHeight1.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); - this.numHeight1.Maximum = new decimal(new int[] { - 299, - 0, - 0, - 0}); - this.numHeight1.Name = "numHeight1"; - this.numHeight1.Size = new System.Drawing.Size(42, 23); - this.numHeight1.TabIndex = 622; - this.numHeight1.Value = new decimal(new int[] { - 50, - 0, - 0, - 0}); - // - // label18 - // - this.label18.AutoSize = true; - this.label18.Location = new System.Drawing.Point(271, 75); - this.label18.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(20, 17); - this.label18.TabIndex = 621; - this.label18.Text = "宽"; - // - // numWidth2 - // - this.numWidth2.Location = new System.Drawing.Point(334, 72); - this.numWidth2.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); - this.numWidth2.Maximum = new decimal(new int[] { - 299, - 0, - 0, - 0}); - this.numWidth2.Name = "numWidth2"; - this.numWidth2.Size = new System.Drawing.Size(42, 23); - this.numWidth2.TabIndex = 620; - this.numWidth2.Value = new decimal(new int[] { - 100, - 0, - 0, - 0}); - // - // numWidth1 - // - this.numWidth1.Location = new System.Drawing.Point(291, 72); - this.numWidth1.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); - this.numWidth1.Maximum = new decimal(new int[] { - 299, - 0, - 0, - 0}); - this.numWidth1.Name = "numWidth1"; - this.numWidth1.Size = new System.Drawing.Size(42, 23); - this.numWidth1.TabIndex = 619; - this.numWidth1.Value = new decimal(new int[] { - 55, - 0, - 0, - 0}); - // - // numLen2 - // - this.numLen2.Location = new System.Drawing.Point(226, 72); - this.numLen2.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); - this.numLen2.Maximum = new decimal(new int[] { - 299, - 0, - 0, - 0}); - this.numLen2.Name = "numLen2"; - this.numLen2.Size = new System.Drawing.Size(42, 23); - this.numLen2.TabIndex = 618; - this.numLen2.Value = new decimal(new int[] { - 100, - 0, - 0, - 0}); - // - // numLen1 - // - this.numLen1.Location = new System.Drawing.Point(183, 72); - this.numLen1.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); - this.numLen1.Maximum = new decimal(new int[] { - 299, - 0, - 0, - 0}); - this.numLen1.Name = "numLen1"; - this.numLen1.Size = new System.Drawing.Size(42, 23); - this.numLen1.TabIndex = 617; - this.numLen1.Value = new decimal(new int[] { - 60, - 0, - 0, - 0}); - // - // label15 - // - this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(164, 75); - 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); - this.label15.TabIndex = 616; - this.label15.Text = "长"; - // - // label17 - // - this.label17.AutoSize = true; - this.label17.Location = new System.Drawing.Point(933, 75); - this.label17.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(20, 17); - this.label17.TabIndex = 614; - this.label17.Text = "元"; - // - // numAddPrice - // - this.numAddPrice.DecimalPlaces = 2; - this.numAddPrice.Increment = new decimal(new int[] { - 1, - 0, - 0, - 131072}); - this.numAddPrice.Location = new System.Drawing.Point(889, 72); - this.numAddPrice.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); - this.numAddPrice.Name = "numAddPrice"; - this.numAddPrice.Size = new System.Drawing.Size(44, 23); - this.numAddPrice.TabIndex = 613; - this.numAddPrice.Value = new decimal(new int[] { - 5, - 0, - 0, - 0}); - // - // label16 - // - this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(843, 75); - this.label16.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(48, 17); - this.label16.TabIndex = 612; - this.label16.Text = "倍 再加"; - // - // numAddPriceTimes - // - this.numAddPriceTimes.DecimalPlaces = 2; - this.numAddPriceTimes.Increment = new decimal(new int[] { - 1, - 0, - 0, - 131072}); - this.numAddPriceTimes.Location = new System.Drawing.Point(799, 72); - this.numAddPriceTimes.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); - this.numAddPriceTimes.Name = "numAddPriceTimes"; - this.numAddPriceTimes.Size = new System.Drawing.Size(44, 23); - this.numAddPriceTimes.TabIndex = 611; - this.numAddPriceTimes.Value = new decimal(new int[] { - 20, - 0, - 0, - 65536}); - // - // chkChangeSizeAndNumber - // - this.chkChangeSizeAndNumber.AutoSize = true; - this.chkChangeSizeAndNumber.Location = new System.Drawing.Point(6, 73); - this.chkChangeSizeAndNumber.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.chkChangeSizeAndNumber.Name = "chkChangeSizeAndNumber"; - this.chkChangeSizeAndNumber.Size = new System.Drawing.Size(159, 21); - this.chkChangeSizeAndNumber.TabIndex = 610; - this.chkChangeSizeAndNumber.Text = "修改包装尺寸和单品数量"; - this.chkChangeSizeAndNumber.UseVisualStyleBackColor = true; - // - // chkAddPrice - // - this.chkAddPrice.AutoSize = true; - this.chkAddPrice.Location = new System.Drawing.Point(755, 73); - this.chkAddPrice.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.chkAddPrice.Name = "chkAddPrice"; - this.chkAddPrice.Size = new System.Drawing.Size(51, 21); - this.chkAddPrice.TabIndex = 615; - this.chkAddPrice.Text = "加价"; - this.chkAddPrice.UseVisualStyleBackColor = true; - // - // btnStop - // - this.btnStop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - 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(1440, 39); - this.btnStop.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); - this.btnStop.Name = "btnStop"; - this.btnStop.Size = new System.Drawing.Size(90, 26); - this.btnStop.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnStop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); - this.btnStop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); - this.btnStop.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.btnStop.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnStop.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.btnStop.Style.GradientAngle = 90; - this.btnStop.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; - this.btnStop.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnStop.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnStop.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnStop.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; - this.btnStop.TabIndex = 511; - this.btnStop.Text = "停止上传"; - this.btnStop.Click += new System.EventHandler(this.btnStop_Click); - // - // btnExport - // - this.btnExport.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btnExport.CanvasColor = System.Drawing.SystemColors.Control; - this.btnExport.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnExport.DisabledBackColor = System.Drawing.Color.Empty; - this.btnExport.Location = new System.Drawing.Point(1348, 39); - this.btnExport.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); - this.btnExport.Name = "btnExport"; - this.btnExport.Size = new System.Drawing.Size(90, 26); - this.btnExport.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnExport.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); - this.btnExport.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); - this.btnExport.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.btnExport.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnExport.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.btnExport.Style.GradientAngle = 90; - this.btnExport.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; - this.btnExport.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnExport.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnExport.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnExport.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; - this.btnExport.TabIndex = 498; - this.btnExport.Text = "导出数据表格"; - this.btnExport.Click += new System.EventHandler(this.btnExport_Click); - // - // btnDel - // - this.btnDel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btnDel.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnDel.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnDel.DisabledBackColor = System.Drawing.Color.Empty; - this.btnDel.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnDel.Location = new System.Drawing.Point(1256, 39); - this.btnDel.Name = "btnDel"; - this.btnDel.Size = new System.Drawing.Size(90, 26); - this.btnDel.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnDel.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnDel.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnDel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.btnDel.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.btnDel.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.btnDel.Style.ForeColor.Color = System.Drawing.Color.White; - this.btnDel.Style.GradientAngle = 90; - this.btnDel.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnDel.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnDel.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnDel.TabIndex = 445; - this.btnDel.Text = "批量删除选中"; - this.btnDel.Visible = false; - this.btnDel.Click += new System.EventHandler(this.btnDel_Click); - // - // pbFissionSetting - // - this.pbFissionSetting.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.pbFissionSetting.Image = global::TemuKJD.Properties.Resources.齿轮; - this.pbFissionSetting.Location = new System.Drawing.Point(1236, 8); - this.pbFissionSetting.Name = "pbFissionSetting"; - this.pbFissionSetting.Size = new System.Drawing.Size(26, 26); - this.pbFissionSetting.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.pbFissionSetting.TabIndex = 191; - this.pbFissionSetting.TabStop = false; - this.pbFissionSetting.Visible = false; - this.pbFissionSetting.Click += new System.EventHandler(this.pbFissionSetting_Click); - // - // tableLayoutPanel1 - // - this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.tableLayoutPanel1.ColumnCount = 22; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.0001F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.0001F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.0001F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.0001F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.0001F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.0001F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.0001F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.0001F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.0001F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 9.999102F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel1.Controls.Add(this.btnSearch, 20, 0); - this.tableLayoutPanel1.Controls.Add(this.cmbUserNotes, 19, 0); - this.tableLayoutPanel1.Controls.Add(this.cmbNotes, 17, 0); - this.tableLayoutPanel1.Controls.Add(this.label13, 16, 0); - this.tableLayoutPanel1.Controls.Add(this.cmbStatus, 15, 0); - this.tableLayoutPanel1.Controls.Add(this.flowLayoutPanel1, 0, 1); - this.tableLayoutPanel1.Controls.Add(this.label6, 0, 0); - this.tableLayoutPanel1.Controls.Add(this.txtShopId, 1, 0); - this.tableLayoutPanel1.Controls.Add(this.label7, 2, 0); - this.tableLayoutPanel1.Controls.Add(this.label8, 14, 0); - this.tableLayoutPanel1.Controls.Add(this.txtShopName, 3, 0); - this.tableLayoutPanel1.Controls.Add(this.label5, 4, 0); - this.tableLayoutPanel1.Controls.Add(this.txtSKC, 7, 0); - this.tableLayoutPanel1.Controls.Add(this.txtSPU, 5, 0); - this.tableLayoutPanel1.Controls.Add(this.label1, 6, 0); - this.tableLayoutPanel1.Controls.Add(this.label2, 8, 0); - this.tableLayoutPanel1.Controls.Add(this.txtCat, 9, 0); - this.tableLayoutPanel1.Controls.Add(this.txtExtCode, 13, 0); - this.tableLayoutPanel1.Controls.Add(this.label3, 10, 0); - this.tableLayoutPanel1.Controls.Add(this.label4, 12, 0); - this.tableLayoutPanel1.Controls.Add(this.txtProdName, 11, 0); - this.tableLayoutPanel1.Controls.Add(this.pnlEmpty, 20, 1); - this.tableLayoutPanel1.Controls.Add(this.label12, 18, 0); - this.tableLayoutPanel1.Controls.Add(this.chkNoSubSa, 21, 0); - this.tableLayoutPanel1.Controls.Add(this.chkShowDel, 21, 1); - this.tableLayoutPanel1.Controls.Add(this.chkUploadProd, 18, 1); - this.tableLayoutPanel1.Location = new System.Drawing.Point(3, 2); - this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 2; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel1.Size = new System.Drawing.Size(1244, 66); - this.tableLayoutPanel1.TabIndex = 469; - // // btnSearch // - this.btnSearch.Anchor = System.Windows.Forms.AnchorStyles.None; + this.btnSearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.btnSearch.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnSearch.Cursor = System.Windows.Forms.Cursors.Hand; this.btnSearch.DisabledBackColor = System.Drawing.Color.Empty; this.btnSearch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSearch.Location = new System.Drawing.Point(1091, 6); + this.btnSearch.Location = new System.Drawing.Point(1164, 9); this.btnSearch.Name = "btnSearch"; - this.btnSearch.Size = new System.Drawing.Size(56, 24); + this.btnSearch.Size = new System.Drawing.Size(42, 24); this.btnSearch.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnSearch.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnSearch.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -804,69 +260,148 @@ this.btnSearch.Text = "搜索"; this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click); // - // cmbUserNotes + // label14 // - this.cmbUserNotes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.cmbUserNotes.FormattingEnabled = true; - this.cmbUserNotes.Items.AddRange(new object[] { - "全部", - "重上", - "已买"}); - this.cmbUserNotes.Location = new System.Drawing.Point(1026, 8); - this.cmbUserNotes.Margin = new System.Windows.Forms.Padding(0); - this.cmbUserNotes.Name = "cmbUserNotes"; - this.cmbUserNotes.Size = new System.Drawing.Size(62, 25); - this.cmbUserNotes.TabIndex = 466; - this.cmbUserNotes.Text = "全部"; + this.label14.AutoSize = true; + this.label14.Font = new System.Drawing.Font("微软雅黑", 8F); + this.label14.ForeColor = System.Drawing.SystemColors.MenuHighlight; + this.label14.Location = new System.Drawing.Point(959, 71); + this.label14.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label14.Name = "label14"; + this.label14.Size = new System.Drawing.Size(278, 16); + this.label14.TabIndex = 640; + this.label14.Text = "备注：新的商品上传货号为固定前缀 EC + 上家商品SKC"; // - // cmbNotes + // btnSetSubSa // - this.cmbNotes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.cmbNotes.FormattingEnabled = true; - this.cmbNotes.Items.AddRange(new object[] { - "全部", - "无备注", - "核价成功", - "核价成功（重复）", - "重复"}); - this.cmbNotes.Location = new System.Drawing.Point(901, 8); - this.cmbNotes.Margin = new System.Windows.Forms.Padding(0); - this.cmbNotes.Name = "cmbNotes"; - this.cmbNotes.Size = new System.Drawing.Size(63, 25); - this.cmbNotes.TabIndex = 467; - this.cmbNotes.Text = "全部"; + this.btnSetSubSa.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnSetSubSa.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnSetSubSa.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnSetSubSa.DisabledBackColor = System.Drawing.Color.Empty; + this.btnSetSubSa.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnSetSubSa.Location = new System.Drawing.Point(1076, 38); + this.btnSetSubSa.Name = "btnSetSubSa"; + this.btnSetSubSa.Size = new System.Drawing.Size(86, 24); + this.btnSetSubSa.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnSetSubSa.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnSetSubSa.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnSetSubSa.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnSetSubSa.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnSetSubSa.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnSetSubSa.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnSetSubSa.Style.GradientAngle = 90; + this.btnSetSubSa.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnSetSubSa.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnSetSubSa.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnSetSubSa.TabIndex = 453; + this.btnSetSubSa.Text = "分配二级超管"; + this.btnSetSubSa.Click += new System.EventHandler(this.btnSetSubSa_Click); // - // label13 + // btnAdd // - this.label13.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(869, 9); - this.label13.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(32, 17); - this.label13.TabIndex = 461; - this.label13.Text = "备注"; + this.btnAdd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnAdd.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnAdd.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnAdd.DisabledBackColor = System.Drawing.Color.Empty; + this.btnAdd.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnAdd.Location = new System.Drawing.Point(1428, 9); + this.btnAdd.Name = "btnAdd"; + this.btnAdd.Size = new System.Drawing.Size(86, 24); + this.btnAdd.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnAdd.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnAdd.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnAdd.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnAdd.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnAdd.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnAdd.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnAdd.Style.GradientAngle = 90; + this.btnAdd.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnAdd.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnAdd.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnAdd.TabIndex = 457; + this.btnAdd.Text = "一键上传"; + this.btnAdd.Click += new System.EventHandler(this.btnAdd_Click); // - // cmbStatus + // pbFissionSetting // - this.cmbStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.cmbStatus.FormattingEnabled = true; - this.cmbStatus.Items.AddRange(new object[] { - "待上传", - "已上传", - "草稿箱", - "全部"}); - this.cmbStatus.Location = new System.Drawing.Point(800, 8); - this.cmbStatus.Margin = new System.Windows.Forms.Padding(0); - this.cmbStatus.Name = "cmbStatus"; - this.cmbStatus.Size = new System.Drawing.Size(63, 25); - this.cmbStatus.TabIndex = 465; - this.cmbStatus.Text = "待上传"; + this.pbFissionSetting.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.pbFissionSetting.Image = global::TemuKJD.Properties.Resources.齿轮; + this.pbFissionSetting.Location = new System.Drawing.Point(1164, 38); + this.pbFissionSetting.Name = "pbFissionSetting"; + this.pbFissionSetting.Size = new System.Drawing.Size(24, 24); + this.pbFissionSetting.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pbFissionSetting.TabIndex = 191; + this.pbFissionSetting.TabStop = false; + this.pbFissionSetting.Visible = false; + this.pbFissionSetting.Click += new System.EventHandler(this.pbFissionSetting_Click); + // + // btnReFission + // + this.btnReFission.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnReFission.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnReFission.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnReFission.DisabledBackColor = System.Drawing.Color.Empty; + this.btnReFission.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnReFission.Location = new System.Drawing.Point(1188, 38); + this.btnReFission.Name = "btnReFission"; + this.btnReFission.Size = new System.Drawing.Size(62, 24); + this.btnReFission.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnReFission.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnReFission.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnReFission.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnReFission.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnReFission.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnReFission.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnReFission.Style.GradientAngle = 90; + this.btnReFission.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnReFission.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnReFission.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnReFission.TabIndex = 449; + this.btnReFission.Text = "重组标题"; + this.btnReFission.Click += new System.EventHandler(this.btnReFission_Click); + // + // chkShowDel + // + this.chkShowDel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.chkShowDel.AutoSize = true; + this.chkShowDel.Location = new System.Drawing.Point(1259, 11); + this.chkShowDel.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.chkShowDel.Name = "chkShowDel"; + this.chkShowDel.Size = new System.Drawing.Size(75, 21); + this.chkShowDel.TabIndex = 471; + this.chkShowDel.Text = "显示删除"; + 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))); + this.chkUploadProd.Checked = true; + this.chkUploadProd.CheckState = System.Windows.Forms.CheckState.Checked; + this.chkUploadProd.Location = new System.Drawing.Point(1343, 11); + this.chkUploadProd.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.chkUploadProd.Name = "chkUploadProd"; + this.chkUploadProd.Size = new System.Drawing.Size(81, 21); + this.chkUploadProd.TabIndex = 471; + this.chkUploadProd.Text = "上传未发布"; + this.chkUploadProd.UseVisualStyleBackColor = true; // // flowLayoutPanel1 // - this.flowLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.tableLayoutPanel1.SetColumnSpan(this.flowLayoutPanel1, 18); + this.flowLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.flowLayoutPanel1.Controls.Add(this.label9); this.flowLayoutPanel1.Controls.Add(this.txtSkuHeadText); this.flowLayoutPanel1.Controls.Add(this.label10); @@ -880,10 +415,10 @@ this.flowLayoutPanel1.Controls.Add(this.chkSkuRandomPrice); this.flowLayoutPanel1.Controls.Add(this.numSkuRandomPrice); this.flowLayoutPanel1.Controls.Add(this.label11); - this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 36); + this.flowLayoutPanel1.Location = new System.Drawing.Point(2, 36); this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(0); this.flowLayoutPanel1.Name = "flowLayoutPanel1"; - this.flowLayoutPanel1.Size = new System.Drawing.Size(964, 30); + this.flowLayoutPanel1.Size = new System.Drawing.Size(1072, 29); this.flowLayoutPanel1.TabIndex = 472; // // label9 @@ -1041,167 +576,72 @@ this.label11.TabIndex = 471; this.label11.Text = "元"; // - // label6 + // label21 // - this.label6.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(3, 9); - this.label6.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(44, 17); - this.label6.TabIndex = 449; - this.label6.Text = "店铺Id"; + this.label21.AutoSize = true; + this.label21.Location = new System.Drawing.Point(621, 71); + this.label21.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label21.Name = "label21"; + this.label21.Size = new System.Drawing.Size(32, 17); + this.label21.TabIndex = 630; + this.label21.Text = "数量"; // - // txtShopId + // numUnitNum2 // - this.txtShopId.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtShopId.Location = new System.Drawing.Point(47, 6); - this.txtShopId.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); - this.txtShopId.Name = "txtShopId"; - this.txtShopId.Size = new System.Drawing.Size(63, 23); - this.txtShopId.TabIndex = 448; + this.numUnitNum2.Location = new System.Drawing.Point(696, 68); + this.numUnitNum2.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numUnitNum2.Maximum = new decimal(new int[] { + 600, + 0, + 0, + 0}); + this.numUnitNum2.Name = "numUnitNum2"; + this.numUnitNum2.Size = new System.Drawing.Size(42, 23); + this.numUnitNum2.TabIndex = 629; + this.numUnitNum2.Value = new decimal(new int[] { + 600, + 0, + 0, + 0}); // - // label7 + // numUnitNum1 // - this.label7.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(116, 9); - this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(56, 17); - this.label7.TabIndex = 452; - this.label7.Text = "店铺名称"; + this.numUnitNum1.Location = new System.Drawing.Point(653, 68); + this.numUnitNum1.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numUnitNum1.Maximum = new decimal(new int[] { + 600, + 0, + 0, + 0}); + this.numUnitNum1.Name = "numUnitNum1"; + this.numUnitNum1.Size = new System.Drawing.Size(42, 23); + this.numUnitNum1.TabIndex = 628; + this.numUnitNum1.Value = new decimal(new int[] { + 450, + 0, + 0, + 0}); // - // label8 + // label20 // - this.label8.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(744, 9); - this.label8.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(56, 17); - this.label8.TabIndex = 458; - this.label8.Text = "认领状态"; - // - // txtShopName - // - this.txtShopName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtShopName.Location = new System.Drawing.Point(172, 6); - this.txtShopName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); - this.txtShopName.Name = "txtShopName"; - this.txtShopName.Size = new System.Drawing.Size(63, 23); - this.txtShopName.TabIndex = 451; - // - // label5 - // - this.label5.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(241, 9); - this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(31, 17); - this.label5.TabIndex = 435; - this.label5.Text = "SPU"; - // - // txtSKC - // - this.txtSKC.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtSKC.Location = new System.Drawing.Point(372, 6); - this.txtSKC.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); - this.txtSKC.Name = "txtSKC"; - this.txtSKC.Size = new System.Drawing.Size(63, 23); - this.txtSKC.TabIndex = 432; - // - // txtSPU - // - this.txtSPU.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtSPU.Location = new System.Drawing.Point(272, 6); - this.txtSPU.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); - this.txtSPU.Name = "txtSPU"; - this.txtSPU.Size = new System.Drawing.Size(63, 23); - this.txtSPU.TabIndex = 434; - // - // label1 - // - this.label1.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(341, 9); - this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(31, 17); - this.label1.TabIndex = 433; - this.label1.Text = "SKC"; - // - // label2 - // - this.label2.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(441, 9); - 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.TabIndex = 426; - this.label2.Text = "类目"; - // - // txtCat - // - this.txtCat.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtCat.Location = new System.Drawing.Point(473, 6); - this.txtCat.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); - this.txtCat.Name = "txtCat"; - this.txtCat.Size = new System.Drawing.Size(63, 23); - this.txtCat.TabIndex = 425; - // - // txtExtCode - // - this.txtExtCode.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtExtCode.Location = new System.Drawing.Point(675, 6); - this.txtExtCode.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); - this.txtExtCode.Name = "txtExtCode"; - this.txtExtCode.Size = new System.Drawing.Size(63, 23); - this.txtExtCode.TabIndex = 429; - // - // label3 - // - this.label3.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(542, 9); - this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(32, 17); - this.label3.TabIndex = 428; - this.label3.Text = "标题"; - // - // label4 - // - this.label4.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(643, 9); - this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(32, 17); - this.label4.TabIndex = 430; - this.label4.Text = "货号"; - // - // txtProdName - // - this.txtProdName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtProdName.Location = new System.Drawing.Point(574, 6); - this.txtProdName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); - this.txtProdName.Name = "txtProdName"; - this.txtProdName.Size = new System.Drawing.Size(63, 23); - this.txtProdName.TabIndex = 427; + this.label20.AutoSize = true; + this.label20.Location = new System.Drawing.Point(487, 71); + this.label20.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label20.Name = "label20"; + this.label20.Size = new System.Drawing.Size(20, 17); + this.label20.TabIndex = 627; + this.label20.Text = "重"; // // pnlEmpty // - this.pnlEmpty.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.pnlEmpty.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.pnlEmpty.CanvasColor = System.Drawing.SystemColors.Control; this.pnlEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.pnlEmpty.DisabledBackColor = System.Drawing.Color.Empty; - this.pnlEmpty.Location = new System.Drawing.Point(1092, 40); + this.pnlEmpty.Location = new System.Drawing.Point(1208, 9); this.pnlEmpty.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); this.pnlEmpty.Name = "pnlEmpty"; - this.pnlEmpty.Size = new System.Drawing.Size(56, 22); + this.pnlEmpty.Size = new System.Drawing.Size(42, 24); this.pnlEmpty.Style.Alignment = System.Drawing.StringAlignment.Center; this.pnlEmpty.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); this.pnlEmpty.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); @@ -1215,59 +655,616 @@ this.pnlEmpty.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.pnlEmpty.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; this.pnlEmpty.TabIndex = 431; - this.pnlEmpty.Text = "清空条件"; + this.pnlEmpty.Text = "清空"; this.pnlEmpty.Click += new System.EventHandler(this.pnlEmpty_Click); // + // numWeight2 + // + this.numWeight2.Location = new System.Drawing.Point(563, 68); + this.numWeight2.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numWeight2.Maximum = new decimal(new int[] { + 99999, + 0, + 0, + 0}); + this.numWeight2.Name = "numWeight2"; + this.numWeight2.Size = new System.Drawing.Size(55, 23); + this.numWeight2.TabIndex = 626; + this.numWeight2.Value = new decimal(new int[] { + 99999, + 0, + 0, + 0}); + // + // numWeight1 + // + this.numWeight1.Location = new System.Drawing.Point(507, 68); + this.numWeight1.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numWeight1.Maximum = new decimal(new int[] { + 99999, + 0, + 0, + 0}); + this.numWeight1.Name = "numWeight1"; + this.numWeight1.Size = new System.Drawing.Size(55, 23); + this.numWeight1.TabIndex = 625; + this.numWeight1.Value = new decimal(new int[] { + 80000, + 0, + 0, + 0}); + // + // label19 + // + this.label19.AutoSize = true; + this.label19.Location = new System.Drawing.Point(379, 71); + this.label19.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label19.Name = "label19"; + this.label19.Size = new System.Drawing.Size(20, 17); + this.label19.TabIndex = 624; + this.label19.Text = "高"; + // + // numHeight2 + // + this.numHeight2.Location = new System.Drawing.Point(442, 68); + this.numHeight2.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numHeight2.Maximum = new decimal(new int[] { + 299, + 0, + 0, + 0}); + this.numHeight2.Name = "numHeight2"; + this.numHeight2.Size = new System.Drawing.Size(42, 23); + this.numHeight2.TabIndex = 623; + this.numHeight2.Value = new decimal(new int[] { + 100, + 0, + 0, + 0}); + // + // numHeight1 + // + this.numHeight1.Location = new System.Drawing.Point(399, 68); + this.numHeight1.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numHeight1.Maximum = new decimal(new int[] { + 299, + 0, + 0, + 0}); + this.numHeight1.Name = "numHeight1"; + this.numHeight1.Size = new System.Drawing.Size(42, 23); + this.numHeight1.TabIndex = 622; + this.numHeight1.Value = new decimal(new int[] { + 50, + 0, + 0, + 0}); + // + // label18 + // + this.label18.AutoSize = true; + this.label18.Location = new System.Drawing.Point(271, 71); + this.label18.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label18.Name = "label18"; + this.label18.Size = new System.Drawing.Size(20, 17); + this.label18.TabIndex = 621; + this.label18.Text = "宽"; + // + // numWidth2 + // + this.numWidth2.Location = new System.Drawing.Point(334, 68); + this.numWidth2.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numWidth2.Maximum = new decimal(new int[] { + 299, + 0, + 0, + 0}); + this.numWidth2.Name = "numWidth2"; + this.numWidth2.Size = new System.Drawing.Size(42, 23); + this.numWidth2.TabIndex = 620; + this.numWidth2.Value = new decimal(new int[] { + 100, + 0, + 0, + 0}); + // + // numWidth1 + // + this.numWidth1.Location = new System.Drawing.Point(291, 68); + this.numWidth1.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numWidth1.Maximum = new decimal(new int[] { + 299, + 0, + 0, + 0}); + this.numWidth1.Name = "numWidth1"; + this.numWidth1.Size = new System.Drawing.Size(42, 23); + this.numWidth1.TabIndex = 619; + this.numWidth1.Value = new decimal(new int[] { + 55, + 0, + 0, + 0}); + // + // numLen2 + // + this.numLen2.Location = new System.Drawing.Point(226, 68); + this.numLen2.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numLen2.Maximum = new decimal(new int[] { + 299, + 0, + 0, + 0}); + this.numLen2.Name = "numLen2"; + this.numLen2.Size = new System.Drawing.Size(42, 23); + this.numLen2.TabIndex = 618; + this.numLen2.Value = new decimal(new int[] { + 100, + 0, + 0, + 0}); + // + // numLen1 + // + this.numLen1.Location = new System.Drawing.Point(183, 68); + this.numLen1.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numLen1.Maximum = new decimal(new int[] { + 299, + 0, + 0, + 0}); + this.numLen1.Name = "numLen1"; + this.numLen1.Size = new System.Drawing.Size(42, 23); + this.numLen1.TabIndex = 617; + this.numLen1.Value = new decimal(new int[] { + 60, + 0, + 0, + 0}); + // + // label15 + // + this.label15.AutoSize = true; + this.label15.Location = new System.Drawing.Point(164, 71); + 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); + this.label15.TabIndex = 616; + this.label15.Text = "长"; + // + // label17 + // + this.label17.AutoSize = true; + this.label17.Location = new System.Drawing.Point(933, 71); + this.label17.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label17.Name = "label17"; + this.label17.Size = new System.Drawing.Size(20, 17); + this.label17.TabIndex = 614; + this.label17.Text = "元"; + // + // numAddPrice + // + this.numAddPrice.DecimalPlaces = 2; + this.numAddPrice.Increment = new decimal(new int[] { + 1, + 0, + 0, + 131072}); + this.numAddPrice.Location = new System.Drawing.Point(889, 68); + this.numAddPrice.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numAddPrice.Name = "numAddPrice"; + this.numAddPrice.Size = new System.Drawing.Size(44, 23); + this.numAddPrice.TabIndex = 613; + this.numAddPrice.Value = new decimal(new int[] { + 5, + 0, + 0, + 0}); + // + // label16 + // + this.label16.AutoSize = true; + this.label16.Location = new System.Drawing.Point(843, 71); + this.label16.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label16.Name = "label16"; + this.label16.Size = new System.Drawing.Size(48, 17); + this.label16.TabIndex = 612; + this.label16.Text = "倍 再加"; + // + // numAddPriceTimes + // + this.numAddPriceTimes.DecimalPlaces = 2; + this.numAddPriceTimes.Increment = new decimal(new int[] { + 1, + 0, + 0, + 131072}); + this.numAddPriceTimes.Location = new System.Drawing.Point(799, 68); + this.numAddPriceTimes.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numAddPriceTimes.Name = "numAddPriceTimes"; + this.numAddPriceTimes.Size = new System.Drawing.Size(44, 23); + this.numAddPriceTimes.TabIndex = 611; + this.numAddPriceTimes.Value = new decimal(new int[] { + 20, + 0, + 0, + 65536}); + // + // chkChangeSizeAndNumber + // + this.chkChangeSizeAndNumber.AutoSize = true; + this.chkChangeSizeAndNumber.Location = new System.Drawing.Point(6, 69); + this.chkChangeSizeAndNumber.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.chkChangeSizeAndNumber.Name = "chkChangeSizeAndNumber"; + this.chkChangeSizeAndNumber.Size = new System.Drawing.Size(159, 21); + this.chkChangeSizeAndNumber.TabIndex = 610; + this.chkChangeSizeAndNumber.Text = "修改包装尺寸和单品数量"; + this.chkChangeSizeAndNumber.UseVisualStyleBackColor = true; + // + // chkAddPrice + // + this.chkAddPrice.AutoSize = true; + this.chkAddPrice.Location = new System.Drawing.Point(755, 69); + this.chkAddPrice.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.chkAddPrice.Name = "chkAddPrice"; + this.chkAddPrice.Size = new System.Drawing.Size(51, 21); + this.chkAddPrice.TabIndex = 615; + this.chkAddPrice.Text = "加价"; + this.chkAddPrice.UseVisualStyleBackColor = true; + // + // btnStop + // + this.btnStop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + 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(1428, 38); + this.btnStop.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); + this.btnStop.Name = "btnStop"; + this.btnStop.Size = new System.Drawing.Size(86, 24); + this.btnStop.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnStop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnStop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnStop.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.btnStop.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnStop.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.btnStop.Style.GradientAngle = 90; + this.btnStop.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; + this.btnStop.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnStop.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnStop.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnStop.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.btnStop.TabIndex = 511; + this.btnStop.Text = "停止上传"; + this.btnStop.Click += new System.EventHandler(this.btnStop_Click); + // + // btnExport + // + this.btnExport.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnExport.CanvasColor = System.Drawing.SystemColors.Control; + this.btnExport.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnExport.DisabledBackColor = System.Drawing.Color.Empty; + this.btnExport.Location = new System.Drawing.Point(1340, 38); + this.btnExport.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); + this.btnExport.Name = "btnExport"; + this.btnExport.Size = new System.Drawing.Size(86, 24); + this.btnExport.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnExport.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnExport.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnExport.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.btnExport.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnExport.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.btnExport.Style.GradientAngle = 90; + this.btnExport.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; + this.btnExport.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnExport.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnExport.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnExport.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.btnExport.TabIndex = 498; + this.btnExport.Text = "导出数据表格"; + this.btnExport.Click += new System.EventHandler(this.btnExport_Click); + // + // btnDel + // + this.btnDel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnDel.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnDel.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnDel.DisabledBackColor = System.Drawing.Color.Empty; + this.btnDel.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnDel.Location = new System.Drawing.Point(1252, 38); + this.btnDel.Name = "btnDel"; + this.btnDel.Size = new System.Drawing.Size(86, 24); + this.btnDel.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnDel.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnDel.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnDel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnDel.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnDel.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnDel.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnDel.Style.GradientAngle = 90; + this.btnDel.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnDel.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnDel.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnDel.TabIndex = 445; + this.btnDel.Text = "批量删除选中"; + this.btnDel.Visible = false; + this.btnDel.Click += new System.EventHandler(this.btnDel_Click); + // + // tableLayoutPanel1 + // + this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.tableLayoutPanel1.ColumnCount = 20; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.0001F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.0001F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.0001F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.0001F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.0001F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.0001F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.0001F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.0001F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.0001F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 9.999102F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel1.Controls.Add(this.cmbUserNotes, 19, 0); + this.tableLayoutPanel1.Controls.Add(this.cmbNotes, 17, 0); + this.tableLayoutPanel1.Controls.Add(this.label13, 16, 0); + this.tableLayoutPanel1.Controls.Add(this.cmbStatus, 15, 0); + this.tableLayoutPanel1.Controls.Add(this.label6, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.txtShopId, 1, 0); + this.tableLayoutPanel1.Controls.Add(this.label7, 2, 0); + this.tableLayoutPanel1.Controls.Add(this.label8, 14, 0); + this.tableLayoutPanel1.Controls.Add(this.txtShopName, 3, 0); + this.tableLayoutPanel1.Controls.Add(this.label5, 4, 0); + this.tableLayoutPanel1.Controls.Add(this.txtSKC, 7, 0); + this.tableLayoutPanel1.Controls.Add(this.txtSPU, 5, 0); + this.tableLayoutPanel1.Controls.Add(this.label1, 6, 0); + this.tableLayoutPanel1.Controls.Add(this.label2, 8, 0); + this.tableLayoutPanel1.Controls.Add(this.txtCat, 9, 0); + this.tableLayoutPanel1.Controls.Add(this.txtExtCode, 13, 0); + this.tableLayoutPanel1.Controls.Add(this.label3, 10, 0); + this.tableLayoutPanel1.Controls.Add(this.label4, 12, 0); + this.tableLayoutPanel1.Controls.Add(this.txtProdName, 11, 0); + this.tableLayoutPanel1.Controls.Add(this.label12, 18, 0); + this.tableLayoutPanel1.Location = new System.Drawing.Point(2, 0); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 2; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel1.Size = new System.Drawing.Size(1072, 42); + this.tableLayoutPanel1.TabIndex = 469; + // + // cmbUserNotes + // + this.cmbUserNotes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.cmbUserNotes.FormattingEnabled = true; + this.cmbUserNotes.Items.AddRange(new object[] { + "全部", + "重上", + "已买"}); + this.cmbUserNotes.Location = new System.Drawing.Point(1008, 11); + this.cmbUserNotes.Margin = new System.Windows.Forms.Padding(0); + this.cmbUserNotes.Name = "cmbUserNotes"; + this.cmbUserNotes.Size = new System.Drawing.Size(64, 25); + this.cmbUserNotes.TabIndex = 466; + this.cmbUserNotes.Text = "全部"; + // + // cmbNotes + // + this.cmbNotes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.cmbNotes.FormattingEnabled = true; + this.cmbNotes.Items.AddRange(new object[] { + "全部", + "无备注", + "核价成功", + "核价成功（重复）", + "重复"}); + this.cmbNotes.Location = new System.Drawing.Point(885, 11); + this.cmbNotes.Margin = new System.Windows.Forms.Padding(0); + this.cmbNotes.Name = "cmbNotes"; + this.cmbNotes.Size = new System.Drawing.Size(61, 25); + this.cmbNotes.TabIndex = 467; + this.cmbNotes.Text = "全部"; + // + // label13 + // + this.label13.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.label13.AutoSize = true; + this.label13.Location = new System.Drawing.Point(853, 12); + this.label13.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(32, 17); + this.label13.TabIndex = 461; + this.label13.Text = "备注"; + // + // cmbStatus + // + this.cmbStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.cmbStatus.FormattingEnabled = true; + this.cmbStatus.Items.AddRange(new object[] { + "待上传", + "已上传", + "草稿箱", + "全部"}); + this.cmbStatus.Location = new System.Drawing.Point(786, 11); + this.cmbStatus.Margin = new System.Windows.Forms.Padding(0); + this.cmbStatus.Name = "cmbStatus"; + this.cmbStatus.Size = new System.Drawing.Size(61, 25); + this.cmbStatus.TabIndex = 465; + this.cmbStatus.Text = "待上传"; + // + // label6 + // + this.label6.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(3, 12); + this.label6.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(44, 17); + this.label6.TabIndex = 449; + this.label6.Text = "店铺Id"; + // + // txtShopId + // + this.txtShopId.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.txtShopId.Location = new System.Drawing.Point(47, 9); + this.txtShopId.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtShopId.Name = "txtShopId"; + this.txtShopId.Size = new System.Drawing.Size(61, 23); + this.txtShopId.TabIndex = 448; + // + // label7 + // + this.label7.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label7.AutoSize = true; + this.label7.Location = new System.Drawing.Point(114, 12); + this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(56, 17); + this.label7.TabIndex = 452; + this.label7.Text = "店铺名称"; + // + // label8 + // + this.label8.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label8.AutoSize = true; + this.label8.Location = new System.Drawing.Point(730, 12); + this.label8.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(56, 17); + this.label8.TabIndex = 458; + this.label8.Text = "认领状态"; + // + // txtShopName + // + this.txtShopName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.txtShopName.Location = new System.Drawing.Point(170, 9); + this.txtShopName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtShopName.Name = "txtShopName"; + this.txtShopName.Size = new System.Drawing.Size(61, 23); + this.txtShopName.TabIndex = 451; + // + // label5 + // + this.label5.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(237, 12); + this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(31, 17); + this.label5.TabIndex = 435; + this.label5.Text = "SPU"; + // + // txtSKC + // + this.txtSKC.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.txtSKC.Location = new System.Drawing.Point(366, 9); + this.txtSKC.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtSKC.Name = "txtSKC"; + this.txtSKC.Size = new System.Drawing.Size(61, 23); + this.txtSKC.TabIndex = 432; + // + // txtSPU + // + this.txtSPU.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.txtSPU.Location = new System.Drawing.Point(268, 9); + this.txtSPU.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtSPU.Name = "txtSPU"; + this.txtSPU.Size = new System.Drawing.Size(61, 23); + this.txtSPU.TabIndex = 434; + // + // label1 + // + this.label1.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(335, 12); + this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(31, 17); + this.label1.TabIndex = 433; + this.label1.Text = "SKC"; + // + // label2 + // + this.label2.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(433, 12); + 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.TabIndex = 426; + this.label2.Text = "类目"; + // + // txtCat + // + this.txtCat.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.txtCat.Location = new System.Drawing.Point(465, 9); + this.txtCat.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtCat.Name = "txtCat"; + this.txtCat.Size = new System.Drawing.Size(61, 23); + this.txtCat.TabIndex = 425; + // + // txtExtCode + // + this.txtExtCode.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.txtExtCode.Location = new System.Drawing.Point(663, 9); + this.txtExtCode.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtExtCode.Name = "txtExtCode"; + this.txtExtCode.Size = new System.Drawing.Size(61, 23); + this.txtExtCode.TabIndex = 429; + // + // label3 + // + this.label3.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(532, 12); + this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(32, 17); + this.label3.TabIndex = 428; + this.label3.Text = "标题"; + // + // label4 + // + this.label4.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(631, 12); + this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(32, 17); + this.label4.TabIndex = 430; + this.label4.Text = "货号"; + // + // txtProdName + // + this.txtProdName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.txtProdName.Location = new System.Drawing.Point(564, 9); + this.txtProdName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtProdName.Name = "txtProdName"; + this.txtProdName.Size = new System.Drawing.Size(61, 23); + this.txtProdName.TabIndex = 427; + // // label12 // this.label12.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(970, 9); + this.label12.Location = new System.Drawing.Point(952, 12); this.label12.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label12.Name = "label12"; this.label12.Size = new System.Drawing.Size(56, 17); this.label12.TabIndex = 460; this.label12.Text = "用户备注"; // - // chkNoSubSa - // - this.chkNoSubSa.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.chkNoSubSa.AutoSize = true; - this.chkNoSubSa.Location = new System.Drawing.Point(1156, 7); - this.chkNoSubSa.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.chkNoSubSa.Name = "chkNoSubSa"; - this.chkNoSubSa.Size = new System.Drawing.Size(88, 21); - this.chkNoSubSa.TabIndex = 470; - this.chkNoSubSa.Text = "未分配超管"; - this.chkNoSubSa.UseVisualStyleBackColor = true; - // - // chkShowDel - // - this.chkShowDel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.chkShowDel.AutoSize = true; - this.chkShowDel.Location = new System.Drawing.Point(1156, 40); - this.chkShowDel.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.chkShowDel.Name = "chkShowDel"; - this.chkShowDel.Size = new System.Drawing.Size(88, 21); - this.chkShowDel.TabIndex = 471; - this.chkShowDel.Text = "显示删除"; - this.chkShowDel.UseVisualStyleBackColor = true; - this.chkShowDel.CheckedChanged += new System.EventHandler(this.chkShowDel_CheckedChanged); - // - // chkUploadProd - // - this.chkUploadProd.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.chkUploadProd.Checked = true; - this.chkUploadProd.CheckState = System.Windows.Forms.CheckState.Checked; - this.tableLayoutPanel1.SetColumnSpan(this.chkUploadProd, 2); - this.chkUploadProd.Location = new System.Drawing.Point(998, 40); - this.chkUploadProd.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.chkUploadProd.Name = "chkUploadProd"; - this.chkUploadProd.Size = new System.Drawing.Size(90, 21); - this.chkUploadProd.TabIndex = 471; - this.chkUploadProd.Text = "上传到未发布"; - this.chkUploadProd.UseVisualStyleBackColor = true; - // // splitContainer2 // this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill; @@ -1287,15 +1284,15 @@ // this.splitContainer2.Panel2.Controls.Add(this.ucSplitPage1); this.splitContainer2.Panel2.Controls.Add(this.statusBar); - this.splitContainer2.Size = new System.Drawing.Size(1534, 534); - this.splitContainer2.SplitterDistance = 505; + this.splitContainer2.Size = new System.Drawing.Size(1518, 538); + this.splitContainer2.SplitterDistance = 509; this.splitContainer2.TabIndex = 0; // // 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(742, 227); + this.pbLoading.Location = new System.Drawing.Point(734, 227); this.pbLoading.Name = "pbLoading"; this.pbLoading.Size = new System.Drawing.Size(50, 50); this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -1318,6 +1315,7 @@ this.dataGridViewEx1.AllowUserToDeleteRows = false; dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke; this.dataGridViewEx1.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + this.dataGridViewEx1.AutoRowNumber = true; this.dataGridViewEx1.BackgroundColor = System.Drawing.Color.White; this.dataGridViewEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; @@ -1401,6 +1399,7 @@ this.dgvSelectProduct.AllowUserToDeleteRows = false; dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke; this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3; + 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; @@ -1445,7 +1444,7 @@ this.dgvSelectProduct.ReadOnly = true; this.dgvSelectProduct.RowHeadersWidth = 40; this.dgvSelectProduct.RowTemplate.Height = 23; - this.dgvSelectProduct.Size = new System.Drawing.Size(1526, 505); + this.dgvSelectProduct.Size = new System.Drawing.Size(1510, 509); this.dgvSelectProduct.TabIndex = 190; this.dgvSelectProduct.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvSelectProduct_CellContentClick); this.dgvSelectProduct.Scroll += new System.Windows.Forms.ScrollEventHandler(this.dgvSelectProduct_Scroll); @@ -1670,7 +1669,7 @@ this.ucSplitPage1.CurrentPage = 1; this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Right; this.ucSplitPage1.IsShowPageSize = true; - this.ucSplitPage1.Location = new System.Drawing.Point(1134, 0); + this.ucSplitPage1.Location = new System.Drawing.Point(1118, 0); this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0); this.ucSplitPage1.Name = "ucSplitPage1"; this.ucSplitPage1.Padding = new System.Windows.Forms.Padding(0, 0, 1, 0); @@ -1687,13 +1686,13 @@ this.statusBar.Location = new System.Drawing.Point(0, 0); this.statusBar.Margin = new System.Windows.Forms.Padding(0); this.statusBar.Name = "statusBar"; - this.statusBar.Size = new System.Drawing.Size(1534, 25); + this.statusBar.Size = new System.Drawing.Size(1518, 25); this.statusBar.TabIndex = 5; // // ProductThirdSelectListManageForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.ClientSize = new System.Drawing.Size(1536, 672); + this.ClientSize = new System.Drawing.Size(1520, 672); this.Controls.Add(this.splitContainer1); 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"))); @@ -1708,6 +1707,10 @@ this.splitContainer1.Panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); this.splitContainer1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pbFissionSetting)).EndInit(); + this.flowLayoutPanel1.ResumeLayout(false); + this.flowLayoutPanel1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numSkuRandomPrice)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.numUnitNum2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.numUnitNum1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.numWeight2)).EndInit(); @@ -1720,12 +1723,8 @@ ((System.ComponentModel.ISupportInitialize)(this.numLen1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.numAddPrice)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.numAddPriceTimes)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pbFissionSetting)).EndInit(); this.tableLayoutPanel1.ResumeLayout(false); this.tableLayoutPanel1.PerformLayout(); - this.flowLayoutPanel1.ResumeLayout(false); - this.flowLayoutPanel1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.numSkuRandomPrice)).EndInit(); this.splitContainer2.Panel1.ResumeLayout(false); this.splitContainer2.Panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit(); diff --git a/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.cs b/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.cs index 7d66369..29043bf 100644 --- a/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.cs +++ b/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.cs @@ -80,10 +80,12 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms } } + bool isFirst = true; private void ProductThirdSelectListManageForm_VisibleChanged(object sender, EventArgs e) { - if (this.Visible == true) + if (this.Visible == true && isFirst) { + isFirst = false; this.pbLoading.Visible = true; SearchDbProdSelect(this.ucSplitPage1.CurrentPage); } diff --git a/TEMUKJD/KJDForms/ShopForms/ShopListForm.cs b/TEMUKJD/KJDForms/ShopForms/ShopListForm.cs index 5a1ae5c..4185aef 100644 --- a/TEMUKJD/KJDForms/ShopForms/ShopListForm.cs +++ b/TEMUKJD/KJDForms/ShopForms/ShopListForm.cs @@ -598,6 +598,11 @@ namespace TemuKJD.KJDForms.ShopForms } } + public void CheckShopLogin(ShopLoginInfo[] shops, bool isShowProgress = true) + { + CheckShopLogin(shops.Select(s => s.LoginName).Distinct().ToArray(), isShowProgress); + } + public void CheckShopLogin(string[] shopNames, bool isShowProgress = true) { for (int i = 0; i < shopNames.Length; i++) diff --git a/TEMUKJD/MainForm.cs b/TEMUKJD/MainForm.cs index b1b7e2b..b965bfc 100644 --- a/TEMUKJD/MainForm.cs +++ b/TEMUKJD/MainForm.cs @@ -148,6 +148,7 @@ namespace TemuKJD if (loginType == "Pdd") { BaseClass.MainPath = "binxixi"; + this.pnlJit.Visible = false; } instance = this; diff --git a/TEMUKJD/MainForm.designer.cs b/TEMUKJD/MainForm.designer.cs index c15e851..2da92e4 100644 --- a/TEMUKJD/MainForm.designer.cs +++ b/TEMUKJD/MainForm.designer.cs @@ -33,6 +33,13 @@ namespace TemuKJD { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm)); + this.tpMainForm = new System.Windows.Forms.ToolTip(this.components); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); + this.bodyPanelBg = new DevComponents.DotNetBar.PanelEx(); + this.bodyPanel = new DevComponents.DotNetBar.PanelEx(); + this.pnlWebBrowserJS = new DevComponents.DotNetBar.PanelEx(); + this.btnDyCollect = new DevComponents.DotNetBar.ButtonX(); + this.btnTest = new DevComponents.DotNetBar.ButtonX(); this.navPanel = new DevComponents.DotNetBar.PanelEx(); this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); this.pnlSA = new DevComponents.DotNetBar.PanelEx(); @@ -44,7 +51,6 @@ namespace TemuKJD this.pnlTools = new DevComponents.DotNetBar.PanelEx(); this.pnlOrder = new DevComponents.DotNetBar.PanelEx(); this.pbLogo = new System.Windows.Forms.PictureBox(); - this.lklbGetHwCode = new TemuKJD.UserComponent.LinkLabelLc(); this.plTopRight = new System.Windows.Forms.Panel(); this.lblVersionName = new System.Windows.Forms.Label(); this.lblVersionInfo = new System.Windows.Forms.Label(); @@ -54,24 +60,128 @@ namespace TemuKJD this.max = new DevComponents.DotNetBar.PanelEx(); this.min = new DevComponents.DotNetBar.PanelEx(); this.close = new DevComponents.DotNetBar.PanelEx(); - this.btnDyCollect = new DevComponents.DotNetBar.ButtonX(); - this.btnTest = new DevComponents.DotNetBar.ButtonX(); - this.bodyPanelBg = new DevComponents.DotNetBar.PanelEx(); - this.bodyPanel = new DevComponents.DotNetBar.PanelEx(); - this.pnlWebBrowserJS = new DevComponents.DotNetBar.PanelEx(); - this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.tpMainForm = new System.Windows.Forms.ToolTip(this.components); + this.lklbGetHwCode = new TemuKJD.UserComponent.LinkLabelLc(); + this.tableLayoutPanel1.SuspendLayout(); + this.bodyPanelBg.SuspendLayout(); + this.bodyPanel.SuspendLayout(); this.navPanel.SuspendLayout(); this.flowLayoutPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pbLogo)).BeginInit(); this.plTopRight.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.picPinDuoDuoToken)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pbAnnouncement)).BeginInit(); - this.bodyPanelBg.SuspendLayout(); - this.bodyPanel.SuspendLayout(); - this.tableLayoutPanel1.SuspendLayout(); this.SuspendLayout(); // + // tpMainForm + // + this.tpMainForm.AutomaticDelay = 300; + // + // tableLayoutPanel1 + // + this.tableLayoutPanel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.tableLayoutPanel1.ColumnCount = 1; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel1.Controls.Add(this.bodyPanelBg, 0, 1); + this.tableLayoutPanel1.Controls.Add(this.navPanel, 0, 0); + this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel1.Location = new System.Drawing.Point(1, 1); + this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(0); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 2; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 91F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(1278, 718); + this.tableLayoutPanel1.TabIndex = 5; + // + // bodyPanelBg + // + this.bodyPanelBg.CanvasColor = System.Drawing.SystemColors.Control; + this.bodyPanelBg.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.bodyPanelBg.Controls.Add(this.bodyPanel); + this.bodyPanelBg.DisabledBackColor = System.Drawing.Color.Empty; + this.bodyPanelBg.Dock = System.Windows.Forms.DockStyle.Fill; + this.bodyPanelBg.Location = new System.Drawing.Point(0, 91); + this.bodyPanelBg.Margin = new System.Windows.Forms.Padding(0); + this.bodyPanelBg.Name = "bodyPanelBg"; + this.bodyPanelBg.Size = new System.Drawing.Size(1278, 627); + this.bodyPanelBg.Style.Alignment = System.Drawing.StringAlignment.Center; + this.bodyPanelBg.Style.BackColor1.Color = System.Drawing.Color.White; + this.bodyPanelBg.Style.BackColor2.Color = System.Drawing.Color.White; + this.bodyPanelBg.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); + this.bodyPanelBg.Style.ForeColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(192)))), ((int)(((byte)(192))))); + this.bodyPanelBg.Style.GradientAngle = 90; + this.bodyPanelBg.TabIndex = 1; + // + // bodyPanel + // + this.bodyPanel.CanvasColor = System.Drawing.SystemColors.Control; + this.bodyPanel.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.bodyPanel.Controls.Add(this.pnlWebBrowserJS); + this.bodyPanel.Controls.Add(this.btnDyCollect); + this.bodyPanel.Controls.Add(this.btnTest); + this.bodyPanel.DisabledBackColor = System.Drawing.Color.Empty; + this.bodyPanel.Dock = System.Windows.Forms.DockStyle.Fill; + this.bodyPanel.Location = new System.Drawing.Point(0, 0); + this.bodyPanel.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.bodyPanel.Name = "bodyPanel"; + this.bodyPanel.Size = new System.Drawing.Size(1278, 627); + this.bodyPanel.Style.Alignment = System.Drawing.StringAlignment.Center; + this.bodyPanel.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; + this.bodyPanel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; + this.bodyPanel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; + this.bodyPanel.Style.GradientAngle = 90; + this.bodyPanel.TabIndex = 0; + this.bodyPanel.Visible = false; + // + // pnlWebBrowserJS + // + this.pnlWebBrowserJS.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.pnlWebBrowserJS.CanvasColor = System.Drawing.SystemColors.Control; + this.pnlWebBrowserJS.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.pnlWebBrowserJS.DisabledBackColor = System.Drawing.Color.Empty; + this.pnlWebBrowserJS.Location = new System.Drawing.Point(1132, 11); + this.pnlWebBrowserJS.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.pnlWebBrowserJS.Name = "pnlWebBrowserJS"; + this.pnlWebBrowserJS.Size = new System.Drawing.Size(135, 71); + this.pnlWebBrowserJS.Style.Alignment = System.Drawing.StringAlignment.Center; + this.pnlWebBrowserJS.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.pnlWebBrowserJS.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.pnlWebBrowserJS.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.pnlWebBrowserJS.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.pnlWebBrowserJS.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.pnlWebBrowserJS.Style.GradientAngle = 90; + this.pnlWebBrowserJS.TabIndex = 0; + this.pnlWebBrowserJS.Text = "WebBrowserJS"; + this.pnlWebBrowserJS.Visible = false; + // + // btnDyCollect + // + this.btnDyCollect.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnDyCollect.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnDyCollect.Location = new System.Drawing.Point(985, 42); + this.btnDyCollect.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.btnDyCollect.Name = "btnDyCollect"; + this.btnDyCollect.Size = new System.Drawing.Size(135, 23); + this.btnDyCollect.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnDyCollect.TabIndex = 130; + this.btnDyCollect.Text = "抖音详情采集"; + this.btnDyCollect.Visible = false; + this.btnDyCollect.Click += new System.EventHandler(this.btnDyCollect_Click); + // + // btnTest + // + this.btnTest.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnTest.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnTest.Location = new System.Drawing.Point(985, 11); + this.btnTest.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.btnTest.Name = "btnTest"; + this.btnTest.Size = new System.Drawing.Size(135, 23); + this.btnTest.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnTest.TabIndex = 4; + this.btnTest.Text = "工具测试"; + this.btnTest.Visible = false; + this.btnTest.Click += new System.EventHandler(this.btnTest_Click); + // // navPanel // this.navPanel.CanvasColor = System.Drawing.SystemColors.Control; @@ -285,7 +395,6 @@ namespace TemuKJD this.pnlJit.StyleMouseOver.MarginTop = 63; this.pnlJit.TabIndex = 7; this.pnlJit.Text = "JIT"; - this.pnlJit.Visible = false; this.pnlJit.Click += new System.EventHandler(this.pnlJit_Click); // // pnlCollect @@ -401,21 +510,6 @@ namespace TemuKJD this.pbLogo.TabStop = false; this.pbLogo.Click += new System.EventHandler(this.logo_Click); // - // lklbGetHwCode - // - this.lklbGetHwCode.AutoSize = true; - this.lklbGetHwCode.Font = new System.Drawing.Font("Yu Gothic UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lklbGetHwCode.LinkColor = System.Drawing.Color.WhiteSmoke; - this.lklbGetHwCode.Location = new System.Drawing.Point(125, 3); - this.lklbGetHwCode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.lklbGetHwCode.Name = "lklbGetHwCode"; - this.lklbGetHwCode.Size = new System.Drawing.Size(52, 15); - this.lklbGetHwCode.TabIndex = 89; - this.lklbGetHwCode.TabStop = true; - this.lklbGetHwCode.Text = "HwCode"; - this.lklbGetHwCode.Visible = false; - this.lklbGetHwCode.Click += new System.EventHandler(this.lklbGetHwCode_Click); - // // plTopRight // this.plTopRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -591,115 +685,20 @@ namespace TemuKJD this.close.TabIndex = 5; this.close.Click += new System.EventHandler(this.close_Click); // - // btnDyCollect + // lklbGetHwCode // - this.btnDyCollect.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnDyCollect.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnDyCollect.Location = new System.Drawing.Point(985, 42); - this.btnDyCollect.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.btnDyCollect.Name = "btnDyCollect"; - this.btnDyCollect.Size = new System.Drawing.Size(135, 23); - this.btnDyCollect.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnDyCollect.TabIndex = 130; - this.btnDyCollect.Text = "抖音详情采集"; - this.btnDyCollect.Visible = false; - this.btnDyCollect.Click += new System.EventHandler(this.btnDyCollect_Click); - // - // btnTest - // - this.btnTest.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnTest.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnTest.Location = new System.Drawing.Point(985, 11); - this.btnTest.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.btnTest.Name = "btnTest"; - this.btnTest.Size = new System.Drawing.Size(135, 23); - this.btnTest.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnTest.TabIndex = 4; - this.btnTest.Text = "工具测试"; - this.btnTest.Visible = false; - this.btnTest.Click += new System.EventHandler(this.btnTest_Click); - // - // bodyPanelBg - // - this.bodyPanelBg.CanvasColor = System.Drawing.SystemColors.Control; - this.bodyPanelBg.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.bodyPanelBg.Controls.Add(this.bodyPanel); - this.bodyPanelBg.DisabledBackColor = System.Drawing.Color.Empty; - this.bodyPanelBg.Dock = System.Windows.Forms.DockStyle.Fill; - this.bodyPanelBg.Location = new System.Drawing.Point(0, 91); - this.bodyPanelBg.Margin = new System.Windows.Forms.Padding(0); - this.bodyPanelBg.Name = "bodyPanelBg"; - this.bodyPanelBg.Size = new System.Drawing.Size(1278, 627); - this.bodyPanelBg.Style.Alignment = System.Drawing.StringAlignment.Center; - this.bodyPanelBg.Style.BackColor1.Color = System.Drawing.Color.White; - this.bodyPanelBg.Style.BackColor2.Color = System.Drawing.Color.White; - this.bodyPanelBg.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); - this.bodyPanelBg.Style.ForeColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(192)))), ((int)(((byte)(192))))); - this.bodyPanelBg.Style.GradientAngle = 90; - this.bodyPanelBg.TabIndex = 1; - // - // bodyPanel - // - this.bodyPanel.CanvasColor = System.Drawing.SystemColors.Control; - this.bodyPanel.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.bodyPanel.Controls.Add(this.pnlWebBrowserJS); - this.bodyPanel.Controls.Add(this.btnDyCollect); - this.bodyPanel.Controls.Add(this.btnTest); - this.bodyPanel.DisabledBackColor = System.Drawing.Color.Empty; - this.bodyPanel.Dock = System.Windows.Forms.DockStyle.Fill; - this.bodyPanel.Location = new System.Drawing.Point(0, 0); - this.bodyPanel.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.bodyPanel.Name = "bodyPanel"; - this.bodyPanel.Size = new System.Drawing.Size(1278, 627); - this.bodyPanel.Style.Alignment = System.Drawing.StringAlignment.Center; - this.bodyPanel.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.bodyPanel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; - this.bodyPanel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.bodyPanel.Style.GradientAngle = 90; - this.bodyPanel.TabIndex = 0; - this.bodyPanel.Visible = false; - // - // pnlWebBrowserJS - // - this.pnlWebBrowserJS.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.pnlWebBrowserJS.CanvasColor = System.Drawing.SystemColors.Control; - this.pnlWebBrowserJS.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.pnlWebBrowserJS.DisabledBackColor = System.Drawing.Color.Empty; - this.pnlWebBrowserJS.Location = new System.Drawing.Point(1132, 11); - this.pnlWebBrowserJS.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.pnlWebBrowserJS.Name = "pnlWebBrowserJS"; - this.pnlWebBrowserJS.Size = new System.Drawing.Size(135, 71); - this.pnlWebBrowserJS.Style.Alignment = System.Drawing.StringAlignment.Center; - this.pnlWebBrowserJS.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.pnlWebBrowserJS.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.pnlWebBrowserJS.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.pnlWebBrowserJS.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.pnlWebBrowserJS.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.pnlWebBrowserJS.Style.GradientAngle = 90; - this.pnlWebBrowserJS.TabIndex = 0; - this.pnlWebBrowserJS.Text = "WebBrowserJS"; - this.pnlWebBrowserJS.Visible = false; - // - // tableLayoutPanel1 - // - this.tableLayoutPanel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.tableLayoutPanel1.ColumnCount = 1; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Controls.Add(this.bodyPanelBg, 0, 1); - this.tableLayoutPanel1.Controls.Add(this.navPanel, 0, 0); - this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel1.Location = new System.Drawing.Point(1, 1); - this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(0); - this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 2; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 91F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(1278, 718); - this.tableLayoutPanel1.TabIndex = 5; - // - // tpMainForm - // - this.tpMainForm.AutomaticDelay = 300; + this.lklbGetHwCode.AutoSize = true; + this.lklbGetHwCode.Font = new System.Drawing.Font("Yu Gothic UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lklbGetHwCode.LinkColor = System.Drawing.Color.WhiteSmoke; + this.lklbGetHwCode.Location = new System.Drawing.Point(125, 3); + this.lklbGetHwCode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.lklbGetHwCode.Name = "lklbGetHwCode"; + this.lklbGetHwCode.Size = new System.Drawing.Size(52, 15); + this.lklbGetHwCode.TabIndex = 89; + this.lklbGetHwCode.TabStop = true; + this.lklbGetHwCode.Text = "HwCode"; + this.lklbGetHwCode.Visible = false; + this.lklbGetHwCode.Click += new System.EventHandler(this.lklbGetHwCode_Click); // // MainForm // @@ -720,6 +719,9 @@ namespace TemuKJD this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.MainForm_FormClosed); this.Load += new System.EventHandler(this.MainForm_Load); this.Resize += new System.EventHandler(this.MainForm_Resize); + this.tableLayoutPanel1.ResumeLayout(false); + this.bodyPanelBg.ResumeLayout(false); + this.bodyPanel.ResumeLayout(false); this.navPanel.ResumeLayout(false); this.navPanel.PerformLayout(); this.flowLayoutPanel1.ResumeLayout(false); @@ -728,9 +730,6 @@ namespace TemuKJD this.plTopRight.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.picPinDuoDuoToken)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pbAnnouncement)).EndInit(); - this.bodyPanelBg.ResumeLayout(false); - this.bodyPanel.ResumeLayout(false); - this.tableLayoutPanel1.ResumeLayout(false); this.ResumeLayout(false); } diff --git a/TEMUKJD/MainForm.resx b/TEMUKJD/MainForm.resx index f5f8c2f..bd214db 100644 --- a/TEMUKJD/MainForm.resx +++ b/TEMUKJD/MainForm.resx @@ -117,6 +117,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + @@ -164,8 +167,8 @@ rUyjR8+TaWYaXZ3gpTyS6GdY5DvIkutXGTioSvOjVCf1auUqxtQagT+/dsiG99GNqiB9VZCIsqtTFXCp XC7PYmWU6/y0WgHakxJlTpG8INNv/okoE3SeHClHZGaHZu/VqQj4OSDTvxsy2aAYKoGVGAl2qgh6KK4C FLOSwVK/2hnJFIECnWUhimZ5yIs87/D+XkCkYfqXxEMS4hnUBZl5QfPW/2ZdkA6dcaW1Kq2Z9rdE/R/7 - bWb4k6MRVmA0JX5/bIF7UI9x1ZI9OTotiawy8nnPaQH+C3Vo0J5y78OuAAAACXBIWXMAAAsQAAALEAGt - I711AAAeA0lEQVR4Xu3XRw4FxAFEQU5jHHHCAd/OOcGZ8f69lbu/ND1opLpEffGj776/xZffff/ltz9k + bWb4k6MRVmA0JX5/bIF7UI9x1ZI9OTotiawy8nnPaQH+C3Vo0J5y78OuAAAACXBIWXMAAAsMAAALDAE/ + QCLIAAAeA0lEQVR4Xu3XRw4FxAFEQU5jHHHCAd/OOcGZ8f69lbu/ND1opLpEffGj776/xZffff/ltz9k P/6s/37GTyb99IP+8zE/m/TzD/r3x/xi0lcf9K+P+eWkX33QPz/m15v+8TG/+aC/L/rtB/3tY77e87vP +utn/H7SHz7rL5/xx0nffNafP+NPPyxfeDizXr3+P0pUxu1ZwD41NKiY27OAfWpoUDG3ZwH71NCgYm7P AvapoUHFeJ4RGlSMfWqoPQvYp4YGFfN8juOdSkpUxu1ZwDuVlKiM27OAdyopURnv5WqvXkN4p5ISlXF7 @@ -299,7 +302,7 @@ iVBORw0KGgoAAAANSUhEUgAAAFAAAABaCAYAAAAvitHLAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1 - MAAA6mAAADqYAAAXb5JfxUYAAAAJcEhZcwAACxAAAAsQAa0jvXUAAATASURBVHhe7djPahtXFAbwYJws + MAAA6mAAADqYAAAXb5JfxUYAAAAJcEhZcwAACwwAAAsMAT9AIsgAAATASURBVHhe7djPahtXFAbwYJws vHW6M6Fv4T5J09AXibeDsDuKIZKNkQYbxdPNtNSLhpZsuiot3ZUGmwT6BwpJW9rYcQtNIBaUrxxbIsr5 7mh8ckeyDGfxQ6Nv7pw59yDJlq4AuOLeHgXOhgJnQ4GzocDZUOBsKHA2FDgbCpwNBc6GAmdDgbOhwNlQ 4GwocDYUOBsKnA0F01bkp+aKHMtFjttFjr0ix36R43mR49WAHEsm52SNrJVrqN60UTBNRY6lIsdakeNJ @@ -326,7 +329,7 @@ iVBORw0KGgoAAAANSUhEUgAAAFAAAABaCAYAAAAvitHLAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1 - MAAA6mAAADqYAAAXb5JfxUYAAAAJcEhZcwAACxAAAAsQAa0jvXUAAAZKSURBVHhe7dpLbBtFGAdw836U + MAAA6mAAADqYAAAXb5JfxUYAAAAJcEhZcwAACwwAAAsMAT9AIsgAAAZKSURBVHhe7dpLbBtFGAdw836U 8ihQeuKAVA5wQEUcWoHECXHiCghIQYJKFCFR2iRQWteJ4yaxE0GSijSuo7ZGSoPgQMoBqUIQ0Qc3VETU SuYpkBpo4qRVSUhikv3Qf+N1N9/M2l7P7DpIY+kX7347O/PNX7ETp40QUcSonVAw/BEKhj9CwfBHKBj+ CAXDH6Fg+PN/f1zDCyE/6r2+8qPeG7DXxxejdkLB8EcoGP4IBcOfyLWGEqFg+CMUDH+EguGPUAjd829+ @@ -359,7 +362,7 @@ iVBORw0KGgoAAAANSUhEUgAAAFAAAABaCAYAAAAvitHLAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1 - MAAA6mAAADqYAAAXb5JfxUYAAAAJcEhZcwAACxAAAAsQAa0jvXUAAAVYSURBVHhe7drpT1RXGAZwQ9QP + MAAA6mAAADqYAAAXb5JfxUYAAAAJcEhZcwAACwwAAAsMAT9AIsgAAAVYSURBVHhe7drpT1RXGAZwQ9QP fsV+I6b/Bf1Lqk0HHAZFQoZMCC7gvo+4MSIwG6O1taam1NRi/dg0apNWq201aZOqaABbF9S6VUfFp3l7 oJp5ZsJ95y446ZnkFy7PPcubk5l77lyYBWCWVT4KLB0KLB0KLB0KLB0KLB0KLB0KLB0KLB0KLB0KLB0K LB0KLB0KLB0KLB0KLB0KLB0KApfLiirksrXIZTuQyw4il72IXPYuctlnk+RYMjknbaSt9OHxAkZBoAYy @@ -388,7 +391,7 @@ iVBORw0KGgoAAAANSUhEUgAAAFAAAABaCAYAAAAvitHLAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1 - MAAA6mAAADqYAAAXb5JfxUYAAAAJcEhZcwAACxAAAAsQAa0jvXUAAAcTSURBVHhe7dxpbFRVGAbguuIC + MAAA6mAAADqYAAAXb5JfxUYAAAAJcEhZcwAACwwAAAsMAT9AIsgAAAcTSURBVHhe7dxpbFRVGAbguuIC rqgxUUNAE/2h/427MTHGuAYpUEo3oBVZQspWWmpBkQKVlkJLVxBFohFQFo3+MSoYFAQVERNF0FIU2qkV BdqhM/Oat3fuMD1nht4759yZmpybPGXud8/yzZt27rQ0TQOQZiROKhjuSAXDHalguCMVDHekguGOVDDc +b8fF4iFJB+p3l/5SPUT6N2fH4zESQXDHalguCMVDHfSLjSUSAXDHalguCMVDHekQtKVPfP0xWdW194b @@ -468,8 +471,8 @@ rUyjR8+TaWYaXZ3gpTyS6GdY5DvIkutXGTioSvOjVCf1auUqxtQagT+/dsiG99GNqiB9VZCIsqtTFXCp XC7PYmWU6/y0WgHakxJlTpG8INNv/okoE3SeHClHZGaHZu/VqQj4OSDTvxsy2aAYKoGVGAl2qgh6KK4C FLOSwVK/2hnJFIECnWUhimZ5yIs87/D+XkCkYfqXxEMS4hnUBZl5QfPW/2ZdkA6dcaW1Kq2Z9rdE/R/7 - bWb4k6MRVmA0JX5/bIF7UI9x1ZI9OTotiawy8nnPaQH+C3Vo0J5y78OuAAAACXBIWXMAAAsQAAALEAGt - I711AAAJjElEQVR4Xu2Yy49cRxXGb/f0vOyZsWc8D/d0lH+CYYmEWJA9UaKwRuxYIAGKvMcLRIsNLFjY + bWb4k6MRVmA0JX5/bIF7UI9x1ZI9OTotiawy8nnPaQH+C3Vo0J5y78OuAAAACXBIWXMAAAsMAAALDAE/ + QCLIAAAJjElEQVR4Xu2Yy49cRxXGb/f0vOyZsWc8D/d0lH+CYYmEWJA9UaKwRuxYIAGKvMcLRIsNLFjY mwgsCBIghKa759Hz9rS7Z7qFBBsSKbESuYUQOM7M3Nu3XwedU1X3VtfpAZWLhS3V4qdz6qu65/F1rDgJ ACDwvDxM8NjBBI8dTPDYwQSPHUzw2MEEjx1M8NjBBI8dTPDYwQSPHUzw2MEEjx1M8NjBBI8dTPDYwQSP HUxwplV4GbLQKmxAq/A+tAqPoFWoQ6vQhlahI8EcNbzDN/gWvzHr/G/MeR1hgjM06HoATQnmdJYLqCjI @@ -559,8 +562,8 @@ rUyjR8+TaWYaXZ3gpTyS6GdY5DvIkutXGTioSvOjVCf1auUqxtQagT+/dsiG99GNqiB9VZCIsqtTFXCp XC7PYmWU6/y0WgHakxJlTpG8INNv/okoE3SeHClHZGaHZu/VqQj4OSDTvxsy2aAYKoGVGAl2qgh6KK4C FLOSwVK/2hnJFIECnWUhimZ5yIs87/D+XkCkYfqXxEMS4hnUBZl5QfPW/2ZdkA6dcaW1Kq2Z9rdE/R/7 - bWb4k6MRVmA0JX5/bIF7UI9x1ZI9OTotiawy8nnPaQH+C3Vo0J5y78OuAAAACXBIWXMAAAsQAAALEAGt - I711AAAKVklEQVR4Xu2cW2wcZxXHZ3xZ79pe2+u7vX1IeGnVJwQSqIICQYIiIfEAFFGBQIiWvPAAgiAh + bWb4k6MRVmA0JX5/bIF7UI9x1ZI9OTotiawy8nnPaQH+C3Vo0J5y78OuAAAACXBIWXMAAAsMAAALDAE/ + QCLIAAAKVklEQVR4Xu2cW2wcZxXHZ3xZ79pe2+u7vX1IeGnVJwQSqIICQYIiIfEAFFGBQIiWvPAAgiAh 7i+lpKlRUh54aFqIoLlg2qROfIkdr+1d2xt7vSYSVIVWSqKE2CFOHcfr3Z29HXS+y8w338w2Xc+s7Uqz 0i/n8p0553z/dew4NwUAFI/tY0l4VIYl4VEZH/SXKid2+EXm4w8e28eS8KgMS8KjMiwJj8qwJDwqQ6nx cIQl4VEZloRHZVgSHpVhSXhUhiXhURmWhEdlWBIelaHU7jZPfi7g24j1fzyfCP+0uBQ+WUqGF2E5vALL @@ -610,7 +613,7 @@ iVBORw0KGgoAAAANSUhEUgAAAFAAAABbCAYAAADk1gJuAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAACupJREFUeF7t2mtvHNUZB3AaQV+gFlEcO7ZnZndnjEqrvq7yLVrxplChfoOqr2iB + vwAADr8BOAVTJAAACupJREFUeF7t2mtvHNUZB3AaQV+gFlEcO7ZnZndnjEqrvq7yLVrxplChfoOqr2iB xHub2Ys3TiDQXMxNIYkUIBepKYhUCQ1EEKmAqLJz3Z3dDYkDjuNcIPHdjvdfPWd27fUcx2Q6fYHVQfrp nPPfnTnPeXa8CVYeAPBA5L/HBZFguCASDBdEguGCSDBcEAmGCyLBcEEkGC6IBMMFkWC4IBIMF0SC4YJI MFwQCYYLIsFwQSQYLogEwwWRYLggrGq1GojSOEQ2KY1XtyqNl59XGqXjSkPTlUbmptJIzXloThm9Ru+h @@ -663,7 +666,7 @@ iVBORw0KGgoAAAANSUhEUgAAAFAAAABbCAYAAADk1gJuAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAC/VJREFUeF7tnFtwG1cdxg2lkEIbkji+aVeXlYG28MDwxNCB4fLATF8KfeM60L7w + vwAADr8BOAVTJAAAC/VJREFUeF7tnFtwG1cdxg2lkEIbkji+aVeXlYG28MDwxNCB4fLATF8KfeM60L7w AFMeKFOIrbtsy5ekcdwyNBAGXjrATAshhZSkTZtpwiR13cbalbS7ktPETRzHjtsmvsoXfcz/rCRLZ500 yq7tdGY989P5n2/PnvOdT2elxJNJHYA6h1vHJDjUhklwqA2T4FAbH/afj/DCBv+w9enF4dYxCQ61YRIc asMkONSGSXCojbqPOljCJDjUhklwqA2T4FAbJsGhNkyCQ22YBIfaMAkOtVF3x2Zzz/e+eaeUGviKpO/Z @@ -720,7 +723,7 @@ iVBORw0KGgoAAAANSUhEUgAAAFAAAABbCAYAAADk1gJuAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1 - MAAA6mAAADqYAAAXb5JfxUYAAAAJcEhZcwAADsIAAA7CARUoSoAAAAyhSURBVHhe7dpbbBzXeQfw1JBt + MAAA6mAAADqYAAAXb5JfxUYAAAAJcEhZcwAADr8AAA6/ATgFUyQAAAyhSURBVHhe7dpbbBzXeQfw1JBt iVIkK3Ts1pIoUuTM7G1k9KEwUBRoixbpW4siQO2gQYAiaFEUQR+D5CUPRVMHQVsEiAXZbVqkqFM0jtJI slxbonbJXV52l/f7UqSVwBfZlS3b2rnPuXxf8c3uUtQcyciUS8JGh8AP58yfO+ec/XRmZ5bQZxDxM6n/ OyVIJaMEqWSUIJWMEqSSUYJUMkqQSkYJUskoQSoZJUglowSpZJQglYwSpJJRglQySpBKRglSyShBKhkl @@ -780,7 +783,7 @@ iVBORw0KGgoAAAANSUhEUgAAAFAAAABbCAYAAADk1gJuAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1 - MAAA6mAAADqYAAAXb5JfxUYAAAAJcEhZcwAADsIAAA7CARUoSoAAAA4PSURBVHhe7ZxtbFvXeccVibK9 + MAAA6mAAADqYAAAXb5JfxUYAAAAJcEhZcwAADr8AAA6/ATgFUyQAAA4PSURBVHhe7ZxtbFvXeccVibK9 ZGkTp3ETx7Yk852XDLBhW1GsQ4euwPqlBYoVW5u1KDpgL9iHDvlUYGvWfiiGdF23AEW7OkCKYQsWLFuc FnYd2ZZESZREvYt6od5sOY2dBEkk2xJ5X87r8wzPJalI98ppaVK2C1wCP57D/z33PP/75zm8NGG7BRFb Am4fnxBQHz4hoD58QkB9/Lo/7vMKd/jh1qengNvHJwTUh08IqA+fEFAfPiGgPlpaAxrCJwTUh08IqA+f @@ -847,7 +850,7 @@ iVBORw0KGgoAAAANSUhEUgAAAFAAAABaCAYAAAAvitHLAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1 - MAAA6mAAADqYAAAXb5JfxUYAAAAJcEhZcwAACxAAAAsQAa0jvXUAAAW8SURBVHhe7dpPaBRXHMBxNzGK + MAAA6mAAADqYAAAXb5JfxUYAAAAJcEhZcwAACwwAAAsMAT9AIsgAAAW8SURBVHhe7dpPaBRXHMBxNzGK iiDGgJAQKgiCB0EQUjwIgiAoUktKTCtBJKRZKG3pqXrwnPbUQ7FJodceCrmklbYHS/9kt8tuNYY1yWaz 2Vkbrdrmj8nMzu7Onze/8mbXbfp+aWae8ycrfYcPO/Odmd88lp38I9sAYJvw4lAQ+KAg8EFB4IOCwAcF gQ8KAh8UBD4oCHxQEPigIPBBQeCDgsAHBYEPCgIfFAQ+KAh8UAgbKUSpJlKIdpFC9BopREdJIZomhegy @@ -878,7 +881,7 @@ iVBORw0KGgoAAAANSUhEUgAAAFAAAABaCAYAAAAvitHLAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1 - MAAA6mAAADqYAAAXb5JfxUYAAAAJcEhZcwAACxAAAAsQAa0jvXUAAAc8SURBVHhe7dx7bFNVHAfwjTkQ + MAAA6mAAADqYAAAXb5JfxUYAAAAJcEhZcwAACwwAAAsMAT9AIsgAAAc8SURBVHhe7dx7bFNVHAfwjTkQ 53S8BIISMBDFGBISFCUGhBinoBFBHgEJ70dilPiXMQj6JxCjJCYgBvxLTTQ+AhkIERnuAW4Im93Yq3vg ZIC03aPve29vf+Z3e3vtzmm7e3vObWtymnzWe37n3HN+/WbduoRQAAAFQuaogmANVRCsoQqCNVRBsIYq CNZQBcGa//ujkCxk+ZHr85kfuX4B2vn4RcgcVRCsoQqCNVRBsKZglMCEKgjWUAXBGqogWEMVsu7DPfPv @@ -915,7 +918,7 @@ iVBORw0KGgoAAAANSUhEUgAAAPoAAABaCAYAAACR8EvTAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL - EAAACxABrSO9dQAABUNJREFUeF7t3ddyW0Ucx3FzRYdrIMVxKpkQQkgc27K0MPQyPAaBVMclsWVpeQWe + DAAACwwBP0AiyAAABUNJREFUeF7t3ddyW0Ucx3FzRYdrIMVxKpkQQkgc27K0MPQyPAaBVMclsWVpeQWe gDIMvQ2vQQ39GSgBboHAjzm2QpL9y0XSkXTO7vfic6+zs78Lf2Ufjzivlyt16cE5XOvQOeme49JdzwPl N+K8bnBenxw7by97qg7PSttesIcFlNWIVsd+Z62pH48u2EuforGT9qCAMlsZemvse6sN/XFk3l78lOw9 bQ8JKLv/h94a+3OVuv4NL38qDszYAwJicN3QW2N/aXLRjiB2xDfErN3Qszj38XhCcY74htiZobfGnsW5 @@ -944,7 +947,7 @@ iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1 - MAAA6mAAADqYAAAXb5JfxUYAAAAJcEhZcwAACxAAAAsQAa0jvXUAAAOxSURBVFhHpZdJiFVXEIaNOIJI + MAAA6mAAADqYAAAXb5JfxUYAAAAJcEhZcwAACwwAAAsMAT9AIsgAAAOxSURBVFhHpZdJiFVXEIaNOIJI L3QjCioxGsdGRV3E4EJxEaIdJxxRQVFEdKMiYmzNQo2I9MaYgKCCIAQkWSQOiDguVJC4FCPaJpoYArGd CBHDJ//zv6/rnndf93v6Q71376k6p4ZTVefcLl3qANAEHAEuAL8AbSY9a0y82em89wLQ4IVbgaM2oqGK nHiSkazmVMjVBWAncAtYkfI6g+Z4bnPK6xT2RmHdmfLqRXCitmgAjQ5hU8p7V3hrZERjysvBnkt5h4JA @@ -963,9 +966,6 @@ Yznx4odshdx7IWvbPsDknSpBpGeNtdSbO28A7+2x3uIN78kAAAAASUVORK5CYII= - - 17, 17 - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAgFJREFUWEfF diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.Designer.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.Designer.cs index 869227f..290ad7f 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.Designer.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.Designer.cs @@ -30,13 +30,18 @@ namespace TemuKJD.PDDForms.ProductSelectForms private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - 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(); + 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.chk15996 = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.chk21365 = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.chk20981 = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.chk22347 = new TemuKJD.UserComponent.UcCheckBox(this.components); this.chkKeepChanceGoodsImg = new TemuKJD.UserComponent.UcCheckBox(this.components); this.pbSkuImg = new System.Windows.Forms.PictureBox(); this.label19 = new System.Windows.Forms.Label(); @@ -101,6 +106,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.colCanUse = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colRemaining = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.txtTest20981 = new System.Windows.Forms.TextBox(); + this.btnTest20981 = new DevComponents.DotNetBar.PanelEx(); this.pbLoading = new System.Windows.Forms.PictureBox(); this.panel1 = new System.Windows.Forms.Panel(); this.dgvSelectProduct = new TemuKJD.UserComponent.DataGridViewEx(); @@ -175,7 +182,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // splitContainer1.Panel2 // this.splitContainer1.Panel2.Controls.Add(this.splitContainer3); - this.splitContainer1.Size = new System.Drawing.Size(1350, 546); + this.splitContainer1.Size = new System.Drawing.Size(1584, 546); this.splitContainer1.SplitterDistance = 140; this.splitContainer1.TabIndex = 11; // @@ -186,6 +193,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms | 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.chk15996); + this.ucGroupBoxEx2.Controls.Add(this.chk21365); + this.ucGroupBoxEx2.Controls.Add(this.chk20981); + this.ucGroupBoxEx2.Controls.Add(this.chk22347); this.ucGroupBoxEx2.Controls.Add(this.chkKeepChanceGoodsImg); this.ucGroupBoxEx2.Controls.Add(this.pbSkuImg); this.ucGroupBoxEx2.Controls.Add(this.label19); @@ -218,17 +229,69 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.ucGroupBoxEx2.Controls.Add(this.lblLowPriceSkuImg); this.ucGroupBoxEx2.Location = new System.Drawing.Point(476, 2); this.ucGroupBoxEx2.Name = "ucGroupBoxEx2"; - this.ucGroupBoxEx2.Size = new System.Drawing.Size(872, 140); + this.ucGroupBoxEx2.Size = new System.Drawing.Size(1106, 140); this.ucGroupBoxEx2.TabIndex = 667; this.ucGroupBoxEx2.TabStop = false; this.ucGroupBoxEx2.Text = "商品上传"; // + // chk15996 + // + this.chk15996.AutoSize = true; + this.chk15996.Checked = true; + this.chk15996.CheckState = System.Windows.Forms.CheckState.Checked; + this.chk15996.Location = new System.Drawing.Point(727, 88); + this.chk15996.Name = "chk15996"; + this.chk15996.Size = new System.Drawing.Size(62, 21); + this.chk15996.TabIndex = 682; + this.chk15996.Text = "15996"; + this.chk15996.UseVisualStyleBackColor = true; + this.chk15996.CheckedChanged += new System.EventHandler(this.chkActivityDetail_CheckedChanged); + // + // chk21365 + // + this.chk21365.AutoSize = true; + this.chk21365.Checked = true; + this.chk21365.CheckState = System.Windows.Forms.CheckState.Checked; + this.chk21365.Location = new System.Drawing.Point(663, 88); + this.chk21365.Name = "chk21365"; + this.chk21365.Size = new System.Drawing.Size(62, 21); + this.chk21365.TabIndex = 681; + this.chk21365.Text = "21365"; + this.chk21365.UseVisualStyleBackColor = true; + this.chk21365.CheckedChanged += new System.EventHandler(this.chkActivityDetail_CheckedChanged); + // + // chk20981 + // + this.chk20981.AutoSize = true; + this.chk20981.Checked = true; + this.chk20981.CheckState = System.Windows.Forms.CheckState.Checked; + this.chk20981.Location = new System.Drawing.Point(599, 88); + this.chk20981.Name = "chk20981"; + this.chk20981.Size = new System.Drawing.Size(62, 21); + this.chk20981.TabIndex = 680; + this.chk20981.Text = "20981"; + this.chk20981.UseVisualStyleBackColor = true; + this.chk20981.CheckedChanged += new System.EventHandler(this.chkActivityDetail_CheckedChanged); + // + // chk22347 + // + this.chk22347.AutoSize = true; + this.chk22347.Checked = true; + this.chk22347.CheckState = System.Windows.Forms.CheckState.Checked; + this.chk22347.Location = new System.Drawing.Point(535, 88); + this.chk22347.Name = "chk22347"; + this.chk22347.Size = new System.Drawing.Size(62, 21); + this.chk22347.TabIndex = 679; + this.chk22347.Text = "22347"; + this.chk22347.UseVisualStyleBackColor = true; + this.chk22347.CheckedChanged += new System.EventHandler(this.chkActivityDetail_CheckedChanged); + // // chkKeepChanceGoodsImg // this.chkKeepChanceGoodsImg.AutoSize = true; this.chkKeepChanceGoodsImg.Checked = true; this.chkKeepChanceGoodsImg.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkKeepChanceGoodsImg.Location = new System.Drawing.Point(535, 65); + this.chkKeepChanceGoodsImg.Location = new System.Drawing.Point(652, 42); this.chkKeepChanceGoodsImg.Name = "chkKeepChanceGoodsImg"; this.chkKeepChanceGoodsImg.Size = new System.Drawing.Size(135, 21); this.chkKeepChanceGoodsImg.TabIndex = 669; @@ -293,7 +356,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // txtAddTimesFake // this.txtAddTimesFake.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.txtAddTimesFake.Location = new System.Drawing.Point(662, 87); + this.txtAddTimesFake.Location = new System.Drawing.Point(662, 64); this.txtAddTimesFake.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtAddTimesFake.Name = "txtAddTimesFake"; this.txtAddTimesFake.Size = new System.Drawing.Size(32, 23); @@ -306,7 +369,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.chkActivity.AutoSize = true; this.chkActivity.Checked = true; this.chkActivity.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkActivity.Location = new System.Drawing.Point(535, 88); + this.chkActivity.Location = new System.Drawing.Point(535, 65); this.chkActivity.Name = "chkActivity"; this.chkActivity.Size = new System.Drawing.Size(135, 21); this.chkActivity.TabIndex = 648; @@ -318,7 +381,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.label17.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.label17.AutoSize = true; - this.label17.Location = new System.Drawing.Point(693, 90); + this.label17.Location = new System.Drawing.Point(694, 67); this.label17.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label17.Name = "label17"; this.label17.Size = new System.Drawing.Size(20, 17); @@ -355,7 +418,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms 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(769, 92); + this.btnClearDgv.Location = new System.Drawing.Point(1003, 92); 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); @@ -582,7 +645,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms 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(769, 62); + this.btnStop.Location = new System.Drawing.Point(1003, 62); 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); @@ -609,7 +672,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms 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(769, 32); + this.btnUpload.Location = new System.Drawing.Point(1003, 32); this.btnUpload.Name = "btnUpload"; this.btnUpload.Size = new System.Drawing.Size(84, 23); this.btnUpload.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -675,7 +738,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.chkChance.AutoSize = true; this.chkChance.Checked = true; this.chkChance.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkChance.Location = new System.Drawing.Point(683, 33); + this.chkChance.Location = new System.Drawing.Point(917, 33); this.chkChance.Name = "chkChance"; this.chkChance.Size = new System.Drawing.Size(87, 21); this.chkChance.TabIndex = 556; @@ -976,7 +1039,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // splitContainer3.Panel2 // this.splitContainer3.Panel2.Controls.Add(this.splitContainer4); - this.splitContainer3.Size = new System.Drawing.Size(1350, 402); + this.splitContainer3.Size = new System.Drawing.Size(1584, 402); this.splitContainer3.SplitterDistance = 372; this.splitContainer3.TabIndex = 1; // @@ -994,11 +1057,13 @@ namespace TemuKJD.PDDForms.ProductSelectForms // // splitContainer2.Panel2 // + this.splitContainer2.Panel2.Controls.Add(this.txtTest20981); + this.splitContainer2.Panel2.Controls.Add(this.btnTest20981); this.splitContainer2.Panel2.Controls.Add(this.pbLoading); this.splitContainer2.Panel2.Controls.Add(this.panel1); 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(1350, 372); + this.splitContainer2.Size = new System.Drawing.Size(1584, 372); this.splitContainer2.SplitterDistance = 300; this.splitContainer2.TabIndex = 0; // @@ -1006,18 +1071,19 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.dgvShop.AllowUserToAddRows = false; this.dgvShop.AllowUserToDeleteRows = false; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + 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))))); - 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.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; + 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, @@ -1122,11 +1188,47 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.colMessage.Name = "colMessage"; this.colMessage.ReadOnly = true; // + // txtTest20981 + // + this.txtTest20981.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.txtTest20981.Location = new System.Drawing.Point(1057, 30); + this.txtTest20981.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtTest20981.Name = "txtTest20981"; + this.txtTest20981.Size = new System.Drawing.Size(127, 23); + this.txtTest20981.TabIndex = 650; + this.txtTest20981.Visible = false; + // + // btnTest20981 + // + this.btnTest20981.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnTest20981.CanvasColor = System.Drawing.SystemColors.Control; + this.btnTest20981.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnTest20981.DisabledBackColor = System.Drawing.Color.Empty; + this.btnTest20981.Location = new System.Drawing.Point(1188, 30); + this.btnTest20981.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); + this.btnTest20981.Name = "btnTest20981"; + this.btnTest20981.Size = new System.Drawing.Size(84, 23); + this.btnTest20981.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnTest20981.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnTest20981.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnTest20981.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.btnTest20981.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnTest20981.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.btnTest20981.Style.GradientAngle = 90; + this.btnTest20981.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; + this.btnTest20981.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnTest20981.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnTest20981.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnTest20981.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.btnTest20981.TabIndex = 649; + this.btnTest20981.Text = "测试20981"; + this.btnTest20981.Visible = false; + // // 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(498, 161); + this.pbLoading.Location = new System.Drawing.Point(615, 161); this.pbLoading.Name = "pbLoading"; this.pbLoading.Size = new System.Drawing.Size(50, 50); this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -1141,7 +1243,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms | System.Windows.Forms.AnchorStyles.Right))); this.panel1.Location = new System.Drawing.Point(36, 53); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(972, 286); + this.panel1.Size = new System.Drawing.Size(1206, 286); this.panel1.TabIndex = 189; this.panel1.Paint += new System.Windows.Forms.PaintEventHandler(this.panel1_Paint); // @@ -1149,18 +1251,19 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.dgvSelectProduct.AllowUserToAddRows = false; this.dgvSelectProduct.AllowUserToDeleteRows = false; - dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3; + 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))))); - 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; + 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, @@ -1190,7 +1293,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.dgvSelectProduct.Name = "dgvSelectProduct"; this.dgvSelectProduct.ReadOnly = true; this.dgvSelectProduct.RowTemplate.Height = 23; - this.dgvSelectProduct.Size = new System.Drawing.Size(1042, 372); + this.dgvSelectProduct.Size = new System.Drawing.Size(1276, 372); this.dgvSelectProduct.TabIndex = 187; this.dgvSelectProduct.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvSelectProduct_CellContentClick); this.dgvSelectProduct.Scroll += new System.Windows.Forms.ScrollEventHandler(this.dgvSelectProduct_Scroll); @@ -1221,11 +1324,12 @@ namespace TemuKJD.PDDForms.ProductSelectForms // // colSupplierName // + dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle11; this.colSupplierName.Frozen = true; this.colSupplierName.HeaderText = "店铺名称"; this.colSupplierName.Name = "colSupplierName"; this.colSupplierName.ReadOnly = true; - this.colSupplierName.Width = 110; // // colLogin // @@ -1300,12 +1404,12 @@ namespace TemuKJD.PDDForms.ProductSelectForms // // colProductName // - dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colProductName.DefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colProductName.DefaultCellStyle = dataGridViewCellStyle12; this.colProductName.HeaderText = "商品标题"; this.colProductName.Name = "colProductName"; this.colProductName.ReadOnly = true; - this.colProductName.Width = 220; + this.colProductName.Width = 160; // // colProductCat // @@ -1371,7 +1475,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.colOpResult.HeaderText = "操作结果"; this.colOpResult.Name = "colOpResult"; this.colOpResult.ReadOnly = true; - this.colOpResult.Width = 200; + this.colOpResult.Width = 260; // // splitContainer4 // @@ -1388,8 +1492,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.splitContainer4.Panel2.Controls.Add(this.btnClear); this.splitContainer4.Panel2.Controls.Add(this.panelEx1); - this.splitContainer4.Size = new System.Drawing.Size(1350, 26); - this.splitContainer4.SplitterDistance = 659; + this.splitContainer4.Size = new System.Drawing.Size(1584, 26); + this.splitContainer4.SplitterDistance = 893; this.splitContainer4.TabIndex = 3; // // statusBar @@ -1400,7 +1504,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.statusBar.Location = new System.Drawing.Point(0, 0); this.statusBar.Margin = new System.Windows.Forms.Padding(0); this.statusBar.Name = "statusBar"; - this.statusBar.Size = new System.Drawing.Size(659, 26); + this.statusBar.Size = new System.Drawing.Size(893, 26); this.statusBar.TabIndex = 2; // // btnClear @@ -1457,7 +1561,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.BackColor = System.Drawing.Color.White; - this.ClientSize = new System.Drawing.Size(1350, 546); + this.ClientSize = new System.Drawing.Size(1584, 546); this.Controls.Add(this.splitContainer1); this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.Name = "PDDDBProdUserSelectForm"; @@ -1485,6 +1589,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.splitContainer3.ResumeLayout(false); this.splitContainer2.Panel1.ResumeLayout(false); this.splitContainer2.Panel2.ResumeLayout(false); + this.splitContainer2.Panel2.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit(); this.splitContainer2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.dgvShop)).EndInit(); @@ -1564,6 +1669,17 @@ namespace TemuKJD.PDDForms.ProductSelectForms private UserComponent.UcCheckBox chkKeepChanceGoodsImg; private System.Windows.Forms.PictureBox pbSkuImg; private System.Windows.Forms.Label lblLowPriceSkuImg; + private System.Windows.Forms.Label label20; + 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 label2; + public System.Windows.Forms.Label lblWaitToUp; + private System.Windows.Forms.TextBox txtTest20981; + private DevComponents.DotNetBar.PanelEx btnTest20981; private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck; private System.Windows.Forms.DataGridViewTextBoxColumn colSelectId; private System.Windows.Forms.DataGridViewTextBoxColumn colSupplierId; @@ -1586,14 +1702,9 @@ namespace TemuKJD.PDDForms.ProductSelectForms private System.Windows.Forms.DataGridViewLinkColumn ColDelete; private System.Windows.Forms.DataGridViewTextBoxColumn colAddTime; private System.Windows.Forms.DataGridViewTextBoxColumn colOpResult; - private System.Windows.Forms.Label label20; - 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 label2; - public System.Windows.Forms.Label lblWaitToUp; + private UserComponent.UcCheckBox chk15996; + private UserComponent.UcCheckBox chk21365; + private UserComponent.UcCheckBox chk20981; + private UserComponent.UcCheckBox chk22347; } } \ No newline at end of file diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.cs index dc2ed15..5ace58c 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.cs @@ -33,13 +33,13 @@ namespace TemuKJD.PDDForms.ProductSelectForms /// /// 拖鞋 /// - public static string[] slippersCatName { get; set; } = new string[] { "洞洞鞋", "其他凉鞋", "包头拖", "人字拖", "一字拖", "居家鞋", "棉拖鞋", "网面鞋", "居家凉拖", - "沙滩凉鞋", "休闲凉鞋", "凉鞋", "运动拖鞋", "时装凉鞋", "男凉拖", "擦地拖鞋", "亚麻拖鞋", "休闲皮鞋", "T恤", "高帮棉鞋", "罗马凉鞋" }; + public static string[] slippersCatName { get; set; } = new string[] { "洞洞鞋", "其他凉鞋", "包头拖", "人字拖", "一字拖", "居家鞋", "居家棉鞋", "棉拖鞋", "居家棉拖", "网面鞋", + "居家凉拖", "沙滩凉鞋", "休闲凉鞋", "凉鞋", "运动拖鞋", "时装凉鞋", "男凉拖", "擦地拖鞋", "亚麻拖鞋", "休闲皮鞋", "T恤", "高帮棉鞋", "罗马凉鞋" }; /// /// 运动鞋/休闲鞋 /// public static string[] sneakersCatName { get; set; } = new string[] { "运动休闲鞋", "布鞋", "帆布鞋", "单鞋", "板鞋/休闲鞋", "广场舞鞋", "板鞋", "乐福鞋", "健步鞋", - "跑步鞋", "棉鞋", "高帮休闲鞋", "网面鞋", "勃肯鞋/软木鞋", "包头拖", "足部磨砂", "老爹鞋", "工装鞋", "豆豆鞋", "汉服鞋" }; + "跑步鞋", "棉鞋", "高帮休闲鞋", "网面鞋", "勃肯鞋/软木鞋", "包头拖", "足部磨砂", "老爹鞋", "工装鞋", "豆豆鞋", "汉服鞋", "雨鞋" }; public CancellationTokenSource cancellationTokenSource { get; set; } = null; public bool IsLoadComplate { get; set; } = false; @@ -668,12 +668,17 @@ namespace TemuKJD.PDDForms.ProductSelectForms { Thread.Sleep(100); } - while(currentShopList.Any(s => s.ShopId == randomShop.ShopId)) + if (cancellationTokenSource.IsCancellationRequested) + break; + + while (currentShopList.Any(s => s.ShopId == randomShop.ShopId)) { Thread.Sleep(500); randomShop = randomShopLst[Randomx.GetId(randomShopLst.Count)]; } currentShopList.Add(randomShop); + if (cancellationTokenSource.IsCancellationRequested) + break; if (lstTemuDBProductSelect.Count <= 0) { @@ -691,6 +696,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms currentShopList.Remove(randomShop); continue; } + if (cancellationTokenSource.IsCancellationRequested) + break; lstTemuDBProductSelect.RemoveAt(0); NaiBa.Util.Helper.ConfigHelper.SaveConfig("pdd_db_prod_upload_list", this.lstTemuDBProductSelect); @@ -868,8 +875,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms continue; } + if (cancellationTokenSource.IsCancellationRequested) + break; //var prodDetailJson = GetHtml.UrlDecode(kjdDbProd.product_json); - result = UploadProduct(shop, kjdDbProd, prod, row.Cells["colOpResult"]); //将商品上传 + result = UploadProduct(shop, kjdDbProd, prod, row.Cells["colOpResult"], startTime); //将商品上传 Invoke(new Action(() => { row.Cells["colSkuFakeImgUrl"].Value = kjdDbProd.sku_img_replace_url; @@ -946,6 +955,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms for (int i = 0; i < 200 && currentShopList.Count > 0; i++) { Thread.Sleep(1000); + if (cancellationTokenSource.IsCancellationRequested) + break; } Invoke(new Action(() => { @@ -966,7 +977,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms })); } - string UploadProduct(ShopLoginInfo shop, KJDDBProduct dbProd, TemuDBProductSelect selectProd, DataGridViewCell cell) + string UploadProduct(ShopLoginInfo shop, KJDDBProduct dbProd, TemuDBProductSelect selectProd, DataGridViewCell cell, DateTime startTime) { if (shop == null || string.IsNullOrEmpty(shop.ShopId) || shop.LoginStatus != "登录成功") { @@ -2314,75 +2325,197 @@ namespace TemuKJD.PDDForms.ProductSelectForms })); } Thread.Sleep(Randomx.GetId(30000, 40000)); - - string activityErr = SignAcitvity(shop, prodParam); - Thread.Sleep(Randomx.GetId(6000, 12000)); - var getProdIdRst = get_prod_commit_id(shop, prodParamHighPrice.goods_id.ParseToString()); - var newCommitId = BaseRegex.GetStringJson(ref getProdIdRst, "goods_commit_id"); - prodParamHighPrice.goods_commit_id = newCommitId; - if (string.IsNullOrEmpty(newCommitId) || !getProdIdRst.Contains("\"success\":true")) - { - var error = BaseRegex.GetStringJson(ref getProdIdRst, "error_msg"); - if (string.IsNullOrEmpty(error)) - error = getProdIdRst; - if (BaseClass.SaLevel != 1 && 1 != 1) - return "上传失败"; - return "上传失败 校验上传失败 " + error; - } - - foreach(var sku in prodParamHighPrice.skus) - { - sku.quantity_delta = 0; - } - saveProdRst = save_goods_edit(shop, prodParamHighPrice, prodParamHighPrice.goods_id.ParseToString(), prodParamHighPrice.goods_commit_id, isChanceApi, "edit"); - if (!saveProdRst.Contains("\"success\":true")) - { - var error = BaseRegex.GetStringJson(ref saveProdRst, "error_msg"); - if (string.IsNullOrEmpty(error)) - error = saveProdRst; - - if (BaseClass.SaLevel != 1 && 1 != 1) - return "上传失败"; - return "上传失败 保存失败 " + error; - } - - Thread.Sleep(Randomx.GetId(20, 100)); - //var str = JsonHelper.SerializeObject(prodParam); - uploadRst = submit_goods_edit(shop, prodParamHighPrice.goods_id.ParseToString(), prodParamHighPrice.goods_commit_id, isChanceApi, "edit"); - if (!uploadRst.Contains("\"success\":true")) - { - var error = BaseRegex.GetStringJson(ref uploadRst, "error_msg"); - if (string.IsNullOrEmpty(error)) - error = uploadRst; - - if (BaseClass.SaLevel != 1 && 1 != 1) - return "上传失败"; - return "上传失败 提交失败 " + error; - } - - //Thread.Sleep(Randomx.GetId(4000, 8000)); - if (!string.IsNullOrEmpty(activityErr)) - { - return "已上传 " + activityErr; - } + var ta = Task.Run(() => SignActivityInTask(shop, prodParam, prodParamHighPrice, cell, startTime)); + //ta.Wait(); } return "{\"success\":true,\"draftId\":" + prodParam.goods_id + ",\"status\":\"已上传\",\"msg\":\"上传成功\"}"; } + public void SignActivityInTask(ShopLoginInfo shop, PDDProductUploadParam prodParam, PDDProductUploadParam prodParamHighPrice, DataGridViewCell cell, DateTime startTime) + { + Thread.Sleep(2000); + var endTime = DateTime.Now; + var timeSpan = endTime - startTime; + var duration = timeSpan.TotalSeconds; + if (cell != null) + { + Invoke(new Action(() => + { + cell.Value = "商品已上传，进行后续操作中" + " " + duration.ParseToInt() + "秒"; + })); + } + bool sign20981 = chk20981.Checked; + bool sign22347 = chk22347.Checked; + bool sign15996 = chk15996.Checked; + bool sign23165 = chk21365.Checked; + + Thread.Sleep(Randomx.GetId(2000, 6000)); + // 判断商品是否上架成功 + var getProdRst1 = queryActivityGoodsEnabled(shop, prodParam.goods_id.ParseToString(), 22347, 0); + var getProdRst2 = queryActivityGoodsEnabled(shop, prodParam.goods_id.ParseToString(), 22347, 1); + var getProdRst3 = ""; // queryActivityGoodsEnabled(shop, prodParam.goods_id.ParseToString(), 20981, 0); + var getProdRst4 = ""; // queryActivityGoodsEnabled(shop, prodParam.goods_id.ParseToString(), 20981, 1); + + if (!getProdRst1.Contains(prodParam.goods_id.ParseToString()) && !getProdRst2.Contains(prodParam.goods_id.ParseToString()) && + !getProdRst3.Contains(prodParam.goods_id.ParseToString()) && !getProdRst4.Contains(prodParam.goods_id.ParseToString())) + { + if (cell != null) + { + endTime = DateTime.Now; + timeSpan = endTime - startTime; + duration = timeSpan.TotalSeconds; + Invoke(new Action(() => + { + cell.Value = "上传错误，商品不存在" + " " + duration.ParseToInt() + "秒"; + })); + } + return; + } + else if (chk22347.Checked) + { + // 如果报了直通车，判断商品自动加入直通车以后再放行（循环12次应该已加入，否则认为加入失败跳过） + for (int i = 0; i < 12 && !getProdRst2.Contains(prodParam.goods_id.ParseToString()); i++) + { + if (cell != null) + { + endTime = DateTime.Now; + timeSpan = endTime - startTime; + duration = timeSpan.TotalSeconds; + Invoke(new Action(() => + { + cell.Value = "商品已上传，进行后续操作中" + " " + duration.ParseToInt() + "秒"; + })); + } + Thread.Sleep(60 * 1000); + getProdRst2 = queryActivityGoodsEnabled(shop, prodParam.goods_id.ParseToString(), 22347, 1); + if (getProdRst2.Contains(prodParam.goods_id.ParseToString())) + { + + } + } + } + + string activityErr = SignActivity(shop, prodParam, sign22347, sign20981, sign23165, sign15996); + + Thread.Sleep(Randomx.GetId(6000, 12000)); + var getProdIdRst = get_prod_commit_id(shop, prodParamHighPrice.goods_id.ParseToString()); + var newCommitId = BaseRegex.GetStringJson(ref getProdIdRst, "goods_commit_id"); + prodParamHighPrice.goods_commit_id = newCommitId; + if (string.IsNullOrEmpty(newCommitId) || !getProdIdRst.Contains("\"success\":true")) + { + var error = BaseRegex.GetStringJson(ref getProdIdRst, "error_msg"); + if (string.IsNullOrEmpty(error)) + error = getProdIdRst; + + //if (BaseClass.SaLevel != 1 && 1 != 1) + // return "上传失败"; + //return "上传失败 校验上传失败 " + error; + + if (cell != null) + { + endTime = DateTime.Now; + timeSpan = endTime - startTime; + duration = timeSpan.TotalSeconds; + Invoke(new Action(() => + { + cell.Value = "上传失败 校验上传失败 " + error + " " + duration.ParseToInt() + "秒"; + })); + } + return; + } + + foreach (var sku in prodParamHighPrice.skus) + { + sku.quantity_delta = 0; + } + var reSaveProdRst = save_goods_edit(shop, prodParamHighPrice, prodParamHighPrice.goods_id.ParseToString(), prodParamHighPrice.goods_commit_id, isChanceApi, "edit"); + if (!reSaveProdRst.Contains("\"success\":true")) + { + var error = BaseRegex.GetStringJson(ref reSaveProdRst, "error_msg"); + if (string.IsNullOrEmpty(error)) + error = reSaveProdRst; + + //if (BaseClass.SaLevel != 1 && 1 != 1) + // return "上传失败"; + //return "上传失败 保存失败 " + error; + if (cell != null) + { + endTime = DateTime.Now; + timeSpan = endTime - startTime; + duration = timeSpan.TotalSeconds; + Invoke(new Action(() => + { + cell.Value = "上传失败 保存失败 " + error + " " + duration.ParseToInt() + "秒"; + })); + } + return; + } + + Thread.Sleep(Randomx.GetId(20, 100)); + //var str = JsonHelper.SerializeObject(prodParam); + var reUploadRst = submit_goods_edit(shop, prodParamHighPrice.goods_id.ParseToString(), prodParamHighPrice.goods_commit_id, isChanceApi, "edit"); + if (!reUploadRst.Contains("\"success\":true")) + { + var error = BaseRegex.GetStringJson(ref reUploadRst, "error_msg"); + if (string.IsNullOrEmpty(error)) + error = reUploadRst; + + //if (BaseClass.SaLevel != 1 && 1 != 1) + // return "上传失败"; + //return "上传失败 提交失败 " + error; + + if (cell != null) + { + endTime = DateTime.Now; + timeSpan = endTime - startTime; + duration = timeSpan.TotalSeconds; + Invoke(new Action(() => + { + cell.Value = "上传失败 保存失败 " + error + " " + duration.ParseToInt() + "秒"; + })); + } + return; + } + + //Thread.Sleep(Randomx.GetId(4000, 8000)); + if (!string.IsNullOrEmpty(activityErr)) + { + //return "已上传 " + activityErr; + } + + if (cell != null) + { + endTime = DateTime.Now; + timeSpan = endTime - startTime; + duration = timeSpan.TotalSeconds; + Invoke(new Action(() => + { + if (!string.IsNullOrEmpty(activityErr)) + { + cell.Value = "已成功上传 " + activityErr + " " + duration.ParseToInt() + "秒"; + } + else + { + cell.Value = "已成功上传" + " " + duration.ParseToInt() + "秒"; + } + })); + } + } + /// - /// 20981 18586百万爆款 21365七折活动 23620临时活动 15996两件9块9活动(价格要求低于29.9元) + /// 所有活动： 22347直通车加权 20981长期报名入口 21365七折活动 15996两件9块9活动(价格要求低于29.9元) 18586百万爆款(需上架满一天) 23620临时活动(已结束) /// /// /// /// - public string SignAcitvity(ShopLoginInfo shop, PDDProductUploadParam prodParam) + public string SignActivity(ShopLoginInfo shop, PDDProductUploadParam prodParam, bool sign22347 = true, bool sign20981 = true, bool sign21365 = true, bool sign15996 = true) { string activityErr = ""; //21365 7折活动 - if (1 == 1) + if (1 == 1 && sign21365) { var activityRst2 = activity_goods_price_rule(shop, prodParam.goods_id.ParseToString(), 21365, 27); if (!activityRst2.Contains("\"success\":true")) @@ -2597,8 +2730,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms } //活动3 restoreSkuImg5: - //23620 临时活动 - if (1 == 1) + //23620 临时活动 活动已结束，停止操作 + if (1 == 2) { Thread.Sleep(Randomx.GetId(500, 1500)); var activityRst4 = activity_goods_price_rule(shop, prodParam.goods_id.ParseToString(), 23620, 27); @@ -2705,108 +2838,16 @@ namespace TemuKJD.PDDForms.ProductSelectForms } //活动4 restoreSkuImg4: - // 20981 - if (1 == 1) + // 20981 长期活动 + if (1 == 1 && sign20981) { - Thread.Sleep(Randomx.GetId(500, 1500)); - var activityRst1 = activity_goods_info(shop, prodParam.goods_id.ParseToString(), "20981"); - if (!activityRst1.Contains("\"success\":true")) - { - var error = BaseRegex.GetStringJson(ref activityRst1, "error_msg"); - if (string.IsNullOrEmpty(error)) - error = activityRst1; - activityErr += "\r\n上传错误 981查询失败 " + error; - if (BaseClass.SaLevel != 1 && 1 != 1) - activityErr = "上传错误"; - goto restoreSkuImg1; - } - try - { - var jObj = JObject.Parse(activityRst1); - var jStr = JsonHelper.SerializeObject(jObj["result"]["result"]); - var pddActivitiInfo = (JsonHelper.DeserializeJsonToObject(jStr)?.theme_activity_quick_enroll_goods_render_form_list).FirstOrDefault(); - - if (pddActivitiInfo == null) - { - activityErr += "\r\n上传错误 981查询/新建失败 商品未提交成功或不满足参加活动条件"; - if (BaseClass.SaLevel != 1 && 1 != 1) - activityErr = "上传错误"; - goto restoreSkuImg1; - } - foreach (var activitySku in pddActivitiInfo.activity_price_render.sku_activity_price_render_dtolist) - { - //var sku = prodParam.skus.FirstOrDefault(s => s.sku_id == activitySku.sku_id); - var sku = prodParam.skus.FirstOrDefault(sk => string.Join("，", sk.spec.Select(s => s.spec_name)) == activitySku.sku_name); - if (sku == null || sku.multi_price > activitySku.suggest_price) - { - activityErr += "\r\n上传错误 981价格低于产品价 " + activitySku.suggest_price + " < " + sku.multi_price; - if (BaseClass.SaLevel != 1 && 1 != 1) - activityErr = "上传错误"; - goto restoreSkuImg1; - } - } - - PDDActivitySubmitParam actSubmitParam = new PDDActivitySubmitParam(); - actSubmitParam.activity_id = pddActivitiInfo.activity_id; - actSubmitParam.enroll_source_ctx.enroll_type = 34; - actSubmitParam.enroll_source_ctx.scene_full_coverage = "mmsActQuickEnrollMultiActivityRealTableV1"; - actSubmitParam.enroll_source_ctx.source_type = "OwnHome_MultiActEnrollMMS"; - actSubmitParam.enroll_source_ctx.scene_type = null; - - var goods_vo_item = new goods_vo_param(); - goods_vo_item.goods_id = prodParam.goods_id; - var skuSamePrice = prodParam.skus.Max(s => s.multi_price); - foreach (var activitySku in pddActivitiInfo.activity_price_render.sku_activity_price_render_dtolist) - { - //var sku = prodParam.skus.FirstOrDefault(s => s.sku_id == activitySku.sku_id); - var sku = prodParam.skus.FirstOrDefault(sk => string.Join("，", sk.spec.Select(s => s.spec_name)) == activitySku.sku_name); - if (sku == null) - { - activityErr += "\r\n上传错误 981价格sku未找到"; - if (BaseClass.SaLevel != 1 && 1 != 1) - activityErr = "上传错误"; - goto restoreSkuImg1; - } - - create_sku_vo_param sku_vo_item = new create_sku_vo_param(); - sku_vo_item.sku_id = activitySku.sku_id; - sku_vo_item.sku_activity_price = sku.multi_price; //skuSamePrice; //sku.multi_price; //activitySku.suggest_price; - sku_vo_item.sku_front_ctx_vo = new sku_front_ctx_vo_param() - { - filling_sku_price = sku.multi_price, //skuSamePrice, //sku.multi_price, //activitySku.suggest_price, - gear_rule = activitySku.gear_rule, - require_price = sku.multi_price, //skuSamePrice, //sku.multi_price, //activitySku.suggest_price, - }; - goods_vo_item.create_activity_price_vo.create_sku_vos.Add(sku_vo_item); - } - actSubmitParam.goods_volist.Add(goods_vo_item); - actSubmitParam.create_protocol_vo.need_create_cost_template = true; - - var addActivityRst = add_activity_goods(shop, actSubmitParam, prodParam.goods_id.ParseToString(), 20981, 0); - var err_msg = BaseRegex.GetStringJson(ref addActivityRst, "error_msg"); - if (!addActivityRst.Contains("\"success\":true") || !string.IsNullOrEmpty(err_msg)) - { - var error = BaseRegex.GetStringJson(ref addActivityRst, "error_msg"); - if (string.IsNullOrEmpty(error)) - error = addActivityRst; - activityErr += "\r\n上传错误 981新建失败 " + error; - if (BaseClass.SaLevel != 1 && 1 != 1) - activityErr = "上传错误"; - goto restoreSkuImg1; - } - } // 活动1 - catch (Exception ex) - { - activityErr += "\r\n上传错误 981查询/新建失败 " + ex.Message; - if (BaseClass.SaLevel != 1 && 1 != 1) - activityErr = "上传错误"; - goto restoreSkuImg1; - } + activityErr += SignActivity20981(shop, prodParam); + goto restoreSkuImg1; } restoreSkuImg1: //15996 9块9 (价格要求低于29.9元) - if (1 == 1 && !prodParam.skus.Any(s => s.multi_price > 2990)) + if (1 == 1 && sign15996 && !prodParam.skus.Any(s => s.multi_price > 2990)) { Thread.Sleep(Randomx.GetId(500, 1500)); var activityRst3 = activity_goods_price_rule(shop, prodParam.goods_id.ParseToString(), 15996, 18); @@ -2907,6 +2948,308 @@ namespace TemuKJD.PDDForms.ProductSelectForms } //活动3 restoreSkuImg3: + // 22347 直通车加权 + if (1 == 1 && sign22347) + { + activityErr += SignActivity22347(shop, prodParam); + } + + return activityErr; + } + + /// + /// 通过直接获取商品测试设置20981活动 + /// + /// + /// + /// + string SignActivity20981Test(ShopLoginInfo shop, PDDProductInfo prodInfo) + { + decimal ratio = 0.33m; + var prodParam = new PDDProductUploadParam(); + prodParam.goods_id = prodInfo.detail.goods_id; + prodParam.skus = new List(); + foreach (var skuInfo in prodInfo.detail.sku) + { + var skuParam = new sku_param() + { + id = skuInfo.id, + is_onsale = skuInfo.is_onsale, + limit_quantity = skuInfo.limit_quantity, + multi_price = (skuInfo.multi_price * ratio).ParseToInt(), + out_sku_sn = skuInfo.out_sku_sn, + oversea_sku = skuInfo.oversea_sku, + price = (skuInfo.price * ratio).ParseToInt(), + quantity_delta = txtStockNum.Text.Trim().ParseToInt(), //skuInfo.quantity, + shipment_limit_second_list = skuInfo.shipment_limit_second_list, + sku69_code = skuInfo.sku69_code, + sku_srv_templates = skuInfo.sku_srv_templates.ParseToString(), + spec = JsonHelper.DeserializeJsonToList(JsonHelper.SerializeObject(skuInfo.spec)), + thumb_url = skuInfo.thumb_url, + weight = skuInfo.weight, + length = skuInfo.length, + price_in_yuan = "", // 内部计算直接置空 + multi_price_in_yuan = "", // 内部计算直接置空 + pre_sale_time = skuInfo.pre_sale_time, + sku_id = skuInfo.sku_id, + thumb_url_file_id = skuInfo.thumb_url_file_id, + }; + if (prodParam.market_price < skuParam.price + 1000) + { + prodParam.market_price = skuParam.price + 1000; + prodParam.market_price_in_yuan = (prodParam.market_price * 0.01).ParseToString(); + } + prodParam.skus.Add(skuParam); + } + return SignActivity20981(shop, prodParam); + } + + string SignActivity20981(ShopLoginInfo shop, PDDProductUploadParam prodParam) + { + string activityErr = ""; + Thread.Sleep(Randomx.GetId(500, 1500)); + var activityRst1 = activity_goods_info(shop, prodParam.goods_id.ParseToString(), "20981"); + if (!activityRst1.Contains("\"success\":true")) + { + var error = BaseRegex.GetStringJson(ref activityRst1, "error_msg"); + if (string.IsNullOrEmpty(error)) + error = activityRst1; + activityErr += "\r\n上传错误 981查询失败 " + error; + if (BaseClass.SaLevel != 1 && 1 != 1) + activityErr = "上传错误"; + //goto restoreSkuImg1; + return activityErr; + } + try + { + var jObj = JObject.Parse(activityRst1); + var jStr = JsonHelper.SerializeObject(jObj["result"]["result"]); + var pddActivitiInfo = (JsonHelper.DeserializeJsonToObject(jStr)?.theme_activity_quick_enroll_goods_render_form_list).FirstOrDefault(); + + if (pddActivitiInfo == null) + { + activityErr += "\r\n上传错误 981查询/新建失败 商品未提交成功或不满足参加活动条件"; + if (BaseClass.SaLevel != 1 && 1 != 1) + activityErr = "上传错误"; + //goto restoreSkuImg1; + return activityErr; + } + foreach (var activitySku in pddActivitiInfo.activity_price_render.sku_activity_price_render_dtolist) + { + //var sku = prodParam.skus.FirstOrDefault(s => s.sku_id == activitySku.sku_id); + var sku = prodParam.skus.FirstOrDefault(sk => string.Join("，", sk.spec.Select(s => s.spec_name)) == activitySku.sku_name); + if (sku == null || sku.multi_price > activitySku.suggest_price) + { + activityErr += "\r\n上传错误 981价格低于产品价 " + activitySku.suggest_price + " < " + sku.multi_price; + if (BaseClass.SaLevel != 1 && 1 != 1) + activityErr = "上传错误"; + //goto restoreSkuImg1; + return activityErr; + } + } + + PDDActivitySubmitParam actSubmitParam = new PDDActivitySubmitParam(); + actSubmitParam.activity_id = pddActivitiInfo.activity_id; + actSubmitParam.enroll_source_ctx.enroll_type = 34; //入口1 + //actSubmitParam.enroll_source_ctx.enroll_type = 3; //入口2 + actSubmitParam.enroll_source_ctx.scene_full_coverage = "mmsActQuickEnrollMultiActivityRealTableV1"; //入口1 + //actSubmitParam.enroll_source_ctx.scene_full_coverage = "mmsActBatchEnrollV1"; //入口2 + actSubmitParam.enroll_source_ctx.source_type = "OwnHome_MultiActEnrollMMS"; //入口1 + //actSubmitParam.enroll_source_ctx.source_type = "MMSActicon"; //入口2 + actSubmitParam.enroll_source_ctx.scene_type = null; //入口1 + //actSubmitParam.enroll_source_ctx.scene_type = "ActivityCard"; //入口2 + + var goods_vo_item = new goods_vo_param(); + goods_vo_item.goods_id = prodParam.goods_id; + var skuSamePrice = prodParam.skus.Max(s => s.multi_price); + foreach (var activitySku in pddActivitiInfo.activity_price_render.sku_activity_price_render_dtolist) + { + //var sku = prodParam.skus.FirstOrDefault(s => s.sku_id == activitySku.sku_id); + var sku = prodParam.skus.FirstOrDefault(sk => string.Join("，", sk.spec.Select(s => s.spec_name)) == activitySku.sku_name); + if (sku == null) + { + activityErr += "\r\n上传错误 981价格sku未找到"; + if (BaseClass.SaLevel != 1 && 1 != 1) + activityErr = "上传错误"; + //goto restoreSkuImg1; + return activityErr; + } + + create_sku_vo_param sku_vo_item = new create_sku_vo_param(); + sku_vo_item.sku_id = activitySku.sku_id; + sku_vo_item.sku_activity_price = sku.multi_price; //skuSamePrice; //sku.multi_price; //activitySku.suggest_price; + sku_vo_item.sku_front_ctx_vo = new sku_front_ctx_vo_param() + { + filling_sku_price = sku.multi_price, //skuSamePrice, //sku.multi_price, //activitySku.suggest_price, + gear_rule = activitySku.gear_rule, + require_price = sku.multi_price, //skuSamePrice, //sku.multi_price, //activitySku.suggest_price, + }; + goods_vo_item.create_activity_price_vo.create_sku_vos.Add(sku_vo_item); + } + actSubmitParam.goods_volist.Add(goods_vo_item); + actSubmitParam.create_protocol_vo.need_create_cost_template = true; + + if (pddActivitiInfo.need_goods_activity_price == true) + actSubmitParam.goods_volist.FirstOrDefault().view_confirmed_goods_protocol_vo.confirm_hit_cut_price = true; + + //var addActivityRst = add_activity_goods(shop, actSubmitParam, prodParam.goods_id.ParseToString(), 20981, 0); + var addActivityRst = add_activity_goods(shop, actSubmitParam, prodParam.goods_id.ParseToString(), 20981, 27); + var err_msg = BaseRegex.GetStringJson(ref addActivityRst, "error_msg"); + if (err_msg.ParseToString().Contains("报名该活动需要签署降价补差协议，立即前往链接签署")) + { + Invoke(new Action(() => + { + PDDShopLoginForm loginForm = new PDDShopLoginForm(shop); + loginForm.openType = EnumOpenType.manage; + loginForm.InitUrl = err_msg.Substring(err_msg.IndexOf("https://")); //"https://mms.pinduoduo.com/mallcenter/signProtocol/21"; + loginForm.ShowDialog(); + })); + addActivityRst = add_activity_goods(shop, actSubmitParam, prodParam.goods_id.ParseToString(), 20981, 27); + err_msg = BaseRegex.GetStringJson(ref addActivityRst, "error_msg"); + } + if (!addActivityRst.Contains("\"success\":true") || !string.IsNullOrEmpty(err_msg)) + { + var error = BaseRegex.GetStringJson(ref addActivityRst, "error_msg"); + if (string.IsNullOrEmpty(error)) + error = addActivityRst; + activityErr += "\r\n上传错误 981新建失败 " + error; + if (BaseClass.SaLevel != 1 && 1 != 1) + activityErr = "上传错误"; + //goto restoreSkuImg1; + return activityErr; + } + } // 活动1 + catch (Exception ex) + { + activityErr += "\r\n上传错误 981查询/新建失败 " + ex.Message; + if (BaseClass.SaLevel != 1 && 1 != 1) + activityErr = "上传错误"; + //goto restoreSkuImg1; + return activityErr; + } + return activityErr; + } + + string SignActivity22347(ShopLoginInfo shop, PDDProductUploadParam prodParam) + { + string activityErr = ""; + Thread.Sleep(Randomx.GetId(500, 1500)); + var activityRst2 = activity_goods_price_rule(shop, prodParam.goods_id.ParseToString(), 22347, 27); + if (!activityRst2.Contains("\"success\":true")) + { + var error = BaseRegex.GetStringJson(ref activityRst2, "error_msg"); + if (string.IsNullOrEmpty(error)) + error = activityRst2; + activityErr += "\r\n上传错误 347查询失败 " + error; + if (BaseClass.SaLevel != 1 && 1 != 1) + activityErr = "上传错误"; + //goto restoreSkuImg1; + return activityErr; + } + try + { + var jObj = JObject.Parse(activityRst2); + var jStr = JsonHelper.SerializeObject(jObj["result"]); + var pddActivitiPriceInfo = JsonHelper.DeserializeJsonToObject(jStr); + var pddActivitiPriceProd = pddActivitiPriceInfo.enroll_goods_rule_vos.FirstOrDefault(); + + if (pddActivitiPriceProd == null) + { + activityErr += "\r\n上传错误 347查询/新建失败 商品未提交成功或不满足参加活动条件"; + if (BaseClass.SaLevel != 1 && 1 != 1) + activityErr = "上传错误"; + //goto restoreSkuImg1; + return activityErr; + } + foreach (var activitySkuInfo in pddActivitiPriceProd.enroll_rule_param.enroll_goods_big_sale_price.sku_info_list) + { + //var sku = prodParam.skus.FirstOrDefault(s => s.sku_id == activitySku.sku_id); + var sku = prodParam.skus.FirstOrDefault(sk => string.Join("，", sk.spec.Select(s => s.spec_name)) == activitySkuInfo.spec_info_str); + if (sku == null || sku.multi_price > activitySkuInfo.require_price) + { + activityErr += "\r\n上传错误 347价格低于产品价 " + activitySkuInfo.require_price + " < " + sku.multi_price; + if (BaseClass.SaLevel != 1 && 1 != 1) + activityErr = "上传错误"; + //goto restoreSkuImg1; + return activityErr; + } + } + + PDDActivitySubmitParam actSubmitParam = new PDDActivitySubmitParam(); + actSubmitParam.activity_id = pddActivitiPriceInfo.activity_id; + actSubmitParam.enroll_source_ctx.enroll_type = 3; + actSubmitParam.enroll_source_ctx.scene_full_coverage = "mmsActBatchEnrollV1"; + actSubmitParam.enroll_source_ctx.source_type = null; + actSubmitParam.enroll_source_ctx.scene_type = null; + + var goods_vo_item = new goods_vo_param(); + goods_vo_item.goods_id = prodParam.goods_id; + var skuSamePrice = prodParam.skus.Max(s => s.multi_price); + foreach (var activitySkuInfo in pddActivitiPriceProd.enroll_rule_param.enroll_goods_big_sale_price.sku_info_list) + { + //var sku = prodParam.skus.FirstOrDefault(s => s.sku_id == activitySku.sku_id); + var sku = prodParam.skus.FirstOrDefault(sk => string.Join("，", sk.spec.Select(s => s.spec_name)) == activitySkuInfo.spec_info_str); + if (sku == null) + { + activityErr += "\r\n上传错误 347价格sku未找到"; + if (BaseClass.SaLevel != 1 && 1 != 1) + activityErr = "上传错误"; + //goto restoreSkuImg1; + return activityErr; + } + + create_sku_vo_param sku_vo_item = new create_sku_vo_param(); + sku_vo_item.sku_id = activitySkuInfo.sku_id; + sku_vo_item.sku_activity_price = sku.multi_price; //skuSamePrice; //sku.multi_price; //activitySku.suggest_price; + sku_vo_item.sku_front_ctx_vo = new sku_front_ctx_vo_param() + { + filling_sku_price = sku.multi_price, + gear_rule = activitySkuInfo.gear_rule, + require_price = sku.multi_price, + filling_sku_price_gear_rule = activitySkuInfo.filling_sku_price_gear_rule, + }; + goods_vo_item.create_activity_price_vo.create_sku_vos.Add(sku_vo_item); + } + actSubmitParam.goods_volist.Add(goods_vo_item); + actSubmitParam.create_protocol_vo.need_create_cost_template = true; + + //if (pddActivitiInfo.need_goods_activity_price == true) + actSubmitParam.goods_volist.FirstOrDefault().view_confirmed_goods_protocol_vo.confirm_hit_cut_price = true; + + var addActivityRst = add_activity_goods(shop, actSubmitParam, prodParam.goods_id.ParseToString(), 22347, 27); + var err_msg = BaseRegex.GetStringJson(ref addActivityRst, "error_msg"); + if (err_msg.ParseToString().Contains("报名该活动需要签署降价补差协议，立即前往链接签署")) + { + Invoke(new Action(() => + { + PDDShopLoginForm loginForm = new PDDShopLoginForm(shop); + loginForm.openType = EnumOpenType.manage; + loginForm.InitUrl = err_msg.Substring(err_msg.IndexOf("https://")); //"https://mms.pinduoduo.com/mallcenter/signProtocol/21"; + loginForm.ShowDialog(); + })); + addActivityRst = add_activity_goods(shop, actSubmitParam, prodParam.goods_id.ParseToString(), 22347, 27); + err_msg = BaseRegex.GetStringJson(ref addActivityRst, "error_msg"); + } + if (!addActivityRst.Contains("\"success\":true") || !string.IsNullOrEmpty(err_msg)) + { + var error = BaseRegex.GetStringJson(ref addActivityRst, "error_msg"); + if (string.IsNullOrEmpty(error)) + error = addActivityRst; + activityErr += "\r\n上传错误 347新建失败 " + error; + if (BaseClass.SaLevel != 1 && 1 != 1) + activityErr = "上传错误"; + //goto restoreSkuImg1; + return activityErr; + } + } // 活动1 + catch (Exception ex) + { + activityErr += "\r\n上传错误 347查询/新建失败 " + ex.Message; + if (BaseClass.SaLevel != 1 && 1 != 1) + activityErr = "上传错误"; + //goto restoreSkuImg1; + return activityErr; + } return activityErr; } @@ -3643,7 +3986,7 @@ Content-Disposition: form-data; name=""pic_operations"" } /// - /// 20981 + /// 查询活动商品 20981 /// /// /// @@ -3685,6 +4028,8 @@ Content-Disposition: form-data; name=""pic_operations"" string refere = "https://mms.pinduoduo.com/act/goods_price/confirm?activityId=" + activityId + "&activityType=" + activityType + "&from=chooseGoods&SourceType=MMSActicon&SceneType=ActivityCard"; + if (activityId == 22347) + refere = "https://mms.pinduoduo.com/act/goods_price/confirm?activityId=" + activityId + "&activityType=" + activityType + "&from=chooseGoods"; var result = HttpResponseBLL.PDDPostResponse(shop, url, body, refere, anti); for (int i = 0; i < 5 && (result.Contains("当前请求频繁，请2小时后重试") || result.Contains("网络繁忙，请不要频繁操作") || result.Contains("您的店铺操作过于频繁，请稍后操作")); i++) @@ -3727,6 +4072,15 @@ Content-Disposition: form-data; name=""pic_operations"" return result; } + /// + /// 设置活动 + /// + /// + /// + /// + /// + /// + /// private string add_activity_goods(ShopLoginInfo shop, PDDActivitySubmitParam actSubmitParam, string prodId, int activityId, int activityType) { var anti = shop.AntiContents.LastOrDefault().ParseToString(); @@ -3738,7 +4092,15 @@ Content-Disposition: form-data; name=""pic_operations"" string refere = "https://mms.pinduoduo.com/act/goods_price/confirm?activityId=" + activityId + "&activityType=" + activityType + "&from=chooseGoods&SourceType=MMSActicon&SceneType=ActivityCard"; if (activityId == 20981) - refere = "https://mms.pinduoduo.com/act/multi-act-enroll?activityId=" + activityId + "&SourceType=PROMO-OwnHome"; + { + //refere = "https://mms.pinduoduo.com/act/multi-act-enroll?activityId=" + activityId + "&SourceType=PROMO-OwnHome"; + //入口1 + refere = "https://mms.pinduoduo.com/act/multi-act-enroll?activityId=20981&activityType=27&SourceType=PROMO-OwnHome"; + //入口2 + //refere = "https://mms.pinduoduo.com/act/goods_price/confirm?activityId=20981&activityType=27&from=chooseGoods&SourceType=MMSActicon&SceneType=ActivityCard"; + } + if (activityId == 22347) + refere = "https://mms.pinduoduo.com/act/goods_price/confirm?activityId=22347&activityType=27&from=chooseGoods"; if (activityId == 18586) refere = "https://mms.pinduoduo.com/act/sign?id=18586&pyramidActivityId=7&SourceType=PROMO-Pyramid&SceneType=Pyramid"; @@ -3757,6 +4119,32 @@ Content-Disposition: form-data; name=""pic_operations"" return result; } + private string queryActivityGoodsEnabled(ShopLoginInfo shop, string prodId, int activityId, int canUse = 1) + { + var anti = shop.AntiContents.LastOrDefault().ParseToString(); + if (shop.AntiContents.Count > 0) + anti = shop.AntiContents[Randomx.GetId(shop.AntiContents.Count)]; + string url = "https://mms.pinduoduo.com/leekmms/activity/query/eligible/goods/listV2"; + string body = @"{""activity_id"":""" + activityId + @""",""page_number"":1,""page_size"":50,""query_goods_from_excel"":false,""eligible"":" + canUse + + @",""goods_id_list"":[" + prodId + "]}"; + + string refere = "https://mms.pinduoduo.com/act/choose_goods/v2?id=" + activityId + "&SourceType=MMSActicon&SceneType=ActivityCard&chooseGoodsType=0"; + + var result = HttpResponseBLL.PDDPostResponse(shop, url, body, refere, anti); + for (int i = 0; i < 5 && (result.Contains("当前请求频繁，请2小时后重试") || result.Contains("网络繁忙，请不要频繁操作") || result.Contains("您的店铺操作过于频繁，请稍后操作")); i++) + { + shop.AntiContents.Remove(anti); + anti = shop.AntiContents.FirstOrDefault().ParseToString(); + if (shop.AntiContents.Count > 0) + { + Thread.Sleep(Randomx.GetId(300, 500)); + anti = shop.AntiContents[Randomx.GetId(shop.AntiContents.Count)]; + result = HttpResponseBLL.PDDPostResponse(shop, url, body, refere, anti); + } + } + return result; + } + private void panel1_Paint(object sender, PaintEventArgs e) { @@ -4295,6 +4683,10 @@ Content-Disposition: form-data; name=""pic_operations"" private void chkActivity_CheckedChanged(object sender, EventArgs e) { isActivityFake = chkActivity.Checked; + if (chkActivity.Checked) + { + chk15996.Checked = chk20981.Checked = chk21365.Checked = chk22347.Checked = true; + } if (IsLoadComplate) { pddUploadRule.IsSignActivity = chkActivity.Checked; @@ -4413,6 +4805,12 @@ Content-Disposition: form-data; name=""pic_operations"" NaiBa.Util.Helper.ConfigHelper.SaveConfig("pdd_upload_rule", pddUploadRule); } } + + private void chkActivityDetail_CheckedChanged(object sender, EventArgs e) + { + if (!chk15996.Checked && !chk20981.Checked && !chk21365.Checked && !chk22347.Checked) + chkActivity.Checked = false; + } } public class AddPriceRule diff --git a/TEMUKJD/PDDForms/ShopForms/PDDShopBrowserObject.cs b/TEMUKJD/PDDForms/ShopForms/PDDShopBrowserObject.cs index 551fe2b..7c00ef7 100644 --- a/TEMUKJD/PDDForms/ShopForms/PDDShopBrowserObject.cs +++ b/TEMUKJD/PDDForms/ShopForms/PDDShopBrowserObject.cs @@ -24,7 +24,7 @@ namespace TemuKJD.PDDForms.ShopForms public delegate void InfoReceivedHandler(string information); public event InfoReceivedHandler OnInfoReceived; - public string getProduct(string sProdId, string supplierId) + public string getProduct(string sProdId, string supplierId, PDDProductInfo prodInfo = null, bool notSaveDb = false) { var prodId = sProdId.ParseToLong(); if (prodId <= 0) @@ -266,93 +266,101 @@ namespace TemuKJD.PDDForms.ShopForms string product_json = "{\"detail\":" + detail_json + ",\"size\":" + size_json + ",\"decoration\":" + decoration_json + ",\"material3\":" + material3_json + ",\"material1\":" + material1_json + ",\"property\":" + property_json + "}"; - string main_img = product.image_url; - if (string.IsNullOrEmpty(main_img)) - main_img = product.hd_thumb_url; - if (string.IsNullOrEmpty(main_img)) - main_img = product.thumb_url; - if (string.IsNullOrEmpty(main_img)) - main_img = (product.galleries?.FirstOrDefault()?.url).ParseToString().Replace("https://", "http://"); - var url = BaseClass.BuildObjString("product/add_product"); - if (isExist) - { - bool isCover = false; - MainForm.instance.Invoke(new Action(() => - { - var ok = BaseMsgForm.ShowConfirm("产品库内已存在相同id商品，是否更新？").DialogResult; - if (ok == DialogResult.OK) - isCover = true; - })); - if (isCover) - url = BaseClass.BuildObjString("product/mdy_product"); - else - return; - } - var data = Work.UserLogin.GetSignaturex() + - "&from_shop_id=" + shop.ShopId + - "&spu_id=" + product.goods_id.ParseToString() + - "&skc_id=" + product.goods_id.ParseToString() + - "&price_text=" + product.sku.Min(s => s.multi_price).ParseToInt() * 0.01m + "-" + product.sku.Max(s => s.multi_price).ParseToInt() * 0.01m + - "&main_cat_id=" + (product.cat_ids?.FirstOrDefault(c => c != null)).ParseToString() + - "&main_cat_name=" + HttpUtility.UrlEncode((product.cats?.FirstOrDefault(c => !string.IsNullOrEmpty(c))).ParseToString(), Encoding.UTF8) + - "&cat_id=" + (product.cat_id).ParseToString() + - "&cat_name=" + HttpUtility.UrlEncode((product.cats?.LastOrDefault(c => !string.IsNullOrEmpty(c))).ParseToString(), Encoding.UTF8) + - "&ext_code=" + HttpUtility.UrlEncode(product.out_goods_sn, Encoding.UTF8) + - "&product_name=" + HttpUtility.UrlEncode(product.goods_name, Encoding.UTF8) + - "&product_json=" + HttpUtility.UrlEncode(product_json, Encoding.UTF8) + - "&size_json=" + HttpUtility.UrlEncode(size_json, Encoding.UTF8) + - "&main_img=" + HttpUtility.UrlEncode(main_img, Encoding.UTF8); - - html = GetHtml.PostUtf8(url, data); - if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) - html = GetHtml.PostUtf8(url, data); - if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) - html = GetHtml.PostUtf8(url, data); - if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) + if (notSaveDb) { - string msg = "选品商品保存失败!请检查网络连接：" + BaseRegex.GetStringJson(ref html, "msg"); - //OnInfoReceived(msg); - MainForm.instance.Invoke(new Action(() => - { - BaseMsgForm.ShowError(msg); - })); + prodInfo = JsonHelper.DeserializeJsonToObject(product_json); } else { - //OnInfoReceived("选品商品保存成功!" + success_err_msg); - MainForm.instance.Invoke(new Action(() => + string main_img = product.image_url; + if (string.IsNullOrEmpty(main_img)) + main_img = product.hd_thumb_url; + if (string.IsNullOrEmpty(main_img)) + main_img = product.thumb_url; + if (string.IsNullOrEmpty(main_img)) + main_img = (product.galleries?.FirstOrDefault()?.url).ParseToString().Replace("https://", "http://"); + var url = BaseClass.BuildObjString("product/add_product"); + if (isExist) { - BaseMsgForm.ShowInfo("选品商品保存成功!" + success_err_msg); - })); + bool isCover = false; + MainForm.instance.Invoke(new Action(() => + { + var ok = BaseMsgForm.ShowConfirm("产品库内已存在相同id商品，是否更新？").DialogResult; + if (ok == DialogResult.OK) + isCover = true; + })); + if (isCover) + url = BaseClass.BuildObjString("product/mdy_product"); + else + return; + } + + var data = Work.UserLogin.GetSignaturex() + + "&from_shop_id=" + shop.ShopId + + "&spu_id=" + product.goods_id.ParseToString() + + "&skc_id=" + product.goods_id.ParseToString() + + "&price_text=" + product.sku.Min(s => s.multi_price).ParseToInt() * 0.01m + "-" + product.sku.Max(s => s.multi_price).ParseToInt() * 0.01m + + "&main_cat_id=" + (product.cat_ids?.FirstOrDefault(c => c != null)).ParseToString() + + "&main_cat_name=" + HttpUtility.UrlEncode((product.cats?.FirstOrDefault(c => !string.IsNullOrEmpty(c))).ParseToString(), Encoding.UTF8) + + "&cat_id=" + (product.cat_id).ParseToString() + + "&cat_name=" + HttpUtility.UrlEncode((product.cats?.LastOrDefault(c => !string.IsNullOrEmpty(c))).ParseToString(), Encoding.UTF8) + + "&ext_code=" + HttpUtility.UrlEncode(product.out_goods_sn, Encoding.UTF8) + + "&product_name=" + HttpUtility.UrlEncode(product.goods_name, Encoding.UTF8) + + "&product_json=" + HttpUtility.UrlEncode(product_json, Encoding.UTF8) + + "&size_json=" + HttpUtility.UrlEncode(size_json, Encoding.UTF8) + + "&main_img=" + HttpUtility.UrlEncode(main_img, Encoding.UTF8); + + html = GetHtml.PostUtf8(url, data); + if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) + html = GetHtml.PostUtf8(url, data); + if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) + html = GetHtml.PostUtf8(url, data); + if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) + { + string msg = "选品商品保存失败!请检查网络连接：" + BaseRegex.GetStringJson(ref html, "msg"); + //OnInfoReceived(msg); + MainForm.instance.Invoke(new Action(() => + { + BaseMsgForm.ShowError(msg); + })); + } + else + { + //OnInfoReceived("选品商品保存成功!" + success_err_msg); + MainForm.instance.Invoke(new Action(() => + { + BaseMsgForm.ShowInfo("选品商品保存成功!" + success_err_msg); + })); + } + + //// 创建 SaveFileDialog 的实例 + //SaveFileDialog saveFileDialog = new SaveFileDialog(); + + //// 单线程单元(STA)模式运行文件对话框，否则会报错。 + //System.Threading.Thread InvokeThread = new System.Threading.Thread(new System.Threading.ThreadStart(()=> { + + // // 设置对话框的属性 + // saveFileDialog.Title = "保存商品"; + // saveFileDialog.Filter = "商品文件 (*.prd)|*.prd|所有文件 (*.*)|*.*"; // 过滤文件类型 + // saveFileDialog.FileName = product.productId.ParseToString(); // 默认文件名 + // saveFileDialog.DefaultExt = "txt"; // 默认文件扩展名 + + // // 显示对话框并获取结果 + // if (saveFileDialog.ShowDialog() == DialogResult.OK) + // { + // // 用户点击了“保存”按钮，此时可以获取文件的路径 + // string filePath = saveFileDialog.FileName; + // // 在这里处理文件保存逻辑，例如写入数据到文件 + // System.IO.File.WriteAllText(filePath, result); + + // //BaseMsgForm.ShowInfo("商品保存成功!"); + // } + //})); + //InvokeThread.SetApartmentState(System.Threading.ApartmentState.STA); + //InvokeThread.Start(); + //InvokeThread.Join(); } - - //// 创建 SaveFileDialog 的实例 - //SaveFileDialog saveFileDialog = new SaveFileDialog(); - - //// 单线程单元(STA)模式运行文件对话框，否则会报错。 - //System.Threading.Thread InvokeThread = new System.Threading.Thread(new System.Threading.ThreadStart(()=> { - - // // 设置对话框的属性 - // saveFileDialog.Title = "保存商品"; - // saveFileDialog.Filter = "商品文件 (*.prd)|*.prd|所有文件 (*.*)|*.*"; // 过滤文件类型 - // saveFileDialog.FileName = product.productId.ParseToString(); // 默认文件名 - // saveFileDialog.DefaultExt = "txt"; // 默认文件扩展名 - - // // 显示对话框并获取结果 - // if (saveFileDialog.ShowDialog() == DialogResult.OK) - // { - // // 用户点击了“保存”按钮，此时可以获取文件的路径 - // string filePath = saveFileDialog.FileName; - // // 在这里处理文件保存逻辑，例如写入数据到文件 - // System.IO.File.WriteAllText(filePath, result); - - // //BaseMsgForm.ShowInfo("商品保存成功!"); - // } - //})); - //InvokeThread.SetApartmentState(System.Threading.ApartmentState.STA); - //InvokeThread.Start(); - //InvokeThread.Join(); } catch (Exception ex) { diff --git a/TEMUKJD/PDDForms/ShopForms/PDDShopLoginForm.cs b/TEMUKJD/PDDForms/ShopForms/PDDShopLoginForm.cs index 4c9477a..56cf5b2 100644 --- a/TEMUKJD/PDDForms/ShopForms/PDDShopLoginForm.cs +++ b/TEMUKJD/PDDForms/ShopForms/PDDShopLoginForm.cs @@ -1336,7 +1336,7 @@ function getElementWithText(sText) sku.multi_price = (numMinPrice.Value * 100).ParseToInt(); sku.price = sku.multi_price + 100; } - var result = prodUserSelectForm.SignAcitvity(shop, prodParam); + var result = prodUserSelectForm.SignActivity(shop, prodParam); Invoke(new Action(() => { btnSignActivity.Text = "一键报名活动";