diff --git a/AllBase/AllBase.csproj b/AllBase/AllBase.csproj index 184648c..14be498 100644 --- a/AllBase/AllBase.csproj +++ b/AllBase/AllBase.csproj @@ -290,7 +290,7 @@ - + diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs index dddbdd2..a926a0a 100644 --- a/AllBase/BaseClass.cs +++ b/AllBase/BaseClass.cs @@ -27,7 +27,7 @@ namespace AllBase /// /// 版本ID /// - public static int VersionCount = 1016; + public static int VersionCount = 1020; //public static int VersionCount = 613; /// diff --git a/AllBase/Extension/Extensions.cs b/AllBase/Extension/Extensions.cs index d3155fd..6978f68 100644 --- a/AllBase/Extension/Extensions.cs +++ b/AllBase/Extension/Extensions.cs @@ -66,6 +66,16 @@ namespace AllBase.Extension { return null; } + try + { + return DateTime.Parse(str); + } + catch + { + } + + if (str.Contains("年") && str.Contains("月") && str.Contains("日") && !str.Contains("周")) + str = str.Replace("年", "-").Replace("月", "-").Replace("日", "").Replace("时", ":").Replace("分", ":").Replace("秒", "").Trim(' ', ':'); if (str.Contains("-") || str.Contains("/")) { return DateTime.Parse(str); diff --git a/AllBase/Model/Result/PDDResult/PddBuyerOrderInfoLite.cs b/AllBase/Model/Result/PDDResult/PddBuyerOrderInfoLite.cs index 1ad3b0d..b798f23 100644 --- a/AllBase/Model/Result/PDDResult/PddBuyerOrderInfoLite.cs +++ b/AllBase/Model/Result/PDDResult/PddBuyerOrderInfoLite.cs @@ -20,7 +20,27 @@ namespace AllBase.Model.Result.PDDResult //BTWL 百世快运 //HTKY 百世快递 - public static string GetWxExpressCompanyCode(string expressCompanyName) + public static string GetPddToWxExpressCompanyCode(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 "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 static string GetWxExpressNameToWxExpressCode(string expressCompanyName) { if (expressCompanyName == null || expressCompanyName == "") return ""; if (expressCompanyName.Contains("邮政快递包裹")) return "EMS"; @@ -28,8 +48,8 @@ namespace AllBase.Model.Result.PDDResult 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 "YD"; + if (expressCompanyName.Contains("圆通速递")) return "YTO"; if (expressCompanyName.Contains("中通快递")) return "ZTO"; if (expressCompanyName.Contains("百世快运")) return "BTWL"; if (expressCompanyName.Contains("百世快递")) return "HTKY"; @@ -44,7 +64,7 @@ namespace AllBase.Model.Result.PDDResult { get { - return GetWxExpressCompanyCode(outExpressCompanyName); + return GetPddToWxExpressCompanyCode(outExpressCompanyName); } } public string outExpressCompanyName @@ -55,6 +75,7 @@ namespace AllBase.Model.Result.PDDResult if (outExpressCompanyMsg.Contains("邮政快递包裹")) return "邮政快递包裹"; if (outExpressCompanyMsg.Contains("邮政电商标快")) return "邮政电商标快"; if (outExpressCompanyMsg.Contains("极兔速递")) return "极兔速递"; + if (outExpressCompanyMsg.Contains("极兔快递")) return "极兔速递"; if (outExpressCompanyMsg.Contains("申通快递")) return "申通快递"; if (outExpressCompanyMsg.Contains("韵达快递")) return "韵达快递"; if (outExpressCompanyMsg.Contains("圆通快递")) return "圆通快递"; diff --git a/AllBase/Model/Result/WXResult/WxOptimizeExpressInfo.cs b/AllBase/Model/Result/WXResult/WxOptimizeExpressInfo.cs new file mode 100644 index 0000000..c33f717 --- /dev/null +++ b/AllBase/Model/Result/WXResult/WxOptimizeExpressInfo.cs @@ -0,0 +1,35 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AllBase.Model.Result.WXResult +{ + public class WxOptimizeExpressInfo + { + public int id { get; set; } + public string delivery_id { get; set; } + public string delivery_name { get; set; } + public string waybill_id { get; set; } + public int status { get; set; } + public string order_id { get; set; } + public string bind_order_id { get; set; } + public string shop_id { get; set; } + public DateTime add_time { get; set; } + public DateTime? use_time { get; set; } + public DateTime? waybill_pickup_time { get; set; } + } + + public class WxOptimizeRstInfo + { + public int id { get; set; } + public string shop_id { get; set; } + public string order_id { get; set; } + public string optimize_rst { get; set; } + public string waybill_id { get; set; } + public string delivery_name { get; set; } + public DateTime add_time { get; set; } + public DateTime mdy_time { get; set; } + } +} diff --git a/AllBase/Model/Result/WXResult/WxOptrimizeLinerCgiInfo.cs b/AllBase/Model/Result/WXResult/WxOptimizeLinerCgiInfo.cs similarity index 81% rename from AllBase/Model/Result/WXResult/WxOptrimizeLinerCgiInfo.cs rename to AllBase/Model/Result/WXResult/WxOptimizeLinerCgiInfo.cs index 40ac8db..9a1574f 100644 --- a/AllBase/Model/Result/WXResult/WxOptrimizeLinerCgiInfo.cs +++ b/AllBase/Model/Result/WXResult/WxOptimizeLinerCgiInfo.cs @@ -6,15 +6,29 @@ using System.Threading.Tasks; namespace AllBase.Model.Result.WXResult { - public class WxOptrimizeLinerCgiInfo + public class WxOptimizeLinerCgiInfo { public string shopId { get; set; } public string shopName { get; set; } public string optimizeWaybillId { get; set; } public string optimizeTime { get; set; } + public int? orderTime { get; set; } + /// + /// 收货 省 + /// + public string province { get; set; } + /// + /// 收货 市 + /// + public string city { get; set; } + /// + /// 收货 区 + /// + public string district‌ { get; set; } + public string receipt_province { get; set; } // "福建省", - public string ship_province { get; set; } // "广东省", + public string ship_province { get; set; } // "广东省", public string receipt_time { get; set; } // "1775439386", public string transport_duration { get; set; } // "120986", public string delivery_id { get; set; } // "ZTO", diff --git a/AllBase/Model/Result/WXResult/WxOptimizeOrderAfterSaleInfo.cs b/AllBase/Model/Result/WXResult/WxOptimizeOrderAfterSaleInfo.cs index ce8d557..65b3a3f 100644 --- a/AllBase/Model/Result/WXResult/WxOptimizeOrderAfterSaleInfo.cs +++ b/AllBase/Model/Result/WXResult/WxOptimizeOrderAfterSaleInfo.cs @@ -12,6 +12,20 @@ namespace AllBase.Model.Result.WXResult public string shopName { get; set; } public string optimizeWaybillId { get; set; } public string optimizeTime { get; set; } + public int? orderTime { get; set; } + /// + /// 收货 省 + /// + public string province { get; set; } + /// + /// 收货 市 + /// + public string city { get; set; } + /// + /// 收货 区 + /// + public string district‌ { 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 e85e99a..2da762f 100644 --- a/AllBase/Model/Result/WXResult/WxOptimizeOrderWayBillInfo.cs +++ b/AllBase/Model/Result/WXResult/WxOptimizeOrderWayBillInfo.cs @@ -12,6 +12,20 @@ namespace AllBase.Model.Result.WXResult public string shopName { get; set; } public string optimizeWaybillId { get; set; } public string optimizeTime { get; set; } + public int? orderTime { get; set; } + /// + /// 收货 省 + /// + public string province { get; set; } + /// + /// 收货 市 + /// + public string city { get; set; } + /// + /// 收货 区 + /// + public string district‌ { 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 9f608d1..5c11622 100644 --- a/AllBase/Model/Result/WXResult/WxOptimizeProductEvaluationInfo.cs +++ b/AllBase/Model/Result/WXResult/WxOptimizeProductEvaluationInfo.cs @@ -12,8 +12,21 @@ namespace AllBase.Model.Result.WXResult public string shopName { get; set; } public string optimizeWaybillId { get; set; } public string optimizeTime { get; set; } - public string order_id { get; set; } + public int? orderTime { get; set; } + /// + /// 收货 省 + /// + public string province { get; set; } + /// + /// 收货 市 + /// + public string city { get; set; } + /// + /// 收货 区 + /// + public string district‌ { get; set; } + public string productEvaluationId { get; set; } // "53890834526", public OptimizeEvaluationInfo evaluationInfo { get; set; } diff --git a/KJDService/KJD_WebService/BLL/WXXD/WXExpressOptimizeManage.cs b/KJDService/KJD_WebService/BLL/WXXD/WXExpressOptimizeManage.cs new file mode 100644 index 0000000..6bea845 --- /dev/null +++ b/KJDService/KJD_WebService/BLL/WXXD/WXExpressOptimizeManage.cs @@ -0,0 +1,707 @@ +using KJD_Web.Model.WxModel; +using KJD_Web.Utils; +using KJD_WebService.Model; +using MySql.Data.MySqlClient; +using NaiBa.Util.Extension; +using Newtonsoft.Json; +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Runtime.Remoting.Messaging; +using System.Web; +using System.Web.Security; +using System.Web.Services.Description; + +namespace KJD_Web.BLL.WXXD +{ + public class WXExpressOptimizeManage + { + public string GetWayBill(string inputData, bool isNoUserName = false) + { + if (!string.IsNullOrEmpty(inputData)) + { + var timeCalc = DateTime.Now; + + if (!WXUserManage.GetSign(inputData)) + return "{\"code\":999,\"msg\":\"校验失败\"}"; + + //var delivery_id = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "delivery_id"))?.Replace("'", "\\'"); + //var delivery_name = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "delivery_name"))?.Replace("'", "\\'"); + //var waybill_id = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "waybill_id"))?.Replace("'", "\\'"); + //if (string.IsNullOrEmpty(delivery_id) || string.IsNullOrEmpty(delivery_name) || string.IsNullOrEmpty(waybill_id)) + //{ + // return "{\"code\":500,\"msg\":\"运单号信息不完整\"}"; + //} + var status = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "status"))?.Replace("'", "\'"); + var order_ids = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "order_ids"))?.Replace("'", "\'"); + var user_name = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "user_name"))?.Replace("'", "\'"); + if (!isNoUserName && user_name.IsNullOrEmpty()) + { + return "{\"code\":500,\"msg\":\"用户名不能为空\"}"; + } + if (isNoUserName && order_ids.IsNullOrEmpty()) + { + return "{\"code\":500,\"msg\":\"订单号不能为空\"}"; + } + + + int page = RegexUtils.GetStringQuery(ref inputData, "page").ParseToInt(); + int page_size = RegexUtils.GetStringQuery(ref inputData, "page_size").ParseToInt(50); + + string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; + MysqlUtils mySql = new MysqlUtils(conn); + string sql = ""; + sql = "select count(*) from wxxd.delivery where 1=1"; + + string where = ""; + if (!isNoUserName) + where += " AND user_name='" + user_name + "'"; + if (status != null) + where += " AND status in (" + status + ")"; + if (order_ids != null) + where += " AND order_id in ('" + order_ids.Replace(",", "','") + "')"; + + sql += where; + + var count = 0; + count = mySql.ExecuteRowCount(sql); + + DataTable dt; + if (count == 0) + { + dt = new DataTable(); + } + else + { + sql = "select * from wxxd.delivery where 1=1"; + sql += where; + sql += " order by id desc limit " + Math.Max(0, page - 1) * page_size + "," + page_size + ";"; + dt = mySql.ExecuteDataTable(sql); + } + mySql.Close(); + + if (!string.IsNullOrEmpty(mySql.Message)) + return "{\"code\":501,\"msg\":\"" + mySql.Message + "\"}"; + + if (dt != null) + { + try + { + List WxOptimizeExpressInfoLst = new List(); + foreach (DataRow row in dt.Rows) + { + WxOptimizeExpressInfoLst.Add(new WxOptimizeExpressInfo() + { + id = row["id"].ParseToInt(), + delivery_id = row["delivery_id"].ParseToString(), + delivery_name = row["delivery_name"].ParseToString(), + order_id = row["order_id"].ParseToString(), + bind_order_id = row["bind_order_id"].ParseToString(), + shop_id = row["shop_id"].ParseToString(), + status = row["status"].ParseToInt(), + waybill_id = row["waybill_id"].ParseToString(), + add_time = Convert.ToDateTime(row["add_time"]), + use_time = row["use_time"].ParseToString().ParseToDateTimeNullable(), + waybill_pickup_time = row["waybill_pickup_time"].ParseToString().ParseToDateTimeNullable(), + }); + } + JsonSerializerSettings jsonSetting = new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore }; + var data = JsonUtils.SerializeObjectToString(WxOptimizeExpressInfoLst, jsonSetting); + var seconds = (DateTime.Now - timeCalc).TotalSeconds.ToString("0.000"); + return "{\"code\":200,\"msg\":\"success\",\"data\":" + data + ",\"count\":" + count + ",\"seconds\":" + seconds + "}"; + } + catch (Exception ex) + { + return "{\"code\":500,\"msg\":\"" + ex.Message + "\",\"data\":[],\"count\":" + 0 + "}"; + } + } + else + { + return "{\"code\":500,\"msg\":\"" + mySql.Message + "\",\"data\":[],\"count\":" + 0 + "}"; + } + } + return "{\"code\":19999,\"msg\":\"输入为空\"}"; + } + + /// + /// 添加运单 + /// + /// + /// + public string AddWaybill(string inputData) + { + if (!string.IsNullOrEmpty(inputData)) + { + if (!WXUserManage.GetSign(inputData)) + return "{\"code\":999,\"msg\":\"校验失败\"}"; + + var delivery_id = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "delivery_id"))?.Replace("'", "\\'"); + var delivery_name = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "delivery_name"))?.Replace("'", "\\'"); + var waybill_id = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "waybill_id"))?.Replace("'", "\\'"); + var bind_order_id = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "bind_order_id"))?.Replace("'", "\\'"); + var waybill_pickup_time = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "waybill_pickup_time")).ParseToDateTimeNullable(); + if (string.IsNullOrEmpty(delivery_id) || string.IsNullOrEmpty(delivery_name) || string.IsNullOrEmpty(waybill_id)) + { + return "{\"code\":500,\"msg\":\"运单号信息不完整\"}"; + } + if (waybill_pickup_time == null && bind_order_id.IsNullOrEmpty()) + { + return "{\"code\":500,\"msg\":\"揽收时间和绑定订单编号不能同时为空\"}"; + } + var user_name = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "user_name"))?.ParseToString(); + if (user_name.IsNullOrEmpty()) + { + return "{\"code\":500,\"msg\":\"请输入用户名\"}"; + } + + string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; + MysqlUtils mySql = new MysqlUtils(conn); + string sql = ""; + sql = "select exists (select 1 from wxxd.delivery where waybill_id='" + waybill_id + "')"; + var exist = mySql.ExecuteFirstInt(sql); + if (exist > 0) + { + mySql.Close(); + return "{\"code\":500,\"msg\":\"运单号已存在\"}"; + } + + sql = "insert into wxxd.delivery (user_name,delivery_id,delivery_name,waybill_id,"; + if (!bind_order_id.IsNullOrEmpty()) + sql += "bind_order_id,"; + if (waybill_pickup_time != null) + sql += "waybill_pickup_time,"; + sql = sql.Trim(','); + sql += ") values ('" + user_name + "','" + delivery_id + "','" + delivery_name + "','" + waybill_id + "',"; + if (!bind_order_id.IsNullOrEmpty()) + sql += "'" + bind_order_id + "',"; + if (waybill_pickup_time != null) + sql += "'" + waybill_pickup_time.Value.ToString("yyyy-MM-dd HH:mm:ss") + "',"; + sql = sql.Trim(','); + sql += ");"; + var rst = mySql.ExecuteNonQuery(sql); + mySql.Close(); + if (!rst) + return "{\"code\":501,\"msg\":\"" + mySql.Message + "\"}"; + else + return "{\"code\":200,\"msg\":\"success\"}"; + } + return "{\"code\":19999,\"msg\":\"输入为空\"}"; + } + + public string DelWaybill(string inputData) + { + if (!string.IsNullOrEmpty(inputData)) + { + if (!WXUserManage.GetSign(inputData)) + return "{\"code\":999,\"msg\":\"校验失败\"}"; + + var waybill_ids = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "waybill_ids"))?.Replace("'", "\\'"); + if (string.IsNullOrEmpty(waybill_ids)) + { + return "{\"code\":500,\"msg\":\"运单号信息不完整\"}"; + } + var user_name = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "user_name"))?.ParseToString(); + if (user_name.IsNullOrEmpty()) + { + return "{\"code\":500,\"msg\":\"请输入用户名\"}"; + } + + string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; + MysqlUtils mySql = new MysqlUtils(conn); + string sql = ""; + sql = "delete from wxxd.delivery WHERE waybill_id in ('" + waybill_ids.Replace(",", "','") + "') and status=0"; + var rst = mySql.ExecuteNonQuery(sql); + mySql.Close(); + if (!rst || !mySql.Message.IsNullOrEmpty()) + return "{\"code\":501,\"msg\":\"删除失败 " + mySql.Message + "\"}"; + else + return "{\"code\":200,\"msg\":\"success\"}"; + } + return "{\"code\":19999,\"msg\":\"输入为空\"}"; + } + + /// + /// 选择并使用运单 + /// + /// + /// + public string SelectAndSetWaybill(string inputData) + { + if (!string.IsNullOrEmpty(inputData)) + { + if (!WXUserManage.GetSign(inputData)) + return "{\"code\":999,\"msg\":\"校验失败\"}"; + + var user_name = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "user_name"))?.ParseToString(); + if (user_name.IsNullOrEmpty()) + { + return "{\"code\":500,\"msg\":\"请输入用户名\"}"; + } + var shop_id = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "shop_id"))?.Replace("'", "\\'"); + var order_id = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "order_id"))?.Replace("'", "\\'"); + if (string.IsNullOrEmpty(order_id) || string.IsNullOrEmpty(shop_id)) + { + return "{\"code\":500,\"msg\":\"缺少订单信息\"}"; + } + + string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; + MysqlUtils mySql = new MysqlUtils(conn, true); + + string sql = ""; + sql = "select * from wxxd.delivery where order_id='" + order_id + "' and status = 1"; + var dt = mySql.ExecuteDataTable(sql); + if (!mySql.Message.IsNullOrEmpty()) + { + mySql.RollBack(); + mySql.Close(); + return "{\"code\":501,\"msg\":\"物流信息查询失败 " + mySql.Message + "\"}"; + } + if (dt?.Rows?.Count == 0) + { + sql = "UPDATE wxxd.delivery SET order_id='" + order_id + "',status=1 WHERE user_name='" + user_name + + "' AND status=0 AND (order_id IS NULL OR order_id='') LIMIT 1"; + var cnt = mySql.ExecuteAffectedRows(sql); + if (cnt == 0 || !mySql.Message.IsNullOrEmpty()) + { + mySql.RollBack(); + mySql.Close(); + return "{\"code\":501,\"msg\":\"物流信息提取失败 " + mySql.Message + "\"}"; + } + + sql = "SELECT * FROM wxxd.delivery WHERE user_name='" + user_name + "' AND order_id='" + order_id + "' AND status = 1"; + dt = mySql.ExecuteDataTable(sql); + if (!mySql.Message.IsNullOrEmpty()) + { + mySql.RollBack(); + mySql.Close(); + return "{\"code\":501,\"msg\":\"物流信息提取失败 " + mySql.Message + "\"}"; + } + if (dt?.Rows?.Count == 0) + { + mySql.RollBack(); + mySql.Close(); + return "{\"code\":501,\"msg\":\"物流信息提取失败 " + mySql.Message + "\"}"; + } + } + var waybill_id = dt.Rows[0]["waybill_id"].ToString(); + + // todo E57调用接口处理 + + mySql.Close(); + mySql = new MysqlUtils(conn, true); + sql = " UPDATE wxxd.delivery SET shop_id='" + shop_id + "',status=2,use_time='" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "' " + + " WHERE user_name='" + user_name + "' AND status=1 AND order_id='" + order_id + "' AND waybill_id='" + waybill_id + "'"; + var rst = mySql.ExecuteAffectedRows(sql); + if (rst == 0 || !mySql.Message.IsNullOrEmpty()) + { + mySql.RollBack(); + mySql.Close(); + return "{\"code\":501,\"msg\":\"修改物流信息失败 " + mySql.Message + "\"}"; + } + else + { + mySql.Commit(); + mySql.Close(); + return "{\"code\":200,\"msg\":\"success\"}"; + } + } + return "{\"code\":19999,\"msg\":\"输入为空\"}"; + } + + public string SelectWaybill(string inputData) + { + if (!string.IsNullOrEmpty(inputData)) + { + if (!WXUserManage.GetSign(inputData)) + return "{\"code\":999,\"msg\":\"校验失败\"}"; + + var user_name = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "user_name"))?.ParseToString(); + if (user_name.IsNullOrEmpty()) + { + return "{\"code\":500,\"msg\":\"请输入用户名\"}"; + } + var shop_id = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "shop_id"))?.Replace("'", "\\'"); + var order_id = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "order_id"))?.Replace("'", "\\'"); + var order_time = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "order_time")).ParseToDateTimeNullable(); + + if (string.IsNullOrEmpty(order_id) || string.IsNullOrEmpty(shop_id)) + { + return "{\"code\":500,\"msg\":\"缺少订单信息\"}"; + } + + string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; + MysqlUtils mySql = new MysqlUtils(conn, true); + + try + { + string sql = ""; + sql = "select * from wxxd.delivery WHERE user_name='" + user_name + "' AND order_id='" + order_id + "' and status = 1 LIMIT 1"; + var dt = mySql.ExecuteDataTable(sql); + if (!mySql.Message.IsNullOrEmpty()) + { + mySql.RollBack(); + mySql.Close(); + return "{\"code\":501,\"msg\":\"物流查询失败 " + mySql.Message + "\"}"; + } + if (dt?.Rows?.Count == 0) + { + // 获取事先绑定的订单运单 + sql = " UPDATE wxxd.delivery SET order_id='" + order_id + "',status=1" + + " WHERE user_name='" + user_name + "' AND status=0 AND bind_order_id='" + order_id + "'" + + " LIMIT 1"; + var cnt = mySql.ExecuteAffectedRows(sql); + if (!mySql.Message.IsNullOrEmpty()) + { + mySql.RollBack(); + mySql.Close(); + return "{\"code\":501,\"msg\":\"物流提取失败 " + mySql.Message + "\"}"; + } + // 根据订单时间提取指定时间段内的运单号 + if (cnt == 0 && order_time != null) + { + // 第一天的订单用第二天的物流发货 + var start_time = order_time.Value.Date.AddHours(24).ToString("yyyy-MM-dd HH:mm:ss"); + var end_time = order_time.Value.Date.AddHours(48).AddSeconds(-1).ToString("yyyy-MM-dd HH:mm:ss"); + sql = " UPDATE wxxd.delivery SET order_id='" + order_id + "',status=1" + + " WHERE user_name='" + user_name + "' AND status=0 AND (order_id IS NULL OR order_id='') AND (bind_order_id IS NULL OR bind_order_id='')" + + " AND waybill_pickup_time between '" + start_time + "' and '" + end_time + "'" + + " LIMIT 1"; + cnt = mySql.ExecuteAffectedRows(sql); + if (!mySql.Message.IsNullOrEmpty()) + { + mySql.RollBack(); + mySql.Close(); + return "{\"code\":501,\"msg\":\"物流提取失败 " + mySql.Message + "\"}"; + } + } + // 挑选最早入库的运单号 + //if (cnt == 0 && order_time == null) + //{ + // sql = " UPDATE wxxd.delivery SET order_id='" + order_id + "',status=1" + + // " WHERE user_name='" + user_name + "' AND status=0 AND (order_id IS NULL OR order_id='') AND (bind_order_id IS NULL OR bind_order_id='')" + + // " LIMIT 1"; + // cnt = mySql.ExecuteAffectedRows(sql); + // if (!mySql.Message.IsNullOrEmpty()) + // { + // mySql.RollBack(); + // mySql.Close(); + // return "{\"code\":501,\"msg\":\"物流提取失败 " + mySql.Message + "\"}"; + // } + //} + if (cnt == 0) + { + mySql.RollBack(); + mySql.Close(); + return "{\"code\":501,\"msg\":\"没有可用的运单号\"}"; + } + + sql = "SELECT * FROM wxxd.delivery WHERE user_name='" + user_name + "' AND order_id='" + order_id + "' AND status = 1"; + dt = mySql.ExecuteDataTable(sql); + if (!mySql.Message.IsNullOrEmpty()) + { + mySql.RollBack(); + mySql.Close(); + return "{\"code\":501,\"msg\":\"物流提取失败 " + mySql.Message + "\"}"; + } + if (dt?.Rows?.Count == 0) + { + mySql.RollBack(); + mySql.Close(); + return "{\"code\":501,\"msg\":\"物流提取失败 " + mySql.Message + "\"}"; + } + } + var waybill_id = dt.Rows[0]["waybill_id"].ToString(); + var delivery_id = dt.Rows[0]["delivery_id"].ParseToString(); + var delivery_name = dt.Rows[0]["delivery_name"].ParseToString(); + + mySql.Commit(); + mySql.Close(); + + return "{\"code\":200,\"msg\":\"success\",\"data\":{\"waybill_id\":\"" + waybill_id + + "\",\"delivery_id\":\"" + delivery_id + "\",\"delivery_name\":\"" + delivery_name + "\"}}"; + } + catch (Exception ex) + { + mySql.RollBack(); + mySql.Close(); + return "{\"code\":501,\"msg\":\"物流提取失败 " + ex.Message + "\"}"; + } + } + return "{\"code\":19999,\"msg\":\"输入为空\"}"; + } + + public string UpdateUsedWaybill(string inputData) + { + if (!string.IsNullOrEmpty(inputData)) + { + if (!WXUserManage.GetSign(inputData)) + return "{\"code\":999,\"msg\":\"校验失败\"}"; + + var user_name = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "user_name"))?.ParseToString(); + if (user_name.IsNullOrEmpty()) + { + return "{\"code\":500,\"msg\":\"请输入用户名\"}"; + } + var shop_id = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "shop_id"))?.Replace("'", "\\'"); + var order_id = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "order_id"))?.Replace("'", "\\'"); + var waybill_id = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "waybill_id"))?.Replace("'", "\\'"); + var is_rollback = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "is_rollback"))?.Replace("'", "\\'"); + if (string.IsNullOrEmpty(order_id) || string.IsNullOrEmpty(shop_id) || string.IsNullOrEmpty(waybill_id)) + { + return "{\"code\":500,\"msg\":\"缺少订单信息\"}"; + } + + string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; + MysqlUtils mySql = new MysqlUtils(conn, true); + + var sql = " UPDATE wxxd.delivery SET shop_id='" + shop_id + "',status=2,use_time='" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "' " + + " WHERE user_name='" + user_name + "' AND status=1 AND order_id='" + order_id + "' AND waybill_id='" + waybill_id + "'"; + if (is_rollback == "true") + sql = " UPDATE wxxd.delivery SET shop_id='',order_id='',status=0,use_time=NULL" + + " WHERE user_name='" + user_name + "' AND status=1 AND order_id='" + order_id + "' AND waybill_id='" + waybill_id + "'"; + + var rst = mySql.ExecuteAffectedRows(sql); + if (rst == 0 || !mySql.Message.IsNullOrEmpty()) + { + mySql.RollBack(); + mySql.Close(); + return "{\"code\":501,\"msg\":\"修改物流信息失败 " + mySql.Message + "\"}"; + } + + // 记录修改结果，暂时注释 + if (is_rollback != "true") + { + //var relation_id = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "relation_id"))?.Replace("'", "\\'"); + //var optimize_rst = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "optimize_rst"))?.Replace("'", "\\'"); + //var delivery_name = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "delivery_name"))?.Replace("'", "\\'"); + //if (optimize_rst != null) + //{ + // sql = "select exists (select 1 from wxxd.delivery where order_id='" + order_id + "')"; + // var exist = mySql.ExecuteFirstInt(sql); + // if (exist > 0) + // { + // sql = " UPDATE wxxd.express_optimize_rst SET "; + // if (shop_id != null) + // sql += " shop_id=@shop_id,"; + // if (relation_id != null) + // sql += " relation_id=@relation_id,"; + // if (optimize_rst != null) + // sql += " optimize_rst=@optimize_rst,"; + // if (waybill_id != null) + // sql += " waybill_id=@waybill_id,"; + // if (delivery_name != null) + // sql += " delivery_name=@delivery_name,"; + // sql = sql.TrimEnd(','); + // sql += " WHERE order_id=@order_id"; + // } + // else + // { + // sql = " insert into wxxd.express_optimize_rst (shop_id,order_id,"; + // if (relation_id != null) + // sql += "relation_id,"; + // if (optimize_rst != null) + // sql += "optimize_rst,"; + // if (waybill_id != null) + // sql += "waybill_id,"; + // if (delivery_name != null) + // sql += "delivery_name,"; + // sql = sql.TrimEnd(','); + // sql += ") "; + // sql += " values (@shop_id,@order_id,"; + // if (relation_id != null) + // sql += "@relation_id,"; + // if (optimize_rst != null) + // sql += "@optimize_rst,"; + // if (waybill_id != null) + // sql += "@waybill_id,"; + // if (delivery_name != null) + // sql += "@delivery_name,"; + // sql = sql.TrimEnd(','); + // sql += ");"; + // } + + // List paramLst = new List(); + // paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "@shop_id", Value = shop_id, }); + // paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "@relation_id", Value = relation_id, }); + // paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "@optimize_rst", Value = optimize_rst, }); + // paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "@waybill_id", Value = waybill_id, }); + // paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "@delivery_name", Value = delivery_name, }); + // paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "@order_id", Value = order_id, }); + // var rows = mySql.ExecuteAffectedRows(sql, paramLst.ToArray()); + //} + } + + mySql.Commit(); + mySql.Close(); + return "{\"code\":200,\"msg\":\"success\"}"; + } + return "{\"code\":19999,\"msg\":\"输入为空\"}"; + } + + public string AddMdyExpressOptimizeRst(string inputData) + { + if (!string.IsNullOrEmpty(inputData)) + { + if (!WXUserManage.GetSign(inputData)) + return "{\"code\":999,\"msg\":\"校验失败\"}"; + + var shop_id = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "shop_id"))?.Replace("'", "\\'"); + var order_id = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "order_id"))?.Replace("'", "\\'"); + var optimize_rst = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "optimize_rst"))?.Replace("'", "\\'"); + var waybill_id = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "waybill_id"))?.Replace("'", "\\'"); + var delivery_name = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "delivery_name"))?.Replace("'", "\\'"); + if (string.IsNullOrEmpty(order_id)) + { + return "{\"code\":500,\"msg\":\"请输入订单编号\"}"; + } + if (string.IsNullOrEmpty(optimize_rst)) + { + return "{\"code\":500,\"msg\":\"请输入补发结果\"}"; + } + + string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; + MysqlUtils mySql = new MysqlUtils(conn); + string sql = ""; + sql = "select exists (select 1 from wxxd.express_optimize_rst where order_id='" + order_id + "')"; + var exist = mySql.ExecuteFirstInt(sql); + if (exist > 0) + { + sql = " UPDATE wxxd.express_optimize_rst SET "; + if (shop_id != null) + sql += " shop_id=@shop_id,"; + if (optimize_rst != null) + sql += " optimize_rst=@optimize_rst,"; + if (waybill_id != null) + sql += " waybill_id=@waybill_id,"; + if (delivery_name != null) + sql += " delivery_name=@delivery_name,"; + sql = sql.TrimEnd(','); + sql += " WHERE order_id=@order_id"; + } + else + { + sql = " insert into wxxd.express_optimize_rst (shop_id,order_id,"; + if (optimize_rst != null) + sql += "optimize_rst,"; + if (waybill_id != null) + sql += "waybill_id,"; + if (delivery_name != null) + sql += "delivery_name,"; + sql = sql.TrimEnd(','); + sql += ") "; + sql += " values (@shop_id,@order_id,"; + if (optimize_rst != null) + sql += "@optimize_rst,"; + if (waybill_id != null) + sql += "@waybill_id,"; + if (delivery_name != null) + sql += "@delivery_name,"; + sql = sql.TrimEnd(','); + sql += ");"; + } + + List paramLst = new List(); + paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "@shop_id", Value = shop_id, }); + paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "@optimize_rst", Value = optimize_rst, }); + paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "@waybill_id", Value = waybill_id, }); + paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "@delivery_name", Value = delivery_name, }); + paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "@order_id", Value = order_id, }); + var rows = mySql.ExecuteAffectedRows(sql, paramLst.ToArray()); + mySql.Close(); + if (!mySql.Message.IsNullOrEmpty()) + return "{\"code\":501,\"msg\":\"" + mySql.Message + "\"}"; + else + return "{\"code\":200,\"msg\":\"success\",\"affected_rows\":" + rows + "}"; + } + return "{\"code\":19999,\"msg\":\"输入为空\"}"; + } + + + public string GetExpressOptimizeRst(string inputData, bool isNoUserName = false) + { + if (!string.IsNullOrEmpty(inputData)) + { + var timeCalc = DateTime.Now; + + if (!WXUserManage.GetSign(inputData)) + return "{\"code\":999,\"msg\":\"校验失败\"}"; + + var order_ids = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "order_ids"))?.Replace("'", "\'"); + if (isNoUserName && order_ids.IsNullOrEmpty()) + { + return "{\"code\":500,\"msg\":\"订单号不能为空\"}"; + } + + int page = RegexUtils.GetStringQuery(ref inputData, "page").ParseToInt(); + int page_size = RegexUtils.GetStringQuery(ref inputData, "page_size").ParseToInt(200); + + string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; + MysqlUtils mySql = new MysqlUtils(conn); + string sql = ""; + sql = "select count(*) from wxxd.express_optimize_rst where 1=1"; + + string where = ""; + if (order_ids != null) + where += " AND order_id in ('" + order_ids.Replace(",", "','") + "')"; + + sql += where; + + var count = 0; + count = mySql.ExecuteRowCount(sql); + + DataTable dt; + if (count == 0) + { + dt = new DataTable(); + } + else + { + sql = "select * from wxxd.express_optimize_rst where 1=1"; + sql += where; + sql += " order by id desc limit " + Math.Max(0, page - 1) * page_size + "," + page_size + ";"; + dt = mySql.ExecuteDataTable(sql); + } + mySql.Close(); + + if (!string.IsNullOrEmpty(mySql.Message)) + return "{\"code\":501,\"msg\":\"" + mySql.Message + "\"}"; + + if (dt != null) + { + try + { + List WxOptimizeRstInfoLst = new List(); + foreach (DataRow row in dt.Rows) + { + WxOptimizeRstInfoLst.Add(new WxOptimizeRstInfo() + { + id = row["id"].ParseToInt(), + waybill_id = row["waybill_id"].ParseToString(), + delivery_name = row["delivery_name"].ParseToString(), + order_id = row["order_id"].ParseToString(), + optimize_rst = row["optimize_rst"].ParseToString(), + shop_id = row["shop_id"].ParseToString(), + add_time = Convert.ToDateTime(row["add_time"]), + mdy_time = Convert.ToDateTime(row["mdy_time"]), + }); + } + JsonSerializerSettings jsonSetting = new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore }; + var data = JsonUtils.SerializeObjectToString(WxOptimizeRstInfoLst, jsonSetting); + var seconds = (DateTime.Now - timeCalc).TotalSeconds.ToString("0.000"); + return "{\"code\":200,\"msg\":\"success\",\"data\":" + data + ",\"count\":" + count + ",\"seconds\":" + seconds + "}"; + } + catch (Exception ex) + { + return "{\"code\":500,\"msg\":\"" + ex.Message + "\",\"data\":[],\"count\":" + 0 + "}"; + } + } + else + { + return "{\"code\":500,\"msg\":\"" + mySql.Message + "\",\"data\":[],\"count\":" + 0 + "}"; + } + } + return "{\"code\":19999,\"msg\":\"输入为空\"}"; + } + } +} \ No newline at end of file diff --git a/KJDService/KJD_WebService/BLL/WXXD/WXShopManage.cs b/KJDService/KJD_WebService/BLL/WXXD/WXShopManage.cs index caa208a..2d5ed4d 100644 --- a/KJDService/KJD_WebService/BLL/WXXD/WXShopManage.cs +++ b/KJDService/KJD_WebService/BLL/WXXD/WXShopManage.cs @@ -96,7 +96,7 @@ namespace KJD_Web.BLL.WXXD } else { - sql = "SELECT s.*,se.expire_time‌ FROM wxxd.shop s" + + sql = "SELECT s.*,se.user_points_expire_time‌ FROM wxxd.shop s" + " LEFT JOIN wxxd.shop_expire se ON s.shop_id=se.shop_id" + " WHERE 1=1"; sql += where; // where 子句 diff --git a/KJDService/KJD_WebService/BLL/WXXD/WXUserManage.cs b/KJDService/KJD_WebService/BLL/WXXD/WXUserManage.cs index 56a61b4..51ae904 100644 --- a/KJDService/KJD_WebService/BLL/WXXD/WXUserManage.cs +++ b/KJDService/KJD_WebService/BLL/WXXD/WXUserManage.cs @@ -16,7 +16,7 @@ namespace KJD_Web.BLL.WXXD { public class WXUserManage { - public static bool GetSign(string signData) + public static bool GetSign(string signData, bool isUserLogin = false) { if (string.IsNullOrEmpty(signData)) { return false; } @@ -25,6 +25,17 @@ namespace KJD_Web.BLL.WXXD string time1 = RegexUtils.GetStringQuery(ref signData, "code"); if (time1 != EncrypUtil.Encryption(time)) return false; + + if (!isUserLogin) + { + var user_name = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref signData, "user_name"))?.ParseToString(); + if (user_name.IsNullOrEmpty()) + { + //return "{\"code\":500,\"msg\":\"请输入用户名\"}"; + return false; + } + } + return true; } @@ -32,7 +43,7 @@ namespace KJD_Web.BLL.WXXD { if (!string.IsNullOrEmpty(inputData)) { - if (!GetSign(inputData)) + if (!GetSign(inputData, true)) return "{\"code\":999,\"msg\":\"校验失败\"}"; var mobile = RegexUtils.GetStringQuery(ref inputData, "mobile")?.Replace("'", "\\'"); diff --git a/KJDService/KJD_WebService/KJD_WebService.csproj b/KJDService/KJD_WebService/KJD_WebService.csproj index edbd917..4f62324 100644 --- a/KJDService/KJD_WebService/KJD_WebService.csproj +++ b/KJDService/KJD_WebService/KJD_WebService.csproj @@ -113,7 +113,7 @@ - + diff --git a/KJDService/KJD_WebService/Model/WxModel/WxOptimizeExpressInfo.cs b/KJDService/KJD_WebService/Model/WxModel/WxOptimizeExpressInfo.cs new file mode 100644 index 0000000..1bbb090 --- /dev/null +++ b/KJDService/KJD_WebService/Model/WxModel/WxOptimizeExpressInfo.cs @@ -0,0 +1,34 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; + +namespace KJD_Web.Model.WxModel +{ + public class WxOptimizeExpressInfo + { + public int id { get; set; } + public string delivery_id { get; set; } + public string delivery_name { get; set; } + public string waybill_id { get; set; } + public int status { get; set; } + public string order_id { get; set; } + public string bind_order_id { get; set; } + public string shop_id { get; set; } + public DateTime add_time { get; set; } + public DateTime? use_time { get; set; } + public DateTime? waybill_pickup_time { get; set; } + } + + public class WxOptimizeRstInfo + { + public int id { get; set; } + public string shop_id { get; set; } + public string order_id { get; set; } + public string optimize_rst { get; set; } + public string waybill_id { get; set; } + public string delivery_name { get; set; } + public DateTime add_time { get; set; } + public DateTime mdy_time { get; set; } + } +} \ No newline at end of file diff --git a/KJDService/KJD_WebService/Utils/Extension/Extension.Convert.cs b/KJDService/KJD_WebService/Utils/Extension/Extension.Convert.cs index b47e916..7eb1b74 100644 --- a/KJDService/KJD_WebService/Utils/Extension/Extension.Convert.cs +++ b/KJDService/KJD_WebService/Utils/Extension/Extension.Convert.cs @@ -345,6 +345,17 @@ namespace NaiBa.Util.Extension { return null; } + + try + { + return DateTime.Parse(str); + } + catch + { + } + + if (str.Contains("年") && str.Contains("月") && str.Contains("日") && !str.Contains("周")) + str = str.Replace("年", "-").Replace("月", "-").Replace("日", "").Replace("时", ":").Replace("分", ":").Replace("秒", "").Trim(' ', ':'); if (str.Contains("-") || str.Contains("/")) { return DateTime.Parse(str); @@ -485,6 +496,8 @@ namespace NaiBa.Util.Extension } else { + if (obj is DateTime) + return (obj as DateTime?).Value.ToString("yyyy-MM-dd HH:mm:ss"); return obj.ToString(); } } diff --git a/KJDService/KJD_WebService/WXShopService.asmx.cs b/KJDService/KJD_WebService/WXShopService.asmx.cs index ede60e1..b07e2a3 100644 --- a/KJDService/KJD_WebService/WXShopService.asmx.cs +++ b/KJDService/KJD_WebService/WXShopService.asmx.cs @@ -211,7 +211,7 @@ namespace KJD_Web string jsontext = GetRequestJsonString(); var result = jsontext; - result = new WXDeliveryManage().AddWaybill(jsontext); + result = new WXExpressOptimizeManage().AddWaybill(jsontext); Context.Response.Write(result); Context.Response.End(); @@ -222,7 +222,7 @@ namespace KJD_Web string jsontext = GetRequestJsonString(); var result = jsontext; - result = new WXDeliveryManage().DelWaybill(jsontext); + result = new WXExpressOptimizeManage().DelWaybill(jsontext); Context.Response.Write(result); Context.Response.End(); @@ -233,7 +233,7 @@ namespace KJD_Web string jsontext = GetRequestJsonString(); var result = jsontext; - result = new WXDeliveryManage().GetWayBill(jsontext); + result = new WXExpressOptimizeManage().GetWayBill(jsontext); Context.Response.Write(result); Context.Response.End(); @@ -244,7 +244,7 @@ namespace KJD_Web string jsontext = GetRequestJsonString(); var result = jsontext; - result = new WXDeliveryManage().GetWayBill(jsontext, true); + result = new WXExpressOptimizeManage().GetWayBill(jsontext, true); Context.Response.Write(result); Context.Response.End(); @@ -255,7 +255,7 @@ namespace KJD_Web string jsontext = GetRequestJsonString(); var result = jsontext; - result = new WXDeliveryManage().SelectAndSetWaybill(jsontext); + result = new WXExpressOptimizeManage().SelectAndSetWaybill(jsontext); Context.Response.Write(result); Context.Response.End(); @@ -266,7 +266,7 @@ namespace KJD_Web string jsontext = GetRequestJsonString(); var result = jsontext; - result = new WXDeliveryManage().SelectWaybill(jsontext); + result = new WXExpressOptimizeManage().SelectWaybill(jsontext); Context.Response.Write(result); Context.Response.End(); @@ -281,7 +281,31 @@ namespace KJD_Web string jsontext = GetRequestJsonString(); var result = jsontext; - result = new WXDeliveryManage().UpdateUsedWaybill(jsontext); + result = new WXExpressOptimizeManage().UpdateUsedWaybill(jsontext); + + Context.Response.Write(result); + Context.Response.End(); + } + + [WebMethod] + public void add_mdy_express_optimize_rst() + { + string jsontext = GetRequestJsonString(); + + var result = jsontext; + result = new WXExpressOptimizeManage().AddMdyExpressOptimizeRst(jsontext); + + Context.Response.Write(result); + Context.Response.End(); + } + + [WebMethod] + public void get_express_optimize_rst() + { + string jsontext = GetRequestJsonString(); + + var result = jsontext; + result = new WXExpressOptimizeManage().GetExpressOptimizeRst(jsontext); Context.Response.Write(result); Context.Response.End(); diff --git a/TEMUKJD/BLL/PDDProdFormConverter.cs b/TEMUKJD/BLL/PDDProdFormConverter.cs index a811dab..31837ab 100644 --- a/TEMUKJD/BLL/PDDProdFormConverter.cs +++ b/TEMUKJD/BLL/PDDProdFormConverter.cs @@ -659,6 +659,13 @@ namespace TemuKJD.BLL shipment_limit_second_list = null, sku69_code = "", }; + // 聚水潭广告sku价格为0库存不为零的给库存也改为0 + if (skuInfo.multi_price == 0) + { + skuInfo.quantity = 0; + skuInfo.quantity_delta = 0; + } + // 聚水潭供应商价加价10%（最低1元）赚取差价 int addPrice = (skuInfo.multi_price * 0.1).ParseToInt(); if (addPrice < 100) diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs index ccfd99b..d59a893 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs @@ -772,7 +772,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms "", "是", "否"}); - this.cmbPddRelation.Location = new System.Drawing.Point(743, 5); + this.cmbPddRelation.Location = new System.Drawing.Point(743, 7); this.cmbPddRelation.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbPddRelation.Name = "cmbPddRelation"; this.cmbPddRelation.Size = new System.Drawing.Size(47, 25); @@ -827,7 +827,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.cmbCat2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.cmbCat2.FormattingEnabled = true; - this.cmbCat2.Location = new System.Drawing.Point(278, 77); + this.cmbCat2.Location = new System.Drawing.Point(278, 75); this.cmbCat2.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbCat2.Name = "cmbCat2"; this.cmbCat2.Size = new System.Drawing.Size(46, 25); @@ -912,7 +912,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms "机会商品", "以图搜品", "外部数据"}); - this.cmbSourceType.Location = new System.Drawing.Point(278, 42); + this.cmbSourceType.Location = new System.Drawing.Point(278, 40); this.cmbSourceType.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbSourceType.Name = "cmbSourceType"; this.cmbSourceType.Size = new System.Drawing.Size(46, 25); @@ -958,7 +958,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms "", "是", "否"}); - this.cmbWxCat.Location = new System.Drawing.Point(622, 7); + this.cmbWxCat.Location = new System.Drawing.Point(622, 5); this.cmbWxCat.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbWxCat.Name = "cmbWxCat"; this.cmbWxCat.Size = new System.Drawing.Size(47, 25); @@ -980,7 +980,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.cmbSort.Items.AddRange(new object[] { "入库时间", "认领总数"}); - this.cmbSort.Location = new System.Drawing.Point(381, 42); + this.cmbSort.Location = new System.Drawing.Point(381, 40); this.cmbSort.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbSort.Name = "cmbSort"; this.cmbSort.Size = new System.Drawing.Size(46, 25); @@ -1056,7 +1056,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.cmbGroupFilter.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.cmbGroupFilter.FormattingEnabled = true; - this.cmbGroupFilter.Location = new System.Drawing.Point(175, 42); + this.cmbGroupFilter.Location = new System.Drawing.Point(175, 40); this.cmbGroupFilter.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbGroupFilter.Name = "cmbGroupFilter"; this.cmbGroupFilter.Size = new System.Drawing.Size(46, 25); @@ -1071,7 +1071,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms "是", "否", "导出未拉回"}); - this.cmbExportToOutServer.Location = new System.Drawing.Point(622, 42); + this.cmbExportToOutServer.Location = new System.Drawing.Point(622, 40); this.cmbExportToOutServer.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbExportToOutServer.Name = "cmbExportToOutServer"; this.cmbExportToOutServer.Size = new System.Drawing.Size(47, 25); @@ -1107,7 +1107,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms "安全商品", "违规商品", "未校验"}); - this.cmbWxSafe.Location = new System.Drawing.Point(501, 42); + this.cmbWxSafe.Location = new System.Drawing.Point(501, 40); this.cmbWxSafe.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbWxSafe.Name = "cmbWxSafe"; this.cmbWxSafe.Size = new System.Drawing.Size(47, 25); @@ -1149,7 +1149,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.cmbCat1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.cmbCat1.FormattingEnabled = true; - this.cmbCat1.Location = new System.Drawing.Point(175, 77); + this.cmbCat1.Location = new System.Drawing.Point(175, 75); this.cmbCat1.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbCat1.Name = "cmbCat1"; this.cmbCat1.Size = new System.Drawing.Size(46, 25); @@ -1171,7 +1171,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.cmbCat3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.cmbCat3.FormattingEnabled = true; - this.cmbCat3.Location = new System.Drawing.Point(381, 77); + this.cmbCat3.Location = new System.Drawing.Point(381, 75); this.cmbCat3.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbCat3.Name = "cmbCat3"; this.cmbCat3.Size = new System.Drawing.Size(46, 25); @@ -1268,7 +1268,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms "是", "否", "修复回传未拉回"}); - this.cmbHasReturn.Location = new System.Drawing.Point(743, 42); + this.cmbHasReturn.Location = new System.Drawing.Point(743, 40); this.cmbHasReturn.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbHasReturn.Name = "cmbHasReturn"; this.cmbHasReturn.Size = new System.Drawing.Size(47, 25); diff --git a/TEMUKJD/WXForms/AdminForms/WXWaybillManageForm.Designer.cs b/TEMUKJD/WXForms/AdminForms/WXWaybillManageForm.Designer.cs new file mode 100644 index 0000000..54495b9 --- /dev/null +++ b/TEMUKJD/WXForms/AdminForms/WXWaybillManageForm.Designer.cs @@ -0,0 +1,582 @@ + +namespace TemuKJD.WXForms.AdminForms +{ + partial class WXWaybillManageForm + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + 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.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WXWaybillManageForm)); + this.panel3 = new System.Windows.Forms.Panel(); + this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); + this.panel5 = new System.Windows.Forms.Panel(); + this.btnDel = new DevComponents.DotNetBar.PanelEx(); + this.panel4 = new System.Windows.Forms.Panel(); + this.comboBox1 = new System.Windows.Forms.ComboBox(); + this.btnImport = new DevComponents.DotNetBar.PanelEx(); + this.btnSearch = new DevComponents.DotNetBar.PanelEx(); + this.txtUserName = new System.Windows.Forms.TextBox(); + this.label5 = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + this.pnlEmpty = new DevComponents.DotNetBar.PanelEx(); + this.splitContainer2 = new System.Windows.Forms.SplitContainer(); + this.pbLoading = new System.Windows.Forms.PictureBox(); + this.dgvExpress = new TemuKJD.UserComponent.DataGridViewEx(); + this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); + this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.colDbId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDeliveryId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colBindOrderId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDeliveryName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colWaybillId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colWaybillPickupTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colStatus = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colOrderId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colUseTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colAddTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colMsg = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colTest = new System.Windows.Forms.DataGridViewLinkColumn(); + this.panel3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); + this.splitContainer1.Panel1.SuspendLayout(); + this.splitContainer1.Panel2.SuspendLayout(); + this.splitContainer1.SuspendLayout(); + this.tableLayoutPanel2.SuspendLayout(); + this.panel5.SuspendLayout(); + this.panel4.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit(); + this.splitContainer2.Panel1.SuspendLayout(); + this.splitContainer2.Panel2.SuspendLayout(); + this.splitContainer2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dgvExpress)).BeginInit(); + this.SuspendLayout(); + // + // panel3 + // + this.panel3.BackColor = System.Drawing.Color.White; + this.panel3.Controls.Add(this.splitContainer1); + this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel3.Location = new System.Drawing.Point(1, 33); + this.panel3.Name = "panel3"; + this.panel3.Size = new System.Drawing.Size(1208, 589); + this.panel3.TabIndex = 36; + // + // splitContainer1 + // + this.splitContainer1.BackColor = System.Drawing.Color.White; + this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; + this.splitContainer1.Location = new System.Drawing.Point(0, 0); + this.splitContainer1.Name = "splitContainer1"; + this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal; + // + // splitContainer1.Panel1 + // + this.splitContainer1.Panel1.Controls.Add(this.tableLayoutPanel2); + // + // splitContainer1.Panel2 + // + this.splitContainer1.Panel2.Controls.Add(this.splitContainer2); + this.splitContainer1.Panel2.Margin = new System.Windows.Forms.Padding(4); + this.splitContainer1.Size = new System.Drawing.Size(1208, 589); + this.splitContainer1.SplitterDistance = 72; + this.splitContainer1.TabIndex = 34; + // + // tableLayoutPanel2 + // + this.tableLayoutPanel2.ColumnCount = 2; + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel2.Controls.Add(this.panel5, 1, 0); + this.tableLayoutPanel2.Controls.Add(this.panel4, 0, 0); + this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 0); + this.tableLayoutPanel2.Name = "tableLayoutPanel2"; + this.tableLayoutPanel2.RowCount = 1; + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel2.Size = new System.Drawing.Size(1208, 72); + this.tableLayoutPanel2.TabIndex = 37; + // + // panel5 + // + this.panel5.Controls.Add(this.btnDel); + this.panel5.Location = new System.Drawing.Point(945, 3); + this.panel5.Name = "panel5"; + this.panel5.Size = new System.Drawing.Size(260, 66); + this.panel5.TabIndex = 1; + // + // btnDel + // + this.btnDel.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnDel.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnDel.DisabledBackColor = System.Drawing.Color.Empty; + this.btnDel.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnDel.Location = new System.Drawing.Point(161, 17); + this.btnDel.Name = "btnDel"; + this.btnDel.Size = new System.Drawing.Size(81, 23); + this.btnDel.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnDel.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnDel.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnDel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnDel.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnDel.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnDel.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnDel.Style.GradientAngle = 90; + this.btnDel.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnDel.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnDel.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnDel.TabIndex = 483; + this.btnDel.Text = "删除选中"; + this.btnDel.Click += new System.EventHandler(this.btnDel_Click); + // + // panel4 + // + this.panel4.Controls.Add(this.comboBox1); + this.panel4.Controls.Add(this.btnImport); + this.panel4.Controls.Add(this.btnSearch); + this.panel4.Controls.Add(this.txtUserName); + this.panel4.Controls.Add(this.label5); + this.panel4.Controls.Add(this.label1); + this.panel4.Controls.Add(this.pnlEmpty); + this.panel4.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel4.Location = new System.Drawing.Point(3, 3); + this.panel4.Name = "panel4"; + this.panel4.Size = new System.Drawing.Size(936, 66); + this.panel4.TabIndex = 0; + // + // comboBox1 + // + this.comboBox1.FormattingEnabled = true; + this.comboBox1.Items.AddRange(new object[] { + "", + "未使用", + "已使用"}); + this.comboBox1.Location = new System.Drawing.Point(377, 13); + this.comboBox1.Name = "comboBox1"; + this.comboBox1.Size = new System.Drawing.Size(127, 25); + this.comboBox1.TabIndex = 470; + this.comboBox1.Text = "未使用"; + this.comboBox1.Visible = false; + // + // btnImport + // + this.btnImport.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnImport.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnImport.DisabledBackColor = System.Drawing.Color.Empty; + this.btnImport.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnImport.Location = new System.Drawing.Point(14, 14); + this.btnImport.Name = "btnImport"; + this.btnImport.Size = new System.Drawing.Size(81, 23); + this.btnImport.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnImport.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnImport.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnImport.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnImport.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnImport.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnImport.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnImport.Style.GradientAngle = 90; + this.btnImport.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnImport.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnImport.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnImport.TabIndex = 469; + this.btnImport.Text = "批量导入"; + this.btnImport.Click += new System.EventHandler(this.btnImport_Click); + // + // btnSearch + // + this.btnSearch.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnSearch.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnSearch.DisabledBackColor = System.Drawing.Color.Empty; + this.btnSearch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnSearch.Location = new System.Drawing.Point(510, 14); + this.btnSearch.Name = "btnSearch"; + this.btnSearch.Size = new System.Drawing.Size(56, 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))))); + this.btnSearch.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnSearch.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnSearch.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnSearch.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnSearch.Style.GradientAngle = 90; + this.btnSearch.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnSearch.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnSearch.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnSearch.TabIndex = 449; + this.btnSearch.Text = "搜索"; + this.btnSearch.Visible = false; + this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click); + // + // txtUserName + // + this.txtUserName.Location = new System.Drawing.Point(187, 14); + this.txtUserName.Name = "txtUserName"; + this.txtUserName.Size = new System.Drawing.Size(127, 23); + this.txtUserName.TabIndex = 419; + this.txtUserName.Visible = false; + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(152, 17); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(44, 17); + this.label5.TabIndex = 420; + this.label5.Text = "账户："; + this.label5.Visible = false; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(318, 17); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(68, 17); + this.label1.TabIndex = 418; + this.label1.Text = "使用状态："; + this.label1.Visible = false; + // + // pnlEmpty + // + this.pnlEmpty.CanvasColor = System.Drawing.SystemColors.Control; + this.pnlEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.pnlEmpty.DisabledBackColor = System.Drawing.Color.Empty; + this.pnlEmpty.Location = new System.Drawing.Point(571, 14); + this.pnlEmpty.Name = "pnlEmpty"; + this.pnlEmpty.Size = new System.Drawing.Size(56, 23); + this.pnlEmpty.Style.Alignment = System.Drawing.StringAlignment.Center; + this.pnlEmpty.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.pnlEmpty.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.pnlEmpty.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.pnlEmpty.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.pnlEmpty.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.pnlEmpty.Style.GradientAngle = 90; + this.pnlEmpty.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; + this.pnlEmpty.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.pnlEmpty.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.pnlEmpty.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.pnlEmpty.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.pnlEmpty.TabIndex = 413; + this.pnlEmpty.Text = "清空条件"; + this.pnlEmpty.Visible = false; + // + // splitContainer2 + // + this.splitContainer2.BackColor = System.Drawing.Color.White; + this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer2.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; + this.splitContainer2.Location = new System.Drawing.Point(0, 0); + this.splitContainer2.Name = "splitContainer2"; + this.splitContainer2.Orientation = System.Windows.Forms.Orientation.Horizontal; + // + // splitContainer2.Panel1 + // + this.splitContainer2.Panel1.BackColor = System.Drawing.Color.White; + this.splitContainer2.Panel1.Controls.Add(this.pbLoading); + this.splitContainer2.Panel1.Controls.Add(this.dgvExpress); + this.splitContainer2.Panel1.Padding = new System.Windows.Forms.Padding(4, 0, 4, 0); + // + // splitContainer2.Panel2 + // + this.splitContainer2.Panel2.Controls.Add(this.ucSplitPage1); + this.splitContainer2.Panel2.Controls.Add(this.statusBar); + this.splitContainer2.Size = new System.Drawing.Size(1208, 513); + this.splitContainer2.SplitterDistance = 484; + this.splitContainer2.TabIndex = 0; + // + // pbLoading + // + this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None; + this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue; + this.pbLoading.Location = new System.Drawing.Point(579, 217); + this.pbLoading.Name = "pbLoading"; + this.pbLoading.Size = new System.Drawing.Size(50, 50); + this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pbLoading.TabIndex = 6; + this.pbLoading.TabStop = false; + // + // dgvExpress + // + this.dgvExpress.AllowUserToAddRows = false; + this.dgvExpress.AllowUserToDeleteRows = false; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvExpress.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + this.dgvExpress.AutoRowNumber = true; + this.dgvExpress.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dgvExpress.BackgroundColor = System.Drawing.Color.White; + this.dgvExpress.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.dgvExpress.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; + this.dgvExpress.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dgvExpress.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.colSelect, + this.colDbId, + this.colDeliveryId, + this.colBindOrderId, + this.colDeliveryName, + this.colWaybillId, + this.colWaybillPickupTime, + this.colStatus, + this.colOrderId, + this.colShopId, + this.colUseTime, + this.colAddTime, + this.colMsg, + this.colTest}); + this.dgvExpress.Dock = System.Windows.Forms.DockStyle.Fill; + this.dgvExpress.Location = new System.Drawing.Point(4, 0); + this.dgvExpress.MultiSelectCheckBox = true; + this.dgvExpress.Name = "dgvExpress"; + this.dgvExpress.ReadOnly = true; + this.dgvExpress.RowTemplate.Height = 23; + this.dgvExpress.ShowCellErrors = false; + this.dgvExpress.Size = new System.Drawing.Size(1200, 484); + this.dgvExpress.TabIndex = 5; + this.dgvExpress.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellContentClick); + // + // ucSplitPage1 + // + this.ucSplitPage1.CurrentPage = 1; + this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Right; + this.ucSplitPage1.IsShowPageSize = true; + this.ucSplitPage1.Location = new System.Drawing.Point(819, 0); + this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0); + this.ucSplitPage1.Name = "ucSplitPage1"; + this.ucSplitPage1.PageSize = 50; + this.ucSplitPage1.Size = new System.Drawing.Size(389, 25); + this.ucSplitPage1.TabIndex = 4; + this.ucSplitPage1.TotalPage = 1; + this.ucSplitPage1.PageChange += new System.Action(this.ucSplitPage1_PageChange); + this.ucSplitPage1.Load += new System.EventHandler(this.ucSplitPage1_Load); + // + // statusBar + // + this.statusBar.BackColor = System.Drawing.Color.White; + this.statusBar.Dock = System.Windows.Forms.DockStyle.Fill; + this.statusBar.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.statusBar.Location = new System.Drawing.Point(0, 0); + this.statusBar.Margin = new System.Windows.Forms.Padding(0); + this.statusBar.Name = "statusBar"; + this.statusBar.Size = new System.Drawing.Size(1208, 25); + this.statusBar.TabIndex = 1; + // + // colSelect + // + this.colSelect.FillWeight = 16F; + this.colSelect.HeaderText = "选"; + this.colSelect.Name = "colSelect"; + this.colSelect.ReadOnly = true; + this.colSelect.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colSelect.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + // + // colDbId + // + this.colDbId.FillWeight = 70F; + this.colDbId.HeaderText = "数据库Id"; + this.colDbId.Name = "colDbId"; + this.colDbId.ReadOnly = true; + this.colDbId.Visible = false; + // + // colDeliveryId + // + this.colDeliveryId.FillWeight = 70F; + this.colDeliveryId.HeaderText = "物流公司编号"; + this.colDeliveryId.Name = "colDeliveryId"; + this.colDeliveryId.ReadOnly = true; + // + // colBindOrderId + // + this.colBindOrderId.HeaderText = "绑定订单号"; + this.colBindOrderId.Name = "colBindOrderId"; + this.colBindOrderId.ReadOnly = true; + // + // colDeliveryName + // + this.colDeliveryName.FillWeight = 70F; + this.colDeliveryName.HeaderText = "物流公司名称"; + this.colDeliveryName.Name = "colDeliveryName"; + this.colDeliveryName.ReadOnly = true; + // + // colWaybillId + // + this.colWaybillId.FillWeight = 70F; + this.colWaybillId.HeaderText = "运单编号"; + this.colWaybillId.Name = "colWaybillId"; + this.colWaybillId.ReadOnly = true; + // + // colWaybillPickupTime + // + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colWaybillPickupTime.DefaultCellStyle = dataGridViewCellStyle3; + this.colWaybillPickupTime.FillWeight = 60F; + this.colWaybillPickupTime.HeaderText = "揽收时间"; + this.colWaybillPickupTime.Name = "colWaybillPickupTime"; + this.colWaybillPickupTime.ReadOnly = true; + // + // colStatus + // + this.colStatus.FillWeight = 40F; + this.colStatus.HeaderText = "使用状态"; + this.colStatus.Name = "colStatus"; + this.colStatus.ReadOnly = true; + // + // colOrderId + // + this.colOrderId.FillWeight = 70F; + this.colOrderId.HeaderText = "使用订单"; + this.colOrderId.Name = "colOrderId"; + this.colOrderId.ReadOnly = true; + this.colOrderId.Visible = false; + // + // colShopId + // + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.colShopId.DefaultCellStyle = dataGridViewCellStyle4; + this.colShopId.FillWeight = 70F; + this.colShopId.HeaderText = "使用店铺编号"; + this.colShopId.Name = "colShopId"; + this.colShopId.ReadOnly = true; + this.colShopId.Visible = false; + // + // colUseTime + // + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.colUseTime.DefaultCellStyle = dataGridViewCellStyle5; + this.colUseTime.FillWeight = 50F; + this.colUseTime.HeaderText = "使用时间"; + this.colUseTime.Name = "colUseTime"; + this.colUseTime.ReadOnly = true; + this.colUseTime.Visible = false; + // + // colAddTime + // + dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colAddTime.DefaultCellStyle = dataGridViewCellStyle6; + this.colAddTime.FillWeight = 50F; + this.colAddTime.HeaderText = "添加时间"; + this.colAddTime.Name = "colAddTime"; + this.colAddTime.ReadOnly = true; + // + // colMsg + // + this.colMsg.HeaderText = "操作结果"; + this.colMsg.Name = "colMsg"; + this.colMsg.ReadOnly = true; + // + // colTest + // + this.colTest.FillWeight = 38F; + this.colTest.HeaderText = "测试"; + this.colTest.Name = "colTest"; + this.colTest.ReadOnly = true; + this.colTest.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colTest.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colTest.Visible = false; + // + // WXWaybillManageForm + // + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; + this.ClientSize = new System.Drawing.Size(1210, 623); + this.Controls.Add(this.panel3); + this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.KeyPreview = true; + this.Name = "WXWaybillManageForm"; + this.Text = "运单管理"; + this.TitleText = "运单管理"; + this.Load += new System.EventHandler(this.WXWaybillManageForm_Load); + this.VisibleChanged += new System.EventHandler(this.WXWaybillManageForm_VisibleChanged); + this.Controls.SetChildIndex(this.panel3, 0); + this.panel3.ResumeLayout(false); + this.splitContainer1.Panel1.ResumeLayout(false); + this.splitContainer1.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); + this.splitContainer1.ResumeLayout(false); + this.tableLayoutPanel2.ResumeLayout(false); + this.panel5.ResumeLayout(false); + this.panel4.ResumeLayout(false); + this.panel4.PerformLayout(); + this.splitContainer2.Panel1.ResumeLayout(false); + this.splitContainer2.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit(); + this.splitContainer2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dgvExpress)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.Panel panel3; + private System.Windows.Forms.SplitContainer splitContainer1; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2; + private System.Windows.Forms.Panel panel4; + private DevComponents.DotNetBar.PanelEx btnSearch; + private System.Windows.Forms.TextBox txtUserName; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.Label label1; + private DevComponents.DotNetBar.PanelEx pnlEmpty; + private System.Windows.Forms.SplitContainer splitContainer2; + private System.Windows.Forms.PictureBox pbLoading; + private UserComponent.DataGridViewEx dgvExpress; + private UserControls.UcSplitPage ucSplitPage1; + private UserControls.StatusBarUserControl statusBar; + private System.Windows.Forms.Panel panel5; + private DevComponents.DotNetBar.PanelEx btnImport; + private System.Windows.Forms.ComboBox comboBox1; + private DevComponents.DotNetBar.PanelEx btnDel; + private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect; + private System.Windows.Forms.DataGridViewTextBoxColumn colDbId; + private System.Windows.Forms.DataGridViewTextBoxColumn colDeliveryId; + private System.Windows.Forms.DataGridViewTextBoxColumn colBindOrderId; + private System.Windows.Forms.DataGridViewTextBoxColumn colDeliveryName; + private System.Windows.Forms.DataGridViewTextBoxColumn colWaybillId; + private System.Windows.Forms.DataGridViewTextBoxColumn colWaybillPickupTime; + private System.Windows.Forms.DataGridViewTextBoxColumn colStatus; + private System.Windows.Forms.DataGridViewTextBoxColumn colOrderId; + private System.Windows.Forms.DataGridViewTextBoxColumn colShopId; + private System.Windows.Forms.DataGridViewTextBoxColumn colUseTime; + private System.Windows.Forms.DataGridViewTextBoxColumn colAddTime; + private System.Windows.Forms.DataGridViewTextBoxColumn colMsg; + private System.Windows.Forms.DataGridViewLinkColumn colTest; + } +} \ No newline at end of file diff --git a/TEMUKJD/WXForms/AdminForms/WXWaybillManageForm.cs b/TEMUKJD/WXForms/AdminForms/WXWaybillManageForm.cs new file mode 100644 index 0000000..ff1a190 --- /dev/null +++ b/TEMUKJD/WXForms/AdminForms/WXWaybillManageForm.cs @@ -0,0 +1,386 @@ +using AllBase; +using AllBase.Extension; +using AllBase.Model.Result.PDDResult; +using AllBase.Model.Result.WXResult; +using NaiBa.Util; +using NaiBa.Util.Extension; +using Newtonsoft.Json.Linq; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.IO; +using System.Linq; +using System.Text; +using System.Threading; +using System.Threading.Tasks; +using System.Windows.Forms; +using TemuKJD.BaseForms; +using TemuKJD.Extension; +using Work; + +namespace TemuKJD.WXForms.AdminForms +{ + public partial class WXWaybillManageForm : BaseForms.BaseGeneralForm + { + public ConcurrentList lstWxOptimizeExpressInfo = new ConcurrentList(); + + public WXWaybillManageForm() + { + InitializeComponent(); + } + + private void WXWaybillManageForm_Load(object sender, EventArgs e) + { + this.dgvExpress.AddSelectorColumn("colSelect"); + } + + private void dgvShop_CellContentClick(object sender, DataGridViewCellEventArgs e) + { + if (e.ColumnIndex < 0 || e.RowIndex < 0) + return; + string headerText = dgvExpress.Columns[e.ColumnIndex].HeaderText; + var dbId = dgvExpress.Rows[e.RowIndex].Cells["colDbId"].Value.ParseToString(); + var express = lstWxOptimizeExpressInfo.FirstOrDefault(p => p.id.ToString() == dbId); + + switch (headerText) + { + case "删除": + if (BaseMsgForm.ShowConfirm("确定删除商品吗？删除后不可恢复！").DialogResult == DialogResult.Cancel) + return; + //DeleteProduct(dbId); + break; + case "测试": + //this.lblExtCodePrice.Text = "调整货号 " + dgvDbProduct.Rows[e.RowIndex].Cells["col_ext_code"].Value.ParseToString() + " 价格"; + //this.lblExtCode.Text = dgvDbProduct.Rows[e.RowIndex].Cells["col_ext_code"].Value.ParseToString(); + //this.txtExtCodePrice.Text = dgvDbProduct.Rows[e.RowIndex].Cells["colExtCodePrice"].Value?.ParseToDecimal().ToString(); + //this.pnlEditExtCodePrice.Visible = true; + //SelectAndSetWaybill + + //var url = BaseClass.BuildObjString("shop/select_and_set_waybill"); + //var data = UserLogin.GetSignaturex() + + // "&shop_id=wx01"+ + // "&order_id=" + Randomx.GetId(100000,999999); + //var html = GetHtml.PostUtf8(url, data); + break; + case "": + dgvExpress.Rows[e.RowIndex].Cells["colSelect"].Value = !(bool)dgvExpress.Rows[e.RowIndex].Cells["colSelect"].Value; + + break; + default: + break; + } + } + + private void btnSearch_Click(object sender, EventArgs e) + { + GetDeliveryAndWaybill(); + } + + void GetDeliveryAndWaybill() + { + if (this.ucSplitPage1.CurrentPage != 1) + this.ucSplitPage1.CurrentPage = 1; + else + GetDeliveryAndWaybill(1); + } + + public void GetDeliveryAndWaybill(int page) + { + Invoke(new Action(() => + { + this.pbLoading.Visible = true; + this.dgvExpress.Rows.Clear(); + lstWxOptimizeExpressInfo.Clear(); + })); + Task.Run(() => + { + int pageCount; + int pageSize = 100; + decimal seconds; + Invoke(new Action(() => { pageSize = this.ucSplitPage1.PageSize; })); + var list = GetDeliveryAndWaybill(out pageCount, out seconds, page, pageSize); + lstWxOptimizeExpressInfo.AddRange(list); + this.ucSplitPage1.TotalPage = pageCount; + + foreach (var express in lstWxOptimizeExpressInfo) + { + Invoke(new Action(() => + { + int rowIndex = this.dgvExpress.Rows.Add( + false, + express.id, + express.delivery_id, + express.bind_order_id, + express.delivery_name, + express.waybill_id, + (express.waybill_pickup_time?.ToString("yyyy-MM-dd HH:mm")).ParseToString(), + express.status == 0 ? "未使用" : "已使用", + express.order_id, + express.shop_id, + express.use_time?.ToString("yyyy-MM-dd HH:mm"), // 使用时间 + express.add_time.ToString("yyyy-MM-dd HH:mm"), // 添加时间 + "", + "测试"); + + dgvExpress.Rows[rowIndex].Height = 60; + })); + } + + Invoke(new Action(() => + { + this.pbLoading.Visible = false; + this.statusBar.lblTaskStatus.Text = "运单号查询完毕"; +#if DEBUG + this.statusBar.lblTaskStatus.Text += "，耗时：" + seconds; +#endif + })); + }); + } + + + public List GetDeliveryAndWaybill(out int pageCount, out decimal seconds, int page = 1, int pageSize = 200) + { + List list = new List(); + pageCount = 1; + seconds = 0; + + var url = BaseClass.BuildObjString("shop/get_waybill"); + var data = ""; + + Invoke(new Action(() => + { + data = UserLogin.GetSignaturex() + + "&page=" + page + + "&page_size=" + pageSize; + if (!string.IsNullOrEmpty(comboBox1.Text.Trim())) + data += "&status=" + (comboBox1.Text.Trim() == "未使用" ? "0" : "1,2"); + })); + 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")) + { + Invoke(new Action(() => + { + BaseMsgForm.ShowError("运单列表获取失败，请重试！" + BaseRegex.GetStringJson(ref html, "msg")); + })); + return list; + } + + seconds = BaseRegex.GetDecimalJson(ref html, "seconds"); + int count = BaseRegex.GetIntJson(ref html, "count"); + pageCount = Math.Ceiling(1.0 * count / pageSize).ParseToInt(); + pageCount = Math.Max(pageCount, 1); + + var jArr = JObject.Parse(html)["data"]; + if (jArr.Count() == 0) + return list; + var sProd = JsonHelper.SerializeObject(jArr); + + try + { + list = JsonHelper.DeserializeJsonToList(sProd); + return list; + } + catch (Exception ex) + { + return new List(); + } + } + + private void ucSplitPage1_PageChange(object obj) + { + GetDeliveryAndWaybill(ucSplitPage1.CurrentPage); + } + + bool first = true; + private void WXWaybillManageForm_VisibleChanged(object sender, EventArgs e) + { + if (this.Visible == true && first) + { + first = false; + + this.pbLoading.Visible = true; + GetDeliveryAndWaybill(ucSplitPage1.CurrentPage); + } + } + + private void btnImport_Click(object sender, EventArgs e) + { + IsOperate = true; + ImportExpress(); + GetDeliveryAndWaybill(); + } + + public bool IsOperate = false; + void ImportExpress() + { + this.btnImport.Enabled = false; + string text = "运单号导入格式：\r\n\r\n1.物流公司名称 运单号码 揽收时间\r\n2.指定定单号 物流公司名称 运单号码 [揽收时间]\r\n\r\n多个运单号请每个新起一行。[]内容非必须"; + BaseMsgForm.ShowInfo(text, "", FormLevel.LARGE); + + OpenFileDialog openFileDialog = new OpenFileDialog(); + openFileDialog.Filter = "文本文件(*.txt)|*.txt"; + openFileDialog.RestoreDirectory = true; + openFileDialog.FilterIndex = 1; + if (openFileDialog.ShowDialog() == DialogResult.OK) + { + using (StreamReader sr = new StreamReader(openFileDialog.FileName, Work.Api.UploadPinduoduoMain.GetFileEncoding(openFileDialog.FileName))) + { + string fileName = openFileDialog.FileName; + string importStr = sr.ReadToEnd().Trim(); + var strArr = importStr.Replace("\r", "").Split('\n'); + string errMsg = ""; + for (int i = 0; i < strArr.Length; i++) + { + if (IsOperate == false) + break; + try + { + // 通用格式 + if (strArr[i].Contains(" ") || strArr[i].Contains("\t")) + { + WxOptimizeExpressInfo express = null; + var ExpressArr = strArr[i].Split(new string[] { " ", "\t" }, StringSplitOptions.RemoveEmptyEntries); + if (ExpressArr.Length > 2) + { + // 三个参数第一个是物流公司名称 + var deliveryName = ExpressArr[0]; + var deliverId = PddBuyerOrderInfoLite.GetWxExpressNameToWxExpressCode(deliveryName); + if (string.IsNullOrEmpty(deliverId)) + deliverId = PddBuyerOrderInfoLite.GetPddToWxExpressCompanyCode(deliveryName); + + // 四个参数或则第一个不是物流公司名称的情况下，第一个是订单号，第二个是物流公司名称 + if (string.IsNullOrEmpty(deliverId)) + { + deliveryName = ExpressArr[1]; + deliverId = PddBuyerOrderInfoLite.GetWxExpressNameToWxExpressCode(deliveryName); + if (string.IsNullOrEmpty(deliverId)) + deliverId = PddBuyerOrderInfoLite.GetPddToWxExpressCompanyCode(deliveryName); + if (deliverId.IsNullOrEmpty()) + { + errMsg += ", 运单信息不完整"; + continue; + } + + express = new WxOptimizeExpressInfo(); + express.waybill_id = ExpressArr[2]; + express.delivery_name = ExpressArr[1]; + express.bind_order_id = ExpressArr[0]; + express.delivery_id = deliverId; + if (ExpressArr.Length > 3) + { + express.waybill_pickup_time = ExpressArr[3].ParseToNullableDateTime(); + if (express.waybill_pickup_time == null) + { + errMsg += ", 运单" + express.waybill_id + "揽收时间格式不合法"; + continue; + } + } + } + else + { + express = new WxOptimizeExpressInfo(); + express.waybill_id = ExpressArr[1]; + express.delivery_name = ExpressArr[0]; + express.delivery_id = deliverId; + express.waybill_pickup_time = ExpressArr[2].ParseToNullableDateTime(); + + if(express.waybill_pickup_time == null) + { + errMsg += ", 运单" + express.waybill_id + "揽收时间格式不合法"; + continue; + } + } + + var url = BaseClass.BuildObjString("shop/add_waybill"); + var data = ""; + + Invoke(new Action(() => + { + data = UserLogin.GetSignaturex() + + "&delivery_id=" + express.delivery_id + + "&delivery_name=" + express.delivery_name + + "&waybill_id=" + express.waybill_id; + // 运单揽收时间 和 指定订单编号 必填其一 + if (express.waybill_pickup_time != null) + data += "&waybill_pickup_time=" + express.waybill_pickup_time.Value.ToString("yyyy-MM-dd HH:mm:ss"); + if (!express.bind_order_id.IsNullOrEmpty()) + data += "&bind_order_id=" + express.bind_order_id; + })); + var html = GetHtml.PostUtf8(url, data); + if (!html.ParseToString().Contains("运单号已存在") && (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))) + html = GetHtml.PostUtf8(url, data); + + if (!html.Contains("\"code\":200")) + { + errMsg += ", " + BaseRegex.GetStringJson(ref html, "msg"); + if (html.ParseToString().Contains("运单号已存在")) + errMsg += " " + express.waybill_id; + } + } + } + else + { + errMsg += ", 运单号信息缺失"; + } + } + catch (Exception ex) + { + } + } + if (!string.IsNullOrEmpty(errMsg.Trim(',', ' '))) + { + BaseMsgForm.ShowError(errMsg.Trim(',', ' '), "", FormLevel.LARGE); + } + } + } + IsOperate = false; + this.btnImport.Enabled = true; + } + + private void btnDel_Click(object sender, EventArgs e) + { + if (BaseMsgForm.ShowConfirm("确定删除运单号吗？删除后不可恢复！").DialogResult == DialogResult.Cancel) + return; + + var lstWaybillId = dgvExpress.Rows.Cast().Where(row + => row.Cells["colSelect"]?.Value.ParseToBool() == true).Select(r => r.Cells["colWaybillId"]?.Value.ToString()).ToList(); + var ExpressList = this.lstWxOptimizeExpressInfo.Where(p => lstWaybillId.Contains(p.waybill_id)).ToArray(); + + this.pbLoading.Visible = true; + //this.statusBar.pgbTaskProgress.Maximum = lstWaybillId.Count; + //this.statusBar.UpdateProgressBar(0); + Task.Run(() => + { + var url = BaseClass.BuildObjString("shop/del_waybill"); + var data = ""; + + Invoke(new Action(() => + { + data = UserLogin.GetSignaturex() + + "&waybill_ids=" + string.Join(",", lstWaybillId); + })); + var html = GetHtml.PostUtf8(url, data); + if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) + html = GetHtml.PostUtf8(url, data); + + GetDeliveryAndWaybill(this.ucSplitPage1.CurrentPage); + Invoke(new Action(() => + { + pbLoading.Visible = false; + BaseMsgForm.ShowInfo("删除完成！"); + })); + }); + } + + private void ucSplitPage1_Load(object sender, EventArgs e) + { + + } + } +} diff --git a/TEMUKJD/WXForms/AdminForms/WXWaybillManageForm.resx b/TEMUKJD/WXForms/AdminForms/WXWaybillManageForm.resx new file mode 100644 index 0000000..c649a5f --- /dev/null +++ b/TEMUKJD/WXForms/AdminForms/WXWaybillManageForm.resx @@ -0,0 +1,340 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + + + AAABAAEAgIAQAAAAAABoKAAAFgAAACgAAACAAAAAAAEAAAEABAAAAAAAACgAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAgICAAMDAwAAAAP8AAP8AAAD//wD/AAAA/wD/AP// + AAD///8AAAAAAAAAAAAAAAAzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMQ + AAAAAAAAAAAAAAAAAAAAAAAAABM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZkzEAAAAAAAAAAAAAAAAAAAAAADOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZMwAAAAAAAAAAAAAAAAAAABOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZkzAAAAAAAAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmTEAAAAAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAAAAAAAA5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAAAAAADmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAAAA5mZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAADmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAGZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAJmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZAAAAAA + OZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmT + AAAAAZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmRAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZkwAAAZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZkwAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZMAAJmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZEAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTADmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkwCZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkRmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZOZmZOZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmP+JmZmZmZmZj/////// + ///4OZmZj/eZmZmZmZmZmPg5OZmZmZuI//iIuZmZmZmZmZmZmZM5mZmZmZmZmZmZmb//+JmZmZmZmP// + //////////OZmP//uZmZmZmZmY//+ZmZOZf///////h5k5mZmZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZ + mZ/////////////4mZ///4mZmZmZmZP///uZmZmP////////+JmZmZmZmZmZkzmZmZmZmZmZmZmZj//4 + mZmZmZmf////////////+Jmf//+JmZmZmZmb///4mZmY//////////+JmZmZmZmZmZM5mZmZmZmZmZmZ + mY//+JmZmZmZn/////////////mZmP//iZmZmZmZk///+5mZj/////iP////+JmZmZmZmZmTOZmZmZmZ + mZmZmZmP//iZmZmZmZ////iIiIiIiIiZOZj//4mZmZmZmZP///uZmf////eZmT////+ZmZmZmZmZkzmZ + mZmZmZmZmZmZj//4mZmZmZmf//+JmZmZmZmZk5mY//+JmZmZmZmT///7mZj///+ZmZmZj///uZmZmZmZ + mZM5mZmZmZmZmZmZmY//+JmZmZmZn///iZmZmZmZmZmZmP//iZmZN5k5k///+5mY///zk5mZOT///4mZ + mZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZmZ///4mZmZmZmZmZmZj//4mZmP/5k5P///uZmP//+ZmZmZmY + //+JmZmZmZmZkzmZmZmZmZmZmZmZj//4mZmZmZmf///4iIiIiIg5mZmY//+JOb//+JmT///7mZj//4mZ + mZmZmP//+ZmZmZmZmZM5mZmZmZmZmZmZmY//+JmZmZmZn///////////85mZmP//iZn///+Jk///+5mf + //+JmZmZmZj///mZmZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZmZ////////////+ZmZj//4mY////85v/ + //uZmP//iZmZmZmY///5mZmZmZmZkzmZmZmZmZmZmZmZj//4mZmZmZmf////////////mZmY//+Jv/// + //+Z///7mZj//4mZmZmZmP//+ZmZmZmZmZM5mZmZmZmZmZmZmY//+JmZmZmZn///////////+JmZmP// + if//////if//+5mY//+JmZmZmZj///mZmZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZmZ///////////4mZ + mZj//4j///////j///uZmP//iZmZmZmY///5mZmZmZmZkzmZmZmZmZmZmZmZj//4mZmZmZmf//+JMzMz + MzOZOZmY//////+D///////7mZj//4mZmZmZmP//+ZmZmZmZmZM5mZmZmZmZmZmZmY//+JmZmZmZn/// + iZmZmZmZmZmZmP//////mY//////+5mY//+JmZmZmZj///mZmZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZ + mZ///4mZmZmZmZmZmZj/////+5mf//////uZmP//iZmZmZmY///5mZmZmZmZkzmZmZmZmZmZMzM5j//4 + kzMzmZmf//+JMzMzMzM5mZmY/////4mTk//////7mZj//4mZmZmZmP//+ZmZmZmZmZM5mZmZmZmZmP// + /////////4mZn////////////4mZmP////+ZmZmP////+5mY//+JmZmZmZj///mZmZmZmZmTOZmZmZmZ + mY/////////////4mZ/////////////7mZj////7mZmZn/////uZmP//iZmZmZmY///5mZmZmZmZkzmZ + mZmZmZn//////////////5mf////////////+Jmf////iZmZk5P////4mZ///4mZmZmZmP//+ZmZmZmZ + mZM5mZmZmZmZj/////////////iZn/////////////iZmP///5mZmZmZj///+5mY//+JmZmZmZj//4mZ + mZmZmZmTOZmZmZmZmZ/////////////zmZP///////////+JmZP///uTmZmZmZj//4mZm///mZmZmZmZ + //85mZmZmZmZkzmZmZmZmZOZiIiIiIiIiIiImTmZOIiIiIiIiIiImTmZOIi5mZmZmZOZiIuZmZk4iZOZ + mZmZOZiDmZmZmZmZmZM5mZmZmZmZOZmZmZmZmZmZmZOZmZmZmZmZmZmZmZOZmZmZmZmZmZmZOZmZmZmZ + mZk5mZmZmZOZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmTuIiIiIs5mZmZmZmZ + mTu4i7mZmZmZmZmZmTMzmZOZmZkzOZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmTmbj///////+HmT + mZmZk4j/////iJmZmZk4iP////iZOZmZj/mZOZOIiIiIiIiIiDmZmZmZmZmZkzmZmZmZmZmZj/////// + ///4mZk5k4///4iI///4OZOY////////iZOZmb/5mZmP///////////4mZmZmZmZmZM5mZmZmZmZn/// + //////////mZmY///5mZmZP///iZmP////////+ZOZk/iZmY/////////////4mZmZmZmZmTOZmZmZmZ + mZ/////////////5mZ////+JmZmY////iZl/////////+ZmZP4mZP//////////////7mZmZmZmZkzmZ + mZmZmZmb////////////uZP/j///+HM3j/////+ZmYj///////iZmT+JmY//////////////+JmZmZmZ + mZM5mZmZmZmZmY//////////+JmT+Jv///////////iPmTmZOI/4mP//uTk/iZmP//////////////iZ + mZmZmZmTOZmZmZmZmZmf//////////mZmZmZ///////////5mZmZmZmTOZk///mZP4mZj/////////// + ///4mZmZmZmZkzmZmZmZmZmTmP////////+JOZmZOY//////////iZmZmZmZmZk5mf/4mT+JmY////// + ////////+JmZmZmZmZM5mZmZmZmZmZn/////////mZmZmZk//////////zmZmZmZmZmZmTmP/zm/iZmP + //////////////iZmZmZmZmTOZmZmZmZmZk5v///////85OZmZkzmP////////iZmZmZmZmZmZmZn//4 + /4mZj/////hzN4/////4mZmZmZmZkzmZmZmZmZmZmZj//////4mZmTmY/4j////////4mZmZmZmZmZmZ + mZj///+JmY////+JmZmY////+JmZmZmZmZM5mZmZmZmZmZmZ//////+ZmZmZj////////////4mZmZmZ + mZmZmZmb////+ZmP///4mZu5mY////iZmZmZmZmTOZmZmZmZmZmZOb/////4k5mZmP/////////////7 + mZmZmZmZmZmZk/////OZv///+ZmP+Jmf///4mZmZmZmZkzmZmZmZmZmZmZmf////+ZmZmZj////////4 + eI//+JmZmZmZmZmZmZP////4mb///4mY//+JmP//+5mZmZmZmZM5mZmZmZmZmZk5v/////uTmZmb//// + ///4mZmX//iZmZmZmZmZmZmZ////+Jmf//95n///+Zj///OZmZmZmZmTOZmZmZmZmZmZmf//////mZmZ + mY//////+ZOZmZiJmZmZmZmZmZmZmY////+ZmP//+I////iP//+JmZmZmZmZkzmZmZmZmZmZmZj///// + /4mZmZmf/////5k5mZOZmTmZmZmZmZmZmZmP///4mZP/////////////OZmZmZmZmZM5mZmZmZmZmZk/ + ///////zmZmZm/////iZmZmZmZmZmZmZmZmZmZmZj///85mZj///////////+JmZmZmZmZmTOZmZmZmZ + mZmZv///////+5mZmZmP///5mZmZmZmZmZmZmZmZmZmZmZ///3mZmZj//////////4mZmZmZmZmZkzmZ + mZmZmZmZmb///4j///uZmZmZmP//mTmZmZmZmZmZmZmZmZmZmZmY/4OZmZmZeP///////4eZmZmZmZmZ + mZM5mZmZmZmZmZmY/4OZOP+JmZmZmZmIiZOZmZmZmZmZmZmZmZmZmZmZmYiZmZmZmZk4iIiIiIOZmZmZ + mZmZmZmTOZmZmZmZmZmZmTOZmZkzmZmZmZmZmZk5mZmZmZmZmZmZmZmZmZmZmZmZk5mZmZmZmZmZmZmZ + mZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmTGZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZkwmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZADmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZkwA5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZMACZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmQAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAABmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTAAADmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAJmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmRAAAAA5mZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAACZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmQAAAAAAGZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAOZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkwAAAAAA + AAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTAA + AAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZMAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZkwAAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmTAAAAAAAAAAAAAAGZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZEAAAAAAAAAAAAAAAA5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZMAAAAAAAAAAAAAAAAAATmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZMQAAAAAAAAAAAAAAAAAAABOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZMQAAAAAAAAAAAAAAAAAAAAAAAzmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTMAAAAAAAAAAAAAAAAAAAAAAAAAAAEzMzMzMzMzMzMzMzMzMz + MzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMxAAAAAAAAAAAAAAD////////////////////////4AAAA + AAAAAAAAAB//////wAAAAAAAAAAAAAAD/////wAAAAAAAAAAAAAAAP////wAAAAAAAAAAAAAAAA////w + AAAAAAAAAAAAAAAAD///4AAAAAAAAAAAAAAAAAf//8AAAAAAAAAAAAAAAAAD//+AAAAAAAAAAAAAAAAA + Af//AAAAAAAAAAAAAAAAAAD//gAAAAAAAAAAAAAAAAAAf/wAAAAAAAAAAAAAAAAAAD/4AAAAAAAAAAAA + AAAAAAAf+AAAAAAAAAAAAAAAAAAAH/AAAAAAAAAAAAAAAAAAAA/wAAAAAAAAAAAAAAAAAAAP4AAAAAAA + AAAAAAAAAAAAB+AAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAADwAAAAAAAAAAAAAAAAAAAA8AA + AAAAAAAAAAAAAAAAAAOAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA + AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA + AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA + AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA + AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA + AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA + AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA + AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA + AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA + AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA + AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA + AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA + AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA + AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA + AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA + AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA + AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA + AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA + AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA + AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA + AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA + AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA + AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA + AAAAAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAPAAAAAAAAAAAAAAAAAAAAD4AAAAAAAAAAAAAAAAAAAA+AA + AAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAH8AAAAAAAAAAAAAAAAAAAD/AAAAAAAAAAAAAAAAAA + AA/4AAAAAAAAAAAAAAAAAAAf/AAAAAAAAAAAAAAAAAAAH/wAAAAAAAAAAAAAAAAAAD/+AAAAAAAAAAAA + AAAAAAB//wAAAAAAAAAAAAAAAAAA//+AAAAAAAAAAAAAAAAAAf//wAAAAAAAAAAAAAAAAAP//+AAAAAA + AAAAAAAAAAAH///4AAAAAAAAAAAAAAAAD////AAAAAAAAAAAAAAAAD////8AAAAAAAAAAAAAAAD///// + wAAAAAAAAAAAAAAD//////wAAAAAAAAAAAAAH////////////////////////w== + + + \ No newline at end of file diff --git a/TEMUKJD/WXForms/ProductForms/WXUserProdListForm.Designer.cs b/TEMUKJD/WXForms/ProductForms/WXUserProdListForm.Designer.cs index 8fe73a0..fa314c7 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, 5); + this.cmbCat3.Location = new System.Drawing.Point(718, 7); 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, 5); + this.cmbCat2.Location = new System.Drawing.Point(515, 7); 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, 7); + this.cmbCat1.Location = new System.Drawing.Point(293, 5); 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, 42); + this.cmbWxSafe.Location = new System.Drawing.Point(71, 40); 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, 5); + this.cmbGroupFilter.Location = new System.Drawing.Point(938, 7); 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, 40); + this.cmbSourceType.Location = new System.Drawing.Point(718, 42); 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, 40); + this.cmbRelation.Location = new System.Drawing.Point(938, 42); 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.Designer.cs b/TEMUKJD/WXForms/ShopForms/WXShopForm.Designer.cs index c1d2b32..9bfa055 100644 --- a/TEMUKJD/WXForms/ShopForms/WXShopForm.Designer.cs +++ b/TEMUKJD/WXForms/ShopForms/WXShopForm.Designer.cs @@ -31,7 +31,7 @@ System.Windows.Forms.TreeNode treeNode1 = new System.Windows.Forms.TreeNode("店铺列表"); System.Windows.Forms.TreeNode treeNode2 = new System.Windows.Forms.TreeNode("子账号管理"); System.Windows.Forms.TreeNode treeNode3 = new System.Windows.Forms.TreeNode("店铺经营统计"); - System.Windows.Forms.TreeNode treeNode4 = new System.Windows.Forms.TreeNode("店铺优化"); + System.Windows.Forms.TreeNode treeNode4 = new System.Windows.Forms.TreeNode("评分考核"); System.Windows.Forms.TreeNode treeNode5 = new System.Windows.Forms.TreeNode("店铺管理", new System.Windows.Forms.TreeNode[] { treeNode1, treeNode2, @@ -133,8 +133,8 @@ treeNode2.Text = "子账号管理"; treeNode3.Name = "店铺经营统计"; treeNode3.Text = "店铺经营统计"; - treeNode4.Name = "店铺优化"; - treeNode4.Text = "店铺优化"; + treeNode4.Name = "评分考核"; + treeNode4.Text = "评分考核"; treeNode5.Name = "店铺管理"; treeNode5.Text = "店铺管理"; this.tv.Nodes.AddRange(new System.Windows.Forms.TreeNode[] { diff --git a/TEMUKJD/WXForms/ShopForms/WXShopForm.cs b/TEMUKJD/WXForms/ShopForms/WXShopForm.cs index e1a4bdf..8331dd3 100644 --- a/TEMUKJD/WXForms/ShopForms/WXShopForm.cs +++ b/TEMUKJD/WXForms/ShopForms/WXShopForm.cs @@ -34,12 +34,12 @@ namespace TemuKJD.WXForms.ShopForms tv.SelectedNode = tv.Nodes[0].Nodes[0]; tv.ExpandGroup(tv.Nodes[0].Name); - List hideName = new List() { "店铺优化", "子账号管理", "高级运费模板", "运费模板", "素材库管理", "订单金额统计", "工作明细统计", "店铺经营统计1" }; + List hideName = new List() { "评分考核", "子账号管理", "高级运费模板", "运费模板", "素材库管理", "订单金额统计", "工作明细统计", "店铺经营统计1" }; if (BaseClass.GroupId == 3) { hideName.Remove("子账号管理"); - hideName.Remove("店铺优化"); + hideName.Remove("评分考核"); } foreach (var item in hideName) @@ -74,7 +74,7 @@ namespace TemuKJD.WXForms.ShopForms case "店铺经营统计": SetForm(shopStatisticsForm.Value); break; - case "店铺优化": + case "评分考核": SetForm(shopOptimizeForm.Value); break; } diff --git a/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.Designer.cs b/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.Designer.cs index 2f4a1f0..689df09 100644 --- a/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.Designer.cs +++ b/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.Designer.cs @@ -36,19 +36,23 @@ namespace TemuKJD.WXForms.ShopForms 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 dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle 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 dataGridViewCellStyle40 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle41 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle42 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle43 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle44 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle45 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle46 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle47 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle(); @@ -59,18 +63,22 @@ 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 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(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle 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(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.ucGroupBoxEx3 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.btnWaybillManage = new DevComponents.DotNetBar.PanelEx(); @@ -116,22 +124,6 @@ namespace TemuKJD.WXForms.ShopForms this.panel1 = new System.Windows.Forms.Panel(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.dgvData1 = new TemuKJD.UserComponent.DataGridViewEx(); - this.colDgv1Check = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.colDgv1ShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colDgv1ShopName = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colDgv1ShopLogin = new System.Windows.Forms.DataGridViewLinkColumn(); - this.colDgv1InShop = new System.Windows.Forms.DataGridViewLinkColumn(); - this.colDgv1ImgUrl = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colDgv1Img = new System.Windows.Forms.DataGridViewImageColumn(); - this.colDgv1SpuId = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colDgv1ProductName = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colDgv1Spec = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colDgv1OutSn = 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(); @@ -140,28 +132,14 @@ namespace TemuKJD.WXForms.ShopForms this.mainPanel = new System.Windows.Forms.Panel(); this.pictureBox3 = new System.Windows.Forms.PictureBox(); this.dgvData3 = new TemuKJD.UserComponent.DataGridViewEx(); - this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - 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.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.tabPage5 = new System.Windows.Forms.TabPage(); + this.chkTestNoAuditUpload = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); + this.splitContainer3 = new System.Windows.Forms.SplitContainer(); this.colDgv4Check = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colDgv4ShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colDgv4ShopName = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -174,16 +152,34 @@ namespace TemuKJD.WXForms.ShopForms this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colDgv4OrderId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv4Address = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv4OrderTime = 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.colDgv4Addresses = 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(); - this.splitContainer3 = new System.Windows.Forms.SplitContainer(); + this.colDgv3Check = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + 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.colDgv3DraftId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv3ProductName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv3Spec = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv3ExtCode = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv3OrderId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv3Address = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv3OrderTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv3PayTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv3TakeTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv3Duration = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv3DeliveryName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv3OptimizeStatus = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv3Optimize = new System.Windows.Forms.DataGridViewLinkColumn(); this.colDgv2Check = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colDgv2ShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colDgv2ShopName = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -197,11 +193,30 @@ namespace TemuKJD.WXForms.ShopForms this.colDgv2SkuCode = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colDgv2EvaluationId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colDgv2OrderId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv2Address = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv2OrderTime = 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(); + this.colDgv1Check = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.colDgv1ShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv1ShopName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv1ShopLogin = new System.Windows.Forms.DataGridViewLinkColumn(); + this.colDgv1InShop = new System.Windows.Forms.DataGridViewLinkColumn(); + this.colDgv1ImgUrl = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv1Img = new System.Windows.Forms.DataGridViewImageColumn(); + this.colDgv1SpuId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv1ProductName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv1Spec = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv1OutSn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv1OrderId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv1Address = 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(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -969,6 +984,7 @@ namespace TemuKJD.WXForms.ShopForms this.colDgv1Spec, this.colDgv1OutSn, this.colDgv1OrderId, + this.colDgv1Address, this.colDgv1OrderTime, this.colDgv1AfterSaleReason, this.colDgv1OptimizeStatus, @@ -983,6 +999,823 @@ namespace TemuKJD.WXForms.ShopForms this.dgvData1.TabIndex = 187; this.dgvData1.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvData_CellContentClick); // + // 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(1408, 489); + this.tabPage2.TabIndex = 5; + this.tabPage2.Text = " 订单评价 "; + this.tabPage2.UseVisualStyleBackColor = true; + // + // panel2 + // + this.panel2.Controls.Add(this.pictureBox2); + this.panel2.Controls.Add(this.dgvData2); + this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; + 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(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(679, 219); + this.pictureBox2.Name = "pictureBox2"; + this.pictureBox2.Size = new System.Drawing.Size(50, 50); + this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pictureBox2.TabIndex = 780; + this.pictureBox2.TabStop = false; + this.pictureBox2.Visible = false; + // + // dgvData2 + // + this.dgvData2.AllowUserToAddRows = false; + this.dgvData2.AllowUserToDeleteRows = false; + dataGridViewCellStyle12.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvData2.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle12; + 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))))); + dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle13.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvData2.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle13; + this.dgvData2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dgvData2.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.colDgv2Check, + this.colDgv2ShopId, + this.colDgv2ShopName, + this.colDgv2Login, + this.colDgv2InShop, + this.colDgv2ImgUrl, + this.colDgv2Img, + this.colDgv2SpuId, + this.colDgv2ProductName, + this.colDgv2Spec, + this.colDgv2SkuCode, + this.colDgv2EvaluationId, + this.colDgv2OrderId, + this.colDgv2Address, + this.colDgv2OrderTime, + this.colDgv2UserNick, + this.colDgv2CommentTime, + 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(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(1408, 489); + this.tabPage3.TabIndex = 1; + this.tabPage3.Text = " 揽收不达标 "; + this.tabPage3.UseVisualStyleBackColor = true; + // + // mainPanel + // + this.mainPanel.Controls.Add(this.pictureBox3); + this.mainPanel.Controls.Add(this.dgvData3); + this.mainPanel.Dock = System.Windows.Forms.DockStyle.Fill; + 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(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(685, 219); + this.pictureBox3.Name = "pictureBox3"; + this.pictureBox3.Size = new System.Drawing.Size(50, 50); + this.pictureBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pictureBox3.TabIndex = 780; + this.pictureBox3.TabStop = false; + this.pictureBox3.Visible = false; + // + // dgvData3 + // + this.dgvData3.AllowUserToAddRows = false; + this.dgvData3.AllowUserToDeleteRows = false; + dataGridViewCellStyle23.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvData3.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle23; + 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))))); + dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle24.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle24.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle24.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle24.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle24.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvData3.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle24; + this.dgvData3.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dgvData3.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.colDgv3Check, + this.colDgv3ShopId, + this.colDgv3ShopName, + this.colDgv3Login, + this.colDgv3InShop, + this.colDgv3ImgUrl, + this.colDgv3Img, + this.colDgv3DraftId, + this.colDgv3ProductName, + this.colDgv3Spec, + this.colDgv3ExtCode, + this.colDgv3OrderId, + this.colDgv3Address, + this.colDgv3OrderTime, + this.colDgv3PayTime, + this.colDgv3TakeTime, + this.colDgv3Duration, + this.colDgv3DeliveryName, + 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(1408, 489); + this.dgvData3.TabIndex = 187; + this.dgvData3.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvData_CellContentClick); + // + // 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(1408, 489); + this.tabPage4.TabIndex = 2; + this.tabPage4.Text = " 配送不达标 "; + this.tabPage4.UseVisualStyleBackColor = true; + // + // panel3 + // + this.panel3.Controls.Add(this.pictureBox4); + this.panel3.Controls.Add(this.dgvData4); + this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; + 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(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(685, 219); + this.pictureBox4.Name = "pictureBox4"; + this.pictureBox4.Size = new System.Drawing.Size(50, 50); + this.pictureBox4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pictureBox4.TabIndex = 780; + this.pictureBox4.TabStop = false; + this.pictureBox4.Visible = false; + // + // dgvData4 + // + this.dgvData4.AllowUserToAddRows = false; + this.dgvData4.AllowUserToDeleteRows = false; + dataGridViewCellStyle35.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvData4.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle35; + 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))))); + dataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle36.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle36.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle36.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle36.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle36.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle36.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvData4.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle36; + this.dgvData4.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dgvData4.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.colDgv4Check, + this.colDgv4ShopId, + this.colDgv4ShopName, + this.colDgv4Login, + this.colDgv4InShop, + this.colDgv4ImgUrl, + this.colDgv4Img, + this.dataGridViewTextBoxColumn4, + this.dataGridViewTextBoxColumn5, + this.dataGridViewTextBoxColumn6, + this.dataGridViewTextBoxColumn7, + this.colDgv4OrderId, + this.colDgv4Address, + this.colDgv4OrderTime, + this.dataGridViewTextBoxColumn9, + this.dataGridViewTextBoxColumn10, + this.colDgv4Addresses, + 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(1408, 489); + this.dgvData4.TabIndex = 187; + this.dgvData4.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvData_CellContentClick); + // + // tabPage5 + // + this.tabPage5.Location = new System.Drawing.Point(2, 40); + this.tabPage5.Name = "tabPage5"; + this.tabPage5.Size = new System.Drawing.Size(1408, 489); + this.tabPage5.TabIndex = 3; + this.tabPage5.Text = " 物流负向反馈 "; + this.tabPage5.UseVisualStyleBackColor = true; + // + // chkTestNoAuditUpload + // + this.chkTestNoAuditUpload.AutoSize = true; + this.chkTestNoAuditUpload.Location = new System.Drawing.Point(1094, 35); + this.chkTestNoAuditUpload.Name = "chkTestNoAuditUpload"; + this.chkTestNoAuditUpload.Size = new System.Drawing.Size(123, 21); + this.chkTestNoAuditUpload.TabIndex = 779; + this.chkTestNoAuditUpload.Text = "测试免审提交商品"; + this.chkTestNoAuditUpload.UseVisualStyleBackColor = true; + this.chkTestNoAuditUpload.Visible = false; + // + // statusBar + // + this.statusBar.BackColor = System.Drawing.Color.White; + this.statusBar.Dock = System.Windows.Forms.DockStyle.Fill; + this.statusBar.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.statusBar.Location = new System.Drawing.Point(0, 0); + this.statusBar.Margin = new System.Windows.Forms.Padding(0); + this.statusBar.Name = "statusBar"; + this.statusBar.Size = new System.Drawing.Size(1772, 27); + this.statusBar.TabIndex = 2; + // + // splitContainer3 + // + this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer3.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; + this.splitContainer3.Location = new System.Drawing.Point(0, 0); + this.splitContainer3.Name = "splitContainer3"; + this.splitContainer3.Orientation = System.Windows.Forms.Orientation.Horizontal; + // + // splitContainer3.Panel1 + // + this.splitContainer3.Panel1.Controls.Add(this.splitContainer2); + // + // splitContainer3.Panel2 + // + this.splitContainer3.Panel2.Controls.Add(this.statusBar); + this.splitContainer3.Size = new System.Drawing.Size(1772, 564); + this.splitContainer3.SplitterDistance = 533; + this.splitContainer3.TabIndex = 3; + // + // colDgv4Check + // + this.colDgv4Check.Frozen = true; + this.colDgv4Check.HeaderText = "选择"; + this.colDgv4Check.Name = "colDgv4Check"; + this.colDgv4Check.ReadOnly = true; + this.colDgv4Check.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv4Check.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colDgv4Check.Width = 30; + // + // colDgv4ShopId + // + this.colDgv4ShopId.Frozen = true; + this.colDgv4ShopId.HeaderText = "店铺Id"; + this.colDgv4ShopId.Name = "colDgv4ShopId"; + this.colDgv4ShopId.ReadOnly = true; + this.colDgv4ShopId.Visible = false; + // + // colDgv4ShopName + // + dataGridViewCellStyle37.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv4ShopName.DefaultCellStyle = dataGridViewCellStyle37; + this.colDgv4ShopName.Frozen = true; + this.colDgv4ShopName.HeaderText = "店铺名称"; + this.colDgv4ShopName.Name = "colDgv4ShopName"; + this.colDgv4ShopName.ReadOnly = true; + // + // colDgv4Login + // + 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; + // + // colDgv4InShop + // + 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 + // + this.colDgv4ImgUrl.HeaderText = "图片地址"; + this.colDgv4ImgUrl.Name = "colDgv4ImgUrl"; + this.colDgv4ImgUrl.ReadOnly = true; + this.colDgv4ImgUrl.Visible = false; + // + // colDgv4Img + // + this.colDgv4Img.HeaderText = "图片"; + this.colDgv4Img.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Zoom; + this.colDgv4Img.Name = "colDgv4Img"; + this.colDgv4Img.ReadOnly = true; + this.colDgv4Img.Width = 60; + // + // dataGridViewTextBoxColumn4 + // + this.dataGridViewTextBoxColumn4.HeaderText = "商品Id"; + this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4"; + this.dataGridViewTextBoxColumn4.ReadOnly = true; + this.dataGridViewTextBoxColumn4.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewTextBoxColumn4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.dataGridViewTextBoxColumn4.Width = 110; + // + // dataGridViewTextBoxColumn5 + // + dataGridViewCellStyle38.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewTextBoxColumn5.DefaultCellStyle = dataGridViewCellStyle38; + this.dataGridViewTextBoxColumn5.HeaderText = "商品标题"; + this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5"; + this.dataGridViewTextBoxColumn5.ReadOnly = true; + this.dataGridViewTextBoxColumn5.Width = 160; + // + // dataGridViewTextBoxColumn6 + // + dataGridViewCellStyle39.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewTextBoxColumn6.DefaultCellStyle = dataGridViewCellStyle39; + this.dataGridViewTextBoxColumn6.HeaderText = "数量"; + this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6"; + this.dataGridViewTextBoxColumn6.ReadOnly = true; + this.dataGridViewTextBoxColumn6.Width = 40; + // + // dataGridViewTextBoxColumn7 + // + this.dataGridViewTextBoxColumn7.HeaderText = "sku货号"; + this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7"; + this.dataGridViewTextBoxColumn7.ReadOnly = true; + this.dataGridViewTextBoxColumn7.Visible = false; + this.dataGridViewTextBoxColumn7.Width = 140; + // + // colDgv4OrderId + // + dataGridViewCellStyle40.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv4OrderId.DefaultCellStyle = dataGridViewCellStyle40; + this.colDgv4OrderId.HeaderText = "单号"; + this.colDgv4OrderId.Name = "colDgv4OrderId"; + this.colDgv4OrderId.ReadOnly = true; + this.colDgv4OrderId.Width = 145; + // + // colDgv4Address + // + dataGridViewCellStyle41.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv4Address.DefaultCellStyle = dataGridViewCellStyle41; + this.colDgv4Address.HeaderText = "收货地址"; + this.colDgv4Address.Name = "colDgv4Address"; + this.colDgv4Address.ReadOnly = true; + // + // colDgv4OrderTime + // + dataGridViewCellStyle42.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv4OrderTime.DefaultCellStyle = dataGridViewCellStyle42; + this.colDgv4OrderTime.HeaderText = "下单时间"; + this.colDgv4OrderTime.Name = "colDgv4OrderTime"; + this.colDgv4OrderTime.ReadOnly = true; + this.colDgv4OrderTime.Width = 75; + // + // dataGridViewTextBoxColumn9 + // + dataGridViewCellStyle43.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewTextBoxColumn9.DefaultCellStyle = dataGridViewCellStyle43; + this.dataGridViewTextBoxColumn9.HeaderText = "物流公司"; + this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9"; + this.dataGridViewTextBoxColumn9.ReadOnly = true; + this.dataGridViewTextBoxColumn9.Width = 70; + // + // dataGridViewTextBoxColumn10 + // + dataGridViewCellStyle44.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewTextBoxColumn10.DefaultCellStyle = dataGridViewCellStyle44; + this.dataGridViewTextBoxColumn10.HeaderText = "揽收、签收时间"; + this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10"; + this.dataGridViewTextBoxColumn10.ReadOnly = true; + this.dataGridViewTextBoxColumn10.Width = 140; + // + // colDgv4Addresses + // + dataGridViewCellStyle45.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv4Addresses.DefaultCellStyle = dataGridViewCellStyle45; + this.colDgv4Addresses.HeaderText = "发货、收货地"; + this.colDgv4Addresses.Name = "colDgv4Addresses"; + this.colDgv4Addresses.ReadOnly = true; + this.colDgv4Addresses.Width = 110; + // + // dataGridViewTextBoxColumn12 + // + dataGridViewCellStyle46.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewTextBoxColumn12.DefaultCellStyle = dataGridViewCellStyle46; + this.dataGridViewTextBoxColumn12.HeaderText = "配送时长"; + this.dataGridViewTextBoxColumn12.Name = "dataGridViewTextBoxColumn12"; + this.dataGridViewTextBoxColumn12.ReadOnly = true; + this.dataGridViewTextBoxColumn12.Width = 80; + // + // colDgv4OptimizeStatus + // + dataGridViewCellStyle47.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv4OptimizeStatus.DefaultCellStyle = dataGridViewCellStyle47; + 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; + // + // colDgv3Check + // + this.colDgv3Check.Frozen = true; + this.colDgv3Check.HeaderText = "选择"; + this.colDgv3Check.Name = "colDgv3Check"; + this.colDgv3Check.ReadOnly = true; + this.colDgv3Check.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv3Check.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colDgv3Check.Width = 30; + // + // colDgv3ShopId + // + this.colDgv3ShopId.Frozen = true; + this.colDgv3ShopId.HeaderText = "店铺Id"; + this.colDgv3ShopId.Name = "colDgv3ShopId"; + this.colDgv3ShopId.ReadOnly = true; + this.colDgv3ShopId.Visible = false; + // + // colDgv3ShopName + // + dataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv3ShopName.DefaultCellStyle = dataGridViewCellStyle25; + this.colDgv3ShopName.Frozen = true; + this.colDgv3ShopName.HeaderText = "店铺名称"; + this.colDgv3ShopName.Name = "colDgv3ShopName"; + this.colDgv3ShopName.ReadOnly = true; + // + // colDgv3Login + // + 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; + // + // colDgv3InShop + // + 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; + // + // colDgv3ImgUrl + // + this.colDgv3ImgUrl.HeaderText = "图片地址"; + this.colDgv3ImgUrl.Name = "colDgv3ImgUrl"; + this.colDgv3ImgUrl.ReadOnly = true; + this.colDgv3ImgUrl.Visible = false; + // + // colDgv3Img + // + this.colDgv3Img.HeaderText = "图片"; + this.colDgv3Img.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Zoom; + this.colDgv3Img.Name = "colDgv3Img"; + this.colDgv3Img.ReadOnly = true; + this.colDgv3Img.Width = 60; + // + // colDgv3DraftId + // + this.colDgv3DraftId.HeaderText = "商品Id"; + this.colDgv3DraftId.Name = "colDgv3DraftId"; + this.colDgv3DraftId.ReadOnly = true; + this.colDgv3DraftId.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv3DraftId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.colDgv3DraftId.Width = 110; + // + // colDgv3ProductName + // + dataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv3ProductName.DefaultCellStyle = dataGridViewCellStyle26; + this.colDgv3ProductName.HeaderText = "商品标题"; + this.colDgv3ProductName.Name = "colDgv3ProductName"; + this.colDgv3ProductName.ReadOnly = true; + this.colDgv3ProductName.Width = 160; + // + // colDgv3Spec + // + dataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv3Spec.DefaultCellStyle = dataGridViewCellStyle27; + this.colDgv3Spec.HeaderText = "sku规格"; + this.colDgv3Spec.Name = "colDgv3Spec"; + this.colDgv3Spec.ReadOnly = true; + this.colDgv3Spec.Width = 130; + // + // colDgv3ExtCode + // + this.colDgv3ExtCode.HeaderText = "sku货号"; + this.colDgv3ExtCode.Name = "colDgv3ExtCode"; + this.colDgv3ExtCode.ReadOnly = true; + this.colDgv3ExtCode.Visible = false; + this.colDgv3ExtCode.Width = 145; + // + // colDgv3OrderId + // + dataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv3OrderId.DefaultCellStyle = dataGridViewCellStyle28; + this.colDgv3OrderId.HeaderText = "单号"; + this.colDgv3OrderId.Name = "colDgv3OrderId"; + this.colDgv3OrderId.ReadOnly = true; + this.colDgv3OrderId.Width = 145; + // + // colDgv3Address + // + dataGridViewCellStyle29.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv3Address.DefaultCellStyle = dataGridViewCellStyle29; + this.colDgv3Address.HeaderText = "收货地址"; + this.colDgv3Address.Name = "colDgv3Address"; + this.colDgv3Address.ReadOnly = true; + // + // colDgv3OrderTime + // + dataGridViewCellStyle30.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv3OrderTime.DefaultCellStyle = dataGridViewCellStyle30; + this.colDgv3OrderTime.HeaderText = "下单时间"; + this.colDgv3OrderTime.Name = "colDgv3OrderTime"; + this.colDgv3OrderTime.ReadOnly = true; + this.colDgv3OrderTime.Width = 75; + // + // colDgv3PayTime + // + dataGridViewCellStyle31.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv3PayTime.DefaultCellStyle = dataGridViewCellStyle31; + this.colDgv3PayTime.HeaderText = "支付时间"; + this.colDgv3PayTime.Name = "colDgv3PayTime"; + this.colDgv3PayTime.ReadOnly = true; + this.colDgv3PayTime.Width = 80; + // + // colDgv3TakeTime + // + dataGridViewCellStyle32.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv3TakeTime.DefaultCellStyle = dataGridViewCellStyle32; + this.colDgv3TakeTime.HeaderText = "揽收时间"; + this.colDgv3TakeTime.Name = "colDgv3TakeTime"; + this.colDgv3TakeTime.ReadOnly = true; + this.colDgv3TakeTime.Width = 80; + // + // colDgv3Duration + // + dataGridViewCellStyle33.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv3Duration.DefaultCellStyle = dataGridViewCellStyle33; + this.colDgv3Duration.HeaderText = "揽收时长"; + this.colDgv3Duration.Name = "colDgv3Duration"; + this.colDgv3Duration.ReadOnly = true; + this.colDgv3Duration.Width = 80; + // + // colDgv3DeliveryName + // + this.colDgv3DeliveryName.HeaderText = "物流公司"; + this.colDgv3DeliveryName.Name = "colDgv3DeliveryName"; + this.colDgv3DeliveryName.ReadOnly = true; + this.colDgv3DeliveryName.Width = 70; + // + // colDgv3OptimizeStatus + // + dataGridViewCellStyle34.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv3OptimizeStatus.DefaultCellStyle = dataGridViewCellStyle34; + 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; + // + // colDgv2Check + // + this.colDgv2Check.Frozen = true; + this.colDgv2Check.HeaderText = "选择"; + this.colDgv2Check.Name = "colDgv2Check"; + this.colDgv2Check.ReadOnly = true; + this.colDgv2Check.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv2Check.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colDgv2Check.Width = 30; + // + // colDgv2ShopId + // + this.colDgv2ShopId.Frozen = true; + this.colDgv2ShopId.HeaderText = "店铺Id"; + this.colDgv2ShopId.Name = "colDgv2ShopId"; + this.colDgv2ShopId.ReadOnly = true; + this.colDgv2ShopId.Visible = false; + // + // colDgv2ShopName + // + dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv2ShopName.DefaultCellStyle = dataGridViewCellStyle14; + this.colDgv2ShopName.Frozen = true; + this.colDgv2ShopName.HeaderText = "店铺名称"; + this.colDgv2ShopName.Name = "colDgv2ShopName"; + this.colDgv2ShopName.ReadOnly = true; + // + // colDgv2Login + // + this.colDgv2Login.HeaderText = "登录"; + this.colDgv2Login.Name = "colDgv2Login"; + this.colDgv2Login.ReadOnly = true; + this.colDgv2Login.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv2Login.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colDgv2Login.Visible = false; + this.colDgv2Login.Width = 40; + // + // colDgv2InShop + // + this.colDgv2InShop.HeaderText = "进店"; + this.colDgv2InShop.Name = "colDgv2InShop"; + this.colDgv2InShop.ReadOnly = true; + this.colDgv2InShop.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv2InShop.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colDgv2InShop.Visible = false; + this.colDgv2InShop.Width = 40; + // + // colDgv2ImgUrl + // + this.colDgv2ImgUrl.HeaderText = "图片地址"; + this.colDgv2ImgUrl.Name = "colDgv2ImgUrl"; + this.colDgv2ImgUrl.ReadOnly = true; + this.colDgv2ImgUrl.Visible = false; + // + // colDgv2Img + // + this.colDgv2Img.HeaderText = "图片"; + this.colDgv2Img.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Zoom; + this.colDgv2Img.Name = "colDgv2Img"; + this.colDgv2Img.ReadOnly = true; + this.colDgv2Img.Width = 60; + // + // colDgv2SpuId + // + this.colDgv2SpuId.HeaderText = "商品Id"; + this.colDgv2SpuId.Name = "colDgv2SpuId"; + this.colDgv2SpuId.ReadOnly = true; + this.colDgv2SpuId.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv2SpuId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.colDgv2SpuId.Width = 110; + // + // colDgv2ProductName + // + dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv2ProductName.DefaultCellStyle = dataGridViewCellStyle15; + this.colDgv2ProductName.HeaderText = "商品标题"; + this.colDgv2ProductName.Name = "colDgv2ProductName"; + this.colDgv2ProductName.ReadOnly = true; + this.colDgv2ProductName.Width = 160; + // + // colDgv2Spec + // + dataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv2Spec.DefaultCellStyle = dataGridViewCellStyle16; + this.colDgv2Spec.HeaderText = "商品规格"; + this.colDgv2Spec.Name = "colDgv2Spec"; + this.colDgv2Spec.ReadOnly = true; + this.colDgv2Spec.Width = 130; + // + // colDgv2SkuCode + // + this.colDgv2SkuCode.HeaderText = "sku编码"; + this.colDgv2SkuCode.Name = "colDgv2SkuCode"; + this.colDgv2SkuCode.ReadOnly = true; + this.colDgv2SkuCode.Visible = false; + this.colDgv2SkuCode.Width = 150; + // + // colDgv2EvaluationId + // + this.colDgv2EvaluationId.HeaderText = "评价编号"; + this.colDgv2EvaluationId.Name = "colDgv2EvaluationId"; + this.colDgv2EvaluationId.ReadOnly = true; + this.colDgv2EvaluationId.Visible = false; + // + // colDgv2OrderId + // + dataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv2OrderId.DefaultCellStyle = dataGridViewCellStyle17; + this.colDgv2OrderId.HeaderText = "对应订单编号"; + this.colDgv2OrderId.Name = "colDgv2OrderId"; + this.colDgv2OrderId.ReadOnly = true; + this.colDgv2OrderId.Width = 145; + // + // colDgv2Address + // + dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv2Address.DefaultCellStyle = dataGridViewCellStyle18; + this.colDgv2Address.HeaderText = "收货地址"; + this.colDgv2Address.Name = "colDgv2Address"; + this.colDgv2Address.ReadOnly = true; + // + // colDgv2OrderTime + // + dataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv2OrderTime.DefaultCellStyle = dataGridViewCellStyle19; + this.colDgv2OrderTime.HeaderText = "下单时间"; + this.colDgv2OrderTime.Name = "colDgv2OrderTime"; + this.colDgv2OrderTime.ReadOnly = true; + this.colDgv2OrderTime.Width = 75; + // + // colDgv2UserNick + // + this.colDgv2UserNick.HeaderText = "用户昵称"; + this.colDgv2UserNick.Name = "colDgv2UserNick"; + this.colDgv2UserNick.ReadOnly = true; + this.colDgv2UserNick.Width = 80; + // + // colDgv2CommentTime + // + dataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv2CommentTime.DefaultCellStyle = dataGridViewCellStyle20; + this.colDgv2CommentTime.HeaderText = "评价时间"; + this.colDgv2CommentTime.Name = "colDgv2CommentTime"; + this.colDgv2CommentTime.ReadOnly = true; + this.colDgv2CommentTime.Width = 75; + // + // colDgv2CommentContent + // + dataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv2CommentContent.DefaultCellStyle = dataGridViewCellStyle21; + this.colDgv2CommentContent.HeaderText = "评价内容"; + this.colDgv2CommentContent.Name = "colDgv2CommentContent"; + this.colDgv2CommentContent.ReadOnly = true; + this.colDgv2CommentContent.Width = 150; + // + // colDgv2OptimizeStatus + // + dataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv2OptimizeStatus.DefaultCellStyle = dataGridViewCellStyle22; + 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; + // // colDgv1Check // this.colDgv1Check.Frozen = true; @@ -998,6 +1831,7 @@ namespace TemuKJD.WXForms.ShopForms this.colDgv1ShopId.HeaderText = "店铺Id"; this.colDgv1ShopId.Name = "colDgv1ShopId"; this.colDgv1ShopId.ReadOnly = true; + this.colDgv1ShopId.Visible = false; // // colDgv1ShopName // @@ -1082,12 +1916,20 @@ namespace TemuKJD.WXForms.ShopForms this.colDgv1OrderId.HeaderText = "订单号"; this.colDgv1OrderId.Name = "colDgv1OrderId"; this.colDgv1OrderId.ReadOnly = true; - this.colDgv1OrderId.Width = 150; + this.colDgv1OrderId.Width = 145; + // + // colDgv1Address + // + dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv1Address.DefaultCellStyle = dataGridViewCellStyle8; + this.colDgv1Address.HeaderText = "收货地址"; + this.colDgv1Address.Name = "colDgv1Address"; + this.colDgv1Address.ReadOnly = true; // // colDgv1OrderTime // - dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv1OrderTime.DefaultCellStyle = dataGridViewCellStyle8; + dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv1OrderTime.DefaultCellStyle = dataGridViewCellStyle9; this.colDgv1OrderTime.HeaderText = "下单时间"; this.colDgv1OrderTime.Name = "colDgv1OrderTime"; this.colDgv1OrderTime.ReadOnly = true; @@ -1095,8 +1937,8 @@ namespace TemuKJD.WXForms.ShopForms // // colDgv1AfterSaleReason // - dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv1AfterSaleReason.DefaultCellStyle = dataGridViewCellStyle9; + dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv1AfterSaleReason.DefaultCellStyle = dataGridViewCellStyle10; this.colDgv1AfterSaleReason.HeaderText = "退款原因"; this.colDgv1AfterSaleReason.Name = "colDgv1AfterSaleReason"; this.colDgv1AfterSaleReason.ReadOnly = true; @@ -1104,774 +1946,20 @@ namespace TemuKJD.WXForms.ShopForms // // colDgv1OptimizeStatus // - dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv1OptimizeStatus.DefaultCellStyle = dataGridViewCellStyle10; - this.colDgv1OptimizeStatus.HeaderText = "优化状态"; + dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv1OptimizeStatus.DefaultCellStyle = dataGridViewCellStyle11; + this.colDgv1OptimizeStatus.HeaderText = "补发状态"; this.colDgv1OptimizeStatus.Name = "colDgv1OptimizeStatus"; this.colDgv1OptimizeStatus.ReadOnly = true; this.colDgv1OptimizeStatus.Width = 80; // // colDgv1Optimize // - this.colDgv1Optimize.HeaderText = "优化"; + 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(1408, 489); - this.tabPage2.TabIndex = 5; - this.tabPage2.Text = " 订单评价 "; - this.tabPage2.UseVisualStyleBackColor = true; - // - // panel2 - // - this.panel2.Controls.Add(this.pictureBox2); - this.panel2.Controls.Add(this.dgvData2); - this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; - 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(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(679, 219); - this.pictureBox2.Name = "pictureBox2"; - this.pictureBox2.Size = new System.Drawing.Size(50, 50); - this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.pictureBox2.TabIndex = 780; - this.pictureBox2.TabStop = false; - this.pictureBox2.Visible = false; - // - // dgvData2 - // - this.dgvData2.AllowUserToAddRows = false; - this.dgvData2.AllowUserToDeleteRows = false; - 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))))); - 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, - this.colDgv2ShopId, - this.colDgv2ShopName, - this.colDgv2Login, - this.colDgv2InShop, - this.colDgv2ImgUrl, - this.colDgv2Img, - this.colDgv2SpuId, - this.colDgv2ProductName, - this.colDgv2Spec, - this.colDgv2SkuCode, - this.colDgv2EvaluationId, - this.colDgv2OrderId, - this.colDgv2UserNick, - this.colDgv2CommentTime, - 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(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(1408, 489); - this.tabPage3.TabIndex = 1; - this.tabPage3.Text = " 揽收不达标 "; - this.tabPage3.UseVisualStyleBackColor = true; - // - // mainPanel - // - this.mainPanel.Controls.Add(this.pictureBox3); - this.mainPanel.Controls.Add(this.dgvData3); - this.mainPanel.Dock = System.Windows.Forms.DockStyle.Fill; - 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(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(685, 219); - this.pictureBox3.Name = "pictureBox3"; - this.pictureBox3.Size = new System.Drawing.Size(50, 50); - this.pictureBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.pictureBox3.TabIndex = 780; - this.pictureBox3.TabStop = false; - this.pictureBox3.Visible = false; - // - // dgvData3 - // - this.dgvData3.AllowUserToAddRows = false; - this.dgvData3.AllowUserToDeleteRows = false; - 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))))); - 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.colDgv3ShopId, - this.colDgv3ShopName, - this.colDgv3Login, - this.colDgv3InShop, - this.colDgv3ImgUrl, - this.colDgv3Img, - this.colDraftId, - this.colProductName, - this.colSpec, - this.colExtCode, - this.colDgv3OrderId, - this.colDeliveryName, - this.colPayTime, - this.colTakeTime, - 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(1408, 489); - this.dgvData3.TabIndex = 187; - this.dgvData3.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvData_CellContentClick); - // - // colCheck - // - this.colCheck.Frozen = true; - this.colCheck.HeaderText = "选择"; - this.colCheck.Name = "colCheck"; - this.colCheck.ReadOnly = true; - this.colCheck.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.colCheck.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colCheck.Width = 30; - // - // colDgv3ShopId - // - this.colDgv3ShopId.Frozen = true; - this.colDgv3ShopId.HeaderText = "店铺Id"; - this.colDgv3ShopId.Name = "colDgv3ShopId"; - this.colDgv3ShopId.ReadOnly = true; - // - // colDgv3ShopName - // - 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; - // - // colDgv3Login - // - 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; - // - // colDgv3InShop - // - 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; - // - // colDgv3ImgUrl - // - this.colDgv3ImgUrl.HeaderText = "图片地址"; - this.colDgv3ImgUrl.Name = "colDgv3ImgUrl"; - this.colDgv3ImgUrl.ReadOnly = true; - this.colDgv3ImgUrl.Visible = false; - // - // colDgv3Img - // - this.colDgv3Img.HeaderText = "图片"; - this.colDgv3Img.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Zoom; - this.colDgv3Img.Name = "colDgv3Img"; - this.colDgv3Img.ReadOnly = true; - this.colDgv3Img.Width = 60; - // - // colDraftId - // - this.colDraftId.HeaderText = "商品Id"; - this.colDraftId.Name = "colDraftId"; - this.colDraftId.ReadOnly = true; - this.colDraftId.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.colDraftId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.colDraftId.Width = 110; - // - // colProductName - // - dataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colProductName.DefaultCellStyle = dataGridViewCellStyle23; - this.colProductName.HeaderText = "商品标题"; - this.colProductName.Name = "colProductName"; - this.colProductName.ReadOnly = true; - this.colProductName.Width = 180; - // - // colSpec - // - dataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colSpec.DefaultCellStyle = dataGridViewCellStyle24; - this.colSpec.HeaderText = "sku规格"; - this.colSpec.Name = "colSpec"; - this.colSpec.ReadOnly = true; - this.colSpec.Width = 145; - // - // colExtCode - // - this.colExtCode.HeaderText = "sku货号"; - this.colExtCode.Name = "colExtCode"; - this.colExtCode.ReadOnly = true; - this.colExtCode.Visible = false; - this.colExtCode.Width = 145; - // - // colDgv3OrderId - // - 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 - // - this.colDeliveryName.HeaderText = "物流公司"; - this.colDeliveryName.Name = "colDeliveryName"; - this.colDeliveryName.ReadOnly = true; - this.colDeliveryName.Width = 75; - // - // colPayTime - // - dataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colPayTime.DefaultCellStyle = dataGridViewCellStyle26; - this.colPayTime.HeaderText = "支付时间"; - this.colPayTime.Name = "colPayTime"; - this.colPayTime.ReadOnly = true; - this.colPayTime.Width = 80; - // - // colTakeTime - // - dataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colTakeTime.DefaultCellStyle = dataGridViewCellStyle27; - this.colTakeTime.HeaderText = "揽收时间"; - this.colTakeTime.Name = "colTakeTime"; - this.colTakeTime.ReadOnly = true; - this.colTakeTime.Width = 80; - // - // colDuration - // - 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(1408, 489); - this.tabPage4.TabIndex = 2; - this.tabPage4.Text = " 配送不达标 "; - this.tabPage4.UseVisualStyleBackColor = true; - // - // panel3 - // - this.panel3.Controls.Add(this.pictureBox4); - this.panel3.Controls.Add(this.dgvData4); - this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; - 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(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(685, 219); - this.pictureBox4.Name = "pictureBox4"; - this.pictureBox4.Size = new System.Drawing.Size(50, 50); - this.pictureBox4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.pictureBox4.TabIndex = 780; - this.pictureBox4.TabStop = false; - this.pictureBox4.Visible = false; - // - // dgvData4 - // - this.dgvData4.AllowUserToAddRows = false; - this.dgvData4.AllowUserToDeleteRows = false; - 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))))); - 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.colDgv4ShopId, - this.colDgv4ShopName, - this.colDgv4Login, - this.colDgv4InShop, - this.colDgv4ImgUrl, - this.colDgv4Img, - this.dataGridViewTextBoxColumn4, - this.dataGridViewTextBoxColumn5, - this.dataGridViewTextBoxColumn6, - this.dataGridViewTextBoxColumn7, - this.colDgv4OrderId, - this.dataGridViewTextBoxColumn9, - this.dataGridViewTextBoxColumn10, - this.colDgv4Address, - 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(1408, 489); - this.dgvData4.TabIndex = 187; - this.dgvData4.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvData_CellContentClick); - // - // colDgv4Check - // - this.colDgv4Check.Frozen = true; - this.colDgv4Check.HeaderText = "选择"; - this.colDgv4Check.Name = "colDgv4Check"; - this.colDgv4Check.ReadOnly = true; - this.colDgv4Check.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv4Check.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colDgv4Check.Width = 30; - // - // colDgv4ShopId - // - this.colDgv4ShopId.Frozen = true; - this.colDgv4ShopId.HeaderText = "店铺Id"; - this.colDgv4ShopId.Name = "colDgv4ShopId"; - this.colDgv4ShopId.ReadOnly = true; - // - // colDgv4ShopName - // - 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; - // - // colDgv4Login - // - 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; - // - // colDgv4InShop - // - 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 - // - this.colDgv4ImgUrl.HeaderText = "图片地址"; - this.colDgv4ImgUrl.Name = "colDgv4ImgUrl"; - this.colDgv4ImgUrl.ReadOnly = true; - this.colDgv4ImgUrl.Visible = false; - // - // colDgv4Img - // - this.colDgv4Img.HeaderText = "图片"; - this.colDgv4Img.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Zoom; - this.colDgv4Img.Name = "colDgv4Img"; - this.colDgv4Img.ReadOnly = true; - this.colDgv4Img.Width = 60; - // - // dataGridViewTextBoxColumn4 - // - this.dataGridViewTextBoxColumn4.HeaderText = "商品Id"; - this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4"; - this.dataGridViewTextBoxColumn4.ReadOnly = true; - this.dataGridViewTextBoxColumn4.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridViewTextBoxColumn4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.dataGridViewTextBoxColumn4.Width = 110; - // - // dataGridViewTextBoxColumn5 - // - 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 = 180; - // - // dataGridViewTextBoxColumn6 - // - dataGridViewCellStyle34.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridViewTextBoxColumn6.DefaultCellStyle = dataGridViewCellStyle34; - this.dataGridViewTextBoxColumn6.HeaderText = "数量"; - this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6"; - this.dataGridViewTextBoxColumn6.ReadOnly = true; - this.dataGridViewTextBoxColumn6.Width = 45; - // - // dataGridViewTextBoxColumn7 - // - this.dataGridViewTextBoxColumn7.HeaderText = "sku货号"; - this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7"; - this.dataGridViewTextBoxColumn7.ReadOnly = true; - this.dataGridViewTextBoxColumn7.Visible = false; - this.dataGridViewTextBoxColumn7.Width = 145; - // - // colDgv4OrderId - // - 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 - // - this.dataGridViewTextBoxColumn9.HeaderText = "物流公司"; - this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9"; - this.dataGridViewTextBoxColumn9.ReadOnly = true; - this.dataGridViewTextBoxColumn9.Width = 75; - // - // dataGridViewTextBoxColumn10 - // - dataGridViewCellStyle36.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridViewTextBoxColumn10.DefaultCellStyle = dataGridViewCellStyle36; - this.dataGridViewTextBoxColumn10.HeaderText = "揽收、签收时间"; - this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10"; - this.dataGridViewTextBoxColumn10.ReadOnly = true; - this.dataGridViewTextBoxColumn10.Width = 160; - // - // colDgv4Address - // - dataGridViewCellStyle37.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv4Address.DefaultCellStyle = dataGridViewCellStyle37; - this.colDgv4Address.HeaderText = "发货、收货地"; - this.colDgv4Address.Name = "colDgv4Address"; - this.colDgv4Address.ReadOnly = true; - this.colDgv4Address.Width = 110; - // - // dataGridViewTextBoxColumn12 - // - dataGridViewCellStyle38.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridViewTextBoxColumn12.DefaultCellStyle = dataGridViewCellStyle38; - this.dataGridViewTextBoxColumn12.HeaderText = "配送时长"; - this.dataGridViewTextBoxColumn12.Name = "dataGridViewTextBoxColumn12"; - this.dataGridViewTextBoxColumn12.ReadOnly = true; - // - // 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(1408, 489); - this.tabPage5.TabIndex = 3; - this.tabPage5.Text = " 物流负向反馈 "; - this.tabPage5.UseVisualStyleBackColor = true; - // - // chkTestNoAuditUpload - // - this.chkTestNoAuditUpload.AutoSize = true; - this.chkTestNoAuditUpload.Location = new System.Drawing.Point(1094, 35); - this.chkTestNoAuditUpload.Name = "chkTestNoAuditUpload"; - this.chkTestNoAuditUpload.Size = new System.Drawing.Size(123, 21); - this.chkTestNoAuditUpload.TabIndex = 779; - this.chkTestNoAuditUpload.Text = "测试免审提交商品"; - this.chkTestNoAuditUpload.UseVisualStyleBackColor = true; - this.chkTestNoAuditUpload.Visible = false; - // - // statusBar - // - this.statusBar.BackColor = System.Drawing.Color.White; - this.statusBar.Dock = System.Windows.Forms.DockStyle.Fill; - this.statusBar.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.statusBar.Location = new System.Drawing.Point(0, 0); - this.statusBar.Margin = new System.Windows.Forms.Padding(0); - this.statusBar.Name = "statusBar"; - this.statusBar.Size = new System.Drawing.Size(1772, 27); - this.statusBar.TabIndex = 2; - // - // splitContainer3 - // - this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill; - this.splitContainer3.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; - this.splitContainer3.Location = new System.Drawing.Point(0, 0); - this.splitContainer3.Name = "splitContainer3"; - this.splitContainer3.Orientation = System.Windows.Forms.Orientation.Horizontal; - // - // splitContainer3.Panel1 - // - this.splitContainer3.Panel1.Controls.Add(this.splitContainer2); - // - // splitContainer3.Panel2 - // - this.splitContainer3.Panel2.Controls.Add(this.statusBar); - this.splitContainer3.Size = new System.Drawing.Size(1772, 564); - this.splitContainer3.SplitterDistance = 533; - this.splitContainer3.TabIndex = 3; - // - // colDgv2Check - // - this.colDgv2Check.Frozen = true; - this.colDgv2Check.HeaderText = "选择"; - this.colDgv2Check.Name = "colDgv2Check"; - this.colDgv2Check.ReadOnly = true; - this.colDgv2Check.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv2Check.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colDgv2Check.Width = 30; - // - // colDgv2ShopId - // - this.colDgv2ShopId.Frozen = true; - this.colDgv2ShopId.HeaderText = "店铺Id"; - this.colDgv2ShopId.Name = "colDgv2ShopId"; - this.colDgv2ShopId.ReadOnly = true; - // - // colDgv2ShopName - // - dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv2ShopName.DefaultCellStyle = dataGridViewCellStyle13; - this.colDgv2ShopName.Frozen = true; - this.colDgv2ShopName.HeaderText = "店铺名称"; - this.colDgv2ShopName.Name = "colDgv2ShopName"; - this.colDgv2ShopName.ReadOnly = true; - // - // colDgv2Login - // - this.colDgv2Login.HeaderText = "登录"; - this.colDgv2Login.Name = "colDgv2Login"; - this.colDgv2Login.ReadOnly = true; - this.colDgv2Login.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv2Login.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colDgv2Login.Visible = false; - this.colDgv2Login.Width = 40; - // - // colDgv2InShop - // - this.colDgv2InShop.HeaderText = "进店"; - this.colDgv2InShop.Name = "colDgv2InShop"; - this.colDgv2InShop.ReadOnly = true; - this.colDgv2InShop.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv2InShop.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colDgv2InShop.Visible = false; - this.colDgv2InShop.Width = 40; - // - // colDgv2ImgUrl - // - this.colDgv2ImgUrl.HeaderText = "图片地址"; - this.colDgv2ImgUrl.Name = "colDgv2ImgUrl"; - this.colDgv2ImgUrl.ReadOnly = true; - this.colDgv2ImgUrl.Visible = false; - // - // colDgv2Img - // - this.colDgv2Img.HeaderText = "图片"; - this.colDgv2Img.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Zoom; - this.colDgv2Img.Name = "colDgv2Img"; - this.colDgv2Img.ReadOnly = true; - this.colDgv2Img.Width = 60; - // - // colDgv2SpuId - // - this.colDgv2SpuId.HeaderText = "商品Id"; - this.colDgv2SpuId.Name = "colDgv2SpuId"; - this.colDgv2SpuId.ReadOnly = true; - this.colDgv2SpuId.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv2SpuId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.colDgv2SpuId.Width = 110; - // - // colDgv2ProductName - // - dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv2ProductName.DefaultCellStyle = dataGridViewCellStyle14; - this.colDgv2ProductName.HeaderText = "商品标题"; - this.colDgv2ProductName.Name = "colDgv2ProductName"; - this.colDgv2ProductName.ReadOnly = true; - this.colDgv2ProductName.Width = 180; - // - // colDgv2Spec - // - dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv2Spec.DefaultCellStyle = dataGridViewCellStyle15; - this.colDgv2Spec.HeaderText = "商品规格"; - this.colDgv2Spec.Name = "colDgv2Spec"; - this.colDgv2Spec.ReadOnly = true; - this.colDgv2Spec.Width = 145; - // - // colDgv2SkuCode - // - this.colDgv2SkuCode.HeaderText = "sku编码"; - this.colDgv2SkuCode.Name = "colDgv2SkuCode"; - this.colDgv2SkuCode.ReadOnly = true; - this.colDgv2SkuCode.Visible = false; - this.colDgv2SkuCode.Width = 150; - // - // colDgv2EvaluationId - // - this.colDgv2EvaluationId.HeaderText = "评价编号"; - this.colDgv2EvaluationId.Name = "colDgv2EvaluationId"; - 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 = "用户昵称"; - this.colDgv2UserNick.Name = "colDgv2UserNick"; - this.colDgv2UserNick.ReadOnly = true; - this.colDgv2UserNick.Width = 80; - // - // colDgv2CommentTime - // - dataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv2CommentTime.DefaultCellStyle = dataGridViewCellStyle17; - this.colDgv2CommentTime.HeaderText = "评价时间"; - this.colDgv2CommentTime.Name = "colDgv2CommentTime"; - this.colDgv2CommentTime.ReadOnly = true; - this.colDgv2CommentTime.Width = 75; - // - // colDgv2CommentContent - // - 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; @@ -1881,7 +1969,7 @@ namespace TemuKJD.WXForms.ShopForms this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.KeyPreview = true; this.Name = "WXShopOptimizeForm"; - 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); @@ -1987,42 +2075,6 @@ namespace TemuKJD.WXForms.ShopForms 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; @@ -2035,6 +2087,7 @@ namespace TemuKJD.WXForms.ShopForms private System.Windows.Forms.DataGridViewTextBoxColumn colDgv1Spec; private System.Windows.Forms.DataGridViewTextBoxColumn colDgv1OutSn; private System.Windows.Forms.DataGridViewTextBoxColumn colDgv1OrderId; + private System.Windows.Forms.DataGridViewTextBoxColumn colDgv1Address; private System.Windows.Forms.DataGridViewTextBoxColumn colDgv1OrderTime; private System.Windows.Forms.DataGridViewTextBoxColumn colDgv1AfterSaleReason; private System.Windows.Forms.DataGridViewTextBoxColumn colDgv1OptimizeStatus; @@ -2052,10 +2105,52 @@ namespace TemuKJD.WXForms.ShopForms private System.Windows.Forms.DataGridViewTextBoxColumn colDgv2SkuCode; private System.Windows.Forms.DataGridViewTextBoxColumn colDgv2EvaluationId; private System.Windows.Forms.DataGridViewTextBoxColumn colDgv2OrderId; + private System.Windows.Forms.DataGridViewTextBoxColumn colDgv2Address; + private System.Windows.Forms.DataGridViewTextBoxColumn colDgv2OrderTime; 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; + private System.Windows.Forms.DataGridViewCheckBoxColumn colDgv3Check; + 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 colDgv3DraftId; + private System.Windows.Forms.DataGridViewTextBoxColumn colDgv3ProductName; + private System.Windows.Forms.DataGridViewTextBoxColumn colDgv3Spec; + private System.Windows.Forms.DataGridViewTextBoxColumn colDgv3ExtCode; + private System.Windows.Forms.DataGridViewTextBoxColumn colDgv3OrderId; + private System.Windows.Forms.DataGridViewTextBoxColumn colDgv3Address; + private System.Windows.Forms.DataGridViewTextBoxColumn colDgv3OrderTime; + private System.Windows.Forms.DataGridViewTextBoxColumn colDgv3PayTime; + private System.Windows.Forms.DataGridViewTextBoxColumn colDgv3TakeTime; + private System.Windows.Forms.DataGridViewTextBoxColumn colDgv3Duration; + private System.Windows.Forms.DataGridViewTextBoxColumn colDgv3DeliveryName; + 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 colDgv4Address; + private System.Windows.Forms.DataGridViewTextBoxColumn colDgv4OrderTime; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn9; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn10; + private System.Windows.Forms.DataGridViewTextBoxColumn colDgv4Addresses; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn12; + private System.Windows.Forms.DataGridViewTextBoxColumn colDgv4OptimizeStatus; + private System.Windows.Forms.DataGridViewLinkColumn colDgv4Optimize; } } \ No newline at end of file diff --git a/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.cs b/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.cs index 7fe1f54..7405800 100644 --- a/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.cs +++ b/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.cs @@ -47,7 +47,7 @@ namespace TemuKJD.WXForms.ShopForms ConcurrentList lstWxOptimizeOrderAfterSaleInfo = new ConcurrentList(); ConcurrentList lstWxOptimizeProductEvaluationInfo = new ConcurrentList(); ConcurrentList lstWxOptimizeOrderWayBillInfo = new ConcurrentList(); // 揽收 - ConcurrentList lstWxOptrimizeLinerCgiInfo = new ConcurrentList(); // 物流 + ConcurrentList lstWxOptrimizeLinerCgiInfo = new ConcurrentList(); // 物流 public WXShopOptimizeForm() { @@ -70,8 +70,8 @@ namespace TemuKJD.WXForms.ShopForms dgvData1.AddImgColumn("colDgv1Img", "colDgv1ImgUrl"); dgvData2.AddSelectorColumn("colDgv2Check"); dgvData2.AddImgColumn("colDgv2Img", "colDgv2ImgUrl"); - dgvData3.AddSelectorColumn("colCheck"); - dgvData3.AddImgColumn("colImg", "colImgUrl"); + dgvData3.AddSelectorColumn("colDgv3Check"); + dgvData3.AddImgColumn("colDgv3Img", "colDgv3ImgUrl"); dgvData4.AddSelectorColumn("colDgv4Check"); dgvData4.AddImgColumn("colDgv4Img", "colDgv4ImgUrl"); @@ -482,15 +482,15 @@ namespace TemuKJD.WXForms.ShopForms { //this.statusBar.lblTaskStatus.Text = "品质退款查询完毕 " + this.statusBar.lblTaskStatus.Text; //BaseMsgForm.ShowInfo("品质退款查询完毕"); - this.statusBar.lblTaskStatus.Text = "优化数据查询中断 " + this.statusBar.lblTaskStatus.Text; - BaseMsgForm.ShowInfo("优化数据查询中断"); + this.statusBar.lblTaskStatus.Text = "数据查询中断 " + this.statusBar.lblTaskStatus.Text; + BaseMsgForm.ShowInfo("数据查询中断"); } else { //this.statusBar.lblTaskStatus.Text = "品质退款查询完毕"; //BaseMsgForm.ShowInfo("品质退款查询完毕"); - this.statusBar.lblTaskStatus.Text = "优化数据查询完毕"; - BaseMsgForm.ShowInfo("优化数据查询完毕"); + this.statusBar.lblTaskStatus.Text = "数据查询完毕"; + BaseMsgForm.ShowInfo("数据查询完毕"); } pictureBox1.Visible = false; pictureBox2.Visible = false; @@ -573,9 +573,53 @@ namespace TemuKJD.WXForms.ShopForms refundOrder.shopId = shop.ShopId; refundOrder.shopName = shop.ShopAccount; - lstWxOptimizeOrderAfterSaleInfo.Add(refundOrder); orderAfterSaleInfoLst.Add(refundOrder); - + } + + // 获取收货地址 + if (1==1) + { + var orderIds = string.Join(",", orderAfterSaleInfoLst.Select(a => a.orderInfo.orderId)); + var getOrderRst = ShopOptimize.orderSearchByOrderId(shop, orderIds); + Thread.Sleep(Randomx.GetId(200, 350)); + if (!getOrderRst.Contains("\"code\":0")) + { + var error = BaseRegex.GetStringJson(ref getOrderRst, "msg"); + if (string.IsNullOrEmpty(error)) + error = getOrderRst; + + foreach (var refundOrder in orderAfterSaleInfoLst) + { + refundOrder.province = "地址获取失败"; + } + } + else + { + try + { + var orderObj = JsonHelper.JObjectParse(getOrderRst)["orderList"]; + var wxOrderLst = JsonHelper.DeserializeJsonToList(JsonHelper.SerializeObject(orderObj)); + + foreach (var refundOrder in orderAfterSaleInfoLst) + { + var wxOrder = wxOrderLst.FirstOrDefault(o => o.commonInfo.orderId == refundOrder.orderInfo.orderId); + if (wxOrder != null) + { + refundOrder.orderTime = wxOrder.commonInfo.createTime; + refundOrder.province = wxOrder.acceptInfo.addressInfo.provinceName; + refundOrder.city = wxOrder.acceptInfo.addressInfo.cityName; + refundOrder.district = wxOrder.acceptInfo.addressInfo.countyName; + } + } + } + catch + { + foreach (var refundOrder in orderAfterSaleInfoLst) + { + refundOrder.province = "地址解析失败"; + } + } + } } // 查询是否被优化过 @@ -610,7 +654,7 @@ namespace TemuKJD.WXForms.ShopForms 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 = "已优化"; + orderAfterSale.optimizeWaybillId = "已补发"; } } catch (Exception ex) @@ -625,6 +669,11 @@ namespace TemuKJD.WXForms.ShopForms foreach (var refundOrder in orderAfterSaleInfoLst) { + if (CheckOrderExist(refundOrder.orderInfo.orderId)) + continue; + + lstWxOptimizeOrderAfterSaleInfo.Add(refundOrder); + Invoke(new Action(() => { var rowIndex = this.dgvData1.Rows.Add( @@ -640,10 +689,11 @@ namespace TemuKJD.WXForms.ShopForms refundOrder.orderInfo.skuName, refundOrder.orderInfo.skuCode, refundOrder.orderInfo.orderId, + refundOrder.province + refundOrder.city + refundOrder.district, BaseClass.StampToDateTime(refundOrder.orderInfo.createTime.ParseToInt()).ToString("yyyy-MM-dd HH:mm:ss"), refundOrder.reason, refundOrder.optimizeWaybillId + "\r\n" + refundOrder.optimizeTime, - "优化" + "补发" ); dgvData1.Rows[rowIndex].Height = 60; @@ -738,11 +788,10 @@ namespace TemuKJD.WXForms.ShopForms prodEvaluationInfo.shopId = shop.ShopId; 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); @@ -757,18 +806,28 @@ namespace TemuKJD.WXForms.ShopForms } else { - prodEvaluationInfo.order_id = ""; - while (getOrderRst.Contains("\"orderId\"")) + try { - prodEvaluationInfo.order_id += (" " + BaseRegex.GetStringJson(ref getOrderRst, "orderId")); - getOrderRst = getOrderRst.Substring(getOrderRst.IndexOf("\"orderId\"") + "\"orderId\"".Length); + prodEvaluationInfo.order_id = ""; + var orderObj = JsonHelper.JObjectParse(getOrderRst)["orderList"]; + var wxOrderLst = JsonHelper.DeserializeJsonToList(JsonHelper.SerializeObject(orderObj)); + if (wxOrderLst.Count == 0) + prodEvaluationInfo.order_id = "未获取到对应订单号"; + else if (wxOrderLst.Count > 1) + prodEvaluationInfo.order_id = string.Join(" ", wxOrderLst.Select(o => o.commonInfo.orderId)) + " 获取到多条订单号"; + else + { + prodEvaluationInfo.order_id = wxOrderLst.FirstOrDefault().commonInfo.orderId; + prodEvaluationInfo.orderTime = wxOrderLst.FirstOrDefault().commonInfo.createTime; + prodEvaluationInfo.province = wxOrderLst.FirstOrDefault().acceptInfo.addressInfo.provinceName; + prodEvaluationInfo.city = wxOrderLst.FirstOrDefault().acceptInfo.addressInfo.cityName; + prodEvaluationInfo.district = wxOrderLst.FirstOrDefault().acceptInfo.addressInfo.countyName; + } + } + catch + { + prodEvaluationInfo.order_id = "订单号转换失败"; } - prodEvaluationInfo.order_id = prodEvaluationInfo.order_id.Trim(' '); - if (prodEvaluationInfo.order_id.IsNullOrEmpty()) - prodEvaluationInfo.order_id = "未获取到对应订单号"; - - if (prodEvaluationInfo.order_id.Contains(" ")) - prodEvaluationInfo.order_id += " 获取到多条订单号"; } } @@ -804,7 +863,7 @@ namespace TemuKJD.WXForms.ShopForms 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 = "已优化"; + evaluationInfo.optimizeWaybillId = "已补发"; } } catch (Exception ex) @@ -819,6 +878,11 @@ namespace TemuKJD.WXForms.ShopForms foreach (var prodEvaluationInfo in productEvaluationInfoLst) { + if (CheckOrderExist(prodEvaluationInfo.order_id)) + continue; + + lstWxOptimizeProductEvaluationInfo.Add(prodEvaluationInfo); + var lblLst = prodEvaluationInfo.evaluationInfo?.firstEvaluationInfo?.buyerEvaluationInfo?.labelList; var content = prodEvaluationInfo.evaluationInfo.firstEvaluationInfo.buyerEvaluationInfo.content + " " + prodEvaluationInfo.evaluationInfo.firstEvaluationInfo.buyerEvaluationInfo.defaultContent; @@ -837,12 +901,14 @@ namespace TemuKJD.WXForms.ShopForms prodEvaluationInfo.productInfo.skuName, "", // spuCode 此处获取不到填空 prodEvaluationInfo.productEvaluationId, - prodEvaluationInfo.order_id, // orderId + prodEvaluationInfo.order_id, + prodEvaluationInfo.province + prodEvaluationInfo.city + prodEvaluationInfo.district, + prodEvaluationInfo.orderTime.IsNullOrZero() ? "" : BaseClass.StampToDateTime(prodEvaluationInfo.orderTime.ParseToInt()).ToString("yyyy-MM-dd HH:mm:ss"), 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(), prodEvaluationInfo.optimizeWaybillId + "\r\n" + prodEvaluationInfo.optimizeTime, - "优化" + "补发" ); dgvData2.Rows[rowIndex].Height = 60; @@ -980,6 +1046,52 @@ namespace TemuKJD.WXForms.ShopForms waybillLst.Add(orderWayBill); } + // 获取收货地址 + if (1 == 1) + { + var orderIds = string.Join(",", waybillLst.Select(a => a.orderInfo.orderId)); + var getOrderRst = ShopOptimize.orderSearchByOrderId(shop, orderIds); + Thread.Sleep(Randomx.GetId(200, 350)); + if (!getOrderRst.Contains("\"code\":0")) + { + var error = BaseRegex.GetStringJson(ref getOrderRst, "msg"); + if (string.IsNullOrEmpty(error)) + error = getOrderRst; + + foreach (var orderWaybill in waybillLst) + { + orderWaybill.province = "地址获取失败"; + } + } + else + { + try + { + var orderObj = JsonHelper.JObjectParse(getOrderRst)["orderList"]; + var wxOrderLst = JsonHelper.DeserializeJsonToList(JsonHelper.SerializeObject(orderObj)); + + foreach (var orderWaybill in waybillLst) + { + var wxOrder = wxOrderLst.FirstOrDefault(o => o.commonInfo.orderId == orderWaybill.orderInfo.orderId); + if (wxOrder != null) + { + orderWaybill.orderTime = wxOrder.commonInfo.createTime; + orderWaybill.province = wxOrder.acceptInfo.addressInfo.provinceName; + orderWaybill.city = wxOrder.acceptInfo.addressInfo.cityName; + orderWaybill.district = wxOrder.acceptInfo.addressInfo.countyName; + } + } + } + catch + { + foreach (var orderWaybill in waybillLst) + { + orderWaybill.province = "地址解析失败"; + } + } + } + } + // 查询是否被优化过 var url = BaseClass.BuildObjString("shop/get_waybill_no_user_name"); var data = ""; @@ -1012,7 +1124,7 @@ namespace TemuKJD.WXForms.ShopForms 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 = "已优化"; + orderWaybill.optimizeWaybillId = "已补发"; } } catch (Exception ex) @@ -1025,31 +1137,94 @@ namespace TemuKJD.WXForms.ShopForms } } + // 查询是否有失败记录 + url = BaseClass.BuildObjString("shop/get_express_optimize_rst"); + if (waybillLst.Select(w => w.orderInfo.orderId).Contains("3735310410457956864")) + { + + } + data = ""; + data = UserLogin.GetSignaturex(); + data += "&order_ids=" + string.Join(",", waybillLst.Select(w => w.orderInfo.orderId)); + 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) + { + if (orderWaybill.optimizeWaybillId.IsNullOrEmpty()) + { + 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) + { + if (orderWaybill.optimizeWaybillId.IsNullOrEmpty()) + { + var ov = optimizeLst.FirstOrDefault(o => o.order_id == orderWaybill.orderInfo.orderId); + if (ov != null) + { + orderWaybill.optimizeWaybillId = ov == null ? "" : ov.optimize_rst; + orderWaybill.optimizeTime = ov == null ? "" : ov?.mdy_time.ToString("yyyy-MM-dd HH:mm"); + } + } + } + } + catch (Exception ex) + { + foreach (var orderWaybill in waybillLst) + { + if (orderWaybill.optimizeWaybillId.IsNullOrEmpty()) + { + orderWaybill.optimizeWaybillId = "查询失败"; + orderWaybill.optimizeTime = ""; + } + } + } + } + foreach (var orderWaybill in waybillLst) { + if (CheckOrderExist(orderWaybill.orderInfo.orderId)) + continue; + 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() ? "" : ((orderWaybill.pickupDuration.ParseToInt() / 3600.0m).ToString("f2") + "小时" + "\r\n" + "[" + (is24 ? "次日" : "48小时") + "]"), - orderWaybill.optimizeWaybillId + "\r\n" + orderWaybill.optimizeTime, - "优化" - ); + 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.province + orderWaybill.city + orderWaybill.district, + orderWaybill.orderTime.IsNullOrZero() ? "" : BaseClass.StampToDateTime(orderWaybill.orderTime.ParseToInt()).ToString("yyyy-MM-dd HH:mm:ss"), + 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.delivery.deliveryName, + orderWaybill.optimizeWaybillId + "\r\n" + orderWaybill.optimizeTime, + "补发" + ); dgvData3.Rows[rowIndex].Height = 60; })); @@ -1159,19 +1334,63 @@ namespace TemuKJD.WXForms.ShopForms this.pictureBox4.Visible = true; this.statusBar.lblTaskStatus.Text = "正在查询配送不达标，店铺：" + shop.ShopAccount + " " + page + "/" + totalPage; })); - List optrimizeLinerCgiLst = new List(); + List optrimizeLinerCgiLst = new List(); foreach (JObject refundOrderObj in wayBillObjs["list"]) { var oStr = JsonHelper.SerializeObject(refundOrderObj); - var orderLinerCgiInfo = JsonHelper.DeserializeJsonToObject(oStr); + var orderLinerCgiInfo = JsonHelper.DeserializeJsonToObject(oStr); if (lstWxOptrimizeLinerCgiInfo.Any(o => o.order_id == orderLinerCgiInfo.order_id)) continue; orderLinerCgiInfo.shopId = shop.ShopId; orderLinerCgiInfo.shopName = shop.ShopAccount; optrimizeLinerCgiLst.Add(orderLinerCgiInfo); - lstWxOptrimizeLinerCgiInfo.Add(orderLinerCgiInfo); - + } + + // 获取收货地址 + if (1 == 1) + { + var orderIds = string.Join(",", optrimizeLinerCgiLst.Select(a => a.order_id)); + var getOrderRst = ShopOptimize.orderSearchByOrderId(shop, orderIds); + Thread.Sleep(Randomx.GetId(200, 350)); + if (!getOrderRst.Contains("\"code\":0")) + { + var error = BaseRegex.GetStringJson(ref getOrderRst, "msg"); + if (string.IsNullOrEmpty(error)) + error = getOrderRst; + + foreach (var linerCgi in optrimizeLinerCgiLst) + { + linerCgi.province = "地址获取失败"; + } + } + else + { + try + { + var orderObj = JsonHelper.JObjectParse(getOrderRst)["orderList"]; + var wxOrderLst = JsonHelper.DeserializeJsonToList(JsonHelper.SerializeObject(orderObj)); + + foreach (var linerCgi in optrimizeLinerCgiLst) + { + var wxOrder = wxOrderLst.FirstOrDefault(o => o.commonInfo.orderId == linerCgi.order_id); + if (wxOrder != null) + { + linerCgi.orderTime = wxOrder.commonInfo.createTime; + linerCgi.province = wxOrder.acceptInfo.addressInfo.provinceName; + linerCgi.city = wxOrder.acceptInfo.addressInfo.cityName; + linerCgi.district = wxOrder.acceptInfo.addressInfo.countyName; + } + } + } + catch + { + foreach (var linerCgi in optrimizeLinerCgiLst) + { + linerCgi.province = "地址解析失败"; + } + } + } } // 查询是否被优化过 @@ -1206,7 +1425,7 @@ namespace TemuKJD.WXForms.ShopForms 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 = "已优化"; + linerCgi.optimizeWaybillId = "已补发"; } } catch (Exception ex) @@ -1219,8 +1438,63 @@ namespace TemuKJD.WXForms.ShopForms } } + // 查询是否有失败记录 + url = BaseClass.BuildObjString("shop/get_express_optimize_rst"); + data = ""; + data = UserLogin.GetSignaturex(); + data += "&order_ids=" + string.Join(",", optrimizeLinerCgiLst.Select(w => w.order_id)); + 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) + { + if (linerCgi.optimizeWaybillId.IsNullOrEmpty()) + { + 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) + { + if (linerCgi.optimizeWaybillId.IsNullOrEmpty()) + { + var ov = optimizeLst.FirstOrDefault(o => o.order_id == linerCgi.order_id); + linerCgi.optimizeWaybillId = ov == null ? "" : ov.optimize_rst; + linerCgi.optimizeTime = ov == null ? "" : ov?.mdy_time.ToString("yyyy-MM-dd HH:mm"); + } + } + } + catch (Exception ex) + { + foreach (var linerCgi in optrimizeLinerCgiLst) + { + if (linerCgi.optimizeWaybillId.IsNullOrEmpty()) + { + linerCgi.optimizeWaybillId = "查询失败"; + linerCgi.optimizeTime = ""; + } + } + } + } + foreach (var orderLinerCgiInfo in optrimizeLinerCgiLst) { + if (CheckOrderExist(orderLinerCgiInfo.order_id)) + continue; + + lstWxOptrimizeLinerCgiInfo.Add(orderLinerCgiInfo); Invoke(new Action(() => { var rowIndex = this.dgvData4.Rows.Add( @@ -1235,14 +1509,16 @@ namespace TemuKJD.WXForms.ShopForms string.Join("\r\n", orderLinerCgiInfo.product_list.Select(p => p.title)), string.Join("\r\n", orderLinerCgiInfo.product_list.Select(p => "x" + p.product_count)), "", //skuCode不展示 - orderLinerCgiInfo.order_id + "\r\n" + orderLinerCgiInfo.waybill_id, + orderLinerCgiInfo.order_id, // + "\r\n" + orderLinerCgiInfo.waybill_id, + orderLinerCgiInfo.province + orderLinerCgiInfo.city + orderLinerCgiInfo.district, + orderLinerCgiInfo.orderTime.IsNullOrZero() ? "" : BaseClass.StampToDateTime(orderLinerCgiInfo.orderTime.ParseToInt()).ToString("yyyy-MM-dd HH:mm:ss"), + orderLinerCgiInfo.delivery_name, 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)*/ + (orderLinerCgiInfo.transport_duration.ParseToInt() / 3600) + "小时" + (orderLinerCgiInfo.transport_duration.ParseToInt() % 3600) / 60 + "分" + "\r\n标准时长" + (orderLinerCgiInfo.transport_std_duration.ParseToInt() / 3600) + "小时", orderLinerCgiInfo.optimizeWaybillId + "\r\n" + orderLinerCgiInfo.optimizeTime, - "优化" + "补发" ); dgvData4.Rows[rowIndex].Height = 60; @@ -1267,13 +1543,15 @@ namespace TemuKJD.WXForms.ShopForms cancellationTokenSource.Cancel(); } - public string OptimizeExpress(ShopLoginInfo shop, string orderId, string productEvaluationId = "") + public string OptimizeExpress(ShopLoginInfo shop, string orderId, string orderCreateTime = "") { var url = BaseClass.BuildObjString("shop/select_waybill"); var data = ""; data = UserLogin.GetSignaturex(); data += "&shop_id=" + shop.ShopId; data += "&order_id=" + orderId; + if (!orderCreateTime.IsNullOrEmpty()) + data += "&order_time=" + orderCreateTime; var html = GetHtml.PostUtf8(url, data); if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) @@ -1281,7 +1559,7 @@ namespace TemuKJD.WXForms.ShopForms if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) { var errMsg = BaseRegex.GetStringJson(ref html, "msg"); - return "优化失败 " + errMsg; + return "补发失败 " + errMsg; } var waybill_id = BaseRegex.GetStringJson(ref html, "waybill_id"); var delivery_id = BaseRegex.GetStringJson(ref html, "delivery_id"); @@ -1300,16 +1578,44 @@ namespace TemuKJD.WXForms.ShopForms 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; + string msg = ""; + string code = ""; + try + { + xmlDoc.LoadXml(optimizeExpressRst); //订单不存在，orderId:3735398415030708224500 + msg = xmlDoc["AjaxResult"]["msg"].InnerText; + code = xmlDoc["AjaxResult"]["code"].InnerText; + + // 记录一下优化结果 + url = BaseClass.BuildObjString("shop/add_mdy_express_optimize_rst"); + data = UserLogin.GetSignaturex(); + data += "&shop_id=" + shop.ShopId; + data += "&order_id=" + orderId; + if (msg.ParseToString().Contains("修改物流信息成功") || code == "200") + { + data += "&waybill_id=" + waybill_id; + data += "&delivery_name=" + delivery_name; + data += "&optimize_rst=补发成功"; + } + else + { + data += "&optimize_rst=" + (msg.IsNullOrEmpty() ? "补发失败" : msg); + } + + html = GetHtml.PostUtf8(url, data); + if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) + html = GetHtml.PostUtf8(url, data); + } + catch + { + } 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")) + if (!optimizeExpressRst.ParseToString().Contains("修改物流信息成功") && !optimizeExpressRst.ParseToString().Contains("200")) data += "&is_rollback=true"; html = GetHtml.PostUtf8(url, data); @@ -1320,14 +1626,14 @@ namespace TemuKJD.WXForms.ShopForms 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; + if (!optimizeExpressRst.ParseToString().Contains("修改物流信息成功") && !optimizeExpressRst.ParseToString().Contains("200")) + return "补发失败，还原失败\r\n" + errMsg + " " + msg; else - return "优化失败\r\n" + errMsg; + return "补发失败\r\n" + errMsg; } - if (!optimizeExpressRst.Contains("修改物流信息成功") && !optimizeExpressRst.Contains("200")) - return "优化失败，已回滚\r\n" + msg; - return "优化成功"; + if (!optimizeExpressRst.ParseToString().Contains("修改物流信息成功") && !optimizeExpressRst.ParseToString().Contains("200")) + return "补发失败，已还原\r\n" + msg; + return "补发成功"; } private void dgvData_CellContentClick(object sender, DataGridViewCellEventArgs e) @@ -1382,30 +1688,29 @@ namespace TemuKJD.WXForms.ShopForms imgFrom.ShowDialog(); break; } - case "优化": + case "补发": { var orderId = row.Cells[$"colDgv{dgvNum}OrderId"].Value.ParseToString(); if (orderId.Contains("未获取到对应订单号")) { - BaseMsgForm.ShowError("缺少单编号无法优化！"); + BaseMsgForm.ShowError("缺少单编号无法补发！"); return; } if (orderId.Contains("获取到多条订单号")) { - BaseMsgForm.ShowError("订单编号不符合优化条件！"); + BaseMsgForm.ShowError("订单编号不符合补发条件！"); return; } orderId = orderId.Split(new string[] { "\r", "\n" }, StringSplitOptions.RemoveEmptyEntries).FirstOrDefault(); if (!string.IsNullOrEmpty(orderId)) { - - var rst = OptimizeExpress(shop, orderId); + var rst = OptimizeExpress(shop, orderId, row.Cells[$"colDgv{dgvNum}OrderTime"].Value.ParseToString()); row.Cells[$"colDgv{dgvNum}OptimizeStatus"].Value = rst; } else { - BaseMsgForm.ShowError("缺少单编号无法优化！"); + BaseMsgForm.ShowError("缺少订单编号无法补发！"); } break; } @@ -1422,6 +1727,19 @@ namespace TemuKJD.WXForms.ShopForms WXWaybillManageForm waybillForm = new WXWaybillManageForm(); waybillForm.ShowDialog(); } + + public bool CheckOrderExist(string orderId) + { + if (lstWxOptimizeOrderAfterSaleInfo.Any(o => o.orderInfo.orderId == orderId)) + return true; + if (lstWxOptimizeProductEvaluationInfo.Any(o => o.order_id == orderId)) + return true; + if (lstWxOptimizeOrderWayBillInfo.Any(o => o.orderInfo.orderId == orderId)) + return true; + if (lstWxOptrimizeLinerCgiInfo.Any(o => o.order_id == orderId)) + return true; + return false; + } } public static class ShopOptimize @@ -1501,5 +1819,14 @@ namespace TemuKJD.WXForms.ShopForms var result = WXHttpResponseBLL.WeiXinPostResponse(shop, url, body, referer); return result; } + + public static string orderSearchByOrderId(ShopLoginInfo shop, string orderIds) + { + 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"":""" + orderIds + @""",""orderTime"":{""type"":0,""time"":[null,null]},""telNumber"":"""",""title"":"""",""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 b831660..d956041 100644 --- a/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.resx +++ b/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.resx @@ -189,6 +189,9 @@ True + + True + True @@ -240,6 +243,12 @@ True + + True + + + True + True @@ -255,7 +264,7 @@ True - + True @@ -276,31 +285,37 @@ True - + True - + True - + True - + True True - + True - + True - + True - + + True + + + True + + True @@ -345,13 +360,19 @@ True + + True + + + True + True True - + True diff --git a/TEMUKJD/WXForms/TalkForms/BuyerOrderListForm.cs b/TEMUKJD/WXForms/TalkForms/BuyerOrderListForm.cs index f9ecab2..e2b5c60 100644 --- a/TEMUKJD/WXForms/TalkForms/BuyerOrderListForm.cs +++ b/TEMUKJD/WXForms/TalkForms/BuyerOrderListForm.cs @@ -1306,8 +1306,18 @@ namespace TemuKJD.WXForms.TalkForms } } + bool isSendOrderE57 = false; public void SendOrderE57(PddBuyerOrderInfoLite order, bool resetSendStatus = false) { + if (resetSendStatus == true) + { + // 防止重复点击发送按钮 + if (isSendOrderE57) + return; + isSendOrderE57 = true; + Task.Run(() => { Thread.Sleep(2500); isSendOrderE57 = false; }); + } + if (order == null) return; if (resetSendStatus) @@ -1339,7 +1349,7 @@ namespace TemuKJD.WXForms.TalkForms // 外采订单已发货的订单不再尝试发货 //if (order.sendStatus == "已发送") // return; - if (order.sendStatus.Contains("外采订单已发货")) + if (order.sendStatus.Contains("外采订单已发货") || order.sendStatus.Contains("更新外采订单微信发货成功")) { Invoke(new Action(() => { @@ -1363,15 +1373,26 @@ namespace TemuKJD.WXForms.TalkForms var exportRst = WXHttpResponseBLL.e57PostResponse(url, dataStr, ""); for (int i = 0; i < 5 && exportRst.Contains("操作超时"); i++) { - Thread.Sleep(2000); + Thread.Sleep(3000); WXHttpResponseBLL.e57PostResponse(url, dataStr, ""); } + if (exportRst.Contains("操作超时")) + { + order.sendStatus = "发送失败 操作超时"; + NaiBa.Util.Helper.ConfigHelper.SaveConfig("pdd_buyer_order_list", lstPddBuyerOrderInfoLite); + Invoke(new Action(() => + { + ShowOrder(order); + })); + return; + } // exportRst.Contains("已存在") || exportRst.Contains("同运单号拦截") || exportRst.Contains("订单已绑定外采订单") System.Xml.XmlDocument xmlDoc = new System.Xml.XmlDocument(); xmlDoc.LoadXml(exportRst); //1505不支持的平台类型: WEISHOP string msg = xmlDoc["ResultVo"]["msg"].InnerText; string data = xmlDoc["ResultVo"]["data"].InnerText; - if (msg == "SUCCESS") + string code = xmlDoc["ResultVo"]["code"].InnerText; + if (code == "0" || msg == "SUCCESS") //if (msg == "SUCCESS") { order.sendStatus = string.IsNullOrEmpty(data) ? msg : data; if (order.sendStatus == "更新微信外采订单状态成功")