diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs index cca726a..8dd1e06 100644 --- a/AllBase/BaseClass.cs +++ b/AllBase/BaseClass.cs @@ -31,7 +31,7 @@ namespace AllBase /// /// 版本ID /// - public static int VersionCount = 1250; + public static int VersionCount = 1256; public static string MainPath = "29wx"; //public static string MainPath = "29wx"; //public static string MainPath = "29pdd"; diff --git a/KJDService/KJD_WebService/BLL/BXX/BXXProductManage.cs b/KJDService/KJD_WebService/BLL/BXX/BXXProductManage.cs index e383073..db25511 100644 --- a/KJDService/KJD_WebService/BLL/BXX/BXXProductManage.cs +++ b/KJDService/KJD_WebService/BLL/BXX/BXXProductManage.cs @@ -1562,6 +1562,193 @@ namespace KJD_Web.BLL.BXX return "{\"code\":19999,\"msg\":\"输入为空\"}"; } + public string GetProductNotes(string inputData) + { + if (!string.IsNullOrEmpty(inputData)) + { + var time = RegexUtils.GetStringQuery(ref inputData, "time").ParseToInt(); + string time1 = RegexUtils.GetStringQuery(ref inputData, "code"); + if (time1 != EncrypUtil.Encryption(time)) + return "{\"code\":50000,\"msg\":\"校验失败\"}"; + + var user_name = RegexUtils.GetStringQuery(ref inputData, "user_name")?.Replace("'", "\\'"); + if (string.IsNullOrEmpty(user_name)) + { + return "{\"code\":50001,\"msg\":\"没有用户名\"}"; + } + + int page = RegexUtils.GetStringQuery(ref inputData, "page").ParseToInt(); + int page_size = RegexUtils.GetStringQuery(ref inputData, "page_size").ParseToInt(200); + var add_user_name = RegexUtils.GetStringQuery(ref inputData, "add_user_name")?.Replace("'", "\\'"); + var is_get_detail = RegexUtils.GetStringQuery(ref inputData, "is_get_detail") == "true"; + + string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; + MysqlUtils mySql = new MysqlUtils(conn); + + string sql = "SELECT p.* FROM `bxx`.`product_notes` p where 1=1 "; + string where = ""; + if (!string.IsNullOrEmpty(add_user_name)) + { + add_user_name = "'" + string.Join("','", add_user_name.Split(new string[] { ",", "，", " " }, StringSplitOptions.RemoveEmptyEntries)) + "'"; + where += " and p.add_user_name in (" + add_user_name + ")"; + } + else + { + where += " and p.add_user_name='admin'"; + } + sql += where; + sql += " ORDER BY id DESC"; + + var dt = mySql.ExecuteDataTable(sql); + mySql.Close(); + + if (dt != null) + { + try + { + JArray notesArr = new JArray(); + string notes_data = ""; + foreach (DataRow row in dt.Rows) + { + notes_data += row["notes"].ToString() + ","; + + if (is_get_detail) + { + JObject notesObj = new JObject(); + notesObj["id"] = row["id"].ParseToLong(); + notesObj["notes"] = row["notes"].ParseToString(); + notesObj["add_user_name"] = row["add_user_name"].ParseToString(); + notesArr.Add(notesObj); + } + } + var data = notes_data.Trim(','); + return "{\"code\":200,\"msg\":\"success\",\"data\":\"" + data + "\",\"notes\":" + JsonUtils.SerializeObject(notesArr) + "}"; + } + catch (Exception ex) + { + return "{\"code\":50002,\"msg\":\"" + ex.Message + "\",\"data\":\"\"}"; + } + } + else + { + return "{\"code\":50003,\"msg\":\"" + mySql.Message + "\",\"data\":\"\"}"; + } + } + return "{\"code\":19999,\"msg\":\"输入为空\"}"; + } + + public string AddProductNotes(string inputData) + { + if (!string.IsNullOrEmpty(inputData)) + { + var time = RegexUtils.GetStringQuery(ref inputData, "time").ParseToInt(); + string time1 = RegexUtils.GetStringQuery(ref inputData, "code"); + if (time1 != EncrypUtil.Encryption(time)) + return "{\"code\":50000,\"msg\":\"校验失败\"}"; + + var user_name = RegexUtils.GetStringQuery(ref inputData, "user_name")?.Replace("'", "\\'"); + if (string.IsNullOrEmpty(user_name)) + { + return "{\"code\":50001,\"msg\":\"没有用户名\"}"; + } + + var add_user_name = RegexUtils.GetStringQuery(ref inputData, "add_user_name")?.Replace("'", "\\'"); + if (string.IsNullOrEmpty(add_user_name)) + { + add_user_name = "admin"; + } + var notes = RegexUtils.GetStringQuery(ref inputData, "notes")?.Replace("'", "\\'"); + if (string.IsNullOrEmpty(notes)) + { + return "{\"code\":500,\"msg\":\"未指定要新增的组\"}"; + } + + string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; + MysqlUtils mySql = new MysqlUtils(conn); + + string sql = "INSERT IGNORE INTO `bxx`.`product_notes` (notes,add_user_name) VALUES ('" + notes + "','" + add_user_name + "')"; + + var add_rows = mySql.ExecuteAffectedRows(sql); + mySql.Close(); + + if (string.IsNullOrEmpty(mySql.Message)) + { + return "{\"code\":200,\"msg\":\"success\", \"add_rows\":" + add_rows + "}"; + } + else + { + return "{\"code\":50003,\"msg\":\"" + mySql.Message + "\",\"data\":\"\"}"; + } + } + return "{\"code\":19999,\"msg\":\"输入为空\"}"; + } + + public string DelProductNotes(string inputData) + { + if (!string.IsNullOrEmpty(inputData)) + { + var time = RegexUtils.GetStringQuery(ref inputData, "time").ParseToInt(); + string time1 = RegexUtils.GetStringQuery(ref inputData, "code"); + if (time1 != EncrypUtil.Encryption(time)) + return "{\"code\":50000,\"msg\":\"校验失败\"}"; + + var user_name = RegexUtils.GetStringQuery(ref inputData, "user_name")?.Replace("'", "\\'"); + if (string.IsNullOrEmpty(user_name)) + { + return "{\"code\":50001,\"msg\":\"没有用户名\"}"; + } + + var add_user_name = RegexUtils.GetStringQuery(ref inputData, "add_user_name")?.Replace("'", "\\'"); + if (string.IsNullOrEmpty(add_user_name)) + { + add_user_name = "admin"; + } + var id = RegexUtils.GetStringQuery(ref inputData, "notes_id")?.Replace("'", "\\'"); + var notes = RegexUtils.GetStringQuery(ref inputData, "notes")?.Replace("'", "\\'"); + if (string.IsNullOrEmpty(id) && string.IsNullOrEmpty(notes)) + { + return "{\"code\":500,\"msg\":\"未指定要删除的组\"}"; + } + + string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; + MysqlUtils mySql = new MysqlUtils(conn); + + string sql = "DELETE FROM `bxx`.`product_notes` p where 1=1"; + + string where = ""; + if (!string.IsNullOrEmpty(id)) + { + id = "" + string.Join(",", id.Split(new string[] { ",", "，", " " }, StringSplitOptions.RemoveEmptyEntries)) + ""; + where += " and p.id in (" + id + ")"; + } + if (!string.IsNullOrEmpty(notes)) + { + notes = "'" + string.Join("','", notes.Split(new string[] { ",", "，", " " }, StringSplitOptions.RemoveEmptyEntries)) + "'"; + where += " and p.notes in (" + notes + ")"; + } + if (!string.IsNullOrEmpty(add_user_name)) + { + add_user_name = "'" + string.Join("','", add_user_name.Split(new string[] { ",", "，", " " }, StringSplitOptions.RemoveEmptyEntries)) + "'"; + where += " and p.add_user_name in (" + add_user_name + ")"; + } + sql += where; + + var del_rows = mySql.ExecuteAffectedRows(sql); + mySql.Close(); + + if (string.IsNullOrEmpty(mySql.Message)) + { + return "{\"code\":200,\"msg\":\"success\", \"del_rows\":" + del_rows + "}"; + } + else + { + return "{\"code\":50003,\"msg\":\"" + mySql.Message + "\",\"data\":\"\"}"; + } + } + return "{\"code\":19999,\"msg\":\"输入为空\"}"; + } + + public string GetProductCates(string inputData) { return "{\"code\":19999,\"msg\":\"接口废弃\"}"; @@ -1706,6 +1893,7 @@ namespace KJD_Web.BLL.BXX var in_spu_ids = RegexUtils.GetStringQuery(ref inputData, "in_spu_ids")?.Replace("'", "\\'"); var in_skc_ids = RegexUtils.GetStringQuery(ref inputData, "in_skc_ids")?.Replace("'", "\\'"); var in_groups = RegexUtils.GetStringQuery(ref inputData, "in_groups")?.Replace("'", "\\'"); + var in_notes = RegexUtils.GetStringQuery(ref inputData, "in_notes")?.Replace("'", "\\'"); var product_name = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "product_name"))?.Replace("'", "\\'"); var in_cates = RegexUtils.GetStringQuery(ref inputData, "in_cates")?.Replace("'", "\\'"); var wx_cat_1 = RegexUtils.GetStringQuery(ref inputData, "wx_cat_1")?.Replace("'", "\\'"); @@ -1775,6 +1963,11 @@ namespace KJD_Web.BLL.BXX in_groups = "'" + string.Join("','", in_groups.Split(new string[] { ",", "，", " " }, StringSplitOptions.RemoveEmptyEntries)) + "'"; where += " and p.group in (" + in_groups + ")"; } + if (!string.IsNullOrEmpty(in_notes)) + { + in_notes = "'" + string.Join("','", in_notes.Split(new string[] { ",", "，", " " }, StringSplitOptions.RemoveEmptyEntries)) + "'"; + where += " and p.notes in (" + in_notes + ")"; + } if (!string.IsNullOrEmpty(in_cates)) { in_cates = "'" + string.Join("','", in_cates.Split(new string[] { ",", "，", " " }, StringSplitOptions.RemoveEmptyEntries)) + "'"; diff --git a/KJDService/KJD_WebService/BLL/WXXD/WXOrderManage.cs b/KJDService/KJD_WebService/BLL/WXXD/WXOrderManage.cs index 07f0064..970dc34 100644 --- a/KJDService/KJD_WebService/BLL/WXXD/WXOrderManage.cs +++ b/KJDService/KJD_WebService/BLL/WXXD/WXOrderManage.cs @@ -18,10 +18,9 @@ namespace KJD_Web.BLL.WXXD { if (!string.IsNullOrEmpty(inputData)) { - var time = RegexUtils.GetStringQuery(ref inputData, "time").ParseToInt(); - string time1 = RegexUtils.GetStringQuery(ref inputData, "code"); - if (time1 != EncrypUtil.Encryption(time)) - return "{\"code\":50000,\"msg\":\"校验失败\"}"; + if (!WXUserManage.GetSign(inputData)) + return "{\"code\":999,\"msg\":\"校验失败\"}"; + var timeCalc = DateTime.Now; var erp_shop_id_in = RegexUtils.GetStringQuery(ref inputData, "erp_shop_id_in")?.Replace("'", "\\'"); var erp_order_id_in = RegexUtils.GetStringQuery(ref inputData, "erp_order_id_in")?.Replace("'", "\\'"); @@ -54,9 +53,9 @@ namespace KJD_Web.BLL.WXXD if (!string.IsNullOrWhiteSpace(purchase_status)) where += " and o.purchase_status = " + purchase_status; if (start_time > 0) - where += " and o.create_time >= " + start_time; + where += " and o.update_time >= " + start_time; if (end_time > 0) - where += " and o.create_time <= " + end_time; + where += " and o.update_time <= " + end_time; sql += where; var count = 0; @@ -70,9 +69,7 @@ namespace KJD_Web.BLL.WXXD } else { - sql = "SELECT o.* FROM" + - " erp.oms_wei_order o " + - " WHERE 1=1"; + sql = "SELECT o.* FROM erp.oms_wei_order o WHERE 1=1"; //where子句 sql += where; @@ -167,7 +164,8 @@ namespace KJD_Web.BLL.WXXD } JsonSerializerSettings jsonSetting = new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore }; var data = JsonUtils.SerializeObjectToString(orderList, jsonSetting); - return "{\"code\":200,\"msg\":\"success\",\"data\":" + data + ",\"count\":" + count + "}"; + var seconds = (DateTime.Now - timeCalc).TotalSeconds.ToString("0.000"); + return "{\"code\":200,\"msg\":\"success\",\"data\":" + data + ",\"count\":" + count + ",\"seconds\":" + seconds + "}"; } catch (Exception ex) { @@ -226,9 +224,7 @@ namespace KJD_Web.BLL.WXXD } else { - sql = "SELECT o.* FROM" + - " erp.oms_wei_order_item o " + - " WHERE 1=1"; + sql = "SELECT o.* FROM erp.oms_wei_order_item o WHERE 1=1"; //where子句 sql += where; @@ -695,7 +691,7 @@ namespace KJD_Web.BLL.WXXD // 客戶端查兩次 //if (is_admin == "true") //{ - // sql = "SELECT e.*,o.create_time as order_create_time FROM `erp`.`oms_wei_external_procurement_log` e LEFT JOIN `erp`.`oms_wei_order` ON e.order_no = o.order_id WHERE 1=1"; + // sql = "SELECT e.*,o.create_time as order_create_time FROM erp.oms_wei_external_procurement_log e LEFT JOIN erp.oms_wei_order ON e.order_no = o.order_id WHERE 1=1"; // sql += where; // sql += " order by id desc limit " + Math.Max(0, page - 1) * page_size + "," + page_size + ";"; //} @@ -928,7 +924,7 @@ namespace KJD_Web.BLL.WXXD string sql = ""; var count = -1; - sql = " update `erp`.`oms_wei_order` set "; + sql = " update erp.oms_wei_order set "; if (soft_remark != null) sql += " soft_remark='" + soft_remark + "',"; sql = sql.TrimEnd(','); @@ -968,6 +964,9 @@ namespace KJD_Web.BLL.WXXD string order_status_prompt = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "order_status_prompt"))?.Replace("'", "\\'"); string after_sales_status = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "after_sales_status"))?.Replace("'", "\\'"); string order_detail = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "order_detail"))?.Replace("'", "\\'"); + string wx_order_send_type = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "wx_order_send_type"))?.Replace("'", "\\'"); + if (string.IsNullOrEmpty(wx_order_send_type)) + wx_order_send_type = "1"; if (string.IsNullOrEmpty(wx_order_id) || string.IsNullOrEmpty(pdd_order_sn)) return "{\"code\":500,\"msg\":\"订单ID不能为空\"}"; @@ -997,9 +996,9 @@ namespace KJD_Web.BLL.WXXD if (id == 0) { sql = "INSERT INTO wxxd.order_pdd_buyer_order (wx_order_id,wx_sku_id,TransitCreateTime,pre_allocated_order_no,buyerId,buyerName,order_sn,order_amount,order_time," + - "outExpressCompanyCode,tracking_number,order_status_prompt,after_sales_status,order_detail)"; + "outExpressCompanyCode,tracking_number,order_status_prompt,after_sales_status,order_detail,wx_order_send_type)"; sql += "VALUES(@wx_order_id,@wx_sku_id,@TransitCreateTime,@pre_allocated_order_no,@buyerId,@buyerName,@pdd_order_sn,@order_amount,@order_time," + - "@outExpressCompanyCode,@tracking_number,@order_status_prompt,@after_sales_status,@order_detail);"; + "@outExpressCompanyCode,@tracking_number,@order_status_prompt,@after_sales_status,@order_detail@wx_order_send_type);"; } else { @@ -1030,6 +1029,8 @@ namespace KJD_Web.BLL.WXXD sql += " after_sales_status=@after_sales_status,"; if (!string.IsNullOrEmpty(order_detail)) sql += " order_detail=@order_detail,"; + if (!string.IsNullOrEmpty(wx_order_send_type)) + sql += " wx_order_send_type=@wx_order_send_type,"; sql = sql.TrimEnd(','); sql += " where order_sn=@pdd_order_sn"; } @@ -1044,12 +1045,13 @@ namespace KJD_Web.BLL.WXXD paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "buyerId", Value = buyerId, }); paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "buyerName", Value = buyerName, }); paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "pdd_order_sn", Value = pdd_order_sn, }); - paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "order_amount", Value = order_amount, }); + paramLst.Add(new MySqlParameter() { DbType = DbType.Int32, ParameterName = "order_amount", Value = order_amount.ParseToNullableInt(), }); paramLst.Add(new MySqlParameter() { DbType = DbType.Int64, ParameterName = "order_time", Value = order_time.ParseToLong(), }); paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "outExpressCompanyCode", Value = outExpressCompanyCode, }); paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "tracking_number", Value = tracking_number, }); paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "order_status_prompt", Value = order_status_prompt, }); paramLst.Add(new MySqlParameter() { DbType = DbType.Int32, ParameterName = "after_sales_status", Value = after_sales_status.ParseToInt(), }); + paramLst.Add(new MySqlParameter() { DbType = DbType.Int32, ParameterName = "wx_order_send_type", Value = wx_order_send_type.ParseToInt(), }); paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "order_detail", Value = order_detail, }); //sql = " update `wxxd`.`order_pdd_buyer_order` set "; //if (!string.IsNullOrEmpty(soft_remark)) @@ -1069,7 +1071,6 @@ namespace KJD_Web.BLL.WXXD return "{\"code\":19999,\"msg\":\"输入为空\"}"; } - public string WXGetBuyerOrderList(string inputData, bool isDetail = false) { if (!string.IsNullOrEmpty(inputData)) @@ -1133,7 +1134,7 @@ namespace KJD_Web.BLL.WXXD { try { - List refundItemList = new List(); + List buyerOrderList = new List(); foreach (DataRow row in dt.Rows) { order_pdd_buyer_order order = new order_pdd_buyer_order @@ -1155,11 +1156,228 @@ namespace KJD_Web.BLL.WXXD TransitCreateTime = row["TransitCreateTime"].ParseToString().ParseToDateTime(), wx_order_id = row["wx_order_id"].ParseToString(), wx_sku_id = row["wx_sku_id"].ParseToString(), + wx_order_send_type = row["wx_order_send_type"].ParseToNullableInt(), }; - refundItemList.Add(order); + buyerOrderList.Add(order); } JsonSerializerSettings jsonSetting = new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore }; - var data = JsonUtils.SerializeObjectToString(refundItemList, jsonSetting); + var data = JsonUtils.SerializeObjectToString(buyerOrderList, 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 WXAddMdyBuyerAfterSale(string inputData) + { + if (!string.IsNullOrEmpty(inputData)) + { + if (!WXUserManage.GetSign(inputData)) + return "{\"code\":999,\"msg\":\"校验失败\"}"; + var timeCalc = DateTime.Now; + + string wx_order_id = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "wx_order_id"))?.Replace("'", "\\'"); + string wx_sku_id = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "wx_sku_id"))?.Replace("'", "\\'"); + string TransitCreateTime = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "TransitCreateTime"))?.Replace("'", "\\'"); + string pre_allocated_order_no = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "pre_allocated_order_no"))?.Replace("'", "\\'"); + string buyerId = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "buyerId"))?.Replace("'", "\\'"); + string buyerName = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "buyerName"))?.Replace("'", "\\'"); + string orderSn = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "orderSn"))?.Replace("'", "\\'"); + string afterSalesId = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "afterSalesId"))?.Replace("'", "\\'"); + string orderAmount = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "orderAmount"))?.Replace("'", "\\'"); + string orderDate = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "orderDate"))?.Replace("'", "\\'"); + string order_detail = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "order_detail"))?.Replace("'", "\\'"); + string refundAmount = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "refundAmount"))?.Replace("'", "\\'"); + string statusText = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "statusText"))?.Replace("'", "\\'"); + string afterSaleAddress = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "afterSaleAddress"))?.Replace("'", "\\'"); + string is_mdy = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "is_mdy"))?.Replace("'", "\\'"); + if (string.IsNullOrEmpty(wx_order_id) || string.IsNullOrEmpty(orderSn) || string.IsNullOrEmpty(afterSalesId)) + return "{\"code\":500,\"msg\":\"订单ID不能为空\"}"; + + string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; + MysqlUtils mySql = new MysqlUtils(conn); + + string sql = ""; + var count = -1; + + sql = "select id from wxxd.order_pdd_buyer_after_sale where afterSalesId='" + afterSalesId + "'"; + var id = mySql.ExecuteFirstInt(sql); + if (!string.IsNullOrEmpty(mySql.Message)) + { + mySql.Close(); + return "{\"code\":500,\"msg\":\"" + mySql.Message + "\"}"; + } + + if (id == 0 && is_mdy != "true") + { + sql = "INSERT INTO wxxd.order_pdd_buyer_after_sale (wx_order_id,wx_sku_id,TransitCreateTime,pre_allocated_order_no,buyerId,buyerName,orderSn,afterSalesId,orderAmount,orderDate," + + "refundAmount,statusText,afterSaleAddress,order_detail)"; + sql += "VALUES(@wx_order_id,@wx_sku_id,@TransitCreateTime,@pre_allocated_order_no,@buyerId,@buyerName,@orderSn,@afterSalesId,@orderAmount,@orderDate," + + "@refundAmount,@statusText,@afterSaleAddress,@order_detail);"; + } + else + { + sql = "UPDATE wxxd.order_pdd_buyer_after_sale SET "; + if (!string.IsNullOrEmpty(wx_order_id)) + sql += " wx_order_id=@wx_order_id,"; + if (!string.IsNullOrEmpty(wx_sku_id)) + sql += " wx_sku_id=@wx_sku_id,"; + if (!string.IsNullOrEmpty(TransitCreateTime)) + sql += " TransitCreateTime=@TransitCreateTime,"; + if (!string.IsNullOrEmpty(pre_allocated_order_no)) + sql += " pre_allocated_order_no=@pre_allocated_order_no,"; + if (!string.IsNullOrEmpty(buyerId)) + sql += " buyerId=@buyerId,"; + if (!string.IsNullOrEmpty(buyerName)) + sql += " buyerName=@buyerName,"; + if (!string.IsNullOrEmpty(orderSn)) + sql += " orderSn=@orderSn,"; + if (!string.IsNullOrEmpty(orderAmount)) + sql += " orderAmount=@orderAmount,"; + if (!string.IsNullOrEmpty(refundAmount)) + sql += " refundAmount=@refundAmount,"; + if (!string.IsNullOrEmpty(statusText)) + sql += " statusText=@statusText,"; + if (!string.IsNullOrEmpty(orderDate)) + sql += " orderDate=@orderDate,"; + if (!string.IsNullOrEmpty(afterSaleAddress)) + sql += " afterSaleAddress=@afterSaleAddress,"; + + if (!string.IsNullOrEmpty(order_detail)) + sql += " order_detail=@order_detail,"; + sql = sql.TrimEnd(','); + sql += " where afterSalesId=@afterSalesId"; + } + + List paramLst = new List(); + paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "wx_order_id", Value = wx_order_id, }); + paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "wx_sku_id", Value = wx_sku_id, }); + paramLst.Add(new MySqlParameter() { DbType = DbType.DateTime, ParameterName = "TransitCreateTime", Value = TransitCreateTime.ParseToDateTime(), }); + paramLst.Add(new MySqlParameter() { DbType = DbType.Int32, ParameterName = "pre_allocated_order_no", Value = pre_allocated_order_no.ParseToInt(), }); + paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "buyerId", Value = buyerId, }); + paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "buyerName", Value = buyerName, }); + paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "statusText", Value = statusText, }); + paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "orderSn", Value = orderSn, }); + paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "afterSalesId", Value = afterSalesId, }); + paramLst.Add(new MySqlParameter() { DbType = DbType.Int32, ParameterName = "refundAmount", Value = refundAmount.ParseToNullableInt(), }); + paramLst.Add(new MySqlParameter() { DbType = DbType.Int32, ParameterName = "orderAmount", Value = orderAmount.ParseToNullableInt(), }); + paramLst.Add(new MySqlParameter() { DbType = DbType.Int64, ParameterName = "orderDate", Value = orderDate.ParseToLong(), }); + paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "afterSaleAddress", Value = afterSaleAddress, }); + paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "order_detail", Value = order_detail, }); + + count = mySql.ExecuteAffectedRows(sql, paramLst.ToArray()); + mySql.Close(); + + if (!string.IsNullOrEmpty(mySql.Message)) + { + return "{\"code\":500,\"msg\":\"" + mySql.Message + "\",\"affected_rows\":" + count + "}"; + } + return "{\"code\":200,\"msg\":\"success\",\"affected_rows\":" + count + "}"; + } + return "{\"code\":19999,\"msg\":\"输入为空\"}"; + } + + public string WXGetBuyerAfterSaleList(string inputData, bool isDetail = false) + { + if (!string.IsNullOrEmpty(inputData)) + { + if (!WXUserManage.GetSign(inputData)) + return "{\"code\":999,\"msg\":\"校验失败\"}"; + var timeCalc = DateTime.Now; + + var wx_order_id_in = RegexUtils.GetStringQuery(ref inputData, "wx_order_id_in")?.Replace("'", "\\'"); + var buyer_order_sn_in = RegexUtils.GetStringQuery(ref inputData, "buyer_order_sn_in")?.Replace("'", "\\'"); + if (wx_order_id_in.IsNullOrEmpty() && string.IsNullOrEmpty(buyer_order_sn_in)) + { + return "{\"code\":500,\"msg\":\"未指定订单\"}"; + } + var sort_type = RegexUtils.GetStringQuery(ref inputData, "sort_type")?.Replace("'", "\\'"); + var is_not_count = RegexUtils.GetStringQuery(ref inputData, "is_not_count") != "false"; + + int page = RegexUtils.GetStringQuery(ref inputData, "page").ParseToInt(); + int page_size = RegexUtils.GetStringQuery(ref inputData, "page_size").ParseToInt(500); + + string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; + MysqlUtils mySql = new MysqlUtils(conn); + + string sql = "SELECT COUNT(id) FROM wxxd.order_pdd_buyer_after_sale o WHERE 1=1 "; + + string where = ""; + if (!string.IsNullOrWhiteSpace(wx_order_id_in)) + where += " and o.wx_order_id in ('" + wx_order_id_in.Replace(",", "','") + "')"; + if (!string.IsNullOrWhiteSpace(buyer_order_sn_in)) + where += " and o.order_sn in ('" + buyer_order_sn_in.Replace(",", "','") + "')"; + sql += where; + + var count = 0; + if (!is_not_count) + count = mySql.ExecuteRowCount(sql); + + DataTable dt; + if (count == 0 && !is_not_count) + { + dt = new DataTable(); + } + else + { + sql = "SELECT o.* FROM" + + " wxxd.order_pdd_buyer_after_sale o " + + " WHERE 1=1"; + + //where子句 + sql += where; + + if (sort_type == "asc") + sql += " ORDER BY o.id ASC"; + else + sql += " ORDER BY o.id DESC"; + sql += " LIMIT " + Math.Max(page - 1, 0) * page_size + "," + page_size; + dt = mySql.ExecuteDataTable(sql); + } + + mySql.Close(); + if (dt != null) + { + try + { + List buyerAfterSaleLst = new List(); + foreach (DataRow row in dt.Rows) + { + order_pdd_buyer_after_sale afterSale = new order_pdd_buyer_after_sale + { + id = row["id"].ParseToLong(), + add_time = row["add_time"].ParseToString().ParseToDateTime(), + afterSalesId = row["afterSalesId"].ParseToString(), + buyerId = row["buyerId"].ParseToString(), + buyerName = row["buyerName"].ParseToString(), + mdy_time = row["mdy_time"].ParseToString().ParseToDateTime(), + orderAmount = row["orderAmount"].ParseToNullableInt(), + order_detail = row["order_detail"].ParseToString(), + orderSn = row["orderSn"].ParseToString(), + orderDate = row["orderDate"].ParseToNullableInt(), + refundAmount = row["refundAmount"].ParseToNullableInt(), + statusText = row["statusText"].ParseToString(), + afterSaleAddress = row["afterSaleAddress"].ParseToString(), + pre_allocated_order_no = row["pre_allocated_order_no"].ParseToNullableInt(), + TransitCreateTime = row["TransitCreateTime"].ParseToString().ParseToDateTime(), + wx_order_id = row["wx_order_id"].ParseToString(), + wx_sku_id = row["wx_sku_id"].ParseToString(), + }; + buyerAfterSaleLst.Add(afterSale); + } + JsonSerializerSettings jsonSetting = new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore }; + var data = JsonUtils.SerializeObjectToString(buyerAfterSaleLst, jsonSetting); var seconds = (DateTime.Now - timeCalc).TotalSeconds.ToString("0.000"); return "{\"code\":200,\"msg\":\"success\",\"data\":" + data + ",\"count\":" + count + ",\"seconds\":" + seconds + "}"; } @@ -1292,7 +1510,11 @@ namespace KJD_Web.BLL.WXXD return "{\"code\":19999,\"msg\":\"输入为空\"}"; } - + /// + /// 订单异常重拍 + /// + /// + /// public string WXUpdateAbnormalTransitOrder(string inputData) { if (!string.IsNullOrEmpty(inputData)) @@ -1326,7 +1548,7 @@ namespace KJD_Web.BLL.WXXD string sql; - sql = "INSERT INTO wxxd.order_abnormal_order_record (out_order_no,order_no,order_sku_id,buyer_account,out_amount,purchaser_note,refund_status,order_code) "; + sql = "INSERT INTO wxxd.order_abnormal_transit_order_rebuy_record (out_order_no,order_no,order_sku_id,buyer_account,out_amount,purchaser_note,refund_status,order_code) "; sql += " VALUES('" + old_out_order_no + "','" + old_order_no + "','" + old_order_sku_id + "','" + old_buyer_account + "'," + old_out_amount + ",'" + old_purchaser_note + "','" + old_refund_status + "','" + order_code + "')"; var rows = mySql.ExecuteAffectedRows(sql); @@ -1340,7 +1562,7 @@ namespace KJD_Web.BLL.WXXD { mySql.RollBack(); mySql.Close(); - return "{\"code\":500,\"msg\":\"创建异常单记录失败\",\"affected_rows\":" + rows + "}"; + return "{\"code\":500,\"msg\":\"创建异常单重拍记录失败\",\"affected_rows\":" + rows + "}"; } sql = "UPDATE erp.oms_wei_external_procurement_log SET "; @@ -1372,5 +1594,242 @@ namespace KJD_Web.BLL.WXXD } return "{\"code\":19999,\"msg\":\"输入为空\"}"; } + + + public string WXAddOrderItemExtInfo(string inputData) + { + if (!string.IsNullOrEmpty(inputData)) + { + if (!WXUserManage.GetSign(inputData)) + return "{\"code\":999,\"msg\":\"校验失败\"}"; + var timeCalc = DateTime.Now; + + string order_id = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "wx_order_id"))?.Replace("'", "\\'"); + string sku_id = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "wx_sku_id"))?.Replace("'", "\\'"); + string shop_app_id = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "shop_app_id"))?.Replace("'", "\\'"); + string shop_name = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "shop_name"))?.Replace("'", "\\'"); + string abnormal_text = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "abnormal_text"))?.Replace("'", "\\'"); + string flag = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "flag"))?.Replace("'", "\\'"); + string label = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "label"))?.Replace("'", "\\'"); + string remark = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "remark"))?.Replace("'", "\\'"); + string after_sale_user_delivery_address = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "after_sale_user_delivery_address"))?.Replace("'", "\\'"); + + if (string.IsNullOrEmpty(order_id) || string.IsNullOrEmpty(sku_id)) + return "{\"code\":500,\"msg\":\"订单ID不能为空\"}"; + + string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; + MysqlUtils mySql = new MysqlUtils(conn); + + string sql = ""; + var count = -1; + + sql = "select id from wxxd.order_item_ext where order_id='" + order_id + "' and sku_id='" + sku_id + "'"; + var id = mySql.ExecuteFirstInt(sql); + if (!string.IsNullOrEmpty(mySql.Message)) + { + mySql.Close(); + return "{\"code\":500,\"msg\":\"" + mySql.Message + "\"}"; + } + if (id > 0) + { + mySql.Close(); + return "{\"code\":500,\"msg\":\"订单已存在\"}"; + } + + sql = "INSERT INTO wxxd.order_item_ext (order_id,sku_id,shop_app_id,shop_name,abnormal_text,flag,label,remark,after_sale_user_delivery_address)"; + sql += "VALUES(@order_id,@sku_id,@shop_app_id,@shop_name,@abnormal_text,@flag,@label,@remark,@after_sale_user_delivery_address);"; + + List paramLst = new List(); + paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "order_id", Value = order_id, }); + paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "sku_id", Value = sku_id, }); + paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "shop_app_id", Value = shop_app_id, }); + paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "shop_name", Value = shop_name, }); + paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "abnormal_text", Value = abnormal_text, }); + paramLst.Add(new MySqlParameter() { DbType = DbType.Int32, ParameterName = "flag", Value = flag, }); + paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "label", Value = label, }); + paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "remark", Value = remark, }); + paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "after_sale_user_delivery_address", Value = after_sale_user_delivery_address, }); + + count = mySql.ExecuteAffectedRows(sql, paramLst.ToArray()); + mySql.Close(); + + if (!string.IsNullOrEmpty(mySql.Message)) + { + return "{\"code\":500,\"msg\":\"" + mySql.Message + "\",\"affected_rows\":" + count + "}"; + } + return "{\"code\":200,\"msg\":\"success\",\"affected_rows\":" + count + "}"; + } + return "{\"code\":19999,\"msg\":\"输入为空\"}"; + } + + public string WXMdyOrderItemExtInfo(string inputData) + { + if (!string.IsNullOrEmpty(inputData)) + { + if (!WXUserManage.GetSign(inputData)) + return "{\"code\":999,\"msg\":\"校验失败\"}"; + var timeCalc = DateTime.Now; + + string order_id = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "wx_order_id"))?.Replace("'", "\\'"); + string sku_id = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "wx_sku_id"))?.Replace("'", "\\'"); + string shop_app_id = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "shop_app_id"))?.Replace("'", "\\'"); + string shop_name = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "shop_name"))?.Replace("'", "\\'"); + string abnormal_text = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "abnormal_text"))?.Replace("'", "\\'"); + string flag = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "flag"))?.Replace("'", "\\'"); + string label = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "label"))?.Replace("'", "\\'"); + string remark = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "remark"))?.Replace("'", "\\'"); + string after_sale_user_delivery_address = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "after_sale_user_delivery_address"))?.Replace("'", "\\'"); + + if (string.IsNullOrEmpty(order_id)) + return "{\"code\":500,\"msg\":\"订单ID不能为空\"}"; + + string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; + MysqlUtils mySql = new MysqlUtils(conn); + + string sql = "UPDATE wxxd.order_item_ext SET "; + if (!string.IsNullOrEmpty(shop_app_id)) + sql += " shop_app_id=@shop_app_id,"; + if (!string.IsNullOrEmpty(shop_name)) + sql += " shop_name=@shop_name,"; + if (abnormal_text != null) + sql += " abnormal_text=@abnormal_text,"; + if (!string.IsNullOrEmpty(flag)) + sql += " flag=@flag,"; + if (label != null) + sql += " label=@label,"; + if (remark != null) + sql += " remark=@remark,"; + if (!string.IsNullOrEmpty(after_sale_user_delivery_address)) + sql += " after_sale_user_delivery_address=@after_sale_user_delivery_address,"; + sql = sql.TrimEnd(','); + sql += " where 1=1"; + if (!string.IsNullOrEmpty(order_id)) + sql += " and order_id=@order_id,"; + if (!string.IsNullOrEmpty(sku_id)) + sql += " and sku_id=@sku_id,"; + + List paramLst = new List(); + paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "order_id", Value = order_id, }); + paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "sku_id", Value = sku_id, }); + paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "shop_app_id", Value = shop_app_id, }); + paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "shop_name", Value = shop_name, }); + paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "abnormal_text", Value = abnormal_text, }); + paramLst.Add(new MySqlParameter() { DbType = DbType.Int32, ParameterName = "flag", Value = flag, }); + paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "label", Value = label, }); + paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "remark", Value = remark, }); + paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "after_sale_user_delivery_address", Value = after_sale_user_delivery_address, }); + + var count = mySql.ExecuteAffectedRows(sql, paramLst.ToArray()); + mySql.Close(); + + if (!string.IsNullOrEmpty(mySql.Message)) + { + return "{\"code\":500,\"msg\":\"" + mySql.Message + "\",\"affected_rows\":" + count + "}"; + } + return "{\"code\":200,\"msg\":\"success\",\"affected_rows\":" + count + "}"; + } + return "{\"code\":19999,\"msg\":\"输入为空\"}"; + } + + public string WXGetOrderItemExtInfoList(string inputData, bool isDetail = false) + { + if (!string.IsNullOrEmpty(inputData)) + { + if (!WXUserManage.GetSign(inputData)) + return "{\"code\":999,\"msg\":\"校验失败\"}"; + var timeCalc = DateTime.Now; + + var wx_order_id_in = RegexUtils.GetStringQuery(ref inputData, "wx_order_id_in")?.Replace("'", "\\'"); + var wx_sku_id = RegexUtils.GetStringQuery(ref inputData, "wx_sku_id_in")?.Replace("'", "\\'"); + if (wx_order_id_in.IsNullOrEmpty()) + { + return "{\"code\":500,\"msg\":\"未指定订单\"}"; + } + var sort_type = RegexUtils.GetStringQuery(ref inputData, "sort_type")?.Replace("'", "\\'"); + var is_not_count = RegexUtils.GetStringQuery(ref inputData, "is_not_count") != "false"; + + int page = RegexUtils.GetStringQuery(ref inputData, "page").ParseToInt(); + int page_size = RegexUtils.GetStringQuery(ref inputData, "page_size").ParseToInt(500); + + string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; + MysqlUtils mySql = new MysqlUtils(conn); + + string sql = "SELECT COUNT(id) FROM wxxd.order_item_ext o WHERE 1=1 "; + + string where = ""; + if (!string.IsNullOrWhiteSpace(wx_order_id_in)) + where += " and o.order_id in ('" + wx_order_id_in.Replace(",", "','") + "')"; + if (!string.IsNullOrWhiteSpace(wx_sku_id)) + where += " and o.sku_id in ('" + wx_sku_id.Replace(",", "','") + "')"; + sql += where; + + var count = 0; + if (!is_not_count) + count = mySql.ExecuteRowCount(sql); + + DataTable dt; + if (count == 0 && !is_not_count) + { + dt = new DataTable(); + } + else + { + sql = "SELECT o.* FROM" + + " wxxd.order_item_ext o " + + " WHERE 1=1"; + + //where子句 + sql += where; + + if (sort_type == "asc") + sql += " ORDER BY o.id ASC"; + else + sql += " ORDER BY o.id DESC"; + sql += " LIMIT " + Math.Max(page - 1, 0) * page_size + "," + page_size; + dt = mySql.ExecuteDataTable(sql); + } + + mySql.Close(); + if (dt != null) + { + try + { + List buyerOrderList = new List(); + foreach (DataRow row in dt.Rows) + { + order_item_ext order = new order_item_ext + { + id = row["id"].ParseToLong(), + add_time = row["add_time"].ParseToString().ParseToDateTime(), + abnormal_text = row["abnormal_text"].ParseToString(), + after_sale_user_delivery_address = row["after_sale_user_delivery_address"].ParseToString(), + flag = row["flag"].ParseToNullableInt(), + mdy_time = row["mdy_time"].ParseToString().ParseToDateTime(), + label = row["label"].ParseToString(), + order_id = row["order_id"].ParseToString(), + remark = row["remark"].ParseToString(), + shop_app_id = row["shop_app_id"].ParseToString(), + shop_name = row["shop_name"].ParseToString(), + sku_id = row["sku_id"].ParseToString(), + }; + buyerOrderList.Add(order); + } + JsonSerializerSettings jsonSetting = new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore }; + var data = JsonUtils.SerializeObjectToString(buyerOrderList, 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/BXXProductService.asmx.cs b/KJDService/KJD_WebService/BXXProductService.asmx.cs index 04e469c..afaae19 100644 --- a/KJDService/KJD_WebService/BXXProductService.asmx.cs +++ b/KJDService/KJD_WebService/BXXProductService.asmx.cs @@ -290,6 +290,42 @@ namespace KJD_Web Context.Response.End(); } + [WebMethod] + public void get_product_notes() + { + string jsontext = GetRequestJsonString(); + + var result = jsontext; + result = new BXXProductManage().GetProductNotes(jsontext); + + Context.Response.Write(result); + Context.Response.End(); + } + + [WebMethod] + public void add_product_notes() + { + string jsontext = GetRequestJsonString(); + + var result = jsontext; + result = new BXXProductManage().AddProductNotes(jsontext); + + Context.Response.Write(result); + Context.Response.End(); + } + + [WebMethod] + public void del_product_notes() + { + string jsontext = GetRequestJsonString(); + + var result = jsontext; + result = new BXXProductManage().DelProductNotes(jsontext); + + Context.Response.Write(result); + Context.Response.End(); + } + [WebMethod] public void get_pdd_product_cates() { diff --git a/KJDService/KJD_WebService/KJD_WebService.csproj b/KJDService/KJD_WebService/KJD_WebService.csproj index 3c64a2a..38dbbd0 100644 --- a/KJDService/KJD_WebService/KJD_WebService.csproj +++ b/KJDService/KJD_WebService/KJD_WebService.csproj @@ -138,6 +138,8 @@ + + diff --git a/KJDService/KJD_WebService/Model/WxModel/order_item_ext.cs b/KJDService/KJD_WebService/Model/WxModel/order_item_ext.cs new file mode 100644 index 0000000..5635a05 --- /dev/null +++ b/KJDService/KJD_WebService/Model/WxModel/order_item_ext.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; + +namespace KJD_Web.Model.WxModel +{ + public class order_item_ext + { + public long? id { get; set; } + public string order_id { get; set; } + public string sku_id { get; set; } + public string shop_app_id { get; set; } + public string shop_name { get; set; } + /// + /// 订单异常文本 + /// + public string abnormal_text { get; set; } + public int? flag { get; set; } + public string label { get; set; } + public string remark { get; set; } + public string after_sale_user_delivery_address { 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/Model/WxModel/order_pdd_buyer_after_sale.cs b/KJDService/KJD_WebService/Model/WxModel/order_pdd_buyer_after_sale.cs new file mode 100644 index 0000000..9a3a540 --- /dev/null +++ b/KJDService/KJD_WebService/Model/WxModel/order_pdd_buyer_after_sale.cs @@ -0,0 +1,29 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; + +namespace KJD_Web.Model.WxModel +{ + public class order_pdd_buyer_after_sale + { + public long? id { get; set; } + public string wx_order_id { get; set; } + public string wx_sku_id { get; set; } + public DateTime TransitCreateTime { get; set; } + //public DateTime TransitPickupTime { get; set; } + public int? pre_allocated_order_no { get; set; } + public string buyerId { get; set; } + public string buyerName { get; set; } + public string afterSalesId { get; set; } + public string orderSn { get; set; } + public int? orderAmount { get; set; } + public long? refundAmount { get; set; } + public long? orderDate { get; set; } + public string statusText { get; set; } + public string afterSaleAddress { get; set; } + public string order_detail { 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/Model/WxModel/order_pdd_buyer_order.cs b/KJDService/KJD_WebService/Model/WxModel/order_pdd_buyer_order.cs index 95585ea..1c740f4 100644 --- a/KJDService/KJD_WebService/Model/WxModel/order_pdd_buyer_order.cs +++ b/KJDService/KJD_WebService/Model/WxModel/order_pdd_buyer_order.cs @@ -24,6 +24,7 @@ namespace KJD_Web.Model.WxModel /// public string order_status_prompt { get; set; } public int? after_sales_status { get; set; } + public int? wx_order_send_type { get; set; } public string order_detail { get; set; } public DateTime add_time { get; set; } public DateTime mdy_time { get; set; } diff --git a/KJDService/KJD_WebService/WXOrderService.asmx.cs b/KJDService/KJD_WebService/WXOrderService.asmx.cs index c055275..d9a1506 100644 --- a/KJDService/KJD_WebService/WXOrderService.asmx.cs +++ b/KJDService/KJD_WebService/WXOrderService.asmx.cs @@ -222,6 +222,30 @@ namespace KJD_Web Context.Response.End(); } + [WebMethod] + public void wx_add_mdy_buyer_after_sale() + { + string jsontext = GetRequestJsonString(); + + var result = jsontext; + result = new WXOrderManage().WXAddMdyBuyerAfterSale(jsontext); + + Context.Response.Write(result); + Context.Response.End(); + } + + [WebMethod] + public void wx_get_buyer_after_sale_list() + { + string jsontext = GetRequestJsonString(); + + var result = jsontext; + result = new WXOrderManage().WXGetBuyerAfterSaleList(jsontext); + + Context.Response.Write(result); + Context.Response.End(); + } + [WebMethod] @@ -248,5 +272,42 @@ namespace KJD_Web Context.Response.Write(result); Context.Response.End(); } + + + [WebMethod] + public void wx_add_order_item_ext_info() + { + string jsontext = GetRequestJsonString(); + + var result = jsontext; + result = new WXOrderManage().WXAddOrderItemExtInfo(jsontext); + + Context.Response.Write(result); + Context.Response.End(); + } + + [WebMethod] + public void wx_mdy_order_item_ext_info() + { + string jsontext = GetRequestJsonString(); + + var result = jsontext; + result = new WXOrderManage().WXMdyOrderItemExtInfo(jsontext); + + Context.Response.Write(result); + Context.Response.End(); + } + + [WebMethod] + public void wx_get_order_item_ext_info() + { + string jsontext = GetRequestJsonString(); + + var result = jsontext; + result = new WXOrderManage().WXGetOrderItemExtInfoList(jsontext); + + Context.Response.Write(result); + Context.Response.End(); + } } } diff --git a/TEMUKJD/KJD.csproj b/TEMUKJD/KJD.csproj index 7503bda..50b35e0 100644 --- a/TEMUKJD/KJD.csproj +++ b/TEMUKJD/KJD.csproj @@ -201,6 +201,12 @@ JstBanPlatformForm.cs + + Form + + + PDDDBProdNotesManageFrom.cs + Form @@ -1412,6 +1418,9 @@ JstBanPlatformForm.cs + + PDDDBProdNotesManageFrom.cs + PDDDBProdGroupManageFrom.cs @@ -2002,6 +2011,7 @@ + diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdGroupManageFrom.Designer.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdGroupManageFrom.Designer.cs index 3e43dae..6ff7988 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdGroupManageFrom.Designer.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdGroupManageFrom.Designer.cs @@ -35,17 +35,17 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.panel2 = new System.Windows.Forms.Panel(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); + this.label2 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); this.btnDeleteGroup = new DevComponents.DotNetBar.PanelEx(); this.btnAddGroup = new DevComponents.DotNetBar.PanelEx(); this.txtGroupName = new System.Windows.Forms.TextBox(); this.dgvProdGroup = new TemuKJD.UserComponent.DataGridViewEx(); - this.btnClose = new TemuKJD.UserControls.ButtonEx(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colDbId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colGroupName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colSAddUserName = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.label2 = new System.Windows.Forms.Label(); + this.btnClose = new TemuKJD.UserControls.ButtonEx(); this.panel2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); @@ -106,15 +106,25 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.splitContainer2.Panel2.Controls.Add(this.dgvProdGroup); this.splitContainer2.Size = new System.Drawing.Size(383, 455); - this.splitContainer2.SplitterDistance = 55; + this.splitContainer2.SplitterDistance = 54; this.splitContainer2.TabIndex = 190; // + // label2 + // + this.label2.AutoSize = true; + this.label2.ForeColor = System.Drawing.SystemColors.ActiveCaption; + this.label2.Location = new System.Drawing.Point(42, 34); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(308, 17); + this.label2.TabIndex = 842; + this.label2.Text = "备注：删除选中仅删除分组，原分组内的商品仍然保留。"; + // // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(9, 13); + this.label1.Location = new System.Drawing.Point(9, 11); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(77, 12); + this.label1.Size = new System.Drawing.Size(80, 17); this.label1.TabIndex = 835; this.label1.Text = "输入分组名称"; // @@ -126,7 +136,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.btnDeleteGroup.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnDeleteGroup.Location = new System.Drawing.Point(296, 8); this.btnDeleteGroup.Name = "btnDeleteGroup"; - this.btnDeleteGroup.Size = new System.Drawing.Size(80, 21); + this.btnDeleteGroup.Size = new System.Drawing.Size(80, 23); this.btnDeleteGroup.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnDeleteGroup.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnDeleteGroup.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -150,7 +160,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.btnAddGroup.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnAddGroup.Location = new System.Drawing.Point(230, 8); this.btnAddGroup.Name = "btnAddGroup"; - this.btnAddGroup.Size = new System.Drawing.Size(46, 21); + this.btnAddGroup.Size = new System.Drawing.Size(46, 23); this.btnAddGroup.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnAddGroup.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnAddGroup.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -170,7 +180,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.txtGroupName.Location = new System.Drawing.Point(90, 8); this.txtGroupName.Name = "txtGroupName"; - this.txtGroupName.Size = new System.Drawing.Size(137, 21); + this.txtGroupName.Size = new System.Drawing.Size(137, 23); this.txtGroupName.TabIndex = 0; // // dgvProdGroup @@ -203,27 +213,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.dgvProdGroup.ReadOnly = true; this.dgvProdGroup.RowHeadersWidth = 51; this.dgvProdGroup.RowTemplate.Height = 23; - this.dgvProdGroup.Size = new System.Drawing.Size(383, 396); + this.dgvProdGroup.Size = new System.Drawing.Size(383, 397); this.dgvProdGroup.TabIndex = 189; this.dgvProdGroup.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvSaUser_CellContentClick); // - // btnClose - // - this.btnClose.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.btnClose.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnClose.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnClose.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnClose.ForeColor = System.Drawing.Color.White; - this.btnClose.Location = new System.Drawing.Point(321, 2); - this.btnClose.Margin = new System.Windows.Forms.Padding(2); - this.btnClose.Name = "btnClose"; - this.btnClose.Size = new System.Drawing.Size(66, 26); - this.btnClose.TabIndex = 374; - this.btnClose.Text = "关闭"; - this.btnClose.UseVisualStyleBackColor = false; - this.btnClose.Click += new System.EventHandler(this.btnClose_Click); - // // colSelect // this.colSelect.HeaderText = "选择"; @@ -258,22 +251,29 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.colSAddUserName.Visible = false; this.colSAddUserName.Width = 150; // - // label2 + // btnClose // - this.label2.AutoSize = true; - this.label2.ForeColor = System.Drawing.SystemColors.ActiveCaption; - this.label2.Location = new System.Drawing.Point(42, 36); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(305, 12); - this.label2.TabIndex = 842; - this.label2.Text = "备注：删除选中仅删除分组，原分组内的商品仍然保留。"; + this.btnClose.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.btnClose.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnClose.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnClose.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnClose.ForeColor = System.Drawing.Color.White; + this.btnClose.Location = new System.Drawing.Point(321, 2); + this.btnClose.Margin = new System.Windows.Forms.Padding(2); + this.btnClose.Name = "btnClose"; + this.btnClose.Size = new System.Drawing.Size(66, 26); + this.btnClose.TabIndex = 374; + this.btnClose.Text = "关闭"; + this.btnClose.UseVisualStyleBackColor = false; + this.btnClose.Click += new System.EventHandler(this.btnClose_Click); // // PDDDBProdGroupManageFrom // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.ClientSize = new System.Drawing.Size(393, 540); this.Controls.Add(this.panel2); + this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.KeyPreview = true; this.Name = "PDDDBProdGroupManageFrom"; diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs index 77580ff..dceaa8c 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs @@ -875,6 +875,46 @@ namespace TemuKJD.PDDForms.ProductSelectForms } } + public static void GetPDDProductNotes(List boxs, string notes_add_user_name = "", string addMoreItems = "") + { + var url = BaseClass.BuildPDDObjString("product/get_product_notes"); + var data = UserLogin.GetSignaturex(); + if (!string.IsNullOrWhiteSpace(notes_add_user_name)) + data += "&add_user_name=" + notes_add_user_name; + 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")) + { + //BaseMsgForm.ShowError("商品备注获取失败，请重试！" + BaseRegex.GetStringJson(ref html, "msg")); + } + else + { + MainForm.instance.Invoke(new Action(() => + { + foreach (var box in boxs) + { + box.Items.Clear(); + var groups = BaseRegex.GetStringJson(ref html, "data"); + box.Items.Add(""); + if (!string.IsNullOrEmpty(addMoreItems)) + { + foreach (var item in addMoreItems.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries)) + { + box.Items.Add(item); + } + } + foreach (var item in groups.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries)) + { + box.Items.Add(item); + } + } + })); + } + } + private void btnEditExtCodePriceOK_Click(object sender, EventArgs e) { var url = BaseClass.BuildPDDObjString("price/add_ext_code_price"); diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdNotesManageFrom.Designer.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdNotesManageFrom.Designer.cs new file mode 100644 index 0000000..8ffb22e --- /dev/null +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdNotesManageFrom.Designer.cs @@ -0,0 +1,316 @@ + +namespace TemuKJD.PDDForms.ProductSelectForms +{ + partial class PDDDBProdNotesManageFrom + { + /// + /// 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.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PDDDBProdNotesManageFrom)); + this.panel2 = new System.Windows.Forms.Panel(); + this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.splitContainer2 = new System.Windows.Forms.SplitContainer(); + this.label2 = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + this.btnDeleteGroup = new DevComponents.DotNetBar.PanelEx(); + this.btnAddGroup = new DevComponents.DotNetBar.PanelEx(); + this.txtNotes = new System.Windows.Forms.TextBox(); + this.dgvNotes = new TemuKJD.UserComponent.DataGridViewEx(); + this.btnClose = new TemuKJD.UserControls.ButtonEx(); + this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.colDbId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colNotes = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colAddUserName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.panel2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); + this.splitContainer1.Panel1.SuspendLayout(); + this.splitContainer1.Panel2.SuspendLayout(); + this.splitContainer1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit(); + this.splitContainer2.Panel1.SuspendLayout(); + this.splitContainer2.Panel2.SuspendLayout(); + this.splitContainer2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dgvNotes)).BeginInit(); + this.SuspendLayout(); + // + // panel2 + // + this.panel2.BackColor = System.Drawing.Color.White; + this.panel2.Controls.Add(this.splitContainer1); + this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel2.Location = new System.Drawing.Point(1, 33); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(391, 506); + this.panel2.TabIndex = 1; + // + // splitContainer1 + // + this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer1.Location = new System.Drawing.Point(0, 0); + this.splitContainer1.Name = "splitContainer1"; + this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal; + // + // splitContainer1.Panel1 + // + this.splitContainer1.Panel1.Controls.Add(this.splitContainer2); + this.splitContainer1.Panel1.Padding = new System.Windows.Forms.Padding(4); + // + // splitContainer1.Panel2 + // + this.splitContainer1.Panel2.Controls.Add(this.btnClose); + this.splitContainer1.Size = new System.Drawing.Size(391, 506); + this.splitContainer1.SplitterDistance = 463; + this.splitContainer1.TabIndex = 190; + // + // splitContainer2 + // + this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer2.Location = new System.Drawing.Point(4, 4); + this.splitContainer2.Name = "splitContainer2"; + this.splitContainer2.Orientation = System.Windows.Forms.Orientation.Horizontal; + // + // splitContainer2.Panel1 + // + this.splitContainer2.Panel1.Controls.Add(this.label2); + this.splitContainer2.Panel1.Controls.Add(this.label1); + this.splitContainer2.Panel1.Controls.Add(this.btnDeleteGroup); + this.splitContainer2.Panel1.Controls.Add(this.btnAddGroup); + this.splitContainer2.Panel1.Controls.Add(this.txtNotes); + // + // splitContainer2.Panel2 + // + this.splitContainer2.Panel2.Controls.Add(this.dgvNotes); + this.splitContainer2.Size = new System.Drawing.Size(383, 455); + this.splitContainer2.SplitterDistance = 54; + this.splitContainer2.TabIndex = 190; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.ForeColor = System.Drawing.SystemColors.ActiveCaption; + this.label2.Location = new System.Drawing.Point(42, 34); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(320, 17); + this.label2.TabIndex = 842; + this.label2.Text = "备注：删除选中仅删除备注，原备注关联的商品仍然保留。"; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(9, 11); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(80, 17); + this.label1.TabIndex = 835; + this.label1.Text = "输入备注内容"; + // + // btnDeleteGroup + // + this.btnDeleteGroup.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnDeleteGroup.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnDeleteGroup.DisabledBackColor = System.Drawing.Color.Empty; + this.btnDeleteGroup.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnDeleteGroup.Location = new System.Drawing.Point(296, 8); + this.btnDeleteGroup.Name = "btnDeleteGroup"; + this.btnDeleteGroup.Size = new System.Drawing.Size(80, 23); + this.btnDeleteGroup.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnDeleteGroup.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnDeleteGroup.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnDeleteGroup.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnDeleteGroup.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnDeleteGroup.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnDeleteGroup.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnDeleteGroup.Style.GradientAngle = 90; + this.btnDeleteGroup.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnDeleteGroup.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnDeleteGroup.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnDeleteGroup.TabIndex = 828; + this.btnDeleteGroup.Text = "删除选中"; + this.btnDeleteGroup.Click += new System.EventHandler(this.btnDeleteNotes_Click); + // + // btnAddGroup + // + this.btnAddGroup.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnAddGroup.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnAddGroup.DisabledBackColor = System.Drawing.Color.Empty; + this.btnAddGroup.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnAddGroup.Location = new System.Drawing.Point(230, 8); + this.btnAddGroup.Name = "btnAddGroup"; + this.btnAddGroup.Size = new System.Drawing.Size(46, 23); + this.btnAddGroup.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnAddGroup.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnAddGroup.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnAddGroup.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnAddGroup.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnAddGroup.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnAddGroup.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnAddGroup.Style.GradientAngle = 90; + this.btnAddGroup.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnAddGroup.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnAddGroup.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnAddGroup.TabIndex = 824; + this.btnAddGroup.Text = "新增"; + this.btnAddGroup.Click += new System.EventHandler(this.btnAddNotes_Click); + // + // txtGroupName + // + this.txtNotes.Location = new System.Drawing.Point(90, 8); + this.txtNotes.Name = "txtGroupName"; + this.txtNotes.Size = new System.Drawing.Size(137, 23); + this.txtNotes.TabIndex = 0; + // + // dgvProdGroup + // + this.dgvNotes.AllowUserToAddRows = false; + this.dgvNotes.AllowUserToDeleteRows = false; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvNotes.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + this.dgvNotes.AutoRowNumber = true; + this.dgvNotes.BackgroundColor = System.Drawing.Color.White; + this.dgvNotes.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.dgvNotes.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; + this.dgvNotes.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dgvNotes.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.colSelect, + this.colDbId, + this.colNotes, + this.colAddUserName}); + this.dgvNotes.Dock = System.Windows.Forms.DockStyle.Fill; + this.dgvNotes.Location = new System.Drawing.Point(0, 0); + this.dgvNotes.MultiSelectCheckBox = true; + this.dgvNotes.Name = "dgvProdGroup"; + this.dgvNotes.ReadOnly = true; + this.dgvNotes.RowHeadersWidth = 51; + this.dgvNotes.RowTemplate.Height = 23; + this.dgvNotes.Size = new System.Drawing.Size(383, 397); + this.dgvNotes.TabIndex = 189; + this.dgvNotes.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvSaUser_CellContentClick); + // + // btnClose + // + this.btnClose.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.btnClose.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnClose.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnClose.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnClose.ForeColor = System.Drawing.Color.White; + this.btnClose.Location = new System.Drawing.Point(321, 2); + this.btnClose.Margin = new System.Windows.Forms.Padding(2); + this.btnClose.Name = "btnClose"; + this.btnClose.Size = new System.Drawing.Size(66, 26); + this.btnClose.TabIndex = 374; + this.btnClose.Text = "关闭"; + this.btnClose.UseVisualStyleBackColor = false; + this.btnClose.Click += new System.EventHandler(this.btnClose_Click); + // + // colSelect + // + this.colSelect.HeaderText = "选择"; + this.colSelect.MinimumWidth = 6; + this.colSelect.Name = "colSelect"; + this.colSelect.ReadOnly = true; + this.colSelect.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colSelect.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colSelect.Width = 50; + // + // colDbId + // + this.colDbId.HeaderText = "数据库Id"; + this.colDbId.MinimumWidth = 6; + this.colDbId.Name = "colDbId"; + this.colDbId.ReadOnly = true; + this.colDbId.Visible = false; + this.colDbId.Width = 125; + // + // colNotes + // + this.colNotes.HeaderText = "备注"; + this.colNotes.Name = "colNotes"; + this.colNotes.ReadOnly = true; + this.colNotes.Width = 280; + // + // colSAddUserName + // + this.colAddUserName.HeaderText = "所属账户"; + this.colAddUserName.Name = "colSAddUserName"; + this.colAddUserName.ReadOnly = true; + this.colAddUserName.Visible = false; + this.colAddUserName.Width = 150; + // + // PDDDBProdNotesManageFrom + // + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; + this.ClientSize = new System.Drawing.Size(393, 540); + this.Controls.Add(this.panel2); + this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.KeyPreview = true; + this.Name = "PDDDBProdNotesManageFrom"; + this.Text = "备注管理"; + this.TitleText = "备注管理"; + this.Load += new System.EventHandler(this.AdminShopAddSubSaForm_Load); + this.Controls.SetChildIndex(this.panel2, 0); + this.panel2.ResumeLayout(false); + this.splitContainer1.Panel1.ResumeLayout(false); + this.splitContainer1.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); + this.splitContainer1.ResumeLayout(false); + this.splitContainer2.Panel1.ResumeLayout(false); + this.splitContainer2.Panel1.PerformLayout(); + this.splitContainer2.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit(); + this.splitContainer2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dgvNotes)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.Panel panel2; + private UserComponent.DataGridViewEx dgvNotes; + private System.Windows.Forms.SplitContainer splitContainer1; + private UserControls.ButtonEx btnClose; + private System.Windows.Forms.SplitContainer splitContainer2; + private System.Windows.Forms.TextBox txtNotes; + private DevComponents.DotNetBar.PanelEx btnDeleteGroup; + private DevComponents.DotNetBar.PanelEx btnAddGroup; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect; + private System.Windows.Forms.DataGridViewTextBoxColumn colDbId; + private System.Windows.Forms.DataGridViewTextBoxColumn colNotes; + private System.Windows.Forms.DataGridViewTextBoxColumn colAddUserName; + } +} \ No newline at end of file diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdNotesManageFrom.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdNotesManageFrom.cs new file mode 100644 index 0000000..5e073a4 --- /dev/null +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdNotesManageFrom.cs @@ -0,0 +1,164 @@ +using AllBase; +using AllBase.Model.Result; +using NaiBa.Util.Extension; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; +using TemuKJD.BaseForms; +using Work; + +namespace TemuKJD.PDDForms.ProductSelectForms +{ + public partial class PDDDBProdNotesManageFrom : BaseGeneralForm + { + public string AddUserName { get; set; } = "admin"; + public PDDDBProdNotesManageFrom(string addUserName = null) + { + InitializeComponent(); + if (addUserName != null) + { + AddUserName = addUserName; + } + } + + private void btnClose_Click(object sender, EventArgs e) + { + this.Close(); + } + + private void AdminShopAddSubSaForm_Load(object sender, EventArgs e) + { + GetNotes(); + } + + public void GetNotes() + { + dgvNotes.Rows.Clear(); + string url = BaseClass.BuildPDDObjString("product/get_product_notes"); + StringBuilder data = new StringBuilder(); + data.Append(UserLogin.GetSignaturex()); + data.Append("&is_get_detail=true"); + data.Append("&add_user_name=" + AddUserName); + string html = GetHtml.PostUtf8(url, data.ToString()); + if (string.IsNullOrEmpty(html)) + return; + if (html.Contains("\"data\"")) + { + var jObj = JsonHelper.JObjectParse(html); + foreach (Newtonsoft.Json.Linq.JObject obj in jObj["notes"]) + { + string oStr = JsonHelper.SerializeObject(obj); + + dgvNotes.Rows.Add( + false, + BaseRegex.GetIntJson(ref oStr, "id"), + BaseRegex.GetStringJson(ref oStr, "notes"), + BaseRegex.GetStringJson(ref oStr, "add_user_name")); + } + } + } + + private void dgvSaUser_CellContentClick(object sender, DataGridViewCellEventArgs e) + { + + if (e.ColumnIndex < 0 || e.RowIndex < 0) + return; + + ////string columnName = dgvSaUser.Columns[e.ColumnIndex].Name; + ////switch (columnName) + ////{ + //// case "colSelect": + //var value = dgvProdNotes.Rows[e.RowIndex].Cells["colSelect"].Value; + //foreach (DataGridViewRow row in this.dgvProdNotes.Rows) + // row.Cells["colSelect"].Value = false; + //dgvProdNotes.Rows[e.RowIndex].Cells["colSelect"].Value = !(bool)value; + //// break; + //// default: + //// break; + ////} + /// + dgvNotes.Rows[e.RowIndex].Cells["colSelect"].Value = !dgvNotes.Rows[e.RowIndex].Cells["colSelect"].Value.ParseToBool(); + } + + private void btnDeleteNotes_Click(object sender, EventArgs e) + { + var selectRows = this.dgvNotes.Rows.Cast().Where(r => r.Cells["colSelect"]?.Value.ParseToBool() == true).ToList(); + if (selectRows.Count == 0) + { + BaseMsgForm.ShowError("请选择要删除的备注！"); + return; + } + + StringBuilder data = new StringBuilder(); + data.Append(UserLogin.GetSignaturex()); + data.Append("¬es=" + string.Join(",", selectRows.Select(r => r.Cells["colNotes"].Value.ParseToString()))); + data.Append("&add_user_name=" + AddUserName); + string url = BaseClass.BuildPDDObjString("product/del_product_notes"); + string html = GetHtml.PostUtf8(url, data.ToString()).Trim(); + if (!string.IsNullOrEmpty(html)) + { + if (html.Contains("\"code\":200")) + { + BaseMsgForm.ShowInfo("删除成功！"); + foreach (var row in selectRows) + dgvNotes.Rows.Remove(row); + //this.Close(); + } + else + { + var msg = BaseRegex.GetStringJson(ref html, "msg"); + if (string.IsNullOrEmpty(msg)) + msg = html; + BaseMsgForm.ShowError(msg, "错误"); + } + } + else + BaseMsgForm.ShowError("未知错误，请重试！", "错误"); + } + + private void btnAddNotes_Click(object sender, EventArgs e) + { + AddProductNotes(txtNotes.Text, AddUserName); + this.GetNotes(); + //this.Close(); + } + + public static void AddProductNotes(string notes, string add_user_name = "admin") + { + if (string.IsNullOrEmpty(notes)) + { + BaseMsgForm.ShowError("请输入"); + return; + } + + StringBuilder data = new StringBuilder(); + data.Append(UserLogin.GetSignaturex()); + data.Append("&add_user_name=" + add_user_name); + data.Append("¬es=" + notes); + string url = BaseClass.BuildPDDObjString("product/add_product_notes"); + string html = GetHtml.PostUtf8(url, data.ToString()).Trim(); + if (!string.IsNullOrEmpty(html)) + { + if (html.Contains("\"code\":200")) + { + BaseMsgForm.ShowInfo("添加成功！"); + } + else + { + var msg = BaseRegex.GetStringJson(ref html, "msg"); + if (string.IsNullOrEmpty(msg)) + msg = html; + BaseMsgForm.ShowError(msg, "错误"); + } + } + else + BaseMsgForm.ShowError("未知错误，请重试！", "错误"); + } + } +} diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdNotesManageFrom.resx b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdNotesManageFrom.resx new file mode 100644 index 0000000..b354c36 --- /dev/null +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdNotesManageFrom.resx @@ -0,0 +1,310 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + 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/PDDForms/ProductSelectForms/UcAddPrice.Designer.cs b/TEMUKJD/PDDForms/ProductSelectForms/UcAddPrice.Designer.cs index 006a433..d246964 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/UcAddPrice.Designer.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/UcAddPrice.Designer.cs @@ -70,7 +70,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.txtPriceStart.Location = new System.Drawing.Point(0, 0); this.txtPriceStart.Margin = new System.Windows.Forms.Padding(0); this.txtPriceStart.Name = "txtPriceStart"; - this.txtPriceStart.Size = new System.Drawing.Size(38, 23); + this.txtPriceStart.Size = new System.Drawing.Size(36, 23); this.txtPriceStart.TabIndex = 551; this.txtPriceStart.Text = "0.0"; this.txtPriceStart.TextChanged += new System.EventHandler(this.Price_TextChanged); @@ -79,7 +79,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.lblPrice.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lblPrice.AutoSize = true; - this.lblPrice.Location = new System.Drawing.Point(38, 3); + this.lblPrice.Location = new System.Drawing.Point(36, 3); this.lblPrice.Margin = new System.Windows.Forms.Padding(0); this.lblPrice.Name = "lblPrice"; this.lblPrice.Size = new System.Drawing.Size(58, 17); @@ -89,10 +89,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms // txtPriceEnd // this.txtPriceEnd.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.txtPriceEnd.Location = new System.Drawing.Point(96, 0); + this.txtPriceEnd.Location = new System.Drawing.Point(94, 0); this.txtPriceEnd.Margin = new System.Windows.Forms.Padding(0); this.txtPriceEnd.Name = "txtPriceEnd"; - this.txtPriceEnd.Size = new System.Drawing.Size(38, 23); + this.txtPriceEnd.Size = new System.Drawing.Size(36, 23); this.txtPriceEnd.TabIndex = 549; this.txtPriceEnd.Text = "999.0"; this.txtPriceEnd.TextChanged += new System.EventHandler(this.Price_TextChanged); @@ -101,7 +101,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.label9.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(134, 3); + this.label9.Location = new System.Drawing.Point(130, 3); this.label9.Margin = new System.Windows.Forms.Padding(0); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(44, 17); @@ -111,10 +111,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms // txtAddTimes // this.txtAddTimes.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.txtAddTimes.Location = new System.Drawing.Point(178, 0); + this.txtAddTimes.Location = new System.Drawing.Point(174, 0); this.txtAddTimes.Margin = new System.Windows.Forms.Padding(0); this.txtAddTimes.Name = "txtAddTimes"; - this.txtAddTimes.Size = new System.Drawing.Size(31, 23); + this.txtAddTimes.Size = new System.Drawing.Size(26, 23); this.txtAddTimes.TabIndex = 544; this.txtAddTimes.Text = "2.0"; this.txtAddTimes.TextChanged += new System.EventHandler(this.Price_TextChanged); @@ -123,7 +123,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.label10.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(209, 3); + this.label10.Location = new System.Drawing.Point(200, 3); this.label10.Margin = new System.Windows.Forms.Padding(0); this.label10.Name = "label10"; this.label10.Size = new System.Drawing.Size(44, 17); @@ -133,10 +133,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms // txtAddMorePrice // this.txtAddMorePrice.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.txtAddMorePrice.Location = new System.Drawing.Point(253, 0); + this.txtAddMorePrice.Location = new System.Drawing.Point(244, 0); this.txtAddMorePrice.Margin = new System.Windows.Forms.Padding(0); this.txtAddMorePrice.Name = "txtAddMorePrice"; - this.txtAddMorePrice.Size = new System.Drawing.Size(31, 23); + this.txtAddMorePrice.Size = new System.Drawing.Size(30, 23); this.txtAddMorePrice.TabIndex = 547; this.txtAddMorePrice.Text = "10.0"; this.txtAddMorePrice.TextChanged += new System.EventHandler(this.Price_TextChanged); @@ -145,7 +145,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.lblSinglePriceAdd.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lblSinglePriceAdd.AutoSize = true; - this.lblSinglePriceAdd.Location = new System.Drawing.Point(284, 3); + this.lblSinglePriceAdd.Location = new System.Drawing.Point(274, 3); this.lblSinglePriceAdd.Margin = new System.Windows.Forms.Padding(0); this.lblSinglePriceAdd.Name = "lblSinglePriceAdd"; this.lblSinglePriceAdd.Size = new System.Drawing.Size(68, 17); @@ -155,7 +155,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // txtSinglePriceAdd // this.txtSinglePriceAdd.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.txtSinglePriceAdd.Location = new System.Drawing.Point(352, 0); + this.txtSinglePriceAdd.Location = new System.Drawing.Point(342, 0); this.txtSinglePriceAdd.Margin = new System.Windows.Forms.Padding(0); this.txtSinglePriceAdd.Name = "txtSinglePriceAdd"; this.txtSinglePriceAdd.Size = new System.Drawing.Size(31, 23); @@ -167,7 +167,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.label1.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(383, 3); + this.label1.Location = new System.Drawing.Point(373, 3); this.label1.Margin = new System.Windows.Forms.Padding(0); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(20, 17); @@ -180,7 +180,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.lblClose.AutoSize = true; this.lblClose.Cursor = System.Windows.Forms.Cursors.Hand; this.lblClose.ForeColor = System.Drawing.SystemColors.HotTrack; - this.lblClose.Location = new System.Drawing.Point(403, 3); + this.lblClose.Location = new System.Drawing.Point(393, 3); this.lblClose.Margin = new System.Windows.Forms.Padding(0); this.lblClose.Name = "lblClose"; this.lblClose.Size = new System.Drawing.Size(17, 17); diff --git a/TEMUKJD/Properties/Resources.Designer.cs b/TEMUKJD/Properties/Resources.Designer.cs index 35b9ba3..4407301 100644 --- a/TEMUKJD/Properties/Resources.Designer.cs +++ b/TEMUKJD/Properties/Resources.Designer.cs @@ -229,6 +229,16 @@ namespace TemuKJD.Properties { } } + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap empty_book_900_1200 { + get { + object obj = ResourceManager.GetObject("empty_book_900_1200", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// diff --git a/TEMUKJD/Properties/Resources.resx b/TEMUKJD/Properties/Resources.resx index 204c46d..b4b1309 100644 --- a/TEMUKJD/Properties/Resources.resx +++ b/TEMUKJD/Properties/Resources.resx @@ -160,6 +160,9 @@ ..\static\dycategorys.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 + + ..\Resources\empty_book_900_1200.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\resources\errpic.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/TEMUKJD/Resources/empty_book_900_1200.jpg b/TEMUKJD/Resources/empty_book_900_1200.jpg new file mode 100644 index 0000000..304d4da Binary files /dev/null and b/TEMUKJD/Resources/empty_book_900_1200.jpg differ diff --git a/TEMUKJD/WXForms/AdminForms/WXAdminAccountBalanceForm.Designer.cs b/TEMUKJD/WXForms/AdminForms/WXAdminAccountBalanceForm.Designer.cs index fe04841..a2a0c92 100644 --- a/TEMUKJD/WXForms/AdminForms/WXAdminAccountBalanceForm.Designer.cs +++ b/TEMUKJD/WXForms/AdminForms/WXAdminAccountBalanceForm.Designer.cs @@ -46,6 +46,8 @@ namespace TemuKJD.WXForms.AdminForms this.panel1 = new System.Windows.Forms.Panel(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); + this.txtOutOrderId = new System.Windows.Forms.TextBox(); + this.label6 = new System.Windows.Forms.Label(); this.lblProfit = new System.Windows.Forms.Label(); this.label13 = new System.Windows.Forms.Label(); this.label12 = new System.Windows.Forms.Label(); @@ -114,6 +116,8 @@ namespace TemuKJD.WXForms.AdminForms this.colCreateTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colRemark = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage(); + this.txtShopOrderNo = new System.Windows.Forms.TextBox(); + this.label9 = new System.Windows.Forms.Label(); this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit(); this.splitContainer2.Panel1.SuspendLayout(); @@ -167,6 +171,10 @@ namespace TemuKJD.WXForms.AdminForms | System.Windows.Forms.AnchorStyles.Right))); this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx1.Controls.Add(this.txtShopOrderNo); + this.ucGroupBoxEx1.Controls.Add(this.label9); + this.ucGroupBoxEx1.Controls.Add(this.txtOutOrderId); + this.ucGroupBoxEx1.Controls.Add(this.label6); this.ucGroupBoxEx1.Controls.Add(this.lblProfit); this.ucGroupBoxEx1.Controls.Add(this.label13); this.ucGroupBoxEx1.Controls.Add(this.label12); @@ -194,11 +202,29 @@ namespace TemuKJD.WXForms.AdminForms this.ucGroupBoxEx1.TabStop = false; this.ucGroupBoxEx1.Text = "查询条件"; // + // txtOutOrderId + // + this.txtOutOrderId.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.txtOutOrderId.Location = new System.Drawing.Point(325, 21); + this.txtOutOrderId.Name = "txtOutOrderId"; + this.txtOutOrderId.Size = new System.Drawing.Size(136, 23); + this.txtOutOrderId.TabIndex = 1165; + // + // label6 + // + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(270, 24); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(56, 17); + this.label6.TabIndex = 1192; + this.label6.Text = "买手单号"; + this.label6.Click += new System.EventHandler(this.label6_Click); + // // lblProfit // this.lblProfit.AutoSize = true; this.lblProfit.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.lblProfit.Location = new System.Drawing.Point(1261, 24); + this.lblProfit.Location = new System.Drawing.Point(1271, 24); this.lblProfit.Name = "lblProfit"; this.lblProfit.Size = new System.Drawing.Size(40, 17); this.lblProfit.TabIndex = 1185; @@ -208,7 +234,7 @@ namespace TemuKJD.WXForms.AdminForms // label13 // this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(1166, 24); + this.label13.Location = new System.Drawing.Point(1176, 24); this.label13.Name = "label13"; this.label13.Size = new System.Drawing.Size(104, 17); this.label13.TabIndex = 1184; @@ -218,7 +244,7 @@ namespace TemuKJD.WXForms.AdminForms // label12 // this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(546, 24); + this.label12.Location = new System.Drawing.Point(682, 24); this.label12.Name = "label12"; this.label12.Size = new System.Drawing.Size(80, 17); this.label12.TabIndex = 1183; @@ -228,7 +254,7 @@ namespace TemuKJD.WXForms.AdminForms // lblPostageNotReturnCnt // this.lblPostageNotReturnCnt.AutoSize = true; - this.lblPostageNotReturnCnt.Location = new System.Drawing.Point(993, 51); + this.lblPostageNotReturnCnt.Location = new System.Drawing.Point(1056, 51); this.lblPostageNotReturnCnt.Name = "lblPostageNotReturnCnt"; this.lblPostageNotReturnCnt.Size = new System.Drawing.Size(135, 17); this.lblPostageNotReturnCnt.TabIndex = 1182; @@ -238,7 +264,7 @@ namespace TemuKJD.WXForms.AdminForms // label10 // this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(910, 51); + this.label10.Location = new System.Drawing.Point(973, 51); this.label10.Name = "label10"; this.label10.Size = new System.Drawing.Size(92, 17); this.label10.TabIndex = 1181; @@ -248,7 +274,7 @@ namespace TemuKJD.WXForms.AdminForms // lblPostageWeightTotal // this.lblPostageWeightTotal.AutoSize = true; - this.lblPostageWeightTotal.Location = new System.Drawing.Point(747, 51); + this.lblPostageWeightTotal.Location = new System.Drawing.Point(858, 51); this.lblPostageWeightTotal.Name = "lblPostageWeightTotal"; this.lblPostageWeightTotal.Size = new System.Drawing.Size(126, 17); this.lblPostageWeightTotal.TabIndex = 1180; @@ -258,7 +284,7 @@ namespace TemuKJD.WXForms.AdminForms // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(652, 51); + this.label8.Location = new System.Drawing.Point(763, 51); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(104, 17); this.label8.TabIndex = 1179; @@ -268,7 +294,7 @@ namespace TemuKJD.WXForms.AdminForms // lblPostageReturnTotal // this.lblPostageReturnTotal.AutoSize = true; - this.lblPostageReturnTotal.Location = new System.Drawing.Point(993, 24); + this.lblPostageReturnTotal.Location = new System.Drawing.Point(1056, 24); this.lblPostageReturnTotal.Name = "lblPostageReturnTotal"; this.lblPostageReturnTotal.Size = new System.Drawing.Size(123, 17); this.lblPostageReturnTotal.TabIndex = 1178; @@ -278,7 +304,7 @@ namespace TemuKJD.WXForms.AdminForms // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(898, 24); + this.label7.Location = new System.Drawing.Point(961, 24); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(104, 17); this.label7.TabIndex = 1177; @@ -288,7 +314,7 @@ namespace TemuKJD.WXForms.AdminForms // lblPostageTotal // this.lblPostageTotal.AutoSize = true; - this.lblPostageTotal.Location = new System.Drawing.Point(747, 24); + this.lblPostageTotal.Location = new System.Drawing.Point(858, 24); this.lblPostageTotal.Name = "lblPostageTotal"; this.lblPostageTotal.Size = new System.Drawing.Size(85, 17); this.lblPostageTotal.TabIndex = 1176; @@ -298,7 +324,7 @@ namespace TemuKJD.WXForms.AdminForms // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(652, 24); + this.label3.Location = new System.Drawing.Point(763, 24); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(104, 17); this.label3.TabIndex = 1169; @@ -311,7 +337,7 @@ namespace TemuKJD.WXForms.AdminForms this.btnSearchShop.Cursor = System.Windows.Forms.Cursors.Hand; this.btnSearchShop.DisabledBackColor = System.Drawing.Color.Empty; this.btnSearchShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSearchShop.Location = new System.Drawing.Point(419, 51); + this.btnSearchShop.Location = new System.Drawing.Point(566, 51); this.btnSearchShop.Name = "btnSearchShop"; this.btnSearchShop.Size = new System.Drawing.Size(27, 23); this.btnSearchShop.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -332,7 +358,7 @@ namespace TemuKJD.WXForms.AdminForms // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(11, 54); + this.label1.Location = new System.Drawing.Point(154, 54); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(44, 17); this.label1.TabIndex = 1158; @@ -341,9 +367,9 @@ namespace TemuKJD.WXForms.AdminForms // txtUserName // this.txtUserName.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.txtUserName.Location = new System.Drawing.Point(55, 51); + this.txtUserName.Location = new System.Drawing.Point(198, 51); this.txtUserName.Name = "txtUserName"; - this.txtUserName.Size = new System.Drawing.Size(358, 23); + this.txtUserName.Size = new System.Drawing.Size(365, 23); this.txtUserName.TabIndex = 1157; // // btnSearch @@ -352,9 +378,9 @@ namespace TemuKJD.WXForms.AdminForms 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(451, 51); + this.btnSearch.Location = new System.Drawing.Point(596, 51); this.btnSearch.Name = "btnSearch"; - this.btnSearch.Size = new System.Drawing.Size(58, 23); + this.btnSearch.Size = new System.Drawing.Size(63, 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))))); @@ -372,22 +398,23 @@ namespace TemuKJD.WXForms.AdminForms // // dtpTimeEnd // - this.dtpTimeEnd.Location = new System.Drawing.Point(377, 21); + this.dtpTimeEnd.Location = new System.Drawing.Point(165, 21); this.dtpTimeEnd.Name = "dtpTimeEnd"; - this.dtpTimeEnd.Size = new System.Drawing.Size(132, 23); + this.dtpTimeEnd.Size = new System.Drawing.Size(100, 23); this.dtpTimeEnd.TabIndex = 1149; // // dtpTimeBegin // - this.dtpTimeBegin.Location = new System.Drawing.Point(239, 21); + this.dtpTimeBegin.Location = new System.Drawing.Point(63, 21); this.dtpTimeBegin.Name = "dtpTimeBegin"; - this.dtpTimeBegin.Size = new System.Drawing.Size(132, 23); + this.dtpTimeBegin.Size = new System.Drawing.Size(100, 23); this.dtpTimeBegin.TabIndex = 1148; + this.dtpTimeBegin.ValueChanged += new System.EventHandler(this.dtpTimeBegin_ValueChanged); // // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(182, 24); + this.label5.Location = new System.Drawing.Point(7, 24); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(56, 17); this.label5.TabIndex = 1147; @@ -396,7 +423,7 @@ namespace TemuKJD.WXForms.AdminForms // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(22, 24); + this.label4.Location = new System.Drawing.Point(31, 54); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(32, 17); this.label4.TabIndex = 1145; @@ -412,9 +439,9 @@ namespace TemuKJD.WXForms.AdminForms "支付宝充值", "拍单扣除/作废返还", "超重扣费"}); - this.cmbType.Location = new System.Drawing.Point(55, 20); + this.cmbType.Location = new System.Drawing.Point(63, 50); this.cmbType.Name = "cmbType"; - this.cmbType.Size = new System.Drawing.Size(121, 25); + this.cmbType.Size = new System.Drawing.Size(90, 25); this.cmbType.TabIndex = 0; this.cmbType.Text = "充值"; // @@ -1008,6 +1035,23 @@ namespace TemuKJD.WXForms.AdminForms this.ucSplitPage1.TotalPage = 1; this.ucSplitPage1.PageChange += new System.Action(this.ucSplitPage1_PageChange); // + // txtShopOrderNo + // + this.txtShopOrderNo.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.txtShopOrderNo.Location = new System.Drawing.Point(523, 21); + this.txtShopOrderNo.Name = "txtShopOrderNo"; + this.txtShopOrderNo.Size = new System.Drawing.Size(136, 23); + this.txtShopOrderNo.TabIndex = 1199; + // + // label9 + // + this.label9.AutoSize = true; + this.label9.Location = new System.Drawing.Point(467, 24); + this.label9.Name = "label9"; + this.label9.Size = new System.Drawing.Size(56, 17); + this.label9.TabIndex = 1200; + this.label9.Text = "店铺单号"; + // // WXAdminAccountBalanceForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -1116,5 +1160,9 @@ namespace TemuKJD.WXForms.AdminForms private System.Windows.Forms.Label label7; private System.Windows.Forms.Label lblPostageTotal; private System.Windows.Forms.Label label3; + private System.Windows.Forms.Label label6; + private System.Windows.Forms.TextBox txtOutOrderId; + private System.Windows.Forms.TextBox txtShopOrderNo; + private System.Windows.Forms.Label label9; } } \ No newline at end of file diff --git a/TEMUKJD/WXForms/AdminForms/WXAdminAccountBalanceForm.cs b/TEMUKJD/WXForms/AdminForms/WXAdminAccountBalanceForm.cs index c52c513..e03aabb 100644 --- a/TEMUKJD/WXForms/AdminForms/WXAdminAccountBalanceForm.cs +++ b/TEMUKJD/WXForms/AdminForms/WXAdminAccountBalanceForm.cs @@ -4,6 +4,7 @@ using AllBase.Model.DBModel; using AllBase.Model.Result; using CefSharp; using CefSharp.WinForms; +using DevComponents.AdvTree; using DevComponents.WinForms.Drawing; using NaiBa.CefHelper; using NaiBa.Util.Extension; @@ -101,6 +102,10 @@ namespace TemuKJD.WXForms.AdminForms data3 += "&type_in=20,23"; if (cmbType.Text == "超重扣费") data3 += "&type_in=24"; + if (!string.IsNullOrEmpty(txtOutOrderId.Text.Trim())) + data3 += "&order_id_in=" + txtOutOrderId.Text.Trim(); + if (!string.IsNullOrEmpty(txtShopOrderNo.Text.Trim())) + data3 += "&remark_fulltext=" + txtShopOrderNo.Text.Trim(); data3 += "&page=" + ucSplitPage1.CurrentPage; data3 += "&page_size=" + ucSplitPage1.PageSize; pageSize = ucSplitPage1.PageSize; @@ -113,6 +118,7 @@ namespace TemuKJD.WXForms.AdminForms BaseMsgForm.ShowError("查询失败：" + BaseRegex.GetStringJsonByRegs(ref html3, html3, "msg")); return; } + List paymentList = new List(); paymentList = JsonHelper.DeserializeJsonToList(JsonHelper.JObjectParse(html3)["data"].ParseToString()); foreach (var payment in paymentList) @@ -129,7 +135,19 @@ namespace TemuKJD.WXForms.AdminForms payment.create_time.ToString("yyyy-MM-dd HH:mm:ss"), payment.remark ); - this.dgvPayment.Rows[rowIndex].Height = 60; + var row = this.dgvPayment.Rows[rowIndex]; + row.Height = 60; + + var rowExists = dgvPayment.Rows.Cast() + .Where(r => r.Cells["colOrderId"].Value.ParseToString() == payment.order_id && r.Cells["colType"].Value.ParseToString() == "中转仓作废返还收入").ToList(); + if (rowExists.Count > 1) + { + var c = Color.FromArgb(Randomx.GetId(127, 200), Randomx.GetId(127, 200), Randomx.GetId(127, 200)); + foreach (var rowExist in rowExists) + { + rowExist.Cells["colOrderId"].Style.BackColor = c; + } + } })); } int count = BaseRegex.GetIntJson(ref html3, "count"); @@ -374,5 +392,15 @@ namespace TemuKJD.WXForms.AdminForms await Task.Run(() => { GetUser(); }); pictureBox1.Visible = false; } + + private void label6_Click(object sender, EventArgs e) + { + + } + + private void dtpTimeBegin_ValueChanged(object sender, EventArgs e) + { + + } } } diff --git a/TEMUKJD/WXForms/AiTalkForms/WxAiTalkForm.cs b/TEMUKJD/WXForms/AiTalkForms/WxAiTalkForm.cs index 4aca353..3e07fde 100644 --- a/TEMUKJD/WXForms/AiTalkForms/WxAiTalkForm.cs +++ b/TEMUKJD/WXForms/AiTalkForms/WxAiTalkForm.cs @@ -527,24 +527,29 @@ namespace TemuKJD.WXForms.AiTalkForms Thread.Sleep(500); } - var shopIds = string.Join(",", GlobalConfig.ShopLoginList.Select(s => s.ShopId)); - url = AiTalkUrl + "/api/stores?page=1&pageSize=5000&keyword=" + shopIds; - refer = AiTalkUrl + "/api/stores"; - var adminCookies = CEFBrowser.GetCookieList("", aiTalkAdminWebBrowser.RequestContext.GetCookieManager(null)); - rst = HttpResponseWxAiTalkBLL.GetResponse(new ShopLoginInfo() { Cookies = JsonHelper.SerializeObject(adminCookies) }, url, refer); - - if (rst.Contains("\"stores\":[")) + int pageSize = 5000; + for (int i = 1; i <= 100; i++) { - List aiTalkInfoLst = JsonHelper.DeserializeJsonToList(JsonHelper.JObjectParse(rst)["stores"].ParseToString()); - foreach (var shop in GlobalConfig.ShopLoginList) + var shopIds = string.Join(",", GlobalConfig.ShopLoginList.Select(s => s.ShopId)); + url = AiTalkUrl + "/api/stores?page=" + i + "&pageSize=" + pageSize + "&keyword=" + shopIds; + refer = AiTalkUrl + "/api/stores"; + var adminCookies = CEFBrowser.GetCookieList("", aiTalkAdminWebBrowser.RequestContext.GetCookieManager(null)); + rst = HttpResponseWxAiTalkBLL.GetResponse(new ShopLoginInfo() { Cookies = JsonHelper.SerializeObject(adminCookies) }, url, refer); + if (rst.Contains("\"stores\":[")) { - shop.shopAiTalkInfo = aiTalkInfoLst.FirstOrDefault(s => s.id == shop.ShopId); + List aiTalkInfoLst = JsonHelper.DeserializeJsonToList(JsonHelper.JObjectParse(rst)["stores"].ParseToString()); + foreach (var shop in GlobalConfig.ShopLoginList) + { + shop.shopAiTalkInfo = aiTalkInfoLst.FirstOrDefault(s => s.id == shop.ShopId); + } + if (aiTalkInfoLst.Count < pageSize) + break; + } + else + { + BaseMsgForm.ShowError("AI客服账户登录失败，请稍候重试！"); + return; } - } - else - { - BaseMsgForm.ShowError("AI客服账户登录失败，请稍候重试！"); - return; } Thread.Sleep(1000); diff --git a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.Designer.cs b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.Designer.cs index bfa3ebd..2c86371 100644 --- a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.Designer.cs +++ b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.Designer.cs @@ -32,19 +32,22 @@ namespace TemuKJD.WXForms.ProductForms private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); + 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(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.ucGroupBoxEx2 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); + this.txtStockNum = new System.Windows.Forms.TextBox(); + this.txtShippingPriceTimes = new System.Windows.Forms.TextBox(); + this.txtAddTimes = new System.Windows.Forms.TextBox(); + this.txtAddMorePrice = new System.Windows.Forms.TextBox(); this.label6 = new System.Windows.Forms.Label(); this.chkRemoveSpecialChar = new TemuKJD.UserComponent.UcCheckBox(this.components); - this.txtShippingPriceTimes = new System.Windows.Forms.TextBox(); this.label13 = new System.Windows.Forms.Label(); this.btnStop = new DevComponents.DotNetBar.PanelEx(); this.label7 = new System.Windows.Forms.Label(); @@ -52,7 +55,6 @@ namespace TemuKJD.WXForms.ProductForms this.chkAddMorePriceFirst = new TemuKJD.UserComponent.UcCheckBox(this.components); this.btnClearDgv = new DevComponents.DotNetBar.PanelEx(); this.label14 = new System.Windows.Forms.Label(); - this.label15 = new System.Windows.Forms.Label(); this.pnlStep = new System.Windows.Forms.Panel(); this.panel3 = new System.Windows.Forms.Panel(); this.fPnlPriceRule = new System.Windows.Forms.FlowLayoutPanel(); @@ -60,11 +62,8 @@ namespace TemuKJD.WXForms.ProductForms this.ucAddPrice2 = new TemuKJD.PDDForms.ProductSelectForms.UcAddPrice(); this.lblNewAddPrice = new System.Windows.Forms.Label(); this.txtWaitSeconds = new System.Windows.Forms.TextBox(); - this.txtAddMorePrice = new System.Windows.Forms.TextBox(); - this.txtAddTimes = new System.Windows.Forms.TextBox(); this.label10 = new System.Windows.Forms.Label(); this.btnUpload = new DevComponents.DotNetBar.PanelEx(); - this.txtStockNum = new System.Windows.Forms.TextBox(); this.label4 = new System.Windows.Forms.Label(); this.label9 = new System.Windows.Forms.Label(); this.chkStepAddPrice = new TemuKJD.UserComponent.UcCheckBox(this.components); @@ -101,6 +100,7 @@ namespace TemuKJD.WXForms.ProductForms this.label22 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label(); this.label39 = new System.Windows.Forms.Label(); + this.chkSkipReplaceText = new TemuKJD.UserComponent.UcCheckBox(this.components); this.佣金上货 = new System.Windows.Forms.TabPage(); this.label31 = new System.Windows.Forms.Label(); this.txtCommissionChangeValue = new System.Windows.Forms.TextBox(); @@ -136,17 +136,19 @@ namespace TemuKJD.WXForms.ProductForms this.chkRandomImgBorder = new TemuKJD.UserComponent.UcCheckBox(this.components); this.line1 = new DevComponents.DotNetBar.Controls.Line(); this.label37 = new System.Windows.Forms.Label(); + this.label15 = new System.Windows.Forms.Label(); this.ucGroupBoxEx4 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); + this.cmbNotes = new System.Windows.Forms.ComboBox(); this.cmbJstInitSet = new System.Windows.Forms.ComboBox(); this.pbSelectProd = new System.Windows.Forms.PictureBox(); this.chkSevenDays = new TemuKJD.UserComponent.UcCheckBox(this.components); this.chkSkipQualification = new TemuKJD.UserComponent.UcCheckBox(this.components); this.lblGoodsCount = new System.Windows.Forms.Label(); this.txtRandomFissionProductCount = new System.Windows.Forms.TextBox(); + this.lblJstInitSet = new System.Windows.Forms.Label(); this.btnSwitchCatType = new DevComponents.DotNetBar.PanelEx(); this.cmbHot = new System.Windows.Forms.ComboBox(); this.btnProdDb = new DevComponents.DotNetBar.PanelEx(); - this.chkWXComplateProd = new TemuKJD.UserComponent.UcCheckBox(this.components); this.txtAddCount = new System.Windows.Forms.TextBox(); this.txtSearchGoodsName = new System.Windows.Forms.TextBox(); this.cmbSourceType = new System.Windows.Forms.ComboBox(); @@ -170,7 +172,8 @@ namespace TemuKJD.WXForms.ProductForms this.label19 = new System.Windows.Forms.Label(); this.chkRandomFissionProduct = new TemuKJD.UserComponent.UcCheckBox(this.components); this.lblWaitToUp = new System.Windows.Forms.Label(); - this.lblJstInitSet = new System.Windows.Forms.Label(); + this.chkWXComplateProd = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.lblNotes = new System.Windows.Forms.Label(); this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.cmbFilterShopGroup = new TemuKJD.UserComponent.UcComboBoxMutiSelect(); this.label24 = new System.Windows.Forms.Label(); @@ -303,9 +306,12 @@ namespace TemuKJD.WXForms.ProductForms this.ucGroupBoxEx2.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.ucGroupBoxEx2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.ucGroupBoxEx2.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx2.Controls.Add(this.txtStockNum); + this.ucGroupBoxEx2.Controls.Add(this.txtShippingPriceTimes); + this.ucGroupBoxEx2.Controls.Add(this.txtAddTimes); + this.ucGroupBoxEx2.Controls.Add(this.txtAddMorePrice); this.ucGroupBoxEx2.Controls.Add(this.label6); this.ucGroupBoxEx2.Controls.Add(this.chkRemoveSpecialChar); - this.ucGroupBoxEx2.Controls.Add(this.txtShippingPriceTimes); this.ucGroupBoxEx2.Controls.Add(this.label13); this.ucGroupBoxEx2.Controls.Add(this.btnStop); this.ucGroupBoxEx2.Controls.Add(this.label7); @@ -313,31 +319,71 @@ namespace TemuKJD.WXForms.ProductForms this.ucGroupBoxEx2.Controls.Add(this.chkAddMorePriceFirst); this.ucGroupBoxEx2.Controls.Add(this.btnClearDgv); this.ucGroupBoxEx2.Controls.Add(this.label14); - this.ucGroupBoxEx2.Controls.Add(this.label15); this.ucGroupBoxEx2.Controls.Add(this.pnlStep); this.ucGroupBoxEx2.Controls.Add(this.lblNewAddPrice); this.ucGroupBoxEx2.Controls.Add(this.txtWaitSeconds); - this.ucGroupBoxEx2.Controls.Add(this.txtAddMorePrice); - this.ucGroupBoxEx2.Controls.Add(this.txtAddTimes); this.ucGroupBoxEx2.Controls.Add(this.label10); this.ucGroupBoxEx2.Controls.Add(this.btnUpload); - this.ucGroupBoxEx2.Controls.Add(this.txtStockNum); this.ucGroupBoxEx2.Controls.Add(this.label4); this.ucGroupBoxEx2.Controls.Add(this.label9); this.ucGroupBoxEx2.Controls.Add(this.chkStepAddPrice); this.ucGroupBoxEx2.Controls.Add(this.ucTabControlMetro1); - this.ucGroupBoxEx2.Location = new System.Drawing.Point(595, 2); + this.ucGroupBoxEx2.Controls.Add(this.label15); + this.ucGroupBoxEx2.Location = new System.Drawing.Point(608, 2); this.ucGroupBoxEx2.Name = "ucGroupBoxEx2"; - this.ucGroupBoxEx2.Size = new System.Drawing.Size(1113, 165); + this.ucGroupBoxEx2.Size = new System.Drawing.Size(1100, 165); this.ucGroupBoxEx2.TabIndex = 667; this.ucGroupBoxEx2.TabStop = false; this.ucGroupBoxEx2.Text = "商品上传"; // + // txtStockNum + // + this.txtStockNum.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.txtStockNum.Location = new System.Drawing.Point(378, 135); + this.txtStockNum.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtStockNum.Name = "txtStockNum"; + this.txtStockNum.Size = new System.Drawing.Size(30, 23); + this.txtStockNum.TabIndex = 530; + this.txtStockNum.Text = "99"; + this.txtStockNum.TextChanged += new System.EventHandler(this.txtAddPrice_TextChanged); + // + // txtShippingPriceTimes + // + this.txtShippingPriceTimes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.txtShippingPriceTimes.Location = new System.Drawing.Point(319, 135); + this.txtShippingPriceTimes.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtShippingPriceTimes.Name = "txtShippingPriceTimes"; + this.txtShippingPriceTimes.Size = new System.Drawing.Size(28, 23); + this.txtShippingPriceTimes.TabIndex = 810; + this.txtShippingPriceTimes.Text = "1.5"; + // + // txtAddTimes + // + this.txtAddTimes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.txtAddTimes.Location = new System.Drawing.Point(76, 135); + this.txtAddTimes.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtAddTimes.Name = "txtAddTimes"; + this.txtAddTimes.Size = new System.Drawing.Size(28, 23); + this.txtAddTimes.TabIndex = 532; + this.txtAddTimes.Text = "1.3"; + this.txtAddTimes.TextChanged += new System.EventHandler(this.txtAddPrice_TextChanged); + // + // txtAddMorePrice + // + this.txtAddMorePrice.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.txtAddMorePrice.Location = new System.Drawing.Point(144, 135); + this.txtAddMorePrice.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtAddMorePrice.Name = "txtAddMorePrice"; + this.txtAddMorePrice.Size = new System.Drawing.Size(28, 23); + this.txtAddMorePrice.TabIndex = 535; + this.txtAddMorePrice.Text = "1.0"; + this.txtAddMorePrice.TextChanged += new System.EventHandler(this.txtAddPrice_TextChanged); + // // label6 // this.label6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(939, 15); + this.label6.Location = new System.Drawing.Point(930, 15); this.label6.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(56, 17); @@ -350,28 +396,18 @@ namespace TemuKJD.WXForms.ProductForms this.chkRemoveSpecialChar.AutoSize = true; this.chkRemoveSpecialChar.Checked = true; this.chkRemoveSpecialChar.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkRemoveSpecialChar.Location = new System.Drawing.Point(797, 13); + this.chkRemoveSpecialChar.Location = new System.Drawing.Point(788, 13); this.chkRemoveSpecialChar.Name = "chkRemoveSpecialChar"; this.chkRemoveSpecialChar.Size = new System.Drawing.Size(147, 21); this.chkRemoveSpecialChar.TabIndex = 896; this.chkRemoveSpecialChar.Text = "移除标题前部特殊符号"; this.chkRemoveSpecialChar.UseVisualStyleBackColor = true; // - // txtShippingPriceTimes - // - this.txtShippingPriceTimes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.txtShippingPriceTimes.Location = new System.Drawing.Point(327, 135); - this.txtShippingPriceTimes.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); - this.txtShippingPriceTimes.Name = "txtShippingPriceTimes"; - this.txtShippingPriceTimes.Size = new System.Drawing.Size(30, 23); - this.txtShippingPriceTimes.TabIndex = 810; - this.txtShippingPriceTimes.Text = "1.5"; - // // label13 // this.label13.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(290, 138); + this.label13.Location = new System.Drawing.Point(282, 138); this.label13.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label13.Name = "label13"; this.label13.Size = new System.Drawing.Size(41, 17); @@ -384,10 +420,10 @@ namespace TemuKJD.WXForms.ProductForms this.btnStop.CanvasColor = System.Drawing.SystemColors.Control; this.btnStop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnStop.DisabledBackColor = System.Drawing.Color.Empty; - this.btnStop.Location = new System.Drawing.Point(1041, 44); + this.btnStop.Location = new System.Drawing.Point(1032, 44); this.btnStop.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); this.btnStop.Name = "btnStop"; - this.btnStop.Size = new System.Drawing.Size(64, 23); + this.btnStop.Size = new System.Drawing.Size(60, 23); this.btnStop.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnStop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); this.btnStop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); @@ -408,7 +444,7 @@ namespace TemuKJD.WXForms.ProductForms // this.label7.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(1019, 15); + this.label7.Location = new System.Drawing.Point(1010, 15); this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(20, 17); @@ -420,7 +456,7 @@ namespace TemuKJD.WXForms.ProductForms this.chkRandomCompanyProd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.chkRandomCompanyProd.Checked = true; this.chkRandomCompanyProd.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkRandomCompanyProd.Location = new System.Drawing.Point(699, 13); + this.chkRandomCompanyProd.Location = new System.Drawing.Point(690, 13); this.chkRandomCompanyProd.Name = "chkRandomCompanyProd"; this.chkRandomCompanyProd.Size = new System.Drawing.Size(87, 21); this.chkRandomCompanyProd.TabIndex = 889; @@ -432,7 +468,7 @@ namespace TemuKJD.WXForms.ProductForms // this.chkAddMorePriceFirst.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.chkAddMorePriceFirst.AutoSize = true; - this.chkAddMorePriceFirst.Location = new System.Drawing.Point(197, 136); + this.chkAddMorePriceFirst.Location = new System.Drawing.Point(190, 136); this.chkAddMorePriceFirst.Name = "chkAddMorePriceFirst"; this.chkAddMorePriceFirst.Size = new System.Drawing.Size(99, 21); this.chkAddMorePriceFirst.TabIndex = 625; @@ -446,10 +482,10 @@ namespace TemuKJD.WXForms.ProductForms this.btnClearDgv.CanvasColor = System.Drawing.SystemColors.Control; this.btnClearDgv.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnClearDgv.DisabledBackColor = System.Drawing.Color.Empty; - this.btnClearDgv.Location = new System.Drawing.Point(1041, 72); + this.btnClearDgv.Location = new System.Drawing.Point(1032, 72); this.btnClearDgv.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); this.btnClearDgv.Name = "btnClearDgv"; - this.btnClearDgv.Size = new System.Drawing.Size(64, 23); + this.btnClearDgv.Size = new System.Drawing.Size(60, 23); this.btnClearDgv.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnClearDgv.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); this.btnClearDgv.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); @@ -478,17 +514,6 @@ namespace TemuKJD.WXForms.ProductForms this.label14.TabIndex = 599; this.label14.Text = "阶梯加价未\r\n勾选或条件\r\n不满足，按"; // - // label15 - // - this.label15.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(178, 138); - this.label15.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(20, 17); - this.label15.TabIndex = 588; - this.label15.Text = "元"; - // // pnlStep // this.pnlStep.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) @@ -497,7 +522,7 @@ namespace TemuKJD.WXForms.ProductForms this.pnlStep.Controls.Add(this.panel3); this.pnlStep.Location = new System.Drawing.Point(76, 17); this.pnlStep.Name = "pnlStep"; - this.pnlStep.Size = new System.Drawing.Size(342, 114); + this.pnlStep.Size = new System.Drawing.Size(332, 114); this.pnlStep.TabIndex = 577; // // panel3 @@ -510,7 +535,7 @@ namespace TemuKJD.WXForms.ProductForms this.panel3.Controls.Add(this.fPnlPriceRule); this.panel3.Location = new System.Drawing.Point(1, 1); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(340, 112); + this.panel3.Size = new System.Drawing.Size(330, 112); this.panel3.TabIndex = 541; // // fPnlPriceRule @@ -522,7 +547,7 @@ namespace TemuKJD.WXForms.ProductForms this.fPnlPriceRule.FlowDirection = System.Windows.Forms.FlowDirection.TopDown; this.fPnlPriceRule.Location = new System.Drawing.Point(0, 0); this.fPnlPriceRule.Name = "fPnlPriceRule"; - this.fPnlPriceRule.Size = new System.Drawing.Size(426, 58); + this.fPnlPriceRule.Size = new System.Drawing.Size(416, 58); this.fPnlPriceRule.TabIndex = 7; // // ucAddPrice1 @@ -559,7 +584,7 @@ namespace TemuKJD.WXForms.ProductForms 0, 0, 0}); - this.ucAddPrice1.Size = new System.Drawing.Size(420, 23); + this.ucAddPrice1.Size = new System.Drawing.Size(410, 23); this.ucAddPrice1.TabIndex = 12; // // ucAddPrice2 @@ -596,7 +621,7 @@ namespace TemuKJD.WXForms.ProductForms 0, 0, 0}); - this.ucAddPrice2.Size = new System.Drawing.Size(420, 23); + this.ucAddPrice2.Size = new System.Drawing.Size(410, 23); this.ucAddPrice2.TabIndex = 13; // // lblNewAddPrice @@ -615,7 +640,7 @@ namespace TemuKJD.WXForms.ProductForms // txtWaitSeconds // this.txtWaitSeconds.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.txtWaitSeconds.Location = new System.Drawing.Point(995, 12); + this.txtWaitSeconds.Location = new System.Drawing.Point(986, 12); this.txtWaitSeconds.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtWaitSeconds.Name = "txtWaitSeconds"; this.txtWaitSeconds.Size = new System.Drawing.Size(24, 23); @@ -623,33 +648,11 @@ namespace TemuKJD.WXForms.ProductForms this.txtWaitSeconds.Text = "10"; this.txtWaitSeconds.TextChanged += new System.EventHandler(this.txtWaitSeconds_TextChanged); // - // txtAddMorePrice - // - this.txtAddMorePrice.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.txtAddMorePrice.Location = new System.Drawing.Point(148, 135); - this.txtAddMorePrice.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); - this.txtAddMorePrice.Name = "txtAddMorePrice"; - this.txtAddMorePrice.Size = new System.Drawing.Size(30, 23); - this.txtAddMorePrice.TabIndex = 535; - this.txtAddMorePrice.Text = "1.0"; - this.txtAddMorePrice.TextChanged += new System.EventHandler(this.txtAddPrice_TextChanged); - // - // txtAddTimes - // - this.txtAddTimes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.txtAddTimes.Location = new System.Drawing.Point(76, 135); - this.txtAddTimes.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); - this.txtAddTimes.Name = "txtAddTimes"; - this.txtAddTimes.Size = new System.Drawing.Size(30, 23); - this.txtAddTimes.TabIndex = 532; - this.txtAddTimes.Text = "1.3"; - this.txtAddTimes.TextChanged += new System.EventHandler(this.txtAddPrice_TextChanged); - // // label10 // this.label10.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(106, 138); + this.label10.Location = new System.Drawing.Point(103, 138); this.label10.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label10.Name = "label10"; this.label10.Size = new System.Drawing.Size(44, 17); @@ -663,9 +666,9 @@ namespace TemuKJD.WXForms.ProductForms this.btnUpload.Cursor = System.Windows.Forms.Cursors.Hand; this.btnUpload.DisabledBackColor = System.Drawing.Color.Empty; this.btnUpload.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnUpload.Location = new System.Drawing.Point(1041, 16); + this.btnUpload.Location = new System.Drawing.Point(1032, 16); this.btnUpload.Name = "btnUpload"; - this.btnUpload.Size = new System.Drawing.Size(64, 23); + this.btnUpload.Size = new System.Drawing.Size(60, 23); this.btnUpload.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnUpload.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnUpload.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -681,22 +684,11 @@ namespace TemuKJD.WXForms.ProductForms this.btnUpload.Text = "批量上传"; this.btnUpload.Click += new System.EventHandler(this.btnUpload_Click); // - // txtStockNum - // - this.txtStockNum.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.txtStockNum.Location = new System.Drawing.Point(388, 135); - this.txtStockNum.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); - this.txtStockNum.Name = "txtStockNum"; - this.txtStockNum.Size = new System.Drawing.Size(30, 23); - this.txtStockNum.TabIndex = 530; - this.txtStockNum.Text = "99"; - this.txtStockNum.TextChanged += new System.EventHandler(this.txtAddPrice_TextChanged); - // // label4 // this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(357, 138); + this.label4.Location = new System.Drawing.Point(348, 138); this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(32, 17); @@ -736,11 +728,11 @@ namespace TemuKJD.WXForms.ProductForms this.ucTabControlMetro1.Controls.Add(this.佣金上货); this.ucTabControlMetro1.Controls.Add(this.裂变调试); this.ucTabControlMetro1.ItemSize = new System.Drawing.Size(72, 24); - this.ucTabControlMetro1.Location = new System.Drawing.Point(421, 11); + this.ucTabControlMetro1.Location = new System.Drawing.Point(411, 11); this.ucTabControlMetro1.Name = "ucTabControlMetro1"; this.ucTabControlMetro1.SelectedIndex = 0; this.ucTabControlMetro1.ShowCloseButton = false; - this.ucTabControlMetro1.Size = new System.Drawing.Size(617, 150); + this.ucTabControlMetro1.Size = new System.Drawing.Size(619, 150); this.ucTabControlMetro1.TabIndex = 822; this.ucTabControlMetro1.TabSelectColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.ucTabControlMetro1.TabSelectTextColor = System.Drawing.Color.Gray; @@ -779,10 +771,11 @@ namespace TemuKJD.WXForms.ProductForms this.上传参数.Controls.Add(this.label22); this.上传参数.Controls.Add(this.label3); this.上传参数.Controls.Add(this.label39); + this.上传参数.Controls.Add(this.chkSkipReplaceText); this.上传参数.Location = new System.Drawing.Point(4, 28); this.上传参数.Name = "上传参数"; this.上传参数.Padding = new System.Windows.Forms.Padding(3); - this.上传参数.Size = new System.Drawing.Size(609, 118); + this.上传参数.Size = new System.Drawing.Size(611, 118); this.上传参数.TabIndex = 1; this.上传参数.Text = "上传参数"; this.上传参数.UseVisualStyleBackColor = true; @@ -835,7 +828,7 @@ namespace TemuKJD.WXForms.ProductForms // this.chkUseRecommand.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.chkUseRecommand.AutoSize = true; - this.chkUseRecommand.Location = new System.Drawing.Point(490, 51); + this.chkUseRecommand.Location = new System.Drawing.Point(492, 51); this.chkUseRecommand.Name = "chkUseRecommand"; this.chkUseRecommand.Size = new System.Drawing.Size(123, 21); this.chkUseRecommand.TabIndex = 907; @@ -922,7 +915,7 @@ namespace TemuKJD.WXForms.ProductForms // this.chkUpDraft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.chkUpDraft.AutoSize = true; - this.chkUpDraft.Location = new System.Drawing.Point(490, 72); + this.chkUpDraft.Location = new System.Drawing.Point(492, 72); this.chkUpDraft.Name = "chkUpDraft"; this.chkUpDraft.Size = new System.Drawing.Size(87, 21); this.chkUpDraft.TabIndex = 769; @@ -985,7 +978,7 @@ namespace TemuKJD.WXForms.ProductForms this.txtReplaceText.MaxLength = 1000000; this.txtReplaceText.Multiline = true; this.txtReplaceText.Name = "txtReplaceText"; - this.txtReplaceText.Size = new System.Drawing.Size(420, 40); + this.txtReplaceText.Size = new System.Drawing.Size(422, 40); this.txtReplaceText.TabIndex = 740; this.txtReplaceText.Text = "真丝,蚕丝,香云纱,羊绒,羊毛,羊羔绒,羊羔毛,羽绒,皮草"; this.txtReplaceText.TextChanged += new System.EventHandler(this.txtReplaceText_TextChanged); @@ -1123,7 +1116,7 @@ namespace TemuKJD.WXForms.ProductForms // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(1, 52); + this.label3.Location = new System.Drawing.Point(1, 53); this.label3.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(68, 17); @@ -1140,6 +1133,17 @@ namespace TemuKJD.WXForms.ProductForms this.label39.TabIndex = 911; this.label39.Text = "或＞"; // + // chkSkipReplaceText + // + this.chkSkipReplaceText.AutoSize = true; + this.chkSkipReplaceText.Location = new System.Drawing.Point(0, 70); + this.chkSkipReplaceText.Name = "chkSkipReplaceText"; + this.chkSkipReplaceText.Size = new System.Drawing.Size(75, 21); + this.chkSkipReplaceText.TabIndex = 921; + this.chkSkipReplaceText.Text = "跳过商品"; + this.chkSkipReplaceText.UseVisualStyleBackColor = true; + this.chkSkipReplaceText.CheckedChanged += new System.EventHandler(this.chkSkipReplaceText_CheckedChanged); + // // 佣金上货 // this.佣金上货.Controls.Add(this.label31); @@ -1157,7 +1161,7 @@ namespace TemuKJD.WXForms.ProductForms this.佣金上货.Location = new System.Drawing.Point(4, 28); this.佣金上货.Name = "佣金上货"; this.佣金上货.Padding = new System.Windows.Forms.Padding(3); - this.佣金上货.Size = new System.Drawing.Size(609, 118); + this.佣金上货.Size = new System.Drawing.Size(611, 118); this.佣金上货.TabIndex = 2; this.佣金上货.Text = "佣金上货"; this.佣金上货.UseVisualStyleBackColor = true; @@ -1325,7 +1329,7 @@ namespace TemuKJD.WXForms.ProductForms this.裂变调试.Location = new System.Drawing.Point(4, 28); this.裂变调试.Name = "裂变调试"; this.裂变调试.Padding = new System.Windows.Forms.Padding(3); - this.裂变调试.Size = new System.Drawing.Size(609, 118); + this.裂变调试.Size = new System.Drawing.Size(611, 118); this.裂变调试.TabIndex = 3; this.裂变调试.Text = "裂变调试"; this.裂变调试.UseVisualStyleBackColor = true; @@ -1339,7 +1343,7 @@ namespace TemuKJD.WXForms.ProductForms this.txtFissionTitle.Multiline = true; this.txtFissionTitle.Name = "txtFissionTitle"; this.txtFissionTitle.ScrollBars = System.Windows.Forms.ScrollBars.Both; - this.txtFissionTitle.Size = new System.Drawing.Size(522, 79); + this.txtFissionTitle.Size = new System.Drawing.Size(524, 79); this.txtFissionTitle.TabIndex = 0; this.txtFissionTitle.TextChanged += new System.EventHandler(this.txtFissionTitle_TextChanged); // @@ -1454,7 +1458,7 @@ namespace TemuKJD.WXForms.ProductForms // this.label32.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.label32.AutoSize = true; - this.label32.Location = new System.Drawing.Point(575, 57); + this.label32.Location = new System.Drawing.Point(577, 57); this.label32.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label32.Name = "label32"; this.label32.Size = new System.Drawing.Size(20, 17); @@ -1465,7 +1469,7 @@ namespace TemuKJD.WXForms.ProductForms // txtAiImgCount // this.txtAiImgCount.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.txtAiImgCount.Location = new System.Drawing.Point(550, 54); + this.txtAiImgCount.Location = new System.Drawing.Point(552, 54); this.txtAiImgCount.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtAiImgCount.Name = "txtAiImgCount"; this.txtAiImgCount.Size = new System.Drawing.Size(24, 23); @@ -1477,7 +1481,7 @@ namespace TemuKJD.WXForms.ProductForms // this.chkAiImage.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.chkAiImage.AutoSize = true; - this.chkAiImage.Location = new System.Drawing.Point(481, 55); + this.chkAiImage.Location = new System.Drawing.Point(483, 55); this.chkAiImage.Name = "chkAiImage"; this.chkAiImage.Size = new System.Drawing.Size(74, 21); this.chkAiImage.TabIndex = 892; @@ -1558,22 +1562,34 @@ namespace TemuKJD.WXForms.ProductForms this.label37.TabIndex = 907; this.label37.Text = "元"; // + // label15 + // + this.label15.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.label15.AutoSize = true; + this.label15.Location = new System.Drawing.Point(171, 138); + this.label15.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(20, 17); + this.label15.TabIndex = 588; + this.label15.Text = "元"; + // // ucGroupBoxEx4 // this.ucGroupBoxEx4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); this.ucGroupBoxEx4.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.ucGroupBoxEx4.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx4.Controls.Add(this.cmbNotes); this.ucGroupBoxEx4.Controls.Add(this.cmbJstInitSet); this.ucGroupBoxEx4.Controls.Add(this.pbSelectProd); this.ucGroupBoxEx4.Controls.Add(this.chkSevenDays); this.ucGroupBoxEx4.Controls.Add(this.chkSkipQualification); this.ucGroupBoxEx4.Controls.Add(this.lblGoodsCount); this.ucGroupBoxEx4.Controls.Add(this.txtRandomFissionProductCount); + this.ucGroupBoxEx4.Controls.Add(this.lblJstInitSet); this.ucGroupBoxEx4.Controls.Add(this.btnSwitchCatType); this.ucGroupBoxEx4.Controls.Add(this.cmbHot); this.ucGroupBoxEx4.Controls.Add(this.btnProdDb); - this.ucGroupBoxEx4.Controls.Add(this.chkWXComplateProd); this.ucGroupBoxEx4.Controls.Add(this.txtAddCount); this.ucGroupBoxEx4.Controls.Add(this.txtSearchGoodsName); this.ucGroupBoxEx4.Controls.Add(this.cmbSourceType); @@ -1597,14 +1613,24 @@ namespace TemuKJD.WXForms.ProductForms this.ucGroupBoxEx4.Controls.Add(this.label19); this.ucGroupBoxEx4.Controls.Add(this.chkRandomFissionProduct); this.ucGroupBoxEx4.Controls.Add(this.lblWaitToUp); - this.ucGroupBoxEx4.Controls.Add(this.lblJstInitSet); + this.ucGroupBoxEx4.Controls.Add(this.chkWXComplateProd); + this.ucGroupBoxEx4.Controls.Add(this.lblNotes); this.ucGroupBoxEx4.Location = new System.Drawing.Point(186, 2); this.ucGroupBoxEx4.Name = "ucGroupBoxEx4"; - this.ucGroupBoxEx4.Size = new System.Drawing.Size(410, 165); + this.ucGroupBoxEx4.Size = new System.Drawing.Size(423, 165); this.ucGroupBoxEx4.TabIndex = 666; this.ucGroupBoxEx4.TabStop = false; this.ucGroupBoxEx4.Text = "待传商品"; // + // cmbNotes + // + this.cmbNotes.FormattingEnabled = true; + this.cmbNotes.Location = new System.Drawing.Point(322, 46); + this.cmbNotes.Name = "cmbNotes"; + this.cmbNotes.Size = new System.Drawing.Size(96, 25); + this.cmbNotes.TabIndex = 823; + this.cmbNotes.Visible = false; + // // cmbJstInitSet // this.cmbJstInitSet.FormattingEnabled = true; @@ -1612,7 +1638,7 @@ namespace TemuKJD.WXForms.ProductForms "", "是", "否"}); - this.cmbJstInitSet.Location = new System.Drawing.Point(228, 132); + this.cmbJstInitSet.Location = new System.Drawing.Point(242, 132); this.cmbJstInitSet.Name = "cmbJstInitSet"; this.cmbJstInitSet.Size = new System.Drawing.Size(33, 25); this.cmbJstInitSet.TabIndex = 697; @@ -1667,7 +1693,7 @@ namespace TemuKJD.WXForms.ProductForms this.txtRandomFissionProductCount.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.txtRandomFissionProductCount.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.txtRandomFissionProductCount.Font = new System.Drawing.Font("微软雅黑", 10F); - this.txtRandomFissionProductCount.Location = new System.Drawing.Point(244, 100); + this.txtRandomFissionProductCount.Location = new System.Drawing.Point(253, 100); this.txtRandomFissionProductCount.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtRandomFissionProductCount.Name = "txtRandomFissionProductCount"; this.txtRandomFissionProductCount.Size = new System.Drawing.Size(32, 25); @@ -1675,6 +1701,18 @@ namespace TemuKJD.WXForms.ProductForms this.txtRandomFissionProductCount.Text = "100"; this.txtRandomFissionProductCount.Visible = false; // + // lblJstInitSet + // + this.lblJstInitSet.AutoSize = true; + this.lblJstInitSet.BackColor = System.Drawing.Color.Transparent; + this.lblJstInitSet.Location = new System.Drawing.Point(214, 136); + this.lblJstInitSet.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.lblJstInitSet.Name = "lblJstInitSet"; + this.lblJstInitSet.Size = new System.Drawing.Size(32, 17); + this.lblJstInitSet.TabIndex = 696; + this.lblJstInitSet.Text = "分销"; + this.lblJstInitSet.Visible = false; + // // btnSwitchCatType // this.btnSwitchCatType.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -1706,9 +1744,9 @@ namespace TemuKJD.WXForms.ProductForms "", "爆款数据", "普通商品"}); - this.cmbHot.Location = new System.Drawing.Point(312, 73); + this.cmbHot.Location = new System.Drawing.Point(322, 73); this.cmbHot.Name = "cmbHot"; - this.cmbHot.Size = new System.Drawing.Size(92, 25); + this.cmbHot.Size = new System.Drawing.Size(96, 25); this.cmbHot.TabIndex = 837; this.cmbHot.Text = "普通商品"; this.cmbHot.Visible = false; @@ -1721,7 +1759,7 @@ namespace TemuKJD.WXForms.ProductForms this.btnProdDb.Cursor = System.Windows.Forms.Cursors.Hand; this.btnProdDb.DisabledBackColor = System.Drawing.Color.Empty; this.btnProdDb.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnProdDb.Location = new System.Drawing.Point(373, 132); + this.btnProdDb.Location = new System.Drawing.Point(387, 132); this.btnProdDb.Name = "btnProdDb"; this.btnProdDb.Size = new System.Drawing.Size(31, 25); this.btnProdDb.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -1739,21 +1777,11 @@ namespace TemuKJD.WXForms.ProductForms this.btnProdDb.Text = "选品"; this.btnProdDb.Click += new System.EventHandler(this.btnProdDb_Click); // - // chkWXComplateProd - // - this.chkWXComplateProd.Location = new System.Drawing.Point(283, 102); - this.chkWXComplateProd.Name = "chkWXComplateProd"; - this.chkWXComplateProd.Size = new System.Drawing.Size(87, 21); - this.chkWXComplateProd.TabIndex = 807; - this.chkWXComplateProd.Text = "微信回采商品"; - this.chkWXComplateProd.UseVisualStyleBackColor = true; - this.chkWXComplateProd.Visible = false; - // // txtAddCount // this.txtAddCount.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.txtAddCount.Font = new System.Drawing.Font("微软雅黑", 10F); - this.txtAddCount.Location = new System.Drawing.Point(296, 132); + this.txtAddCount.Location = new System.Drawing.Point(310, 132); this.txtAddCount.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtAddCount.Name = "txtAddCount"; this.txtAddCount.Size = new System.Drawing.Size(29, 25); @@ -1764,10 +1792,10 @@ namespace TemuKJD.WXForms.ProductForms // this.txtSearchGoodsName.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.txtSearchGoodsName.Font = new System.Drawing.Font("微软雅黑", 10F); - this.txtSearchGoodsName.Location = new System.Drawing.Point(184, 46); + this.txtSearchGoodsName.Location = new System.Drawing.Point(189, 46); this.txtSearchGoodsName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtSearchGoodsName.Name = "txtSearchGoodsName"; - this.txtSearchGoodsName.Size = new System.Drawing.Size(220, 25); + this.txtSearchGoodsName.Size = new System.Drawing.Size(96, 25); this.txtSearchGoodsName.TabIndex = 795; // // cmbSourceType @@ -1786,7 +1814,7 @@ namespace TemuKJD.WXForms.ProductForms "多多外部数据"}); this.cmbSourceType.Location = new System.Drawing.Point(56, 73); this.cmbSourceType.Name = "cmbSourceType"; - this.cmbSourceType.Size = new System.Drawing.Size(92, 25); + this.cmbSourceType.Size = new System.Drawing.Size(96, 25); this.cmbSourceType.TabIndex = 673; this.cmbSourceType.Text = "厂商直采"; this.cmbSourceType.Visible = false; @@ -1800,9 +1828,9 @@ namespace TemuKJD.WXForms.ProductForms this.cmbCateFilter3.DropDownWidth = 1; this.cmbCateFilter3.FormattingEnabled = true; this.cmbCateFilter3.IntegralHeight = false; - this.cmbCateFilter3.Location = new System.Drawing.Point(312, 19); + this.cmbCateFilter3.Location = new System.Drawing.Point(322, 19); this.cmbCateFilter3.Name = "cmbCateFilter3"; - this.cmbCateFilter3.Size = new System.Drawing.Size(92, 25); + this.cmbCateFilter3.Size = new System.Drawing.Size(96, 25); this.cmbCateFilter3.TabIndex = 710; this.cmbCateFilter3.Text = "全部"; this.cmbCateFilter3.SelectedIndexChanged += new System.EventHandler(this.cmbCateFilter3_SelectedIndexChanged); @@ -1811,7 +1839,7 @@ namespace TemuKJD.WXForms.ProductForms // label21 // this.label21.AutoSize = true; - this.label21.Location = new System.Drawing.Point(276, 23); + this.label21.Location = new System.Drawing.Point(286, 23); this.label21.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label21.Name = "label21"; this.label21.Size = new System.Drawing.Size(39, 17); @@ -1821,9 +1849,9 @@ namespace TemuKJD.WXForms.ProductForms // cmbGroupFilter // this.cmbGroupFilter.FormattingEnabled = true; - this.cmbGroupFilter.Location = new System.Drawing.Point(184, 73); + this.cmbGroupFilter.Location = new System.Drawing.Point(189, 73); this.cmbGroupFilter.Name = "cmbGroupFilter"; - this.cmbGroupFilter.Size = new System.Drawing.Size(92, 25); + this.cmbGroupFilter.Size = new System.Drawing.Size(96, 25); this.cmbGroupFilter.TabIndex = 641; this.cmbGroupFilter.Visible = false; this.cmbGroupFilter.SelectedIndexChanged += new System.EventHandler(this.cmbGroupFilter_SelectedIndexChanged); @@ -1835,7 +1863,7 @@ namespace TemuKJD.WXForms.ProductForms this.txtIdFilter.Location = new System.Drawing.Point(56, 100); this.txtIdFilter.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtIdFilter.Name = "txtIdFilter"; - this.txtIdFilter.Size = new System.Drawing.Size(92, 25); + this.txtIdFilter.Size = new System.Drawing.Size(96, 25); this.txtIdFilter.TabIndex = 652; this.txtIdFilter.Visible = false; // @@ -1846,9 +1874,9 @@ namespace TemuKJD.WXForms.ProductForms this.cmbCateFilter2.DropDownWidth = 1; this.cmbCateFilter2.FormattingEnabled = true; this.cmbCateFilter2.IntegralHeight = false; - this.cmbCateFilter2.Location = new System.Drawing.Point(184, 19); + this.cmbCateFilter2.Location = new System.Drawing.Point(189, 19); this.cmbCateFilter2.Name = "cmbCateFilter2"; - this.cmbCateFilter2.Size = new System.Drawing.Size(92, 25); + this.cmbCateFilter2.Size = new System.Drawing.Size(96, 25); this.cmbCateFilter2.TabIndex = 708; this.cmbCateFilter2.Text = "全部"; this.cmbCateFilter2.SelectedIndexChanged += new System.EventHandler(this.cmbCateFilter2_SelectedIndexChanged); @@ -1860,7 +1888,7 @@ namespace TemuKJD.WXForms.ProductForms this.btnClearFilter.CanvasColor = System.Drawing.SystemColors.Control; this.btnClearFilter.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnClearFilter.DisabledBackColor = System.Drawing.Color.Empty; - this.btnClearFilter.Location = new System.Drawing.Point(373, 100); + this.btnClearFilter.Location = new System.Drawing.Point(387, 100); this.btnClearFilter.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); this.btnClearFilter.Name = "btnClearFilter"; this.btnClearFilter.Size = new System.Drawing.Size(31, 25); @@ -1889,7 +1917,7 @@ namespace TemuKJD.WXForms.ProductForms "未校验"}); this.cmbWxSafe.Location = new System.Drawing.Point(56, 46); this.cmbWxSafe.Name = "cmbWxSafe"; - this.cmbWxSafe.Size = new System.Drawing.Size(92, 25); + this.cmbWxSafe.Size = new System.Drawing.Size(96, 25); this.cmbWxSafe.TabIndex = 675; this.cmbWxSafe.Text = "安全+未校验"; // @@ -1899,7 +1927,7 @@ namespace TemuKJD.WXForms.ProductForms this.btnClearUpload.CanvasColor = System.Drawing.SystemColors.Control; this.btnClearUpload.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnClearUpload.DisabledBackColor = System.Drawing.Color.Empty; - this.btnClearUpload.Location = new System.Drawing.Point(263, 132); + this.btnClearUpload.Location = new System.Drawing.Point(277, 132); this.btnClearUpload.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); this.btnClearUpload.Name = "btnClearUpload"; this.btnClearUpload.Size = new System.Drawing.Size(31, 25); @@ -1928,7 +1956,7 @@ namespace TemuKJD.WXForms.ProductForms this.cmbCateFilter1.IntegralHeight = false; this.cmbCateFilter1.Location = new System.Drawing.Point(56, 19); this.cmbCateFilter1.Name = "cmbCateFilter1"; - this.cmbCateFilter1.Size = new System.Drawing.Size(92, 25); + this.cmbCateFilter1.Size = new System.Drawing.Size(96, 25); this.cmbCateFilter1.TabIndex = 663; this.cmbCateFilter1.Text = "全部"; this.cmbCateFilter1.SelectedIndexChanged += new System.EventHandler(this.cmbCateFilter1_SelectedIndexChanged); @@ -1950,7 +1978,7 @@ namespace TemuKJD.WXForms.ProductForms this.btnRandomAdd.Cursor = System.Windows.Forms.Cursors.Hand; this.btnRandomAdd.DisabledBackColor = System.Drawing.Color.Empty; this.btnRandomAdd.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnRandomAdd.Location = new System.Drawing.Point(327, 132); + this.btnRandomAdd.Location = new System.Drawing.Point(341, 132); this.btnRandomAdd.Name = "btnRandomAdd"; this.btnRandomAdd.Size = new System.Drawing.Size(44, 25); this.btnRandomAdd.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -1965,7 +1993,7 @@ namespace TemuKJD.WXForms.ProductForms this.btnRandomAdd.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); this.btnRandomAdd.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); this.btnRandomAdd.TabIndex = 431; - this.btnRandomAdd.Text = "随机选"; + this.btnRandomAdd.Text = "随机"; this.btnRandomAdd.Click += new System.EventHandler(this.btnRandomAdd_Click); // // lblSourceType @@ -1982,7 +2010,7 @@ namespace TemuKJD.WXForms.ProductForms // lblGroupFilter // this.lblGroupFilter.AutoSize = true; - this.lblGroupFilter.Location = new System.Drawing.Point(155, 77); + this.lblGroupFilter.Location = new System.Drawing.Point(160, 77); this.lblGroupFilter.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.lblGroupFilter.Name = "lblGroupFilter"; this.lblGroupFilter.Size = new System.Drawing.Size(32, 17); @@ -2003,7 +2031,7 @@ namespace TemuKJD.WXForms.ProductForms // label20 // this.label20.AutoSize = true; - this.label20.Location = new System.Drawing.Point(155, 50); + this.label20.Location = new System.Drawing.Point(160, 50); this.label20.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label20.Name = "label20"; this.label20.Size = new System.Drawing.Size(32, 17); @@ -2024,7 +2052,7 @@ namespace TemuKJD.WXForms.ProductForms // lblHot // this.lblHot.AutoSize = true; - this.lblHot.Location = new System.Drawing.Point(283, 77); + this.lblHot.Location = new System.Drawing.Point(293, 77); this.lblHot.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.lblHot.Name = "lblHot"; this.lblHot.Size = new System.Drawing.Size(32, 17); @@ -2035,7 +2063,7 @@ namespace TemuKJD.WXForms.ProductForms // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(148, 23); + this.label19.Location = new System.Drawing.Point(153, 23); this.label19.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label19.Name = "label19"; this.label19.Size = new System.Drawing.Size(39, 17); @@ -2044,11 +2072,11 @@ namespace TemuKJD.WXForms.ProductForms // // chkRandomFissionProduct // - this.chkRandomFissionProduct.Location = new System.Drawing.Point(155, 104); + this.chkRandomFissionProduct.Location = new System.Drawing.Point(163, 102); this.chkRandomFissionProduct.Name = "chkRandomFissionProduct"; - this.chkRandomFissionProduct.Size = new System.Drawing.Size(92, 17); + this.chkRandomFissionProduct.Size = new System.Drawing.Size(96, 21); this.chkRandomFissionProduct.TabIndex = 910; - this.chkRandomFissionProduct.Text = "裂变商品数量"; + this.chkRandomFissionProduct.Text = "裂变标题数量"; this.chkRandomFissionProduct.UseVisualStyleBackColor = true; this.chkRandomFissionProduct.Visible = false; // @@ -2067,17 +2095,27 @@ namespace TemuKJD.WXForms.ProductForms this.lblWaitToUp.Text = "待上传 0 件"; this.lblWaitToUp.Click += new System.EventHandler(this.lblWaitToUp_Click); // - // lblJstInitSet + // chkWXComplateProd // - this.lblJstInitSet.AutoSize = true; - this.lblJstInitSet.BackColor = System.Drawing.Color.Transparent; - this.lblJstInitSet.Location = new System.Drawing.Point(200, 136); - this.lblJstInitSet.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.lblJstInitSet.Name = "lblJstInitSet"; - this.lblJstInitSet.Size = new System.Drawing.Size(32, 17); - this.lblJstInitSet.TabIndex = 696; - this.lblJstInitSet.Text = "分销"; - this.lblJstInitSet.Visible = false; + this.chkWXComplateProd.AutoSize = true; + this.chkWXComplateProd.Location = new System.Drawing.Point(296, 102); + this.chkWXComplateProd.Name = "chkWXComplateProd"; + this.chkWXComplateProd.Size = new System.Drawing.Size(99, 21); + this.chkWXComplateProd.TabIndex = 807; + this.chkWXComplateProd.Text = "微信回采商品"; + this.chkWXComplateProd.UseVisualStyleBackColor = true; + this.chkWXComplateProd.Visible = false; + // + // lblNotes + // + this.lblNotes.AutoSize = true; + this.lblNotes.Location = new System.Drawing.Point(293, 50); + this.lblNotes.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.lblNotes.Name = "lblNotes"; + this.lblNotes.Size = new System.Drawing.Size(32, 17); + this.lblNotes.TabIndex = 822; + this.lblNotes.Text = "备注"; + this.lblNotes.Visible = false; // // ucGroupBoxEx1 // @@ -2489,7 +2527,7 @@ namespace TemuKJD.WXForms.ProductForms // lblExtCodeFilter // this.lblExtCodeFilter.AutoSize = true; - this.lblExtCodeFilter.Location = new System.Drawing.Point(260, 38); + this.lblExtCodeFilter.Location = new System.Drawing.Point(262, 38); this.lblExtCodeFilter.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.lblExtCodeFilter.Name = "lblExtCodeFilter"; this.lblExtCodeFilter.Size = new System.Drawing.Size(32, 17); @@ -2501,19 +2539,19 @@ namespace TemuKJD.WXForms.ProductForms // this.dgvShop.AllowUserToAddRows = false; this.dgvShop.AllowUserToDeleteRows = false; - dataGridViewCellStyle9.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle9; + dataGridViewCellStyle25.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle25; this.dgvShop.AutoRowNumber = true; this.dgvShop.BackgroundColor = System.Drawing.Color.White; this.dgvShop.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle10.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle10; + dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle26.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle26.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle26.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle26.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle26.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle26; this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colSelect, @@ -2745,19 +2783,19 @@ namespace TemuKJD.WXForms.ProductForms // this.dgvSelectProduct.AllowUserToAddRows = false; this.dgvSelectProduct.AllowUserToDeleteRows = false; - dataGridViewCellStyle11.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle11; + dataGridViewCellStyle27.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle27; this.dgvSelectProduct.AutoRowNumber = true; this.dgvSelectProduct.BackgroundColor = System.Drawing.Color.White; this.dgvSelectProduct.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle12.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvSelectProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle12; + dataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle28.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle28.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle28.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle28.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle28.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvSelectProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle28; this.dgvSelectProduct.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvSelectProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colCheck, @@ -2819,8 +2857,8 @@ namespace TemuKJD.WXForms.ProductForms // // colSupplierName // - dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle13; + dataGridViewCellStyle29.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle29; this.colSupplierName.Frozen = true; this.colSupplierName.HeaderText = "店铺名称"; this.colSupplierName.Name = "colSupplierName"; @@ -2900,8 +2938,8 @@ namespace TemuKJD.WXForms.ProductForms // // colProductName // - dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colProductName.DefaultCellStyle = dataGridViewCellStyle14; + dataGridViewCellStyle30.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colProductName.DefaultCellStyle = dataGridViewCellStyle30; this.colProductName.HeaderText = "商品标题"; this.colProductName.Name = "colProductName"; this.colProductName.ReadOnly = true; @@ -2909,8 +2947,8 @@ namespace TemuKJD.WXForms.ProductForms // // colProductCat // - dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colProductCat.DefaultCellStyle = dataGridViewCellStyle15; + dataGridViewCellStyle31.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colProductCat.DefaultCellStyle = dataGridViewCellStyle31; this.colProductCat.HeaderText = "商品类目"; this.colProductCat.Name = "colProductCat"; this.colProductCat.ReadOnly = true; @@ -2965,8 +3003,8 @@ namespace TemuKJD.WXForms.ProductForms // // colAddTime // - dataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colAddTime.DefaultCellStyle = dataGridViewCellStyle16; + dataGridViewCellStyle32.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colAddTime.DefaultCellStyle = dataGridViewCellStyle32; this.colAddTime.HeaderText = "上传时间"; this.colAddTime.Name = "colAddTime"; this.colAddTime.ReadOnly = true; @@ -3157,8 +3195,6 @@ namespace TemuKJD.WXForms.ProductForms private System.Windows.Forms.TextBox txtExtCodeFilter; private System.Windows.Forms.Label lblExtCodeFilter; private System.Windows.Forms.Label label9; - private System.Windows.Forms.Label lblGroupFilter; - private System.Windows.Forms.ComboBox cmbGroupFilter; private DevComponents.DotNetBar.PanelEx btnClear; private DevComponents.DotNetBar.PanelEx panelEx1; private System.Windows.Forms.TextBox txtIdFilter; @@ -3319,5 +3355,10 @@ namespace TemuKJD.WXForms.ProductForms private UserComponent.UcCheckBox chkSameSpecPriceDown; private UserComponent.UcCheckBox chkLowestPriceSku; private UserComponent.UcCheckBox chkRemoveSpecialChar; + private UserComponent.UcCheckBox chkSkipReplaceText; + private System.Windows.Forms.ComboBox cmbGroupFilter; + private System.Windows.Forms.Label lblGroupFilter; + private System.Windows.Forms.ComboBox cmbNotes; + private System.Windows.Forms.Label lblNotes; } } \ No newline at end of file diff --git a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs index f27c424..a85ee32 100644 --- a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs +++ b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs @@ -42,7 +42,6 @@ namespace TemuKJD.WXForms.ProductForms public CancellationTokenSource cancellationTokenSource { get; set; } = null; public bool IsWxNotUseSoftwareDefaultAddressOnce { get; set; } = false; - public bool IsLoadComplate { get; set; } = false; public ConcurrentList lstTemuDBProductSelect = new ConcurrentList(); ConcurrentList lstAddPriceRule = new ConcurrentList(); @@ -205,6 +204,7 @@ namespace TemuKJD.WXForms.ProductForms this.txtPreDays.Text = wxUploadRule.PreSaleDays.ParseToString(); this.txtReplaceText.Text = wxUploadRule.FilterWords.ParseToString(); + this.chkSkipReplaceText.Checked = wxUploadRule.IsSkipHasFilterWordsProd.ParseToBool(); this.txtMinPrice.Text = wxUploadRule.SkuMinPrice.ParseToString(); this.txtWaitSeconds.Text = wxUploadRule.WaitSeconds.ParseToString(); this.chkHighestPriceSku.Checked = wxUploadRule.OnlyHighestPriceSku.ParseToBool(); @@ -389,6 +389,14 @@ namespace TemuKJD.WXForms.ProductForms chkRandomFissionProduct.Visible = true; txtRandomFissionProductCount.Visible = true; + + lblNotes.Visible = true; + cmbNotes.Visible = true; + Task.Run(() => + { + string addUserName = BaseClass.GroupId == 3 ? BaseClass.UserName : BaseClass.ParentUserName; + PDDDBProdListForm.GetPDDProductNotes(new List { cmbNotes }, addUserName); + }); } cmbHot_TextChanged(null, null); @@ -405,7 +413,7 @@ namespace TemuKJD.WXForms.ProductForms List ctrlLst = new List() { lblSourceType, cmbSourceType, lblGroupFilter, cmbGroupFilter, lblHot, cmbHot, lblIdFilter, txtIdFilter, - chkRandomFissionProduct, txtRandomFissionProductCount, lblJstInitSet, cmbJstInitSet + chkRandomFissionProduct, txtRandomFissionProductCount/*, lblNotes, cmbNotes*//*, lblJstInitSet, cmbJstInitSet*/ }; for (int i = 0; i < ctrlLst.Count - 2; i += 2) { @@ -413,14 +421,19 @@ namespace TemuKJD.WXForms.ProductForms { for (int j= ctrlLst.Count - 2; j > i; j-=2) { + ctrlLst[j].Parent = ucGroupBoxEx4; ctrlLst[j].Location = new Point(ctrlLst[j - 2].Location.X, ctrlLst[j - 2].Location.Y); ctrlLst[j + 1].Location = new Point(ctrlLst[j].Location.X + ctrlLst[j].Width - 3, ctrlLst[j - 1].Location.Y); ctrlLst[j + 1].BringToFront(); } } } + if (cmbNotes.Visible == false) + { + txtSearchGoodsName.Width = 229; + } - IsLoadComplate = true; + IsFormLoad = true; } private void btnRefreshAuthor_Click(object sender, EventArgs e) @@ -1780,74 +1793,66 @@ namespace TemuKJD.WXForms.ProductForms // 过滤标题敏感词 if (lstTitleReplaceText.Count > 0) { - foreach (var txt in lstTitleReplaceText) + if (chkSkipReplaceText.Checked) { - dbProd.product_name = dbProd.product_name.Replace(txt, ""); - selectProd.product_name = selectProd.product_name.Replace(txt, ""); - } + if (lstTitleReplaceText.Any(t => selectProd.product_name.Contains(t))) + return "{\"success\":false,\"draftId\":0,\"status\":\"未上传\",\"errMsg\":\"命中敏感词\"}"; + if (lstTitleReplaceText.Any(t => dbProd.product_name.Contains(t))) + return "{\"success\":false,\"draftId\":0,\"status\":\"未上传\",\"errMsg\":\"命中敏感词\"}"; - var goods_name = prodJObj["detail"]["goods_name"].ParseToString(); - foreach (var txt in lstTitleReplaceText) - { - goods_name = goods_name.Replace(txt, ""); + var goods_name = prodJObj["detail"]["goods_name"].ParseToString(); + if (lstTitleReplaceText.Any(t => goods_name.Contains(t))) + return "{\"success\":false,\"draftId\":0,\"status\":\"未上传\",\"errMsg\":\"命中敏感词\"}"; + var tiny_name = prodJObj["detail"]["tiny_name"].ParseToString(); + if (lstTitleReplaceText.Any(t => tiny_name.Contains(t))) + return "{\"success\":false,\"draftId\":0,\"status\":\"未上传\",\"errMsg\":\"命中敏感词\"}"; + var goods_desc = prodJObj["detail"]["goods_desc"].ParseToString(); + if (lstTitleReplaceText.Any(t => goods_desc.Contains(t))) + return "{\"success\":false,\"draftId\":0,\"status\":\"未上传\",\"errMsg\":\"命中敏感词\"}"; + var share_desc = prodJObj["detail"]["share_desc"].ParseToString(); + if (lstTitleReplaceText.Any(t => share_desc.Contains(t))) + return "{\"success\":false,\"draftId\":0,\"status\":\"未上传\",\"errMsg\":\"命中敏感词\"}"; } - prodJObj["detail"]["goods_name"] = goods_name; + else + { + foreach (var txt in lstTitleReplaceText) + { + dbProd.product_name = dbProd.product_name.Replace(txt, ""); + selectProd.product_name = selectProd.product_name.Replace(txt, ""); + } - var tiny_name = prodJObj["detail"]["tiny_name"].ParseToString(); - foreach (var txt in lstTitleReplaceText) - { - tiny_name = tiny_name.Replace(txt, ""); - } - prodJObj["detail"]["tiny_name"] = tiny_name; + var goods_name = prodJObj["detail"]["goods_name"].ParseToString(); + foreach (var txt in lstTitleReplaceText) + { + goods_name = goods_name.Replace(txt, ""); + } + prodJObj["detail"]["goods_name"] = goods_name; - var goods_desc = prodJObj["detail"]["goods_desc"].ParseToString(); - foreach (var txt in lstTitleReplaceText) - { - goods_desc = goods_desc.Replace(txt, ""); - } - prodJObj["detail"]["goods_desc"] = goods_desc; + var tiny_name = prodJObj["detail"]["tiny_name"].ParseToString(); + foreach (var txt in lstTitleReplaceText) + { + tiny_name = tiny_name.Replace(txt, ""); + } + prodJObj["detail"]["tiny_name"] = tiny_name; - var share_desc = prodJObj["detail"]["share_desc"].ParseToString(); - foreach (var txt in lstTitleReplaceText) - { - share_desc = share_desc.Replace(txt, ""); + var goods_desc = prodJObj["detail"]["goods_desc"].ParseToString(); + foreach (var txt in lstTitleReplaceText) + { + goods_desc = goods_desc.Replace(txt, ""); + } + prodJObj["detail"]["goods_desc"] = goods_desc; + + var share_desc = prodJObj["detail"]["share_desc"].ParseToString(); + foreach (var txt in lstTitleReplaceText) + { + share_desc = share_desc.Replace(txt, ""); + } + prodJObj["detail"]["share_desc"] = share_desc; } - prodJObj["detail"]["share_desc"] = share_desc; } // 过滤标题特殊字符 if (chkRemoveSpecialChar.Checked) { - //if (dbProd.product_name.Contains("】") && dbProd.product_name.IndexOf("】") < dbProd.product_name.Length / 2 && dbProd.product_name.Length > 10) - // dbProd.product_name = dbProd.product_name.Substring(dbProd.product_name.IndexOf("】")).Trim('】'); - - //if (selectProd.product_name.Contains("】") && selectProd.product_name.IndexOf("】") < selectProd.product_name.Length / 2 && selectProd.product_name.Length > 10) - // selectProd.product_name = selectProd.product_name.Substring(selectProd.product_name.IndexOf("】")).Trim('】'); - - //var goods_name = prodJObj["detail"]["goods_name"].ParseToString(); - //if (goods_name.Contains("】") && goods_name.IndexOf("】") < goods_name.Length / 2 && goods_name.Length > 10) - // prodJObj["detail"]["goods_name"] = goods_name.Substring(goods_name.IndexOf("】")).Trim('】'); - - //if (dbProd.product_name.Contains("]") && dbProd.product_name.IndexOf("]") < dbProd.product_name.Length / 2 && dbProd.product_name.Length > 10) - // dbProd.product_name = dbProd.product_name.Substring(dbProd.product_name.IndexOf("]")).Trim(']'); - - //if (selectProd.product_name.Contains("]") && selectProd.product_name.IndexOf("]") < selectProd.product_name.Length / 2 && selectProd.product_name.Length > 10) - // selectProd.product_name = selectProd.product_name.Substring(selectProd.product_name.IndexOf("]")).Trim(']'); - - //goods_name = prodJObj["detail"]["goods_name"].ParseToString(); - //if (goods_name.Contains("]") && goods_name.IndexOf("]") < goods_name.Length / 2 && goods_name.Length > 10) - // prodJObj["detail"]["goods_name"] = goods_name.Substring(goods_name.IndexOf("]")).Trim(']'); - - - //if (dbProd.product_name.Contains("}") && dbProd.product_name.IndexOf("}") < dbProd.product_name.Length / 2 && dbProd.product_name.Length > 10) - // dbProd.product_name = dbProd.product_name.Substring(dbProd.product_name.IndexOf("}")).Trim('}'); - - //if (selectProd.product_name.Contains("}") && selectProd.product_name.IndexOf("}") < selectProd.product_name.Length / 2 && selectProd.product_name.Length > 10) - // selectProd.product_name = selectProd.product_name.Substring(selectProd.product_name.IndexOf("}")).Trim('}'); - - //goods_name = prodJObj["detail"]["goods_name"].ParseToString(); - //if (goods_name.Contains("}") && goods_name.IndexOf("}") < goods_name.Length / 2 && goods_name.Length > 10) - // prodJObj["detail"]["goods_name"] = goods_name.Substring(goods_name.IndexOf("}")).Trim('}'); - var chLst = new List { ']', '】', '）', ')', '}', }; foreach (var ch in chLst) { @@ -4432,21 +4437,131 @@ namespace TemuKJD.WXForms.ProductForms })); } - string publisher = "出版社名称：" + new List() { "技术出版社", "文化出版社", "美术出版社" }[Randomx.GetId(3)]; + //string publisher = "出版社名称：" + new List() { "技术出版社", "文化出版社", "美术出版社" }[Randomx.GetId(3)]; + ////string isbn = "ISBN："; + //string isbn = "ISBN/CN刊号："; + ////string bookName = "书名："; + //string bookName = "图书名称："; + //string bookPrice = "定价：" + upProdParam.product.productSkus.Max(s => s.productSkuInfo.salePrice) * 0.01; + //string author = "作者：王老师"; + //string publishTime = "出版时间：" + DateTime.Now.AddMonths(-3).ToString("yyyy年MM月dd日"); + //string edition = "版次：1"; + //string binding = "装帧：平装"; + + //foreach (var propParam in upProdParam.product.info.param) + //{ + // if (propParam.categorys[0].name.Contains("出版社名称")) + // publisher = "出版社名称：" + propParam.categorys[1].name; + // else if (propParam.categorys[0].name.Contains("ISBN版号/CN刊号")) + // { + // //isbn = "ISBN：" + propParam.categorys[1].name; + // isbn = "ISBN/CN刊号：" + propParam.categorys[1].name; + // if (propParam.categorys[1].name.Length == 13) + // { + // var isbnStr = propParam.categorys[1].name; + // isbn = "ISBN/CN刊号：" + isbnStr[0] + isbnStr[1] + isbnStr[2] + "-" + isbnStr[3] + "-" + isbnStr[4] + isbnStr[5] + isbnStr[6] + isbnStr[7] + "-" + isbnStr[8] + isbnStr[9] + isbnStr[10] + isbnStr[11] + "-" + isbnStr[12]; + // } + // } + // else if (propParam.categorys[0].name.Contains("书名")) + // { + // //bookName = "书名：" + propParam.categorys[1].name; + // bookName = "图书名称：" + propParam.categorys[1].name; + // } + // else if (propParam.categorys[0].name.Contains("定价")) + // { + // //bookPrice = "定价：" + propParam.categorys[1].name; + // propParam.categorys[1].name = bookPrice; + // } + // else if (propParam.categorys[0].name.Contains("作者")) + // author = "作者：" + propParam.categorys[1].name; + // else if (propParam.categorys[0].name.Contains("出版时间")) + // publishTime = "出版时间：" + propParam.categorys[1].name; + // else if (propParam.categorys[0].name.Contains("版次")) + // edition = "版次：" + propParam.categorys[1].name; + // else if (propParam.categorys[0].name.Contains("包装")) + // binding = "装帧：" + propParam.categorys[1].name; + //} + + //var bookStr = publisher + "\r\n" + "\r\n" + + // isbn + "\r\n" + "\r\n" + + // bookName + "\r\n" + "\r\n" + + // bookPrice + "\r\n" + "\r\n" + + // author + "\r\n" + "\r\n" + + // publishTime + "\r\n" + "\r\n" + + // edition + "\r\n" + "\r\n" + + // binding; + + //int imgW = 800; int imgH = 800; int textImgH = 0; + //string getImgError; + //var img_url = upProdParam.product.info.headImg[0]; + //if (!img_url.Contains("wst.wxapp.tc.qq.com") && !img_url.Contains("mmecimage.cn")) + // img_url = img_url.Replace("https://", "http://"); + //var imageMain = GetHtml.GetUrlImg(img_url, out getImgError); + //if (imageMain == null) + // imageMain = new Bitmap(800, 800); + //using (Bitmap bitmap = new Bitmap(1, 1)) // 尺寸不重要，只是为了使用Graphics对象 + //using (Graphics g = Graphics.FromImage(bitmap)) // 获取Graphics对象 + //{ + // // 定义字体 + // Font font = new Font("微软雅黑", 16, FontStyle.Regular); + // g.TextRenderingHint = System.Drawing.Text.TextRenderingHint.ClearTypeGridFit; + // // 定义要测量的字符串 + // string text = bookStr; + // // 测量字符串大小 + // SizeF size = g.MeasureString(text, font, imgW - 120); + // // 输出高度信息 + // //Console.WriteLine("Text Height: " + size.Height); + // textImgH = size.Height.ParseToInt() + 180; + //} + + ////var bookImg = new Bitmap(imgW, imgH); + ////using (Graphics g = Graphics.FromImage(bookImg)) + ////{ + //// g.Clear(Color.White); + //// //Font font = new Font("宋体", 15, FontStyle.Bold); + //// //Font font = new Font("微软雅黑", 15, FontStyle.Regular); + //// Font font = new Font("微软雅黑", 16, FontStyle.Regular); + //// //Font font = new Font("宋体", 17, FontStyle.Bold); + //// Brush textBrush = Brushes.Black; + //// g.TextRenderingHint = System.Drawing.Text.TextRenderingHint.ClearTypeGridFit; + //// RectangleF rectF = new RectangleF(60, 80, imgW - 120, imgH - 180); + //// g.DrawString(bookStr, font, textBrush, rectF); + ////} + + //// 绘制一张带主图的商品详情页 + //var bookImg = new Bitmap(imgW, imgH + textImgH); + //using (Graphics g = Graphics.FromImage(bookImg)) + //{ + // g.Clear(Color.FromArgb(248, 239, 244)); + + // g.DrawImage(imageMain, new Rectangle(0, 0, imgW, imgH), 0, 0, imageMain.Width, imageMain.Height, GraphicsUnit.Pixel); + + // //Font font = new Font("宋体", 15, FontStyle.Bold); + // //Font font = new Font("微软雅黑", 15, FontStyle.Regular); + // Font font = new Font("微软雅黑", 18, FontStyle.Regular); + // //Font font = new Font("宋体", 17, FontStyle.Bold); + // Brush textBrush = Brushes.Black; + // g.TextRenderingHint = System.Drawing.Text.TextRenderingHint.ClearTypeGridFit; + // RectangleF rectF = new RectangleF(60, imgH + 80, imgW - 120, textImgH - 180); + // g.DrawString(bookStr, font, textBrush, rectF); + //} + + + string publisher = "出版发行：" + new List() { "技术出版社", "文化出版社", "美术出版社" }[Randomx.GetId(3)]; //string isbn = "ISBN："; string isbn = "ISBN/CN刊号："; //string bookName = "书名："; string bookName = "图书名称："; - string bookPrice = "定价：" + upProdParam.product.productSkus.Max(s => s.productSkuInfo.salePrice) * 0.01; - string author = "作者：王老师"; + string bookPrice = "定　　价：" + upProdParam.product.productSkus.Max(s => s.productSkuInfo.salePrice) * 0.01; + string author = "作　　者：王老师"; string publishTime = "出版时间：" + DateTime.Now.AddMonths(-3).ToString("yyyy年MM月dd日"); - string edition = "版次：1"; - string binding = "装帧：平装"; + string edition = "版　　次：1"; + string binding = "装　　帧：平装"; foreach (var propParam in upProdParam.product.info.param) { if (propParam.categorys[0].name.Contains("出版社名称")) - publisher = "出版社名称：" + propParam.categorys[1].name; + publisher = "出版发行：" + propParam.categorys[1].name; else if (propParam.categorys[0].name.Contains("ISBN版号/CN刊号")) { //isbn = "ISBN：" + propParam.categorys[1].name; @@ -4468,13 +4583,13 @@ namespace TemuKJD.WXForms.ProductForms propParam.categorys[1].name = bookPrice; } else if (propParam.categorys[0].name.Contains("作者")) - author = "作者：" + propParam.categorys[1].name; + author = "作　　者：" + propParam.categorys[1].name; else if (propParam.categorys[0].name.Contains("出版时间")) publishTime = "出版时间：" + propParam.categorys[1].name; else if (propParam.categorys[0].name.Contains("版次")) - edition = "版次：" + propParam.categorys[1].name; + edition = "版　　次：" + propParam.categorys[1].name; else if (propParam.categorys[0].name.Contains("包装")) - binding = "装帧：" + propParam.categorys[1].name; + binding = "装　　帧：" + propParam.categorys[1].name; } var bookStr = publisher + "\r\n" + "\r\n" + @@ -4509,38 +4624,95 @@ namespace TemuKJD.WXForms.ProductForms textImgH = size.Height.ParseToInt() + 180; } - //var bookImg = new Bitmap(imgW, imgH); - //using (Graphics g = Graphics.FromImage(bookImg)) - //{ - // g.Clear(Color.White); - // //Font font = new Font("宋体", 15, FontStyle.Bold); - // //Font font = new Font("微软雅黑", 15, FontStyle.Regular); - // Font font = new Font("微软雅黑", 16, FontStyle.Regular); - // //Font font = new Font("宋体", 17, FontStyle.Bold); - // Brush textBrush = Brushes.Black; - // g.TextRenderingHint = System.Drawing.Text.TextRenderingHint.ClearTypeGridFit; - // RectangleF rectF = new RectangleF(60, 80, imgW - 120, imgH - 180); - // g.DrawString(bookStr, font, textBrush, rectF); - //} - - // 绘制一张带主图的商品详情页 - var bookImg = new Bitmap(imgW, imgH + textImgH); + var bookImg = TemuKJD.Properties.Resources.empty_book_900_1200; + imgH = bookImg.Height; + imgW = bookImg.Width; using (Graphics g = Graphics.FromImage(bookImg)) { - g.Clear(Color.FromArgb(248, 239, 244)); - - g.DrawImage(imageMain, new Rectangle(0, 0, imgW, imgH), 0, 0, imageMain.Width, imageMain.Height, GraphicsUnit.Pixel); - - //Font font = new Font("宋体", 15, FontStyle.Bold); - //Font font = new Font("微软雅黑", 15, FontStyle.Regular); - Font font = new Font("微软雅黑", 18, FontStyle.Regular); - //Font font = new Font("宋体", 17, FontStyle.Bold); Brush textBrush = Brushes.Black; g.TextRenderingHint = System.Drawing.Text.TextRenderingHint.ClearTypeGridFit; - RectangleF rectF = new RectangleF(60, imgH + 80, imgW - 120, textImgH - 180); - g.DrawString(bookStr, font, textBrush, rectF); + float txtY = 80; + + // 书名 + Font font = new Font("宋体", 22, FontStyle.Bold); + RectangleF rectF = new RectangleF(100, txtY, imgW - 200, imgH - txtY - 80); + g.DrawString(bookName.Replace("图书名称：", ""), font, textBrush, rectF); + // 测量文本的高度 决定接下来文字绘制位置 + var textSize = g.MeasureString(bookName.Replace("图书名称：", ""), font, imgW - 200); + txtY += 20 + textSize.Height; + + font = new Font("宋体", 16, FontStyle.Bold); + rectF = new RectangleF(100, txtY, imgW - 200, imgH - txtY - 80); + g.DrawString(author.Replace("作　　者：", "").TrimEnd('著', ' ') + " 著", font, textBrush, rectF); + // 测量文本的高度 + textSize = g.MeasureString(author.Replace("作　　者：", "").TrimEnd('著', ' ') + " 著", font, imgW - 200); + txtY += 20 + textSize.Height; + + rectF = new RectangleF(100, txtY, imgW - 200, imgH - txtY - 80); + g.DrawString(publisher.Replace("出版发行：", ""), font, textBrush, rectF); + // 测量文本的高度 + textSize = g.MeasureString(publisher.Replace("出版发行：", ""), font, imgW - 200); + txtY += 20 + textSize.Height; + + rectF = new RectangleF(100, txtY, imgW - 200, imgH - txtY - 80); + g.DrawString(isbn.Replace("ISBN/CN刊号：", "ISBN "), font, textBrush, rectF); + // 测量文本的高度 + textSize = g.MeasureString(isbn.Replace("ISBN/CN刊号：", "ISBN "), font, imgW - 200); + txtY += 20 + textSize.Height; + + // 以下从下往上写 + txtY = imgH - 120; + // 测量文本的高度 + textSize = g.MeasureString(binding, font, imgW - 200); + txtY -= (10 + textSize.Height); + rectF = new RectangleF(100, txtY, imgW - 200, imgH - txtY); + g.DrawString(binding, font, textBrush, rectF); + + // 测量文本的高度 + textSize = g.MeasureString(edition, font, imgW - 200); + txtY -= (10 + textSize.Height); + rectF = new RectangleF(100, txtY, imgW - 200, imgH - txtY); + g.DrawString(edition, font, textBrush, rectF); + + // 测量文本的高度 + textSize = g.MeasureString(publishTime, font, imgW - 200); + txtY -= (10 + textSize.Height); + rectF = new RectangleF(100, txtY, imgW - 200, imgH - txtY); + g.DrawString(publishTime, font, textBrush, rectF); + + // 测量文本的高度 + textSize = g.MeasureString(author, font, imgW - 200); + txtY -= (10 + textSize.Height); + rectF = new RectangleF(100, txtY, imgW - 200, imgH - txtY); + g.DrawString(author, font, textBrush, rectF); + + // 测量文本的高度 + textSize = g.MeasureString(bookPrice + "元", font, imgW - 200); + txtY -= (10 + textSize.Height); + rectF = new RectangleF(100, txtY, imgW - 200, imgH - txtY); + g.DrawString(bookPrice + "元", font, textBrush, rectF); + + // 测量文本的高度 + textSize = g.MeasureString(bookName, font, imgW - 200); + txtY -= (10 + textSize.Height); + rectF = new RectangleF(100, txtY, imgW - 200, imgH - txtY); + g.DrawString(bookName, font, textBrush, rectF); + + // 测量文本的高度 + textSize = g.MeasureString(isbn.Replace("ISBN/CN刊号：", "书号 ISBN "), font, imgW - 200); + txtY -= (10 + textSize.Height); + rectF = new RectangleF(100, txtY, imgW - 200, imgH - txtY); + g.DrawString(isbn.Replace("ISBN/CN刊号：", "书　　号：ISBN "), font, textBrush, rectF); + + // 测量文本的高度 + textSize = g.MeasureString(publisher, font, imgW - 200); + txtY -= (10 + textSize.Height); + rectF = new RectangleF(100, txtY, imgW - 200, imgH - txtY); + g.DrawString(publisher, font, textBrush, rectF); + } + Thread.Sleep(Randomx.GetId(500, 800)); var locationStr = UploadImg(shop, bookImg, cell); if (!locationStr.Contains("\"success\":true")) @@ -5666,6 +5838,8 @@ namespace TemuKJD.WXForms.ProductForms } data += "&in_groups=" + serach_group; + data += "&in_notes=" + cmbNotes.Text.Trim(); + data += "&product_name=" + txtSearchGoodsName.Text.Trim(); // 商品采集权限可以随机管理员或自己采集的商品 @@ -5678,6 +5852,7 @@ namespace TemuKJD.WXForms.ProductForms cmbHot.Text != "爆款数据" && !BaseClass.UserAuthority.Contains("货源选择")) data += "&add_user_name=" + (BaseClass.GroupId == 3 ? BaseClass.UserName : BaseClass.ParentUserName); + // 防止手输查询学员数据 if (!BaseClass.UserAuthority.Contains("学员数据") && !BaseClass.ParentAuthority.Contains("学员数据") && cmbSourceType.Text.Contains("学员数据")) { cmbSourceType.Text = cmbSourceType.Text.Replace("学员数据", ""); @@ -5928,7 +6103,7 @@ namespace TemuKJD.WXForms.ProductForms private void txtAddPrice_TextChanged(object sender, EventArgs e) { - if (IsLoadComplate) + if (IsFormLoad) { defaultAddPriceRule.AddPriceTimes = txtAddTimes.Text.Trim().ParseToDecimal(); defaultAddPriceRule.AddMorePrice = txtAddMorePrice.Text.Trim().ParseToDecimal(); @@ -5965,7 +6140,7 @@ namespace TemuKJD.WXForms.ProductForms private void chkAddMorePriceFirst_CheckedChanged(object sender, EventArgs e) { - if (IsLoadComplate) + if (IsFormLoad) { defaultAddPriceRule.AddMorePriceFirst = chkAddMorePriceFirst.Checked; NaiBa.Util.Helper.ConfigHelper.SaveConfig("wx_default_add_price_rule", defaultAddPriceRule); @@ -6574,7 +6749,7 @@ namespace TemuKJD.WXForms.ProductForms private void txtFissionTitle_TextChanged(object sender, EventArgs e) { - if (this.IsLoadComplate) + if (this.IsFormLoad) NaiBa.Util.Helper.ConfigHelper.SaveConfig("wx_prod_fission_title", txtFissionTitle.Text); lblFissionTitleCount.Text = "标题数：" + txtFissionTitle.Text.Split(new string[] { "\r", "\n" }, StringSplitOptions.RemoveEmptyEntries).ToList().Count(); } @@ -6593,9 +6768,13 @@ namespace TemuKJD.WXForms.ProductForms } } - private void chkSameSpecPrice_CheckedChanged(object sender, EventArgs e) + private void chkSkipReplaceText_CheckedChanged(object sender, EventArgs e) { - + if (this.IsFormLoad) + { + wxUploadRule.IsSkipHasFilterWordsProd = chkSkipReplaceText.Checked; + NaiBa.Util.Helper.ConfigHelper.SaveConfig("wx_upload_rule", wxUploadRule); + } } } @@ -7046,6 +7225,7 @@ Content-Type: application/octet-stream public int PreSaleDays { get; set; } = 5; public string FilterWords { get; set; } = "顶级,之王,二手,亏本,冲量,白菜价,跳楼价,xx,xxx,最大,最小,低价,降价,成本,赔钱,甩卖,真丝,蚕丝,香云纱,羊绒,羊毛,羊羔绒,羊羔毛,羽绒,皮草"; + public bool IsSkipHasFilterWordsProd { get; set; } = false; public int SkuMinPrice { get; set; } = 10; public int SkuMaxPrice { get; set; } = 9999; diff --git a/TEMUKJD/WXForms/ProductForms/WXProdPreSaleForm.Designer.cs b/TEMUKJD/WXForms/ProductForms/WXProdPreSaleForm.Designer.cs index 47afb8a..c31a37a 100644 --- a/TEMUKJD/WXForms/ProductForms/WXProdPreSaleForm.Designer.cs +++ b/TEMUKJD/WXForms/ProductForms/WXProdPreSaleForm.Designer.cs @@ -159,6 +159,7 @@ namespace TemuKJD.WXForms.ProductForms this.colOpResult = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.splitContainer4 = new System.Windows.Forms.SplitContainer(); this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); + this.comboBox1 = new System.Windows.Forms.ComboBox(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -729,6 +730,7 @@ namespace TemuKJD.WXForms.ProductForms | System.Windows.Forms.AnchorStyles.Left))); this.ucGroupBoxEx4.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.ucGroupBoxEx4.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx4.Controls.Add(this.comboBox1); this.ucGroupBoxEx4.Controls.Add(this.label5); this.ucGroupBoxEx4.Controls.Add(this.chkSearchPromotionLink); this.ucGroupBoxEx4.Controls.Add(this.cmbOnSaleStatus); @@ -766,7 +768,7 @@ namespace TemuKJD.WXForms.ProductForms this.chkSearchPromotionLink.Name = "chkSearchPromotionLink"; this.chkSearchPromotionLink.Size = new System.Drawing.Size(147, 21); this.chkSearchPromotionLink.TabIndex = 827; - this.chkSearchPromotionLink.Text = "同时查询商品推广短链"; + this.chkSearchPromotionLink.Text = "同时查询商品推广链接"; this.chkSearchPromotionLink.UseVisualStyleBackColor = true; this.chkSearchPromotionLink.CheckedChanged += new System.EventHandler(this.chkSearchPromotionLink_CheckedChanged); // @@ -1874,6 +1876,18 @@ namespace TemuKJD.WXForms.ProductForms this.statusBar.Size = new System.Drawing.Size(1165, 26); this.statusBar.TabIndex = 2; // + // comboBox1 + // + this.comboBox1.FormattingEnabled = true; + this.comboBox1.Items.AddRange(new object[] { + "短链", + "长链"}); + this.comboBox1.Location = new System.Drawing.Point(156, 89); + this.comboBox1.Name = "comboBox1"; + this.comboBox1.Size = new System.Drawing.Size(49, 25); + this.comboBox1.TabIndex = 995; + this.comboBox1.Text = "短链"; + // // WXProdPreSaleForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -2038,5 +2052,6 @@ namespace TemuKJD.WXForms.ProductForms private System.Windows.Forms.DateTimePicker dtpEndTime; private System.Windows.Forms.Label label9; private System.Windows.Forms.ComboBox cmbChangePriceType; + private System.Windows.Forms.ComboBox comboBox1; } } \ No newline at end of file diff --git a/TEMUKJD/WXForms/ProductForms/WXProdPreSaleForm.cs b/TEMUKJD/WXForms/ProductForms/WXProdPreSaleForm.cs index b9324be..18465ee 100644 --- a/TEMUKJD/WXForms/ProductForms/WXProdPreSaleForm.cs +++ b/TEMUKJD/WXForms/ProductForms/WXProdPreSaleForm.cs @@ -844,7 +844,10 @@ namespace TemuKJD.WXForms.ProductForms { Invoke(new Action(() => { - dgvSelectProduct.Rows[rowIndex].Cells["colPromotionLink"].Value = shareUrl; + if (comboBox1.Text == "短链") + dgvSelectProduct.Rows[rowIndex].Cells["colPromotionLink"].Value = shortLink; + else + dgvSelectProduct.Rows[rowIndex].Cells["colPromotionLink"].Value = shareUrl; })); } else diff --git a/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.Designer.cs b/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.Designer.cs index 037b67e..ca2739b 100644 --- a/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.Designer.cs +++ b/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.Designer.cs @@ -49,6 +49,9 @@ namespace TemuKJD.WXForms.ProductForms System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WXUserCollectAuthProdListForm)); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.cmbBatchEditNotes = new System.Windows.Forms.ComboBox(); + this.btnEditNotes = new DevComponents.DotNetBar.PanelEx(); + this.btnBatchEditNotes = new DevComponents.DotNetBar.PanelEx(); this.btnAITitleFission = new DevComponents.DotNetBar.PanelEx(); this.txtFissionProductCount = new System.Windows.Forms.TextBox(); this.chkFissionProduct = new TemuKJD.UserComponent.UcCheckBox(this.components); @@ -61,6 +64,8 @@ namespace TemuKJD.WXForms.ProductForms this.btnGetProdWxCate = new DevComponents.DotNetBar.PanelEx(); this.btnDel = new DevComponents.DotNetBar.PanelEx(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); + this.cmbNotes = new System.Windows.Forms.ComboBox(); + this.label9 = new System.Windows.Forms.Label(); this.cmbHasFission = new System.Windows.Forms.ComboBox(); this.label8 = new System.Windows.Forms.Label(); this.txtCatBoundLessThan = new System.Windows.Forms.TextBox(); @@ -80,11 +85,13 @@ namespace TemuKJD.WXForms.ProductForms this.lblSourceType = new System.Windows.Forms.Label(); this.cmbSourceType = new System.Windows.Forms.ComboBox(); this.lblNotes = new System.Windows.Forms.Label(); - this.txtNotes = new System.Windows.Forms.TextBox(); this.label12 = new System.Windows.Forms.Label(); this.cmbWxCat = new System.Windows.Forms.ComboBox(); this.lblWxSafe = new System.Windows.Forms.Label(); this.cmbWxSafe = new System.Windows.Forms.ComboBox(); + this.chkTime = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.dtpStart = new System.Windows.Forms.DateTimePicker(); + this.dtpEnd = new System.Windows.Forms.DateTimePicker(); this.label7 = new System.Windows.Forms.Label(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); this.lblRelation = new System.Windows.Forms.Label(); @@ -144,12 +151,6 @@ namespace TemuKJD.WXForms.ProductForms this.col_select_product = new System.Windows.Forms.DataGridViewLinkColumn(); this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage(); this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); - this.txtBatchEditNotes = new System.Windows.Forms.TextBox(); - this.btnBatchEditNotes = new DevComponents.DotNetBar.PanelEx(); - this.dtpEnd = new System.Windows.Forms.DateTimePicker(); - this.dtpStart = new System.Windows.Forms.DateTimePicker(); - this.chkTime = new TemuKJD.UserComponent.UcCheckBox(this.components); - this.label9 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -174,8 +175,9 @@ namespace TemuKJD.WXForms.ProductForms // // splitContainer1.Panel1 // + this.splitContainer1.Panel1.Controls.Add(this.cmbBatchEditNotes); + this.splitContainer1.Panel1.Controls.Add(this.btnEditNotes); this.splitContainer1.Panel1.Controls.Add(this.btnBatchEditNotes); - this.splitContainer1.Panel1.Controls.Add(this.txtBatchEditNotes); this.splitContainer1.Panel1.Controls.Add(this.btnAITitleFission); this.splitContainer1.Panel1.Controls.Add(this.txtFissionProductCount); this.splitContainer1.Panel1.Controls.Add(this.chkFissionProduct); @@ -197,6 +199,66 @@ namespace TemuKJD.WXForms.ProductForms this.splitContainer1.SplitterDistance = 115; this.splitContainer1.TabIndex = 1; // + // cmbBatchEditNotes + // + this.cmbBatchEditNotes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.cmbBatchEditNotes.FormattingEnabled = true; + this.cmbBatchEditNotes.Location = new System.Drawing.Point(1221, 43); + this.cmbBatchEditNotes.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); + this.cmbBatchEditNotes.Name = "cmbBatchEditNotes"; + this.cmbBatchEditNotes.Size = new System.Drawing.Size(105, 25); + this.cmbBatchEditNotes.TabIndex = 886; + // + // btnEditNotes + // + this.btnEditNotes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnEditNotes.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnEditNotes.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnEditNotes.DisabledBackColor = System.Drawing.Color.Empty; + this.btnEditNotes.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnEditNotes.Location = new System.Drawing.Point(1328, 43); + this.btnEditNotes.Name = "btnEditNotes"; + this.btnEditNotes.Size = new System.Drawing.Size(15, 25); + this.btnEditNotes.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnEditNotes.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnEditNotes.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnEditNotes.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnEditNotes.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnEditNotes.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnEditNotes.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnEditNotes.Style.GradientAngle = 90; + this.btnEditNotes.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnEditNotes.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnEditNotes.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnEditNotes.TabIndex = 1267; + this.btnEditNotes.Text = "+"; + this.btnEditNotes.Click += new System.EventHandler(this.btnEditNotes_Click); + // + // btnBatchEditNotes + // + this.btnBatchEditNotes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnBatchEditNotes.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnBatchEditNotes.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnBatchEditNotes.DisabledBackColor = System.Drawing.Color.Empty; + this.btnBatchEditNotes.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnBatchEditNotes.Location = new System.Drawing.Point(1345, 43); + this.btnBatchEditNotes.Name = "btnBatchEditNotes"; + this.btnBatchEditNotes.Size = new System.Drawing.Size(84, 25); + this.btnBatchEditNotes.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnBatchEditNotes.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnBatchEditNotes.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnBatchEditNotes.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnBatchEditNotes.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnBatchEditNotes.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnBatchEditNotes.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnBatchEditNotes.Style.GradientAngle = 90; + this.btnBatchEditNotes.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnBatchEditNotes.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnBatchEditNotes.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnBatchEditNotes.TabIndex = 1230; + this.btnBatchEditNotes.Text = "批量修改备注"; + this.btnBatchEditNotes.Click += new System.EventHandler(this.btnBatchEditNotes_Click); + // // btnAITitleFission // this.btnAITitleFission.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -250,9 +312,9 @@ namespace TemuKJD.WXForms.ProductForms this.btnOut1688ProdSaveDb.Cursor = System.Windows.Forms.Cursors.Hand; this.btnOut1688ProdSaveDb.DisabledBackColor = System.Drawing.Color.Empty; this.btnOut1688ProdSaveDb.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnOut1688ProdSaveDb.Location = new System.Drawing.Point(1324, 78); + this.btnOut1688ProdSaveDb.Location = new System.Drawing.Point(1328, 78); this.btnOut1688ProdSaveDb.Name = "btnOut1688ProdSaveDb"; - this.btnOut1688ProdSaveDb.Size = new System.Drawing.Size(105, 25); + this.btnOut1688ProdSaveDb.Size = new System.Drawing.Size(101, 25); this.btnOut1688ProdSaveDb.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnOut1688ProdSaveDb.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnOut1688ProdSaveDb.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -275,7 +337,7 @@ namespace TemuKJD.WXForms.ProductForms this.btnImportPddOutData.Cursor = System.Windows.Forms.Cursors.Hand; this.btnImportPddOutData.DisabledBackColor = System.Drawing.Color.Empty; this.btnImportPddOutData.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnImportPddOutData.Location = new System.Drawing.Point(1216, 78); + this.btnImportPddOutData.Location = new System.Drawing.Point(1221, 78); this.btnImportPddOutData.Name = "btnImportPddOutData"; this.btnImportPddOutData.Size = new System.Drawing.Size(105, 25); this.btnImportPddOutData.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -462,6 +524,7 @@ namespace TemuKJD.WXForms.ProductForms this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel1.Controls.Add(this.cmbNotes, 7, 0); this.tableLayoutPanel1.Controls.Add(this.label9, 2, 2); this.tableLayoutPanel1.Controls.Add(this.cmbHasFission, 11, 1); this.tableLayoutPanel1.Controls.Add(this.label8, 10, 1); @@ -482,7 +545,6 @@ namespace TemuKJD.WXForms.ProductForms this.tableLayoutPanel1.Controls.Add(this.lblSourceType, 4, 0); this.tableLayoutPanel1.Controls.Add(this.cmbSourceType, 5, 0); this.tableLayoutPanel1.Controls.Add(this.lblNotes, 6, 0); - this.tableLayoutPanel1.Controls.Add(this.txtNotes, 7, 0); this.tableLayoutPanel1.Controls.Add(this.label12, 8, 0); this.tableLayoutPanel1.Controls.Add(this.cmbWxCat, 9, 0); this.tableLayoutPanel1.Controls.Add(this.lblWxSafe, 10, 0); @@ -499,6 +561,28 @@ namespace TemuKJD.WXForms.ProductForms this.tableLayoutPanel1.Size = new System.Drawing.Size(992, 105); this.tableLayoutPanel1.TabIndex = 679; // + // cmbNotes + // + this.cmbNotes.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.cmbNotes.FormattingEnabled = true; + this.cmbNotes.Location = new System.Drawing.Point(554, 3); + this.cmbNotes.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); + this.cmbNotes.Name = "cmbNotes"; + this.cmbNotes.Size = new System.Drawing.Size(99, 25); + this.cmbNotes.TabIndex = 885; + // + // label9 + // + this.label9.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label9.AutoSize = true; + this.label9.Location = new System.Drawing.Point(181, 77); + this.label9.Margin = new System.Windows.Forms.Padding(3, 7, 0, 0); + this.label9.Name = "label9"; + this.label9.Size = new System.Drawing.Size(56, 17); + this.label9.TabIndex = 885; + this.label9.Text = "结束时间"; + // // cmbHasFission // this.cmbHasFission.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) @@ -748,18 +832,6 @@ namespace TemuKJD.WXForms.ProductForms this.lblNotes.TabIndex = 440; this.lblNotes.Text = " 备注"; // - // txtNotes - // - this.txtNotes.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.txtNotes.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.txtNotes.Font = new System.Drawing.Font("微软雅黑", 10F); - this.txtNotes.Location = new System.Drawing.Point(554, 3); - this.txtNotes.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); - this.txtNotes.Name = "txtNotes"; - this.txtNotes.Size = new System.Drawing.Size(99, 25); - this.txtNotes.TabIndex = 439; - // // label12 // this.label12.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -814,6 +886,38 @@ namespace TemuKJD.WXForms.ProductForms this.cmbWxSafe.TabIndex = 676; this.cmbWxSafe.Text = "安全+未校验"; // + // chkTime + // + this.chkTime.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.chkTime.Location = new System.Drawing.Point(3, 77); + this.chkTime.Name = "chkTime"; + this.chkTime.Size = new System.Drawing.Size(66, 21); + this.chkTime.TabIndex = 980; + this.chkTime.Text = "开始时间"; + this.chkTime.UseVisualStyleBackColor = true; + // + // dtpStart + // + this.dtpStart.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.dtpStart.CustomFormat = "yyyy-MM-dd HH:mm"; + this.dtpStart.Format = System.Windows.Forms.DateTimePickerFormat.Custom; + this.dtpStart.Location = new System.Drawing.Point(72, 76); + this.dtpStart.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); + this.dtpStart.Name = "dtpStart"; + this.dtpStart.Size = new System.Drawing.Size(99, 23); + this.dtpStart.TabIndex = 981; + // + // dtpEnd + // + this.dtpEnd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.dtpEnd.CustomFormat = "yyyy-MM-dd HH:mm"; + this.dtpEnd.Format = System.Windows.Forms.DateTimePickerFormat.Custom; + this.dtpEnd.Location = new System.Drawing.Point(237, 76); + this.dtpEnd.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); + this.dtpEnd.Name = "dtpEnd"; + this.dtpEnd.Size = new System.Drawing.Size(99, 23); + this.dtpEnd.TabIndex = 982; + // // label7 // this.label7.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -1477,85 +1581,6 @@ namespace TemuKJD.WXForms.ProductForms this.statusBar.Size = new System.Drawing.Size(1438, 25); this.statusBar.TabIndex = 5; // - // txtBatchEditNotes - // - this.txtBatchEditNotes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.txtBatchEditNotes.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.txtBatchEditNotes.Font = new System.Drawing.Font("微软雅黑", 10F); - this.txtBatchEditNotes.Location = new System.Drawing.Point(1216, 43); - this.txtBatchEditNotes.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); - this.txtBatchEditNotes.Name = "txtBatchEditNotes"; - this.txtBatchEditNotes.Size = new System.Drawing.Size(126, 25); - this.txtBatchEditNotes.TabIndex = 1226; - // - // btnBatchEditNotes - // - this.btnBatchEditNotes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btnBatchEditNotes.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnBatchEditNotes.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnBatchEditNotes.DisabledBackColor = System.Drawing.Color.Empty; - this.btnBatchEditNotes.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnBatchEditNotes.Location = new System.Drawing.Point(1345, 43); - this.btnBatchEditNotes.Name = "btnBatchEditNotes"; - this.btnBatchEditNotes.Size = new System.Drawing.Size(84, 25); - this.btnBatchEditNotes.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnBatchEditNotes.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnBatchEditNotes.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnBatchEditNotes.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.btnBatchEditNotes.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.btnBatchEditNotes.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.btnBatchEditNotes.Style.ForeColor.Color = System.Drawing.Color.White; - this.btnBatchEditNotes.Style.GradientAngle = 90; - this.btnBatchEditNotes.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnBatchEditNotes.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnBatchEditNotes.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnBatchEditNotes.TabIndex = 1230; - this.btnBatchEditNotes.Text = "批量修改备注"; - this.btnBatchEditNotes.Click += new System.EventHandler(this.btnBatchEditNotes_Click); - // - // dtpEnd - // - this.dtpEnd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.dtpEnd.CustomFormat = "yyyy-MM-dd HH:mm"; - this.dtpEnd.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - this.dtpEnd.Location = new System.Drawing.Point(237, 76); - this.dtpEnd.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); - this.dtpEnd.Name = "dtpEnd"; - this.dtpEnd.Size = new System.Drawing.Size(99, 23); - this.dtpEnd.TabIndex = 982; - // - // dtpStart - // - this.dtpStart.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.dtpStart.CustomFormat = "yyyy-MM-dd HH:mm"; - this.dtpStart.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - this.dtpStart.Location = new System.Drawing.Point(72, 76); - this.dtpStart.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); - this.dtpStart.Name = "dtpStart"; - this.dtpStart.Size = new System.Drawing.Size(99, 23); - this.dtpStart.TabIndex = 981; - // - // chkTime - // - this.chkTime.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.chkTime.Location = new System.Drawing.Point(3, 77); - this.chkTime.Name = "chkTime"; - this.chkTime.Size = new System.Drawing.Size(66, 21); - this.chkTime.TabIndex = 980; - this.chkTime.Text = "开始时间"; - this.chkTime.UseVisualStyleBackColor = true; - // - // label9 - // - this.label9.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(181, 77); - this.label9.Margin = new System.Windows.Forms.Padding(3, 7, 0, 0); - this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(56, 17); - this.label9.TabIndex = 885; - this.label9.Text = "结束时间"; - // // WXUserCollectAuthProdListForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -1608,7 +1633,6 @@ namespace TemuKJD.WXForms.ProductForms private System.Windows.Forms.Label label2; private UserComponent.DataGridViewEx dgvDbProduct; private System.Windows.Forms.PictureBox pbLoading; - private System.Windows.Forms.TextBox txtNotes; private System.Windows.Forms.Label lblNotes; private System.Windows.Forms.ComboBox cmbSort; private System.Windows.Forms.Label label6; @@ -1690,10 +1714,12 @@ namespace TemuKJD.WXForms.ProductForms private System.Windows.Forms.DataGridViewLinkColumn col_delete; private System.Windows.Forms.DataGridViewLinkColumn col_select_product; private DevComponents.DotNetBar.PanelEx btnBatchEditNotes; - private System.Windows.Forms.TextBox txtBatchEditNotes; private System.Windows.Forms.DateTimePicker dtpStart; private System.Windows.Forms.DateTimePicker dtpEnd; private UserComponent.UcCheckBox chkTime; private System.Windows.Forms.Label label9; + private DevComponents.DotNetBar.PanelEx btnEditNotes; + public System.Windows.Forms.ComboBox cmbNotes; + public System.Windows.Forms.ComboBox cmbBatchEditNotes; } } \ No newline at end of file diff --git a/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.cs b/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.cs index 42e45f5..b5d0b1f 100644 --- a/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.cs +++ b/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.cs @@ -54,6 +54,13 @@ namespace TemuKJD.WXForms.ProductForms dtpStart.Value = DateTime.Now.Date.AddMonths(-1); dtpEnd.Value = DateTime.Now.Date.AddDays(1).AddSeconds(-1); + Task.Run(() => + { + string addUserName = BaseClass.GroupId == 3 ? BaseClass.UserName : BaseClass.ParentUserName; + PDDDBProdListForm.GetPDDProductNotes(new List { cmbNotes }, addUserName); + PDDDBProdListForm.GetPDDProductNotes(new List { cmbBatchEditNotes }, addUserName); + }); + //chkCatBoundLessThan.Visible = false; //chkCatBoundMoreThan.Visible = false; //tableLayoutPanel1.SetColumn(lblSourceType, 2); @@ -198,7 +205,7 @@ namespace TemuKJD.WXForms.ProductForms // 清除整个Bitmap为白色 g.Clear(Color.White); } - foreach (var prod in lstTemuDbProduct) + foreach (var prod in lstTemuDbProduct.Reverse().ToList()) { var catName = GetProdCateName(prod); Invoke(new Action(() => @@ -379,7 +386,7 @@ namespace TemuKJD.WXForms.ProductForms "&page_size=" + pageSize + "&search_spu=" + string.Join(",", txtSPU.Text.Trim().Split(new string[] { ",", "，", " " }, StringSplitOptions.RemoveEmptyEntries).Select(s => s + collectAuthorityTag)) + "&search_skc=" + txtSKC.Text.Trim() + - "&search_notes=" + txtNotes.Text.Trim() + + "&search_notes=" + cmbNotes.Text.Trim() + "&search_ext_code=" + txtExtCode.Text.Trim() + //"&search_group=" + cmbGroupFilter.Text.Trim() + "&search_prod_name=" + txtProdName.Text.Trim() + @@ -562,7 +569,7 @@ namespace TemuKJD.WXForms.ProductForms this.txtProdName.Text = ""; this.txtSKC.Text = ""; this.txtSPU.Text = ""; - this.txtNotes.Text = ""; + this.cmbNotes.Text = ""; this.cmbGroupFilter.Text = ""; this.cmbSort.Text = "入库时间"; this.cmbSourceType.Text = ""; @@ -1204,8 +1211,10 @@ namespace TemuKJD.WXForms.ProductForms private void btnBatchEditNotes_Click(object sender, EventArgs e) { - var lstProdId = dgvDbProduct.Rows.Cast().Where(row - => row.Cells["colSelect"]?.Value.ParseToBool() == true).Select(r => r.Cells["col_spu_id"]?.Value.ToString()).ToList(); + var rows = dgvDbProduct.Rows.Cast().Where(row + => row.Cells["colSelect"]?.Value.ParseToBool() == true); + var lstProdId = rows.Select(r => r.Cells["col_spu_id"]?.Value.ToString()).ToList(); + string newNotes = this.cmbBatchEditNotes.Text.Trim(); if (BaseMsgForm.ShowConfirm("确定批量编辑备注吗？").DialogResult == DialogResult.Cancel) return; if (lstProdId.Count == 0) @@ -1215,30 +1224,12 @@ namespace TemuKJD.WXForms.ProductForms } this.pbLoading.Visible = true; - //int total = 0, successCnt = 0, failCnt = 0; Task.Run(() => { var prodList = lstTemuDbProduct.Where(p => lstProdId.Contains(p.spu_id)).ToList(); - //foreach (var dbProd in prodList) - //{ - // total++; - // var url = BaseClass.BuildPDDObjString("product/mdy_db_product"); - // var data = UserLogin.GetSignaturex() + - // "&db_id=" + dbProd.id + "¬es=" + this.txtBatchEditNotes.Text.Trim(); - // var html = GetHtml.PostUtf8(url, data); - // if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) - // { - // failCnt++; - // } - // else - // { - // successCnt++; - // } - // Thread.Sleep(100); - //} var url = BaseClass.BuildPDDObjString("product/mdy_db_product"); var data = UserLogin.GetSignaturex() + - "&in_db_ids=" + string.Join(",", prodList.Select(p => p.id).ToList()) + "¬es=" + this.txtBatchEditNotes.Text.Trim(); + "&in_db_ids=" + string.Join(",", prodList.Select(p => p.id).ToList()) + "¬es=" + newNotes; var html = GetHtml.PostUtf8(url, data); if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) { @@ -1246,10 +1237,46 @@ namespace TemuKJD.WXForms.ProductForms } else { - SearchDbProd(this.ucSplitPage1.CurrentPage); - BaseMsgForm.ShowInfo("修改完成"); + //SearchDbProd(this.ucSplitPage1.CurrentPage); + //BaseMsgForm.ShowInfo("修改完成"); + + foreach (var prod in prodList) + { + prod.notes = newNotes; + } + foreach (var row in rows) + { + Invoke(new Action(() => { row.Cells["col_notes"].Value = newNotes; })); + + } + + if (!string.IsNullOrEmpty(newNotes)) + { + string addUserName = BaseClass.GroupId == 3 ? BaseClass.UserName : BaseClass.ParentUserName; + PDDDBProdNotesManageFrom.AddProductNotes(newNotes, addUserName); + + PDDDBProdListForm.GetPDDProductNotes(new List { cmbNotes }, addUserName); + PDDDBProdListForm.GetPDDProductNotes(new List { cmbBatchEditNotes }, addUserName); + } } + Invoke(new Action(() => + { + this.pbLoading.Visible = false; + })); }); } + + private void btnEditNotes_Click(object sender, EventArgs e) + { + string addUserName = BaseClass.GroupId == 3 ? BaseClass.UserName : BaseClass.ParentUserName; + PDDDBProdNotesManageFrom groupMf = new PDDDBProdNotesManageFrom(addUserName); + groupMf.ShowDialog(); + + + PDDDBProdListForm.GetPDDProductNotes(new List { cmbNotes }, addUserName); + PDDDBProdListForm.GetPDDProductNotes(new List { cmbBatchEditNotes }, addUserName); + } + + } } diff --git a/TEMUKJD/WXForms/ShopForms/WXGetTopUpQrCode.Designer.cs b/TEMUKJD/WXForms/ShopForms/WXGetTopUpQrCode.Designer.cs index b0a2751..386f4b7 100644 --- a/TEMUKJD/WXForms/ShopForms/WXGetTopUpQrCode.Designer.cs +++ b/TEMUKJD/WXForms/ShopForms/WXGetTopUpQrCode.Designer.cs @@ -157,7 +157,7 @@ namespace TemuKJD.WXForms.ShopForms this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(92, 17); this.label2.TabIndex = 1150; - this.label2.Text = "余额充值金额："; + this.label2.Text = "积分充值金额："; // // splitContainer1 // diff --git a/TEMUKJD/WXForms/ShopForms/WXGetTopUpQrCode.cs b/TEMUKJD/WXForms/ShopForms/WXGetTopUpQrCode.cs index 79cd142..9a1c7e6 100644 --- a/TEMUKJD/WXForms/ShopForms/WXGetTopUpQrCode.cs +++ b/TEMUKJD/WXForms/ShopForms/WXGetTopUpQrCode.cs @@ -115,6 +115,19 @@ namespace TemuKJD.WXForms.ShopForms //{ // updateBalanceAction(); //} + + var url3 = BaseClass.BuildWXObjString("user/get_all_user"); + var data3 = UserLogin.GetSignaturex(); + data3 += "&search_user_name=" + BaseClass.UserName; + var html = GetHtml.PostUtf8(url3, data3); + if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) + html = GetHtml.PostUtf8(url3, data3); + if (html.Contains("\"code\":200")) + { + var p = BaseRegex.GetDecimalJson(ref html, "points"); + BaseClass.Points = p.ParseToInt(); + MainForm.instance.lblPoints.Text = "账户积分：" + BaseClass.Points.ToString(); + } } } } diff --git a/TEMUKJD/WXForms/ShopForms/WXShopForm.Designer.cs b/TEMUKJD/WXForms/ShopForms/WXShopForm.Designer.cs index a783092..eba14b6 100644 --- a/TEMUKJD/WXForms/ShopForms/WXShopForm.Designer.cs +++ b/TEMUKJD/WXForms/ShopForms/WXShopForm.Designer.cs @@ -37,7 +37,7 @@ System.Windows.Forms.TreeNode treeNode7 = new System.Windows.Forms.TreeNode("店铺经营统计"); System.Windows.Forms.TreeNode treeNode8 = new System.Windows.Forms.TreeNode("评分考核"); System.Windows.Forms.TreeNode treeNode9 = new System.Windows.Forms.TreeNode("税务申报"); - System.Windows.Forms.TreeNode treeNode10 = new System.Windows.Forms.TreeNode("充值二维码"); + System.Windows.Forms.TreeNode treeNode10 = new System.Windows.Forms.TreeNode("积分充值"); System.Windows.Forms.TreeNode treeNode11 = new System.Windows.Forms.TreeNode("店铺管理", new System.Windows.Forms.TreeNode[] { treeNode1, treeNode2, @@ -158,8 +158,8 @@ treeNode8.Text = "评分考核"; treeNode9.Name = "税务申报"; treeNode9.Text = "税务申报"; - treeNode10.Name = "充值二维码"; - treeNode10.Text = "充值二维码"; + treeNode10.Name = "积分充值"; + treeNode10.Text = "积分充值"; treeNode11.Name = "店铺管理"; treeNode11.Text = "店铺管理"; this.tv.Nodes.AddRange(new System.Windows.Forms.TreeNode[] { diff --git a/TEMUKJD/WXForms/ShopForms/WXShopForm.cs b/TEMUKJD/WXForms/ShopForms/WXShopForm.cs index 8ccd3ae..0a81287 100644 --- a/TEMUKJD/WXForms/ShopForms/WXShopForm.cs +++ b/TEMUKJD/WXForms/ShopForms/WXShopForm.cs @@ -60,7 +60,7 @@ namespace TemuKJD.WXForms.ShopForms public List getHideTreeNodes() { - List hideNames = new List() { "充值二维码", "OEM账号管理", "OEM返现明细", "OEM积分明细", "店铺地址管理", "评分考核", "子账号管理", "高级运费模板", "运费模板", "素材库管理", "订单金额统计", "工作明细统计", "店铺经营统计1" }; + List hideNames = new List() { "积分充值", "OEM账号管理", "OEM返现明细", "OEM积分明细", "店铺地址管理", "评分考核", "子账号管理", "高级运费模板", "运费模板", "素材库管理", "订单金额统计", "工作明细统计", "店铺经营统计1" }; if (BaseClass.SaLevel == 1) { @@ -78,7 +78,7 @@ namespace TemuKJD.WXForms.ShopForms } if (BaseClass.UserAuthority.Contains("充值用户") && BaseClass.GroupId == 3 && BaseClass.AgentCode.IsNullOrEmpty() && BaseClass.OemId.IsNullOrEmpty()) { - hideNames.Remove("充值二维码"); + //hideNames.Remove("积分充值"); } if (!BaseClass.OemId.IsNullOrEmpty() && BaseClass.IsOemOwner) { @@ -133,7 +133,7 @@ namespace TemuKJD.WXForms.ShopForms case "评分考核": SetForm(shopOptimizeForm.Value); break; - case "充值二维码": + case "积分充值": SetForm(getTopUpQrCode.Value); break; case "OEM账号管理": diff --git a/TEMUKJD/WXForms/ShopForms/WXSubAccountListForm.cs b/TEMUKJD/WXForms/ShopForms/WXSubAccountListForm.cs index 522f830..70ccb66 100644 --- a/TEMUKJD/WXForms/ShopForms/WXSubAccountListForm.cs +++ b/TEMUKJD/WXForms/ShopForms/WXSubAccountListForm.cs @@ -246,7 +246,7 @@ namespace TemuKJD.WXForms.ShopForms this.flowLayoutPanel1.Controls.Add(new UcCheckBox() { Name = "拍单", Text = "拍单", AutoSize = true }); this.flowLayoutPanel1.Controls.Add(new Label() { Text = "-------------------------------------", AutoSize = true }); //this.flowLayoutPanel1.Controls.Add(new UcCheckBox() { Name = "采购", Text = "采购", AutoSize = true }); - List subUserNoAuthorityPageNames = new List() { "子账号管理", "店铺地址管理", "充值二维码", "1688商品采集", "多多商品采集" }; + List subUserNoAuthorityPageNames = new List() { "子账号管理", "店铺地址管理", "积分充值", "1688商品采集", "多多商品采集" }; var shopForm = MainForm.instance.shopForm as WXShopForm; if (shopForm != null) {