微信筛选店铺 店铺分组 运费加价
This commit is contained in:
1 parent
b4fa5cacb1
commit
afaabea1fa
33 files changed
+1338
-536
No files matched your search
@@ -27,7 +27,7 @@ namespace AllBase
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 版本ID
|
/// 版本ID
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static int VersionCount = 811;
|
public static int VersionCount = 815;
|
||||||
//public static int VersionCount = 613;
|
//public static int VersionCount = 613;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ namespace AllBase.Helper
|
|||||||
|
|
||||||
public static ConcurrentList<WXShopTokenInfo> WxTokenList { get; set; } = new ConcurrentList<WXShopTokenInfo>();
|
public static ConcurrentList<WXShopTokenInfo> WxTokenList { get; set; } = new ConcurrentList<WXShopTokenInfo>();
|
||||||
public static ConcurrentList<WxCatInfo> WxCatList { get; set; } = new ConcurrentList<WxCatInfo>();
|
public static ConcurrentList<WxCatInfo> WxCatList { get; set; } = new ConcurrentList<WxCatInfo>();
|
||||||
|
public static ConcurrentList<WxCatBoundInfo> WxCatBoundList { get; set; } = new ConcurrentList<WxCatBoundInfo>();
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 店铺设置参数
|
/// 店铺设置参数
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@@ -41,6 +41,7 @@ namespace AllBase.Model.Result
|
|||||||
public string cat_name { get; set; }
|
public string cat_name { get; set; }
|
||||||
public string change_cat_id { get; set; }
|
public string change_cat_id { get; set; }
|
||||||
public string change_cat_name { get; set; }
|
public string change_cat_name { get; set; }
|
||||||
|
public string wx_cat_leaf { get; set; }
|
||||||
public string ext_code { get; set; }
|
public string ext_code { get; set; }
|
||||||
public string product_name { get; set; }
|
public string product_name { get; set; }
|
||||||
public string main_img { get; set; }
|
public string main_img { get; set; }
|
||||||
|
|||||||
@@ -6,6 +6,20 @@ using System.Threading.Tasks;
|
|||||||
|
|
||||||
namespace AllBase.Model.Result.WXResult
|
namespace AllBase.Model.Result.WXResult
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 微信类目保证金
|
||||||
|
/// </summary>
|
||||||
|
public class WxCatBoundInfo
|
||||||
|
{
|
||||||
|
public long? leaf_id { get; set; } // 547106
|
||||||
|
public string leaf_name { get; set; } // 摩托车骑行鞋
|
||||||
|
public string full_cat_name { get; set; } // 汽摩电动/摩托车及配件/摩托车装备/摩托车骑行鞋
|
||||||
|
/// <summary>
|
||||||
|
/// 保证金,金额元
|
||||||
|
/// </summary>
|
||||||
|
public int cat_bound { get; set; } // 2000
|
||||||
|
}
|
||||||
|
|
||||||
public class WxCatInfo
|
public class WxCatInfo
|
||||||
{
|
{
|
||||||
public string cat_id { get; set; } // "545263",
|
public string cat_id { get; set; } // "545263",
|
||||||
@@ -15,4 +29,22 @@ namespace AllBase.Model.Result.WXResult
|
|||||||
public bool leaf { get; set; } // true,
|
public bool leaf { get; set; } // true,
|
||||||
public bool is_local_life { get; set; } // false
|
public bool is_local_life { get; set; } // false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public class WxCatAndQuaInfo
|
||||||
|
{
|
||||||
|
public WxCatInfo cat { get; set; }
|
||||||
|
public List<product_qua> product_qua_list { get; set; }
|
||||||
|
public bool? is_confidence_require_bad_must_pay { get; set; } // false
|
||||||
|
}
|
||||||
|
|
||||||
|
public class product_qua
|
||||||
|
{
|
||||||
|
public string qua_id { get; set; } // "1111491",
|
||||||
|
public bool? need_to_apply { get; set; } // true,
|
||||||
|
public string tips { get; set; } // "若为进口商品,需提供中华人民共和国海关进口货物报关单,展现对应品牌名称及商品名称",
|
||||||
|
public bool? mandatory { get; set; } // false,
|
||||||
|
public string name { get; set; } // "报关单",
|
||||||
|
public List<object> cert_group_list { get; set; } // []
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -284,7 +284,7 @@ namespace KJD_Web.BLL.BXX
|
|||||||
if (!string.IsNullOrEmpty(product_get_type))
|
if (!string.IsNullOrEmpty(product_get_type))
|
||||||
where += " and p.product_get_type ='" + product_get_type + "'";
|
where += " and p.product_get_type ='" + product_get_type + "'";
|
||||||
if (!string.IsNullOrEmpty(wx_safe_status))
|
if (!string.IsNullOrEmpty(wx_safe_status))
|
||||||
where += " and p.wx_safe_status ='" + wx_safe_status + "'";
|
where += " and p.wx_safe_status in ('" + wx_safe_status.Replace(",", "','") + "')";
|
||||||
if (!string.IsNullOrEmpty(special_prod_type))
|
if (!string.IsNullOrEmpty(special_prod_type))
|
||||||
where += " and p.special_prod_type ='" + special_prod_type + "'";
|
where += " and p.special_prod_type ='" + special_prod_type + "'";
|
||||||
|
|
||||||
@@ -684,6 +684,9 @@ namespace KJD_Web.BLL.BXX
|
|||||||
var in_skc_ids = RegexUtils.GetStringQuery(ref inputData, "in_skc_ids")?.Replace("'", "\\'");
|
var in_skc_ids = RegexUtils.GetStringQuery(ref inputData, "in_skc_ids")?.Replace("'", "\\'");
|
||||||
var in_groups = RegexUtils.GetStringQuery(ref inputData, "in_groups")?.Replace("'", "\\'");
|
var in_groups = RegexUtils.GetStringQuery(ref inputData, "in_groups")?.Replace("'", "\\'");
|
||||||
var in_cates = RegexUtils.GetStringQuery(ref inputData, "in_cates")?.Replace("'", "\\'");
|
var in_cates = RegexUtils.GetStringQuery(ref inputData, "in_cates")?.Replace("'", "\\'");
|
||||||
|
var wx_cat_1 = RegexUtils.GetStringQuery(ref inputData, "wx_cat_1")?.Replace("'", "\\'");
|
||||||
|
var wx_cat_2 = RegexUtils.GetStringQuery(ref inputData, "wx_cat_2")?.Replace("'", "\\'");
|
||||||
|
var wx_cat_3 = RegexUtils.GetStringQuery(ref inputData, "wx_cat_3")?.Replace("'", "\\'");
|
||||||
var product_get_type = RegexUtils.GetStringQuery(ref inputData, "product_get_type")?.Replace("'", "\\'");
|
var product_get_type = RegexUtils.GetStringQuery(ref inputData, "product_get_type")?.Replace("'", "\\'");
|
||||||
var wx_safe_status = RegexUtils.GetStringQuery(ref inputData, "wx_safe_status")?.Replace("'", "\\'");
|
var wx_safe_status = RegexUtils.GetStringQuery(ref inputData, "wx_safe_status")?.Replace("'", "\\'");
|
||||||
var special_prod_type = RegexUtils.GetStringQuery(ref inputData, "special_prod_type")?.Replace("'", "\\'");
|
var special_prod_type = RegexUtils.GetStringQuery(ref inputData, "special_prod_type")?.Replace("'", "\\'");
|
||||||
@@ -723,11 +726,23 @@ namespace KJD_Web.BLL.BXX
|
|||||||
in_cates = "'" + string.Join("','", in_cates.Split(new string[] { ",", ",", " " }, StringSplitOptions.RemoveEmptyEntries)) + "'";
|
in_cates = "'" + string.Join("','", in_cates.Split(new string[] { ",", ",", " " }, StringSplitOptions.RemoveEmptyEntries)) + "'";
|
||||||
where += " and (p.cat_name in (" + in_cates + ") or p.main_cat_name in (" + in_cates + "))";
|
where += " and (p.cat_name in (" + in_cates + ") or p.main_cat_name in (" + in_cates + "))";
|
||||||
}
|
}
|
||||||
|
if (!string.IsNullOrEmpty(wx_cat_1))
|
||||||
|
{
|
||||||
|
where += " and p.wx_cat_1=" + wx_cat_1 + "";
|
||||||
|
}
|
||||||
|
if (!string.IsNullOrEmpty(wx_cat_2))
|
||||||
|
{
|
||||||
|
where += " and p.wx_cat_2=" + wx_cat_2 + "";
|
||||||
|
}
|
||||||
|
if (!string.IsNullOrEmpty(wx_cat_3))
|
||||||
|
{
|
||||||
|
where += " and p.wx_cat_3=" + wx_cat_3 + "";
|
||||||
|
}
|
||||||
if (!string.IsNullOrEmpty(product_get_type))
|
if (!string.IsNullOrEmpty(product_get_type))
|
||||||
where += " and p.product_get_type ='" + product_get_type + "'";
|
where += " and p.product_get_type ='" + product_get_type + "'";
|
||||||
if (!string.IsNullOrEmpty(wx_safe_status))
|
if (!string.IsNullOrEmpty(wx_safe_status))
|
||||||
where += " and p.wx_safe_status ='" + wx_safe_status + "'";
|
where += " and p.wx_safe_status in ('" + wx_safe_status.Replace(",", "','") + "')";
|
||||||
if (!string.IsNullOrEmpty(special_prod_type))
|
if (!string.IsNullOrEmpty(special_prod_type)) // 图书,普通商品
|
||||||
where += " and p.special_prod_type ='" + special_prod_type + "'";
|
where += " and p.special_prod_type ='" + special_prod_type + "'";
|
||||||
// 供应商货源是否已完成初始设置
|
// 供应商货源是否已完成初始设置
|
||||||
if (!string.IsNullOrEmpty(is_supplier_prod_ok))
|
if (!string.IsNullOrEmpty(is_supplier_prod_ok))
|
||||||
|
|||||||
@@ -893,7 +893,8 @@ namespace KJD_Web.BLL
|
|||||||
|
|
||||||
string where = "";
|
string where = "";
|
||||||
if (!isAdmin)
|
if (!isAdmin)
|
||||||
where += " and (s.user_name='" + user_name + "' or s.sub_user_name like '%" + user_name + "%')";
|
//where += " and (s.user_name='" + user_name + "' or s.sub_user_name like '%" + user_name + "%')";
|
||||||
|
where += " and s.user_name='" + user_name + "'";
|
||||||
if (!string.IsNullOrEmpty(operate_sub_sa_name))
|
if (!string.IsNullOrEmpty(operate_sub_sa_name))
|
||||||
{
|
{
|
||||||
where += " and s.operate_sub_sa_name = '" + operate_sub_sa_name + "'";
|
where += " and s.operate_sub_sa_name = '" + operate_sub_sa_name + "'";
|
||||||
@@ -907,7 +908,7 @@ namespace KJD_Web.BLL
|
|||||||
if (!string.IsNullOrWhiteSpace(status))
|
if (!string.IsNullOrWhiteSpace(status))
|
||||||
where += " and s.status = '" + status + "'";
|
where += " and s.status = '" + status + "'";
|
||||||
if (!string.IsNullOrWhiteSpace(search_shop_id))
|
if (!string.IsNullOrWhiteSpace(search_shop_id))
|
||||||
where += " and s.shop_id like '%" + search_shop_id + "%'";
|
where += " and s.shop_id like '" + search_shop_id + "%'";
|
||||||
if (!string.IsNullOrWhiteSpace(search_shop_account))
|
if (!string.IsNullOrWhiteSpace(search_shop_account))
|
||||||
where += " and s.shop_account like @search_shop_account";
|
where += " and s.shop_account like @search_shop_account";
|
||||||
if (!string.IsNullOrWhiteSpace(search_notes))
|
if (!string.IsNullOrWhiteSpace(search_notes))
|
||||||
@@ -927,25 +928,25 @@ namespace KJD_Web.BLL
|
|||||||
if (!string.IsNullOrWhiteSpace(search_user_notes))
|
if (!string.IsNullOrWhiteSpace(search_user_notes))
|
||||||
where += " and s.user_notes like '" + search_user_notes + "%'";
|
where += " and s.user_notes like '" + search_user_notes + "%'";
|
||||||
if (!string.IsNullOrWhiteSpace(search_spu))
|
if (!string.IsNullOrWhiteSpace(search_spu))
|
||||||
where += " and p.spu_id like '%" + search_spu + "%'";
|
where += " and p.spu_id like '" + search_spu + "%'";
|
||||||
if (!string.IsNullOrWhiteSpace(search_skc))
|
if (!string.IsNullOrWhiteSpace(search_skc))
|
||||||
where += " and p.skc_id like '%" + search_skc + "%'";
|
where += " and p.skc_id like '" + search_skc + "%'";
|
||||||
if (!string.IsNullOrWhiteSpace(search_cat))
|
if (!string.IsNullOrWhiteSpace(search_cat))
|
||||||
where += " and p.cat_name like '%" + search_cat + "%'";
|
where += " and p.cat_name like '" + search_cat + "%'";
|
||||||
if (!string.IsNullOrWhiteSpace(search_ext_code))
|
if (!string.IsNullOrWhiteSpace(search_ext_code))
|
||||||
where += " and p.ext_code like '%" + search_ext_code + "%'";
|
where += " and p.ext_code like '" + search_ext_code + "%'";
|
||||||
if (!string.IsNullOrWhiteSpace(search_prod_name))
|
if (!string.IsNullOrWhiteSpace(search_prod_name))
|
||||||
where += " and p.product_name like @search_prod_name";
|
where += " and p.product_name like @search_prod_name";
|
||||||
if (!string.IsNullOrEmpty(search_sub_sa_name))
|
if (!string.IsNullOrEmpty(search_sub_sa_name))
|
||||||
{
|
{
|
||||||
where += " and (s.operate_sub_sa_name like '%" + search_sub_sa_name + "%'";
|
where += " and (s.operate_sub_sa_name like '" + search_sub_sa_name + "%'";
|
||||||
where += " or u.nick_name like '%" + operate_sub_sa_name + "%')";
|
where += " or u.nick_name like '" + operate_sub_sa_name + "%')";
|
||||||
}
|
}
|
||||||
|
|
||||||
sql += where;
|
sql += where;
|
||||||
|
|
||||||
List<MySqlParameter> paramLst = new List<MySqlParameter>();
|
List<MySqlParameter> paramLst = new List<MySqlParameter>();
|
||||||
paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "@search_shop_account", Value = "%" + search_shop_account + "%", });
|
paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "@search_shop_account", Value = "" + search_shop_account + "%", });
|
||||||
paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "@search_prod_name", Value = "%" + search_prod_name + "%", });
|
paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "@search_prod_name", Value = "%" + search_prod_name + "%", });
|
||||||
|
|
||||||
var count = mySql.ExecuteRowCount(sql, paramLst.ToArray());
|
var count = mySql.ExecuteRowCount(sql, paramLst.ToArray());
|
||||||
|
|||||||
@@ -252,7 +252,8 @@ namespace KJD_Web.BLL.WXXD
|
|||||||
string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString;
|
string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString;
|
||||||
MysqlUtils mySql = new MysqlUtils(conn);
|
MysqlUtils mySql = new MysqlUtils(conn);
|
||||||
|
|
||||||
string sql = "SELECT DISTINCT p.cat_name FROM `bxx`.`product` p where p.is_del=0";
|
//string sql = "SELECT DISTINCT p.cat_name FROM `bxx`.`product` p where p.is_del=0";
|
||||||
|
string sql = "SELECT DISTINCT p.main_cat_name FROM `bxx`.`product` p where p.is_del=0";
|
||||||
|
|
||||||
string where = "";
|
string where = "";
|
||||||
sql += where;
|
sql += where;
|
||||||
@@ -267,7 +268,7 @@ namespace KJD_Web.BLL.WXXD
|
|||||||
string group_data = "";
|
string group_data = "";
|
||||||
foreach (DataRow row in dt.Rows)
|
foreach (DataRow row in dt.Rows)
|
||||||
{
|
{
|
||||||
group_data += row["cat_name"].ToString() + ",";
|
group_data += row["main_cat_name"].ToString() + ",";
|
||||||
}
|
}
|
||||||
var data = group_data.Trim(',');
|
var data = group_data.Trim(',');
|
||||||
return "{\"code\":200,\"msg\":\"success\",\"data\":\"" + data + "\"}";
|
return "{\"code\":200,\"msg\":\"success\",\"data\":\"" + data + "\"}";
|
||||||
@@ -530,6 +531,137 @@ namespace KJD_Web.BLL.WXXD
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
var data = group_data.Trim(',');
|
var data = group_data.Trim(',');
|
||||||
|
if (data.IsNullOrEmpty())
|
||||||
|
data = "\"\"";
|
||||||
|
return "{\"code\":200,\"msg\":\"success\",\"data\":" + data + "}";
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
return "{\"code\":50002,\"msg\":\"" + ex.Message + "\",\"data\":\"\"}";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return "{\"code\":50003,\"msg\":\"" + mySql.Message + "\",\"data\":\"\"}";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return "{\"code\":19999,\"msg\":\"输入为空\"}";
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public string WXAddMdyShippingTemplate(string inputData)
|
||||||
|
{
|
||||||
|
if (!string.IsNullOrEmpty(inputData))
|
||||||
|
{
|
||||||
|
var time = RegexUtils.GetStringQuery(ref inputData, "time").ParseToInt();
|
||||||
|
string time1 = RegexUtils.GetStringQuery(ref inputData, "code");
|
||||||
|
if (time1 != EncrypUtil.Encryption(time))
|
||||||
|
return "{\"code\":50000,\"msg\":\"校验失败\"}";
|
||||||
|
|
||||||
|
var user_name = RegexUtils.GetStringQuery(ref inputData, "user_name")?.Replace("'", "\\'");
|
||||||
|
if (string.IsNullOrEmpty(user_name))
|
||||||
|
{
|
||||||
|
return "{\"code\":50001,\"msg\":\"没有用户名\"}";
|
||||||
|
}
|
||||||
|
|
||||||
|
//int page = RegexUtils.GetStringQuery(ref inputData, "page").ParseToInt();
|
||||||
|
//int page_size = RegexUtils.GetStringQuery(ref inputData, "page_size").ParseToInt(50);
|
||||||
|
string coid = RegexUtils.GetStringQuery(ref inputData, "coid")?.Replace("'", "\\'");
|
||||||
|
string shipping_template_json = RegexUtils.GetStringQuery(ref inputData, "shipping_template_json")?.Replace("'", "\\'");
|
||||||
|
if (string.IsNullOrEmpty("coid"))
|
||||||
|
return "{\"code\":50001,\"msg\":\"没有运费编号\"}";
|
||||||
|
if (string.IsNullOrEmpty("shipping_template_json"))
|
||||||
|
return "{\"code\":50001,\"msg\":\"没有运费信息\"}";
|
||||||
|
|
||||||
|
string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString;
|
||||||
|
MysqlUtils mySql = new MysqlUtils(conn);
|
||||||
|
|
||||||
|
string sql = "SELECT * FROM `wxxd`.`shipping_template` where coid='" + coid + "'";
|
||||||
|
|
||||||
|
string where = "";
|
||||||
|
sql += where;
|
||||||
|
|
||||||
|
var dt = mySql.ExecuteDataTable(sql);
|
||||||
|
mySql.Close();
|
||||||
|
|
||||||
|
if (dt != null)
|
||||||
|
{
|
||||||
|
conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString;
|
||||||
|
mySql = new MysqlUtils(conn);
|
||||||
|
if (dt.Rows.Count == 0)
|
||||||
|
{
|
||||||
|
sql = "INSERT INTO `wxxd`.`shipping_template` (coid,shipping_template_json) VALUES (@coid,@shipping_template_json);";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
sql = "UPDATE `wxxd`.`shipping_template` SET shipping_template_json=@shipping_template_json WHERE coid=@coid;";
|
||||||
|
}
|
||||||
|
|
||||||
|
List<MySqlParameter> paramLst = new List<MySqlParameter>();
|
||||||
|
paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "coid", Value = coid, });
|
||||||
|
paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "shipping_template_json", Value = shipping_template_json, });
|
||||||
|
mySql.ExecuteNonQuery(sql, paramLst.ToArray());
|
||||||
|
mySql.Close();
|
||||||
|
if (string.IsNullOrEmpty(mySql.Message))
|
||||||
|
{
|
||||||
|
return "{\"code\":200,\"msg\":\"success\",\"data\":\"\"}";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return "{\"code\":50003,\"msg\":\"" + mySql.Message + "\",\"data\":\"\"}";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return "{\"code\":50003,\"msg\":\"" + mySql.Message + "\",\"data\":\"\"}";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return "{\"code\":19999,\"msg\":\"输入为空\"}";
|
||||||
|
}
|
||||||
|
|
||||||
|
public string WXGetShippingTemplate(string inputData)
|
||||||
|
{
|
||||||
|
if (!string.IsNullOrEmpty(inputData))
|
||||||
|
{
|
||||||
|
var time = RegexUtils.GetStringQuery(ref inputData, "time").ParseToInt();
|
||||||
|
string time1 = RegexUtils.GetStringQuery(ref inputData, "code");
|
||||||
|
if (time1 != EncrypUtil.Encryption(time))
|
||||||
|
return "{\"code\":50000,\"msg\":\"校验失败\"}";
|
||||||
|
|
||||||
|
var user_name = RegexUtils.GetStringQuery(ref inputData, "user_name")?.Replace("'", "\\'");
|
||||||
|
if (string.IsNullOrEmpty(user_name))
|
||||||
|
{
|
||||||
|
return "{\"code\":50001,\"msg\":\"没有用户名\"}";
|
||||||
|
}
|
||||||
|
|
||||||
|
//int page = RegexUtils.GetStringQuery(ref inputData, "page").ParseToInt();
|
||||||
|
//int page_size = RegexUtils.GetStringQuery(ref inputData, "page_size").ParseToInt(50);
|
||||||
|
string coid = RegexUtils.GetStringQuery(ref inputData, "coid")?.Replace("'", "\\'");
|
||||||
|
|
||||||
|
string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString;
|
||||||
|
MysqlUtils mySql = new MysqlUtils(conn);
|
||||||
|
|
||||||
|
string sql = "SELECT * FROM `wxxd`.`shipping_template` where coid='" + coid + "'";
|
||||||
|
|
||||||
|
string where = "";
|
||||||
|
sql += where;
|
||||||
|
|
||||||
|
var dt = mySql.ExecuteDataTable(sql);
|
||||||
|
mySql.Close();
|
||||||
|
|
||||||
|
if (dt != null)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
string group_data = "";
|
||||||
|
foreach (DataRow row in dt.Rows)
|
||||||
|
{
|
||||||
|
group_data += row["shipping_template_json"].ToString();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
var data = group_data.Trim(',');
|
||||||
|
if (data.IsNullOrEmpty())
|
||||||
|
data = "\"\"";
|
||||||
return "{\"code\":200,\"msg\":\"success\",\"data\":" + data + "}";
|
return "{\"code\":200,\"msg\":\"success\",\"data\":" + data + "}";
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
|
|||||||
@@ -95,7 +95,7 @@ namespace KJD_Web.BLL.WXXD
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
sql = "SELECT s.id,s.login_name,s.login_pass,s.cookie,s.cookie2,s.anti_contents,s.openid,s.shop_id,s.shop_account,s.sub_user_name," +
|
sql = "SELECT s.id,s.login_name,s.login_pass,s.cookie,s.cookie2,s.anti_contents,s.openid,s.shop_id,s.shop_account,s.sub_user_name," +
|
||||||
"s.user_name,s.company_name,s.notes,s.login_status,s.login_status2,c.add_product_remaining,c.add_product_month," +
|
"s.user_name,s.company_name,s.notes,s.group_name,s.login_status,s.login_status2,c.add_product_remaining,c.add_product_month," +
|
||||||
"s.add_time,s.mdy_time,s.add_sub_sa_time,s.operate_sub_sa_name";
|
"s.add_time,s.mdy_time,s.add_sub_sa_time,s.operate_sub_sa_name";
|
||||||
//sql += " FROM wxxd.shop s WHERE 1=1";
|
//sql += " FROM wxxd.shop s WHERE 1=1";
|
||||||
sql += " FROM wxxd.shop s LEFT JOIN wxxd.shop_add_prod_count c ON s.shop_id=c.shop_id WHERE 1=1";
|
sql += " FROM wxxd.shop s LEFT JOIN wxxd.shop_add_prod_count c ON s.shop_id=c.shop_id WHERE 1=1";
|
||||||
@@ -133,6 +133,7 @@ namespace KJD_Web.BLL.WXXD
|
|||||||
add_product_month = row["add_product_month"].ParseToInt(),
|
add_product_month = row["add_product_month"].ParseToInt(),
|
||||||
operate_sub_sa_name = row["operate_sub_sa_name"].ParseToString(),
|
operate_sub_sa_name = row["operate_sub_sa_name"].ParseToString(),
|
||||||
openid = row["openid"].ParseToString(),
|
openid = row["openid"].ParseToString(),
|
||||||
|
group_name = row["group_name"].ParseToString(),
|
||||||
};
|
};
|
||||||
shopList.Add(shop);
|
shopList.Add(shop);
|
||||||
}
|
}
|
||||||
@@ -274,7 +275,7 @@ namespace KJD_Web.BLL.WXXD
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
sql = "SELECT s.id,s.login_name,s.login_pass,s.cookie,s.cookie2,s.anti_contents,s.shop_id,s.openid,s.shop_account,s.sub_user_name,s.user_name," +
|
sql = "SELECT s.id,s.login_name,s.login_pass,s.cookie,s.cookie2,s.anti_contents,s.shop_id,s.openid,s.shop_account,s.sub_user_name,s.user_name," +
|
||||||
"s.company_name,s.notes,s.login_status,s.login_status2,c.add_product_remaining,c.add_product_month,s.add_time,s.mdy_time," +
|
"s.company_name,s.notes,s.group_name,s.login_status,s.login_status2,c.add_product_remaining,c.add_product_month,s.add_time,s.mdy_time," +
|
||||||
"s.add_sub_sa_time,s.operate_sub_sa_name";
|
"s.add_sub_sa_time,s.operate_sub_sa_name";
|
||||||
sql += " FROM wxxd.shop s LEFT JOIN wxxd.shop_add_prod_count c ON s.shop_id=c.shop_id WHERE 1=1";
|
sql += " FROM wxxd.shop s LEFT JOIN wxxd.shop_add_prod_count c ON s.shop_id=c.shop_id WHERE 1=1";
|
||||||
|
|
||||||
@@ -311,6 +312,7 @@ namespace KJD_Web.BLL.WXXD
|
|||||||
add_product_month = row["add_product_month"].ParseToInt(),
|
add_product_month = row["add_product_month"].ParseToInt(),
|
||||||
operate_sub_sa_name = row["operate_sub_sa_name"].ParseToString(),
|
operate_sub_sa_name = row["operate_sub_sa_name"].ParseToString(),
|
||||||
openid = row["openid"].ToString(),
|
openid = row["openid"].ToString(),
|
||||||
|
group_name = row["group_name"].ToString(),
|
||||||
};
|
};
|
||||||
shopList.Add(shop);
|
shopList.Add(shop);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
<IISExpressWindowsAuthentication />
|
<IISExpressWindowsAuthentication />
|
||||||
<IISExpressUseClassicPipelineMode />
|
<IISExpressUseClassicPipelineMode />
|
||||||
<UseGlobalApplicationHostFile />
|
<UseGlobalApplicationHostFile />
|
||||||
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
|
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
|
||||||
<ProjectView>ShowAllFiles</ProjectView>
|
<ProjectView>ShowAllFiles</ProjectView>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ProjectExtensions>
|
<ProjectExtensions>
|
||||||
|
|||||||
@@ -34,6 +34,7 @@ namespace KJD_Web.Model.ShopModel
|
|||||||
/// 备注
|
/// 备注
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string notes { get; set; }
|
public string notes { get; set; }
|
||||||
|
public string group_name { get; set; }
|
||||||
public string login_status { get; set; }
|
public string login_status { get; set; }
|
||||||
public string login_status2 { get; set; }
|
public string login_status2 { get; set; }
|
||||||
public int add_product_remaining { get; set; }
|
public int add_product_remaining { get; set; }
|
||||||
|
|||||||
@@ -145,5 +145,29 @@ namespace KJD_Web
|
|||||||
Context.Response.Write(result);
|
Context.Response.Write(result);
|
||||||
Context.Response.End();
|
Context.Response.End();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//WXAddMdyAfterSale
|
||||||
|
[WebMethod]
|
||||||
|
public void wx_add_mdy_shipping_template()
|
||||||
|
{
|
||||||
|
string jsontext = GetRequestJsonString();
|
||||||
|
|
||||||
|
var result = jsontext;
|
||||||
|
result = new WXProductManage().WXAddMdyShippingTemplate(jsontext);
|
||||||
|
|
||||||
|
Context.Response.Write(result);
|
||||||
|
Context.Response.End();
|
||||||
|
}
|
||||||
|
[WebMethod]
|
||||||
|
public void wx_get_shipping_template()
|
||||||
|
{
|
||||||
|
string jsontext = GetRequestJsonString();
|
||||||
|
|
||||||
|
var result = jsontext;
|
||||||
|
result = new WXProductManage().WXGetShippingTemplate(jsontext);
|
||||||
|
|
||||||
|
Context.Response.Write(result);
|
||||||
|
Context.Response.End();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -400,7 +400,7 @@ namespace TemuKJD.BLL
|
|||||||
var jstGoodsObj = prodObj["pddData"];
|
var jstGoodsObj = prodObj["pddData"];
|
||||||
var jstPddPropMapLst = JsonHelper.DeserializeJsonToList<PDDPropRefPidNameMap>(JsonHelper.SerializeObject(prodObj["pddPropMap"]));
|
var jstPddPropMapLst = JsonHelper.DeserializeJsonToList<PDDPropRefPidNameMap>(JsonHelper.SerializeObject(prodObj["pddPropMap"]));
|
||||||
//{"goodsId":"2016474712785620994","warehouseGoodsId":"C7108311198A4217B022DCA87B6A5863","spuCode":"3783056947394249077","skus":[{"skuId":"2016692758292738050","warehouseSkuId":"C742B3FCB0364448AF92332F8F6005A6","skuCode":"ZH-XP-YWQYW-010"},{"skuId":"2016692758317903874","warehouseSkuId":"703E87F1B7774C14923821A57EEE6EFA","skuCode":"ZH-XP-YWQYW-010-111"},{"skuId":"2016692758338875394","warehouseSkuId":"895EDCDF6ECC4FAE8AD4DB9503719002","skuCode":"ZH-XP-YWQYW-010-222"}]}
|
//{"goodsId":"2016474712785620994","warehouseGoodsId":"C7108311198A4217B022DCA87B6A5863","spuCode":"3783056947394249077","skus":[{"skuId":"2016692758292738050","warehouseSkuId":"C742B3FCB0364448AF92332F8F6005A6","skuCode":"ZH-XP-YWQYW-010"},{"skuId":"2016692758317903874","warehouseSkuId":"703E87F1B7774C14923821A57EEE6EFA","skuCode":"ZH-XP-YWQYW-010-111"},{"skuId":"2016692758338875394","warehouseSkuId":"895EDCDF6ECC4FAE8AD4DB9503719002","skuCode":"ZH-XP-YWQYW-010-222"}]}
|
||||||
var jstSecretCodeLst = JsonHelper.JObjectParse(dbProd.sku_secret_json);
|
var jstSecretCodeLst = JsonHelper.JObjectParse(dbProd.sku_secret_json.TrimStart('[').TrimEnd(']'));
|
||||||
|
|
||||||
PDDProductInfo prodInfo = new PDDProductInfo()
|
PDDProductInfo prodInfo = new PDDProductInfo()
|
||||||
{
|
{
|
||||||
@@ -624,7 +624,7 @@ namespace TemuKJD.BLL
|
|||||||
thumb_url_is_deleted = null,
|
thumb_url_is_deleted = null,
|
||||||
quantity_delta = 0,
|
quantity_delta = 0,
|
||||||
spec = new List<spec_item>(),
|
spec = new List<spec_item>(),
|
||||||
// sku货号
|
// sku货号下面单独设置
|
||||||
out_sku_sn = "",
|
out_sku_sn = "",
|
||||||
batch_id = null,
|
batch_id = null,
|
||||||
priority = 1,
|
priority = 1,
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ namespace TemuKJD.BLL
|
|||||||
+ "&shop_account=" + _shop.ShopAccount
|
+ "&shop_account=" + _shop.ShopAccount
|
||||||
+ "&cookie=" + _shop.Cookies
|
+ "&cookie=" + _shop.Cookies
|
||||||
+ "&cookie2=" + _shop.Cookies2
|
+ "&cookie2=" + _shop.Cookies2
|
||||||
+ "&shop_group=" + GetHtml.UrlEncodeUtf8(_shop.GroupName)
|
+ "&group_name=" + GetHtml.UrlEncodeUtf8(_shop.GroupName)
|
||||||
+ "&sub_user_name=" + GetHtml.UrlEncodeUtf8(_shop.SubUserName)
|
+ "&sub_user_name=" + GetHtml.UrlEncodeUtf8(_shop.SubUserName)
|
||||||
+ "¬es=" + GetHtml.UrlEncodeUtf8(_shop.Notes)
|
+ "¬es=" + GetHtml.UrlEncodeUtf8(_shop.Notes)
|
||||||
+ "&login_status=" + _shop.LoginStatus
|
+ "&login_status=" + _shop.LoginStatus
|
||||||
@@ -91,7 +91,7 @@ namespace TemuKJD.BLL
|
|||||||
data += "&login_name=" + _shop.LoginName;
|
data += "&login_name=" + _shop.LoginName;
|
||||||
data += "&login_pass=" + GetHtml.UrlEncodeUtf8(_shop.Password);
|
data += "&login_pass=" + GetHtml.UrlEncodeUtf8(_shop.Password);
|
||||||
data += "¬es=" + GetHtml.UrlEncodeUtf8(_shop.Notes);
|
data += "¬es=" + GetHtml.UrlEncodeUtf8(_shop.Notes);
|
||||||
data += "&shop_group=" + GetHtml.UrlEncodeUtf8(_shop.GroupName);
|
data += "&group_name=" + GetHtml.UrlEncodeUtf8(_shop.GroupName);
|
||||||
data += "&sub_user_name=" + GetHtml.UrlEncodeUtf8(_shop.SubUserName);
|
data += "&sub_user_name=" + GetHtml.UrlEncodeUtf8(_shop.SubUserName);
|
||||||
|
|
||||||
|
|
||||||
@@ -276,6 +276,7 @@ namespace TemuKJD.BLL
|
|||||||
shop.Cookies2 = jObj["cookie2"].ParseToString().Replace("&", "&").Replace("%", "%").Replace("+", "+").Replace(""", "\"");
|
shop.Cookies2 = jObj["cookie2"].ParseToString().Replace("&", "&").Replace("%", "%").Replace("+", "+").Replace(""", "\"");
|
||||||
shop.CompanyName = BaseRegex.GetStringJson(ref shopStr, "company_name");
|
shop.CompanyName = BaseRegex.GetStringJson(ref shopStr, "company_name");
|
||||||
shop.Notes = BaseRegex.GetStringJson(ref shopStr, "notes");
|
shop.Notes = BaseRegex.GetStringJson(ref shopStr, "notes");
|
||||||
|
shop.GroupName = BaseRegex.GetStringJson(ref shopStr, "group_name");
|
||||||
shop.LoginStatus = BaseRegex.GetStringJson(ref shopStr, "login_status");
|
shop.LoginStatus = BaseRegex.GetStringJson(ref shopStr, "login_status");
|
||||||
shop.LoginStatus2 = BaseRegex.GetStringJson(ref shopStr, "login_status2");
|
shop.LoginStatus2 = BaseRegex.GetStringJson(ref shopStr, "login_status2");
|
||||||
shop.OperateSubSaName = BaseRegex.GetStringJson(ref shopStr, "operate_sub_sa_name");
|
shop.OperateSubSaName = BaseRegex.GetStringJson(ref shopStr, "operate_sub_sa_name");
|
||||||
|
|||||||
+54
-54
@@ -29,6 +29,8 @@
|
|||||||
private void InitializeComponent()
|
private void InitializeComponent()
|
||||||
{
|
{
|
||||||
this.components = new System.ComponentModel.Container();
|
this.components = new System.ComponentModel.Container();
|
||||||
|
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||||
|
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
|
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = 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 dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||||
@@ -38,8 +40,6 @@
|
|||||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = 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 dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
|
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
||||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
||||||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ProductThirdSelectListManageForm));
|
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ProductThirdSelectListManageForm));
|
||||||
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
|
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
|
||||||
this.numMaxWaitSecond = new System.Windows.Forms.NumericUpDown();
|
this.numMaxWaitSecond = new System.Windows.Forms.NumericUpDown();
|
||||||
@@ -52,7 +52,6 @@
|
|||||||
this.btnAdd = new DevComponents.DotNetBar.PanelEx();
|
this.btnAdd = new DevComponents.DotNetBar.PanelEx();
|
||||||
this.btnReFission = new DevComponents.DotNetBar.PanelEx();
|
this.btnReFission = new DevComponents.DotNetBar.PanelEx();
|
||||||
this.chkShowDel = new TemuKJD.UserComponent.UcCheckBox(this.components);
|
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.chkUploadProd = new TemuKJD.UserComponent.UcCheckBox(this.components);
|
||||||
this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
|
this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
|
||||||
this.label9 = new System.Windows.Forms.Label();
|
this.label9 = new System.Windows.Forms.Label();
|
||||||
@@ -117,6 +116,7 @@
|
|||||||
this.txtProdName = new System.Windows.Forms.TextBox();
|
this.txtProdName = new System.Windows.Forms.TextBox();
|
||||||
this.lblUserNotes = new System.Windows.Forms.Label();
|
this.lblUserNotes = new System.Windows.Forms.Label();
|
||||||
this.chkUseGlobalFissionSetting = new TemuKJD.UserComponent.UcCheckBox(this.components);
|
this.chkUseGlobalFissionSetting = new TemuKJD.UserComponent.UcCheckBox(this.components);
|
||||||
|
this.chkNoSubSa = new TemuKJD.UserComponent.UcCheckBox(this.components);
|
||||||
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
|
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
|
||||||
this.pbLoading = new System.Windows.Forms.PictureBox();
|
this.pbLoading = new System.Windows.Forms.PictureBox();
|
||||||
this.panel2 = new System.Windows.Forms.Panel();
|
this.panel2 = new System.Windows.Forms.Panel();
|
||||||
@@ -210,7 +210,6 @@
|
|||||||
this.splitContainer1.Panel1.Controls.Add(this.btnAdd);
|
this.splitContainer1.Panel1.Controls.Add(this.btnAdd);
|
||||||
this.splitContainer1.Panel1.Controls.Add(this.btnReFission);
|
this.splitContainer1.Panel1.Controls.Add(this.btnReFission);
|
||||||
this.splitContainer1.Panel1.Controls.Add(this.chkShowDel);
|
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.chkUploadProd);
|
||||||
this.splitContainer1.Panel1.Controls.Add(this.flowLayoutPanel1);
|
this.splitContainer1.Panel1.Controls.Add(this.flowLayoutPanel1);
|
||||||
this.splitContainer1.Panel1.Controls.Add(this.label21);
|
this.splitContainer1.Panel1.Controls.Add(this.label21);
|
||||||
@@ -240,6 +239,7 @@
|
|||||||
this.splitContainer1.Panel1.Controls.Add(this.btnDel);
|
this.splitContainer1.Panel1.Controls.Add(this.btnDel);
|
||||||
this.splitContainer1.Panel1.Controls.Add(this.tableLayoutPanel1);
|
this.splitContainer1.Panel1.Controls.Add(this.tableLayoutPanel1);
|
||||||
this.splitContainer1.Panel1.Controls.Add(this.chkUseGlobalFissionSetting);
|
this.splitContainer1.Panel1.Controls.Add(this.chkUseGlobalFissionSetting);
|
||||||
|
this.splitContainer1.Panel1.Controls.Add(this.chkNoSubSa);
|
||||||
//
|
//
|
||||||
// splitContainer1.Panel2
|
// splitContainer1.Panel2
|
||||||
//
|
//
|
||||||
@@ -447,18 +447,6 @@
|
|||||||
this.chkShowDel.UseVisualStyleBackColor = true;
|
this.chkShowDel.UseVisualStyleBackColor = true;
|
||||||
this.chkShowDel.CheckedChanged += new System.EventHandler(this.chkShowDel_CheckedChanged);
|
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
|
// chkUploadProd
|
||||||
//
|
//
|
||||||
this.chkUploadProd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
this.chkUploadProd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
||||||
@@ -1154,7 +1142,7 @@
|
|||||||
"全部",
|
"全部",
|
||||||
"重上",
|
"重上",
|
||||||
"已买"});
|
"已买"});
|
||||||
this.cmbUserNotes.Location = new System.Drawing.Point(927, 11);
|
this.cmbUserNotes.Location = new System.Drawing.Point(927, 8);
|
||||||
this.cmbUserNotes.Margin = new System.Windows.Forms.Padding(0);
|
this.cmbUserNotes.Margin = new System.Windows.Forms.Padding(0);
|
||||||
this.cmbUserNotes.Name = "cmbUserNotes";
|
this.cmbUserNotes.Name = "cmbUserNotes";
|
||||||
this.cmbUserNotes.Size = new System.Drawing.Size(52, 25);
|
this.cmbUserNotes.Size = new System.Drawing.Size(52, 25);
|
||||||
@@ -1171,7 +1159,7 @@
|
|||||||
"核价成功",
|
"核价成功",
|
||||||
"核价成功(重复)",
|
"核价成功(重复)",
|
||||||
"重复"});
|
"重复"});
|
||||||
this.cmbNotes.Location = new System.Drawing.Point(813, 11);
|
this.cmbNotes.Location = new System.Drawing.Point(813, 8);
|
||||||
this.cmbNotes.Margin = new System.Windows.Forms.Padding(0);
|
this.cmbNotes.Margin = new System.Windows.Forms.Padding(0);
|
||||||
this.cmbNotes.Name = "cmbNotes";
|
this.cmbNotes.Name = "cmbNotes";
|
||||||
this.cmbNotes.Size = new System.Drawing.Size(52, 25);
|
this.cmbNotes.Size = new System.Drawing.Size(52, 25);
|
||||||
@@ -1198,7 +1186,7 @@
|
|||||||
"已上传",
|
"已上传",
|
||||||
"草稿箱",
|
"草稿箱",
|
||||||
"全部"});
|
"全部"});
|
||||||
this.cmbStatus.Location = new System.Drawing.Point(723, 11);
|
this.cmbStatus.Location = new System.Drawing.Point(723, 8);
|
||||||
this.cmbStatus.Margin = new System.Windows.Forms.Padding(0);
|
this.cmbStatus.Margin = new System.Windows.Forms.Padding(0);
|
||||||
this.cmbStatus.Name = "cmbStatus";
|
this.cmbStatus.Name = "cmbStatus";
|
||||||
this.cmbStatus.Size = new System.Drawing.Size(52, 25);
|
this.cmbStatus.Size = new System.Drawing.Size(52, 25);
|
||||||
@@ -1382,6 +1370,18 @@
|
|||||||
this.chkUseGlobalFissionSetting.Text = "使用全局\r\n重组标题";
|
this.chkUseGlobalFissionSetting.Text = "使用全局\r\n重组标题";
|
||||||
this.chkUseGlobalFissionSetting.UseVisualStyleBackColor = true;
|
this.chkUseGlobalFissionSetting.UseVisualStyleBackColor = true;
|
||||||
//
|
//
|
||||||
|
// chkNoSubSa
|
||||||
|
//
|
||||||
|
this.chkNoSubSa.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
||||||
|
this.chkNoSubSa.AutoSize = true;
|
||||||
|
this.chkNoSubSa.Location = new System.Drawing.Point(1079, 11);
|
||||||
|
this.chkNoSubSa.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
|
||||||
|
this.chkNoSubSa.Name = "chkNoSubSa";
|
||||||
|
this.chkNoSubSa.Size = new System.Drawing.Size(87, 21);
|
||||||
|
this.chkNoSubSa.TabIndex = 470;
|
||||||
|
this.chkNoSubSa.Text = "未分配超管";
|
||||||
|
this.chkNoSubSa.UseVisualStyleBackColor = true;
|
||||||
|
//
|
||||||
// splitContainer2
|
// splitContainer2
|
||||||
//
|
//
|
||||||
this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill;
|
this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||||
@@ -1392,9 +1392,9 @@
|
|||||||
//
|
//
|
||||||
// splitContainer2.Panel1
|
// splitContainer2.Panel1
|
||||||
//
|
//
|
||||||
|
this.splitContainer2.Panel1.Controls.Add(this.dgvSelectProduct);
|
||||||
this.splitContainer2.Panel1.Controls.Add(this.pbLoading);
|
this.splitContainer2.Panel1.Controls.Add(this.pbLoading);
|
||||||
this.splitContainer2.Panel1.Controls.Add(this.panel2);
|
this.splitContainer2.Panel1.Controls.Add(this.panel2);
|
||||||
this.splitContainer2.Panel1.Controls.Add(this.dgvSelectProduct);
|
|
||||||
this.splitContainer2.Panel1.Padding = new System.Windows.Forms.Padding(4, 0, 4, 0);
|
this.splitContainer2.Panel1.Padding = new System.Windows.Forms.Padding(4, 0, 4, 0);
|
||||||
//
|
//
|
||||||
// splitContainer2.Panel2
|
// splitContainer2.Panel2
|
||||||
@@ -1457,19 +1457,19 @@
|
|||||||
//
|
//
|
||||||
this.dgvMapDraftIds.AllowUserToAddRows = false;
|
this.dgvMapDraftIds.AllowUserToAddRows = false;
|
||||||
this.dgvMapDraftIds.AllowUserToDeleteRows = false;
|
this.dgvMapDraftIds.AllowUserToDeleteRows = false;
|
||||||
dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke;
|
dataGridViewCellStyle10.BackColor = System.Drawing.Color.WhiteSmoke;
|
||||||
this.dgvMapDraftIds.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
|
this.dgvMapDraftIds.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle10;
|
||||||
this.dgvMapDraftIds.AutoRowNumber = true;
|
this.dgvMapDraftIds.AutoRowNumber = true;
|
||||||
this.dgvMapDraftIds.BackgroundColor = System.Drawing.Color.White;
|
this.dgvMapDraftIds.BackgroundColor = System.Drawing.Color.White;
|
||||||
this.dgvMapDraftIds.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
this.dgvMapDraftIds.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||||
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
|
dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
|
||||||
dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
|
dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control;
|
||||||
dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
dataGridViewCellStyle11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||||
dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
|
dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText;
|
||||||
dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
|
dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight;
|
||||||
dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
|
dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
|
||||||
dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
|
dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
|
||||||
this.dgvMapDraftIds.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
|
this.dgvMapDraftIds.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11;
|
||||||
this.dgvMapDraftIds.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
|
this.dgvMapDraftIds.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
|
||||||
this.dgvMapDraftIds.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
|
this.dgvMapDraftIds.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
|
||||||
this.dataGridViewCheckBoxColumn1,
|
this.dataGridViewCheckBoxColumn1,
|
||||||
@@ -1544,19 +1544,19 @@
|
|||||||
//
|
//
|
||||||
this.dgvSelectProduct.AllowUserToAddRows = false;
|
this.dgvSelectProduct.AllowUserToAddRows = false;
|
||||||
this.dgvSelectProduct.AllowUserToDeleteRows = false;
|
this.dgvSelectProduct.AllowUserToDeleteRows = false;
|
||||||
dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke;
|
dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke;
|
||||||
this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3;
|
this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
|
||||||
this.dgvSelectProduct.AutoRowNumber = true;
|
this.dgvSelectProduct.AutoRowNumber = true;
|
||||||
this.dgvSelectProduct.BackgroundColor = System.Drawing.Color.White;
|
this.dgvSelectProduct.BackgroundColor = System.Drawing.Color.White;
|
||||||
this.dgvSelectProduct.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
this.dgvSelectProduct.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||||
dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
|
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
|
||||||
dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control;
|
dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
|
||||||
dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||||
dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText;
|
dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
|
||||||
dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
|
dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
|
||||||
dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
|
dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
|
||||||
dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
|
dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
|
||||||
this.dgvSelectProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4;
|
this.dgvSelectProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
|
||||||
this.dgvSelectProduct.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
|
this.dgvSelectProduct.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
|
||||||
this.dgvSelectProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
|
this.dgvSelectProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
|
||||||
this.colSelect,
|
this.colSelect,
|
||||||
@@ -1623,8 +1623,8 @@
|
|||||||
//
|
//
|
||||||
// colSupplierName
|
// colSupplierName
|
||||||
//
|
//
|
||||||
dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
||||||
this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle5;
|
this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle3;
|
||||||
this.colSupplierName.HeaderText = "店铺名称";
|
this.colSupplierName.HeaderText = "店铺名称";
|
||||||
this.colSupplierName.Name = "colSupplierName";
|
this.colSupplierName.Name = "colSupplierName";
|
||||||
this.colSupplierName.ReadOnly = true;
|
this.colSupplierName.ReadOnly = true;
|
||||||
@@ -1704,8 +1704,8 @@
|
|||||||
//
|
//
|
||||||
// colProductName
|
// colProductName
|
||||||
//
|
//
|
||||||
dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
||||||
this.colProductName.DefaultCellStyle = dataGridViewCellStyle6;
|
this.colProductName.DefaultCellStyle = dataGridViewCellStyle4;
|
||||||
this.colProductName.HeaderText = "商品标题";
|
this.colProductName.HeaderText = "商品标题";
|
||||||
this.colProductName.Name = "colProductName";
|
this.colProductName.Name = "colProductName";
|
||||||
this.colProductName.ReadOnly = true;
|
this.colProductName.ReadOnly = true;
|
||||||
@@ -1713,8 +1713,8 @@
|
|||||||
//
|
//
|
||||||
// colProductCat
|
// colProductCat
|
||||||
//
|
//
|
||||||
dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
||||||
this.colProductCat.DefaultCellStyle = dataGridViewCellStyle7;
|
this.colProductCat.DefaultCellStyle = dataGridViewCellStyle5;
|
||||||
this.colProductCat.HeaderText = "商品类目";
|
this.colProductCat.HeaderText = "商品类目";
|
||||||
this.colProductCat.Name = "colProductCat";
|
this.colProductCat.Name = "colProductCat";
|
||||||
this.colProductCat.ReadOnly = true;
|
this.colProductCat.ReadOnly = true;
|
||||||
@@ -1747,8 +1747,8 @@
|
|||||||
//
|
//
|
||||||
// colAddTime
|
// colAddTime
|
||||||
//
|
//
|
||||||
dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
||||||
this.colAddTime.DefaultCellStyle = dataGridViewCellStyle8;
|
this.colAddTime.DefaultCellStyle = dataGridViewCellStyle6;
|
||||||
this.colAddTime.HeaderText = "添加时间";
|
this.colAddTime.HeaderText = "添加时间";
|
||||||
this.colAddTime.Name = "colAddTime";
|
this.colAddTime.Name = "colAddTime";
|
||||||
this.colAddTime.ReadOnly = true;
|
this.colAddTime.ReadOnly = true;
|
||||||
@@ -1756,8 +1756,8 @@
|
|||||||
//
|
//
|
||||||
// colMdyTime
|
// colMdyTime
|
||||||
//
|
//
|
||||||
dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
||||||
this.colMdyTime.DefaultCellStyle = dataGridViewCellStyle9;
|
this.colMdyTime.DefaultCellStyle = dataGridViewCellStyle7;
|
||||||
this.colMdyTime.HeaderText = "上传时间";
|
this.colMdyTime.HeaderText = "上传时间";
|
||||||
this.colMdyTime.Name = "colMdyTime";
|
this.colMdyTime.Name = "colMdyTime";
|
||||||
this.colMdyTime.ReadOnly = true;
|
this.colMdyTime.ReadOnly = true;
|
||||||
@@ -1772,8 +1772,8 @@
|
|||||||
//
|
//
|
||||||
// colSubSaNick
|
// colSubSaNick
|
||||||
//
|
//
|
||||||
dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
||||||
this.colSubSaNick.DefaultCellStyle = dataGridViewCellStyle10;
|
this.colSubSaNick.DefaultCellStyle = dataGridViewCellStyle8;
|
||||||
this.colSubSaNick.HeaderText = "二级超管";
|
this.colSubSaNick.HeaderText = "二级超管";
|
||||||
this.colSubSaNick.Name = "colSubSaNick";
|
this.colSubSaNick.Name = "colSubSaNick";
|
||||||
this.colSubSaNick.ReadOnly = true;
|
this.colSubSaNick.ReadOnly = true;
|
||||||
@@ -1788,8 +1788,8 @@
|
|||||||
//
|
//
|
||||||
// colNotes
|
// colNotes
|
||||||
//
|
//
|
||||||
dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
||||||
this.colNotes.DefaultCellStyle = dataGridViewCellStyle11;
|
this.colNotes.DefaultCellStyle = dataGridViewCellStyle9;
|
||||||
this.colNotes.HeaderText = "备注";
|
this.colNotes.HeaderText = "备注";
|
||||||
this.colNotes.Name = "colNotes";
|
this.colNotes.Name = "colNotes";
|
||||||
this.colNotes.ReadOnly = true;
|
this.colNotes.ReadOnly = true;
|
||||||
|
|||||||
@@ -95,10 +95,15 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
|
|||||||
colUserNotes.Visible = false;
|
colUserNotes.Visible = false;
|
||||||
ucSplitPage1.IsShowPageSize = true;
|
ucSplitPage1.IsShowPageSize = true;
|
||||||
var columnStyles = tableLayoutPanel1.ColumnStyles.Cast<ColumnStyle>().ToList();
|
var columnStyles = tableLayoutPanel1.ColumnStyles.Cast<ColumnStyle>().ToList();
|
||||||
columnStyles[columnStyles.Count - 1].SizeType = SizeType.Absolute;
|
//lblUserNotes
|
||||||
columnStyles[columnStyles.Count - 1].Width = 0;
|
//columnStyles[columnStyles.Count - 1].SizeType = SizeType.Absolute;
|
||||||
columnStyles[columnStyles.Count - 2].SizeType = SizeType.Absolute;
|
//columnStyles[columnStyles.Count - 1].Width = 0;
|
||||||
columnStyles[columnStyles.Count - 2].Width = 0;
|
//columnStyles[columnStyles.Count - 2].SizeType = SizeType.Absolute;
|
||||||
|
//columnStyles[columnStyles.Count - 2].Width = 0;
|
||||||
|
columnStyles[tableLayoutPanel1.GetColumn(lblUserNotes)].SizeType = SizeType.Absolute;
|
||||||
|
columnStyles[tableLayoutPanel1.GetColumn(lblUserNotes)].Width = 0;
|
||||||
|
columnStyles[tableLayoutPanel1.GetColumn(cmbUserNotes)].SizeType = SizeType.Absolute;
|
||||||
|
columnStyles[tableLayoutPanel1.GetColumn(cmbUserNotes)].Width = 0;
|
||||||
int colsWidth = 0;
|
int colsWidth = 0;
|
||||||
foreach (DataGridViewColumn col in dgvSelectProduct.Columns)
|
foreach (DataGridViewColumn col in dgvSelectProduct.Columns)
|
||||||
{
|
{
|
||||||
@@ -314,8 +319,12 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
|
|||||||
data += "&no_sub_sa=true";
|
data += "&no_sub_sa=true";
|
||||||
if (ClientMode != EnumClientMode.Admin)
|
if (ClientMode != EnumClientMode.Admin)
|
||||||
{
|
{
|
||||||
string shopIds = string.Join(",", GlobalConfig.ShopLoginList.Where(s => !s.ShopId.IsNullOrEmpty()).Select(s => s.ShopId).Distinct()) ?? "default";
|
//string shopIds = string.Join(",", GlobalConfig.ShopLoginList.Where(s => !s.ShopId.IsNullOrEmpty()).Select(s => s.ShopId).Distinct());
|
||||||
data += "&shop_ids=" + shopIds;
|
//// 传默认值防止没有店铺的账号查询到所有信息
|
||||||
|
//if (string.IsNullOrEmpty(shopIds))
|
||||||
|
// shopIds = "0";
|
||||||
|
//data += "&shop_ids=" + shopIds;
|
||||||
|
data += "&shop_ids=\"" + string.Join("\",\"", GlobalConfig.ShopLoginList.Where(s => !s.ShopId.IsNullOrEmpty()).Select(s => s.ShopId).Distinct()) + "\"";
|
||||||
}
|
}
|
||||||
}));
|
}));
|
||||||
var html = GetHtml.PostUtf8(url, data);
|
var html = GetHtml.PostUtf8(url, data);
|
||||||
|
|||||||
@@ -117,24 +117,6 @@
|
|||||||
<resheader name="writer">
|
<resheader name="writer">
|
||||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
</resheader>
|
</resheader>
|
||||||
<metadata name="dataGridViewCheckBoxColumn1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
|
||||||
<value>True</value>
|
|
||||||
</metadata>
|
|
||||||
<metadata name="colMapId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
|
||||||
<value>True</value>
|
|
||||||
</metadata>
|
|
||||||
<metadata name="colMapShopId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
|
||||||
<value>True</value>
|
|
||||||
</metadata>
|
|
||||||
<metadata name="colMapDraftId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
|
||||||
<value>True</value>
|
|
||||||
</metadata>
|
|
||||||
<metadata name="colToPorductPage.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
|
||||||
<value>True</value>
|
|
||||||
</metadata>
|
|
||||||
<metadata name="colToDraftPage.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
|
||||||
<value>True</value>
|
|
||||||
</metadata>
|
|
||||||
<metadata name="colSelect.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
<metadata name="colSelect.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
<value>True</value>
|
<value>True</value>
|
||||||
</metadata>
|
</metadata>
|
||||||
@@ -213,6 +195,24 @@
|
|||||||
<metadata name="colOpResult.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
<metadata name="colOpResult.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
<value>True</value>
|
<value>True</value>
|
||||||
</metadata>
|
</metadata>
|
||||||
|
<metadata name="dataGridViewCheckBoxColumn1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
|
<value>True</value>
|
||||||
|
</metadata>
|
||||||
|
<metadata name="colMapId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
|
<value>True</value>
|
||||||
|
</metadata>
|
||||||
|
<metadata name="colMapShopId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
|
<value>True</value>
|
||||||
|
</metadata>
|
||||||
|
<metadata name="colMapDraftId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
|
<value>True</value>
|
||||||
|
</metadata>
|
||||||
|
<metadata name="colToPorductPage.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
|
<value>True</value>
|
||||||
|
</metadata>
|
||||||
|
<metadata name="colToDraftPage.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
|
<value>True</value>
|
||||||
|
</metadata>
|
||||||
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||||
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||||
<value>
|
<value>
|
||||||
|
|||||||
@@ -308,6 +308,7 @@ namespace TemuKJD
|
|||||||
Task.Run(()=>
|
Task.Run(()=>
|
||||||
{
|
{
|
||||||
ReadWxCate();
|
ReadWxCate();
|
||||||
|
ReadWxCateBound();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -332,6 +333,36 @@ namespace TemuKJD
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void ReadWxCateBound()
|
||||||
|
{
|
||||||
|
string filePath = Path.Combine(Environment.CurrentDirectory, "temp\\wxCatBound");
|
||||||
|
if (!File.Exists(filePath))
|
||||||
|
return;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var catTxts = FileBase.ReadAllLines(filePath);
|
||||||
|
foreach (var catTxt in catTxts)
|
||||||
|
{
|
||||||
|
if (catTxt.StartsWith("类目id"))
|
||||||
|
continue;
|
||||||
|
var catTxtArr = catTxt.Split(',');
|
||||||
|
GlobalConfig.WxCatBoundList.Add(new WxCatBoundInfo()
|
||||||
|
{
|
||||||
|
cat_bound = catTxtArr[3].ParseToInt(),
|
||||||
|
full_cat_name = catTxtArr[2],
|
||||||
|
leaf_id = catTxtArr[0].ParseToLong(),
|
||||||
|
leaf_name = catTxtArr[1],
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
BaseMsgForm.ShowError("类目价格获取失败:" + ex.Message);
|
||||||
|
}
|
||||||
|
if (GlobalConfig.WxCatBoundList == null)
|
||||||
|
GlobalConfig.WxCatBoundList = new ConcurrentList<WxCatBoundInfo>();
|
||||||
|
}
|
||||||
|
|
||||||
public void SetTitle()
|
public void SetTitle()
|
||||||
{
|
{
|
||||||
lblVersionInfo.Text = BaseClass.ToolName + " V" + BaseClass.Varsion + " - " + BaseClass.NickName;
|
lblVersionInfo.Text = BaseClass.ToolName + " V" + BaseClass.Varsion + " - " + BaseClass.NickName;
|
||||||
|
|||||||
@@ -1279,7 +1279,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
var url3 = BaseClass.BuildPDDObjString("product/mdy_product");
|
var url3 = BaseClass.BuildPDDObjString("product/mdy_product");
|
||||||
string skuSecretJson = JsonHelper.SerializeObject(JsonHelper.JObjectParse(getRst)["data"]);
|
string skuSecretJson = JsonHelper.SerializeObject(JsonHelper.JObjectParse(getRst)["data"].FirstOrDefault());
|
||||||
if (skuSecretJson.Contains("warehouseGoodsId") && skuSecretJson.Contains("goodsId") &&
|
if (skuSecretJson.Contains("warehouseGoodsId") && skuSecretJson.Contains("goodsId") &&
|
||||||
skuSecretJson.Contains("warehouseSkuId") && skuSecretJson.Contains("skuId"))
|
skuSecretJson.Contains("warehouseSkuId") && skuSecretJson.Contains("skuId"))
|
||||||
{
|
{
|
||||||
@@ -1330,15 +1330,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms
|
|||||||
}
|
}
|
||||||
//Thread.Sleep(500);
|
//Thread.Sleep(500);
|
||||||
|
|
||||||
// 获取售后地址
|
|
||||||
//https://po.e57.cn/prod-api/api/sys-api/system/open/api/afterSale/info?warehouseNum=10361546&shopId=46568955
|
|
||||||
//var url2 = "https://po.e57.cn/prod-api/api/sys-api/system/open/api/afterSale/info?warehouseNum=" + dbProd.skc_id; //+ "&userName=阿杰账户";
|
|
||||||
//var exportRst2 = WXHttpResponseBLL.e57GetResponse(url2, "");
|
|
||||||
// 获取运费模板
|
|
||||||
//"https://po.e57.cn/prod-api/api/sys-api/system/open/api/freightTemplate/list?warehouseNum=10361546";
|
|
||||||
//var url3 = "https://po.e57.cn/prod-api/api/sys-api/system/open/api/freightTemplate/list?warehouseNum=" + dbProd.skc_id;
|
|
||||||
//var exportRst3 = WXHttpResponseBLL.e57GetResponse(url3, "");
|
|
||||||
|
|
||||||
// 查询微信接口token
|
// 查询微信接口token
|
||||||
//url = "https://po.e57.cn/prod-api/api/sys-api/system/open/api/shop/list?userName=阿杰账户";
|
//url = "https://po.e57.cn/prod-api/api/sys-api/system/open/api/shop/list?userName=阿杰账户";
|
||||||
//exportRst = WXHttpResponseBLL.e57PostResponse(url, "&warehouseNum=123456&shopId=46568955", "");
|
//exportRst = WXHttpResponseBLL.e57PostResponse(url, "&warehouseNum=123456&shopId=46568955", "");
|
||||||
|
|||||||
+11
-1
@@ -44,6 +44,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
|
|||||||
this.colProductSkcPic = new System.Windows.Forms.DataGridViewImageColumn();
|
this.colProductSkcPic = new System.Windows.Forms.DataGridViewImageColumn();
|
||||||
this.colProductName = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
this.colProductName = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||||
this.colProductCat = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
this.colProductCat = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||||
|
this.colBound = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||||
this.colExtCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
this.colExtCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||||
this.colNotes = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
this.colNotes = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||||
this.ColDelete = new System.Windows.Forms.DataGridViewLinkColumn();
|
this.ColDelete = new System.Windows.Forms.DataGridViewLinkColumn();
|
||||||
@@ -127,6 +128,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
|
|||||||
this.dgvSelectProduct.AllowUserToDeleteRows = false;
|
this.dgvSelectProduct.AllowUserToDeleteRows = false;
|
||||||
dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke;
|
dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke;
|
||||||
this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
|
this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
|
||||||
|
this.dgvSelectProduct.AutoRowNumber = true;
|
||||||
this.dgvSelectProduct.BackgroundColor = System.Drawing.Color.White;
|
this.dgvSelectProduct.BackgroundColor = System.Drawing.Color.White;
|
||||||
this.dgvSelectProduct.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
this.dgvSelectProduct.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||||
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
|
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
|
||||||
@@ -146,6 +148,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
|
|||||||
this.colProductSkcPic,
|
this.colProductSkcPic,
|
||||||
this.colProductName,
|
this.colProductName,
|
||||||
this.colProductCat,
|
this.colProductCat,
|
||||||
|
this.colBound,
|
||||||
this.colExtCode,
|
this.colExtCode,
|
||||||
this.colNotes,
|
this.colNotes,
|
||||||
this.ColDelete});
|
this.ColDelete});
|
||||||
@@ -205,7 +208,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
|
|||||||
this.colProductName.HeaderText = "商品标题";
|
this.colProductName.HeaderText = "商品标题";
|
||||||
this.colProductName.Name = "colProductName";
|
this.colProductName.Name = "colProductName";
|
||||||
this.colProductName.ReadOnly = true;
|
this.colProductName.ReadOnly = true;
|
||||||
this.colProductName.Width = 390;
|
this.colProductName.Width = 320;
|
||||||
//
|
//
|
||||||
// colProductCat
|
// colProductCat
|
||||||
//
|
//
|
||||||
@@ -214,6 +217,12 @@ namespace TemuKJD.PDDForms.ProductSelectForms
|
|||||||
this.colProductCat.ReadOnly = true;
|
this.colProductCat.ReadOnly = true;
|
||||||
this.colProductCat.Width = 120;
|
this.colProductCat.Width = 120;
|
||||||
//
|
//
|
||||||
|
// colBound
|
||||||
|
//
|
||||||
|
this.colBound.HeaderText = "保证金";
|
||||||
|
this.colBound.Name = "colBound";
|
||||||
|
this.colBound.ReadOnly = true;
|
||||||
|
//
|
||||||
// colExtCode
|
// colExtCode
|
||||||
//
|
//
|
||||||
this.colExtCode.HeaderText = "商品货号";
|
this.colExtCode.HeaderText = "商品货号";
|
||||||
@@ -271,6 +280,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
|
|||||||
private System.Windows.Forms.DataGridViewImageColumn colProductSkcPic;
|
private System.Windows.Forms.DataGridViewImageColumn colProductSkcPic;
|
||||||
private System.Windows.Forms.DataGridViewTextBoxColumn colProductName;
|
private System.Windows.Forms.DataGridViewTextBoxColumn colProductName;
|
||||||
private System.Windows.Forms.DataGridViewTextBoxColumn colProductCat;
|
private System.Windows.Forms.DataGridViewTextBoxColumn colProductCat;
|
||||||
|
private System.Windows.Forms.DataGridViewTextBoxColumn colBound;
|
||||||
private System.Windows.Forms.DataGridViewTextBoxColumn colExtCode;
|
private System.Windows.Forms.DataGridViewTextBoxColumn colExtCode;
|
||||||
private System.Windows.Forms.DataGridViewTextBoxColumn colNotes;
|
private System.Windows.Forms.DataGridViewTextBoxColumn colNotes;
|
||||||
private System.Windows.Forms.DataGridViewLinkColumn ColDelete;
|
private System.Windows.Forms.DataGridViewLinkColumn ColDelete;
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
using AllBase;
|
using AllBase;
|
||||||
|
using AllBase.Helper;
|
||||||
using AllBase.Model.Result;
|
using AllBase.Model.Result;
|
||||||
using NaiBa.Util.Extension;
|
using NaiBa.Util.Extension;
|
||||||
using System;
|
using System;
|
||||||
@@ -35,15 +36,17 @@ namespace TemuKJD.PDDForms.ProductSelectForms
|
|||||||
{
|
{
|
||||||
foreach (var prodSelect in lstTemuDBProductSelect)
|
foreach (var prodSelect in lstTemuDBProductSelect)
|
||||||
{
|
{
|
||||||
|
var catBound = GlobalConfig.WxCatBoundList.FirstOrDefault(b => b.leaf_id.ParseToString() == prodSelect.wx_cat_leaf);
|
||||||
int rowIndex = this.dgvSelectProduct.Rows.Add(
|
int rowIndex = this.dgvSelectProduct.Rows.Add(
|
||||||
false,
|
false,
|
||||||
prodSelect.id,
|
prodSelect.id,
|
||||||
prodSelect.spu_id,
|
BaseClass.SaLevel > 0 ? prodSelect.spu_id : prodSelect.spu_id.ParseToString().GetHashCode().ParseToString().Trim('-'),
|
||||||
prodSelect.main_img,
|
prodSelect.main_img,
|
||||||
null, //DataGridViewExtension.defaultBitmap,
|
DataGridViewExtension.defaultBitmap,
|
||||||
prodSelect.product_name, // 商品名称
|
prodSelect.product_name, // 商品名称
|
||||||
prodSelect.cat_name,
|
prodSelect.cat_name,
|
||||||
prodSelect.ext_code,
|
catBound?.cat_bound,
|
||||||
|
BaseClass.SaLevel > 0 ? prodSelect.spu_id : prodSelect.ext_code.ParseToString().GetHashCode().ParseToString().Trim('-'),
|
||||||
prodSelect.notes,
|
prodSelect.notes,
|
||||||
"删除"
|
"删除"
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -138,6 +138,9 @@
|
|||||||
<metadata name="colProductCat.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
<metadata name="colProductCat.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
<value>True</value>
|
<value>True</value>
|
||||||
</metadata>
|
</metadata>
|
||||||
|
<metadata name="colBound.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
|
<value>True</value>
|
||||||
|
</metadata>
|
||||||
<metadata name="colExtCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
<metadata name="colExtCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
<value>True</value>
|
<value>True</value>
|
||||||
</metadata>
|
</metadata>
|
||||||
|
|||||||
+57
-29
@@ -30,11 +30,11 @@ namespace TemuKJD.ToolForms
|
|||||||
private void InitializeComponent()
|
private void InitializeComponent()
|
||||||
{
|
{
|
||||||
this.components = new System.ComponentModel.Container();
|
this.components = new System.ComponentModel.Container();
|
||||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
|
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
|
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
|
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
|
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
|
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||||
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
|
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
|
||||||
this.btnNext = new System.Windows.Forms.Button();
|
this.btnNext = new System.Windows.Forms.Button();
|
||||||
this.btnPrev = new System.Windows.Forms.Button();
|
this.btnPrev = new System.Windows.Forms.Button();
|
||||||
@@ -60,6 +60,7 @@ namespace TemuKJD.ToolForms
|
|||||||
this.cmbMultiCookieName = new DevComponents.DotNetBar.Controls.ComboBoxEx();
|
this.cmbMultiCookieName = new DevComponents.DotNetBar.Controls.ComboBoxEx();
|
||||||
this.btnMultiLogin = new DevComponents.DotNetBar.PanelEx();
|
this.btnMultiLogin = new DevComponents.DotNetBar.PanelEx();
|
||||||
this.btnDel = new DevComponents.DotNetBar.PanelEx();
|
this.btnDel = new DevComponents.DotNetBar.PanelEx();
|
||||||
|
this.btnCancelSelect = new DevComponents.DotNetBar.PanelEx();
|
||||||
this.txtTitle = new System.Windows.Forms.TextBox();
|
this.txtTitle = new System.Windows.Forms.TextBox();
|
||||||
this.btnSearchTitle = new DevComponents.DotNetBar.PanelEx();
|
this.btnSearchTitle = new DevComponents.DotNetBar.PanelEx();
|
||||||
this.chkSkip = new TemuKJD.UserComponent.UcCheckBox(this.components);
|
this.chkSkip = new TemuKJD.UserComponent.UcCheckBox(this.components);
|
||||||
@@ -113,7 +114,7 @@ namespace TemuKJD.ToolForms
|
|||||||
this.splitContainer2.Panel1.Controls.Add(this.btnNext);
|
this.splitContainer2.Panel1.Controls.Add(this.btnNext);
|
||||||
this.splitContainer2.Panel1.Controls.Add(this.btnPrev);
|
this.splitContainer2.Panel1.Controls.Add(this.btnPrev);
|
||||||
this.splitContainer2.Panel1.Controls.Add(this.txtAddress);
|
this.splitContainer2.Panel1.Controls.Add(this.txtAddress);
|
||||||
this.splitContainer2.Size = new System.Drawing.Size(1390, 438);
|
this.splitContainer2.Size = new System.Drawing.Size(1390, 440);
|
||||||
this.splitContainer2.SplitterDistance = 26;
|
this.splitContainer2.SplitterDistance = 26;
|
||||||
this.splitContainer2.TabIndex = 6;
|
this.splitContainer2.TabIndex = 6;
|
||||||
//
|
//
|
||||||
@@ -152,7 +153,7 @@ namespace TemuKJD.ToolForms
|
|||||||
//
|
//
|
||||||
this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None;
|
this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None;
|
||||||
this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue;
|
this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue;
|
||||||
this.pbLoading.Location = new System.Drawing.Point(673, 196);
|
this.pbLoading.Location = new System.Drawing.Point(673, 194);
|
||||||
this.pbLoading.Name = "pbLoading";
|
this.pbLoading.Name = "pbLoading";
|
||||||
this.pbLoading.Size = new System.Drawing.Size(50, 50);
|
this.pbLoading.Size = new System.Drawing.Size(50, 50);
|
||||||
this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
|
this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
|
||||||
@@ -164,20 +165,20 @@ namespace TemuKJD.ToolForms
|
|||||||
//
|
//
|
||||||
this.dgvProduct.AllowUserToAddRows = false;
|
this.dgvProduct.AllowUserToAddRows = false;
|
||||||
this.dgvProduct.AllowUserToDeleteRows = false;
|
this.dgvProduct.AllowUserToDeleteRows = false;
|
||||||
dataGridViewCellStyle6.BackColor = System.Drawing.Color.WhiteSmoke;
|
dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke;
|
||||||
this.dgvProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle6;
|
this.dgvProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
|
||||||
this.dgvProduct.AutoRowNumber = true;
|
this.dgvProduct.AutoRowNumber = true;
|
||||||
this.dgvProduct.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
|
this.dgvProduct.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
|
||||||
this.dgvProduct.BackgroundColor = System.Drawing.Color.White;
|
this.dgvProduct.BackgroundColor = System.Drawing.Color.White;
|
||||||
this.dgvProduct.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
this.dgvProduct.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||||
dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
|
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
|
||||||
dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control;
|
dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
|
||||||
dataGridViewCellStyle7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||||
dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText;
|
dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
|
||||||
dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight;
|
dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
|
||||||
dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
|
dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
|
||||||
dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
|
dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
|
||||||
this.dgvProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7;
|
this.dgvProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
|
||||||
this.dgvProduct.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
|
this.dgvProduct.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
|
||||||
this.dgvProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
|
this.dgvProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
|
||||||
this.colCheck,
|
this.colCheck,
|
||||||
@@ -196,7 +197,7 @@ namespace TemuKJD.ToolForms
|
|||||||
this.dgvProduct.Name = "dgvProduct";
|
this.dgvProduct.Name = "dgvProduct";
|
||||||
this.dgvProduct.ReadOnly = true;
|
this.dgvProduct.ReadOnly = true;
|
||||||
this.dgvProduct.RowTemplate.Height = 23;
|
this.dgvProduct.RowTemplate.Height = 23;
|
||||||
this.dgvProduct.Size = new System.Drawing.Size(1390, 437);
|
this.dgvProduct.Size = new System.Drawing.Size(1390, 433);
|
||||||
this.dgvProduct.TabIndex = 7;
|
this.dgvProduct.TabIndex = 7;
|
||||||
this.dgvProduct.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvProduct_CellContentClick);
|
this.dgvProduct.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvProduct_CellContentClick);
|
||||||
//
|
//
|
||||||
@@ -236,8 +237,8 @@ namespace TemuKJD.ToolForms
|
|||||||
//
|
//
|
||||||
// colGoodsName
|
// colGoodsName
|
||||||
//
|
//
|
||||||
dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
||||||
this.colGoodsName.DefaultCellStyle = dataGridViewCellStyle8;
|
this.colGoodsName.DefaultCellStyle = dataGridViewCellStyle3;
|
||||||
this.colGoodsName.FillWeight = 120F;
|
this.colGoodsName.FillWeight = 120F;
|
||||||
this.colGoodsName.HeaderText = "商品名称";
|
this.colGoodsName.HeaderText = "商品名称";
|
||||||
this.colGoodsName.Name = "colGoodsName";
|
this.colGoodsName.Name = "colGoodsName";
|
||||||
@@ -265,8 +266,8 @@ namespace TemuKJD.ToolForms
|
|||||||
//
|
//
|
||||||
// colPrice
|
// colPrice
|
||||||
//
|
//
|
||||||
dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
||||||
this.colPrice.DefaultCellStyle = dataGridViewCellStyle9;
|
this.colPrice.DefaultCellStyle = dataGridViewCellStyle4;
|
||||||
this.colPrice.FillWeight = 70F;
|
this.colPrice.FillWeight = 70F;
|
||||||
this.colPrice.HeaderText = "价格";
|
this.colPrice.HeaderText = "价格";
|
||||||
this.colPrice.Name = "colPrice";
|
this.colPrice.Name = "colPrice";
|
||||||
@@ -281,8 +282,8 @@ namespace TemuKJD.ToolForms
|
|||||||
//
|
//
|
||||||
// colMsg
|
// colMsg
|
||||||
//
|
//
|
||||||
dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
||||||
this.colMsg.DefaultCellStyle = dataGridViewCellStyle10;
|
this.colMsg.DefaultCellStyle = dataGridViewCellStyle5;
|
||||||
this.colMsg.FillWeight = 200F;
|
this.colMsg.FillWeight = 200F;
|
||||||
this.colMsg.HeaderText = "操作结果";
|
this.colMsg.HeaderText = "操作结果";
|
||||||
this.colMsg.Name = "colMsg";
|
this.colMsg.Name = "colMsg";
|
||||||
@@ -306,6 +307,7 @@ namespace TemuKJD.ToolForms
|
|||||||
// splitContainer1.Panel2
|
// splitContainer1.Panel2
|
||||||
//
|
//
|
||||||
this.splitContainer1.Panel2.BackColor = System.Drawing.Color.White;
|
this.splitContainer1.Panel2.BackColor = System.Drawing.Color.White;
|
||||||
|
this.splitContainer1.Panel2.Controls.Add(this.btnCancelSelect);
|
||||||
this.splitContainer1.Panel2.Controls.Add(this.txtTitle);
|
this.splitContainer1.Panel2.Controls.Add(this.txtTitle);
|
||||||
this.splitContainer1.Panel2.Controls.Add(this.btnSearchTitle);
|
this.splitContainer1.Panel2.Controls.Add(this.btnSearchTitle);
|
||||||
this.splitContainer1.Panel2.Controls.Add(this.chkSkip);
|
this.splitContainer1.Panel2.Controls.Add(this.chkSkip);
|
||||||
@@ -331,7 +333,7 @@ namespace TemuKJD.ToolForms
|
|||||||
this.splitContainer1.Panel2.Controls.Add(this.btnImportCookie);
|
this.splitContainer1.Panel2.Controls.Add(this.btnImportCookie);
|
||||||
this.splitContainer1.Panel2.Controls.Add(this.label2);
|
this.splitContainer1.Panel2.Controls.Add(this.label2);
|
||||||
this.splitContainer1.Size = new System.Drawing.Size(1404, 561);
|
this.splitContainer1.Size = new System.Drawing.Size(1404, 561);
|
||||||
this.splitContainer1.SplitterDistance = 474;
|
this.splitContainer1.SplitterDistance = 469;
|
||||||
this.splitContainer1.SplitterWidth = 3;
|
this.splitContainer1.SplitterWidth = 3;
|
||||||
this.splitContainer1.TabIndex = 4;
|
this.splitContainer1.TabIndex = 4;
|
||||||
//
|
//
|
||||||
@@ -346,7 +348,7 @@ namespace TemuKJD.ToolForms
|
|||||||
this.ucTabControlMetro1.Name = "ucTabControlMetro1";
|
this.ucTabControlMetro1.Name = "ucTabControlMetro1";
|
||||||
this.ucTabControlMetro1.SelectedIndex = 0;
|
this.ucTabControlMetro1.SelectedIndex = 0;
|
||||||
this.ucTabControlMetro1.ShowCloseButton = false;
|
this.ucTabControlMetro1.ShowCloseButton = false;
|
||||||
this.ucTabControlMetro1.Size = new System.Drawing.Size(1404, 474);
|
this.ucTabControlMetro1.Size = new System.Drawing.Size(1404, 469);
|
||||||
this.ucTabControlMetro1.TabIndex = 462;
|
this.ucTabControlMetro1.TabIndex = 462;
|
||||||
this.ucTabControlMetro1.TabSelectColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
this.ucTabControlMetro1.TabSelectColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||||
this.ucTabControlMetro1.TabSelectTextColor = System.Drawing.Color.Gray;
|
this.ucTabControlMetro1.TabSelectTextColor = System.Drawing.Color.Gray;
|
||||||
@@ -358,7 +360,7 @@ namespace TemuKJD.ToolForms
|
|||||||
this.tabPage1.Location = new System.Drawing.Point(4, 26);
|
this.tabPage1.Location = new System.Drawing.Point(4, 26);
|
||||||
this.tabPage1.Name = "tabPage1";
|
this.tabPage1.Name = "tabPage1";
|
||||||
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
|
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
|
||||||
this.tabPage1.Size = new System.Drawing.Size(1396, 444);
|
this.tabPage1.Size = new System.Drawing.Size(1396, 446);
|
||||||
this.tabPage1.TabIndex = 0;
|
this.tabPage1.TabIndex = 0;
|
||||||
this.tabPage1.Text = "商品页面";
|
this.tabPage1.Text = "商品页面";
|
||||||
this.tabPage1.UseVisualStyleBackColor = true;
|
this.tabPage1.UseVisualStyleBackColor = true;
|
||||||
@@ -370,7 +372,7 @@ namespace TemuKJD.ToolForms
|
|||||||
this.tabPage2.Location = new System.Drawing.Point(4, 26);
|
this.tabPage2.Location = new System.Drawing.Point(4, 26);
|
||||||
this.tabPage2.Name = "tabPage2";
|
this.tabPage2.Name = "tabPage2";
|
||||||
this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
|
this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
|
||||||
this.tabPage2.Size = new System.Drawing.Size(1396, 443);
|
this.tabPage2.Size = new System.Drawing.Size(1396, 439);
|
||||||
this.tabPage2.TabIndex = 1;
|
this.tabPage2.TabIndex = 1;
|
||||||
this.tabPage2.Text = "采集列表";
|
this.tabPage2.Text = "采集列表";
|
||||||
this.tabPage2.UseVisualStyleBackColor = true;
|
this.tabPage2.UseVisualStyleBackColor = true;
|
||||||
@@ -447,6 +449,31 @@ namespace TemuKJD.ToolForms
|
|||||||
this.btnDel.TabIndex = 409;
|
this.btnDel.TabIndex = 409;
|
||||||
this.btnDel.Text = "删";
|
this.btnDel.Text = "删";
|
||||||
//
|
//
|
||||||
|
// btnCancelSelect
|
||||||
|
//
|
||||||
|
this.btnCancelSelect.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
||||||
|
this.btnCancelSelect.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||||
|
this.btnCancelSelect.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||||
|
this.btnCancelSelect.DisabledBackColor = System.Drawing.Color.Empty;
|
||||||
|
this.btnCancelSelect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||||
|
this.btnCancelSelect.Location = new System.Drawing.Point(581, 33);
|
||||||
|
this.btnCancelSelect.Name = "btnCancelSelect";
|
||||||
|
this.btnCancelSelect.Size = new System.Drawing.Size(115, 23);
|
||||||
|
this.btnCancelSelect.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||||
|
this.btnCancelSelect.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||||
|
this.btnCancelSelect.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||||
|
this.btnCancelSelect.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
|
||||||
|
this.btnCancelSelect.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
|
||||||
|
this.btnCancelSelect.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
|
||||||
|
this.btnCancelSelect.Style.ForeColor.Color = System.Drawing.Color.White;
|
||||||
|
this.btnCancelSelect.Style.GradientAngle = 90;
|
||||||
|
this.btnCancelSelect.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
|
||||||
|
this.btnCancelSelect.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||||
|
this.btnCancelSelect.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||||
|
this.btnCancelSelect.TabIndex = 999;
|
||||||
|
this.btnCancelSelect.Text = "取消选中已入库";
|
||||||
|
this.btnCancelSelect.Click += new System.EventHandler(this.btnCancelSelect_Click);
|
||||||
|
//
|
||||||
// txtTitle
|
// txtTitle
|
||||||
//
|
//
|
||||||
this.txtTitle.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
this.txtTitle.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
||||||
@@ -628,7 +655,7 @@ namespace TemuKJD.ToolForms
|
|||||||
this.statusBar.Location = new System.Drawing.Point(317, 60);
|
this.statusBar.Location = new System.Drawing.Point(317, 60);
|
||||||
this.statusBar.Margin = new System.Windows.Forms.Padding(0);
|
this.statusBar.Margin = new System.Windows.Forms.Padding(0);
|
||||||
this.statusBar.Name = "statusBar";
|
this.statusBar.Name = "statusBar";
|
||||||
this.statusBar.Size = new System.Drawing.Size(740, 25);
|
this.statusBar.Size = new System.Drawing.Size(739, 25);
|
||||||
this.statusBar.TabIndex = 823;
|
this.statusBar.TabIndex = 823;
|
||||||
//
|
//
|
||||||
// label4
|
// label4
|
||||||
@@ -901,5 +928,6 @@ namespace TemuKJD.ToolForms
|
|||||||
private System.Windows.Forms.TabPage tabPage2;
|
private System.Windows.Forms.TabPage tabPage2;
|
||||||
private System.Windows.Forms.TextBox txtTitle;
|
private System.Windows.Forms.TextBox txtTitle;
|
||||||
private DevComponents.DotNetBar.PanelEx btnSearchTitle;
|
private DevComponents.DotNetBar.PanelEx btnSearchTitle;
|
||||||
|
private DevComponents.DotNetBar.PanelEx btnCancelSelect;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -523,6 +523,9 @@ namespace TemuKJD.ToolForms
|
|||||||
if (cancellationTokenSource.IsCancellationRequested)
|
if (cancellationTokenSource.IsCancellationRequested)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
if (row.Index % 20 == 0)
|
||||||
|
NaiBa.Util.Helper.ConfigHelper.SaveConfig("supplier_product_list_" + MainForm.ProcessCount, lstJSTListProductInfo);
|
||||||
|
|
||||||
Invoke(new Action(() =>
|
Invoke(new Action(() =>
|
||||||
{
|
{
|
||||||
this.statusBar.lblTaskStatus.Text = "正在入库表格第 " + (row.Index + 1) + " 行数据";
|
this.statusBar.lblTaskStatus.Text = "正在入库表格第 " + (row.Index + 1) + " 行数据";
|
||||||
@@ -533,7 +536,13 @@ namespace TemuKJD.ToolForms
|
|||||||
if (prod == null || prod.dbProduct == null || prod.dbProduct.product_json.Length < 10)
|
if (prod == null || prod.dbProduct == null || prod.dbProduct.product_json.Length < 10)
|
||||||
continue;
|
continue;
|
||||||
var dbProd = prod.dbProduct;
|
var dbProd = prod.dbProduct;
|
||||||
|
|
||||||
|
if (prod.getProductMsg.Contains("入库成功") || prod.getProductMsg.Contains("已存在相同id商品"))
|
||||||
|
{
|
||||||
|
if (!chkOverride.Checked)
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
bool isExist = false;
|
bool isExist = false;
|
||||||
var existUrl = BaseClass.BuildObjString("product/get_product_list");
|
var existUrl = BaseClass.BuildObjString("product/get_product_list");
|
||||||
string existData = UserLogin.GetSignaturex() + "&search_spu=" + prod.spuId;
|
string existData = UserLogin.GetSignaturex() + "&search_spu=" + prod.spuId;
|
||||||
@@ -564,9 +573,11 @@ namespace TemuKJD.ToolForms
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
//入库成功 已存在相同id商品
|
||||||
|
prod.getProductMsg = "已存在相同id商品,跳过";
|
||||||
Invoke(new Action(() =>
|
Invoke(new Action(() =>
|
||||||
{
|
{
|
||||||
row.Cells["colMsg"].Value = "已存在相同id商品,跳过";
|
row.Cells["colMsg"].Value = prod.getProductMsg;
|
||||||
}));
|
}));
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@@ -606,6 +617,7 @@ namespace TemuKJD.ToolForms
|
|||||||
"&sale_count=" + dbProd.sale_count +
|
"&sale_count=" + dbProd.sale_count +
|
||||||
"&sale_count_text=" + HttpUtility.UrlEncode(dbProd.sale_count_text, Encoding.UTF8) +
|
"&sale_count_text=" + HttpUtility.UrlEncode(dbProd.sale_count_text, Encoding.UTF8) +
|
||||||
"&main_img=" + HttpUtility.UrlEncode(dbProd.main_img, Encoding.UTF8) +
|
"&main_img=" + HttpUtility.UrlEncode(dbProd.main_img, Encoding.UTF8) +
|
||||||
|
"&wx_safe_status=" + HttpUtility.UrlEncode("安全商品", Encoding.UTF8) +
|
||||||
"&product_get_type=" + HttpUtility.UrlEncode("厂商直采", Encoding.UTF8);
|
"&product_get_type=" + HttpUtility.UrlEncode("厂商直采", Encoding.UTF8);
|
||||||
if (!isExist)
|
if (!isExist)
|
||||||
{
|
{
|
||||||
@@ -640,13 +652,14 @@ namespace TemuKJD.ToolForms
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
string msg = "商品入库成功!";
|
prod.getProductMsg = "商品入库成功!";
|
||||||
Invoke(new Action(() =>
|
Invoke(new Action(() =>
|
||||||
{
|
{
|
||||||
row.Cells["colMsg"].Value = msg;
|
row.Cells["colMsg"].Value = prod.getProductMsg;
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
NaiBa.Util.Helper.ConfigHelper.SaveConfig("supplier_product_list_" + MainForm.ProcessCount, lstJSTListProductInfo);
|
||||||
|
|
||||||
Invoke(new Action(() =>
|
Invoke(new Action(() =>
|
||||||
{
|
{
|
||||||
@@ -712,6 +725,9 @@ namespace TemuKJD.ToolForms
|
|||||||
if (cancellationTokenSource.IsCancellationRequested)
|
if (cancellationTokenSource.IsCancellationRequested)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
if (row.Index % 20 == 0)
|
||||||
|
NaiBa.Util.Helper.ConfigHelper.SaveConfig("supplier_product_list_" + MainForm.ProcessCount, lstJSTListProductInfo);
|
||||||
|
|
||||||
Invoke(new Action(() =>
|
Invoke(new Action(() =>
|
||||||
{
|
{
|
||||||
this.statusBar.lblTaskStatus.Text = "正在采集表格第 " + (row.Index + 1) + " 行详情数据";
|
this.statusBar.lblTaskStatus.Text = "正在采集表格第 " + (row.Index + 1) + " 行详情数据";
|
||||||
@@ -727,6 +743,8 @@ namespace TemuKJD.ToolForms
|
|||||||
{
|
{
|
||||||
if (prod.getProductMsg == "商品已存在,跳过详情采集")
|
if (prod.getProductMsg == "商品已存在,跳过详情采集")
|
||||||
continue;
|
continue;
|
||||||
|
if (prod.getProductMsg.Contains("入库成功") || prod.getProductMsg.Contains("已存在相同id商品"))
|
||||||
|
continue;
|
||||||
|
|
||||||
bool isExist = false;
|
bool isExist = false;
|
||||||
var existUrl = BaseClass.BuildObjString("product/get_product_list");
|
var existUrl = BaseClass.BuildObjString("product/get_product_list");
|
||||||
@@ -858,9 +876,6 @@ namespace TemuKJD.ToolForms
|
|||||||
try { row.Cells["colMsg"].Value = prod.getProductMsg; } catch { }
|
try { row.Cells["colMsg"].Value = prod.getProductMsg; } catch { }
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (row.Index % 20 == 0 )
|
|
||||||
NaiBa.Util.Helper.ConfigHelper.SaveConfig("supplier_product_list_" + MainForm.ProcessCount, lstJSTListProductInfo);
|
|
||||||
}
|
}
|
||||||
NaiBa.Util.Helper.ConfigHelper.SaveConfig("supplier_product_list_" + MainForm.ProcessCount, lstJSTListProductInfo);
|
NaiBa.Util.Helper.ConfigHelper.SaveConfig("supplier_product_list_" + MainForm.ProcessCount, lstJSTListProductInfo);
|
||||||
Invoke(new Action(() =>
|
Invoke(new Action(() =>
|
||||||
@@ -1068,5 +1083,22 @@ namespace TemuKJD.ToolForms
|
|||||||
}));
|
}));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void btnCancelSelect_Click(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
Task.Run(() => {
|
||||||
|
|
||||||
|
foreach(DataGridViewRow row in dgvProduct.Rows)
|
||||||
|
{
|
||||||
|
if (row.Cells["colMsg"].Value.ParseToString().Contains("入库成功") || row.Cells["colMsg"].Value.ParseToString().Contains("已存在相同id商品"))
|
||||||
|
{
|
||||||
|
Invoke(new Action(() =>
|
||||||
|
{
|
||||||
|
row.Cells["colcheck"].Value = false;
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+13
-13
@@ -72,13 +72,13 @@ namespace TemuKJD.WXForms.AdminForms
|
|||||||
this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||||
this.colShopAccount = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
this.colShopAccount = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||||
this.colNotes = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
this.colNotes = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||||
|
this.colGroupName = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||||
this.colMinus = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
this.colMinus = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||||
this.colProductRemaining = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
this.colProductRemaining = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||||
this.colPlus = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
this.colPlus = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||||
this.colCookie = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
this.colCookie = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||||
this.colUser = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
this.colUser = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||||
this.colSubUser = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
this.colSubUser = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||||
this.colGroupName = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
|
||||||
this.colUploadAccount = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
this.colUploadAccount = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||||
this.colBuyAccount = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
this.colBuyAccount = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||||
this.colChatAccount = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
this.colChatAccount = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||||
@@ -509,6 +509,7 @@ namespace TemuKJD.WXForms.AdminForms
|
|||||||
this.dgvShop.AllowUserToDeleteRows = false;
|
this.dgvShop.AllowUserToDeleteRows = false;
|
||||||
dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke;
|
dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke;
|
||||||
this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
|
this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
|
||||||
|
this.dgvShop.AutoRowNumber = true;
|
||||||
this.dgvShop.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
|
this.dgvShop.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
|
||||||
this.dgvShop.BackgroundColor = System.Drawing.Color.White;
|
this.dgvShop.BackgroundColor = System.Drawing.Color.White;
|
||||||
this.dgvShop.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
this.dgvShop.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||||
@@ -527,13 +528,13 @@ namespace TemuKJD.WXForms.AdminForms
|
|||||||
this.colShopId,
|
this.colShopId,
|
||||||
this.colShopAccount,
|
this.colShopAccount,
|
||||||
this.colNotes,
|
this.colNotes,
|
||||||
|
this.colGroupName,
|
||||||
this.colMinus,
|
this.colMinus,
|
||||||
this.colProductRemaining,
|
this.colProductRemaining,
|
||||||
this.colPlus,
|
this.colPlus,
|
||||||
this.colCookie,
|
this.colCookie,
|
||||||
this.colUser,
|
this.colUser,
|
||||||
this.colSubUser,
|
this.colSubUser,
|
||||||
this.colGroupName,
|
|
||||||
this.colUploadAccount,
|
this.colUploadAccount,
|
||||||
this.colBuyAccount,
|
this.colBuyAccount,
|
||||||
this.colChatAccount,
|
this.colChatAccount,
|
||||||
@@ -634,6 +635,13 @@ namespace TemuKJD.WXForms.AdminForms
|
|||||||
this.colNotes.Name = "colNotes";
|
this.colNotes.Name = "colNotes";
|
||||||
this.colNotes.ReadOnly = true;
|
this.colNotes.ReadOnly = true;
|
||||||
//
|
//
|
||||||
|
// colGroupName
|
||||||
|
//
|
||||||
|
this.colGroupName.FillWeight = 70F;
|
||||||
|
this.colGroupName.HeaderText = "店铺分组";
|
||||||
|
this.colGroupName.Name = "colGroupName";
|
||||||
|
this.colGroupName.ReadOnly = true;
|
||||||
|
//
|
||||||
// colMinus
|
// colMinus
|
||||||
//
|
//
|
||||||
dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
||||||
@@ -683,14 +691,6 @@ namespace TemuKJD.WXForms.AdminForms
|
|||||||
this.colSubUser.Name = "colSubUser";
|
this.colSubUser.Name = "colSubUser";
|
||||||
this.colSubUser.ReadOnly = true;
|
this.colSubUser.ReadOnly = true;
|
||||||
//
|
//
|
||||||
// colGroupName
|
|
||||||
//
|
|
||||||
this.colGroupName.FillWeight = 70F;
|
|
||||||
this.colGroupName.HeaderText = "店铺分组";
|
|
||||||
this.colGroupName.Name = "colGroupName";
|
|
||||||
this.colGroupName.ReadOnly = true;
|
|
||||||
this.colGroupName.Visible = false;
|
|
||||||
//
|
|
||||||
// colUploadAccount
|
// colUploadAccount
|
||||||
//
|
//
|
||||||
this.colUploadAccount.FillWeight = 70F;
|
this.colUploadAccount.FillWeight = 70F;
|
||||||
@@ -842,13 +842,13 @@ namespace TemuKJD.WXForms.AdminForms
|
|||||||
this.colDelete.ReadOnly = true;
|
this.colDelete.ReadOnly = true;
|
||||||
this.colDelete.Visible = false;
|
this.colDelete.Visible = false;
|
||||||
//
|
//
|
||||||
// PDDAdminShopListForm
|
// WXAdminShopListForm
|
||||||
//
|
//
|
||||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
|
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
|
||||||
this.ClientSize = new System.Drawing.Size(1273, 610);
|
this.ClientSize = new System.Drawing.Size(1273, 610);
|
||||||
this.Controls.Add(this.splitContainer1);
|
this.Controls.Add(this.splitContainer1);
|
||||||
this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||||
this.Name = "PDDAdminShopListForm";
|
this.Name = "WXAdminShopListForm";
|
||||||
this.Text = "AdminShopForm";
|
this.Text = "AdminShopForm";
|
||||||
this.Load += new System.EventHandler(this.AdminShopForm_Load);
|
this.Load += new System.EventHandler(this.AdminShopForm_Load);
|
||||||
this.VisibleChanged += new System.EventHandler(this.AdminShopForm_VisibleChanged);
|
this.VisibleChanged += new System.EventHandler(this.AdminShopForm_VisibleChanged);
|
||||||
@@ -916,13 +916,13 @@ namespace TemuKJD.WXForms.AdminForms
|
|||||||
private System.Windows.Forms.DataGridViewTextBoxColumn colShopId;
|
private System.Windows.Forms.DataGridViewTextBoxColumn colShopId;
|
||||||
private System.Windows.Forms.DataGridViewTextBoxColumn colShopAccount;
|
private System.Windows.Forms.DataGridViewTextBoxColumn colShopAccount;
|
||||||
private System.Windows.Forms.DataGridViewTextBoxColumn colNotes;
|
private System.Windows.Forms.DataGridViewTextBoxColumn colNotes;
|
||||||
|
private System.Windows.Forms.DataGridViewTextBoxColumn colGroupName;
|
||||||
private System.Windows.Forms.DataGridViewTextBoxColumn colMinus;
|
private System.Windows.Forms.DataGridViewTextBoxColumn colMinus;
|
||||||
private System.Windows.Forms.DataGridViewTextBoxColumn colProductRemaining;
|
private System.Windows.Forms.DataGridViewTextBoxColumn colProductRemaining;
|
||||||
private System.Windows.Forms.DataGridViewTextBoxColumn colPlus;
|
private System.Windows.Forms.DataGridViewTextBoxColumn colPlus;
|
||||||
private System.Windows.Forms.DataGridViewTextBoxColumn colCookie;
|
private System.Windows.Forms.DataGridViewTextBoxColumn colCookie;
|
||||||
private System.Windows.Forms.DataGridViewTextBoxColumn colUser;
|
private System.Windows.Forms.DataGridViewTextBoxColumn colUser;
|
||||||
private System.Windows.Forms.DataGridViewTextBoxColumn colSubUser;
|
private System.Windows.Forms.DataGridViewTextBoxColumn colSubUser;
|
||||||
private System.Windows.Forms.DataGridViewTextBoxColumn colGroupName;
|
|
||||||
private System.Windows.Forms.DataGridViewTextBoxColumn colUploadAccount;
|
private System.Windows.Forms.DataGridViewTextBoxColumn colUploadAccount;
|
||||||
private System.Windows.Forms.DataGridViewTextBoxColumn colBuyAccount;
|
private System.Windows.Forms.DataGridViewTextBoxColumn colBuyAccount;
|
||||||
private System.Windows.Forms.DataGridViewTextBoxColumn colChatAccount;
|
private System.Windows.Forms.DataGridViewTextBoxColumn colChatAccount;
|
||||||
|
|||||||
@@ -114,6 +114,7 @@ namespace TemuKJD.WXForms.AdminForms
|
|||||||
shop.ShopId,
|
shop.ShopId,
|
||||||
shop.ShopAccount,
|
shop.ShopAccount,
|
||||||
shop.Notes,
|
shop.Notes,
|
||||||
|
shop.GroupName,
|
||||||
"-",
|
"-",
|
||||||
shop.AddProductRemaining,
|
shop.AddProductRemaining,
|
||||||
"+",
|
"+",
|
||||||
@@ -121,7 +122,6 @@ namespace TemuKJD.WXForms.AdminForms
|
|||||||
shop.Cookies,
|
shop.Cookies,
|
||||||
shop.UserName,
|
shop.UserName,
|
||||||
shop.SubUserName,
|
shop.SubUserName,
|
||||||
shop.GroupName,
|
|
||||||
shop.UploadAccount,
|
shop.UploadAccount,
|
||||||
shop.BuyAccount,
|
shop.BuyAccount,
|
||||||
shop.ChatAccount,
|
shop.ChatAccount,
|
||||||
|
|||||||
@@ -132,6 +132,9 @@
|
|||||||
<metadata name="colNotes.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
<metadata name="colNotes.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
<value>True</value>
|
<value>True</value>
|
||||||
</metadata>
|
</metadata>
|
||||||
|
<metadata name="colGroupName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
|
<value>True</value>
|
||||||
|
</metadata>
|
||||||
<metadata name="colMinus.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
<metadata name="colMinus.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
<value>True</value>
|
<value>True</value>
|
||||||
</metadata>
|
</metadata>
|
||||||
@@ -150,9 +153,6 @@
|
|||||||
<metadata name="colSubUser.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
<metadata name="colSubUser.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
<value>True</value>
|
<value>True</value>
|
||||||
</metadata>
|
</metadata>
|
||||||
<metadata name="colGroupName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
|
||||||
<value>True</value>
|
|
||||||
</metadata>
|
|
||||||
<metadata name="colUploadAccount.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
<metadata name="colUploadAccount.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
<value>True</value>
|
<value>True</value>
|
||||||
</metadata>
|
</metadata>
|
||||||
|
|||||||
+517
-276
File diff suppressed because it is too large.
Load diff
@@ -48,6 +48,7 @@ namespace TemuKJD.WXForms.ProductForms
|
|||||||
//public Dictionary<string, List<string>> dicCheckedShopIdList = new Dictionary<string, List<string>>();
|
//public Dictionary<string, List<string>> dicCheckedShopIdList = new Dictionary<string, List<string>>();
|
||||||
public Dictionary<string, bool> dicCheckedShopId = new Dictionary<string, bool>();
|
public Dictionary<string, bool> dicCheckedShopId = new Dictionary<string, bool>();
|
||||||
public Dictionary<string, WxShopUploadInfo> dicShopUpload = new Dictionary<string, WxShopUploadInfo>();
|
public Dictionary<string, WxShopUploadInfo> dicShopUpload = new Dictionary<string, WxShopUploadInfo>();
|
||||||
|
public string pdd_product_cates = "";
|
||||||
public WXDBProdUploadForm()
|
public WXDBProdUploadForm()
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
@@ -55,15 +56,12 @@ namespace TemuKJD.WXForms.ProductForms
|
|||||||
|
|
||||||
private void UserSelectDbProductForm_Load(object sender, EventArgs e)
|
private void UserSelectDbProductForm_Load(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
cmbSpProdType.SelectedIndex = 0;
|
|
||||||
this.splitContainer1.Dock = DockStyle.Fill;
|
this.splitContainer1.Dock = DockStyle.Fill;
|
||||||
this.panel1.Location = new Point(40, 30);
|
this.panel1.Location = new Point(40, 30);
|
||||||
this.panel1.Width = this.Width - 80;
|
this.panel1.Width = this.Width - 80;
|
||||||
this.panel1.Height = this.Height - 60;
|
this.panel1.Height = this.Height - 60;
|
||||||
this.panel1.SendToBack();
|
this.panel1.SendToBack();
|
||||||
|
|
||||||
cmbWxSafe.SelectedIndex = 0;
|
|
||||||
|
|
||||||
lstTemuDBProductSelect = NaiBa.Util.Helper.ConfigHelper.LoadConfig<NaiBa.Util.ConcurrentList<TemuDBProductSelect>>("wx_db_prod_upload_list");
|
lstTemuDBProductSelect = NaiBa.Util.Helper.ConfigHelper.LoadConfig<NaiBa.Util.ConcurrentList<TemuDBProductSelect>>("wx_db_prod_upload_list");
|
||||||
if (lstTemuDBProductSelect == null)
|
if (lstTemuDBProductSelect == null)
|
||||||
lstTemuDBProductSelect = new NaiBa.Util.ConcurrentList<TemuDBProductSelect>();
|
lstTemuDBProductSelect = new NaiBa.Util.ConcurrentList<TemuDBProductSelect>();
|
||||||
@@ -116,6 +114,7 @@ namespace TemuKJD.WXForms.ProductForms
|
|||||||
txtAddMorePrice.TextChanged -= txtAddPrice_TextChanged;
|
txtAddMorePrice.TextChanged -= txtAddPrice_TextChanged;
|
||||||
txtSinglePriceAdd.TextChanged -= txtAddPrice_TextChanged;
|
txtSinglePriceAdd.TextChanged -= txtAddPrice_TextChanged;
|
||||||
txtStockNum.TextChanged -= txtAddPrice_TextChanged;
|
txtStockNum.TextChanged -= txtAddPrice_TextChanged;
|
||||||
|
txtShippingPriceTimes.TextChanged -= txtAddPrice_TextChanged;
|
||||||
chkAddMorePriceFirst.CheckedChanged -= chkAddMorePriceFirst_CheckedChanged;
|
chkAddMorePriceFirst.CheckedChanged -= chkAddMorePriceFirst_CheckedChanged;
|
||||||
chkStepAddPrice.CheckedChanged -= chkStepAddPrice_CheckedChanged;
|
chkStepAddPrice.CheckedChanged -= chkStepAddPrice_CheckedChanged;
|
||||||
|
|
||||||
@@ -123,6 +122,7 @@ namespace TemuKJD.WXForms.ProductForms
|
|||||||
this.txtAddMorePrice.Text = defaultAddPriceRule.AddMorePrice.ToString();
|
this.txtAddMorePrice.Text = defaultAddPriceRule.AddMorePrice.ToString();
|
||||||
this.txtSinglePriceAdd.Text = defaultAddPriceRule.SinglePriceAdd.ToString();
|
this.txtSinglePriceAdd.Text = defaultAddPriceRule.SinglePriceAdd.ToString();
|
||||||
this.txtStockNum.Text = defaultAddPriceRule.StockNum.ToString();
|
this.txtStockNum.Text = defaultAddPriceRule.StockNum.ToString();
|
||||||
|
this.txtShippingPriceTimes.Text = defaultAddPriceRule.ShippingPriceTimes.ToString();
|
||||||
this.chkAddMorePriceFirst.Checked = defaultAddPriceRule.AddMorePriceFirst;
|
this.chkAddMorePriceFirst.Checked = defaultAddPriceRule.AddMorePriceFirst;
|
||||||
this.chkStepAddPrice.Checked = defaultAddPriceRule.IsStepAddPrice;
|
this.chkStepAddPrice.Checked = defaultAddPriceRule.IsStepAddPrice;
|
||||||
|
|
||||||
@@ -130,6 +130,7 @@ namespace TemuKJD.WXForms.ProductForms
|
|||||||
txtAddMorePrice.TextChanged += txtAddPrice_TextChanged;
|
txtAddMorePrice.TextChanged += txtAddPrice_TextChanged;
|
||||||
txtSinglePriceAdd.TextChanged += txtAddPrice_TextChanged;
|
txtSinglePriceAdd.TextChanged += txtAddPrice_TextChanged;
|
||||||
txtStockNum.TextChanged += txtAddPrice_TextChanged;
|
txtStockNum.TextChanged += txtAddPrice_TextChanged;
|
||||||
|
txtShippingPriceTimes.TextChanged += txtAddPrice_TextChanged;
|
||||||
chkAddMorePriceFirst.CheckedChanged += chkAddMorePriceFirst_CheckedChanged;
|
chkAddMorePriceFirst.CheckedChanged += chkAddMorePriceFirst_CheckedChanged;
|
||||||
chkStepAddPrice.CheckedChanged += chkStepAddPrice_CheckedChanged;
|
chkStepAddPrice.CheckedChanged += chkStepAddPrice_CheckedChanged;
|
||||||
|
|
||||||
@@ -251,7 +252,8 @@ namespace TemuKJD.WXForms.ProductForms
|
|||||||
foreach (DataGridViewRow row in dgvShop.Rows)
|
foreach (DataGridViewRow row in dgvShop.Rows)
|
||||||
{
|
{
|
||||||
//if (list.Any(l => l == row.Cells["colShopId"]?.Value?.ToString()))
|
//if (list.Any(l => l == row.Cells["colShopId"]?.Value?.ToString()))
|
||||||
row.Cells["colSelect"].Value = true;
|
if(row.Visible == true)
|
||||||
|
row.Cells["colSelect"].Value = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -324,20 +326,52 @@ namespace TemuKJD.WXForms.ProductForms
|
|||||||
html = GetHtml.PostUtf8(url, data);
|
html = GetHtml.PostUtf8(url, data);
|
||||||
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||||
{
|
{
|
||||||
//BaseMsgForm.ShowError("商品分组获取失败,请重试!" + BaseRegex.GetStringJson(ref html, "msg"));
|
BaseMsgForm.ShowError("商品类目获取失败,请重试!" + BaseRegex.GetStringJson(ref html, "msg"));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
Invoke(new Action(() =>
|
pdd_product_cates = BaseRegex.GetStringJson(ref html, "data");
|
||||||
|
}
|
||||||
|
|
||||||
|
Invoke(new Action(() =>
|
||||||
|
{
|
||||||
|
if (cmbSourceType.Text != "厂商直采")
|
||||||
{
|
{
|
||||||
cmbCateFilter.Items.Clear();
|
fillPddCate();
|
||||||
var groups = BaseRegex.GetStringJson(ref html, "data");
|
}
|
||||||
foreach (var item in groups.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries))
|
else
|
||||||
{
|
{
|
||||||
cmbCateFilter.Items.Add(item);
|
fillWxCate();
|
||||||
}
|
}
|
||||||
cmbCateFilter.Items.Add("");
|
}));
|
||||||
}));
|
}
|
||||||
|
|
||||||
|
void fillPddCate()
|
||||||
|
{
|
||||||
|
cmbCateFilter1.Items.Clear();
|
||||||
|
cmbCateFilter2.Items.Clear();
|
||||||
|
cmbCateFilter3.Items.Clear();
|
||||||
|
cmbCateFilter1.Text = "";
|
||||||
|
cmbCateFilter2.Text = "";
|
||||||
|
cmbCateFilter3.Text = "";
|
||||||
|
foreach (var item in pdd_product_cates.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries))
|
||||||
|
{
|
||||||
|
cmbCateFilter1.Items.Add(item);
|
||||||
|
}
|
||||||
|
cmbCateFilter1.Items.Add("");
|
||||||
|
}
|
||||||
|
|
||||||
|
void fillWxCate()
|
||||||
|
{
|
||||||
|
cmbCateFilter1.Items.Clear();
|
||||||
|
cmbCateFilter2.Items.Clear();
|
||||||
|
cmbCateFilter3.Items.Clear();
|
||||||
|
cmbCateFilter1.Text = "";
|
||||||
|
cmbCateFilter2.Text = "";
|
||||||
|
cmbCateFilter3.Text = "";
|
||||||
|
foreach (var cate in GlobalConfig.WxCatList.Where(c => c.level == 1).ToList())
|
||||||
|
{
|
||||||
|
cmbCateFilter1.Items.Add(cate.name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1449,6 +1483,95 @@ namespace TemuKJD.WXForms.ProductForms
|
|||||||
upProdParam.product.info.aiGenShortTitle = upProdParam.product.info.shortTitle;
|
upProdParam.product.info.aiGenShortTitle = upProdParam.product.info.shortTitle;
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
#region 获取推单运费模板,计算运费加价。
|
||||||
|
|
||||||
|
var shippingTemplateJson = "";
|
||||||
|
var shipPrice = 0;
|
||||||
|
|
||||||
|
if (dbProd.wx_cat_leaf != null)
|
||||||
|
{
|
||||||
|
var urlShipping = BaseClass.BuildObjString("product/wx_get_shipping_template");
|
||||||
|
var dataShipping = Work.UserLogin.GetSignaturex() +
|
||||||
|
"&coid=" + dbProd.skc_id;
|
||||||
|
var htmlShipping = GetHtml.PostUtf8(urlShipping, dataShipping);
|
||||||
|
if (string.IsNullOrEmpty(htmlShipping) || !htmlShipping.Contains("\"code\":200"))
|
||||||
|
htmlShipping = GetHtml.PostUtf8(urlShipping, dataShipping);
|
||||||
|
if (string.IsNullOrEmpty(htmlShipping) || !htmlShipping.Contains("\"code\":200"))
|
||||||
|
{
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (htmlShipping.Contains("\"data\":\"\""))
|
||||||
|
{
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
shippingTemplateJson = JsonHelper.SerializeObject(JsonHelper.JObjectParse(htmlShipping)["data"]);
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (string.IsNullOrEmpty(shippingTemplateJson))
|
||||||
|
{
|
||||||
|
|
||||||
|
// 获取运费模板
|
||||||
|
//"https://po.e57.cn/prod-api/api/sys-api/system/open/api/freightTemplate/list?warehouseNum=10361546";
|
||||||
|
var urlShip = "https://po.e57.cn/prod-api/api/sys-api/system/open/api/freightTemplate/list?warehouseNum=" + dbProd.skc_id;
|
||||||
|
var shipRst = WXHttpResponseBLL.e57GetResponse(urlShip, "");
|
||||||
|
try
|
||||||
|
{
|
||||||
|
//[{"id":"204","warehouseNum":"15016108","freightType":0,"provinces":"香港特别行政区,台湾省,澳门特别行政区","freightPrice":9999900,"createBy":"vmslin","createTime":"2026-01-30T16:45:03+08:00","updateBy":"vmslin","updateTime":"2026-01-30T16:45:03+08:00"},{"id":"205","warehouseNum":"15016108","freightType":3,"provinces":"海南省,新疆维吾尔自治区,西藏自治区,内蒙古自治区","freightPrice":1530,"createBy":"vmslin","createTime":"2026-01-30T16:45:51+08:00","updateBy":"vmslin","updateTime":"2026-01-30T16:45:51+08:00"},{"id":"206","warehouseNum":"15016108","freightType":1,"provinces":"北京市,上海市","freightPrice":410,"createBy":"vmslin","createTime":"2026-01-30T16:46:04+08:00","updateBy":"vmslin","updateTime":"2026-01-30T16:46:04+08:00"},{"id":"207","warehouseNum":"15016108","freightType":1,"provinces":"安徽省,重庆市,福建省,广东省,甘肃省,广西壮族自治区,贵州省,河北省,湖北省,黑龙江省,河南省,湖南省,吉林省,江苏省,江西省,辽宁省,宁夏回族自治区,青海省,四川省,山东省,山西省,陕西省,天津市,云南省,浙江省","freightPrice":310,"createBy":"vmslin","createTime":"2026-01-30T16:46:17+08:00","updateBy":"vmslin","updateTime":"2026-01-30T16:46:17+08:00"}]
|
||||||
|
shippingTemplateJson = JsonHelper.SerializeObject(JsonHelper.JObjectParse(shipRst)["data"]);
|
||||||
|
if (shipRst.Contains("\"code\":0") && !string.IsNullOrEmpty(shippingTemplateJson))
|
||||||
|
{
|
||||||
|
urlShipping = BaseClass.BuildObjString("product/wx_add_mdy_shipping_template");
|
||||||
|
dataShipping = Work.UserLogin.GetSignaturex() +
|
||||||
|
"&coid=" + dbProd.skc_id +
|
||||||
|
"&shipping_template_json=" + shippingTemplateJson;
|
||||||
|
htmlShipping = GetHtml.PostUtf8(urlShipping, dataShipping);
|
||||||
|
if (string.IsNullOrEmpty(htmlShipping) || !htmlShipping.Contains("\"code\":200"))
|
||||||
|
htmlShipping = GetHtml.PostUtf8(urlShipping, dataShipping);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!string.IsNullOrEmpty(shippingTemplateJson))
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
int count = 0;
|
||||||
|
var shipObjs = JArray.Parse(shippingTemplateJson);
|
||||||
|
foreach (var shipObj in shipObjs)
|
||||||
|
{
|
||||||
|
var provincesStr = shipObj["provinces"].ParseToString();
|
||||||
|
if (provincesStr.Split(',').Length > count)
|
||||||
|
{
|
||||||
|
count = provincesStr.Split(',').Length;
|
||||||
|
shipPrice = shipObj["freightPrice"].ParseToInt();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
return "{\"success\":false,\"draftId\":0,\"status\":\"未上传\",\"errMsg\":\"运费模板获取失败 " + ex.Message + "\"}";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (shipPrice <=0)
|
||||||
|
{
|
||||||
|
return "{\"success\":false,\"draftId\":0,\"status\":\"未上传\",\"errMsg\":\"运费模板获取失败 未获取到\"}";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endregion
|
||||||
|
|
||||||
#region 售后信息
|
#region 售后信息
|
||||||
|
|
||||||
var afterSaleAddress = "";
|
var afterSaleAddress = "";
|
||||||
@@ -1497,7 +1620,8 @@ namespace TemuKJD.WXForms.ProductForms
|
|||||||
{
|
{
|
||||||
urlAfterSale = BaseClass.BuildObjString("product/wx_add_mdy_after_sale");
|
urlAfterSale = BaseClass.BuildObjString("product/wx_add_mdy_after_sale");
|
||||||
dataAfterSale = Work.UserLogin.GetSignaturex() +
|
dataAfterSale = Work.UserLogin.GetSignaturex() +
|
||||||
"&coid=" + dbProd.skc_id + "&after_sale_json=" + afterSaleAddress;
|
"&coid=" + dbProd.skc_id +
|
||||||
|
"&after_sale_json=" + afterSaleAddress;
|
||||||
htmlAfterSale = GetHtml.PostUtf8(urlAfterSale, dataAfterSale);
|
htmlAfterSale = GetHtml.PostUtf8(urlAfterSale, dataAfterSale);
|
||||||
if (string.IsNullOrEmpty(htmlAfterSale) || !htmlAfterSale.Contains("\"code\":200"))
|
if (string.IsNullOrEmpty(htmlAfterSale) || !htmlAfterSale.Contains("\"code\":200"))
|
||||||
htmlAfterSale = GetHtml.PostUtf8(urlAfterSale, dataAfterSale);
|
htmlAfterSale = GetHtml.PostUtf8(urlAfterSale, dataAfterSale);
|
||||||
@@ -1936,6 +2060,8 @@ namespace TemuKJD.WXForms.ProductForms
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// 聚水潭上微信小店,加运费(其他平台shipPrice默认为0)
|
||||||
|
skuParam.productSkuInfo.salePrice += (shipPrice * defaultAddPriceRule.ShippingPriceTimes).ParseToInt();
|
||||||
// sku图
|
// sku图
|
||||||
skuParam.productSkuInfo.thumbImg = upProdParam.product.info.productSaleAttrs[0].items.FirstOrDefault(a => a.value == skuInfo.spec[0].spec_name)?.imgUrl;
|
skuParam.productSkuInfo.thumbImg = upProdParam.product.info.productSaleAttrs[0].items.FirstOrDefault(a => a.value == skuInfo.spec[0].spec_name)?.imgUrl;
|
||||||
skuParam.productSkuInfo.skuCode = skuInfo.out_sku_sn;
|
skuParam.productSkuInfo.skuCode = skuInfo.out_sku_sn;
|
||||||
@@ -2448,11 +2574,26 @@ namespace TemuKJD.WXForms.ProductForms
|
|||||||
data += "&in_ext_codes=" + txtExtCodeFilter.Text;
|
data += "&in_ext_codes=" + txtExtCodeFilter.Text;
|
||||||
data += "&in_spu_ids=" + txtIdFilter.Text;
|
data += "&in_spu_ids=" + txtIdFilter.Text;
|
||||||
data += "&in_groups=" + cmbGroupFilter.Text;
|
data += "&in_groups=" + cmbGroupFilter.Text;
|
||||||
data += "&in_cates=" + cmbCateFilter.Text;
|
if (cmbSourceType.Text != "厂商直采")
|
||||||
|
data += "&in_cates=" + cmbCateFilter1.Text;
|
||||||
|
else
|
||||||
|
{
|
||||||
|
var cate1 = GlobalConfig.WxCatList.FirstOrDefault(c => c.level == 1 && c.name == cmbCateFilter1.Text.Trim());
|
||||||
|
var cates2 = GlobalConfig.WxCatList.Where(c => c.f_cat_id == cate1?.cat_id).ToList();
|
||||||
|
var cate2 = cates2.FirstOrDefault(c => c.level == 2 && c.name == cmbCateFilter2.Text.Trim());
|
||||||
|
var cates3 = GlobalConfig.WxCatList.Where(c => c.f_cat_id == cate2?.cat_id).ToList();
|
||||||
|
var cate3 = cates3.FirstOrDefault(c => c.level == 3 && c.name == cmbCateFilter3.Text.Trim());
|
||||||
|
|
||||||
|
if (!string.IsNullOrEmpty(cmbCateFilter1.Text) && cate1 != null)
|
||||||
|
data += "&wx_cat_1=" + cate1.cat_id;
|
||||||
|
if (!string.IsNullOrEmpty(cmbCateFilter2.Text) && cate2 != null)
|
||||||
|
data += "&wx_cat_2=" + cate2.cat_id;
|
||||||
|
if (!string.IsNullOrEmpty(cmbCateFilter3.Text) && cate3 != null)
|
||||||
|
data += "&wx_cat_3=" + cate3.cat_id;
|
||||||
|
}
|
||||||
data += "&product_get_type=" + cmbSourceType.Text.Trim();
|
data += "&product_get_type=" + cmbSourceType.Text.Trim();
|
||||||
data += "&wx_safe_status=" + cmbWxSafe.Text.Trim();
|
data += "&wx_safe_status=" + cmbWxSafe.Text.Trim().Replace("安全+未校验", "安全商品,未校验");
|
||||||
data += "&special_prod_type=" + cmbSpProdType.Text.Trim();
|
data += "&is_supplier_prod_ok=" + cmbJstInitSet.Text.Trim();
|
||||||
data += "&is_supplier_prod_ok=" + cmbSet.Text.Trim();
|
|
||||||
}));
|
}));
|
||||||
var html = GetHtml.PostUtf8(url, data);
|
var html = GetHtml.PostUtf8(url, data);
|
||||||
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||||
@@ -2546,6 +2687,7 @@ namespace TemuKJD.WXForms.ProductForms
|
|||||||
defaultAddPriceRule.AddMorePrice = txtAddMorePrice.Text.Trim().ParseToDecimal();
|
defaultAddPriceRule.AddMorePrice = txtAddMorePrice.Text.Trim().ParseToDecimal();
|
||||||
defaultAddPriceRule.SinglePriceAdd = txtSinglePriceAdd.Text.Trim().ParseToDecimal();
|
defaultAddPriceRule.SinglePriceAdd = txtSinglePriceAdd.Text.Trim().ParseToDecimal();
|
||||||
defaultAddPriceRule.StockNum = txtStockNum.Text.Trim().ParseToInt();
|
defaultAddPriceRule.StockNum = txtStockNum.Text.Trim().ParseToInt();
|
||||||
|
defaultAddPriceRule.ShippingPriceTimes = txtShippingPriceTimes.Text.Trim().ParseToDecimal();
|
||||||
NaiBa.Util.Helper.ConfigHelper.SaveConfig<AddPriceRule>("wx_default_add_price_rule", defaultAddPriceRule);
|
NaiBa.Util.Helper.ConfigHelper.SaveConfig<AddPriceRule>("wx_default_add_price_rule", defaultAddPriceRule);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2604,9 +2746,9 @@ namespace TemuKJD.WXForms.ProductForms
|
|||||||
txtIdFilter.Text = "";
|
txtIdFilter.Text = "";
|
||||||
txtExtCodeFilter.Text = "";
|
txtExtCodeFilter.Text = "";
|
||||||
cmbGroupFilter.Text = "";
|
cmbGroupFilter.Text = "";
|
||||||
cmbCateFilter.Text = "";
|
cmbCateFilter1.Text = "";
|
||||||
cmbWxSafe.SelectedIndex = 0;
|
cmbWxSafe.Text = "安全+未校验";
|
||||||
cmbSpProdType.SelectedIndex = 0;
|
cmbSourceType.Text = "厂商直采";
|
||||||
int prodCount;
|
int prodCount;
|
||||||
GetRandomProductList(out prodCount, 1, 1);
|
GetRandomProductList(out prodCount, 1, 1);
|
||||||
lblGoodsCount.Text = "产品库 " + prodCount + " 件";
|
lblGoodsCount.Text = "产品库 " + prodCount + " 件";
|
||||||
@@ -2764,6 +2906,98 @@ namespace TemuKJD.WXForms.ProductForms
|
|||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void cmbSourceType_SelectedIndexChanged(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
if (cmbSourceType.Text != "厂商直采")
|
||||||
|
fillPddCate();
|
||||||
|
else
|
||||||
|
fillWxCate();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void cmbSourceType_TextChanged(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private void cmbCateFilter1_SelectedIndexChanged(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
if (cmbSourceType.Text != "厂商直采")
|
||||||
|
return;
|
||||||
|
|
||||||
|
cmbCateFilter2.Text = "";
|
||||||
|
cmbCateFilter2.Items.Clear();
|
||||||
|
var cate1 = GlobalConfig.WxCatList.FirstOrDefault(c => c.level == 1 && c.name == cmbCateFilter1.Text.Trim());
|
||||||
|
var cates2 = GlobalConfig.WxCatList.Where(c => c.f_cat_id == cate1?.cat_id).ToList();
|
||||||
|
foreach (var cate2 in cates2)
|
||||||
|
{
|
||||||
|
cmbCateFilter2.Items.Add(cate2.name);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private void cmbCateFilter2_SelectedIndexChanged(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
if (cmbSourceType.Text != "厂商直采")
|
||||||
|
return;
|
||||||
|
|
||||||
|
cmbCateFilter3.Text = "";
|
||||||
|
cmbCateFilter3.Items.Clear();
|
||||||
|
var cate1 = GlobalConfig.WxCatList.FirstOrDefault(c => c.level == 1 && c.name == cmbCateFilter1.Text.Trim());
|
||||||
|
var cates2 = GlobalConfig.WxCatList.Where(c => c.f_cat_id == cate1?.cat_id).ToList();
|
||||||
|
var cate2 = cates2.FirstOrDefault(c => c.level == 2 && c.name == cmbCateFilter2.Text.Trim());
|
||||||
|
var cates3 = GlobalConfig.WxCatList.Where(c => c.f_cat_id == cate2?.cat_id).ToList();
|
||||||
|
foreach (var cate3 in cates3)
|
||||||
|
{
|
||||||
|
cmbCateFilter3.Items.Add(cate3.name);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void cmbCateFilter3_SelectedIndexChanged(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
var cate1 = GlobalConfig.WxCatList.FirstOrDefault(c => c.level == 1 && c.name == cmbCateFilter1.Text.Trim());
|
||||||
|
var cates2 = GlobalConfig.WxCatList.Where(c => c.f_cat_id == cate1?.cat_id).ToList();
|
||||||
|
var cate2 = cates2.FirstOrDefault(c => c.level == 2 && c.name == cmbCateFilter2.Text.Trim());
|
||||||
|
var cates3 = GlobalConfig.WxCatList.Where(c => c.f_cat_id == cate2?.cat_id).ToList();
|
||||||
|
var cate3 = cates3.FirstOrDefault(c => c.level == 3 && c.name == cmbCateFilter3.Text.Trim());
|
||||||
|
}
|
||||||
|
|
||||||
|
private void btnFilterBound_Click(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
var bound = txtFilterBound.Text.Trim().ParseToInt();
|
||||||
|
var cates = GlobalConfig.WxCatBoundList.Where(b => b.cat_bound <= bound);
|
||||||
|
lstTemuDBProductSelect.RemoveAll(p => !cates.Any(c => c.leaf_id.ParseToString() == p.wx_cat_leaf));
|
||||||
|
|
||||||
|
NaiBa.Util.Helper.ConfigHelper.SaveConfig("wx_db_prod_upload_list", this.lstTemuDBProductSelect);
|
||||||
|
lblWaitToUp.Text = "待上传 " + lstTemuDBProductSelect.Count + " 件";
|
||||||
|
}
|
||||||
|
|
||||||
|
private void btnFilterShop_Click(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
foreach(DataGridViewRow row in dgvShop.Rows)
|
||||||
|
{
|
||||||
|
if (!row.Cells["colShopName"].Value.ParseToString().Contains(txtFilterShopName.Text.Trim()))
|
||||||
|
{
|
||||||
|
row.Visible = false;
|
||||||
|
row.Cells["colSelect"].Value = false;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (!row.Cells["colShopNotes"].Value.ParseToString().Contains(txtFilterShopNotes.Text.Trim()))
|
||||||
|
{
|
||||||
|
row.Visible = false;
|
||||||
|
row.Cells["colSelect"].Value = false;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
row.Visible = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void btnEmptyShop_Click(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
txtFilterShopName.Text = "";
|
||||||
|
txtFilterShopNotes.Text = "";
|
||||||
|
btnFilterShop_Click(null, null);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public class WXUpload
|
public class WXUpload
|
||||||
@@ -3113,6 +3347,10 @@ Content-Type: application/octet-stream
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public int StockNum { get; set; } = 0;
|
public int StockNum { get; set; } = 0;
|
||||||
public bool IsStepAddPrice { get; set; } = false;
|
public bool IsStepAddPrice { get; set; } = false;
|
||||||
|
/// <summary>
|
||||||
|
/// 运费倍率
|
||||||
|
/// </summary>
|
||||||
|
public decimal ShippingPriceTimes { get; set; } = 1.0m;
|
||||||
}
|
}
|
||||||
|
|
||||||
public class WXUploadRule
|
public class WXUploadRule
|
||||||
|
|||||||
+35
-39
@@ -28,8 +28,9 @@
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
private void InitializeComponent()
|
private void InitializeComponent()
|
||||||
{
|
{
|
||||||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WXShopAddEditForm));
|
|
||||||
this.panel2 = new System.Windows.Forms.Panel();
|
this.panel2 = new System.Windows.Forms.Panel();
|
||||||
|
this.label8 = new System.Windows.Forms.Label();
|
||||||
|
this.txtNotes = new DevComponents.DotNetBar.Controls.TextBoxX();
|
||||||
this.label7 = new System.Windows.Forms.Label();
|
this.label7 = new System.Windows.Forms.Label();
|
||||||
this.cmbGroup = new System.Windows.Forms.ComboBox();
|
this.cmbGroup = new System.Windows.Forms.ComboBox();
|
||||||
this.txtBuyAccount = new DevComponents.DotNetBar.Controls.TextBoxX();
|
this.txtBuyAccount = new DevComponents.DotNetBar.Controls.TextBoxX();
|
||||||
@@ -44,8 +45,6 @@
|
|||||||
this.label1 = new System.Windows.Forms.Label();
|
this.label1 = new System.Windows.Forms.Label();
|
||||||
this.label5 = new System.Windows.Forms.Label();
|
this.label5 = new System.Windows.Forms.Label();
|
||||||
this.btnOk = new TemuKJD.UserControls.ButtonEx();
|
this.btnOk = new TemuKJD.UserControls.ButtonEx();
|
||||||
this.txtNotes = new DevComponents.DotNetBar.Controls.TextBoxX();
|
|
||||||
this.label8 = new System.Windows.Forms.Label();
|
|
||||||
this.panel2.SuspendLayout();
|
this.panel2.SuspendLayout();
|
||||||
this.SuspendLayout();
|
this.SuspendLayout();
|
||||||
//
|
//
|
||||||
@@ -75,6 +74,35 @@
|
|||||||
this.panel2.TabIndex = 1;
|
this.panel2.TabIndex = 1;
|
||||||
this.panel2.Paint += new System.Windows.Forms.PaintEventHandler(this.panel2_Paint);
|
this.panel2.Paint += new System.Windows.Forms.PaintEventHandler(this.panel2_Paint);
|
||||||
//
|
//
|
||||||
|
// label8
|
||||||
|
//
|
||||||
|
this.label8.AutoSize = true;
|
||||||
|
this.label8.Location = new System.Drawing.Point(29, 135);
|
||||||
|
this.label8.Name = "label8";
|
||||||
|
this.label8.Size = new System.Drawing.Size(56, 17);
|
||||||
|
this.label8.TabIndex = 386;
|
||||||
|
this.label8.Text = " 备注";
|
||||||
|
//
|
||||||
|
// txtNotes
|
||||||
|
//
|
||||||
|
//
|
||||||
|
//
|
||||||
|
//
|
||||||
|
this.txtNotes.Border.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
|
||||||
|
this.txtNotes.Border.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
|
||||||
|
this.txtNotes.Border.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
|
||||||
|
this.txtNotes.Border.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
|
||||||
|
this.txtNotes.Border.Class = "CrumbBarBackgroundKey";
|
||||||
|
this.txtNotes.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||||
|
this.txtNotes.Border.PaddingBottom = 2;
|
||||||
|
this.txtNotes.Border.PaddingLeft = 2;
|
||||||
|
this.txtNotes.Border.PaddingRight = 2;
|
||||||
|
this.txtNotes.Border.PaddingTop = 2;
|
||||||
|
this.txtNotes.Location = new System.Drawing.Point(91, 133);
|
||||||
|
this.txtNotes.Name = "txtNotes";
|
||||||
|
this.txtNotes.Size = new System.Drawing.Size(172, 23);
|
||||||
|
this.txtNotes.TabIndex = 385;
|
||||||
|
//
|
||||||
// label7
|
// label7
|
||||||
//
|
//
|
||||||
this.label7.AutoSize = true;
|
this.label7.AutoSize = true;
|
||||||
@@ -95,11 +123,10 @@
|
|||||||
"上货",
|
"上货",
|
||||||
"数据",
|
"数据",
|
||||||
"登录"});
|
"登录"});
|
||||||
this.cmbGroup.Location = new System.Drawing.Point(91, 257);
|
this.cmbGroup.Location = new System.Drawing.Point(91, 166);
|
||||||
this.cmbGroup.Name = "cmbGroup";
|
this.cmbGroup.Name = "cmbGroup";
|
||||||
this.cmbGroup.Size = new System.Drawing.Size(172, 25);
|
this.cmbGroup.Size = new System.Drawing.Size(172, 25);
|
||||||
this.cmbGroup.TabIndex = 383;
|
this.cmbGroup.TabIndex = 383;
|
||||||
this.cmbGroup.Visible = false;
|
|
||||||
//
|
//
|
||||||
// txtBuyAccount
|
// txtBuyAccount
|
||||||
//
|
//
|
||||||
@@ -228,12 +255,11 @@
|
|||||||
// label5
|
// label5
|
||||||
//
|
//
|
||||||
this.label5.AutoSize = true;
|
this.label5.AutoSize = true;
|
||||||
this.label5.Location = new System.Drawing.Point(29, 260);
|
this.label5.Location = new System.Drawing.Point(29, 169);
|
||||||
this.label5.Name = "label5";
|
this.label5.Name = "label5";
|
||||||
this.label5.Size = new System.Drawing.Size(56, 17);
|
this.label5.Size = new System.Drawing.Size(56, 17);
|
||||||
this.label5.TabIndex = 377;
|
this.label5.TabIndex = 377;
|
||||||
this.label5.Text = "店铺分组";
|
this.label5.Text = "店铺分组";
|
||||||
this.label5.Visible = false;
|
|
||||||
//
|
//
|
||||||
// btnOk
|
// btnOk
|
||||||
//
|
//
|
||||||
@@ -251,43 +277,13 @@
|
|||||||
this.btnOk.UseVisualStyleBackColor = false;
|
this.btnOk.UseVisualStyleBackColor = false;
|
||||||
this.btnOk.Click += new System.EventHandler(this.btnOk_Click);
|
this.btnOk.Click += new System.EventHandler(this.btnOk_Click);
|
||||||
//
|
//
|
||||||
// txtNotes
|
// WXShopAddEditForm
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
this.txtNotes.Border.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
|
|
||||||
this.txtNotes.Border.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
|
|
||||||
this.txtNotes.Border.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
|
|
||||||
this.txtNotes.Border.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
|
|
||||||
this.txtNotes.Border.Class = "CrumbBarBackgroundKey";
|
|
||||||
this.txtNotes.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
|
||||||
this.txtNotes.Border.PaddingBottom = 2;
|
|
||||||
this.txtNotes.Border.PaddingLeft = 2;
|
|
||||||
this.txtNotes.Border.PaddingRight = 2;
|
|
||||||
this.txtNotes.Border.PaddingTop = 2;
|
|
||||||
this.txtNotes.Location = new System.Drawing.Point(91, 133);
|
|
||||||
this.txtNotes.Name = "txtNotes";
|
|
||||||
this.txtNotes.Size = new System.Drawing.Size(172, 23);
|
|
||||||
this.txtNotes.TabIndex = 385;
|
|
||||||
//
|
|
||||||
// label8
|
|
||||||
//
|
|
||||||
this.label8.AutoSize = true;
|
|
||||||
this.label8.Location = new System.Drawing.Point(29, 135);
|
|
||||||
this.label8.Name = "label8";
|
|
||||||
this.label8.Size = new System.Drawing.Size(56, 17);
|
|
||||||
this.label8.TabIndex = 386;
|
|
||||||
this.label8.Text = " 备注";
|
|
||||||
//
|
|
||||||
// ShopAddEditForm
|
|
||||||
//
|
//
|
||||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
|
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
|
||||||
this.ClientSize = new System.Drawing.Size(297, 319);
|
this.ClientSize = new System.Drawing.Size(297, 319);
|
||||||
this.Controls.Add(this.panel2);
|
this.Controls.Add(this.panel2);
|
||||||
this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||||
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
|
this.Name = "WXShopAddEditForm";
|
||||||
this.Name = "ShopAddEditForm";
|
|
||||||
this.Text = "添加店铺";
|
this.Text = "添加店铺";
|
||||||
this.TitleText = "添加店铺";
|
this.TitleText = "添加店铺";
|
||||||
this.Load += new System.EventHandler(this.ShopAddEditForm_Load);
|
this.Load += new System.EventHandler(this.ShopAddEditForm_Load);
|
||||||
|
|||||||
+29
-28
@@ -38,6 +38,7 @@
|
|||||||
this.btnLoginSelect = new TemuKJD.UserControls.ButtonEx();
|
this.btnLoginSelect = new TemuKJD.UserControls.ButtonEx();
|
||||||
this.btnCheck = new TemuKJD.UserControls.ButtonEx();
|
this.btnCheck = new TemuKJD.UserControls.ButtonEx();
|
||||||
this.panel4 = new System.Windows.Forms.Panel();
|
this.panel4 = new System.Windows.Forms.Panel();
|
||||||
|
this.btnAddShop = new TemuKJD.UserControls.ButtonEx();
|
||||||
this.cmbNotes = new System.Windows.Forms.ComboBox();
|
this.cmbNotes = new System.Windows.Forms.ComboBox();
|
||||||
this.pnlEmpty = new DevComponents.DotNetBar.PanelEx();
|
this.pnlEmpty = new DevComponents.DotNetBar.PanelEx();
|
||||||
this.btnSearch = new TemuKJD.UserControls.ButtonEx();
|
this.btnSearch = new TemuKJD.UserControls.ButtonEx();
|
||||||
@@ -47,7 +48,6 @@
|
|||||||
this.txtShopId = new System.Windows.Forms.TextBox();
|
this.txtShopId = new System.Windows.Forms.TextBox();
|
||||||
this.label2 = new System.Windows.Forms.Label();
|
this.label2 = new System.Windows.Forms.Label();
|
||||||
this.btnImport = new TemuKJD.UserControls.ButtonEx();
|
this.btnImport = new TemuKJD.UserControls.ButtonEx();
|
||||||
this.btnAddShop = new TemuKJD.UserControls.ButtonEx();
|
|
||||||
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
|
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
|
||||||
this.btnRefreshAuth = new TemuKJD.UserControls.ButtonEx();
|
this.btnRefreshAuth = new TemuKJD.UserControls.ButtonEx();
|
||||||
this.pbLoading = new System.Windows.Forms.PictureBox();
|
this.pbLoading = new System.Windows.Forms.PictureBox();
|
||||||
@@ -59,9 +59,9 @@
|
|||||||
this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||||
this.colShopAccount = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
this.colShopAccount = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||||
this.colNotes = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
this.colNotes = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||||
|
this.colGroupName = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||||
this.colCookie = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
this.colCookie = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||||
this.colSubUser = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
this.colSubUser = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||||
this.colGroupName = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
|
||||||
this.colUploadAccount = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
this.colUploadAccount = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||||
this.colBuyAccount = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
this.colBuyAccount = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||||
this.colChatAccount = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
this.colChatAccount = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||||
@@ -213,6 +213,22 @@
|
|||||||
this.panel4.Size = new System.Drawing.Size(1023, 40);
|
this.panel4.Size = new System.Drawing.Size(1023, 40);
|
||||||
this.panel4.TabIndex = 0;
|
this.panel4.TabIndex = 0;
|
||||||
//
|
//
|
||||||
|
// btnAddShop
|
||||||
|
//
|
||||||
|
this.btnAddShop.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||||
|
this.btnAddShop.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||||
|
this.btnAddShop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
|
||||||
|
this.btnAddShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||||
|
this.btnAddShop.ForeColor = System.Drawing.Color.White;
|
||||||
|
this.btnAddShop.Location = new System.Drawing.Point(1, 9);
|
||||||
|
this.btnAddShop.Margin = new System.Windows.Forms.Padding(2);
|
||||||
|
this.btnAddShop.Name = "btnAddShop";
|
||||||
|
this.btnAddShop.Size = new System.Drawing.Size(107, 26);
|
||||||
|
this.btnAddShop.TabIndex = 370;
|
||||||
|
this.btnAddShop.Text = "扫码添加店铺";
|
||||||
|
this.btnAddShop.UseVisualStyleBackColor = false;
|
||||||
|
this.btnAddShop.Click += new System.EventHandler(this.btnAddShop_Click);
|
||||||
|
//
|
||||||
// cmbNotes
|
// cmbNotes
|
||||||
//
|
//
|
||||||
this.cmbNotes.FormattingEnabled = true;
|
this.cmbNotes.FormattingEnabled = true;
|
||||||
@@ -320,22 +336,6 @@
|
|||||||
this.btnImport.Visible = false;
|
this.btnImport.Visible = false;
|
||||||
this.btnImport.Click += new System.EventHandler(this.btnImport_Click);
|
this.btnImport.Click += new System.EventHandler(this.btnImport_Click);
|
||||||
//
|
//
|
||||||
// btnAddShop
|
|
||||||
//
|
|
||||||
this.btnAddShop.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
|
||||||
this.btnAddShop.Cursor = System.Windows.Forms.Cursors.Hand;
|
|
||||||
this.btnAddShop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
|
|
||||||
this.btnAddShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
|
||||||
this.btnAddShop.ForeColor = System.Drawing.Color.White;
|
|
||||||
this.btnAddShop.Location = new System.Drawing.Point(1, 9);
|
|
||||||
this.btnAddShop.Margin = new System.Windows.Forms.Padding(2);
|
|
||||||
this.btnAddShop.Name = "btnAddShop";
|
|
||||||
this.btnAddShop.Size = new System.Drawing.Size(107, 26);
|
|
||||||
this.btnAddShop.TabIndex = 370;
|
|
||||||
this.btnAddShop.Text = "扫码添加店铺";
|
|
||||||
this.btnAddShop.UseVisualStyleBackColor = false;
|
|
||||||
this.btnAddShop.Click += new System.EventHandler(this.btnAddShop_Click);
|
|
||||||
//
|
|
||||||
// splitContainer2
|
// splitContainer2
|
||||||
//
|
//
|
||||||
this.splitContainer2.BackColor = System.Drawing.Color.White;
|
this.splitContainer2.BackColor = System.Drawing.Color.White;
|
||||||
@@ -413,9 +413,9 @@
|
|||||||
this.colShopId,
|
this.colShopId,
|
||||||
this.colShopAccount,
|
this.colShopAccount,
|
||||||
this.colNotes,
|
this.colNotes,
|
||||||
|
this.colGroupName,
|
||||||
this.colCookie,
|
this.colCookie,
|
||||||
this.colSubUser,
|
this.colSubUser,
|
||||||
this.colGroupName,
|
|
||||||
this.colUploadAccount,
|
this.colUploadAccount,
|
||||||
this.colBuyAccount,
|
this.colBuyAccount,
|
||||||
this.colChatAccount,
|
this.colChatAccount,
|
||||||
@@ -490,16 +490,25 @@
|
|||||||
//
|
//
|
||||||
// colShopAccount
|
// colShopAccount
|
||||||
//
|
//
|
||||||
|
this.colShopAccount.FillWeight = 90F;
|
||||||
this.colShopAccount.HeaderText = "店铺账号";
|
this.colShopAccount.HeaderText = "店铺账号";
|
||||||
this.colShopAccount.Name = "colShopAccount";
|
this.colShopAccount.Name = "colShopAccount";
|
||||||
this.colShopAccount.ReadOnly = true;
|
this.colShopAccount.ReadOnly = true;
|
||||||
//
|
//
|
||||||
// colNotes
|
// colNotes
|
||||||
//
|
//
|
||||||
|
this.colNotes.FillWeight = 90F;
|
||||||
this.colNotes.HeaderText = "备注";
|
this.colNotes.HeaderText = "备注";
|
||||||
this.colNotes.Name = "colNotes";
|
this.colNotes.Name = "colNotes";
|
||||||
this.colNotes.ReadOnly = true;
|
this.colNotes.ReadOnly = true;
|
||||||
//
|
//
|
||||||
|
// colGroupName
|
||||||
|
//
|
||||||
|
this.colGroupName.FillWeight = 80F;
|
||||||
|
this.colGroupName.HeaderText = "店铺分组";
|
||||||
|
this.colGroupName.Name = "colGroupName";
|
||||||
|
this.colGroupName.ReadOnly = true;
|
||||||
|
//
|
||||||
// colCookie
|
// colCookie
|
||||||
//
|
//
|
||||||
this.colCookie.HeaderText = "店铺Cookie";
|
this.colCookie.HeaderText = "店铺Cookie";
|
||||||
@@ -514,14 +523,6 @@
|
|||||||
this.colSubUser.Name = "colSubUser";
|
this.colSubUser.Name = "colSubUser";
|
||||||
this.colSubUser.ReadOnly = true;
|
this.colSubUser.ReadOnly = true;
|
||||||
//
|
//
|
||||||
// colGroupName
|
|
||||||
//
|
|
||||||
this.colGroupName.FillWeight = 69.42599F;
|
|
||||||
this.colGroupName.HeaderText = "店铺分组";
|
|
||||||
this.colGroupName.Name = "colGroupName";
|
|
||||||
this.colGroupName.ReadOnly = true;
|
|
||||||
this.colGroupName.Visible = false;
|
|
||||||
//
|
|
||||||
// colUploadAccount
|
// colUploadAccount
|
||||||
//
|
//
|
||||||
this.colUploadAccount.FillWeight = 69.42599F;
|
this.colUploadAccount.FillWeight = 69.42599F;
|
||||||
@@ -717,9 +718,9 @@
|
|||||||
private System.Windows.Forms.DataGridViewTextBoxColumn colShopId;
|
private System.Windows.Forms.DataGridViewTextBoxColumn colShopId;
|
||||||
private System.Windows.Forms.DataGridViewTextBoxColumn colShopAccount;
|
private System.Windows.Forms.DataGridViewTextBoxColumn colShopAccount;
|
||||||
private System.Windows.Forms.DataGridViewTextBoxColumn colNotes;
|
private System.Windows.Forms.DataGridViewTextBoxColumn colNotes;
|
||||||
|
private System.Windows.Forms.DataGridViewTextBoxColumn colGroupName;
|
||||||
private System.Windows.Forms.DataGridViewTextBoxColumn colCookie;
|
private System.Windows.Forms.DataGridViewTextBoxColumn colCookie;
|
||||||
private System.Windows.Forms.DataGridViewTextBoxColumn colSubUser;
|
private System.Windows.Forms.DataGridViewTextBoxColumn colSubUser;
|
||||||
private System.Windows.Forms.DataGridViewTextBoxColumn colGroupName;
|
|
||||||
private System.Windows.Forms.DataGridViewTextBoxColumn colUploadAccount;
|
private System.Windows.Forms.DataGridViewTextBoxColumn colUploadAccount;
|
||||||
private System.Windows.Forms.DataGridViewTextBoxColumn colBuyAccount;
|
private System.Windows.Forms.DataGridViewTextBoxColumn colBuyAccount;
|
||||||
private System.Windows.Forms.DataGridViewTextBoxColumn colChatAccount;
|
private System.Windows.Forms.DataGridViewTextBoxColumn colChatAccount;
|
||||||
|
|||||||
@@ -480,9 +480,9 @@ namespace TemuKJD.WXForms.ShopForms
|
|||||||
param.ShopId,
|
param.ShopId,
|
||||||
param.ShopAccount,
|
param.ShopAccount,
|
||||||
param.Notes,
|
param.Notes,
|
||||||
|
param.GroupName,
|
||||||
param.Cookies,
|
param.Cookies,
|
||||||
param.SubUserName,
|
param.SubUserName,
|
||||||
param.GroupName,
|
|
||||||
param.UploadAccount,
|
param.UploadAccount,
|
||||||
param.BuyAccount,
|
param.BuyAccount,
|
||||||
param.ChatAccount,
|
param.ChatAccount,
|
||||||
|
|||||||
@@ -132,15 +132,15 @@
|
|||||||
<metadata name="colNotes.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
<metadata name="colNotes.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
<value>True</value>
|
<value>True</value>
|
||||||
</metadata>
|
</metadata>
|
||||||
|
<metadata name="colGroupName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
|
<value>True</value>
|
||||||
|
</metadata>
|
||||||
<metadata name="colCookie.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
<metadata name="colCookie.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
<value>True</value>
|
<value>True</value>
|
||||||
</metadata>
|
</metadata>
|
||||||
<metadata name="colSubUser.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
<metadata name="colSubUser.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
<value>True</value>
|
<value>True</value>
|
||||||
</metadata>
|
</metadata>
|
||||||
<metadata name="colGroupName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
|
||||||
<value>True</value>
|
|
||||||
</metadata>
|
|
||||||
<metadata name="colUploadAccount.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
<metadata name="colUploadAccount.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
<value>True</value>
|
<value>True</value>
|
||||||
</metadata>
|
</metadata>
|
||||||
|
|||||||
@@ -716,6 +716,15 @@ offCountPara,false;offProductPara,100;IrregularitiesPara,true;noNeerPara,true;no
|
|||||||
File.Delete(Path.Combine(Environment.CurrentDirectory, "temp\\wxCat.zip"));
|
File.Delete(Path.Combine(Environment.CurrentDirectory, "temp\\wxCat.zip"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (!FileBase.Exists("temp\\wxCatBound"))
|
||||||
|
{
|
||||||
|
if (GetHtml.DownloadFile(BaseClass.ServerUrl + "/Download/" + "wxCatBound.zip", "temp\\wxCatBound.dll" + ".bak"))
|
||||||
|
{
|
||||||
|
FileBase.Move("temp\\wxCatBound.dll" + ".bak", "temp\\wxCatBound.zip");
|
||||||
|
ZipFile.ExtractToDirectory(Path.Combine(Environment.CurrentDirectory, "temp\\wxCatBound.zip"), Path.Combine(Environment.CurrentDirectory, "temp"));
|
||||||
|
File.Delete(Path.Combine(Environment.CurrentDirectory, "temp\\wxCatBound.zip"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
List<KeyValueBase> files = new List<KeyValueBase>();
|
List<KeyValueBase> files = new List<KeyValueBase>();
|
||||||
|
|||||||
Reference in new issue
Block a user