diff --git a/AllBase/AllBase.csproj b/AllBase/AllBase.csproj
index e09746c..184648c 100644
--- a/AllBase/AllBase.csproj
+++ b/AllBase/AllBase.csproj
@@ -287,6 +287,7 @@
+
diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs
index 4702ac2..dddbdd2 100644
--- a/AllBase/BaseClass.cs
+++ b/AllBase/BaseClass.cs
@@ -27,7 +27,7 @@ namespace AllBase
///
/// 版本ID
///
- public static int VersionCount = 1013;
+ public static int VersionCount = 1016;
//public static int VersionCount = 613;
///
diff --git a/AllBase/Model/Result/PDDResult/PddBuyerOrderInfoLite.cs b/AllBase/Model/Result/PDDResult/PddBuyerOrderInfoLite.cs
index cad1f9d..1ad3b0d 100644
--- a/AllBase/Model/Result/PDDResult/PddBuyerOrderInfoLite.cs
+++ b/AllBase/Model/Result/PDDResult/PddBuyerOrderInfoLite.cs
@@ -20,24 +20,31 @@ namespace AllBase.Model.Result.PDDResult
//BTWL 百世快运
//HTKY 百世快递
+ public static string GetWxExpressCompanyCode(string expressCompanyName)
+ {
+ if (expressCompanyName == null || expressCompanyName == "") return "";
+ if (expressCompanyName.Contains("邮政快递包裹")) return "EMS";
+ if (expressCompanyName.Contains("邮政电商标快")) return "EMS";
+ if (expressCompanyName.Contains("邮政EMS")) return "EMS";
+ if (expressCompanyName.Contains("极兔速递")) return "JTSD";
+ if (expressCompanyName.Contains("申通快递")) return "STO";
+ if (expressCompanyName.Contains("韵达快递")) return "YD";
+ if (expressCompanyName.Contains("圆通快递")) return "YTO";
+ if (expressCompanyName.Contains("中通快递")) return "ZTO";
+ if (expressCompanyName.Contains("百世快运")) return "BTWL";
+ if (expressCompanyName.Contains("百世快递")) return "HTKY";
+ if (expressCompanyName.Contains("顺丰速运")) return "SF";
+ if (expressCompanyName.Contains("京东快递")) return "JD";
+ if (expressCompanyName.Contains("京东快运")) return "JDKY";
+ return "";
+ }
+
public string outExpressCompanyMsg { get; set; } // 物流公司名称，可以尝试直接从列表中匹配
public string outExpressCompanyCode
{
get
{
- if (outExpressCompanyMsg == null || outExpressCompanyMsg == "") return "";
- if (outExpressCompanyMsg.Contains("邮政快递包裹")) return "EMS";
- if (outExpressCompanyMsg.Contains("邮政电商标快")) return "EMS";
- if (outExpressCompanyMsg.Contains("邮政EMS")) return "EMS";
- if (outExpressCompanyMsg.Contains("极兔速递")) return "JTSD";
- if (outExpressCompanyMsg.Contains("申通快递")) return "STO";
- if (outExpressCompanyMsg.Contains("韵达快递")) return "YD";
- if (outExpressCompanyMsg.Contains("圆通快递")) return "YTO";
- if (outExpressCompanyMsg.Contains("中通快递")) return "ZTO";
- if (outExpressCompanyMsg.Contains("百世快运")) return "BTWL";
- if (outExpressCompanyMsg.Contains("百世快递")) return "HTKY";
- if (outExpressCompanyMsg.Contains("顺丰")) return "SF";
- return "";
+ return GetWxExpressCompanyCode(outExpressCompanyName);
}
}
public string outExpressCompanyName
@@ -55,7 +62,9 @@ namespace AllBase.Model.Result.PDDResult
if (outExpressCompanyMsg.Contains("百世快运")) return "百世快运";
if (outExpressCompanyMsg.Contains("百世快递")) return "百世快递";
if (outExpressCompanyMsg.Contains("邮政EMS")) return "邮政EMS";
- if (outExpressCompanyMsg.Contains("顺丰")) return "顺丰速运";
+ if (outExpressCompanyMsg.Contains("顺丰速运")) return "顺丰速运";
+ if (outExpressCompanyMsg.Contains("京东快递")) return "京东快递";
+ if (outExpressCompanyMsg.Contains("京东快运")) return "京东快运";
return "物流名称获取失败";
}
}
diff --git a/AllBase/Model/Result/WXResult/WxOptimizeOrderAfterSaleInfo.cs b/AllBase/Model/Result/WXResult/WxOptimizeOrderAfterSaleInfo.cs
index d4084f2..ce8d557 100644
--- a/AllBase/Model/Result/WXResult/WxOptimizeOrderAfterSaleInfo.cs
+++ b/AllBase/Model/Result/WXResult/WxOptimizeOrderAfterSaleInfo.cs
@@ -10,6 +10,8 @@ namespace AllBase.Model.Result.WXResult
{
public string shopId { get; set; }
public string shopName { get; set; }
+ public string optimizeWaybillId { get; set; }
+ public string optimizeTime { get; set; }
public AfterSaleOrderInfo orderInfo { get; set; }
public string reason { get; set; } // "生锈/弯曲变形/钝化不锋利"
diff --git a/AllBase/Model/Result/WXResult/WxOptimizeOrderWayBillInfo.cs b/AllBase/Model/Result/WXResult/WxOptimizeOrderWayBillInfo.cs
index 7142c22..e85e99a 100644
--- a/AllBase/Model/Result/WXResult/WxOptimizeOrderWayBillInfo.cs
+++ b/AllBase/Model/Result/WXResult/WxOptimizeOrderWayBillInfo.cs
@@ -10,6 +10,8 @@ namespace AllBase.Model.Result.WXResult
{
public string shopId { get; set; }
public string shopName { get; set; }
+ public string optimizeWaybillId { get; set; }
+ public string optimizeTime { get; set; }
public WayBillOrderInfo orderInfo { get; set; }
public string waybillId { get; set; } // "JT4157662637789",
diff --git a/AllBase/Model/Result/WXResult/WxOptimizeProductEvaluationInfo.cs b/AllBase/Model/Result/WXResult/WxOptimizeProductEvaluationInfo.cs
index f260bd9..9f608d1 100644
--- a/AllBase/Model/Result/WXResult/WxOptimizeProductEvaluationInfo.cs
+++ b/AllBase/Model/Result/WXResult/WxOptimizeProductEvaluationInfo.cs
@@ -10,6 +10,10 @@ namespace AllBase.Model.Result.WXResult
{
public string shopId { get; set; }
public string shopName { get; set; }
+ public string optimizeWaybillId { get; set; }
+ public string optimizeTime { get; set; }
+
+ public string order_id { get; set; }
public string productEvaluationId { get; set; } // "53890834526",
public OptimizeEvaluationInfo evaluationInfo { get; set; }
diff --git a/AllBase/Model/Result/WXResult/WxOptrimizeLinerCgiInfo.cs b/AllBase/Model/Result/WXResult/WxOptrimizeLinerCgiInfo.cs
index 9f68e57..40ac8db 100644
--- a/AllBase/Model/Result/WXResult/WxOptrimizeLinerCgiInfo.cs
+++ b/AllBase/Model/Result/WXResult/WxOptrimizeLinerCgiInfo.cs
@@ -10,6 +10,8 @@ namespace AllBase.Model.Result.WXResult
{
public string shopId { get; set; }
public string shopName { get; set; }
+ public string optimizeWaybillId { get; set; }
+ public string optimizeTime { get; set; }
public string receipt_province { get; set; } // "福建省",
public string ship_province { get; set; } // "广东省",
diff --git a/KJDService/KJD_WebService/BLL/WXXD/WXProductManage.cs b/KJDService/KJD_WebService/BLL/WXXD/WXProductManage.cs
index 3634a53..b12ffa4 100644
--- a/KJDService/KJD_WebService/BLL/WXXD/WXProductManage.cs
+++ b/KJDService/KJD_WebService/BLL/WXXD/WXProductManage.cs
@@ -894,8 +894,8 @@ namespace KJD_Web.BLL.WXXD
sql += where;
sql += " order by id desc limit " + Math.Max(0, page - 1) * page_size + "," + page_size + ";";
dt = mySql.ExecuteDataTable(sql);
- mySql.Close();
}
+ mySql.Close();
if (dt != null)
{
diff --git a/KJDService/KJD_WebService/BLL/WXXD/WXUserManage.cs b/KJDService/KJD_WebService/BLL/WXXD/WXUserManage.cs
index 869ef45..56a61b4 100644
--- a/KJDService/KJD_WebService/BLL/WXXD/WXUserManage.cs
+++ b/KJDService/KJD_WebService/BLL/WXXD/WXUserManage.cs
@@ -79,7 +79,8 @@ namespace KJD_Web.BLL.WXXD
var userAuthLst = user.authority.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries).ToList();
if (!main_authority.Contains("积分用户"))
{
- user.authority = string.Join(",", userAuthLst.Remove("积分用户"));
+ userAuthLst.Remove("积分用户");
+ user.authority = string.Join(",", userAuthLst);
}
else if (!user.authority.Contains("积分用户"))
{
@@ -344,7 +345,8 @@ namespace KJD_Web.BLL.WXXD
var userAuthLst = user.authority.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries).ToList();
if (!main_authority.Contains("积分用户"))
{
- user.authority = string.Join(",", userAuthLst.Remove("积分用户"));
+ userAuthLst.Remove("积分用户");
+ user.authority = string.Join(",", userAuthLst);
}
else if (!user.authority.Contains("积分用户"))
{
diff --git a/KJDService/KJD_WebService/KJD_WebService.csproj b/KJDService/KJD_WebService/KJD_WebService.csproj
index 03cc50f..edbd917 100644
--- a/KJDService/KJD_WebService/KJD_WebService.csproj
+++ b/KJDService/KJD_WebService/KJD_WebService.csproj
@@ -113,6 +113,7 @@
+
@@ -128,6 +129,7 @@
+
WXProd.aspx
diff --git a/KJDService/KJD_WebService/Utils/MySqlUtils.cs b/KJDService/KJD_WebService/Utils/MySqlUtils.cs
index 27cae30..42e4178 100644
--- a/KJDService/KJD_WebService/Utils/MySqlUtils.cs
+++ b/KJDService/KJD_WebService/Utils/MySqlUtils.cs
@@ -58,21 +58,21 @@ namespace KJD_Web.Utils
///
public bool IsRunning = false;
+ public bool IsUseTrans { get; set; } = false;
+ public MySqlTransaction Transaction { get; set; } = null;
+
///
/// 初始化数据库链接
///
/// 数据库链接
- public MysqlUtils(string connString)
+ public MysqlUtils(string connString, bool isUseTrans = false)
{
+ this.IsUseTrans = isUseTrans;
+
ConnString = connString;
ConnTo();
}
- public void BeginTransaction()
- {
- Conn.BeginTransaction();
- }
-
///
/// 去掉SQL中的特殊字符
///
@@ -112,6 +112,15 @@ namespace KJD_Web.Utils
return value;
}
+ /////
+ ///// 开放一个Conn获取路径，以便外部使用事务提交
+ /////
+ //public MySqlConnection GetConn()
+ //{
+ // //Transaction = Conn.BeginTransaction();
+ // return Conn;
+ //}
+
///
/// 插入数据
///
@@ -662,24 +671,24 @@ namespace KJD_Web.Utils
cmd.Connection = Conn;
cmd.CommandType = CommandType.Text;
cmd.CommandTimeout = TimeOut;
- }
- public MySqlTransaction Transaction { get; set; } = null;
+ if (Transaction != null)
+ cmd.Transaction = Transaction;
+ }
///
/// 连接数据库
///
- private void ConnTo(bool isTransaction = false)
+ private void ConnTo()
{
Close();
try
{
Conn = new MySqlConnection(ConnString);
Conn.Open();
- if (isTransaction)
- {
- Conn.BeginTransaction();
- }
+
+ if (IsUseTrans)
+ this.Transaction = Conn.BeginTransaction();
}
catch (Exception e)
{
@@ -711,6 +720,18 @@ namespace KJD_Web.Utils
}
}
+ public void Commit()
+ {
+ if (Transaction != null)
+ Transaction.Commit();
+ }
+
+ public void RollBack()
+ {
+ if (Transaction != null)
+ Transaction.Rollback();
+ }
+
///
/// 关闭数据库链接
///
@@ -720,7 +741,9 @@ namespace KJD_Web.Utils
try
{
if (Conn != null && Conn.State == ConnectionState.Open)
+ {
Conn.Close();
+ }
Conn = null;
try
@@ -732,6 +755,16 @@ namespace KJD_Web.Utils
{
}
reader = null;
+
+ try
+ {
+ if (Transaction != null)
+ Transaction.Dispose();
+ }
+ catch
+ {
+ }
+ Transaction = null;
}
catch
{
diff --git a/KJDService/KJD_WebService/WXShopService.asmx.cs b/KJDService/KJD_WebService/WXShopService.asmx.cs
index 4d5332a..ede60e1 100644
--- a/KJDService/KJD_WebService/WXShopService.asmx.cs
+++ b/KJDService/KJD_WebService/WXShopService.asmx.cs
@@ -205,6 +205,88 @@ namespace KJD_Web
Context.Response.End();
}
+ [WebMethod]
+ public void add_waybill()
+ {
+ string jsontext = GetRequestJsonString();
+
+ var result = jsontext;
+ result = new WXDeliveryManage().AddWaybill(jsontext);
+
+ Context.Response.Write(result);
+ Context.Response.End();
+ }
+ [WebMethod]
+ public void del_waybill()
+ {
+ string jsontext = GetRequestJsonString();
+
+ var result = jsontext;
+ result = new WXDeliveryManage().DelWaybill(jsontext);
+
+ Context.Response.Write(result);
+ Context.Response.End();
+ }
+ [WebMethod]
+ public void get_waybill()
+ {
+ string jsontext = GetRequestJsonString();
+
+ var result = jsontext;
+ result = new WXDeliveryManage().GetWayBill(jsontext);
+
+ Context.Response.Write(result);
+ Context.Response.End();
+ }
+ [WebMethod]
+ public void get_waybill_no_user_name()
+ {
+ string jsontext = GetRequestJsonString();
+
+ var result = jsontext;
+ result = new WXDeliveryManage().GetWayBill(jsontext, true);
+
+ Context.Response.Write(result);
+ Context.Response.End();
+ }
+ [WebMethod]
+ public void select_and_set_waybill()
+ {
+ string jsontext = GetRequestJsonString();
+
+ var result = jsontext;
+ result = new WXDeliveryManage().SelectAndSetWaybill(jsontext);
+
+ Context.Response.Write(result);
+ Context.Response.End();
+ }
+ [WebMethod]
+ public void select_waybill()
+ {
+ string jsontext = GetRequestJsonString();
+
+ var result = jsontext;
+ result = new WXDeliveryManage().SelectWaybill(jsontext);
+
+ Context.Response.Write(result);
+ Context.Response.End();
+ }
+
+ ///
+ /// 标记已正式使用的运单号
+ ///
+ [WebMethod]
+ public void update_used_waybill()
+ {
+ string jsontext = GetRequestJsonString();
+
+ var result = jsontext;
+ result = new WXDeliveryManage().UpdateUsedWaybill(jsontext);
+
+ Context.Response.Write(result);
+ Context.Response.End();
+ }
+
[WebMethod]
public void e57_get_wx_tokens()
{
diff --git a/TEMUKJD/KJD.csproj b/TEMUKJD/KJD.csproj
index 8f51c34..3c914c8 100644
--- a/TEMUKJD/KJD.csproj
+++ b/TEMUKJD/KJD.csproj
@@ -262,6 +262,12 @@
WXAdminAddressSyncForm.cs
+
+ Form
+
+
+ WXWaybillManageForm.cs
+
Form
@@ -1298,6 +1304,9 @@
WXProdComplateForm.cs
+
+ WXWaybillManageForm.cs
+
WXUserProdListForm.cs
diff --git a/TEMUKJD/PDDForms/ShopForms/PDDShopListForm.cs b/TEMUKJD/PDDForms/ShopForms/PDDShopListForm.cs
index 87c1202..5e420cc 100644
--- a/TEMUKJD/PDDForms/ShopForms/PDDShopListForm.cs
+++ b/TEMUKJD/PDDForms/ShopForms/PDDShopListForm.cs
@@ -879,11 +879,12 @@ namespace TemuKJD.PDDForms.ShopForms
break;
case "订单Api":
{
- var currentPddClient = GlobalConfig.PddClentInfoList.FirstOrDefault(c => c.is_current == true);
- if (currentPddClient != null)
+ //var currentPddClient = GlobalConfig.PddClentInfoList.FirstOrDefault(c => c.is_current == true);
+ //if (currentPddClient != null)
{
PDDShopLoginForm shopLoginForm = new PDDShopLoginForm(shop);
- shopLoginForm.InitUrl = "https://fuwu.pinduoduo.com/service-market/service-detail?detailId=84862";
+ //shopLoginForm.InitUrl = "https://fuwu.pinduoduo.com/service-market/service-detail?detailId=84862";
+ shopLoginForm.InitUrl = "https://fuwu.pinduoduo.com/service-market/service-detail?detailId=79676"; // 小红椒
shopLoginForm.openType = EnumOpenType.manage;
shopLoginForm.SaveComplete += shopLoginForm_SaveComplete;
shopLoginForm.ShowDialog();
@@ -893,14 +894,15 @@ namespace TemuKJD.PDDForms.ShopForms
break;
case "订单授权":
{
- var currentPddClient = GlobalConfig.PddClentInfoList.FirstOrDefault(c => c.is_current == true);
- if (currentPddClient != null)
+ //var currentPddClient = GlobalConfig.PddClentInfoList.FirstOrDefault(c => c.is_current == true);
+ //if (currentPddClient != null)
{
PDDShopLoginForm shopLoginForm = new PDDShopLoginForm(shop);
shopLoginForm.InitUrl = "https://fuwu.pinduoduo.com/service-market/auth?client_id=" + PddApi.clientId_pi_xiu_guan_jia +
"&redirect_uri=" + GetHtml.UrlEncodeUtf8("http://po.e57.cn/login?source=pdd_code_pixiu") + "&response_type=code";
+ shopLoginForm.InitUrl = "https://fuwu.pinduoduo.com/service-market/auth?client_id=94d942df626a4a118cc18b05ee7f2e8d&redirect_uri=https%3A%2F%2Fpo.e57.cn%2Flogin%3Fsource%3Dpdd_code_xhj&response_type=code";
shopLoginForm.openType = EnumOpenType.manage;
- shopLoginForm.AuthClientId = currentPddClient.client_id;
+ //shopLoginForm.AuthClientId = currentPddClient.client_id;
shopLoginForm.SaveComplete += shopLoginForm_SaveComplete;
shopLoginForm.ShowDialog();
btnRefreshCookie_Click(null, null);
diff --git a/TEMUKJD/WXForms/AdminForms/WXAdminForm.Designer.cs b/TEMUKJD/WXForms/AdminForms/WXAdminForm.Designer.cs
index bbb3470..cae3cfb 100644
--- a/TEMUKJD/WXForms/AdminForms/WXAdminForm.Designer.cs
+++ b/TEMUKJD/WXForms/AdminForms/WXAdminForm.Designer.cs
@@ -37,7 +37,8 @@
System.Windows.Forms.TreeNode treeNode7 = new System.Windows.Forms.TreeNode("随机厂商商品");
System.Windows.Forms.TreeNode treeNode8 = new System.Windows.Forms.TreeNode("地址管理");
System.Windows.Forms.TreeNode treeNode9 = new System.Windows.Forms.TreeNode("图片工具");
- System.Windows.Forms.TreeNode treeNode10 = new System.Windows.Forms.TreeNode("超级权限管理", new System.Windows.Forms.TreeNode[] {
+ System.Windows.Forms.TreeNode treeNode10 = new System.Windows.Forms.TreeNode("运单管理");
+ System.Windows.Forms.TreeNode treeNode11 = new System.Windows.Forms.TreeNode("超级权限管理", new System.Windows.Forms.TreeNode[] {
treeNode1,
treeNode2,
treeNode3,
@@ -46,7 +47,8 @@
treeNode6,
treeNode7,
treeNode8,
- treeNode9});
+ treeNode9,
+ treeNode10});
this.panel1 = new System.Windows.Forms.Panel();
this.panel3 = new System.Windows.Forms.Panel();
this.panel2 = new System.Windows.Forms.Panel();
@@ -155,10 +157,12 @@
treeNode8.Text = "地址管理";
treeNode9.Name = "图片工具";
treeNode9.Text = "图片工具";
- treeNode10.Name = "超级权限管理";
- treeNode10.Text = "超级权限管理";
+ treeNode10.Name = "运单管理";
+ treeNode10.Text = "运单管理";
+ treeNode11.Name = "超级权限管理";
+ treeNode11.Text = "超级权限管理";
this.tv.Nodes.AddRange(new System.Windows.Forms.TreeNode[] {
- treeNode10});
+ treeNode11});
this.tv.OverForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
this.tv.Size = new System.Drawing.Size(140, 446);
this.tv.TabIndex = 1;
diff --git a/TEMUKJD/WXForms/AdminForms/WXAdminForm.cs b/TEMUKJD/WXForms/AdminForms/WXAdminForm.cs
index e107acc..e01666f 100644
--- a/TEMUKJD/WXForms/AdminForms/WXAdminForm.cs
+++ b/TEMUKJD/WXForms/AdminForms/WXAdminForm.cs
@@ -27,6 +27,7 @@ namespace TemuKJD.WXForms.AdminForms
public Lazy imgToolForm = new Lazy();
public Lazy getAddressForm = new Lazy();
public Lazy randomComProductForm = new Lazy();
+ public Lazy waybillManageForm = new Lazy();
public WXAdminForm()
{
@@ -37,7 +38,8 @@ namespace TemuKJD.WXForms.AdminForms
tv.SelectedNode = tv.Nodes[0].Nodes[0];
tv.ExpandGroup(tv.Nodes[0].Name);
- List hideName = new List() { "地址管理1", "1688厂家采集1", "图片工具", "Sku采集回传1", "超级用户管理", "超级店铺管理", "PDD产品库", "SKU替换图", "选品加价管理", "认领待上传", "库存上传", "商品核价" };
+ List hideName = new List() { "运单管理", "地址管理1", "1688厂家采集1", "图片工具", "Sku采集回传1",
+ "超级用户管理", "超级店铺管理", "PDD产品库", "SKU替换图", "选品加价管理", "认领待上传", "库存上传", "商品核价" };
if (BaseClass.GroupId == 3)
{
@@ -105,6 +107,9 @@ namespace TemuKJD.WXForms.AdminForms
case "随机厂商商品":
SetForm(randomComProductForm.Value);
break;
+ case "运单管理":
+ SetForm(waybillManageForm.Value);
+ break;
}
//}));
//}).Start();
diff --git a/TEMUKJD/WXForms/AdminForms/WXProdComplateForm.Designer.cs b/TEMUKJD/WXForms/AdminForms/WXProdComplateForm.Designer.cs
index a57692a..56d20f9 100644
--- a/TEMUKJD/WXForms/AdminForms/WXProdComplateForm.Designer.cs
+++ b/TEMUKJD/WXForms/AdminForms/WXProdComplateForm.Designer.cs
@@ -32,14 +32,14 @@ namespace TemuKJD.WXForms.AdminForms
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.ucGroupBoxEx3 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
this.cmbSaleSort = new System.Windows.Forms.ComboBox();
@@ -905,19 +905,19 @@ namespace TemuKJD.WXForms.AdminForms
//
this.dgvShop.AllowUserToAddRows = false;
this.dgvShop.AllowUserToDeleteRows = false;
- dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke;
- this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+ dataGridViewCellStyle9.BackColor = System.Drawing.Color.WhiteSmoke;
+ this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle9;
this.dgvShop.AutoRowNumber = true;
this.dgvShop.BackgroundColor = System.Drawing.Color.White;
this.dgvShop.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
- this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+ dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle10.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+ this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle10;
this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colSelect,
@@ -935,6 +935,7 @@ namespace TemuKJD.WXForms.AdminForms
this.colMessage});
this.dgvShop.Dock = System.Windows.Forms.DockStyle.Fill;
this.dgvShop.Location = new System.Drawing.Point(4, 0);
+ this.dgvShop.MultiSelectCheckBox = true;
this.dgvShop.Name = "dgvShop";
this.dgvShop.ReadOnly = true;
this.dgvShop.RowHeadersWidth = 25;
@@ -1077,19 +1078,19 @@ namespace TemuKJD.WXForms.AdminForms
//
this.dgvSelectProduct.AllowUserToAddRows = false;
this.dgvSelectProduct.AllowUserToDeleteRows = false;
- dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke;
- this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3;
+ dataGridViewCellStyle11.BackColor = System.Drawing.Color.WhiteSmoke;
+ this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle11;
this.dgvSelectProduct.AutoRowNumber = true;
this.dgvSelectProduct.BackgroundColor = System.Drawing.Color.White;
this.dgvSelectProduct.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
- this.dgvSelectProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4;
+ dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle12.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+ this.dgvSelectProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle12;
this.dgvSelectProduct.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvSelectProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colCheck,
@@ -1119,6 +1120,7 @@ namespace TemuKJD.WXForms.AdminForms
this.colOpResult});
this.dgvSelectProduct.Dock = System.Windows.Forms.DockStyle.Fill;
this.dgvSelectProduct.Location = new System.Drawing.Point(0, 0);
+ this.dgvSelectProduct.MultiSelectCheckBox = true;
this.dgvSelectProduct.Name = "dgvSelectProduct";
this.dgvSelectProduct.ReadOnly = true;
this.dgvSelectProduct.RowTemplate.Height = 23;
@@ -1152,8 +1154,8 @@ namespace TemuKJD.WXForms.AdminForms
//
// colSupplierName
//
- dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle5;
+ dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle13;
this.colSupplierName.Frozen = true;
this.colSupplierName.HeaderText = "店铺名称";
this.colSupplierName.Name = "colSupplierName";
@@ -1241,8 +1243,8 @@ namespace TemuKJD.WXForms.AdminForms
//
// colProductName
//
- dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.colProductName.DefaultCellStyle = dataGridViewCellStyle6;
+ dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.colProductName.DefaultCellStyle = dataGridViewCellStyle14;
this.colProductName.HeaderText = "商品标题";
this.colProductName.Name = "colProductName";
this.colProductName.ReadOnly = true;
@@ -1250,8 +1252,8 @@ namespace TemuKJD.WXForms.AdminForms
//
// colProductCat
//
- dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.colProductCat.DefaultCellStyle = dataGridViewCellStyle7;
+ dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.colProductCat.DefaultCellStyle = dataGridViewCellStyle15;
this.colProductCat.HeaderText = "商品类目";
this.colProductCat.Name = "colProductCat";
this.colProductCat.ReadOnly = true;
@@ -1310,8 +1312,8 @@ namespace TemuKJD.WXForms.AdminForms
//
// colAddTime
//
- dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.colAddTime.DefaultCellStyle = dataGridViewCellStyle8;
+ dataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.colAddTime.DefaultCellStyle = dataGridViewCellStyle16;
this.colAddTime.HeaderText = "上架时间";
this.colAddTime.Name = "colAddTime";
this.colAddTime.ReadOnly = true;
@@ -1420,8 +1422,9 @@ namespace TemuKJD.WXForms.AdminForms
this.ClientSize = new System.Drawing.Size(1424, 641);
this.Controls.Add(this.splitContainer1);
this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.KeyPreview = true;
this.Name = "WXProdComplateForm";
- this.Text = "爆单神器";
+ this.Text = "商品回采 暂时作废";
this.Load += new System.EventHandler(this.UserSelectDbProductForm_Load);
this.VisibleChanged += new System.EventHandler(this.UserSelectDbProductForm_VisibleChanged);
this.splitContainer1.Panel1.ResumeLayout(false);
diff --git a/TEMUKJD/WXForms/ProductForms/WXUserProdListForm.Designer.cs b/TEMUKJD/WXForms/ProductForms/WXUserProdListForm.Designer.cs
index fa314c7..8fe73a0 100644
--- a/TEMUKJD/WXForms/ProductForms/WXUserProdListForm.Designer.cs
+++ b/TEMUKJD/WXForms/ProductForms/WXUserProdListForm.Designer.cs
@@ -420,7 +420,7 @@ namespace TemuKJD.WXForms.ProductForms
this.cmbCat3.DropDownWidth = 1;
this.cmbCat3.FormattingEnabled = true;
this.cmbCat3.IntegralHeight = false;
- this.cmbCat3.Location = new System.Drawing.Point(718, 7);
+ this.cmbCat3.Location = new System.Drawing.Point(718, 5);
this.cmbCat3.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.cmbCat3.Name = "cmbCat3";
this.cmbCat3.Size = new System.Drawing.Size(146, 25);
@@ -448,7 +448,7 @@ namespace TemuKJD.WXForms.ProductForms
this.cmbCat2.DropDownWidth = 1;
this.cmbCat2.FormattingEnabled = true;
this.cmbCat2.IntegralHeight = false;
- this.cmbCat2.Location = new System.Drawing.Point(515, 7);
+ this.cmbCat2.Location = new System.Drawing.Point(515, 5);
this.cmbCat2.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.cmbCat2.Name = "cmbCat2";
this.cmbCat2.Size = new System.Drawing.Size(146, 25);
@@ -476,7 +476,7 @@ namespace TemuKJD.WXForms.ProductForms
this.cmbCat1.DropDownWidth = 1;
this.cmbCat1.FormattingEnabled = true;
this.cmbCat1.IntegralHeight = false;
- this.cmbCat1.Location = new System.Drawing.Point(293, 5);
+ this.cmbCat1.Location = new System.Drawing.Point(293, 7);
this.cmbCat1.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.cmbCat1.Name = "cmbCat1";
this.cmbCat1.Size = new System.Drawing.Size(146, 25);
@@ -536,7 +536,7 @@ namespace TemuKJD.WXForms.ProductForms
"安全+未校验",
"安全商品",
"未校验"});
- this.cmbWxSafe.Location = new System.Drawing.Point(71, 40);
+ this.cmbWxSafe.Location = new System.Drawing.Point(71, 42);
this.cmbWxSafe.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.cmbWxSafe.Name = "cmbWxSafe";
this.cmbWxSafe.Size = new System.Drawing.Size(146, 25);
@@ -559,7 +559,7 @@ namespace TemuKJD.WXForms.ProductForms
//
this.cmbGroupFilter.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
this.cmbGroupFilter.FormattingEnabled = true;
- this.cmbGroupFilter.Location = new System.Drawing.Point(938, 7);
+ this.cmbGroupFilter.Location = new System.Drawing.Point(938, 5);
this.cmbGroupFilter.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.cmbGroupFilter.Name = "cmbGroupFilter";
this.cmbGroupFilter.Size = new System.Drawing.Size(146, 25);
@@ -580,7 +580,7 @@ namespace TemuKJD.WXForms.ProductForms
"机会商品",
"以图搜品",
"外部数据"});
- this.cmbSourceType.Location = new System.Drawing.Point(718, 42);
+ this.cmbSourceType.Location = new System.Drawing.Point(718, 40);
this.cmbSourceType.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.cmbSourceType.Name = "cmbSourceType";
this.cmbSourceType.Size = new System.Drawing.Size(146, 25);
@@ -610,7 +610,7 @@ namespace TemuKJD.WXForms.ProductForms
"",
"是",
"否"});
- this.cmbRelation.Location = new System.Drawing.Point(938, 42);
+ this.cmbRelation.Location = new System.Drawing.Point(938, 40);
this.cmbRelation.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.cmbRelation.Name = "cmbRelation";
this.cmbRelation.Size = new System.Drawing.Size(146, 25);
diff --git a/TEMUKJD/WXForms/ShopForms/WXShopForm.cs b/TEMUKJD/WXForms/ShopForms/WXShopForm.cs
index 07b3c80..e1a4bdf 100644
--- a/TEMUKJD/WXForms/ShopForms/WXShopForm.cs
+++ b/TEMUKJD/WXForms/ShopForms/WXShopForm.cs
@@ -34,11 +34,12 @@ namespace TemuKJD.WXForms.ShopForms
tv.SelectedNode = tv.Nodes[0].Nodes[0];
tv.ExpandGroup(tv.Nodes[0].Name);
- List hideName = new List() { "店铺优化1", "子账号管理", "高级运费模板", "运费模板", "素材库管理", "订单金额统计", "工作明细统计", "店铺经营统计1" };
+ List hideName = new List() { "店铺优化", "子账号管理", "高级运费模板", "运费模板", "素材库管理", "订单金额统计", "工作明细统计", "店铺经营统计1" };
if (BaseClass.GroupId == 3)
{
hideName.Remove("子账号管理");
+ hideName.Remove("店铺优化");
}
foreach (var item in hideName)
diff --git a/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.Designer.cs b/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.Designer.cs
index a73ddbe..2f4a1f0 100644
--- a/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.Designer.cs
+++ b/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.Designer.cs
@@ -43,9 +43,7 @@ namespace TemuKJD.WXForms.ShopForms
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle();
@@ -61,13 +59,21 @@ namespace TemuKJD.WXForms.ShopForms
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle33 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle35 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle36 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle37 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle38 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle39 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.ucGroupBoxEx3 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
+ this.btnWaybillManage = new DevComponents.DotNetBar.PanelEx();
this.ucCheckBox5 = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.ucCheckBox4 = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.ucCheckBox3 = new TemuKJD.UserComponent.UcCheckBox(this.components);
@@ -121,9 +127,11 @@ namespace TemuKJD.WXForms.ShopForms
this.colDgv1ProductName = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colDgv1Spec = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colDgv1OutSn = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.colDgv1OrderSn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.colDgv1OrderId = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colDgv1OrderTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colDgv1AfterSaleReason = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.colDgv1OptimizeStatus = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.colDgv1Optimize = new System.Windows.Forms.DataGridViewLinkColumn();
this.tabPage2 = new System.Windows.Forms.TabPage();
this.panel2 = new System.Windows.Forms.Panel();
this.pictureBox2 = new System.Windows.Forms.PictureBox();
@@ -133,41 +141,45 @@ namespace TemuKJD.WXForms.ShopForms
this.pictureBox3 = new System.Windows.Forms.PictureBox();
this.dgvData3 = new TemuKJD.UserComponent.DataGridViewEx();
this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn();
- this.colSupplierId = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.colSupplierName = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.colLogin = new System.Windows.Forms.DataGridViewLinkColumn();
- this.colInShop = new System.Windows.Forms.DataGridViewLinkColumn();
- this.colImgUrl = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.colImg = new System.Windows.Forms.DataGridViewImageColumn();
+ this.colDgv3ShopId = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.colDgv3ShopName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.colDgv3Login = new System.Windows.Forms.DataGridViewLinkColumn();
+ this.colDgv3InShop = new System.Windows.Forms.DataGridViewLinkColumn();
+ this.colDgv3ImgUrl = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.colDgv3Img = new System.Windows.Forms.DataGridViewImageColumn();
this.colDraftId = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colProductName = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colSpec = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colExtCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.colNotes = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.colDgv3OrderId = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colDeliveryName = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colPayTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colTakeTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colDuration = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.colDgv3OptimizeStatus = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.colDgv3Optimize = new System.Windows.Forms.DataGridViewLinkColumn();
this.tabPage4 = new System.Windows.Forms.TabPage();
this.panel3 = new System.Windows.Forms.Panel();
this.pictureBox4 = new System.Windows.Forms.PictureBox();
this.dgvData4 = new TemuKJD.UserComponent.DataGridViewEx();
this.colDgv4Check = new System.Windows.Forms.DataGridViewCheckBoxColumn();
- this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.dataGridViewLinkColumn1 = new System.Windows.Forms.DataGridViewLinkColumn();
- this.dataGridViewLinkColumn2 = new System.Windows.Forms.DataGridViewLinkColumn();
+ this.colDgv4ShopId = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.colDgv4ShopName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.colDgv4Login = new System.Windows.Forms.DataGridViewLinkColumn();
+ this.colDgv4InShop = new System.Windows.Forms.DataGridViewLinkColumn();
this.colDgv4ImgUrl = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colDgv4Img = new System.Windows.Forms.DataGridViewImageColumn();
this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.colDgv4OrderId = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colDgv4Address = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn12 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.colDgv4OptimizeStatus = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.colDgv4Optimize = new System.Windows.Forms.DataGridViewLinkColumn();
this.tabPage5 = new System.Windows.Forms.TabPage();
this.chkTestNoAuditUpload = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
@@ -184,9 +196,12 @@ namespace TemuKJD.WXForms.ShopForms
this.colDgv2Spec = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colDgv2SkuCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colDgv2EvaluationId = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.colDgv2OrderId = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colDgv2UserNick = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colDgv2CommentTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colDgv2CommentContent = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.colDgv2OptimizeStatus = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.colDgv2Optimize = new System.Windows.Forms.DataGridViewLinkColumn();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@@ -251,6 +266,7 @@ namespace TemuKJD.WXForms.ShopForms
this.ucGroupBoxEx3.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
this.ucGroupBoxEx3.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.ucGroupBoxEx3.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
+ this.ucGroupBoxEx3.Controls.Add(this.btnWaybillManage);
this.ucGroupBoxEx3.Controls.Add(this.ucCheckBox5);
this.ucGroupBoxEx3.Controls.Add(this.ucCheckBox4);
this.ucGroupBoxEx3.Controls.Add(this.ucCheckBox3);
@@ -266,6 +282,30 @@ namespace TemuKJD.WXForms.ShopForms
this.ucGroupBoxEx3.TabStop = false;
this.ucGroupBoxEx3.Text = "查询";
//
+ // btnWaybillManage
+ //
+ this.btnWaybillManage.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+ this.btnWaybillManage.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.btnWaybillManage.DisabledBackColor = System.Drawing.Color.Empty;
+ this.btnWaybillManage.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.btnWaybillManage.Location = new System.Drawing.Point(12, 130);
+ this.btnWaybillManage.Name = "btnWaybillManage";
+ this.btnWaybillManage.Size = new System.Drawing.Size(89, 23);
+ this.btnWaybillManage.Style.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnWaybillManage.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnWaybillManage.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnWaybillManage.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+ this.btnWaybillManage.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+ this.btnWaybillManage.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
+ this.btnWaybillManage.Style.ForeColor.Color = System.Drawing.Color.White;
+ this.btnWaybillManage.Style.GradientAngle = 90;
+ this.btnWaybillManage.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnWaybillManage.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+ this.btnWaybillManage.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+ this.btnWaybillManage.TabIndex = 886;
+ this.btnWaybillManage.Text = "运单号管理";
+ this.btnWaybillManage.Click += new System.EventHandler(this.btnWaybillManage_Click);
+ //
// ucCheckBox5
//
this.ucCheckBox5.AutoSize = true;
@@ -332,10 +372,10 @@ namespace TemuKJD.WXForms.ShopForms
this.btnCancel.CanvasColor = System.Drawing.SystemColors.Control;
this.btnCancel.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnCancel.DisabledBackColor = System.Drawing.Color.Empty;
- this.btnCancel.Location = new System.Drawing.Point(24, 132);
+ this.btnCancel.Location = new System.Drawing.Point(104, 130);
this.btnCancel.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2);
this.btnCancel.Name = "btnCancel";
- this.btnCancel.Size = new System.Drawing.Size(142, 23);
+ this.btnCancel.Size = new System.Drawing.Size(69, 23);
this.btnCancel.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnCancel.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
this.btnCancel.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
@@ -358,9 +398,9 @@ namespace TemuKJD.WXForms.ShopForms
this.btnSearch.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnSearch.DisabledBackColor = System.Drawing.Color.Empty;
this.btnSearch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnSearch.Location = new System.Drawing.Point(24, 106);
+ this.btnSearch.Location = new System.Drawing.Point(12, 104);
this.btnSearch.Name = "btnSearch";
- this.btnSearch.Size = new System.Drawing.Size(142, 23);
+ this.btnSearch.Size = new System.Drawing.Size(161, 23);
this.btnSearch.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnSearch.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnSearch.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
@@ -840,7 +880,7 @@ namespace TemuKJD.WXForms.ShopForms
this.splitContainer2.Panel2.Controls.Add(this.ucTabControl1);
this.splitContainer2.Panel2.Controls.Add(this.chkTestNoAuditUpload);
this.splitContainer2.Panel2.Padding = new System.Windows.Forms.Padding(0, 0, 4, 0);
- this.splitContainer2.Size = new System.Drawing.Size(1780, 533);
+ this.splitContainer2.Size = new System.Drawing.Size(1772, 533);
this.splitContainer2.SplitterDistance = 350;
this.splitContainer2.TabIndex = 0;
//
@@ -859,7 +899,7 @@ namespace TemuKJD.WXForms.ShopForms
this.ucTabControl1.Name = "ucTabControl1";
this.ucTabControl1.SelectedIndex = 0;
this.ucTabControl1.ShowCloseButton = false;
- this.ucTabControl1.Size = new System.Drawing.Size(1422, 533);
+ this.ucTabControl1.Size = new System.Drawing.Size(1414, 533);
this.ucTabControl1.TabIndex = 781;
this.ucTabControl1.TabSelectColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.ucTabControl1.TabSelectTextColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
@@ -870,7 +910,7 @@ namespace TemuKJD.WXForms.ShopForms
this.tabPage1.Controls.Add(this.panel1);
this.tabPage1.Location = new System.Drawing.Point(2, 40);
this.tabPage1.Name = "tabPage1";
- this.tabPage1.Size = new System.Drawing.Size(1416, 489);
+ this.tabPage1.Size = new System.Drawing.Size(1408, 489);
this.tabPage1.TabIndex = 4;
this.tabPage1.Text = " 品质退款 ";
this.tabPage1.UseVisualStyleBackColor = true;
@@ -883,14 +923,14 @@ namespace TemuKJD.WXForms.ShopForms
this.panel1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(1416, 489);
+ this.panel1.Size = new System.Drawing.Size(1408, 489);
this.panel1.TabIndex = 2;
//
// pictureBox1
//
this.pictureBox1.Anchor = System.Windows.Forms.AnchorStyles.None;
this.pictureBox1.Image = global::TemuKJD.Properties.Resources.loading_blue;
- this.pictureBox1.Location = new System.Drawing.Point(683, 219);
+ this.pictureBox1.Location = new System.Drawing.Point(679, 219);
this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.Size = new System.Drawing.Size(50, 50);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -928,18 +968,20 @@ namespace TemuKJD.WXForms.ShopForms
this.colDgv1ProductName,
this.colDgv1Spec,
this.colDgv1OutSn,
- this.colDgv1OrderSn,
+ this.colDgv1OrderId,
this.colDgv1OrderTime,
- this.colDgv1AfterSaleReason});
+ this.colDgv1AfterSaleReason,
+ this.colDgv1OptimizeStatus,
+ this.colDgv1Optimize});
this.dgvData1.Dock = System.Windows.Forms.DockStyle.Fill;
this.dgvData1.Location = new System.Drawing.Point(0, 0);
this.dgvData1.MultiSelectCheckBox = true;
this.dgvData1.Name = "dgvData1";
this.dgvData1.ReadOnly = true;
this.dgvData1.RowTemplate.Height = 23;
- this.dgvData1.Size = new System.Drawing.Size(1416, 489);
+ this.dgvData1.Size = new System.Drawing.Size(1408, 489);
this.dgvData1.TabIndex = 187;
- this.dgvData1.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvData1_CellContentClick);
+ this.dgvData1.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvData_CellContentClick);
//
// colDgv1Check
//
@@ -953,7 +995,6 @@ namespace TemuKJD.WXForms.ShopForms
//
// colDgv1ShopId
//
- this.colDgv1ShopId.Frozen = true;
this.colDgv1ShopId.HeaderText = "店铺Id";
this.colDgv1ShopId.Name = "colDgv1ShopId";
this.colDgv1ShopId.ReadOnly = true;
@@ -962,7 +1003,6 @@ namespace TemuKJD.WXForms.ShopForms
//
dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colDgv1ShopName.DefaultCellStyle = dataGridViewCellStyle5;
- this.colDgv1ShopName.Frozen = true;
this.colDgv1ShopName.HeaderText = "店铺名称";
this.colDgv1ShopName.Name = "colDgv1ShopName";
this.colDgv1ShopName.ReadOnly = true;
@@ -1037,12 +1077,12 @@ namespace TemuKJD.WXForms.ShopForms
this.colDgv1OutSn.Visible = false;
this.colDgv1OutSn.Width = 150;
//
- // colDgv1OrderSn
+ // colDgv1OrderId
//
- this.colDgv1OrderSn.HeaderText = "订单号";
- this.colDgv1OrderSn.Name = "colDgv1OrderSn";
- this.colDgv1OrderSn.ReadOnly = true;
- this.colDgv1OrderSn.Width = 150;
+ this.colDgv1OrderId.HeaderText = "订单号";
+ this.colDgv1OrderId.Name = "colDgv1OrderId";
+ this.colDgv1OrderId.ReadOnly = true;
+ this.colDgv1OrderId.Width = 150;
//
// colDgv1OrderTime
//
@@ -1062,12 +1102,28 @@ namespace TemuKJD.WXForms.ShopForms
this.colDgv1AfterSaleReason.ReadOnly = true;
this.colDgv1AfterSaleReason.Width = 150;
//
+ // colDgv1OptimizeStatus
+ //
+ dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.colDgv1OptimizeStatus.DefaultCellStyle = dataGridViewCellStyle10;
+ this.colDgv1OptimizeStatus.HeaderText = "优化状态";
+ this.colDgv1OptimizeStatus.Name = "colDgv1OptimizeStatus";
+ this.colDgv1OptimizeStatus.ReadOnly = true;
+ this.colDgv1OptimizeStatus.Width = 80;
+ //
+ // colDgv1Optimize
+ //
+ this.colDgv1Optimize.HeaderText = "优化";
+ this.colDgv1Optimize.Name = "colDgv1Optimize";
+ this.colDgv1Optimize.ReadOnly = true;
+ this.colDgv1Optimize.Width = 50;
+ //
// tabPage2
//
this.tabPage2.Controls.Add(this.panel2);
this.tabPage2.Location = new System.Drawing.Point(2, 40);
this.tabPage2.Name = "tabPage2";
- this.tabPage2.Size = new System.Drawing.Size(1416, 489);
+ this.tabPage2.Size = new System.Drawing.Size(1408, 489);
this.tabPage2.TabIndex = 5;
this.tabPage2.Text = " 订单评价 ";
this.tabPage2.UseVisualStyleBackColor = true;
@@ -1080,14 +1136,14 @@ namespace TemuKJD.WXForms.ShopForms
this.panel2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.panel2.Location = new System.Drawing.Point(0, 0);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(1416, 489);
+ this.panel2.Size = new System.Drawing.Size(1408, 489);
this.panel2.TabIndex = 3;
//
// pictureBox2
//
this.pictureBox2.Anchor = System.Windows.Forms.AnchorStyles.None;
this.pictureBox2.Image = global::TemuKJD.Properties.Resources.loading_blue;
- this.pictureBox2.Location = new System.Drawing.Point(683, 219);
+ this.pictureBox2.Location = new System.Drawing.Point(679, 219);
this.pictureBox2.Name = "pictureBox2";
this.pictureBox2.Size = new System.Drawing.Size(50, 50);
this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -1099,19 +1155,19 @@ namespace TemuKJD.WXForms.ShopForms
//
this.dgvData2.AllowUserToAddRows = false;
this.dgvData2.AllowUserToDeleteRows = false;
- dataGridViewCellStyle10.BackColor = System.Drawing.Color.WhiteSmoke;
- this.dgvData2.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle10;
+ dataGridViewCellStyle11.BackColor = System.Drawing.Color.WhiteSmoke;
+ this.dgvData2.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle11;
this.dgvData2.AutoRowNumber = true;
this.dgvData2.BackgroundColor = System.Drawing.Color.White;
this.dgvData2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
- this.dgvData2.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11;
+ dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle12.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+ this.dgvData2.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle12;
this.dgvData2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvData2.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colDgv2Check,
@@ -1126,24 +1182,28 @@ namespace TemuKJD.WXForms.ShopForms
this.colDgv2Spec,
this.colDgv2SkuCode,
this.colDgv2EvaluationId,
+ this.colDgv2OrderId,
this.colDgv2UserNick,
this.colDgv2CommentTime,
- this.colDgv2CommentContent});
+ this.colDgv2CommentContent,
+ this.colDgv2OptimizeStatus,
+ this.colDgv2Optimize});
this.dgvData2.Dock = System.Windows.Forms.DockStyle.Fill;
this.dgvData2.Location = new System.Drawing.Point(0, 0);
this.dgvData2.MultiSelectCheckBox = true;
this.dgvData2.Name = "dgvData2";
this.dgvData2.ReadOnly = true;
this.dgvData2.RowTemplate.Height = 23;
- this.dgvData2.Size = new System.Drawing.Size(1416, 489);
+ this.dgvData2.Size = new System.Drawing.Size(1408, 489);
this.dgvData2.TabIndex = 187;
+ this.dgvData2.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvData_CellContentClick);
//
// tabPage3
//
this.tabPage3.Controls.Add(this.mainPanel);
this.tabPage3.Location = new System.Drawing.Point(2, 40);
this.tabPage3.Name = "tabPage3";
- this.tabPage3.Size = new System.Drawing.Size(1416, 489);
+ this.tabPage3.Size = new System.Drawing.Size(1408, 489);
this.tabPage3.TabIndex = 1;
this.tabPage3.Text = " 揽收不达标 ";
this.tabPage3.UseVisualStyleBackColor = true;
@@ -1156,14 +1216,14 @@ namespace TemuKJD.WXForms.ShopForms
this.mainPanel.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.mainPanel.Location = new System.Drawing.Point(0, 0);
this.mainPanel.Name = "mainPanel";
- this.mainPanel.Size = new System.Drawing.Size(1416, 489);
+ this.mainPanel.Size = new System.Drawing.Size(1408, 489);
this.mainPanel.TabIndex = 1;
//
// pictureBox3
//
this.pictureBox3.Anchor = System.Windows.Forms.AnchorStyles.None;
this.pictureBox3.Image = global::TemuKJD.Properties.Resources.loading_blue;
- this.pictureBox3.Location = new System.Drawing.Point(689, 219);
+ this.pictureBox3.Location = new System.Drawing.Point(685, 219);
this.pictureBox3.Name = "pictureBox3";
this.pictureBox3.Size = new System.Drawing.Size(50, 50);
this.pictureBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -1175,46 +1235,48 @@ namespace TemuKJD.WXForms.ShopForms
//
this.dgvData3.AllowUserToAddRows = false;
this.dgvData3.AllowUserToDeleteRows = false;
- dataGridViewCellStyle17.BackColor = System.Drawing.Color.WhiteSmoke;
- this.dgvData3.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle17;
+ dataGridViewCellStyle20.BackColor = System.Drawing.Color.WhiteSmoke;
+ this.dgvData3.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle20;
this.dgvData3.AutoRowNumber = true;
this.dgvData3.BackgroundColor = System.Drawing.Color.White;
this.dgvData3.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle18.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- dataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
- this.dgvData3.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle18;
+ dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle21.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle21.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle21.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle21.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle21.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+ this.dgvData3.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle21;
this.dgvData3.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvData3.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colCheck,
- this.colSupplierId,
- this.colSupplierName,
- this.colLogin,
- this.colInShop,
- this.colImgUrl,
- this.colImg,
+ this.colDgv3ShopId,
+ this.colDgv3ShopName,
+ this.colDgv3Login,
+ this.colDgv3InShop,
+ this.colDgv3ImgUrl,
+ this.colDgv3Img,
this.colDraftId,
this.colProductName,
this.colSpec,
this.colExtCode,
- this.colNotes,
+ this.colDgv3OrderId,
this.colDeliveryName,
this.colPayTime,
this.colTakeTime,
- this.colDuration});
+ this.colDuration,
+ this.colDgv3OptimizeStatus,
+ this.colDgv3Optimize});
this.dgvData3.Dock = System.Windows.Forms.DockStyle.Fill;
this.dgvData3.Location = new System.Drawing.Point(0, 0);
this.dgvData3.MultiSelectCheckBox = true;
this.dgvData3.Name = "dgvData3";
this.dgvData3.ReadOnly = true;
this.dgvData3.RowTemplate.Height = 23;
- this.dgvData3.Size = new System.Drawing.Size(1416, 489);
+ this.dgvData3.Size = new System.Drawing.Size(1408, 489);
this.dgvData3.TabIndex = 187;
- this.dgvData3.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvData3_CellContentClick);
+ this.dgvData3.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvData_CellContentClick);
//
// colCheck
//
@@ -1226,56 +1288,56 @@ namespace TemuKJD.WXForms.ShopForms
this.colCheck.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
this.colCheck.Width = 30;
//
- // colSupplierId
+ // colDgv3ShopId
//
- this.colSupplierId.Frozen = true;
- this.colSupplierId.HeaderText = "店铺Id";
- this.colSupplierId.Name = "colSupplierId";
- this.colSupplierId.ReadOnly = true;
+ this.colDgv3ShopId.Frozen = true;
+ this.colDgv3ShopId.HeaderText = "店铺Id";
+ this.colDgv3ShopId.Name = "colDgv3ShopId";
+ this.colDgv3ShopId.ReadOnly = true;
//
- // colSupplierName
+ // colDgv3ShopName
//
- dataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle19;
- this.colSupplierName.Frozen = true;
- this.colSupplierName.HeaderText = "店铺名称";
- this.colSupplierName.Name = "colSupplierName";
- this.colSupplierName.ReadOnly = true;
+ dataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.colDgv3ShopName.DefaultCellStyle = dataGridViewCellStyle22;
+ this.colDgv3ShopName.Frozen = true;
+ this.colDgv3ShopName.HeaderText = "店铺名称";
+ this.colDgv3ShopName.Name = "colDgv3ShopName";
+ this.colDgv3ShopName.ReadOnly = true;
//
- // colLogin
+ // colDgv3Login
//
- this.colLogin.HeaderText = "登录";
- this.colLogin.Name = "colLogin";
- this.colLogin.ReadOnly = true;
- this.colLogin.Resizable = System.Windows.Forms.DataGridViewTriState.True;
- this.colLogin.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
- this.colLogin.Visible = false;
- this.colLogin.Width = 40;
+ this.colDgv3Login.HeaderText = "登录";
+ this.colDgv3Login.Name = "colDgv3Login";
+ this.colDgv3Login.ReadOnly = true;
+ this.colDgv3Login.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+ this.colDgv3Login.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+ this.colDgv3Login.Visible = false;
+ this.colDgv3Login.Width = 40;
//
- // colInShop
+ // colDgv3InShop
//
- this.colInShop.HeaderText = "进店";
- this.colInShop.Name = "colInShop";
- this.colInShop.ReadOnly = true;
- this.colInShop.Resizable = System.Windows.Forms.DataGridViewTriState.True;
- this.colInShop.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
- this.colInShop.Visible = false;
- this.colInShop.Width = 40;
+ this.colDgv3InShop.HeaderText = "进店";
+ this.colDgv3InShop.Name = "colDgv3InShop";
+ this.colDgv3InShop.ReadOnly = true;
+ this.colDgv3InShop.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+ this.colDgv3InShop.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+ this.colDgv3InShop.Visible = false;
+ this.colDgv3InShop.Width = 40;
//
- // colImgUrl
+ // colDgv3ImgUrl
//
- this.colImgUrl.HeaderText = "图片地址";
- this.colImgUrl.Name = "colImgUrl";
- this.colImgUrl.ReadOnly = true;
- this.colImgUrl.Visible = false;
+ this.colDgv3ImgUrl.HeaderText = "图片地址";
+ this.colDgv3ImgUrl.Name = "colDgv3ImgUrl";
+ this.colDgv3ImgUrl.ReadOnly = true;
+ this.colDgv3ImgUrl.Visible = false;
//
- // colImg
+ // colDgv3Img
//
- this.colImg.HeaderText = "图片";
- this.colImg.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Zoom;
- this.colImg.Name = "colImg";
- this.colImg.ReadOnly = true;
- this.colImg.Width = 60;
+ this.colDgv3Img.HeaderText = "图片";
+ this.colDgv3Img.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Zoom;
+ this.colDgv3Img.Name = "colDgv3Img";
+ this.colDgv3Img.ReadOnly = true;
+ this.colDgv3Img.Width = 60;
//
// colDraftId
//
@@ -1288,8 +1350,8 @@ namespace TemuKJD.WXForms.ShopForms
//
// colProductName
//
- dataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.colProductName.DefaultCellStyle = dataGridViewCellStyle20;
+ dataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.colProductName.DefaultCellStyle = dataGridViewCellStyle23;
this.colProductName.HeaderText = "商品标题";
this.colProductName.Name = "colProductName";
this.colProductName.ReadOnly = true;
@@ -1297,8 +1359,8 @@ namespace TemuKJD.WXForms.ShopForms
//
// colSpec
//
- dataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.colSpec.DefaultCellStyle = dataGridViewCellStyle21;
+ dataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.colSpec.DefaultCellStyle = dataGridViewCellStyle24;
this.colSpec.HeaderText = "sku规格";
this.colSpec.Name = "colSpec";
this.colSpec.ReadOnly = true;
@@ -1312,14 +1374,14 @@ namespace TemuKJD.WXForms.ShopForms
this.colExtCode.Visible = false;
this.colExtCode.Width = 145;
//
- // colNotes
+ // colDgv3OrderId
//
- dataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.colNotes.DefaultCellStyle = dataGridViewCellStyle22;
- this.colNotes.HeaderText = "单号";
- this.colNotes.Name = "colNotes";
- this.colNotes.ReadOnly = true;
- this.colNotes.Width = 160;
+ dataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.colDgv3OrderId.DefaultCellStyle = dataGridViewCellStyle25;
+ this.colDgv3OrderId.HeaderText = "单号";
+ this.colDgv3OrderId.Name = "colDgv3OrderId";
+ this.colDgv3OrderId.ReadOnly = true;
+ this.colDgv3OrderId.Width = 160;
//
// colDeliveryName
//
@@ -1330,8 +1392,8 @@ namespace TemuKJD.WXForms.ShopForms
//
// colPayTime
//
- dataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.colPayTime.DefaultCellStyle = dataGridViewCellStyle23;
+ dataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.colPayTime.DefaultCellStyle = dataGridViewCellStyle26;
this.colPayTime.HeaderText = "支付时间";
this.colPayTime.Name = "colPayTime";
this.colPayTime.ReadOnly = true;
@@ -1339,8 +1401,8 @@ namespace TemuKJD.WXForms.ShopForms
//
// colTakeTime
//
- dataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.colTakeTime.DefaultCellStyle = dataGridViewCellStyle24;
+ dataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.colTakeTime.DefaultCellStyle = dataGridViewCellStyle27;
this.colTakeTime.HeaderText = "揽收时间";
this.colTakeTime.Name = "colTakeTime";
this.colTakeTime.ReadOnly = true;
@@ -1348,19 +1410,37 @@ namespace TemuKJD.WXForms.ShopForms
//
// colDuration
//
- dataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.colDuration.DefaultCellStyle = dataGridViewCellStyle25;
+ dataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.colDuration.DefaultCellStyle = dataGridViewCellStyle28;
this.colDuration.HeaderText = "揽收时长";
this.colDuration.Name = "colDuration";
this.colDuration.ReadOnly = true;
this.colDuration.Width = 80;
//
+ // colDgv3OptimizeStatus
+ //
+ dataGridViewCellStyle29.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.colDgv3OptimizeStatus.DefaultCellStyle = dataGridViewCellStyle29;
+ this.colDgv3OptimizeStatus.HeaderText = "优化状态";
+ this.colDgv3OptimizeStatus.Name = "colDgv3OptimizeStatus";
+ this.colDgv3OptimizeStatus.ReadOnly = true;
+ this.colDgv3OptimizeStatus.Width = 80;
+ //
+ // colDgv3Optimize
+ //
+ this.colDgv3Optimize.HeaderText = "优化";
+ this.colDgv3Optimize.Name = "colDgv3Optimize";
+ this.colDgv3Optimize.ReadOnly = true;
+ this.colDgv3Optimize.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+ this.colDgv3Optimize.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+ this.colDgv3Optimize.Width = 50;
+ //
// tabPage4
//
this.tabPage4.Controls.Add(this.panel3);
this.tabPage4.Location = new System.Drawing.Point(2, 40);
this.tabPage4.Name = "tabPage4";
- this.tabPage4.Size = new System.Drawing.Size(1416, 489);
+ this.tabPage4.Size = new System.Drawing.Size(1408, 489);
this.tabPage4.TabIndex = 2;
this.tabPage4.Text = " 配送不达标 ";
this.tabPage4.UseVisualStyleBackColor = true;
@@ -1373,14 +1453,14 @@ namespace TemuKJD.WXForms.ShopForms
this.panel3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.panel3.Location = new System.Drawing.Point(0, 0);
this.panel3.Name = "panel3";
- this.panel3.Size = new System.Drawing.Size(1416, 489);
+ this.panel3.Size = new System.Drawing.Size(1408, 489);
this.panel3.TabIndex = 2;
//
// pictureBox4
//
this.pictureBox4.Anchor = System.Windows.Forms.AnchorStyles.None;
this.pictureBox4.Image = global::TemuKJD.Properties.Resources.loading_blue;
- this.pictureBox4.Location = new System.Drawing.Point(689, 219);
+ this.pictureBox4.Location = new System.Drawing.Point(685, 219);
this.pictureBox4.Name = "pictureBox4";
this.pictureBox4.Size = new System.Drawing.Size(50, 50);
this.pictureBox4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -1392,45 +1472,48 @@ namespace TemuKJD.WXForms.ShopForms
//
this.dgvData4.AllowUserToAddRows = false;
this.dgvData4.AllowUserToDeleteRows = false;
- dataGridViewCellStyle26.BackColor = System.Drawing.Color.WhiteSmoke;
- this.dgvData4.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle26;
+ dataGridViewCellStyle30.BackColor = System.Drawing.Color.WhiteSmoke;
+ this.dgvData4.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle30;
this.dgvData4.AutoRowNumber = true;
this.dgvData4.BackgroundColor = System.Drawing.Color.White;
this.dgvData4.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- dataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle27.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle27.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- dataGridViewCellStyle27.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle27.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle27.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
- this.dgvData4.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle27;
+ dataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle31.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle31.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle31.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle31.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle31.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle31.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+ this.dgvData4.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle31;
this.dgvData4.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvData4.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colDgv4Check,
- this.dataGridViewTextBoxColumn1,
- this.dataGridViewTextBoxColumn2,
- this.dataGridViewLinkColumn1,
- this.dataGridViewLinkColumn2,
+ this.colDgv4ShopId,
+ this.colDgv4ShopName,
+ this.colDgv4Login,
+ this.colDgv4InShop,
this.colDgv4ImgUrl,
this.colDgv4Img,
this.dataGridViewTextBoxColumn4,
this.dataGridViewTextBoxColumn5,
this.dataGridViewTextBoxColumn6,
this.dataGridViewTextBoxColumn7,
- this.dataGridViewTextBoxColumn8,
+ this.colDgv4OrderId,
this.dataGridViewTextBoxColumn9,
this.dataGridViewTextBoxColumn10,
this.colDgv4Address,
- this.dataGridViewTextBoxColumn12});
+ this.dataGridViewTextBoxColumn12,
+ this.colDgv4OptimizeStatus,
+ this.colDgv4Optimize});
this.dgvData4.Dock = System.Windows.Forms.DockStyle.Fill;
this.dgvData4.Location = new System.Drawing.Point(0, 0);
this.dgvData4.MultiSelectCheckBox = true;
this.dgvData4.Name = "dgvData4";
this.dgvData4.ReadOnly = true;
this.dgvData4.RowTemplate.Height = 23;
- this.dgvData4.Size = new System.Drawing.Size(1416, 489);
+ this.dgvData4.Size = new System.Drawing.Size(1408, 489);
this.dgvData4.TabIndex = 187;
+ this.dgvData4.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvData_CellContentClick);
//
// colDgv4Check
//
@@ -1442,41 +1525,41 @@ namespace TemuKJD.WXForms.ShopForms
this.colDgv4Check.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
this.colDgv4Check.Width = 30;
//
- // dataGridViewTextBoxColumn1
+ // colDgv4ShopId
//
- this.dataGridViewTextBoxColumn1.Frozen = true;
- this.dataGridViewTextBoxColumn1.HeaderText = "店铺Id";
- this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
- this.dataGridViewTextBoxColumn1.ReadOnly = true;
+ this.colDgv4ShopId.Frozen = true;
+ this.colDgv4ShopId.HeaderText = "店铺Id";
+ this.colDgv4ShopId.Name = "colDgv4ShopId";
+ this.colDgv4ShopId.ReadOnly = true;
//
- // dataGridViewTextBoxColumn2
+ // colDgv4ShopName
//
- dataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle28;
- this.dataGridViewTextBoxColumn2.Frozen = true;
- this.dataGridViewTextBoxColumn2.HeaderText = "店铺名称";
- this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
- this.dataGridViewTextBoxColumn2.ReadOnly = true;
+ dataGridViewCellStyle32.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.colDgv4ShopName.DefaultCellStyle = dataGridViewCellStyle32;
+ this.colDgv4ShopName.Frozen = true;
+ this.colDgv4ShopName.HeaderText = "店铺名称";
+ this.colDgv4ShopName.Name = "colDgv4ShopName";
+ this.colDgv4ShopName.ReadOnly = true;
//
- // dataGridViewLinkColumn1
+ // colDgv4Login
//
- this.dataGridViewLinkColumn1.HeaderText = "登录";
- this.dataGridViewLinkColumn1.Name = "dataGridViewLinkColumn1";
- this.dataGridViewLinkColumn1.ReadOnly = true;
- this.dataGridViewLinkColumn1.Resizable = System.Windows.Forms.DataGridViewTriState.True;
- this.dataGridViewLinkColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
- this.dataGridViewLinkColumn1.Visible = false;
- this.dataGridViewLinkColumn1.Width = 40;
+ this.colDgv4Login.HeaderText = "登录";
+ this.colDgv4Login.Name = "colDgv4Login";
+ this.colDgv4Login.ReadOnly = true;
+ this.colDgv4Login.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+ this.colDgv4Login.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+ this.colDgv4Login.Visible = false;
+ this.colDgv4Login.Width = 40;
//
- // dataGridViewLinkColumn2
+ // colDgv4InShop
//
- this.dataGridViewLinkColumn2.HeaderText = "进店";
- this.dataGridViewLinkColumn2.Name = "dataGridViewLinkColumn2";
- this.dataGridViewLinkColumn2.ReadOnly = true;
- this.dataGridViewLinkColumn2.Resizable = System.Windows.Forms.DataGridViewTriState.True;
- this.dataGridViewLinkColumn2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
- this.dataGridViewLinkColumn2.Visible = false;
- this.dataGridViewLinkColumn2.Width = 40;
+ this.colDgv4InShop.HeaderText = "进店";
+ this.colDgv4InShop.Name = "colDgv4InShop";
+ this.colDgv4InShop.ReadOnly = true;
+ this.colDgv4InShop.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+ this.colDgv4InShop.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+ this.colDgv4InShop.Visible = false;
+ this.colDgv4InShop.Width = 40;
//
// colDgv4ImgUrl
//
@@ -1504,17 +1587,17 @@ namespace TemuKJD.WXForms.ShopForms
//
// dataGridViewTextBoxColumn5
//
- dataGridViewCellStyle29.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.dataGridViewTextBoxColumn5.DefaultCellStyle = dataGridViewCellStyle29;
+ dataGridViewCellStyle33.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.dataGridViewTextBoxColumn5.DefaultCellStyle = dataGridViewCellStyle33;
this.dataGridViewTextBoxColumn5.HeaderText = "商品标题";
this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
this.dataGridViewTextBoxColumn5.ReadOnly = true;
- this.dataGridViewTextBoxColumn5.Width = 280;
+ this.dataGridViewTextBoxColumn5.Width = 180;
//
// dataGridViewTextBoxColumn6
//
- dataGridViewCellStyle30.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.dataGridViewTextBoxColumn6.DefaultCellStyle = dataGridViewCellStyle30;
+ dataGridViewCellStyle34.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.dataGridViewTextBoxColumn6.DefaultCellStyle = dataGridViewCellStyle34;
this.dataGridViewTextBoxColumn6.HeaderText = "数量";
this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
this.dataGridViewTextBoxColumn6.ReadOnly = true;
@@ -1528,14 +1611,14 @@ namespace TemuKJD.WXForms.ShopForms
this.dataGridViewTextBoxColumn7.Visible = false;
this.dataGridViewTextBoxColumn7.Width = 145;
//
- // dataGridViewTextBoxColumn8
+ // colDgv4OrderId
//
- dataGridViewCellStyle31.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.dataGridViewTextBoxColumn8.DefaultCellStyle = dataGridViewCellStyle31;
- this.dataGridViewTextBoxColumn8.HeaderText = "单号";
- this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8";
- this.dataGridViewTextBoxColumn8.ReadOnly = true;
- this.dataGridViewTextBoxColumn8.Width = 160;
+ dataGridViewCellStyle35.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.colDgv4OrderId.DefaultCellStyle = dataGridViewCellStyle35;
+ this.colDgv4OrderId.HeaderText = "单号";
+ this.colDgv4OrderId.Name = "colDgv4OrderId";
+ this.colDgv4OrderId.ReadOnly = true;
+ this.colDgv4OrderId.Width = 150;
//
// dataGridViewTextBoxColumn9
//
@@ -1546,8 +1629,8 @@ namespace TemuKJD.WXForms.ShopForms
//
// dataGridViewTextBoxColumn10
//
- dataGridViewCellStyle32.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.dataGridViewTextBoxColumn10.DefaultCellStyle = dataGridViewCellStyle32;
+ dataGridViewCellStyle36.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.dataGridViewTextBoxColumn10.DefaultCellStyle = dataGridViewCellStyle36;
this.dataGridViewTextBoxColumn10.HeaderText = "揽收、签收时间";
this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10";
this.dataGridViewTextBoxColumn10.ReadOnly = true;
@@ -1555,8 +1638,8 @@ namespace TemuKJD.WXForms.ShopForms
//
// colDgv4Address
//
- dataGridViewCellStyle33.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.colDgv4Address.DefaultCellStyle = dataGridViewCellStyle33;
+ dataGridViewCellStyle37.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.colDgv4Address.DefaultCellStyle = dataGridViewCellStyle37;
this.colDgv4Address.HeaderText = "发货、收货地";
this.colDgv4Address.Name = "colDgv4Address";
this.colDgv4Address.ReadOnly = true;
@@ -1564,18 +1647,33 @@ namespace TemuKJD.WXForms.ShopForms
//
// dataGridViewTextBoxColumn12
//
- dataGridViewCellStyle34.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.dataGridViewTextBoxColumn12.DefaultCellStyle = dataGridViewCellStyle34;
+ dataGridViewCellStyle38.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.dataGridViewTextBoxColumn12.DefaultCellStyle = dataGridViewCellStyle38;
this.dataGridViewTextBoxColumn12.HeaderText = "配送时长";
this.dataGridViewTextBoxColumn12.Name = "dataGridViewTextBoxColumn12";
this.dataGridViewTextBoxColumn12.ReadOnly = true;
- this.dataGridViewTextBoxColumn12.Width = 120;
+ //
+ // colDgv4OptimizeStatus
+ //
+ dataGridViewCellStyle39.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.colDgv4OptimizeStatus.DefaultCellStyle = dataGridViewCellStyle39;
+ this.colDgv4OptimizeStatus.HeaderText = "优化状态";
+ this.colDgv4OptimizeStatus.Name = "colDgv4OptimizeStatus";
+ this.colDgv4OptimizeStatus.ReadOnly = true;
+ this.colDgv4OptimizeStatus.Width = 80;
+ //
+ // colDgv4Optimize
+ //
+ this.colDgv4Optimize.HeaderText = "优化";
+ this.colDgv4Optimize.Name = "colDgv4Optimize";
+ this.colDgv4Optimize.ReadOnly = true;
+ this.colDgv4Optimize.Width = 50;
//
// tabPage5
//
this.tabPage5.Location = new System.Drawing.Point(2, 40);
this.tabPage5.Name = "tabPage5";
- this.tabPage5.Size = new System.Drawing.Size(1416, 489);
+ this.tabPage5.Size = new System.Drawing.Size(1408, 489);
this.tabPage5.TabIndex = 3;
this.tabPage5.Text = " 物流负向反馈 ";
this.tabPage5.UseVisualStyleBackColor = true;
@@ -1599,7 +1697,7 @@ namespace TemuKJD.WXForms.ShopForms
this.statusBar.Location = new System.Drawing.Point(0, 0);
this.statusBar.Margin = new System.Windows.Forms.Padding(0);
this.statusBar.Name = "statusBar";
- this.statusBar.Size = new System.Drawing.Size(1780, 27);
+ this.statusBar.Size = new System.Drawing.Size(1772, 27);
this.statusBar.TabIndex = 2;
//
// splitContainer3
@@ -1617,7 +1715,7 @@ namespace TemuKJD.WXForms.ShopForms
// splitContainer3.Panel2
//
this.splitContainer3.Panel2.Controls.Add(this.statusBar);
- this.splitContainer3.Size = new System.Drawing.Size(1780, 564);
+ this.splitContainer3.Size = new System.Drawing.Size(1772, 564);
this.splitContainer3.SplitterDistance = 533;
this.splitContainer3.TabIndex = 3;
//
@@ -1640,8 +1738,8 @@ namespace TemuKJD.WXForms.ShopForms
//
// colDgv2ShopName
//
- dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.colDgv2ShopName.DefaultCellStyle = dataGridViewCellStyle12;
+ dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.colDgv2ShopName.DefaultCellStyle = dataGridViewCellStyle13;
this.colDgv2ShopName.Frozen = true;
this.colDgv2ShopName.HeaderText = "店铺名称";
this.colDgv2ShopName.Name = "colDgv2ShopName";
@@ -1693,8 +1791,8 @@ namespace TemuKJD.WXForms.ShopForms
//
// colDgv2ProductName
//
- dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.colDgv2ProductName.DefaultCellStyle = dataGridViewCellStyle13;
+ dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.colDgv2ProductName.DefaultCellStyle = dataGridViewCellStyle14;
this.colDgv2ProductName.HeaderText = "商品标题";
this.colDgv2ProductName.Name = "colDgv2ProductName";
this.colDgv2ProductName.ReadOnly = true;
@@ -1702,8 +1800,8 @@ namespace TemuKJD.WXForms.ShopForms
//
// colDgv2Spec
//
- dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.colDgv2Spec.DefaultCellStyle = dataGridViewCellStyle14;
+ dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.colDgv2Spec.DefaultCellStyle = dataGridViewCellStyle15;
this.colDgv2Spec.HeaderText = "商品规格";
this.colDgv2Spec.Name = "colDgv2Spec";
this.colDgv2Spec.ReadOnly = true;
@@ -1724,6 +1822,15 @@ namespace TemuKJD.WXForms.ShopForms
this.colDgv2EvaluationId.ReadOnly = true;
this.colDgv2EvaluationId.Visible = false;
//
+ // colDgv2OrderId
+ //
+ dataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.colDgv2OrderId.DefaultCellStyle = dataGridViewCellStyle16;
+ this.colDgv2OrderId.HeaderText = "对应订单编号";
+ this.colDgv2OrderId.Name = "colDgv2OrderId";
+ this.colDgv2OrderId.ReadOnly = true;
+ this.colDgv2OrderId.Width = 150;
+ //
// colDgv2UserNick
//
this.colDgv2UserNick.HeaderText = "用户昵称";
@@ -1733,8 +1840,8 @@ namespace TemuKJD.WXForms.ShopForms
//
// colDgv2CommentTime
//
- dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.colDgv2CommentTime.DefaultCellStyle = dataGridViewCellStyle15;
+ dataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.colDgv2CommentTime.DefaultCellStyle = dataGridViewCellStyle17;
this.colDgv2CommentTime.HeaderText = "评价时间";
this.colDgv2CommentTime.Name = "colDgv2CommentTime";
this.colDgv2CommentTime.ReadOnly = true;
@@ -1742,18 +1849,34 @@ namespace TemuKJD.WXForms.ShopForms
//
// colDgv2CommentContent
//
- dataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.colDgv2CommentContent.DefaultCellStyle = dataGridViewCellStyle16;
+ dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.colDgv2CommentContent.DefaultCellStyle = dataGridViewCellStyle18;
this.colDgv2CommentContent.HeaderText = "评价内容";
this.colDgv2CommentContent.Name = "colDgv2CommentContent";
this.colDgv2CommentContent.ReadOnly = true;
this.colDgv2CommentContent.Width = 150;
//
+ // colDgv2OptimizeStatus
+ //
+ dataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.colDgv2OptimizeStatus.DefaultCellStyle = dataGridViewCellStyle19;
+ this.colDgv2OptimizeStatus.HeaderText = "优化状态";
+ this.colDgv2OptimizeStatus.Name = "colDgv2OptimizeStatus";
+ this.colDgv2OptimizeStatus.ReadOnly = true;
+ this.colDgv2OptimizeStatus.Width = 80;
+ //
+ // colDgv2Optimize
+ //
+ this.colDgv2Optimize.HeaderText = "优化";
+ this.colDgv2Optimize.Name = "colDgv2Optimize";
+ this.colDgv2Optimize.ReadOnly = true;
+ this.colDgv2Optimize.Width = 50;
+ //
// WXShopOptimizeForm
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.BackColor = System.Drawing.Color.White;
- this.ClientSize = new System.Drawing.Size(1780, 564);
+ this.ClientSize = new System.Drawing.Size(1772, 564);
this.Controls.Add(this.splitContainer3);
this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.KeyPreview = true;
@@ -1863,6 +1986,43 @@ namespace TemuKJD.WXForms.ShopForms
private System.Windows.Forms.Panel panel3;
private System.Windows.Forms.PictureBox pictureBox4;
private UserComponent.DataGridViewEx dgvData4;
+ private DevComponents.DotNetBar.PanelEx btnWaybillManage;
+ private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck;
+ private System.Windows.Forms.DataGridViewTextBoxColumn colDgv3ShopId;
+ private System.Windows.Forms.DataGridViewTextBoxColumn colDgv3ShopName;
+ private System.Windows.Forms.DataGridViewLinkColumn colDgv3Login;
+ private System.Windows.Forms.DataGridViewLinkColumn colDgv3InShop;
+ private System.Windows.Forms.DataGridViewTextBoxColumn colDgv3ImgUrl;
+ private System.Windows.Forms.DataGridViewImageColumn colDgv3Img;
+ private System.Windows.Forms.DataGridViewTextBoxColumn colDraftId;
+ private System.Windows.Forms.DataGridViewTextBoxColumn colProductName;
+ private System.Windows.Forms.DataGridViewTextBoxColumn colSpec;
+ private System.Windows.Forms.DataGridViewTextBoxColumn colExtCode;
+ private System.Windows.Forms.DataGridViewTextBoxColumn colDgv3OrderId;
+ private System.Windows.Forms.DataGridViewTextBoxColumn colDeliveryName;
+ private System.Windows.Forms.DataGridViewTextBoxColumn colPayTime;
+ private System.Windows.Forms.DataGridViewTextBoxColumn colTakeTime;
+ private System.Windows.Forms.DataGridViewTextBoxColumn colDuration;
+ private System.Windows.Forms.DataGridViewTextBoxColumn colDgv3OptimizeStatus;
+ private System.Windows.Forms.DataGridViewLinkColumn colDgv3Optimize;
+ private System.Windows.Forms.DataGridViewCheckBoxColumn colDgv4Check;
+ private System.Windows.Forms.DataGridViewTextBoxColumn colDgv4ShopId;
+ private System.Windows.Forms.DataGridViewTextBoxColumn colDgv4ShopName;
+ private System.Windows.Forms.DataGridViewLinkColumn colDgv4Login;
+ private System.Windows.Forms.DataGridViewLinkColumn colDgv4InShop;
+ private System.Windows.Forms.DataGridViewTextBoxColumn colDgv4ImgUrl;
+ private System.Windows.Forms.DataGridViewImageColumn colDgv4Img;
+ private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4;
+ private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5;
+ private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6;
+ private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7;
+ private System.Windows.Forms.DataGridViewTextBoxColumn colDgv4OrderId;
+ private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn9;
+ private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn10;
+ private System.Windows.Forms.DataGridViewTextBoxColumn colDgv4Address;
+ private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn12;
+ private System.Windows.Forms.DataGridViewTextBoxColumn colDgv4OptimizeStatus;
+ private System.Windows.Forms.DataGridViewLinkColumn colDgv4Optimize;
private System.Windows.Forms.DataGridViewCheckBoxColumn colDgv1Check;
private System.Windows.Forms.DataGridViewTextBoxColumn colDgv1ShopId;
private System.Windows.Forms.DataGridViewTextBoxColumn colDgv1ShopName;
@@ -1874,41 +2034,11 @@ namespace TemuKJD.WXForms.ShopForms
private System.Windows.Forms.DataGridViewTextBoxColumn colDgv1ProductName;
private System.Windows.Forms.DataGridViewTextBoxColumn colDgv1Spec;
private System.Windows.Forms.DataGridViewTextBoxColumn colDgv1OutSn;
- private System.Windows.Forms.DataGridViewTextBoxColumn colDgv1OrderSn;
+ private System.Windows.Forms.DataGridViewTextBoxColumn colDgv1OrderId;
private System.Windows.Forms.DataGridViewTextBoxColumn colDgv1OrderTime;
private System.Windows.Forms.DataGridViewTextBoxColumn colDgv1AfterSaleReason;
- private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck;
- private System.Windows.Forms.DataGridViewTextBoxColumn colSupplierId;
- private System.Windows.Forms.DataGridViewTextBoxColumn colSupplierName;
- private System.Windows.Forms.DataGridViewLinkColumn colLogin;
- private System.Windows.Forms.DataGridViewLinkColumn colInShop;
- private System.Windows.Forms.DataGridViewTextBoxColumn colImgUrl;
- private System.Windows.Forms.DataGridViewImageColumn colImg;
- private System.Windows.Forms.DataGridViewTextBoxColumn colDraftId;
- private System.Windows.Forms.DataGridViewTextBoxColumn colProductName;
- private System.Windows.Forms.DataGridViewTextBoxColumn colSpec;
- private System.Windows.Forms.DataGridViewTextBoxColumn colExtCode;
- private System.Windows.Forms.DataGridViewTextBoxColumn colNotes;
- private System.Windows.Forms.DataGridViewTextBoxColumn colDeliveryName;
- private System.Windows.Forms.DataGridViewTextBoxColumn colPayTime;
- private System.Windows.Forms.DataGridViewTextBoxColumn colTakeTime;
- private System.Windows.Forms.DataGridViewTextBoxColumn colDuration;
- private System.Windows.Forms.DataGridViewCheckBoxColumn colDgv4Check;
- private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
- private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
- private System.Windows.Forms.DataGridViewLinkColumn dataGridViewLinkColumn1;
- private System.Windows.Forms.DataGridViewLinkColumn dataGridViewLinkColumn2;
- private System.Windows.Forms.DataGridViewTextBoxColumn colDgv4ImgUrl;
- private System.Windows.Forms.DataGridViewImageColumn colDgv4Img;
- private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4;
- private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5;
- private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6;
- private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7;
- private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn8;
- private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn9;
- private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn10;
- private System.Windows.Forms.DataGridViewTextBoxColumn colDgv4Address;
- private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn12;
+ private System.Windows.Forms.DataGridViewTextBoxColumn colDgv1OptimizeStatus;
+ private System.Windows.Forms.DataGridViewLinkColumn colDgv1Optimize;
private System.Windows.Forms.DataGridViewCheckBoxColumn colDgv2Check;
private System.Windows.Forms.DataGridViewTextBoxColumn colDgv2ShopId;
private System.Windows.Forms.DataGridViewTextBoxColumn colDgv2ShopName;
@@ -1921,8 +2051,11 @@ namespace TemuKJD.WXForms.ShopForms
private System.Windows.Forms.DataGridViewTextBoxColumn colDgv2Spec;
private System.Windows.Forms.DataGridViewTextBoxColumn colDgv2SkuCode;
private System.Windows.Forms.DataGridViewTextBoxColumn colDgv2EvaluationId;
+ private System.Windows.Forms.DataGridViewTextBoxColumn colDgv2OrderId;
private System.Windows.Forms.DataGridViewTextBoxColumn colDgv2UserNick;
private System.Windows.Forms.DataGridViewTextBoxColumn colDgv2CommentTime;
private System.Windows.Forms.DataGridViewTextBoxColumn colDgv2CommentContent;
+ private System.Windows.Forms.DataGridViewTextBoxColumn colDgv2OptimizeStatus;
+ private System.Windows.Forms.DataGridViewLinkColumn colDgv2Optimize;
}
}
\ No newline at end of file
diff --git a/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.cs b/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.cs
index fb2d06c..7fe1f54 100644
--- a/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.cs
+++ b/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.cs
@@ -30,6 +30,7 @@ using Newtonsoft.Json;
using NaiBa.Util;
using AllBase.Model.Config;
using TemuKJD.WXForms.ProductForms;
+using TemuKJD.WXForms.AdminForms;
namespace TemuKJD.WXForms.ShopForms
{
@@ -287,60 +288,6 @@ namespace TemuKJD.WXForms.ShopForms
}
}
- private void dgvData3_CellContentClick(object sender, DataGridViewCellEventArgs e)
- {
- if (e.ColumnIndex < 0 || e.RowIndex < 0)
- return;
- string headerText = dgvData3.Columns[e.ColumnIndex].HeaderText;
- var shopId = dgvData3.Rows[e.RowIndex].Cells["colSupplierId"].Value.ParseToString();
- var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId);
-
- switch (headerText)
- {
- case "删除":
- break;
- case "登录":
- {
- WXShopLoginForm shopLoginForm = new WXShopLoginForm(shop);
- //shopLoginForm.prodUserSelectForm = this;
- shopLoginForm.openType = EnumOpenType.login;
- shopLoginForm.ShowDialog();
- RefreshShopLogin();
- }
- break;
- case "进店":
- {
- WXShopLoginForm shopLoginForm = new WXShopLoginForm(shop);
- WXShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false);
- if (shop.LoginStatus == "登录成功")
- {
- shopLoginForm.openType = EnumOpenType.manage;
- shopLoginForm.WindowState = FormWindowState.Maximized;
- shopLoginForm.InitUrl = "https://store.weixin.qq.com/shop/home";
- shopLoginForm.Show();
- }
- else
- {
- shopLoginForm.openType = EnumOpenType.login;
- shopLoginForm.ShowDialog();
- RefreshShopLogin();
- }
- }
- break;
- case "图片":
- {
- ShowImgForm imgFrom = new ShowImgForm(dgvData3.Rows[e.RowIndex].Cells["colImgUrl"].Value.ParseToString());
- imgFrom.ShowDialog();
- break;
- }
- case "":
- dgvData3.Rows[e.RowIndex].Cells["colCheck"].Value = !(bool)dgvData3.Rows[e.RowIndex].Cells["colCheck"].Value;
- break;
- default:
- break;
- }
- }
-
private void btnStop_Click(object sender, EventArgs e)
{
if (this.cancellationTokenSource != null)
@@ -616,6 +563,7 @@ namespace TemuKJD.WXForms.ShopForms
this.pictureBox1.Visible = true;
this.statusBar.lblTaskStatus.Text = "正在查询品质退款，店铺：" + shop.ShopAccount + " " + page + "/" + totalPage;
}));
+ var orderAfterSaleInfoLst = new List();
foreach (JObject refundOrderObj in prodObjs["data"])
{
var oStr = JsonHelper.SerializeObject(refundOrderObj);
@@ -626,6 +574,57 @@ namespace TemuKJD.WXForms.ShopForms
refundOrder.shopName = shop.ShopAccount;
lstWxOptimizeOrderAfterSaleInfo.Add(refundOrder);
+ orderAfterSaleInfoLst.Add(refundOrder);
+
+ }
+
+ // 查询是否被优化过
+ var url = BaseClass.BuildObjString("shop/get_waybill_no_user_name");
+ var data = "";
+ data = UserLogin.GetSignaturex();
+ data += "&status=2";
+ data += "&order_ids=" + string.Join(",", orderAfterSaleInfoLst.Select(w => w.orderInfo.orderId));
+ var html = GetHtml.PostUtf8(url, data);
+ if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
+ html = GetHtml.PostUtf8(url, data);
+ if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
+ html = GetHtml.PostUtf8(url, data);
+ if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
+ {
+ foreach (var orderAfterSale in orderAfterSaleInfoLst)
+ {
+ orderAfterSale.optimizeWaybillId = "查询失败";
+ orderAfterSale.optimizeTime = "";
+ }
+ }
+ else
+ {
+ try
+ {
+ var jArr = JObject.Parse(html)["data"];
+ var sProd = JsonHelper.SerializeObject(jArr);
+ var optimizeLst = JsonHelper.DeserializeJsonToList(sProd);
+ foreach (var orderAfterSale in orderAfterSaleInfoLst)
+ {
+ var ov = optimizeLst.FirstOrDefault(o => o.order_id == orderAfterSale.orderInfo.orderId);
+ orderAfterSale.optimizeWaybillId = ov == null ? "" : ov.waybill_id;
+ orderAfterSale.optimizeTime = ov == null ? "" : ov?.use_time?.ToString("yyyy-MM-dd HH:mm");
+ if (!string.IsNullOrEmpty(orderAfterSale.optimizeWaybillId))
+ orderAfterSale.optimizeWaybillId = "已优化";
+ }
+ }
+ catch (Exception ex)
+ {
+ foreach (var orderAfterSale in orderAfterSaleInfoLst)
+ {
+ orderAfterSale.optimizeWaybillId = "查询失败";
+ orderAfterSale.optimizeTime = "";
+ }
+ }
+ }
+
+ foreach (var refundOrder in orderAfterSaleInfoLst)
+ {
Invoke(new Action(() =>
{
var rowIndex = this.dgvData1.Rows.Add(
@@ -642,7 +641,10 @@ namespace TemuKJD.WXForms.ShopForms
refundOrder.orderInfo.skuCode,
refundOrder.orderInfo.orderId,
BaseClass.StampToDateTime(refundOrder.orderInfo.createTime.ParseToInt()).ToString("yyyy-MM-dd HH:mm:ss"),
- refundOrder.reason);
+ refundOrder.reason,
+ refundOrder.optimizeWaybillId + "\r\n" + refundOrder.optimizeTime,
+ "优化"
+ );
dgvData1.Rows[rowIndex].Height = 60;
}));
@@ -660,7 +662,10 @@ namespace TemuKJD.WXForms.ShopForms
}
}
-
+ ///
+ /// 查询差评订单
+ ///
+ ///
public void SearchData2(ShopLoginInfo shop)
{
if (shop.LoginStatus != "登录成功")
@@ -722,6 +727,8 @@ namespace TemuKJD.WXForms.ShopForms
}));
if (totalPage == 0)
break;
+
+ var productEvaluationInfoLst = new List();
foreach (JObject refundOrderObj in prodObjs["finderProductEvaluationInfoList"])
{
var oStr = JsonHelper.SerializeObject(refundOrderObj);
@@ -732,6 +739,86 @@ namespace TemuKJD.WXForms.ShopForms
prodEvaluationInfo.shopName = shop.ShopAccount;
lstWxOptimizeProductEvaluationInfo.Add(prodEvaluationInfo);
+ productEvaluationInfoLst.Add(prodEvaluationInfo);
+
+ }
+
+ foreach (var prodEvaluationInfo in productEvaluationInfoLst)
+ {
+ var getOrderRst = ShopOptimize.orderSearch(shop, prodEvaluationInfo.productInfo.spuName, prodEvaluationInfo.evaluationInfo.buyer.identity.nickname);
+ Thread.Sleep(Randomx.GetId(200, 350));
+ if (!getOrderRst.Contains("\"code\":0"))
+ {
+ var error = BaseRegex.GetStringJson(ref getData2, "msg");
+ if (string.IsNullOrEmpty(error))
+ error = getData2;
+
+ prodEvaluationInfo.order_id = error;
+ }
+ else
+ {
+ prodEvaluationInfo.order_id = "";
+ while (getOrderRst.Contains("\"orderId\""))
+ {
+ prodEvaluationInfo.order_id += (" " + BaseRegex.GetStringJson(ref getOrderRst, "orderId"));
+ getOrderRst = getOrderRst.Substring(getOrderRst.IndexOf("\"orderId\"") + "\"orderId\"".Length);
+ }
+ prodEvaluationInfo.order_id = prodEvaluationInfo.order_id.Trim(' ');
+ if (prodEvaluationInfo.order_id.IsNullOrEmpty())
+ prodEvaluationInfo.order_id = "未获取到对应订单号";
+
+ if (prodEvaluationInfo.order_id.Contains(" "))
+ prodEvaluationInfo.order_id += " 获取到多条订单号";
+ }
+ }
+
+ // 查询是否被优化过
+ var url = BaseClass.BuildObjString("shop/get_waybill_no_user_name");
+ var data = "";
+ data = UserLogin.GetSignaturex();
+ data += "&status=2";
+ data += "&order_ids=" + string.Join(",", productEvaluationInfoLst.Select(w => w.order_id).Where(r => !r.IsNullOrEmpty()));
+ var html = GetHtml.PostUtf8(url, data);
+ if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
+ html = GetHtml.PostUtf8(url, data);
+ if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
+ html = GetHtml.PostUtf8(url, data);
+ if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
+ {
+ foreach (var evaluationInfo in productEvaluationInfoLst)
+ {
+ evaluationInfo.optimizeWaybillId = "查询失败";
+ evaluationInfo.optimizeTime = "";
+ }
+ }
+ else
+ {
+ try
+ {
+ var jArr = JObject.Parse(html)["data"];
+ var sProd = JsonHelper.SerializeObject(jArr);
+ var optimizeLst = JsonHelper.DeserializeJsonToList(sProd);
+ foreach (var evaluationInfo in productEvaluationInfoLst)
+ {
+ var ov = optimizeLst.FirstOrDefault(o => o.order_id == evaluationInfo.order_id);
+ evaluationInfo.optimizeWaybillId = ov == null ? "" : ov.waybill_id;
+ evaluationInfo.optimizeTime = ov == null ? "" : ov?.use_time?.ToString("yyyy-MM-dd HH:mm");
+ if (!string.IsNullOrEmpty(evaluationInfo.optimizeWaybillId))
+ evaluationInfo.optimizeWaybillId = "已优化";
+ }
+ }
+ catch (Exception ex)
+ {
+ foreach (var evaluationInfo in productEvaluationInfoLst)
+ {
+ evaluationInfo.optimizeWaybillId = "查询失败";
+ evaluationInfo.optimizeTime = "";
+ }
+ }
+ }
+
+ foreach (var prodEvaluationInfo in productEvaluationInfoLst)
+ {
var lblLst = prodEvaluationInfo.evaluationInfo?.firstEvaluationInfo?.buyerEvaluationInfo?.labelList;
var content = prodEvaluationInfo.evaluationInfo.firstEvaluationInfo.buyerEvaluationInfo.content + " " +
prodEvaluationInfo.evaluationInfo.firstEvaluationInfo.buyerEvaluationInfo.defaultContent;
@@ -748,11 +835,14 @@ namespace TemuKJD.WXForms.ShopForms
prodEvaluationInfo.productInfo.productId,
prodEvaluationInfo.productInfo.spuName,
prodEvaluationInfo.productInfo.skuName,
- "", //spuCode 此处获取不到填空
+ "", // spuCode 此处获取不到填空
prodEvaluationInfo.productEvaluationId,
+ prodEvaluationInfo.order_id, // orderId
prodEvaluationInfo.evaluationInfo.buyer.identity.nickname,
BaseClass.StampToDateTime(prodEvaluationInfo.evaluationInfo.firstEvaluationInfo.buyerEvaluationInfo.createTime.ParseToInt()).ToString("yyyy-MM-dd HH:mm:ss"),
- (content + " " + (lblLst == null ? "" : string.Join(" ", lblLst.Select(e => e.labelName)))).Trim()
+ (content + " " + (lblLst == null ? "" : string.Join(" ", lblLst.Select(e => e.labelName)))).Trim(),
+ prodEvaluationInfo.optimizeWaybillId + "\r\n" + prodEvaluationInfo.optimizeTime,
+ "优化"
);
dgvData2.Rows[rowIndex].Height = 60;
@@ -801,8 +891,8 @@ namespace TemuKJD.WXForms.ShopForms
if (shopRow != null)
{
shopRow.Cells["colMessage"].Value = "获取揽收时效失败" + error;
- //if(error.Contains("\"code\":2") && error.Contains("[194,62,3,176,14,1]"))
- // shopRow.Cells["colMessage"].Value = "店铺无评分";
+ if(error.Contains("\"code\":2") && error.Contains("[194,62,3,176,14,1]"))
+ shopRow.Cells["colMessage"].Value = "店铺无时效评分";
}
}));
}
@@ -863,6 +953,8 @@ namespace TemuKJD.WXForms.ShopForms
this.pictureBox3.Visible = true;
this.statusBar.lblTaskStatus.Text = "正在查询揽收不达标，店铺：" + shop.ShopAccount + " " + page + "/" + totalPage;
}));
+
+ List waybillLst = new List();
foreach (JObject refundOrderObj in wayBillObjs["data"])
{
var oStr = JsonHelper.SerializeObject(refundOrderObj);
@@ -885,30 +977,81 @@ namespace TemuKJD.WXForms.ShopForms
{
}
+ waybillLst.Add(orderWayBill);
+ }
- lstWxOptimizeOrderWayBillInfo.Add(orderWayBill);
+ // 查询是否被优化过
+ var url = BaseClass.BuildObjString("shop/get_waybill_no_user_name");
+ var data = "";
+ data = UserLogin.GetSignaturex();
+ data += "&status=2";
+ data += "&order_ids=" + string.Join(",", waybillLst.Select(w => w.orderInfo.orderId));
+ var html = GetHtml.PostUtf8(url, data);
+ if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
+ html = GetHtml.PostUtf8(url, data);
+ if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
+ html = GetHtml.PostUtf8(url, data);
+ if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
+ {
+ foreach (var orderWaybill in waybillLst)
+ {
+ orderWaybill.optimizeWaybillId = "查询失败";
+ orderWaybill.optimizeTime = "";
+ }
+ }
+ else
+ {
+ try
+ {
+ var jArr = JObject.Parse(html)["data"];
+ var sProd = JsonHelper.SerializeObject(jArr);
+ var optimizeLst = JsonHelper.DeserializeJsonToList(sProd);
+ foreach (var orderWaybill in waybillLst)
+ {
+ var ov = optimizeLst.FirstOrDefault(o => o.order_id == orderWaybill.orderInfo.orderId);
+ orderWaybill.optimizeWaybillId = ov == null ? "" : ov.waybill_id;
+ orderWaybill.optimizeTime = ov == null ? "" : ov?.use_time?.ToString("yyyy-MM-dd HH:mm");
+ if (!string.IsNullOrEmpty(orderWaybill.optimizeWaybillId))
+ orderWaybill.optimizeWaybillId = "已优化";
+ }
+ }
+ catch (Exception ex)
+ {
+ foreach (var orderWaybill in waybillLst)
+ {
+ orderWaybill.optimizeWaybillId = "查询失败";
+ orderWaybill.optimizeTime = "";
+ }
+ }
+ }
+
+ foreach (var orderWaybill in waybillLst)
+ {
+ lstWxOptimizeOrderWayBillInfo.Add(orderWaybill);
Invoke(new Action(() =>
{
- var rowIndex = this.dgvData3.Rows.Add(
- false,
- shop.ShopId,
- shop.ShopAccount,
- "登录",
- "进店",
- orderWayBill.orderInfo.imgUrl,
- DataGridViewExtension.defaultBitmap,
- orderWayBill.orderInfo.spuId,
- orderWayBill.orderInfo.name,
- orderWayBill.orderInfo.skuName + " x" + orderWayBill.orderInfo.productCnt,
- orderWayBill.orderInfo.skuCode,
- orderWayBill.orderInfo.orderId + "\r\n" + orderWayBill.waybillId,
- orderWayBill.delivery.deliveryName,
- BaseClass.StampToDateTime(orderWayBill.payTime.ParseToInt()).ToString("yyyy-MM-dd HH:mm:ss"),
- orderWayBill.realPickupTime.ParseToInt().IsNullOrZero() ? "" : BaseClass.StampToDateTime(orderWayBill.realPickupTime.ParseToInt()).ToString("yyyy-MM-dd HH:mm:ss"),
- (orderWayBill.pickupDuration.ParseToInt().IsNullOrZero() ? "" : (new TimeSpan(orderWayBill.pickupDuration.ParseToLong()).TotalHours.ToString("f2") + "小时" + "\r\n")) + "[" + (is24 ? "次日" : "48小时") + "]"
- );
+ var rowIndex = this.dgvData3.Rows.Add(
+ false,
+ shop.ShopId,
+ shop.ShopAccount,
+ "登录",
+ "进店",
+ orderWaybill.orderInfo.imgUrl,
+ DataGridViewExtension.defaultBitmap,
+ orderWaybill.orderInfo.spuId,
+ orderWaybill.orderInfo.name,
+ orderWaybill.orderInfo.skuName + " x" + orderWaybill.orderInfo.productCnt,
+ orderWaybill.orderInfo.skuCode,
+ orderWaybill.orderInfo.orderId + "\r\n" + orderWaybill.waybillId,
+ orderWaybill.delivery.deliveryName,
+ BaseClass.StampToDateTime(orderWaybill.payTime.ParseToInt()).ToString("yyyy-MM-dd HH:mm:ss"),
+ orderWaybill.realPickupTime.ParseToInt().IsNullOrZero() ? "" : BaseClass.StampToDateTime(orderWaybill.realPickupTime.ParseToInt()).ToString("yyyy-MM-dd HH:mm:ss"),
+ orderWaybill.pickupDuration.ParseToInt().IsNullOrZero() ? "" : ((orderWaybill.pickupDuration.ParseToInt() / 3600.0m).ToString("f2") + "小时" + "\r\n" + "[" + (is24 ? "次日" : "48小时") + "]"),
+ orderWaybill.optimizeWaybillId + "\r\n" + orderWaybill.optimizeTime,
+ "优化"
+ );
- dgvData3.Rows[rowIndex].Height = 60;
+ dgvData3.Rows[rowIndex].Height = 60;
}));
}
}
@@ -955,8 +1098,8 @@ namespace TemuKJD.WXForms.ShopForms
if (shopRow != null)
{
shopRow.Cells["colMessage"].Value = "获取配送时效失败" + error;
- //if(error.Contains("\"code\":2") && error.Contains("[194,62,3,176,14,1]"))
- // shopRow.Cells["colMessage"].Value = "店铺无评分";
+ if(error.Contains("\"code\":2") && error.Contains("[194,62,3,176,14,1]"))
+ shopRow.Cells["colMessage"].Value = "店铺无时效评分";
}
}));
}
@@ -1016,6 +1159,7 @@ namespace TemuKJD.WXForms.ShopForms
this.pictureBox4.Visible = true;
this.statusBar.lblTaskStatus.Text = "正在查询配送不达标，店铺：" + shop.ShopAccount + " " + page + "/" + totalPage;
}));
+ List optrimizeLinerCgiLst = new List();
foreach (JObject refundOrderObj in wayBillObjs["list"])
{
var oStr = JsonHelper.SerializeObject(refundOrderObj);
@@ -1025,14 +1169,58 @@ namespace TemuKJD.WXForms.ShopForms
orderLinerCgiInfo.shopId = shop.ShopId;
orderLinerCgiInfo.shopName = shop.ShopAccount;
- //// 24小时揽收率截至第二天
- //if (is24 && BaseClass.StampToDateTime(orderLinerCgiInfo.realPickupTime.ParseToInt()).Date <= BaseClass.StampToDateTime(orderLinerCgiInfo.payTime.ParseToInt()).Date.AddDays(1))
- // continue;
- //// 48小时揽收率按48小时算
- //if (!is24 && BaseClass.StampToDateTime(orderLinerCgiInfo.realPickupTime.ParseToInt()) <= BaseClass.StampToDateTime(orderLinerCgiInfo.payTime.ParseToInt()).AddDays(2))
- // continue;
-
+ optrimizeLinerCgiLst.Add(orderLinerCgiInfo);
lstWxOptrimizeLinerCgiInfo.Add(orderLinerCgiInfo);
+
+ }
+
+ // 查询是否被优化过
+ var url = BaseClass.BuildObjString("shop/get_waybill_no_user_name");
+ var data = "";
+ data = UserLogin.GetSignaturex();
+ data += "&status=2";
+ data += "&order_ids=" + string.Join(",", optrimizeLinerCgiLst.Select(w => w.order_id));
+ var html = GetHtml.PostUtf8(url, data);
+ if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
+ html = GetHtml.PostUtf8(url, data);
+ if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
+ html = GetHtml.PostUtf8(url, data);
+ if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
+ {
+ foreach (var linerCgi in optrimizeLinerCgiLst)
+ {
+ linerCgi.optimizeWaybillId = "查询失败";
+ linerCgi.optimizeTime = "";
+ }
+ }
+ else
+ {
+ try
+ {
+ var jArr = JObject.Parse(html)["data"];
+ var sProd = JsonHelper.SerializeObject(jArr);
+ var optimizeLst = JsonHelper.DeserializeJsonToList(sProd);
+ foreach (var linerCgi in optrimizeLinerCgiLst)
+ {
+ var ov = optimizeLst.FirstOrDefault(o => o.order_id == linerCgi.order_id);
+ linerCgi.optimizeWaybillId = ov == null ? "" : ov.waybill_id;
+ linerCgi.optimizeTime = ov == null ? "" : ov?.use_time?.ToString("yyyy-MM-dd HH:mm");
+ if (!string.IsNullOrEmpty(linerCgi.optimizeWaybillId))
+ linerCgi.optimizeWaybillId = "已优化";
+ }
+ }
+ catch (Exception ex)
+ {
+ foreach (var linerCgi in optrimizeLinerCgiLst)
+ {
+ linerCgi.optimizeWaybillId = "查询失败";
+ linerCgi.optimizeTime = "";
+ }
+ }
+ }
+
+ foreach (var orderLinerCgiInfo in optrimizeLinerCgiLst)
+ {
Invoke(new Action(() =>
{
var rowIndex = this.dgvData4.Rows.Add(
@@ -1052,7 +1240,9 @@ namespace TemuKJD.WXForms.ShopForms
BaseClass.StampToDateTime(orderLinerCgiInfo.collect_time.ParseToInt()).ToString("yyyy-MM-dd HH:mm:ss") + "\r\n" + BaseClass.StampToDateTime(orderLinerCgiInfo.receipt_time.ParseToInt()).ToString("yyyy-MM-dd HH:mm:ss"),
"发货地：" + orderLinerCgiInfo.ship_city + "\r\n" + "收货地：" + orderLinerCgiInfo.ship_province + orderLinerCgiInfo.receipt_city,
(orderLinerCgiInfo.transport_duration.ParseToInt() / 3600) + "小时" + (orderLinerCgiInfo.transport_duration.ParseToInt() % 3600) / 60 + "分" +
- "\r\n标准时长" + (orderLinerCgiInfo.transport_std_duration.ParseToInt() / 3600) + "小时" /*+ (orderLinerCgiInfo.transport_std_duration.ParseToInt() % 3600)*/
+ "\r\n标准时长" + (orderLinerCgiInfo.transport_std_duration.ParseToInt() / 3600) + "小时", /*+ (orderLinerCgiInfo.transport_std_duration.ParseToInt() % 3600)*/
+ orderLinerCgiInfo.optimizeWaybillId + "\r\n" + orderLinerCgiInfo.optimizeTime,
+ "优化"
);
dgvData4.Rows[rowIndex].Height = 60;
@@ -1071,17 +1261,167 @@ namespace TemuKJD.WXForms.ShopForms
}
}
-
- private void dgvData1_CellContentClick(object sender, DataGridViewCellEventArgs e)
- {
-
- }
-
private void btnCancel_Click(object sender, EventArgs e)
{
if (this.cancellationTokenSource != null)
cancellationTokenSource.Cancel();
}
+
+ public string OptimizeExpress(ShopLoginInfo shop, string orderId, string productEvaluationId = "")
+ {
+ var url = BaseClass.BuildObjString("shop/select_waybill");
+ var data = "";
+ data = UserLogin.GetSignaturex();
+ data += "&shop_id=" + shop.ShopId;
+ data += "&order_id=" + orderId;
+
+ var html = GetHtml.PostUtf8(url, data);
+ if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
+ html = GetHtml.PostUtf8(url, data);
+ if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
+ {
+ var errMsg = BaseRegex.GetStringJson(ref html, "msg");
+ return "优化失败 " + errMsg;
+ }
+ var waybill_id = BaseRegex.GetStringJson(ref html, "waybill_id");
+ var delivery_id = BaseRegex.GetStringJson(ref html, "delivery_id");
+ var delivery_name = BaseRegex.GetStringJson(ref html, "delivery_name");
+
+ JObject body = new JObject();
+ body["platform"] = "WEISHOP";
+ //body["shopId"] = shop.ShopId;
+ body["orderId"] = orderId;
+ body["expressNo"] = waybill_id;
+ body["expressName"] = delivery_id;
+ url = "https://po.e57.cn/prod-api/api/oms-api/order/optimize/optimizeExpressInfo";
+ var bodyStr = JsonHelper.SerializeObject(body);
+ var optimizeExpressRst = WXHttpResponseBLL.e57PostResponse(url, bodyStr, "");
+ if (!optimizeExpressRst.Contains("修改物流信息成功") && !optimizeExpressRst.Contains("200"))
+ optimizeExpressRst = WXHttpResponseBLL.e57PostResponse(url, bodyStr, "");
+ System.Xml.XmlDocument xmlDoc = new System.Xml.XmlDocument();
+
+ xmlDoc.LoadXml(optimizeExpressRst); //订单不存在，orderId:3735398415030708224500
+ string msg = xmlDoc["AjaxResult"]["msg"].InnerText;
+ string code = xmlDoc["AjaxResult"]["code"].InnerText;
+
+ url = BaseClass.BuildObjString("shop/update_used_waybill");
+ data = UserLogin.GetSignaturex();
+ data += "&shop_id=" + shop.ShopId;
+ data += "&order_id=" + orderId;
+ data += "&waybill_id=" + waybill_id;
+ if (!optimizeExpressRst.Contains("修改物流信息成功") && !optimizeExpressRst.Contains("200"))
+ data += "&is_rollback=true";
+
+ html = GetHtml.PostUtf8(url, data);
+ if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
+ html = GetHtml.PostUtf8(url, data);
+ if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
+ html = GetHtml.PostUtf8(url, data);
+ if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
+ {
+ var errMsg = BaseRegex.GetStringJson(ref html, "msg");
+ if (!optimizeExpressRst.Contains("修改物流信息成功") && !optimizeExpressRst.Contains("200"))
+ return "优化失败，回滚失败\r\n" + errMsg + " " + msg;
+ else
+ return "优化失败\r\n" + errMsg;
+ }
+ if (!optimizeExpressRst.Contains("修改物流信息成功") && !optimizeExpressRst.Contains("200"))
+ return "优化失败，已回滚\r\n" + msg;
+ return "优化成功";
+ }
+
+ private void dgvData_CellContentClick(object sender, DataGridViewCellEventArgs e)
+ {
+ if (e.ColumnIndex < 0 || e.RowIndex < 0)
+ return;
+ var dgvData = sender as DataGridView;
+ if (dgvData == null)
+ return;
+
+ var dgvNum = dgvData.Name.Replace("dgvData", "");
+
+ var row = dgvData.Rows[e.RowIndex];
+ string headerText = dgvData.Columns[e.ColumnIndex].HeaderText;
+ var shopId = row.Cells["colDgv" + dgvNum + "ShopId"].Value.ParseToString();
+ var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId);
+
+ switch (headerText)
+ {
+ case "删除":
+ break;
+ case "登录":
+ {
+ WXShopLoginForm shopLoginForm = new WXShopLoginForm(shop);
+ shopLoginForm.openType = EnumOpenType.login;
+ shopLoginForm.ShowDialog();
+ RefreshShopLogin();
+ }
+ break;
+ case "进店":
+ {
+ WXShopLoginForm shopLoginForm = new WXShopLoginForm(shop);
+ WXShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false);
+ if (shop.LoginStatus == "登录成功")
+ {
+ shopLoginForm.openType = EnumOpenType.manage;
+ shopLoginForm.WindowState = FormWindowState.Maximized;
+ shopLoginForm.InitUrl = "https://store.weixin.qq.com/shop/home";
+ shopLoginForm.Show();
+ }
+ else
+ {
+ shopLoginForm.openType = EnumOpenType.login;
+ shopLoginForm.ShowDialog();
+ RefreshShopLogin();
+ }
+ }
+ break;
+ case "图片":
+ {
+ ShowImgForm imgFrom = new ShowImgForm(row.Cells["colDgv" + dgvNum + "ImgUrl"].Value.ParseToString());
+ imgFrom.ShowDialog();
+ break;
+ }
+ case "优化":
+ {
+ var orderId = row.Cells[$"colDgv{dgvNum}OrderId"].Value.ParseToString();
+ if (orderId.Contains("未获取到对应订单号"))
+ {
+ BaseMsgForm.ShowError("缺少单编号无法优化！");
+ return;
+ }
+ if (orderId.Contains("获取到多条订单号"))
+ {
+ BaseMsgForm.ShowError("订单编号不符合优化条件！");
+ return;
+ }
+
+ orderId = orderId.Split(new string[] { "\r", "\n" }, StringSplitOptions.RemoveEmptyEntries).FirstOrDefault();
+ if (!string.IsNullOrEmpty(orderId))
+ {
+
+ var rst = OptimizeExpress(shop, orderId);
+ row.Cells[$"colDgv{dgvNum}OptimizeStatus"].Value = rst;
+ }
+ else
+ {
+ BaseMsgForm.ShowError("缺少单编号无法优化！");
+ }
+ break;
+ }
+ case "":
+ row.Cells[$"colDgv{dgvNum}check"].Value = !(bool)row.Cells[$"colDgv{dgvNum}check"].Value;
+ break;
+ default:
+ break;
+ }
+ }
+
+ private void btnWaybillManage_Click(object sender, EventArgs e)
+ {
+ WXWaybillManageForm waybillForm = new WXWaybillManageForm();
+ waybillForm.ShowDialog();
+ }
}
public static class ShopOptimize
@@ -1145,5 +1485,21 @@ namespace TemuKJD.WXForms.ShopForms
var result = WXHttpResponseBLL.WeiXinPostResponse(shop, url, body, referer);
return result;
}
+
+ public static string orderSearch(ShopLoginInfo shop, string prodTitle, string receiverName)
+ {
+ string url = "https://store.weixin.qq.com/shop-faas/mmchannelstradeorder/list/cgi/orderSearch?token=&lang=zh_CN";
+ string referer = "https://store.weixin.qq.com/shop/order/list";
+ string body = @"{""isSearch"":true,""pageSize"":30,""orderId"":"""",""orderTime"":{""type"":0,""time"":[null,null]},
+""telNumber"":"""",""title"":""复古刺绣盘扣麻棉衬衫女2022夏新款中式禅意茶服宽松短款v领上衣"",""receiverName"":""浅菊夏離、"",""finderNickName"":"""",
+""merchantNotes"":"""",""merchantNotesTagColor"":0,""waybillId"":"""",""productCode"":"""",""inspectStatus"":"""",""finderWay"":0,""searchOrderType"":0,
+""payMethod"":0,""orderChannel"":0,""bulkbuyActivityId"":"""",""deliveryNegotiationFlag"":0,""transactionId"":"""",""page"":1,""startCreateTime"":null,
+""endCreateTime"":null}";
+
+ body = @"{""isSearch"":true,""pageSize"":30,""orderId"":"""",""orderTime"":{""type"":0,""time"":[null,null]},
+""telNumber"":"""",""title"":""" + prodTitle + @""",""receiverName"":""" + receiverName + @""",""finderNickName"":"""",""merchantNotes"":"""",""merchantNotesTagColor"":0,""waybillId"":"""",""productCode"":"""",""inspectStatus"":"""",""finderWay"":0,""searchOrderType"":0,""payMethod"":0,""orderChannel"":0,""bulkbuyActivityId"":"""",""deliveryNegotiationFlag"":0,""transactionId"":"""",""page"":1,""startCreateTime"":null,""endCreateTime"":null}";
+ var result = WXHttpResponseBLL.WeiXinPostResponse(shop, url, body, referer);
+ return result;
+ }
}
}
diff --git a/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.resx b/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.resx
index 5b9ac71..b831660 100644
--- a/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.resx
+++ b/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.resx
@@ -186,7 +186,7 @@
True
-
+
True
@@ -195,6 +195,12 @@
True
+
+ True
+
+
+ True
+
True
@@ -231,6 +237,9 @@
True
+
+ True
+
True
@@ -240,25 +249,31 @@
True
+
+ True
+
+
+ True
+
True
-
+
True
-
+
True
-
+
True
-
+
True
-
+
True
-
+
True
@@ -273,7 +288,7 @@
True
-
+
True
@@ -288,19 +303,25 @@
True
+
+ True
+
+
+ True
+
True
-
+
True
-
+
True
-
+
True
-
+
True
@@ -321,7 +342,7 @@
True
-
+
True
@@ -336,4 +357,10 @@
True
+
+ True
+
+
+ True
+
\ No newline at end of file