diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs index f10cfe3..b520f71 100644 --- a/AllBase/BaseClass.cs +++ b/AllBase/BaseClass.cs @@ -27,8 +27,8 @@ namespace AllBase /// /// 版本ID /// - public static int VersionCount = 566; - //public static int VersionCount = 566; + public static int VersionCount = 572; + //public static int VersionCount = 572; /// /// 版本号 diff --git a/AllBase/Model/Param/TemuProductManage/TemuProductParam.cs b/AllBase/Model/Param/TemuProductManage/TemuProductParam.cs index f7b1c3a..e5e0c1f 100644 --- a/AllBase/Model/Param/TemuProductManage/TemuProductParam.cs +++ b/AllBase/Model/Param/TemuProductManage/TemuProductParam.cs @@ -202,6 +202,11 @@ namespace AllBase.Model.Param.TemuProductManage public ProductSkuNetContentReq productSkuNetContentReq { get; set; } } + public class ProductSkuMultiPackReq2 : ProductSkuMultiPackReq + { + public int? individuallyPacked { get; set; } + } + public class ProductSkuAccessoriesReq { /// diff --git a/AllBase/Model/Result/TemuCheckPriceInfo.cs b/AllBase/Model/Result/TemuCheckPriceInfo.cs index 14c5f75..6ec2b32 100644 --- a/AllBase/Model/Result/TemuCheckPriceInfo.cs +++ b/AllBase/Model/Result/TemuCheckPriceInfo.cs @@ -58,6 +58,10 @@ namespace AllBase.Model.Result public int? priceReviewStatus { get; set; } // 状态3=作废 public string skuPreviewImage { get; set; } public long? skuId { get; set; } + public int? len { get; set; } + public int? width { get; set; } + public int? height { get; set; } + public int? weight { get; set; } public int? supplierPriceValue { get; set; } public string supplierPrice { get; set; } public List productPropertyList { get; set; } diff --git a/AllBase/Model/Result/TemuDBProductPurchasePriceInfo.cs b/AllBase/Model/Result/TemuDBProductPurchasePriceInfo.cs index 8d1edad..a896897 100644 --- a/AllBase/Model/Result/TemuDBProductPurchasePriceInfo.cs +++ b/AllBase/Model/Result/TemuDBProductPurchasePriceInfo.cs @@ -9,6 +9,8 @@ namespace AllBase.Model.Result public class TemuDBProductPurchasePriceInfo { public int id { get; set; } + public string shop_id { get; set; } + public string shop_name { get; set; } public string spu_id { get; set; } public string skc_id { get; set; } public string cat_id { get; set; } @@ -16,6 +18,7 @@ namespace AllBase.Model.Result public string ext_code { get; set; } public string product_name { get; set; } public string main_img { get; set; } + public int discount { get; set; } = 100; public string price_text { get; set; } public string sku_purchase_price_json { get; set; } public List dbSkuPurchasePriceList { get; set; } @@ -26,9 +29,10 @@ namespace AllBase.Model.Result public class TemuDBSkuPurchasePriceInfo { - public int? productSkuId { get; set; } + public long? productSkuId { get; set; } + public string className { get; set; } public List productSkuSpecList { get; set; } - public int? PriceValue { get; set; } - public int? PurchasePriceValue { get; set; } + public int? priceValue { get; set; } + public int? purchasePriceValue { get; set; } } } diff --git a/AllBase/Model/Result/TemuDetailProductInfo.cs b/AllBase/Model/Result/TemuDetailProductInfo.cs index 6469806..2f3a161 100644 --- a/AllBase/Model/Result/TemuDetailProductInfo.cs +++ b/AllBase/Model/Result/TemuDetailProductInfo.cs @@ -37,7 +37,7 @@ namespace AllBase.Model.Result public List outerPackageImages { get; set; } public List goodsModelList { get; set; } public List productPropertyList { get; set; } - public List productSpecPropertyVOS { get; set; } + public List productSpecPropertyVOS { get; set; } public TemuProductWhExtAttr productWhExtAttr { get; set; } public TemuProductLocalExtAttr productLocalExtAttr { get; set; } public TemuProductSaleExtAttr productSaleExtAttr { get; set; } @@ -111,6 +111,23 @@ namespace AllBase.Model.Result public string numberInputValue { get; set; } } + public class TemuProductSpecPropertyVO + { + public long? templatePid { get; set; } + public int? pid { get; set; } + public int? refPid { get; set; } + public string propName { get; set; } + public int? vid { get; set; } + public string propValue { get; set; } + public string valueUnit { get; set; } + public string valueExtendInfo { get; set; } + public string numberInputValue { get; set; } + public int? parentSpecId { get; set; } + public int? specId { get; set; } + public int? valueGroupId { get; set; } + public string valueGroupName { get; set; } + } + public class TemuProductWhExtAttr { public string outerGoodsUrl { get; set; } diff --git a/AllBase/Model/Result/TemuStockInfo.cs b/AllBase/Model/Result/TemuStockInfo.cs index 4181dbc..1d1e29c 100644 --- a/AllBase/Model/Result/TemuStockInfo.cs +++ b/AllBase/Model/Result/TemuStockInfo.cs @@ -92,6 +92,14 @@ namespace AllBase.Model.Result /// public SkuQuantityInfo skuQuantityTotalInfo { get; set; } /// + /// skc货号 + /// + public string skcExtCode { get; set; } + /// + /// 加入站点时长 单位天 + /// + public int? onSalesDurationOffline { get; set; } + /// /// 备货仓组Id列表 /// public List warehouseGroupIdList { get; set; } @@ -114,6 +122,15 @@ namespace AllBase.Model.Result /// 获取评价分错误 /// public string getAfsScoreError { get; set; } = ""; + public decimal? discount { get; set; } = 100; + /// + /// KJD库中是否有进货价数据 + /// + //public bool hasDbPurchasePrice { get; set; } = false; + /// + /// KJD库中进货价数据 + /// + public TemuDBProductPurchasePriceInfo purchasePriceInfo { get; set; } = null; } /// @@ -156,6 +173,10 @@ namespace AllBase.Model.Result /// public int? lastThirtyDaysSaleVolume { get; set; } /// + /// 累计销量 + /// + public int? totalSaleVolume { get; set; } + /// /// 申报价格 CNY 分 /// public int? supplierPrice { get; set; } @@ -176,6 +197,8 @@ namespace AllBase.Model.Result public InventoryNumInfo inventoryNumInfo { get; set; } + /////////////////////////////////////////////////////////// + /// 以下为本地新增用于本地显示的属性 /// /// 拟备货数量，=0不备货 /// @@ -185,6 +208,26 @@ namespace AllBase.Model.Result /// 进货价，保存于KJD库 /// public int purchasePrice { get; set; } = 0; + /// + /// 总货值 + /// + public int goodsValue { get; set; } + /// + /// 总进价（成本） + /// + public int goodsCost { get; set; } + /// + /// 今日利润（通过KJD库获取进货价计算获得） + /// + public decimal? todayProfit { get; set; } = null; + /// + /// 近7日利润（通过KJD库获取进货价计算获得） + /// + public decimal? sevenDaysProfit { get; set; } = null; + /// + /// 近30日利润（通过KJD库获取进货价计算获得） + /// + public decimal? thirtyDaysProfit { get; set; } = null; } /// diff --git a/KJDService/KJD_WebService/BLL/PriceManage.cs b/KJDService/KJD_WebService/BLL/PriceManage.cs index 03b8b97..60cabbc 100644 --- a/KJDService/KJD_WebService/BLL/PriceManage.cs +++ b/KJDService/KJD_WebService/BLL/PriceManage.cs @@ -308,6 +308,8 @@ namespace KJD_Web.BLL return "{\"code\":500,\"msg\":\"没有用户名\"}"; } + string shop_id = RegexUtils.GetStringQuery(ref inputData, "shop_id"); + string shop_name = RegexUtils.GetStringQuery(ref inputData, "shop_name"); string spu_id = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "spu_id")).ParseToString(); string skc_id = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "skc_id")).ParseToString(); string cat_id = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "cat_id")).ParseToString(); @@ -315,6 +317,7 @@ namespace KJD_Web.BLL string ext_code = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "ext_code")).ParseToString(); string product_name = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "product_name")).ParseToString(); string main_img = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "main_img")).ParseToString(); + string discount = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "discount")).ParseToString(); string price_text = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "price_text")).ParseToString(); string sku_purchase_price_json = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "sku_purchase_price_json")).ParseToString(); string notes = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "notes")).ParseToString(); @@ -324,9 +327,11 @@ namespace KJD_Web.BLL MysqlUtils mySql = new MysqlUtils(conn); string sqlExist = "select count(spu_id) from kjd.product_purchase_price where spu_id=@spu_id"; string sql = "insert into kjd.product_purchase_price " + - "(spu_id,skc_id,cat_id,cat_name,ext_code,product_name,main_img,price_text,sku_purchase_price_json,notes) " + - "values (@spu_id,@skc_id,@cat_id,@cat_name,@ext_code,@product_name,@main_img,@price_text,@sku_purchase_price_json,@notes);"; + "(shop_id,shop_name,spu_id,skc_id,cat_id,cat_name,ext_code,product_name,main_img,discount,price_text,sku_purchase_price_json,notes) " + + "values (@shop_id,@shop_name,@spu_id,@skc_id,@cat_id,@cat_name,@ext_code,@product_name,@main_img,@discount,@price_text,@sku_purchase_price_json,@notes);"; List paramLst = new List(); + paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "@shop_id", Value = shop_id, }); + paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "@shop_name", Value = shop_name, }); paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "@spu_id", Value = spu_id, }); paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "@skc_id", Value = skc_id, }); paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "@cat_id", Value = cat_id, }); @@ -334,6 +339,7 @@ namespace KJD_Web.BLL paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "@ext_code", Value = ext_code, }); paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "@product_name", Value = product_name, }); paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "@main_img", Value = main_img, }); + paramLst.Add(new MySqlParameter() { DbType = DbType.Int32, ParameterName = "@discount", Value = discount.ParseToInt(), }); paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "@price_text", Value = price_text, }); paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "@sku_purchase_price_json", Value = sku_purchase_price_json, }); paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "@notes", Value = notes, }); @@ -375,21 +381,28 @@ namespace KJD_Web.BLL } var db_id = RegexUtils.GetStringQuery(ref inputData, "db_id"); + string shop_id = RegexUtils.GetStringQuery(ref inputData, "shop_id"); + string shop_name = RegexUtils.GetStringQuery(ref inputData, "shop_name"); string cat_id = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "cat_id")).ParseToString(); string cat_name = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "cat_name")).ParseToString(); string ext_code = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "ext_code")).ParseToString(); string product_name = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "product_name")).ParseToString(); string main_img = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "main_img")).ParseToString(); + string discount = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "discount")).ParseToString(); string price_text = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "price_text")).ParseToString(); string sku_purchase_price_json = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "sku_purchase_price_json")).ParseToString(); string notes = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "notes")).ParseToString(); List paramLst = new List(); + paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "@db_id", Value = db_id, }); + paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "@shop_id", Value = shop_id, }); + paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "@shop_name", Value = shop_name, }); paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "@cat_id", Value = cat_id, }); paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "@cat_name", Value = cat_name, }); paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "@ext_code", Value = ext_code, }); paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "@product_name", Value = product_name, }); paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "@main_img", Value = main_img, }); + paramLst.Add(new MySqlParameter() { DbType = DbType.Int32, ParameterName = "@discount", Value = discount.ParseToInt(), }); paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "@price_text", Value = price_text, }); paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "@sku_purchase_price_json", Value = sku_purchase_price_json, }); paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "@notes", Value = notes, }); @@ -398,6 +411,10 @@ namespace KJD_Web.BLL MysqlUtils mySql = new MysqlUtils(conn); string sql = "update kjd.product_purchase_price set"; + if (shop_id != null) + sql += " shop_id=@shop_id,"; + if (shop_name != null) + sql += " shop_name=@shop_name,"; if (cat_id != null) sql += " cat_id=@cat_id,"; if (cat_name != null) @@ -408,6 +425,8 @@ namespace KJD_Web.BLL sql += " product_name=@product_name,"; if (main_img != null) sql += " main_img=@main_img,"; + if (discount != null) + sql += " discount=@discount,"; if (price_text != null) sql += " price_text=@price_text,"; if (sku_purchase_price_json != null) @@ -478,7 +497,7 @@ namespace KJD_Web.BLL if (!string.IsNullOrWhiteSpace(search_notes)) where += " and p.notes like @search_notes"; if (!string.IsNullOrEmpty(in_spu_id)) - where += " and p.ext_code in ('" + in_spu_id?.Replace(",", "','") + "')"; + where += " and p.spu_id in ('" + in_spu_id?.Replace(",", "','") + "')"; sql += where; var count = mySql.ExecuteRowCount(sql, paramLst.ToArray()); @@ -511,9 +530,12 @@ namespace KJD_Web.BLL ProductPurchasePriceResultParam price = new ProductPurchasePriceResultParam { id = row["id"].ParseToInt(), + shop_id = row["shop_id"].ParseToString(), + shop_name = row["shop_name"].ParseToString(), cat_id = row["cat_id"].ParseToString(), cat_name = row["cat_name"].ParseToString(), main_img = row["main_img"].ParseToString(), + discount = row["discount"].ParseToInt(), price_text = row["price_text"].ParseToString(), product_name = row["product_name"].ParseToString(), skc_id = row["skc_id"].ParseToString(), diff --git a/KJDService/KJD_WebService/Model/ProductPurchasePriceResultParam.cs b/KJDService/KJD_WebService/Model/ProductPurchasePriceResultParam.cs index e412049..dc49442 100644 --- a/KJDService/KJD_WebService/Model/ProductPurchasePriceResultParam.cs +++ b/KJDService/KJD_WebService/Model/ProductPurchasePriceResultParam.cs @@ -8,6 +8,8 @@ namespace KJD_Web.Model public class ProductPurchasePriceResultParam { public int id { get; set; } + public string shop_id { get; set; } + public string shop_name { get; set; } public string spu_id { get; set; } public string skc_id { get; set; } public string cat_id { get; set; } @@ -15,6 +17,7 @@ namespace KJD_Web.Model public string ext_code { get; set; } public string product_name { get; set; } public string main_img { get; set; } + public int discount { get; set; } public string price_text { get; set; } public string sku_purchase_price_json { get; set; } public DateTime add_time { get; set; } diff --git a/TEMUKJD/KJD.csproj b/TEMUKJD/KJD.csproj index 67d3777..8f5b4d4 100644 --- a/TEMUKJD/KJD.csproj +++ b/TEMUKJD/KJD.csproj @@ -358,6 +358,7 @@ ShopLoginForm.cs + Form @@ -376,6 +377,12 @@ ShopUpdateCookieForm.cs + + Form + + + ShopSetPurchasePriceForm.cs + Form @@ -728,6 +735,9 @@ ShopOrderStatisticsForm.cs + + ShopSetPurchasePriceForm.cs + ShopWorkStatisticsForm.cs diff --git a/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.Designer.cs b/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.Designer.cs index ec19e65..7fd32d7 100644 --- a/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.Designer.cs +++ b/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.Designer.cs @@ -38,14 +38,31 @@ namespace TemuKJD.KJDForms.AdminForms System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.splitContainer3 = new System.Windows.Forms.SplitContainer(); + this.splitContainer2 = new System.Windows.Forms.SplitContainer(); + this.pbShopLoading = new System.Windows.Forms.PictureBox(); + this.pbLoading = new System.Windows.Forms.PictureBox(); + this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); + this.btnClear = new DevComponents.DotNetBar.PanelEx(); + this.splitContainer4 = new System.Windows.Forms.SplitContainer(); this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); - this.chkFilter = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.btnRestoreSizeAndNumber = new DevComponents.DotNetBar.PanelEx(); + this.numWeight2 = new System.Windows.Forms.NumericUpDown(); + this.numHeight2 = new System.Windows.Forms.NumericUpDown(); + this.numWeight1 = new System.Windows.Forms.NumericUpDown(); + this.numHeight1 = new System.Windows.Forms.NumericUpDown(); + this.numWidth1 = new System.Windows.Forms.NumericUpDown(); this.chkSearchTime = new TemuKJD.UserComponent.UcCheckBox(this.components); this.dtpEndTime = new System.Windows.Forms.DateTimePicker(); + this.numLen2 = new System.Windows.Forms.NumericUpDown(); this.dtpStartTime = new System.Windows.Forms.DateTimePicker(); + this.numWidth2 = new System.Windows.Forms.NumericUpDown(); + this.label19 = new System.Windows.Forms.Label(); this.btnStop = new DevComponents.DotNetBar.PanelEx(); + this.numLen1 = new System.Windows.Forms.NumericUpDown(); this.btnSearchPrice2 = new DevComponents.DotNetBar.PanelEx(); - this.panelEx2 = new DevComponents.DotNetBar.PanelEx(); + this.label15 = new System.Windows.Forms.Label(); + this.btnRestoreProdName = new DevComponents.DotNetBar.PanelEx(); this.txtSkcId = new System.Windows.Forms.TextBox(); this.chkSearchAllShop = new TemuKJD.UserComponent.UcCheckBox(this.components); this.btnEmpty = new DevComponents.DotNetBar.PanelEx(); @@ -69,9 +86,9 @@ namespace TemuKJD.KJDForms.AdminForms this.btnMutliOk = new DevComponents.DotNetBar.PanelEx(); this.pnlDetailOperate2 = new System.Windows.Forms.Panel(); this.pnlMutliCancelWithTitleWrong = new DevComponents.DotNetBar.PanelEx(); - this.splitContainer3 = new System.Windows.Forms.SplitContainer(); - this.splitContainer2 = new System.Windows.Forms.SplitContainer(); - this.pbShopLoading = new System.Windows.Forms.PictureBox(); + this.chkFilter = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.label18 = new System.Windows.Forms.Label(); + this.label20 = new System.Windows.Forms.Label(); this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colUser = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -82,10 +99,9 @@ namespace TemuKJD.KJDForms.AdminForms this.colLoginStatus = new System.Windows.Forms.DataGridViewLinkColumn(); this.colCanUse = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.pbLoading = new System.Windows.Forms.PictureBox(); - this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); - this.btnClear = new DevComponents.DotNetBar.PanelEx(); this.dgvPriceCheck = new TemuKJD.UserComponent.DataGridViewEx(); + this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colProdIndex = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colOrderId = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -108,16 +124,10 @@ namespace TemuKJD.KJDForms.AdminForms this.colCancel = new System.Windows.Forms.DataGridViewLinkColumn(); this.colCancelWithTitleWrong = new System.Windows.Forms.DataGridViewLinkColumn(); this.colMsg = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.splitContainer4 = new System.Windows.Forms.SplitContainer(); - this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage(); - this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); this.splitContainer1.SuspendLayout(); - this.ucGroupBoxEx1.SuspendLayout(); - this.pnlDetailOperate1.SuspendLayout(); - this.pnlDetailOperate2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).BeginInit(); this.splitContainer3.Panel1.SuspendLayout(); this.splitContainer3.Panel2.SuspendLayout(); @@ -127,13 +137,24 @@ namespace TemuKJD.KJDForms.AdminForms this.splitContainer2.Panel2.SuspendLayout(); this.splitContainer2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pbShopLoading)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dgvShop)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dgvPriceCheck)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer4)).BeginInit(); this.splitContainer4.Panel1.SuspendLayout(); this.splitContainer4.Panel2.SuspendLayout(); this.splitContainer4.SuspendLayout(); + this.ucGroupBoxEx1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numWeight2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numHeight2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numWeight1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numHeight1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numWidth1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numLen2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numWidth2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numLen1)).BeginInit(); + this.pnlDetailOperate1.SuspendLayout(); + this.pnlDetailOperate2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dgvShop)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dgvPriceCheck)).BeginInit(); this.SuspendLayout(); // // splitContainer1 @@ -152,10 +173,146 @@ namespace TemuKJD.KJDForms.AdminForms // splitContainer1.Panel2 // this.splitContainer1.Panel2.Controls.Add(this.splitContainer3); - this.splitContainer1.Size = new System.Drawing.Size(1344, 585); + this.splitContainer1.Size = new System.Drawing.Size(1350, 611); this.splitContainer1.SplitterDistance = 120; this.splitContainer1.TabIndex = 11; // + // splitContainer3 + // + this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer3.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; + this.splitContainer3.Location = new System.Drawing.Point(0, 0); + this.splitContainer3.Name = "splitContainer3"; + this.splitContainer3.Orientation = System.Windows.Forms.Orientation.Horizontal; + // + // splitContainer3.Panel1 + // + this.splitContainer3.Panel1.Controls.Add(this.splitContainer2); + // + // splitContainer3.Panel2 + // + this.splitContainer3.Panel2.Controls.Add(this.splitContainer4); + this.splitContainer3.Size = new System.Drawing.Size(1350, 487); + this.splitContainer3.SplitterDistance = 457; + this.splitContainer3.TabIndex = 1; + // + // splitContainer2 + // + this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer2.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; + this.splitContainer2.Location = new System.Drawing.Point(0, 0); + this.splitContainer2.Name = "splitContainer2"; + // + // splitContainer2.Panel1 + // + this.splitContainer2.Panel1.Controls.Add(this.pbShopLoading); + this.splitContainer2.Panel1.Controls.Add(this.dgvShop); + this.splitContainer2.Panel1.Padding = new System.Windows.Forms.Padding(4, 0, 0, 0); + // + // splitContainer2.Panel2 + // + this.splitContainer2.Panel2.Controls.Add(this.pbLoading); + this.splitContainer2.Panel2.Controls.Add(this.panelEx1); + this.splitContainer2.Panel2.Controls.Add(this.btnClear); + this.splitContainer2.Panel2.Controls.Add(this.dgvPriceCheck); + this.splitContainer2.Panel2.Padding = new System.Windows.Forms.Padding(0, 0, 4, 0); + this.splitContainer2.Size = new System.Drawing.Size(1350, 457); + this.splitContainer2.SplitterDistance = 280; + this.splitContainer2.TabIndex = 0; + // + // pbShopLoading + // + this.pbShopLoading.Anchor = System.Windows.Forms.AnchorStyles.None; + this.pbShopLoading.Image = global::TemuKJD.Properties.Resources.loading_blue; + this.pbShopLoading.Location = new System.Drawing.Point(115, 203); + this.pbShopLoading.Name = "pbShopLoading"; + this.pbShopLoading.Size = new System.Drawing.Size(50, 50); + this.pbShopLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pbShopLoading.TabIndex = 676; + this.pbShopLoading.TabStop = false; + this.pbShopLoading.Visible = false; + // + // pbLoading + // + this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None; + this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue; + this.pbLoading.Location = new System.Drawing.Point(508, 203); + this.pbLoading.Name = "pbLoading"; + this.pbLoading.Size = new System.Drawing.Size(50, 50); + this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pbLoading.TabIndex = 675; + this.pbLoading.TabStop = false; + this.pbLoading.Visible = false; + // + // panelEx1 + // + this.panelEx1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; + this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty; + this.panelEx1.Location = new System.Drawing.Point(833, 393); + this.panelEx1.Name = "panelEx1"; + this.panelEx1.Size = new System.Drawing.Size(115, 21); + this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; + this.panelEx1.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.panelEx1.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.panelEx1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.panelEx1.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.panelEx1.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.panelEx1.Style.GradientAngle = 90; + this.panelEx1.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; + this.panelEx1.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.panelEx1.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.panelEx1.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.panelEx1.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.panelEx1.TabIndex = 668; + this.panelEx1.Text = "停止当前操作"; + this.panelEx1.Visible = false; + // + // btnClear + // + this.btnClear.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.btnClear.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnClear.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnClear.DisabledBackColor = System.Drawing.Color.Empty; + this.btnClear.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnClear.Location = new System.Drawing.Point(724, 393); + this.btnClear.Name = "btnClear"; + this.btnClear.Size = new System.Drawing.Size(90, 21); + this.btnClear.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnClear.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnClear.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnClear.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnClear.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnClear.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnClear.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnClear.Style.GradientAngle = 90; + this.btnClear.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnClear.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnClear.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnClear.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.btnClear.TabIndex = 440; + this.btnClear.Text = "清空结果"; + this.btnClear.Visible = false; + // + // splitContainer4 + // + this.splitContainer4.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer4.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; + this.splitContainer4.Location = new System.Drawing.Point(0, 0); + this.splitContainer4.Name = "splitContainer4"; + // + // splitContainer4.Panel1 + // + this.splitContainer4.Panel1.Controls.Add(this.ucSplitPage1); + // + // splitContainer4.Panel2 + // + this.splitContainer4.Panel2.Controls.Add(this.statusBar); + this.splitContainer4.Size = new System.Drawing.Size(1350, 26); + this.splitContainer4.SplitterDistance = 282; + this.splitContainer4.TabIndex = 3; + // // ucGroupBoxEx1 // this.ucGroupBoxEx1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) @@ -163,13 +320,23 @@ namespace TemuKJD.KJDForms.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.chkFilter); + this.ucGroupBoxEx1.Controls.Add(this.btnRestoreSizeAndNumber); + this.ucGroupBoxEx1.Controls.Add(this.numWeight2); + this.ucGroupBoxEx1.Controls.Add(this.numHeight2); + this.ucGroupBoxEx1.Controls.Add(this.numWeight1); + this.ucGroupBoxEx1.Controls.Add(this.numHeight1); + this.ucGroupBoxEx1.Controls.Add(this.numWidth1); this.ucGroupBoxEx1.Controls.Add(this.chkSearchTime); this.ucGroupBoxEx1.Controls.Add(this.dtpEndTime); + this.ucGroupBoxEx1.Controls.Add(this.numLen2); this.ucGroupBoxEx1.Controls.Add(this.dtpStartTime); + this.ucGroupBoxEx1.Controls.Add(this.numWidth2); + this.ucGroupBoxEx1.Controls.Add(this.label19); this.ucGroupBoxEx1.Controls.Add(this.btnStop); + this.ucGroupBoxEx1.Controls.Add(this.numLen1); this.ucGroupBoxEx1.Controls.Add(this.btnSearchPrice2); - this.ucGroupBoxEx1.Controls.Add(this.panelEx2); + this.ucGroupBoxEx1.Controls.Add(this.label15); + this.ucGroupBoxEx1.Controls.Add(this.btnRestoreProdName); this.ucGroupBoxEx1.Controls.Add(this.txtSkcId); this.ucGroupBoxEx1.Controls.Add(this.chkSearchAllShop); this.ucGroupBoxEx1.Controls.Add(this.btnEmpty); @@ -185,30 +352,136 @@ namespace TemuKJD.KJDForms.AdminForms this.ucGroupBoxEx1.Controls.Add(this.label7); this.ucGroupBoxEx1.Controls.Add(this.pnlDetailOperate1); this.ucGroupBoxEx1.Controls.Add(this.pnlDetailOperate2); + this.ucGroupBoxEx1.Controls.Add(this.chkFilter); + this.ucGroupBoxEx1.Controls.Add(this.label18); + this.ucGroupBoxEx1.Controls.Add(this.label20); this.ucGroupBoxEx1.Location = new System.Drawing.Point(3, 2); this.ucGroupBoxEx1.Name = "ucGroupBoxEx1"; - this.ucGroupBoxEx1.Size = new System.Drawing.Size(1338, 120); + this.ucGroupBoxEx1.Size = new System.Drawing.Size(1344, 120); this.ucGroupBoxEx1.TabIndex = 399; this.ucGroupBoxEx1.TabStop = false; this.ucGroupBoxEx1.Text = "参数设置"; // - // chkFilter + // btnRestoreSizeAndNumber // - this.chkFilter.AutoSize = true; - this.chkFilter.Location = new System.Drawing.Point(776, 35); - this.chkFilter.Name = "chkFilter"; - this.chkFilter.Size = new System.Drawing.Size(135, 21); - this.chkFilter.TabIndex = 857; - this.chkFilter.Text = "仅显示含头尾词标题"; - this.chkFilter.UseVisualStyleBackColor = true; - this.chkFilter.CheckedChanged += new System.EventHandler(this.chkFilter_CheckedChanged); + this.btnRestoreSizeAndNumber.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnRestoreSizeAndNumber.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnRestoreSizeAndNumber.DisabledBackColor = System.Drawing.Color.Empty; + this.btnRestoreSizeAndNumber.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnRestoreSizeAndNumber.Location = new System.Drawing.Point(861, 83); + this.btnRestoreSizeAndNumber.Name = "btnRestoreSizeAndNumber"; + this.btnRestoreSizeAndNumber.Size = new System.Drawing.Size(99, 23); + this.btnRestoreSizeAndNumber.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnRestoreSizeAndNumber.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnRestoreSizeAndNumber.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnRestoreSizeAndNumber.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnRestoreSizeAndNumber.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnRestoreSizeAndNumber.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnRestoreSizeAndNumber.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnRestoreSizeAndNumber.Style.GradientAngle = 90; + this.btnRestoreSizeAndNumber.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnRestoreSizeAndNumber.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnRestoreSizeAndNumber.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnRestoreSizeAndNumber.TabIndex = 879; + this.btnRestoreSizeAndNumber.Text = "还原尺寸与数量"; + this.btnRestoreSizeAndNumber.Click += new System.EventHandler(this.btnRestoreSizeAndNumber_Click); + // + // numWeight2 + // + this.numWeight2.Location = new System.Drawing.Point(789, 83); + this.numWeight2.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numWeight2.Maximum = new decimal(new int[] { + 300, + 0, + 0, + 0}); + this.numWeight2.Name = "numWeight2"; + this.numWeight2.Size = new System.Drawing.Size(55, 23); + this.numWeight2.TabIndex = 683; + this.numWeight2.Value = new decimal(new int[] { + 300, + 0, + 0, + 0}); + // + // numHeight2 + // + this.numHeight2.Location = new System.Drawing.Point(928, 54); + this.numHeight2.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numHeight2.Maximum = new decimal(new int[] { + 299, + 0, + 0, + 0}); + this.numHeight2.Name = "numHeight2"; + this.numHeight2.Size = new System.Drawing.Size(40, 23); + this.numHeight2.TabIndex = 908; + this.numHeight2.Value = new decimal(new int[] { + 10, + 0, + 0, + 0}); + // + // numWeight1 + // + this.numWeight1.Location = new System.Drawing.Point(737, 83); + this.numWeight1.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numWeight1.Maximum = new decimal(new int[] { + 99999, + 0, + 0, + 0}); + this.numWeight1.Name = "numWeight1"; + this.numWeight1.Size = new System.Drawing.Size(53, 23); + this.numWeight1.TabIndex = 682; + this.numWeight1.Value = new decimal(new int[] { + 200, + 0, + 0, + 0}); + // + // numHeight1 + // + this.numHeight1.Location = new System.Drawing.Point(894, 54); + this.numHeight1.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numHeight1.Maximum = new decimal(new int[] { + 299, + 0, + 0, + 0}); + this.numHeight1.Name = "numHeight1"; + this.numHeight1.Size = new System.Drawing.Size(35, 23); + this.numHeight1.TabIndex = 907; + this.numHeight1.Value = new decimal(new int[] { + 5, + 0, + 0, + 0}); + // + // numWidth1 + // + this.numWidth1.Location = new System.Drawing.Point(805, 53); + this.numWidth1.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numWidth1.Maximum = new decimal(new int[] { + 299, + 0, + 0, + 0}); + this.numWidth1.Name = "numWidth1"; + this.numWidth1.Size = new System.Drawing.Size(35, 23); + this.numWidth1.TabIndex = 904; + this.numWidth1.Value = new decimal(new int[] { + 15, + 0, + 0, + 0}); // // chkSearchTime // this.chkSearchTime.AutoSize = true; this.chkSearchTime.Checked = true; this.chkSearchTime.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkSearchTime.Location = new System.Drawing.Point(456, 58); + this.chkSearchTime.Location = new System.Drawing.Point(407, 57); this.chkSearchTime.Name = "chkSearchTime"; this.chkSearchTime.Size = new System.Drawing.Size(15, 14); this.chkSearchTime.TabIndex = 827; @@ -216,24 +489,70 @@ namespace TemuKJD.KJDForms.AdminForms // // dtpEndTime // - this.dtpEndTime.Location = new System.Drawing.Point(610, 54); + this.dtpEndTime.Location = new System.Drawing.Point(561, 53); this.dtpEndTime.Name = "dtpEndTime"; this.dtpEndTime.Size = new System.Drawing.Size(136, 23); this.dtpEndTime.TabIndex = 826; // + // numLen2 + // + this.numLen2.Location = new System.Drawing.Point(750, 53); + this.numLen2.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numLen2.Maximum = new decimal(new int[] { + 299, + 0, + 0, + 0}); + this.numLen2.Name = "numLen2"; + this.numLen2.Size = new System.Drawing.Size(40, 23); + this.numLen2.TabIndex = 903; + this.numLen2.Value = new decimal(new int[] { + 30, + 0, + 0, + 0}); + // // dtpStartTime // - this.dtpStartTime.Location = new System.Drawing.Point(472, 54); + this.dtpStartTime.Location = new System.Drawing.Point(423, 53); this.dtpStartTime.Name = "dtpStartTime"; this.dtpStartTime.Size = new System.Drawing.Size(136, 23); this.dtpStartTime.TabIndex = 825; // + // numWidth2 + // + this.numWidth2.Location = new System.Drawing.Point(839, 53); + this.numWidth2.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numWidth2.Maximum = new decimal(new int[] { + 299, + 0, + 0, + 0}); + this.numWidth2.Name = "numWidth2"; + this.numWidth2.Size = new System.Drawing.Size(40, 23); + this.numWidth2.TabIndex = 905; + this.numWidth2.Value = new decimal(new int[] { + 20, + 0, + 0, + 0}); + // + // label19 + // + this.label19.AutoSize = true; + this.label19.Location = new System.Drawing.Point(878, 57); + this.label19.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label19.Name = "label19"; + this.label19.Size = new System.Drawing.Size(20, 17); + this.label19.TabIndex = 909; + this.label19.Text = "高"; + // // btnStop // 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(680, 82); + this.btnStop.Location = new System.Drawing.Point(631, 83); this.btnStop.Name = "btnStop"; this.btnStop.Size = new System.Drawing.Size(66, 23); this.btnStop.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -252,13 +571,31 @@ namespace TemuKJD.KJDForms.AdminForms this.btnStop.Text = "停止读取"; this.btnStop.Click += new System.EventHandler(this.btnStop_Click); // + // numLen1 + // + this.numLen1.Location = new System.Drawing.Point(716, 53); + this.numLen1.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numLen1.Maximum = new decimal(new int[] { + 299, + 0, + 0, + 0}); + this.numLen1.Name = "numLen1"; + this.numLen1.Size = new System.Drawing.Size(35, 23); + this.numLen1.TabIndex = 902; + this.numLen1.Value = new decimal(new int[] { + 25, + 0, + 0, + 0}); + // // btnSearchPrice2 // this.btnSearchPrice2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnSearchPrice2.Cursor = System.Windows.Forms.Cursors.Hand; this.btnSearchPrice2.DisabledBackColor = System.Drawing.Color.Empty; this.btnSearchPrice2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSearchPrice2.Location = new System.Drawing.Point(565, 82); + this.btnSearchPrice2.Location = new System.Drawing.Point(516, 83); this.btnSearchPrice2.Name = "btnSearchPrice2"; this.btnSearchPrice2.Size = new System.Drawing.Size(112, 23); this.btnSearchPrice2.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -276,33 +613,43 @@ namespace TemuKJD.KJDForms.AdminForms this.btnSearchPrice2.Text = "读取待创建首单"; this.btnSearchPrice2.Click += new System.EventHandler(this.btnSearchPrice2_Click); // - // panelEx2 + // label15 // - this.panelEx2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.panelEx2.Cursor = System.Windows.Forms.Cursors.Hand; - this.panelEx2.DisabledBackColor = System.Drawing.Color.Empty; - this.panelEx2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.panelEx2.Location = new System.Drawing.Point(791, 65); - this.panelEx2.Name = "panelEx2"; - this.panelEx2.Size = new System.Drawing.Size(99, 23); - this.panelEx2.Style.Alignment = System.Drawing.StringAlignment.Center; - this.panelEx2.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.panelEx2.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.panelEx2.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.panelEx2.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.panelEx2.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.panelEx2.Style.ForeColor.Color = System.Drawing.Color.White; - this.panelEx2.Style.GradientAngle = 90; - this.panelEx2.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.panelEx2.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.panelEx2.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.panelEx2.TabIndex = 749; - this.panelEx2.Text = "批量还原标题"; - this.panelEx2.Click += new System.EventHandler(this.btnReturnProdName_Click); + this.label15.AutoSize = true; + this.label15.Location = new System.Drawing.Point(700, 56); + 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 = 901; + this.label15.Text = "长"; + // + // btnRestoreProdName + // + this.btnRestoreProdName.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnRestoreProdName.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnRestoreProdName.DisabledBackColor = System.Drawing.Color.Empty; + this.btnRestoreProdName.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnRestoreProdName.Location = new System.Drawing.Point(863, 22); + this.btnRestoreProdName.Name = "btnRestoreProdName"; + this.btnRestoreProdName.Size = new System.Drawing.Size(99, 23); + this.btnRestoreProdName.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnRestoreProdName.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnRestoreProdName.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnRestoreProdName.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnRestoreProdName.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnRestoreProdName.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnRestoreProdName.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnRestoreProdName.Style.GradientAngle = 90; + this.btnRestoreProdName.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnRestoreProdName.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnRestoreProdName.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnRestoreProdName.TabIndex = 749; + this.btnRestoreProdName.Text = "批量还原标题"; + this.btnRestoreProdName.Click += new System.EventHandler(this.btnRestoreProdName_Click); // // txtSkcId // - this.txtSkcId.Location = new System.Drawing.Point(495, 25); + this.txtSkcId.Location = new System.Drawing.Point(446, 22); this.txtSkcId.Name = "txtSkcId"; this.txtSkcId.Size = new System.Drawing.Size(251, 23); this.txtSkcId.TabIndex = 733; @@ -310,7 +657,7 @@ namespace TemuKJD.KJDForms.AdminForms // chkSearchAllShop // this.chkSearchAllShop.AutoSize = true; - this.chkSearchAllShop.Location = new System.Drawing.Point(277, 59); + this.chkSearchAllShop.Location = new System.Drawing.Point(250, 58); this.chkSearchAllShop.Name = "chkSearchAllShop"; this.chkSearchAllShop.Size = new System.Drawing.Size(147, 21); this.chkSearchAllShop.TabIndex = 710; @@ -322,7 +669,7 @@ namespace TemuKJD.KJDForms.AdminForms this.btnEmpty.CanvasColor = System.Drawing.SystemColors.Control; this.btnEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnEmpty.DisabledBackColor = System.Drawing.Color.Empty; - this.btnEmpty.Location = new System.Drawing.Point(376, 82); + this.btnEmpty.Location = new System.Drawing.Point(349, 83); this.btnEmpty.Name = "btnEmpty"; this.btnEmpty.Size = new System.Drawing.Size(40, 23); this.btnEmpty.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -347,7 +694,7 @@ namespace TemuKJD.KJDForms.AdminForms this.btnSearchPrice.Cursor = System.Windows.Forms.Cursors.Hand; this.btnSearchPrice.DisabledBackColor = System.Drawing.Color.Empty; this.btnSearchPrice.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSearchPrice.Location = new System.Drawing.Point(456, 82); + this.btnSearchPrice.Location = new System.Drawing.Point(407, 83); this.btnSearchPrice.Name = "btnSearchPrice"; this.btnSearchPrice.Size = new System.Drawing.Size(106, 23); this.btnSearchPrice.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -368,7 +715,7 @@ namespace TemuKJD.KJDForms.AdminForms // label5 // this.label5.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.label5.Location = new System.Drawing.Point(274, 24); + this.label5.Location = new System.Drawing.Point(247, 21); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(142, 36); this.label5.TabIndex = 685; @@ -378,7 +725,7 @@ namespace TemuKJD.KJDForms.AdminForms // this.txtNotes.Location = new System.Drawing.Point(61, 83); this.txtNotes.Name = "txtNotes"; - this.txtNotes.Size = new System.Drawing.Size(207, 23); + this.txtNotes.Size = new System.Drawing.Size(183, 23); this.txtNotes.TabIndex = 382; // // label4 @@ -396,7 +743,7 @@ namespace TemuKJD.KJDForms.AdminForms this.btnRefreshShop.Cursor = System.Windows.Forms.Cursors.Hand; this.btnRefreshShop.DisabledBackColor = System.Drawing.Color.Empty; this.btnRefreshShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnRefreshShop.Location = new System.Drawing.Point(273, 82); + this.btnRefreshShop.Location = new System.Drawing.Point(246, 83); this.btnRefreshShop.Name = "btnRefreshShop"; this.btnRefreshShop.Size = new System.Drawing.Size(100, 23); this.btnRefreshShop.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -418,14 +765,14 @@ namespace TemuKJD.KJDForms.AdminForms // this.txtShopName.Location = new System.Drawing.Point(61, 53); this.txtShopName.Name = "txtShopName"; - this.txtShopName.Size = new System.Drawing.Size(207, 23); + this.txtShopName.Size = new System.Drawing.Size(183, 23); this.txtShopName.TabIndex = 380; // // txtShopId // this.txtShopId.Location = new System.Drawing.Point(61, 22); this.txtShopId.Name = "txtShopId"; - this.txtShopId.Size = new System.Drawing.Size(207, 23); + this.txtShopId.Size = new System.Drawing.Size(183, 23); this.txtShopId.TabIndex = 378; // // label2 @@ -449,7 +796,7 @@ namespace TemuKJD.KJDForms.AdminForms // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(453, 28); + this.label7.Location = new System.Drawing.Point(404, 25); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(52, 17); this.label7.TabIndex = 734; @@ -464,9 +811,9 @@ namespace TemuKJD.KJDForms.AdminForms this.pnlDetailOperate1.Controls.Add(this.label6); this.pnlDetailOperate1.Controls.Add(this.btnMutliCancel); this.pnlDetailOperate1.Controls.Add(this.btnMutliOk); - this.pnlDetailOperate1.Location = new System.Drawing.Point(913, 16); + this.pnlDetailOperate1.Location = new System.Drawing.Point(972, 16); this.pnlDetailOperate1.Name = "pnlDetailOperate1"; - this.pnlDetailOperate1.Size = new System.Drawing.Size(420, 76); + this.pnlDetailOperate1.Size = new System.Drawing.Size(365, 76); this.pnlDetailOperate1.TabIndex = 855; // // btnRePrice @@ -475,9 +822,9 @@ namespace TemuKJD.KJDForms.AdminForms this.btnRePrice.Cursor = System.Windows.Forms.Cursors.Hand; this.btnRePrice.DisabledBackColor = System.Drawing.Color.Empty; this.btnRePrice.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnRePrice.Location = new System.Drawing.Point(170, 20); + this.btnRePrice.Location = new System.Drawing.Point(164, 20); this.btnRePrice.Name = "btnRePrice"; - this.btnRePrice.Size = new System.Drawing.Size(98, 23); + this.btnRePrice.Size = new System.Drawing.Size(90, 23); this.btnRePrice.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnRePrice.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnRePrice.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -496,7 +843,7 @@ namespace TemuKJD.KJDForms.AdminForms // label10 // this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(10, 23); + this.label10.Location = new System.Drawing.Point(4, 23); this.label10.Name = "label10"; this.label10.Size = new System.Drawing.Size(32, 17); this.label10.TabIndex = 680; @@ -504,7 +851,7 @@ namespace TemuKJD.KJDForms.AdminForms // // txtPriceDown // - this.txtPriceDown.Location = new System.Drawing.Point(42, 20); + this.txtPriceDown.Location = new System.Drawing.Point(36, 20); this.txtPriceDown.Margin = new System.Windows.Forms.Padding(0); this.txtPriceDown.Name = "txtPriceDown"; this.txtPriceDown.Size = new System.Drawing.Size(48, 23); @@ -515,7 +862,7 @@ namespace TemuKJD.KJDForms.AdminForms // this.label1.AutoSize = true; this.label1.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.label1.Location = new System.Drawing.Point(10, 48); + this.label1.Location = new System.Drawing.Point(4, 48); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(223, 17); this.label1.TabIndex = 684; @@ -524,7 +871,7 @@ namespace TemuKJD.KJDForms.AdminForms // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(93, 23); + this.label6.Location = new System.Drawing.Point(87, 23); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(80, 17); this.label6.TabIndex = 723; @@ -536,9 +883,9 @@ namespace TemuKJD.KJDForms.AdminForms this.btnMutliCancel.Cursor = System.Windows.Forms.Cursors.Hand; this.btnMutliCancel.DisabledBackColor = System.Drawing.Color.Empty; this.btnMutliCancel.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnMutliCancel.Location = new System.Drawing.Point(306, 49); + this.btnMutliCancel.Location = new System.Drawing.Point(270, 49); this.btnMutliCancel.Name = "btnMutliCancel"; - this.btnMutliCancel.Size = new System.Drawing.Size(98, 23); + this.btnMutliCancel.Size = new System.Drawing.Size(90, 23); this.btnMutliCancel.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnMutliCancel.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnMutliCancel.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -560,9 +907,9 @@ namespace TemuKJD.KJDForms.AdminForms this.btnMutliOk.Cursor = System.Windows.Forms.Cursors.Hand; this.btnMutliOk.DisabledBackColor = System.Drawing.Color.Empty; this.btnMutliOk.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnMutliOk.Location = new System.Drawing.Point(306, 20); + this.btnMutliOk.Location = new System.Drawing.Point(270, 20); this.btnMutliOk.Name = "btnMutliOk"; - this.btnMutliOk.Size = new System.Drawing.Size(98, 23); + this.btnMutliOk.Size = new System.Drawing.Size(90, 23); this.btnMutliOk.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnMutliOk.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnMutliOk.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -581,9 +928,9 @@ namespace TemuKJD.KJDForms.AdminForms // pnlDetailOperate2 // this.pnlDetailOperate2.Controls.Add(this.pnlMutliCancelWithTitleWrong); - this.pnlDetailOperate2.Location = new System.Drawing.Point(913, 76); + this.pnlDetailOperate2.Location = new System.Drawing.Point(972, 76); this.pnlDetailOperate2.Name = "pnlDetailOperate2"; - this.pnlDetailOperate2.Size = new System.Drawing.Size(420, 75); + this.pnlDetailOperate2.Size = new System.Drawing.Size(365, 75); this.pnlDetailOperate2.TabIndex = 856; this.pnlDetailOperate2.Visible = false; // @@ -593,9 +940,9 @@ namespace TemuKJD.KJDForms.AdminForms this.pnlMutliCancelWithTitleWrong.Cursor = System.Windows.Forms.Cursors.Hand; this.pnlMutliCancelWithTitleWrong.DisabledBackColor = System.Drawing.Color.Empty; this.pnlMutliCancelWithTitleWrong.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.pnlMutliCancelWithTitleWrong.Location = new System.Drawing.Point(306, 18); + this.pnlMutliCancelWithTitleWrong.Location = new System.Drawing.Point(270, 18); this.pnlMutliCancelWithTitleWrong.Name = "pnlMutliCancelWithTitleWrong"; - this.pnlMutliCancelWithTitleWrong.Size = new System.Drawing.Size(98, 23); + this.pnlMutliCancelWithTitleWrong.Size = new System.Drawing.Size(90, 23); this.pnlMutliCancelWithTitleWrong.Style.Alignment = System.Drawing.StringAlignment.Center; this.pnlMutliCancelWithTitleWrong.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.pnlMutliCancelWithTitleWrong.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -611,60 +958,36 @@ namespace TemuKJD.KJDForms.AdminForms this.pnlMutliCancelWithTitleWrong.Text = "批量作废"; this.pnlMutliCancelWithTitleWrong.Click += new System.EventHandler(this.pnlMutliCancelWithTitleWrong_Click); // - // splitContainer3 + // chkFilter // - this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill; - this.splitContainer3.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; - this.splitContainer3.Location = new System.Drawing.Point(0, 0); - this.splitContainer3.Name = "splitContainer3"; - this.splitContainer3.Orientation = System.Windows.Forms.Orientation.Horizontal; + this.chkFilter.AutoSize = true; + this.chkFilter.Location = new System.Drawing.Point(711, 23); + this.chkFilter.Name = "chkFilter"; + this.chkFilter.Size = new System.Drawing.Size(159, 21); + this.chkFilter.TabIndex = 857; + this.chkFilter.Text = "列表仅显示含头尾词标题"; + this.chkFilter.UseVisualStyleBackColor = true; + this.chkFilter.CheckedChanged += new System.EventHandler(this.chkFilter_CheckedChanged); // - // splitContainer3.Panel1 + // label18 // - this.splitContainer3.Panel1.Controls.Add(this.splitContainer2); + this.label18.AutoSize = true; + this.label18.Location = new System.Drawing.Point(789, 56); + this.label18.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label18.Name = "label18"; + this.label18.Size = new System.Drawing.Size(20, 17); + this.label18.TabIndex = 906; + this.label18.Text = "宽"; // - // splitContainer3.Panel2 + // label20 // - this.splitContainer3.Panel2.Controls.Add(this.splitContainer4); - this.splitContainer3.Size = new System.Drawing.Size(1344, 461); - this.splitContainer3.SplitterDistance = 431; - this.splitContainer3.TabIndex = 1; - // - // splitContainer2 - // - this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill; - this.splitContainer2.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; - this.splitContainer2.Location = new System.Drawing.Point(0, 0); - this.splitContainer2.Name = "splitContainer2"; - // - // splitContainer2.Panel1 - // - this.splitContainer2.Panel1.Controls.Add(this.pbShopLoading); - this.splitContainer2.Panel1.Controls.Add(this.dgvShop); - this.splitContainer2.Panel1.Padding = new System.Windows.Forms.Padding(4, 0, 0, 0); - // - // splitContainer2.Panel2 - // - this.splitContainer2.Panel2.Controls.Add(this.pbLoading); - this.splitContainer2.Panel2.Controls.Add(this.panelEx1); - this.splitContainer2.Panel2.Controls.Add(this.btnClear); - this.splitContainer2.Panel2.Controls.Add(this.dgvPriceCheck); - this.splitContainer2.Panel2.Padding = new System.Windows.Forms.Padding(0, 0, 4, 0); - this.splitContainer2.Size = new System.Drawing.Size(1344, 431); - this.splitContainer2.SplitterDistance = 280; - this.splitContainer2.TabIndex = 0; - // - // pbShopLoading - // - this.pbShopLoading.Anchor = System.Windows.Forms.AnchorStyles.None; - this.pbShopLoading.Image = global::TemuKJD.Properties.Resources.loading_blue; - this.pbShopLoading.Location = new System.Drawing.Point(115, 190); - this.pbShopLoading.Name = "pbShopLoading"; - this.pbShopLoading.Size = new System.Drawing.Size(50, 50); - this.pbShopLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.pbShopLoading.TabIndex = 676; - this.pbShopLoading.TabStop = false; - this.pbShopLoading.Visible = false; + this.label20.AutoSize = true; + this.label20.Location = new System.Drawing.Point(721, 86); + this.label20.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label20.Name = "label20"; + this.label20.Size = new System.Drawing.Size(20, 17); + this.label20.TabIndex = 684; + this.label20.Text = "重"; // // dgvShop // @@ -699,7 +1022,7 @@ namespace TemuKJD.KJDForms.AdminForms this.dgvShop.ReadOnly = true; this.dgvShop.RowHeadersWidth = 25; this.dgvShop.RowTemplate.Height = 23; - this.dgvShop.Size = new System.Drawing.Size(276, 431); + this.dgvShop.Size = new System.Drawing.Size(276, 457); this.dgvShop.TabIndex = 6; this.dgvShop.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellContentClick); // @@ -774,68 +1097,6 @@ namespace TemuKJD.KJDForms.AdminForms this.colMessage.Name = "colMessage"; this.colMessage.ReadOnly = true; // - // pbLoading - // - this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None; - this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue; - this.pbLoading.Location = new System.Drawing.Point(505, 190); - this.pbLoading.Name = "pbLoading"; - this.pbLoading.Size = new System.Drawing.Size(50, 50); - this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.pbLoading.TabIndex = 675; - this.pbLoading.TabStop = false; - this.pbLoading.Visible = false; - // - // panelEx1 - // - this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; - this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty; - this.panelEx1.Location = new System.Drawing.Point(833, 380); - this.panelEx1.Name = "panelEx1"; - this.panelEx1.Size = new System.Drawing.Size(115, 21); - this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; - this.panelEx1.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); - this.panelEx1.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); - this.panelEx1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.panelEx1.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.panelEx1.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.panelEx1.Style.GradientAngle = 90; - this.panelEx1.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; - this.panelEx1.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.panelEx1.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.panelEx1.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.panelEx1.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; - this.panelEx1.TabIndex = 668; - this.panelEx1.Text = "停止当前操作"; - this.panelEx1.Visible = false; - // - // btnClear - // - this.btnClear.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.btnClear.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnClear.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnClear.DisabledBackColor = System.Drawing.Color.Empty; - this.btnClear.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnClear.Location = new System.Drawing.Point(718, 380); - this.btnClear.Name = "btnClear"; - this.btnClear.Size = new System.Drawing.Size(90, 21); - this.btnClear.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnClear.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnClear.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnClear.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.btnClear.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.btnClear.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.btnClear.Style.ForeColor.Color = System.Drawing.Color.White; - this.btnClear.Style.GradientAngle = 90; - this.btnClear.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnClear.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnClear.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnClear.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; - this.btnClear.TabIndex = 440; - this.btnClear.Text = "清空结果"; - this.btnClear.Visible = false; - // // dgvPriceCheck // this.dgvPriceCheck.AllowUserToAddRows = false; @@ -882,7 +1143,7 @@ namespace TemuKJD.KJDForms.AdminForms this.dgvPriceCheck.ReadOnly = true; this.dgvPriceCheck.RowHeadersWidth = 36; this.dgvPriceCheck.RowTemplate.Height = 23; - this.dgvPriceCheck.Size = new System.Drawing.Size(1056, 431); + this.dgvPriceCheck.Size = new System.Drawing.Size(1062, 457); this.dgvPriceCheck.TabIndex = 187; this.dgvPriceCheck.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvCheckPrice_CellContentClick); this.dgvPriceCheck.CellMouseDown += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dgvPriceCheck_CellMouseDown); @@ -892,6 +1153,31 @@ namespace TemuKJD.KJDForms.AdminForms this.dgvPriceCheck.Scroll += new System.Windows.Forms.ScrollEventHandler(this.dgvPriceCheck_Scroll); this.dgvPriceCheck.MouseUp += new System.Windows.Forms.MouseEventHandler(this.dgvPriceCheck_MouseUp); // + // ucSplitPage1 + // + this.ucSplitPage1.CurrentPage = 1; + this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Left; + this.ucSplitPage1.IsShowPageSize = false; + this.ucSplitPage1.Location = new System.Drawing.Point(0, 0); + this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0); + this.ucSplitPage1.Name = "ucSplitPage1"; + this.ucSplitPage1.PageSize = 50; + this.ucSplitPage1.Size = new System.Drawing.Size(282, 26); + this.ucSplitPage1.TabIndex = 5; + this.ucSplitPage1.TotalPage = 1; + this.ucSplitPage1.PageChange += new System.Action(this.ucSplitPage1_PageChange); + // + // statusBar + // + this.statusBar.BackColor = System.Drawing.Color.White; + this.statusBar.Dock = System.Windows.Forms.DockStyle.Fill; + this.statusBar.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.statusBar.Location = new System.Drawing.Point(0, 0); + this.statusBar.Margin = new System.Windows.Forms.Padding(0); + this.statusBar.Name = "statusBar"; + this.statusBar.Size = new System.Drawing.Size(1064, 26); + this.statusBar.TabIndex = 2; + // // colCheck // this.colCheck.HeaderText = "选择"; @@ -920,13 +1206,14 @@ namespace TemuKJD.KJDForms.AdminForms this.colSupplierId.HeaderText = "店铺Id"; this.colSupplierId.Name = "colSupplierId"; this.colSupplierId.ReadOnly = true; + this.colSupplierId.Width = 80; // // colSupplierName // this.colSupplierName.HeaderText = "店铺名称"; this.colSupplierName.Name = "colSupplierName"; this.colSupplierName.ReadOnly = true; - this.colSupplierName.Width = 110; + this.colSupplierName.Width = 90; // // colImgUrl // @@ -950,7 +1237,7 @@ namespace TemuKJD.KJDForms.AdminForms this.colProductId.ReadOnly = true; this.colProductId.Resizable = System.Windows.Forms.DataGridViewTriState.True; this.colProductId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colProductId.Visible = false; + this.colProductId.Width = 90; // // colProdSkc // @@ -969,7 +1256,7 @@ namespace TemuKJD.KJDForms.AdminForms this.colProdName.HeaderText = "标题"; this.colProdName.Name = "colProdName"; this.colProdName.ReadOnly = true; - this.colProdName.Width = 150; + this.colProdName.Width = 140; // // colSkuName // @@ -1065,51 +1352,10 @@ namespace TemuKJD.KJDForms.AdminForms this.colMsg.ReadOnly = true; this.colMsg.Width = 160; // - // splitContainer4 - // - this.splitContainer4.Dock = System.Windows.Forms.DockStyle.Fill; - this.splitContainer4.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; - this.splitContainer4.Location = new System.Drawing.Point(0, 0); - this.splitContainer4.Name = "splitContainer4"; - // - // splitContainer4.Panel1 - // - this.splitContainer4.Panel1.Controls.Add(this.ucSplitPage1); - // - // splitContainer4.Panel2 - // - this.splitContainer4.Panel2.Controls.Add(this.statusBar); - this.splitContainer4.Size = new System.Drawing.Size(1344, 26); - this.splitContainer4.SplitterDistance = 282; - this.splitContainer4.TabIndex = 3; - // - // ucSplitPage1 - // - this.ucSplitPage1.CurrentPage = 1; - this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Left; - this.ucSplitPage1.Location = new System.Drawing.Point(0, 0); - this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0); - this.ucSplitPage1.Name = "ucSplitPage1"; - this.ucSplitPage1.Size = new System.Drawing.Size(282, 26); - this.ucSplitPage1.TabIndex = 5; - this.ucSplitPage1.TotalPage = 1; - this.ucSplitPage1.PageChange += new System.Action(this.ucSplitPage1_PageChange); - // - // statusBar - // - this.statusBar.BackColor = System.Drawing.Color.White; - this.statusBar.Dock = System.Windows.Forms.DockStyle.Fill; - this.statusBar.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.statusBar.Location = new System.Drawing.Point(0, 0); - this.statusBar.Margin = new System.Windows.Forms.Padding(0); - this.statusBar.Name = "statusBar"; - this.statusBar.Size = new System.Drawing.Size(1058, 26); - this.statusBar.TabIndex = 2; - // // AdminProductPriceCheckForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.ClientSize = new System.Drawing.Size(1344, 585); + this.ClientSize = new System.Drawing.Size(1350, 611); this.Controls.Add(this.splitContainer1); this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.KeyPreview = true; @@ -1123,11 +1369,6 @@ namespace TemuKJD.KJDForms.AdminForms this.splitContainer1.Panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); this.splitContainer1.ResumeLayout(false); - this.ucGroupBoxEx1.ResumeLayout(false); - this.ucGroupBoxEx1.PerformLayout(); - this.pnlDetailOperate1.ResumeLayout(false); - this.pnlDetailOperate1.PerformLayout(); - this.pnlDetailOperate2.ResumeLayout(false); this.splitContainer3.Panel1.ResumeLayout(false); this.splitContainer3.Panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).EndInit(); @@ -1137,13 +1378,26 @@ namespace TemuKJD.KJDForms.AdminForms ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit(); this.splitContainer2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pbShopLoading)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dgvShop)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dgvPriceCheck)).EndInit(); this.splitContainer4.Panel1.ResumeLayout(false); this.splitContainer4.Panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splitContainer4)).EndInit(); this.splitContainer4.ResumeLayout(false); + this.ucGroupBoxEx1.ResumeLayout(false); + this.ucGroupBoxEx1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numWeight2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numHeight2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numWeight1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numHeight1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numWidth1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numLen2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numWidth2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numLen1)).EndInit(); + this.pnlDetailOperate1.ResumeLayout(false); + this.pnlDetailOperate1.PerformLayout(); + this.pnlDetailOperate2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dgvShop)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dgvPriceCheck)).EndInit(); this.ResumeLayout(false); } @@ -1181,7 +1435,7 @@ namespace TemuKJD.KJDForms.AdminForms private System.Windows.Forms.Label label6; private System.Windows.Forms.TextBox txtSkcId; private System.Windows.Forms.Label label7; - private DevComponents.DotNetBar.PanelEx panelEx2; + private DevComponents.DotNetBar.PanelEx btnRestoreProdName; private DevComponents.DotNetBar.PanelEx btnMutliCancel; private DevComponents.DotNetBar.PanelEx btnMutliOk; private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect; @@ -1201,6 +1455,20 @@ namespace TemuKJD.KJDForms.AdminForms private System.Windows.Forms.Panel pnlDetailOperate1; private System.Windows.Forms.Panel pnlDetailOperate2; private DevComponents.DotNetBar.PanelEx pnlMutliCancelWithTitleWrong; + private UserComponent.UcCheckBox chkFilter; + private DevComponents.DotNetBar.PanelEx btnRestoreSizeAndNumber; + private System.Windows.Forms.NumericUpDown numHeight2; + private System.Windows.Forms.NumericUpDown numHeight1; + private System.Windows.Forms.NumericUpDown numWidth1; + private System.Windows.Forms.NumericUpDown numLen2; + private System.Windows.Forms.NumericUpDown numWidth2; + private System.Windows.Forms.Label label19; + private System.Windows.Forms.NumericUpDown numLen1; + private System.Windows.Forms.Label label15; + private System.Windows.Forms.Label label18; + private System.Windows.Forms.NumericUpDown numWeight2; + private System.Windows.Forms.NumericUpDown numWeight1; + private System.Windows.Forms.Label label20; private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck; private System.Windows.Forms.DataGridViewTextBoxColumn colProdIndex; private System.Windows.Forms.DataGridViewTextBoxColumn colOrderId; @@ -1223,6 +1491,5 @@ namespace TemuKJD.KJDForms.AdminForms private System.Windows.Forms.DataGridViewLinkColumn colCancel; private System.Windows.Forms.DataGridViewLinkColumn colCancelWithTitleWrong; private System.Windows.Forms.DataGridViewTextBoxColumn colMsg; - private UserComponent.UcCheckBox chkFilter; } } \ No newline at end of file diff --git a/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.cs b/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.cs index 85cb298..c1268c5 100644 --- a/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.cs +++ b/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.cs @@ -706,6 +706,14 @@ namespace TemuKJD.KJDForms.AdminForms { dgvPriceCheck.Rows[rowId].Visible = false; } + if (checkRestoreSizeAndNumber(priceInfo)) + { + dgvPriceCheck.Rows[rowId].Cells["colProdName"].Style.ForeColor = Color.Red; + } + else + { + dgvPriceCheck.Rows[rowId].Cells["colProdName"].Style.ForeColor = dgvPriceCheck.DefaultCellStyle.ForeColor; + } })); } this.ShowDgvImg(); @@ -798,6 +806,12 @@ namespace TemuKJD.KJDForms.AdminForms return KJDHttpResponse.PostResponse2(shop, url, body, referer); } + /// + /// 请求修改标题 + /// + /// + /// + /// private string editPriceProductNameBatchAdd(ShopLoginInfo shop, string productId) { string url = "https://agentseller.temu.com/lich-mms/audit/edit/task/product/batchAdd"; @@ -815,6 +829,52 @@ namespace TemuKJD.KJDForms.AdminForms return KJDHttpResponse.PostResponse2(shop, url, body, referer); } + //申请修改 SKU分类和包装清单 体积与重量 商品名称 + //{"bizIdType":1,"bizIds":[8942170367],"productEditItems":[{"editItem":4,"editAdvice":"12345"},{"editItem":8,"editAdvice":"54321"},{"editItem":1,"editAdvice":"33333"}]} + //string body = @"{""bizIdType"":1,""bizIds"":[8942170367],""productEditItems"":[{""editItem"":4,""editAdvice"":""12345""},{""editItem"":8,""editAdvice"":""54321""},{""editItem"":1,""editAdvice"":""33333""}]}"; + //HttpWebRequest request = (HttpWebRequest)WebRequest.Create("https://agentseller.temu.com/lich-mms/audit/edit/task/product/batchAdd"); + //request.Referer = "https://agentseller.temu.com/goods/list"; + + /// + /// 请求修改包装规格尺寸与SKU分类数量 + /// + /// + /// + /// + private string editPriceProductSizeAndNumberBatchAdd(ShopLoginInfo shop, string productId) + { + string url = "https://agentseller.temu.com/lich-mms/audit/edit/task/product/batchAdd"; + string body = @"{""bizIdType"":1,""bizIds"":[" + productId + @"],""productEditItems"":[{""editItem"":4,""editAdvice"":""优化""},{""editItem"":8,""editAdvice"":""优化""}]}"; + string referer = "https://agentseller.temu.com/goods/list?productId=" + productId; + return KJDHttpResponse.PostResponse2(shop, url, body, referer); + } + + private string editPriceProductSizeAndNumberTaskQuery(ShopLoginInfo shop, string productId) + { + string url = "https://agentseller.temu.com/lich-mms/audit/edit/task/product/pageQuery"; + string body = @"{""page"":1,""pageSize"":10,""editTaskAggStatuses"":[1],""productIdList"":[" + productId + "]}"; + string referer = "https://agentseller.temu.com/goods/list"; + return KJDHttpResponse.PostResponse2(shop, url, body, referer); + } + + private string editPriceProductQuery(ShopLoginInfo shop, string prodId, string taskUid) + { + string url = "https://agentseller.temu.com/visage-agent-seller/product/query"; + string body = @"{""productId"":" + prodId + @",""productEditTaskUid"":""" + taskUid + @"""}"; + string refere = "https://agentseller.temu.com/goods/edit?from=platform&productId=" + prodId + "&taskUid=" + taskUid; + return KJDHttpResponse.PostResponse2(shop, url, body, refere); + } + + private string editPriceProductSizeAndNumber(ShopLoginInfo shop, string taskUid, string productId, string data) + { + string url = "https://agentseller.temu.com/visage-agent-seller/product/edit/task/reply"; + //string body = @"{""productId"":4432690492,""taskUid"":""8de73095-733e-4cdf-8fbd-3ddd8d9dff18"",""taskVersion"":0,""refuseEdit"":false,""productName"":""男士轻便 EVA 拖鞋，带钩环后跟带 ，舒适的露趾拖鞋，适合室内和室外使用，家居拖鞋，易于使用的魔鬼毡扣带扣，洞洞鞋，家居拖鞋，带钩环扣件，适合室内和室外使用，带扣凉鞋，后厨工专用鞋简约款两用，适合室内/室外使用，春夏凉鞋，EVA 拖鞋，适合19个不同的搭配风格""}"; + string body = ""; //@"{""productId"":" + productId + @",""taskUid"":""" + taskUid + @""",""taskVersion"":0,""refuseEdit"":false,""productName"":""" + productNewName + @"""}"; + body = data; + string referer = "https://agentseller.temu.com/goods/edit?from=platform&productId=" + productId + "&taskUid=" + taskUid; + return KJDHttpResponse.PostResponse2(shop, url, body, referer); + } + Bitmap defaultBitmap = new Bitmap(80, 80); void ShowDgvImg() { @@ -869,7 +929,7 @@ namespace TemuKJD.KJDForms.AdminForms this.ShowDgvImg(); } - private void btnReturnProdName_Click(object sender, EventArgs e) + private void btnRestoreProdName_Click(object sender, EventArgs e) { var products = this.dgvPriceCheck.Rows.Cast().Where(r => r.Cells["colCheck"].Value.ParseToBool() == true) .Select(r => r.Cells["colProductId"].Value.ParseToString()); @@ -889,8 +949,6 @@ namespace TemuKJD.KJDForms.AdminForms { var rows = this.dgvPriceCheck.Rows.Cast().Where(r => r.Cells["colProductId"].Value.ParseToString() == price.productId.ParseToString()).ToList(); var shop = lstAdminShopInfo.FirstOrDefault(s => s.ShopId == price.supplierId.ParseToString()); - var html = editPriceProductNameBatchAdd(shop, price.productId.ParseToString()); - if (shop == null) continue; if (shop.LoginStatus2 != "国际版在线") @@ -917,6 +975,7 @@ namespace TemuKJD.KJDForms.AdminForms continue; } + var html = editPriceProductNameBatchAdd(shop, price.productId.ParseToString()); //{"success":true,"errorCode":1000000,"errorMsg":null,"result":{"handleFailedList":[{"failedBizId":4432690492,"failedReason":"This product has pending or in-progress modification tasks, cannot initiate again"}],"addFailedList":[{"failedBizId":4432690492,"failedReason":"This product has pending or in-progress modification tasks, cannot initiate again","failedReasonType":8}],"successBizId2TaskUidMap":{}}} if (html.Contains("This product has pending or in-progress modification tasks")) { @@ -1323,6 +1382,325 @@ namespace TemuKJD.KJDForms.AdminForms } return newPName; } + + private void btnRestoreSizeAndNumber_Click(object sender, EventArgs e) + { + var products = this.dgvPriceCheck.Rows.Cast().Where(r => r.Cells["colCheck"].Value.ParseToBool() == true) + .Select(r => r.Cells["colProductId"].Value.ParseToString()); + var prices = this.lstCheckPriceInfo.Where(p => products.Contains(p.productId.ParseToString())).ToList(); + + if (prices.Count == 0) + { + BaseMsgForm.ShowError("未选择商品"); + return; + } + + this.statusBar.lblTaskStatus.Text = "正在批量还原包装规格尺寸与SKU分类数量"; + this.pbLoading.Visible = true; + Task.Run(() => + { + foreach (var price in prices) + { + var rows = this.dgvPriceCheck.Rows.Cast().Where(r => r.Cells["colProductId"].Value.ParseToString() == price.productId.ParseToString()).ToList(); + var shop = lstAdminShopInfo.FirstOrDefault(s => s.ShopId == price.supplierId.ParseToString()); + if (shop == null) + continue; + if (shop.LoginStatus2 != "国际版在线") + { + Invoke(new Action(() => + { + foreach (var row in rows) + row.Cells["colMsg"].Value = "店铺掉线"; + })); + continue; + } + + //var pName = price.productName; + if (checkRestoreSizeAndNumber(price)) + { + } + else + { + Invoke(new Action(() => + { + foreach (var row in rows) + row.Cells["colMsg"].Value = "无需还原包装规格尺寸与SKU分类数量"; + })); + continue; + } + + var taskUid = ""; + var html = editPriceProductSizeAndNumberBatchAdd(shop, price.productId.ParseToString()); + //{"success":true,"errorCode":1000000,"errorMsg":null,"result":{"handleFailedList":[{"failedBizId":4432690492,"failedReason":"This product has pending or in-progress modification tasks, cannot initiate again"}],"addFailedList":[{"failedBizId":4432690492,"failedReason":"This product has pending or in-progress modification tasks, cannot initiate again","failedReasonType":8}],"successBizId2TaskUidMap":{}}} + if (html.Contains("This product has pending or in-progress modification tasks")) + { + var taskHtml = editPriceProductSizeAndNumberTaskQuery(shop, price.productId.ParseToString()); + taskUid = BaseRegex.GetStringJson(ref taskHtml, "taskUid"); + if (string.IsNullOrEmpty(taskUid) || !taskHtml.Contains("\"productEditTaskItems\":[{\"editItem\":4,\"editAdvice\":\"优化\"},{\"editItem\":8,\"editAdvice\":\"优化\"}]")) + { + Invoke(new Action(() => + { + foreach (var row in rows) + row.Cells["colMsg"].Value = "已提交过修改任务或商品有其他修改任务"; + })); + continue; + } + } + if (!html.Contains("\"success\":true")) + { + if (html.Contains("登录过期") || html.Contains("Invalid Login State")) + { + AdminShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false); + Invoke(new Action(() => + { + displayShopStatus(shop); + })); + } + string sErrMsg = BaseRegex.GetStringJson(ref html, "errorMsg").ParseToString(); + if (string.IsNullOrEmpty(sErrMsg)) + { + sErrMsg = BaseRegex.GetStringJson(ref html, "error_msg").ParseToString(); + } + Invoke(new Action(() => + { + foreach (var row in rows) + row.Cells["colMsg"].Value = "修改请求失败 " + sErrMsg; + })); + continue; + } + try + { + if (string.IsNullOrEmpty(taskUid)) + { + JObject jObj = JObject.Parse(html); + taskUid = jObj["result"]["successBizId2TaskUidMap"].LastOrDefault().LastOrDefault().ParseToString(); + } + } + catch (Exception ex) + { + Invoke(new Action(() => + { + foreach (var row in rows) + row.Cells["colMsg"].Value = "修改请求失败 " + ex.Message; + })); + continue; + } + + + html = editPriceProductQuery(shop, price.productId.ParseToString(), taskUid); + if (html.Contains("This product has pending or in-progress modification tasks")) + { + Invoke(new Action(() => + { + foreach (var row in rows) + row.Cells["colMsg"].Value = "已提交过修改任务"; + })); + continue; + } + if (!html.Contains("\"success\":true")) + { + if (html.Contains("登录过期") || html.Contains("Invalid Login State")) + { + AdminShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false); + Invoke(new Action(() => + { + displayShopStatus(shop); + })); + } + string sErrMsg = BaseRegex.GetStringJson(ref html, "errorMsg").ParseToString(); + if (string.IsNullOrEmpty(sErrMsg)) + { + sErrMsg = BaseRegex.GetStringJson(ref html, "error_msg").ParseToString(); + } + Invoke(new Action(() => + { + foreach (var row in rows) + row.Cells["colMsg"].Value = "修改请求失败 " + sErrMsg; + })); + continue; + } + + try + { + //int len = Randomx.GetId(15, 31); //300 + //int width = Randomx.GetId(10, 15); //200 + //int height = Randomx.GetId(5, 10); //100 + //int weight = Randomx.GetId(100, 200); //500000 + //int numberOfPieces = Randomx.GetId(450, 601);// 单品数量 + int len = Randomx.GetId(numLen1.Value.ParseToInt(), numLen2.Value.ParseToInt() + 1); + int width = Randomx.GetId(numWidth1.Value.ParseToInt(), Math.Min(len, numWidth2.Value.ParseToInt() + 1)); + int height = Randomx.GetId(numHeight1.Value.ParseToInt(), Math.Min(width, numHeight2.Value.ParseToInt() + 1)); + int weight = Randomx.GetId(numWeight1.Value.ParseToInt(), numWeight2.Value.ParseToInt() + 1); + int numberOfPieces = 1; + + JObject obj = JObject.Parse(html); + var result = JsonHelper.SerializeObject(obj["result"]); + TemuDetailProductInfo prodInfo = JsonHelper.DeserializeJsonToObject(result); + + + //JObject jPost = new JObject(); + //jPost.Add("productId", price.productId); + //jPost.Add("taskUid", taskUid.ParseToString()); + //jPost.Add("taskVersion", 0); + //jPost.Add("refuseEdit", false); + //var jProductSkcMainReqs = new JArray(); + //jPost.Add("productSkcReqs", jProductSkcMainReqs); + //JObject jProductSkcMainReq = new JObject(); + //jProductSkcMainReqs.Add(jProductSkcMainReq); + //var jMainProductSkuSpecReqs = new JArray(); + //jProductSkcMainReq.Add("mainProductSkuSpecReqs", jMainProductSkuSpecReqs); + //jMainProductSkuSpecReqs.Add(new JObject() { + // new JProperty("parentSpecId",0), + // new JProperty("parentSpecName",""), + // new JProperty("specId",0), + // new JProperty("specName",""), + //}); + + var jStr = "{"; + jStr += "\r\n\"productId\":" + price.productId + ","; + jStr += "\r\n\"taskUid\":\"" + taskUid.ParseToString() + "\","; + jStr += "\r\n\"taskVersion\":" + 0 + ","; + jStr += "\r\n\"refuseEdit\":false,"; + jStr += "\r\n\"productSkcReqs\":[{"; + jStr += " \r\n\"mainProductSkuSpecReqs\":[{".Trim(); + jStr += " \r\n\"parentSpecId\":0,".Trim(); + jStr += " \r\n\"parentSpecName\":\"\",".Trim(); + jStr += " \r\n\"specId\":0,".Trim(); + jStr += " \r\n\"specName\":\"\"".Trim(); + jStr += " \r\n}],".Trim(); + + + jStr += " \r\n\"productSkuReqs\":[".Trim(); + + foreach (var sku in prodInfo.productSkcList.FirstOrDefault().productSkuList) + { + jStr += " \r\n{".Trim(); + + //productSkuSpecReqs + jStr += " \r\n\"productSkuSpecReqs\":[".Trim(); + foreach (var spec in sku.productSkuSpecList) + { + jStr += "{"; + jStr += "\"parentSpecId\":" + spec.parentSpecId + ","; + jStr += "\"parentSpecName\":\"" + spec.parentSpecName + "\","; + jStr += "\"specId\":" + spec.specId + ","; + jStr += "\"specName\":\"" + spec.specName + "\","; + var specProp = prodInfo.productSpecPropertyVOS.FirstOrDefault(p => p.parentSpecId == spec.parentSpecId); + if (!string.IsNullOrEmpty(specProp?.valueGroupId.ParseToString())) + jStr += "\"groupId\":" + specProp?.valueGroupId.ParseToString() + ","; + if (!string.IsNullOrEmpty(specProp?.vid.ParseToString())) + jStr += "\"vid\":" + specProp?.vid.ParseToString() + ","; + jStr = jStr.TrimEnd(','); + jStr += "},"; + } + jStr = jStr.TrimEnd(','); + jStr += " \r\n],".Trim(); + + //productSkuWhExtAttrReq + jStr += "\"productSkuWhExtAttrReq\":{"; + jStr += " \"productSkuWeightReq\":{\"value\":" + (weight * 1000) + "},"; + jStr += " \"productSkuVolumeReq\":{"; + jStr += " \"len\":" + (len * 10) + ","; + jStr += " \"width\":" + (width * 10) + ","; + jStr += " \"height\":" + (height * 10); + jStr += " }"; + jStr += "},"; + + //productSkuMultiPackReq + jStr += "\"productSkuMultiPackReq\":{"; + jStr += " \"skuClassification\":1,"; + jStr += " \"numberOfPieces\":1,"; + jStr += " \"pieceUnitCode\":" + Math.Max(1, sku.productSkuMultiPack.pieceUnitCode.ParseToInt()) + ","; + jStr += " \"productSkuNetContentReq\":{"; + jStr += " },"; + jStr += " \"individuallyPacked\":-1"; + jStr += "},"; + + //productSkuAccessoriesReq + jStr += "\"productSkuAccessoriesReq\":{"; + jStr += "\"productSkuAccessories\":["; + jStr += "]"; + jStr += "}"; + + jStr += " \r\n},".Trim(); + } + jStr = jStr.TrimEnd(','); + jStr += " \r\n]".Trim(); + + jStr += "\r\n}]"; + jStr += "\r\n}"; + + var jStrObj = JObject.Parse(jStr); + jStr = JsonHelper.SerializeObject(jStrObj); + + html = editPriceProductSizeAndNumber(shop, taskUid.ParseToString(), price.productId.ParseToString(), jStr); + Thread.Sleep(Randomx.GetId(25, 75)); + if (html.Contains("\"success\":true")) + { + Invoke(new Action(() => + { + foreach (var row in rows) + row.Cells["colMsg"].Value = "修改请求成功"; + })); + } + else + { + if (html.Contains("登录过期") || html.Contains("Invalid Login State")) + { + AdminShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false); + Invoke(new Action(() => + { + displayShopStatus(shop); + })); + } + string sErrMsg = BaseRegex.GetStringJson(ref html, "errorMsg").ParseToString(); + if (string.IsNullOrEmpty(sErrMsg)) + sErrMsg = BaseRegex.GetStringJson(ref html, "error_msg").ParseToString(); + if (string.IsNullOrEmpty(sErrMsg)) + sErrMsg = html; + Invoke(new Action(() => + { + foreach (var row in rows) + row.Cells["colMsg"].Value = "修改请求失败 " + sErrMsg; + })); + continue; + } + } + catch (Exception ex) + { + Invoke(new Action(() => + { + foreach (var row in rows) + row.Cells["colMsg"].Value = "修改请求失败 " + ex.Message; + })); + continue; + } + } + + Invoke(new Action(() => + { + this.statusBar.lblTaskStatus.Text = "批量还原尺寸与数量完成"; + this.pbLoading.Visible = false; + })); + }); + } + + /// + /// 检测是否需要重置尺寸和sku单品数量 + /// + /// + /// + bool checkRestoreSizeAndNumber(TemuCheckPriceInfo info) + { + //最长边：60 - 100 cm//生成时需转换为mm + //次长边：60 - 90 cm//生成时需转换为mm + //最短边：50 - 80 cm//生成时需转换为mm + //重量：80000 - 99999g //生成时需转换为mg + var skc = info.skcList.FirstOrDefault(); + if (skc.skuList.Any(s => (s.len >= 60 * 10 || s.width >= 60 * 10 || s.height >= 50 * 10) && s.weight >= 80000 * 1000)) + return true; + return false; + } } public class PriceCheckConfig diff --git a/TEMUKJD/KJDForms/AdminForms/AdminShopLoginForm.cs b/TEMUKJD/KJDForms/AdminForms/AdminShopLoginForm.cs index 9e9b8cc..2fb927f 100644 --- a/TEMUKJD/KJDForms/AdminForms/AdminShopLoginForm.cs +++ b/TEMUKJD/KJDForms/AdminForms/AdminShopLoginForm.cs @@ -584,7 +584,10 @@ namespace TemuKJD.KJDForms.AdminForms if (this.shop != null && data.Contains("\"success\":true")) { var maskMobile = BaseRegex.GetStringJson(ref data, "maskOwnerMobile"); - if (shop.LoginName.EndsWith(maskMobile)) + var maskMobile2 = "||||" + BaseRegex.GetStringJson(ref data, "maskMobile").ParseToString(); + if (maskMobile2.Contains("*")) + maskMobile2 = maskMobile2.Substring(maskMobile2.LastIndexOf("*")).Trim('*'); + if (shop.LoginName.EndsWith(maskMobile) || shop.LoginName.EndsWith(maskMobile2)) { lstShopCompany.Clear(); var jObj = JObject.Parse(data); diff --git a/TEMUKJD/KJDForms/ProductForms/ProductForm.cs b/TEMUKJD/KJDForms/ProductForms/ProductForm.cs index f0f5bd0..26b70f1 100644 --- a/TEMUKJD/KJDForms/ProductForms/ProductForm.cs +++ b/TEMUKJD/KJDForms/ProductForms/ProductForm.cs @@ -13,6 +13,7 @@ using System.Windows.Forms; using TemuKJD.KJDForms.ProductSelectForms; using TemuKJD.KJDForms.BaseForms; using TemuKJD.KJDForms.ProductThirdSelectForms; +using AllBase; namespace TemuKJD.KJDForms.ProductForms { @@ -29,6 +30,33 @@ namespace TemuKJD.KJDForms.ProductForms public ProductForm() { InitializeComponent(); + + try + { + tv.SelectedNode = tv.Nodes[0].Nodes[0]; + tv.ExpandGroup(tv.Nodes[0].Name); + + List hideName = new List() { "设置进货价" }; + + if (BaseClass.GroupId == 3) + { + //hideName.Remove("设置进货价"); + if (BaseClass.SaLevel == 1) + { + } + if (BaseClass.SaLevel == 2) + { + } + } + + foreach (var item in hideName) + { + var n = tv.Nodes[0].Nodes.Find(item, true); + if (n.Count() > 0) + n[0].Remove(); + } + } + catch { } } private void tv_AfterSelect(object sender, TreeViewEventArgs e) diff --git a/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.Designer.cs b/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.Designer.cs index a2f8559..742b516 100644 --- a/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.Designer.cs +++ b/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.Designer.cs @@ -39,6 +39,26 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DbProductSelectListManageForm)); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.label21 = new System.Windows.Forms.Label(); + this.numUnitNum2 = new System.Windows.Forms.NumericUpDown(); + this.numUnitNum1 = new System.Windows.Forms.NumericUpDown(); + this.label20 = new System.Windows.Forms.Label(); + this.numWeight2 = new System.Windows.Forms.NumericUpDown(); + this.numWeight1 = new System.Windows.Forms.NumericUpDown(); + this.label19 = new System.Windows.Forms.Label(); + this.numHeight2 = new System.Windows.Forms.NumericUpDown(); + this.numHeight1 = new System.Windows.Forms.NumericUpDown(); + this.label18 = new System.Windows.Forms.Label(); + this.numWidth2 = new System.Windows.Forms.NumericUpDown(); + this.numWidth1 = new System.Windows.Forms.NumericUpDown(); + this.numLen2 = new System.Windows.Forms.NumericUpDown(); + this.numLen1 = new System.Windows.Forms.NumericUpDown(); + this.label15 = new System.Windows.Forms.Label(); + this.label17 = new System.Windows.Forms.Label(); + this.numAddPrice = new System.Windows.Forms.NumericUpDown(); + this.label16 = new System.Windows.Forms.Label(); + this.numAddPriceTimes = new System.Windows.Forms.NumericUpDown(); + this.chkChangeSizeAndNumber = new TemuKJD.UserComponent.UcCheckBox(this.components); this.btnStop = new DevComponents.DotNetBar.PanelEx(); this.btnExport = new DevComponents.DotNetBar.PanelEx(); this.lblCustomImgNum = new System.Windows.Forms.Label(); @@ -90,6 +110,7 @@ this.chkUploadProd = new TemuKJD.UserComponent.UcCheckBox(this.components); this.btnSetSubSa = new TemuKJD.UserControls.ButtonEx(); this.btnAdd = new TemuKJD.UserControls.ButtonEx(); + this.chkAddPrice = new TemuKJD.UserComponent.UcCheckBox(this.components); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); this.pbLoading = new System.Windows.Forms.PictureBox(); this.dgvSelectProduct = new TemuKJD.UserComponent.DataGridViewEx(); @@ -125,6 +146,18 @@ this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); this.splitContainer1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numUnitNum2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numUnitNum1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numWeight2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numWeight1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numHeight2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numHeight1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numWidth2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numWidth1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numLen2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numLen1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numAddPrice)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numAddPriceTimes)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numSeconds)).BeginInit(); this.tableLayoutPanel1.SuspendLayout(); this.flowLayoutPanel1.SuspendLayout(); @@ -148,6 +181,26 @@ // // splitContainer1.Panel1 // + this.splitContainer1.Panel1.Controls.Add(this.label21); + this.splitContainer1.Panel1.Controls.Add(this.numUnitNum2); + this.splitContainer1.Panel1.Controls.Add(this.numUnitNum1); + this.splitContainer1.Panel1.Controls.Add(this.label20); + this.splitContainer1.Panel1.Controls.Add(this.numWeight2); + this.splitContainer1.Panel1.Controls.Add(this.numWeight1); + this.splitContainer1.Panel1.Controls.Add(this.label19); + this.splitContainer1.Panel1.Controls.Add(this.numHeight2); + this.splitContainer1.Panel1.Controls.Add(this.numHeight1); + this.splitContainer1.Panel1.Controls.Add(this.label18); + this.splitContainer1.Panel1.Controls.Add(this.numWidth2); + this.splitContainer1.Panel1.Controls.Add(this.numWidth1); + this.splitContainer1.Panel1.Controls.Add(this.numLen2); + this.splitContainer1.Panel1.Controls.Add(this.numLen1); + this.splitContainer1.Panel1.Controls.Add(this.label15); + this.splitContainer1.Panel1.Controls.Add(this.label17); + this.splitContainer1.Panel1.Controls.Add(this.numAddPrice); + this.splitContainer1.Panel1.Controls.Add(this.label16); + this.splitContainer1.Panel1.Controls.Add(this.numAddPriceTimes); + this.splitContainer1.Panel1.Controls.Add(this.chkChangeSizeAndNumber); this.splitContainer1.Panel1.Controls.Add(this.btnStop); this.splitContainer1.Panel1.Controls.Add(this.btnExport); this.splitContainer1.Panel1.Controls.Add(this.lblCustomImgNum); @@ -160,6 +213,7 @@ this.splitContainer1.Panel1.Controls.Add(this.tableLayoutPanel1); this.splitContainer1.Panel1.Controls.Add(this.btnSetSubSa); this.splitContainer1.Panel1.Controls.Add(this.btnAdd); + this.splitContainer1.Panel1.Controls.Add(this.chkAddPrice); // // splitContainer1.Panel2 // @@ -168,6 +222,305 @@ this.splitContainer1.SplitterDistance = 100; this.splitContainer1.TabIndex = 2; // + // label21 + // + this.label21.AutoSize = true; + this.label21.Location = new System.Drawing.Point(621, 75); + this.label21.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label21.Name = "label21"; + this.label21.Size = new System.Drawing.Size(32, 17); + this.label21.TabIndex = 588; + this.label21.Text = "数量"; + // + // numUnitNum2 + // + this.numUnitNum2.Location = new System.Drawing.Point(696, 72); + this.numUnitNum2.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numUnitNum2.Maximum = new decimal(new int[] { + 600, + 0, + 0, + 0}); + this.numUnitNum2.Name = "numUnitNum2"; + this.numUnitNum2.Size = new System.Drawing.Size(42, 23); + this.numUnitNum2.TabIndex = 587; + this.numUnitNum2.Value = new decimal(new int[] { + 600, + 0, + 0, + 0}); + // + // numUnitNum1 + // + this.numUnitNum1.Location = new System.Drawing.Point(653, 72); + this.numUnitNum1.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numUnitNum1.Maximum = new decimal(new int[] { + 600, + 0, + 0, + 0}); + this.numUnitNum1.Name = "numUnitNum1"; + this.numUnitNum1.Size = new System.Drawing.Size(42, 23); + this.numUnitNum1.TabIndex = 586; + this.numUnitNum1.Value = new decimal(new int[] { + 450, + 0, + 0, + 0}); + // + // label20 + // + this.label20.AutoSize = true; + this.label20.Location = new System.Drawing.Point(487, 75); + this.label20.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label20.Name = "label20"; + this.label20.Size = new System.Drawing.Size(20, 17); + this.label20.TabIndex = 585; + this.label20.Text = "重"; + // + // numWeight2 + // + this.numWeight2.Location = new System.Drawing.Point(563, 72); + this.numWeight2.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numWeight2.Maximum = new decimal(new int[] { + 99999, + 0, + 0, + 0}); + this.numWeight2.Name = "numWeight2"; + this.numWeight2.Size = new System.Drawing.Size(55, 23); + this.numWeight2.TabIndex = 584; + this.numWeight2.Value = new decimal(new int[] { + 99999, + 0, + 0, + 0}); + // + // numWeight1 + // + this.numWeight1.Location = new System.Drawing.Point(507, 72); + this.numWeight1.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numWeight1.Maximum = new decimal(new int[] { + 99999, + 0, + 0, + 0}); + this.numWeight1.Name = "numWeight1"; + this.numWeight1.Size = new System.Drawing.Size(55, 23); + this.numWeight1.TabIndex = 583; + this.numWeight1.Value = new decimal(new int[] { + 80000, + 0, + 0, + 0}); + // + // label19 + // + this.label19.AutoSize = true; + this.label19.Location = new System.Drawing.Point(379, 75); + this.label19.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label19.Name = "label19"; + this.label19.Size = new System.Drawing.Size(20, 17); + this.label19.TabIndex = 570; + this.label19.Text = "高"; + // + // numHeight2 + // + this.numHeight2.Location = new System.Drawing.Point(442, 72); + this.numHeight2.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numHeight2.Maximum = new decimal(new int[] { + 299, + 0, + 0, + 0}); + this.numHeight2.Name = "numHeight2"; + this.numHeight2.Size = new System.Drawing.Size(42, 23); + this.numHeight2.TabIndex = 569; + this.numHeight2.Value = new decimal(new int[] { + 100, + 0, + 0, + 0}); + // + // numHeight1 + // + this.numHeight1.Location = new System.Drawing.Point(399, 72); + this.numHeight1.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numHeight1.Maximum = new decimal(new int[] { + 299, + 0, + 0, + 0}); + this.numHeight1.Name = "numHeight1"; + this.numHeight1.Size = new System.Drawing.Size(42, 23); + this.numHeight1.TabIndex = 568; + this.numHeight1.Value = new decimal(new int[] { + 50, + 0, + 0, + 0}); + // + // label18 + // + this.label18.AutoSize = true; + this.label18.Location = new System.Drawing.Point(271, 75); + this.label18.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label18.Name = "label18"; + this.label18.Size = new System.Drawing.Size(20, 17); + this.label18.TabIndex = 567; + this.label18.Text = "宽"; + // + // numWidth2 + // + this.numWidth2.Location = new System.Drawing.Point(334, 72); + this.numWidth2.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numWidth2.Maximum = new decimal(new int[] { + 299, + 0, + 0, + 0}); + this.numWidth2.Name = "numWidth2"; + this.numWidth2.Size = new System.Drawing.Size(42, 23); + this.numWidth2.TabIndex = 566; + this.numWidth2.Value = new decimal(new int[] { + 100, + 0, + 0, + 0}); + // + // numWidth1 + // + this.numWidth1.Location = new System.Drawing.Point(291, 72); + this.numWidth1.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numWidth1.Maximum = new decimal(new int[] { + 299, + 0, + 0, + 0}); + this.numWidth1.Name = "numWidth1"; + this.numWidth1.Size = new System.Drawing.Size(42, 23); + this.numWidth1.TabIndex = 565; + this.numWidth1.Value = new decimal(new int[] { + 55, + 0, + 0, + 0}); + // + // numLen2 + // + this.numLen2.Location = new System.Drawing.Point(226, 72); + this.numLen2.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numLen2.Maximum = new decimal(new int[] { + 299, + 0, + 0, + 0}); + this.numLen2.Name = "numLen2"; + this.numLen2.Size = new System.Drawing.Size(42, 23); + this.numLen2.TabIndex = 564; + this.numLen2.Value = new decimal(new int[] { + 100, + 0, + 0, + 0}); + // + // numLen1 + // + this.numLen1.Location = new System.Drawing.Point(183, 72); + this.numLen1.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numLen1.Maximum = new decimal(new int[] { + 299, + 0, + 0, + 0}); + this.numLen1.Name = "numLen1"; + this.numLen1.Size = new System.Drawing.Size(42, 23); + this.numLen1.TabIndex = 563; + this.numLen1.Value = new decimal(new int[] { + 60, + 0, + 0, + 0}); + // + // label15 + // + this.label15.AutoSize = true; + this.label15.Location = new System.Drawing.Point(164, 75); + this.label15.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(20, 17); + this.label15.TabIndex = 562; + this.label15.Text = "长"; + // + // label17 + // + this.label17.AutoSize = true; + this.label17.Location = new System.Drawing.Point(933, 75); + this.label17.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label17.Name = "label17"; + this.label17.Size = new System.Drawing.Size(20, 17); + this.label17.TabIndex = 549; + this.label17.Text = "元"; + // + // numAddPrice + // + this.numAddPrice.DecimalPlaces = 2; + this.numAddPrice.Increment = new decimal(new int[] { + 1, + 0, + 0, + 131072}); + this.numAddPrice.Location = new System.Drawing.Point(889, 72); + this.numAddPrice.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numAddPrice.Name = "numAddPrice"; + this.numAddPrice.Size = new System.Drawing.Size(44, 23); + this.numAddPrice.TabIndex = 548; + this.numAddPrice.Value = new decimal(new int[] { + 5, + 0, + 0, + 0}); + // + // label16 + // + this.label16.AutoSize = true; + this.label16.Location = new System.Drawing.Point(843, 75); + this.label16.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label16.Name = "label16"; + this.label16.Size = new System.Drawing.Size(48, 17); + this.label16.TabIndex = 547; + this.label16.Text = "倍 再加"; + // + // numAddPriceTimes + // + this.numAddPriceTimes.DecimalPlaces = 2; + this.numAddPriceTimes.Increment = new decimal(new int[] { + 1, + 0, + 0, + 131072}); + this.numAddPriceTimes.Location = new System.Drawing.Point(799, 72); + this.numAddPriceTimes.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numAddPriceTimes.Name = "numAddPriceTimes"; + this.numAddPriceTimes.Size = new System.Drawing.Size(44, 23); + this.numAddPriceTimes.TabIndex = 533; + this.numAddPriceTimes.Value = new decimal(new int[] { + 20, + 0, + 0, + 65536}); + // + // chkChangeSizeAndNumber + // + this.chkChangeSizeAndNumber.AutoSize = true; + this.chkChangeSizeAndNumber.Location = new System.Drawing.Point(6, 73); + this.chkChangeSizeAndNumber.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.chkChangeSizeAndNumber.Name = "chkChangeSizeAndNumber"; + this.chkChangeSizeAndNumber.Size = new System.Drawing.Size(159, 21); + this.chkChangeSizeAndNumber.TabIndex = 520; + this.chkChangeSizeAndNumber.Text = "修改包装尺寸和单品数量"; + this.chkChangeSizeAndNumber.UseVisualStyleBackColor = true; + // // btnStop // this.btnStop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -223,12 +576,13 @@ // lblCustomImgNum // this.lblCustomImgNum.AutoSize = true; - this.lblCustomImgNum.Location = new System.Drawing.Point(349, 74); + this.lblCustomImgNum.Location = new System.Drawing.Point(1442, 75); this.lblCustomImgNum.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.lblCustomImgNum.Name = "lblCustomImgNum"; this.lblCustomImgNum.Size = new System.Drawing.Size(95, 17); this.lblCustomImgNum.TabIndex = 484; this.lblCustomImgNum.Text = "自定义图片 0 张"; + this.lblCustomImgNum.Visible = false; // // btnCustomImg // @@ -236,7 +590,7 @@ this.btnCustomImg.Cursor = System.Windows.Forms.Cursors.Hand; this.btnCustomImg.DisabledBackColor = System.Drawing.Color.Empty; this.btnCustomImg.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnCustomImg.Location = new System.Drawing.Point(242, 69); + this.btnCustomImg.Location = new System.Drawing.Point(1335, 70); this.btnCustomImg.Name = "btnCustomImg"; this.btnCustomImg.Size = new System.Drawing.Size(106, 26); this.btnCustomImg.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -252,21 +606,23 @@ this.btnCustomImg.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); this.btnCustomImg.TabIndex = 483; this.btnCustomImg.Text = "设置自定义图片"; + this.btnCustomImg.Visible = false; this.btnCustomImg.Click += new System.EventHandler(this.btnCustomImg_Click); // // label14 // this.label14.AutoSize = true; - this.label14.Location = new System.Drawing.Point(183, 74); + this.label14.Location = new System.Drawing.Point(1276, 75); this.label14.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label14.Name = "label14"; this.label14.Size = new System.Drawing.Size(56, 17); this.label14.TabIndex = 479; this.label14.Text = "秒后还原"; + this.label14.Visible = false; // // numSeconds // - this.numSeconds.Location = new System.Drawing.Point(137, 71); + this.numSeconds.Location = new System.Drawing.Point(1230, 72); this.numSeconds.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); this.numSeconds.Maximum = new decimal(new int[] { 1000, @@ -281,16 +637,18 @@ 0, 0, 0}); + this.numSeconds.Visible = false; // // chkCustomPic // - this.chkCustomPic.Location = new System.Drawing.Point(8, 72); + this.chkCustomPic.Location = new System.Drawing.Point(1101, 73); this.chkCustomPic.Margin = new System.Windows.Forms.Padding(2, 0, 0, 0); this.chkCustomPic.Name = "chkCustomPic"; this.chkCustomPic.Size = new System.Drawing.Size(135, 21); this.chkCustomPic.TabIndex = 477; this.chkCustomPic.Text = "使用自定义图片并在"; this.chkCustomPic.UseVisualStyleBackColor = true; + this.chkCustomPic.Visible = false; // // btnDel // @@ -918,6 +1276,17 @@ this.btnAdd.UseVisualStyleBackColor = false; this.btnAdd.Click += new System.EventHandler(this.btnAdd_Click); // + // chkAddPrice + // + this.chkAddPrice.AutoSize = true; + this.chkAddPrice.Location = new System.Drawing.Point(755, 73); + this.chkAddPrice.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.chkAddPrice.Name = "chkAddPrice"; + this.chkAddPrice.Size = new System.Drawing.Size(51, 21); + this.chkAddPrice.TabIndex = 550; + this.chkAddPrice.Text = "加价"; + this.chkAddPrice.UseVisualStyleBackColor = true; + // // splitContainer2 // this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill; @@ -1259,6 +1628,18 @@ this.splitContainer1.Panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); this.splitContainer1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.numUnitNum2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numUnitNum1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numWeight2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numWeight1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numHeight2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numHeight1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numWidth2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numWidth1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numLen2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numLen1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numAddPrice)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numAddPriceTimes)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.numSeconds)).EndInit(); this.tableLayoutPanel1.ResumeLayout(false); this.tableLayoutPanel1.PerformLayout(); @@ -1360,5 +1741,26 @@ private DevComponents.DotNetBar.PanelEx btnCustomImg; private DevComponents.DotNetBar.PanelEx btnExport; private DevComponents.DotNetBar.PanelEx btnStop; + private UserComponent.UcCheckBox chkChangeSizeAndNumber; + private System.Windows.Forms.NumericUpDown numAddPriceTimes; + private System.Windows.Forms.Label label17; + private System.Windows.Forms.NumericUpDown numAddPrice; + private System.Windows.Forms.Label label16; + private UserComponent.UcCheckBox chkAddPrice; + private System.Windows.Forms.Label label19; + private System.Windows.Forms.NumericUpDown numHeight2; + private System.Windows.Forms.NumericUpDown numHeight1; + private System.Windows.Forms.Label label18; + private System.Windows.Forms.NumericUpDown numWidth2; + private System.Windows.Forms.NumericUpDown numWidth1; + private System.Windows.Forms.NumericUpDown numLen2; + private System.Windows.Forms.NumericUpDown numLen1; + private System.Windows.Forms.Label label15; + private System.Windows.Forms.Label label21; + private System.Windows.Forms.NumericUpDown numUnitNum2; + private System.Windows.Forms.NumericUpDown numUnitNum1; + private System.Windows.Forms.Label label20; + private System.Windows.Forms.NumericUpDown numWeight2; + private System.Windows.Forms.NumericUpDown numWeight1; } } \ No newline at end of file diff --git a/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs b/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs index c1ef513..1153bf6 100644 --- a/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs +++ b/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs @@ -1229,6 +1229,18 @@ namespace TemuKJD.KJDForms.ProductSelectForms } #endregion + int len = 30, width = 20, height = 10; // 300, 200, 100 + int weight = 500; //500000 + int numberOfPieces = 1; // 单品数量 + if (chkChangeSizeAndNumber.Checked) // 修改包装尺寸和单品数量 + { + len = Randomx.GetId(numLen1.Value.ParseToInt(), numLen2.Value.ParseToInt()+1); + width = Randomx.GetId(numWidth1.Value.ParseToInt(), Math.Min(len, numWidth2.Value.ParseToInt() + 1)); + height = Randomx.GetId(numHeight1.Value.ParseToInt(), Math.Min(width, numHeight2.Value.ParseToInt() + 1)); + weight = Randomx.GetId(numWeight1.Value.ParseToInt(), numWeight2.Value.ParseToInt() + 1); + numberOfPieces = Randomx.GetId(numUnitNum1.Value.ParseToInt(), numUnitNum2.Value.ParseToInt()); + } + int skuCount = 0; //foreach (var skuInfo in skcInfo.productSkuList) List skuListTmp = new List(); @@ -1270,12 +1282,36 @@ namespace TemuKJD.KJDForms.ProductSelectForms skuItem.productSkuId = 0; skuItem.productSkuMultiPackReq = new ProductSkuMultiPackReq() { + skuClassification = skuInfo.productSkuMultiPack.skuClassification, numberOfPieces = skuInfo.productSkuMultiPack.numberOfPieces, pieceUnitCode = skuInfo.productSkuMultiPack.pieceUnitCode, productSkuNetContentReq = JsonHelper.DeserializeJsonToObject( JsonHelper.SerializeObject(skuInfo.productSkuMultiPack.productSkuNetContent)), - skuClassification = skuInfo.productSkuMultiPack.skuClassification, }; + if (skuInfo.productSkuMultiPack.individuallyPacked != null) + { + skuItem.productSkuMultiPackReq = new ProductSkuMultiPackReq2() + { + skuClassification = skuInfo.productSkuMultiPack.skuClassification, + numberOfPieces = skuInfo.productSkuMultiPack.numberOfPieces, + pieceUnitCode = skuInfo.productSkuMultiPack.pieceUnitCode, + productSkuNetContentReq = JsonHelper.DeserializeJsonToObject( + JsonHelper.SerializeObject(skuInfo.productSkuMultiPack.productSkuNetContent)), + individuallyPacked = skuInfo.productSkuMultiPack.individuallyPacked.ParseToInt(), + }; + } + if (chkChangeSizeAndNumber.Checked) + { + skuItem.productSkuMultiPackReq = new ProductSkuMultiPackReq2() + { + skuClassification = 2, + numberOfPieces = numberOfPieces, + pieceUnitCode = skuInfo.productSkuMultiPack.pieceUnitCode, + productSkuNetContentReq = JsonHelper.DeserializeJsonToObject( + JsonHelper.SerializeObject(skuInfo.productSkuMultiPack.productSkuNetContent)), + individuallyPacked = 1, + }; + } skuItem.productSkuNonAuditExtAttrReq = JsonHelper.DeserializeJsonToObject( JsonHelper.SerializeObject(skuInfo.productSkuNonAuditExtAttr)); if (skuItem.productSkuNonAuditExtAttrReq == null) @@ -1342,6 +1378,13 @@ namespace TemuKJD.KJDForms.ProductSelectForms productSkuWeightReq = JsonHelper.DeserializeJsonToObject( JsonHelper.SerializeObject(skuInfo.productSkuWhExtAttr.productSkuWeight)), }; + if (chkChangeSizeAndNumber.Checked) // 修改包装尺寸和单品数量 + { + skuItem.productSkuWhExtAttrReq.productSkuVolumeReq.len = len * 10; + skuItem.productSkuWhExtAttrReq.productSkuVolumeReq.width = width * 10; + skuItem.productSkuWhExtAttrReq.productSkuVolumeReq.height = height * 10; + skuItem.productSkuWhExtAttrReq.productSkuWeightReq.value = weight * 1000; + } skuItem.supplierPrice = skuInfo.supplierPrice; // 按照批号原价取商品原价和加价规则并修改商品上传价格 if (chkOriginalPriceMarkUp.Checked) @@ -1350,6 +1393,10 @@ namespace TemuKJD.KJDForms.ProductSelectForms if (dbPrice != null) skuItem.supplierPrice = dbPrice.original_price * dbPrice.markup_times + dbPrice.extra_price; } + if (chkAddPrice.Checked) //自定义加价 + { + skuItem.supplierPrice = (skuInfo.supplierPrice * numAddPriceTimes.Value + numAddPrice.Value * 100).ParseToInt(); + } #region 使用随机sku价格上传(第一个sku价格不变，此处有bug，平台最后的sku排列不是按照提交上去的顺序排的) if (skuCount != 1 && chkSkuRandomPrice.Checked) diff --git a/TEMUKJD/KJDForms/ProductSelectForms/Price/DbProductPriceMarkUpForm.cs b/TEMUKJD/KJDForms/ProductSelectForms/Price/DbProductPriceMarkUpForm.cs index 8bb8210..6d326dd 100644 --- a/TEMUKJD/KJDForms/ProductSelectForms/Price/DbProductPriceMarkUpForm.cs +++ b/TEMUKJD/KJDForms/ProductSelectForms/Price/DbProductPriceMarkUpForm.cs @@ -75,7 +75,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms BaseMsgForm.ShowInfo(text, "", FormLevel.LARGE); OpenFileDialog openFileDialog = new OpenFileDialog(); - openFileDialog.Filter = "文本文件(*.txt)|*.txt|所有文件 (*.*)|*.*"; + openFileDialog.Filter = "文本文件(*.txt)|*.txt|csv文件(*.csv)|*.csv|所有文件 (*.*)|*.*"; openFileDialog.RestoreDirectory = true; openFileDialog.FilterIndex = 1; if (openFileDialog.ShowDialog() == DialogResult.OK) @@ -84,8 +84,8 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.pbLoading.Enabled = true; Task.Run(() => { - using (StreamReader sr = new StreamReader(openFileDialog.FileName, System.Text.Encoding.UTF8)) - //using (StreamReader sr = new StreamReader(openFileDialog.FileName, Encoding.GetEncoding("gb2312"))) + //using (StreamReader sr = new StreamReader(openFileDialog.FileName, System.Text.Encoding.UTF8)) + using (StreamReader sr = new StreamReader(openFileDialog.FileName, Encoding.GetEncoding("gb2312"))) { string fileName = openFileDialog.FileName; string importStr = sr.ReadToEnd().Trim(); @@ -145,7 +145,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms Invoke(new Action(() => { - this.statusBar.lblTaskStatus.Text = "导入结束"; + this.statusBar.lblTaskStatus.Text = "加价信息导入结束"; BaseMsgForm.ShowInfo(resultMsg, "", FormLevel.LARGE); })); } diff --git a/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.Designer.cs b/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.Designer.cs index 7fa4779..7386925 100644 --- a/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.Designer.cs +++ b/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.Designer.cs @@ -39,6 +39,27 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ProductThirdSelectListManageForm)); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.label21 = new System.Windows.Forms.Label(); + this.numUnitNum2 = new System.Windows.Forms.NumericUpDown(); + this.numUnitNum1 = new System.Windows.Forms.NumericUpDown(); + this.label20 = new System.Windows.Forms.Label(); + this.numWeight2 = new System.Windows.Forms.NumericUpDown(); + this.numWeight1 = new System.Windows.Forms.NumericUpDown(); + this.label19 = new System.Windows.Forms.Label(); + this.numHeight2 = new System.Windows.Forms.NumericUpDown(); + this.numHeight1 = new System.Windows.Forms.NumericUpDown(); + this.label18 = new System.Windows.Forms.Label(); + this.numWidth2 = new System.Windows.Forms.NumericUpDown(); + this.numWidth1 = new System.Windows.Forms.NumericUpDown(); + this.numLen2 = new System.Windows.Forms.NumericUpDown(); + this.numLen1 = new System.Windows.Forms.NumericUpDown(); + this.label15 = new System.Windows.Forms.Label(); + this.label17 = new System.Windows.Forms.Label(); + this.numAddPrice = new System.Windows.Forms.NumericUpDown(); + this.label16 = new System.Windows.Forms.Label(); + this.numAddPriceTimes = new System.Windows.Forms.NumericUpDown(); + this.chkChangeSizeAndNumber = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.chkAddPrice = new TemuKJD.UserComponent.UcCheckBox(this.components); this.btnStop = new DevComponents.DotNetBar.PanelEx(); this.btnExport = new DevComponents.DotNetBar.PanelEx(); this.btnDel = new DevComponents.DotNetBar.PanelEx(); @@ -120,6 +141,18 @@ this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); this.splitContainer1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numUnitNum2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numUnitNum1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numWeight2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numWeight1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numHeight2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numHeight1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numWidth2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numWidth1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numLen2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numLen1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numAddPrice)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numAddPriceTimes)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pbFissionSetting)).BeginInit(); this.tableLayoutPanel1.SuspendLayout(); this.flowLayoutPanel1.SuspendLayout(); @@ -143,6 +176,27 @@ // // splitContainer1.Panel1 // + this.splitContainer1.Panel1.Controls.Add(this.label21); + this.splitContainer1.Panel1.Controls.Add(this.numUnitNum2); + this.splitContainer1.Panel1.Controls.Add(this.numUnitNum1); + this.splitContainer1.Panel1.Controls.Add(this.label20); + this.splitContainer1.Panel1.Controls.Add(this.numWeight2); + this.splitContainer1.Panel1.Controls.Add(this.numWeight1); + this.splitContainer1.Panel1.Controls.Add(this.label19); + this.splitContainer1.Panel1.Controls.Add(this.numHeight2); + this.splitContainer1.Panel1.Controls.Add(this.numHeight1); + this.splitContainer1.Panel1.Controls.Add(this.label18); + this.splitContainer1.Panel1.Controls.Add(this.numWidth2); + this.splitContainer1.Panel1.Controls.Add(this.numWidth1); + this.splitContainer1.Panel1.Controls.Add(this.numLen2); + this.splitContainer1.Panel1.Controls.Add(this.numLen1); + this.splitContainer1.Panel1.Controls.Add(this.label15); + this.splitContainer1.Panel1.Controls.Add(this.label17); + this.splitContainer1.Panel1.Controls.Add(this.numAddPrice); + this.splitContainer1.Panel1.Controls.Add(this.label16); + this.splitContainer1.Panel1.Controls.Add(this.numAddPriceTimes); + this.splitContainer1.Panel1.Controls.Add(this.chkChangeSizeAndNumber); + this.splitContainer1.Panel1.Controls.Add(this.chkAddPrice); this.splitContainer1.Panel1.Controls.Add(this.btnStop); this.splitContainer1.Panel1.Controls.Add(this.btnExport); this.splitContainer1.Panel1.Controls.Add(this.btnDel); @@ -156,9 +210,319 @@ // this.splitContainer1.Panel2.Controls.Add(this.splitContainer2); this.splitContainer1.Size = new System.Drawing.Size(1558, 638); - this.splitContainer1.SplitterDistance = 70; + this.splitContainer1.SplitterDistance = 100; this.splitContainer1.TabIndex = 2; // + // label21 + // + this.label21.AutoSize = true; + this.label21.Location = new System.Drawing.Point(621, 75); + this.label21.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label21.Name = "label21"; + this.label21.Size = new System.Drawing.Size(32, 17); + this.label21.TabIndex = 630; + this.label21.Text = "数量"; + // + // numUnitNum2 + // + this.numUnitNum2.Location = new System.Drawing.Point(696, 72); + this.numUnitNum2.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numUnitNum2.Maximum = new decimal(new int[] { + 600, + 0, + 0, + 0}); + this.numUnitNum2.Name = "numUnitNum2"; + this.numUnitNum2.Size = new System.Drawing.Size(42, 23); + this.numUnitNum2.TabIndex = 629; + this.numUnitNum2.Value = new decimal(new int[] { + 600, + 0, + 0, + 0}); + // + // numUnitNum1 + // + this.numUnitNum1.Location = new System.Drawing.Point(653, 72); + this.numUnitNum1.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numUnitNum1.Maximum = new decimal(new int[] { + 600, + 0, + 0, + 0}); + this.numUnitNum1.Name = "numUnitNum1"; + this.numUnitNum1.Size = new System.Drawing.Size(42, 23); + this.numUnitNum1.TabIndex = 628; + this.numUnitNum1.Value = new decimal(new int[] { + 450, + 0, + 0, + 0}); + // + // label20 + // + this.label20.AutoSize = true; + this.label20.Location = new System.Drawing.Point(487, 75); + this.label20.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label20.Name = "label20"; + this.label20.Size = new System.Drawing.Size(20, 17); + this.label20.TabIndex = 627; + this.label20.Text = "重"; + // + // numWeight2 + // + this.numWeight2.Location = new System.Drawing.Point(563, 72); + this.numWeight2.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numWeight2.Maximum = new decimal(new int[] { + 99999, + 0, + 0, + 0}); + this.numWeight2.Name = "numWeight2"; + this.numWeight2.Size = new System.Drawing.Size(55, 23); + this.numWeight2.TabIndex = 626; + this.numWeight2.Value = new decimal(new int[] { + 99999, + 0, + 0, + 0}); + // + // numWeight1 + // + this.numWeight1.Location = new System.Drawing.Point(507, 72); + this.numWeight1.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numWeight1.Maximum = new decimal(new int[] { + 99999, + 0, + 0, + 0}); + this.numWeight1.Name = "numWeight1"; + this.numWeight1.Size = new System.Drawing.Size(55, 23); + this.numWeight1.TabIndex = 625; + this.numWeight1.Value = new decimal(new int[] { + 80000, + 0, + 0, + 0}); + // + // label19 + // + this.label19.AutoSize = true; + this.label19.Location = new System.Drawing.Point(379, 75); + this.label19.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label19.Name = "label19"; + this.label19.Size = new System.Drawing.Size(20, 17); + this.label19.TabIndex = 624; + this.label19.Text = "高"; + // + // numHeight2 + // + this.numHeight2.Location = new System.Drawing.Point(442, 72); + this.numHeight2.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numHeight2.Maximum = new decimal(new int[] { + 299, + 0, + 0, + 0}); + this.numHeight2.Name = "numHeight2"; + this.numHeight2.Size = new System.Drawing.Size(42, 23); + this.numHeight2.TabIndex = 623; + this.numHeight2.Value = new decimal(new int[] { + 100, + 0, + 0, + 0}); + // + // numHeight1 + // + this.numHeight1.Location = new System.Drawing.Point(399, 72); + this.numHeight1.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numHeight1.Maximum = new decimal(new int[] { + 299, + 0, + 0, + 0}); + this.numHeight1.Name = "numHeight1"; + this.numHeight1.Size = new System.Drawing.Size(42, 23); + this.numHeight1.TabIndex = 622; + this.numHeight1.Value = new decimal(new int[] { + 50, + 0, + 0, + 0}); + // + // label18 + // + this.label18.AutoSize = true; + this.label18.Location = new System.Drawing.Point(271, 75); + this.label18.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label18.Name = "label18"; + this.label18.Size = new System.Drawing.Size(20, 17); + this.label18.TabIndex = 621; + this.label18.Text = "宽"; + // + // numWidth2 + // + this.numWidth2.Location = new System.Drawing.Point(334, 72); + this.numWidth2.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numWidth2.Maximum = new decimal(new int[] { + 299, + 0, + 0, + 0}); + this.numWidth2.Name = "numWidth2"; + this.numWidth2.Size = new System.Drawing.Size(42, 23); + this.numWidth2.TabIndex = 620; + this.numWidth2.Value = new decimal(new int[] { + 100, + 0, + 0, + 0}); + // + // numWidth1 + // + this.numWidth1.Location = new System.Drawing.Point(291, 72); + this.numWidth1.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numWidth1.Maximum = new decimal(new int[] { + 299, + 0, + 0, + 0}); + this.numWidth1.Name = "numWidth1"; + this.numWidth1.Size = new System.Drawing.Size(42, 23); + this.numWidth1.TabIndex = 619; + this.numWidth1.Value = new decimal(new int[] { + 55, + 0, + 0, + 0}); + // + // numLen2 + // + this.numLen2.Location = new System.Drawing.Point(226, 72); + this.numLen2.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numLen2.Maximum = new decimal(new int[] { + 299, + 0, + 0, + 0}); + this.numLen2.Name = "numLen2"; + this.numLen2.Size = new System.Drawing.Size(42, 23); + this.numLen2.TabIndex = 618; + this.numLen2.Value = new decimal(new int[] { + 100, + 0, + 0, + 0}); + // + // numLen1 + // + this.numLen1.Location = new System.Drawing.Point(183, 72); + this.numLen1.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numLen1.Maximum = new decimal(new int[] { + 299, + 0, + 0, + 0}); + this.numLen1.Name = "numLen1"; + this.numLen1.Size = new System.Drawing.Size(42, 23); + this.numLen1.TabIndex = 617; + this.numLen1.Value = new decimal(new int[] { + 60, + 0, + 0, + 0}); + // + // label15 + // + this.label15.AutoSize = true; + this.label15.Location = new System.Drawing.Point(164, 75); + this.label15.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(20, 17); + this.label15.TabIndex = 616; + this.label15.Text = "长"; + // + // label17 + // + this.label17.AutoSize = true; + this.label17.Location = new System.Drawing.Point(933, 75); + this.label17.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label17.Name = "label17"; + this.label17.Size = new System.Drawing.Size(20, 17); + this.label17.TabIndex = 614; + this.label17.Text = "元"; + // + // numAddPrice + // + this.numAddPrice.DecimalPlaces = 2; + this.numAddPrice.Increment = new decimal(new int[] { + 1, + 0, + 0, + 131072}); + this.numAddPrice.Location = new System.Drawing.Point(889, 72); + this.numAddPrice.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numAddPrice.Name = "numAddPrice"; + this.numAddPrice.Size = new System.Drawing.Size(44, 23); + this.numAddPrice.TabIndex = 613; + this.numAddPrice.Value = new decimal(new int[] { + 5, + 0, + 0, + 0}); + // + // label16 + // + this.label16.AutoSize = true; + this.label16.Location = new System.Drawing.Point(843, 75); + this.label16.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label16.Name = "label16"; + this.label16.Size = new System.Drawing.Size(48, 17); + this.label16.TabIndex = 612; + this.label16.Text = "倍 再加"; + // + // numAddPriceTimes + // + this.numAddPriceTimes.DecimalPlaces = 2; + this.numAddPriceTimes.Increment = new decimal(new int[] { + 1, + 0, + 0, + 131072}); + this.numAddPriceTimes.Location = new System.Drawing.Point(799, 72); + this.numAddPriceTimes.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numAddPriceTimes.Name = "numAddPriceTimes"; + this.numAddPriceTimes.Size = new System.Drawing.Size(44, 23); + this.numAddPriceTimes.TabIndex = 611; + this.numAddPriceTimes.Value = new decimal(new int[] { + 20, + 0, + 0, + 65536}); + // + // chkChangeSizeAndNumber + // + this.chkChangeSizeAndNumber.AutoSize = true; + this.chkChangeSizeAndNumber.Location = new System.Drawing.Point(6, 73); + this.chkChangeSizeAndNumber.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.chkChangeSizeAndNumber.Name = "chkChangeSizeAndNumber"; + this.chkChangeSizeAndNumber.Size = new System.Drawing.Size(159, 21); + this.chkChangeSizeAndNumber.TabIndex = 610; + this.chkChangeSizeAndNumber.Text = "修改包装尺寸和单品数量"; + this.chkChangeSizeAndNumber.UseVisualStyleBackColor = true; + // + // chkAddPrice + // + this.chkAddPrice.AutoSize = true; + this.chkAddPrice.Location = new System.Drawing.Point(755, 73); + this.chkAddPrice.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.chkAddPrice.Name = "chkAddPrice"; + this.chkAddPrice.Size = new System.Drawing.Size(51, 21); + this.chkAddPrice.TabIndex = 615; + this.chkAddPrice.Text = "加价"; + this.chkAddPrice.UseVisualStyleBackColor = true; + // // btnStop // this.btnStop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -850,15 +1214,15 @@ // this.splitContainer2.Panel2.Controls.Add(this.ucSplitPage1); this.splitContainer2.Panel2.Controls.Add(this.statusBar); - this.splitContainer2.Size = new System.Drawing.Size(1558, 564); - this.splitContainer2.SplitterDistance = 535; + this.splitContainer2.Size = new System.Drawing.Size(1558, 534); + this.splitContainer2.SplitterDistance = 505; this.splitContainer2.TabIndex = 0; // // pbLoading // this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None; this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue; - this.pbLoading.Location = new System.Drawing.Point(754, 242); + this.pbLoading.Location = new System.Drawing.Point(754, 227); this.pbLoading.Name = "pbLoading"; this.pbLoading.Size = new System.Drawing.Size(50, 50); this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -915,7 +1279,7 @@ this.dgvSelectProduct.ReadOnly = true; this.dgvSelectProduct.RowHeadersWidth = 40; this.dgvSelectProduct.RowTemplate.Height = 23; - this.dgvSelectProduct.Size = new System.Drawing.Size(1550, 535); + this.dgvSelectProduct.Size = new System.Drawing.Size(1550, 505); this.dgvSelectProduct.TabIndex = 190; this.dgvSelectProduct.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvSelectProduct_CellContentClick); this.dgvSelectProduct.Scroll += new System.Windows.Forms.ScrollEventHandler(this.dgvSelectProduct_Scroll); @@ -1172,9 +1536,22 @@ this.VisibleChanged += new System.EventHandler(this.ProductThirdSelectListManageForm_VisibleChanged); this.Controls.SetChildIndex(this.splitContainer1, 0); this.splitContainer1.Panel1.ResumeLayout(false); + this.splitContainer1.Panel1.PerformLayout(); this.splitContainer1.Panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); this.splitContainer1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.numUnitNum2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numUnitNum1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numWeight2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numWeight1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numHeight2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numHeight1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numWidth2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numWidth1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numLen2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numLen1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numAddPrice)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numAddPriceTimes)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pbFissionSetting)).EndInit(); this.tableLayoutPanel1.ResumeLayout(false); this.tableLayoutPanel1.PerformLayout(); @@ -1271,5 +1648,26 @@ private System.Windows.Forms.DataGridViewTextBoxColumn colOpResult; private DevComponents.DotNetBar.PanelEx btnExport; private DevComponents.DotNetBar.PanelEx btnStop; + private System.Windows.Forms.Label label21; + private System.Windows.Forms.NumericUpDown numUnitNum2; + private System.Windows.Forms.NumericUpDown numUnitNum1; + private System.Windows.Forms.Label label20; + private System.Windows.Forms.NumericUpDown numWeight2; + private System.Windows.Forms.NumericUpDown numWeight1; + private System.Windows.Forms.Label label19; + private System.Windows.Forms.NumericUpDown numHeight2; + private System.Windows.Forms.NumericUpDown numHeight1; + private System.Windows.Forms.Label label18; + private System.Windows.Forms.NumericUpDown numWidth2; + private System.Windows.Forms.NumericUpDown numWidth1; + private System.Windows.Forms.NumericUpDown numLen2; + private System.Windows.Forms.NumericUpDown numLen1; + private System.Windows.Forms.Label label15; + private System.Windows.Forms.Label label17; + private System.Windows.Forms.NumericUpDown numAddPrice; + private System.Windows.Forms.Label label16; + private System.Windows.Forms.NumericUpDown numAddPriceTimes; + private UserComponent.UcCheckBox chkChangeSizeAndNumber; + private UserComponent.UcCheckBox chkAddPrice; } } \ No newline at end of file diff --git a/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.cs b/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.cs index f9bcb46..474af8e 100644 --- a/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.cs +++ b/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.cs @@ -1199,6 +1199,23 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms } #endregion + int len = 30, width = 20, height = 10; // 300, 200, 100 + int weight = 500; //500000 + int numberOfPieces = 1; // 单品数量 + if (chkChangeSizeAndNumber.Checked) // 修改包装尺寸和单品数量 + { + //len = Randomx.GetId(62, 101); + //width = Randomx.GetId(61, len); + //height = Randomx.GetId(60, width); + //weight = Randomx.GetId(80000, 99999); + //numberOfPieces = Randomx.GetId(450, 601); + len = Randomx.GetId(numLen1.Value.ParseToInt(), numLen2.Value.ParseToInt() + 1); + width = Randomx.GetId(numWidth1.Value.ParseToInt(), Math.Min(len, numWidth2.Value.ParseToInt() + 1)); + height = Randomx.GetId(numHeight1.Value.ParseToInt(), Math.Min(width, numHeight2.Value.ParseToInt() + 1)); + weight = Randomx.GetId(numWeight1.Value.ParseToInt(), numWeight2.Value.ParseToInt() + 1); + numberOfPieces = Randomx.GetId(numUnitNum1.Value.ParseToInt(), numUnitNum2.Value.ParseToInt()); + } + int skuCount = 0; //foreach (var skuInfo in skcInfo.productSkuList) List skuListTmp = new List(); @@ -1244,6 +1261,30 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms JsonHelper.SerializeObject(skuInfo.productSkuMultiPack.productSkuNetContent)), skuClassification = skuInfo.productSkuMultiPack.skuClassification, }; + if (skuInfo.productSkuMultiPack.individuallyPacked != null) + { + skuItem.productSkuMultiPackReq = new ProductSkuMultiPackReq2() + { + skuClassification = skuInfo.productSkuMultiPack.skuClassification, + numberOfPieces = skuInfo.productSkuMultiPack.numberOfPieces, + pieceUnitCode = skuInfo.productSkuMultiPack.pieceUnitCode, + productSkuNetContentReq = JsonHelper.DeserializeJsonToObject( + JsonHelper.SerializeObject(skuInfo.productSkuMultiPack.productSkuNetContent)), + individuallyPacked = skuInfo.productSkuMultiPack.individuallyPacked.ParseToInt(), + }; + } + if (chkChangeSizeAndNumber.Checked) + { + skuItem.productSkuMultiPackReq = new ProductSkuMultiPackReq2() + { + skuClassification = 2, + numberOfPieces = numberOfPieces, + pieceUnitCode = skuInfo.productSkuMultiPack.pieceUnitCode, + productSkuNetContentReq = JsonHelper.DeserializeJsonToObject( + JsonHelper.SerializeObject(skuInfo.productSkuMultiPack.productSkuNetContent)), + individuallyPacked = 1, + }; + } skuItem.productSkuNonAuditExtAttrReq = JsonHelper.DeserializeJsonToObject( JsonHelper.SerializeObject(skuInfo.productSkuNonAuditExtAttr)); if (skuItem.productSkuNonAuditExtAttrReq == null) @@ -1311,8 +1352,19 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms productSkuWeightReq = JsonHelper.DeserializeJsonToObject( JsonHelper.SerializeObject(skuInfo.productSkuWhExtAttr.productSkuWeight)), }; + if (chkChangeSizeAndNumber.Checked) // 修改包装尺寸和单品数量 + { + skuItem.productSkuWhExtAttrReq.productSkuVolumeReq.len = len * 10; + skuItem.productSkuWhExtAttrReq.productSkuVolumeReq.width = width * 10; + skuItem.productSkuWhExtAttrReq.productSkuVolumeReq.height = height * 10; + skuItem.productSkuWhExtAttrReq.productSkuWeightReq.value = weight * 1000; + } skuItem.supplierPrice = skuInfo.supplierPrice; skuItem.supplierPrice += 1000; // 每个sku价格直接加10元去核价 + if (chkAddPrice.Checked) //自定义加价 + { + skuItem.supplierPrice = (skuInfo.supplierPrice * numAddPriceTimes.Value + numAddPrice.Value * 100).ParseToInt(); + } #region 使用随机sku价格上传(第一个sku价格不变，此处有bug，平台最后的sku排列不是按照提交上去的顺序排的) if (skuCount != 1 && chkSkuRandomPrice.Checked) diff --git a/TEMUKJD/KJDForms/ShopForms/ShopForm.cs b/TEMUKJD/KJDForms/ShopForms/ShopForm.cs index 72f9ee6..1db5e3e 100644 --- a/TEMUKJD/KJDForms/ShopForms/ShopForm.cs +++ b/TEMUKJD/KJDForms/ShopForms/ShopForm.cs @@ -126,7 +126,13 @@ namespace TemuKJD.KJDForms.ShopForms panel3.Controls.Add(f); f.AutoSize = true; f.Dock = DockStyle.Fill; - f.Show(); + try + { + f.Show(); + } + catch + { + } } private void ShopForm_Load(object sender, EventArgs e) diff --git a/TEMUKJD/KJDForms/ShopForms/ShopLoginForm.cs b/TEMUKJD/KJDForms/ShopForms/ShopLoginForm.cs index 2f7c8d8..08e328b 100644 --- a/TEMUKJD/KJDForms/ShopForms/ShopLoginForm.cs +++ b/TEMUKJD/KJDForms/ShopForms/ShopLoginForm.cs @@ -35,6 +35,8 @@ namespace TemuKJD.KJDForms.ShopForms } public partial class ShopLoginForm : LRBaseForm { + public static ShopLoginForm shopLoginInstance { get; set; } = null; + public int CloseAfterSecond { get; set; } public EnumOpenType openType = EnumOpenType.manage; public bool isMultiLogin = false; @@ -53,6 +55,12 @@ namespace TemuKJD.KJDForms.ShopForms public ShopLoginForm(ShopLoginInfo shopInfo) { + if (shopLoginInstance != null && !shopLoginInstance.IsDisposed) + { + shopLoginInstance.Dispose(); + } + shopLoginInstance = this; + InitializeComponent(); this.shop = shopInfo; diff --git a/TEMUKJD/KJDForms/ShopForms/Statistics/LRBaseFrom.cs b/TEMUKJD/KJDForms/ShopForms/Statistics/LRBaseFrom.cs new file mode 100644 index 0000000..2add82f --- /dev/null +++ b/TEMUKJD/KJDForms/ShopForms/Statistics/LRBaseFrom.cs @@ -0,0 +1,6 @@ +namespace TemuKJD.KJDForms.ShopForms.Statistics +{ + public class LRBaseFrom + { + } +} \ No newline at end of file diff --git a/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsDetailForm.Designer.cs b/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsDetailForm.Designer.cs index cbe55f5..ee1f43f 100644 --- a/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsDetailForm.Designer.cs +++ b/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsDetailForm.Designer.cs @@ -40,31 +40,27 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics this.btnGetNotGet = new DevComponents.DotNetBar.PanelEx(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); this.pbLoading = new System.Windows.Forms.PictureBox(); - this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx(); + this.dgvOrder = new TemuKJD.UserComponent.DataGridViewEx(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.colLoginStatus = new System.Windows.Forms.DataGridViewLinkColumn(); - this.colDetail = new System.Windows.Forms.DataGridViewLinkColumn(); - this.colShopLoginName = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colShopAccount = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colNotes = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colOnSaleProductNumber = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colSpu = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colSkc = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colProductSkcPic = new System.Windows.Forms.DataGridViewImageColumn(); this.colSaleVolume = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colTodayProfit = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colSevenDaysSaleVolume = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colSevenDaysProfit = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colThirtyDaysSaleVolume = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colThirtyDaysProfit = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colHighPriceLimitNumber = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colAboutToSellOutNumber = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colAdvicePrepareSkcNumber = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colYesterdayIncomeAmount = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colThisMonthIncomeAmount = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colProductValue = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colProductCost = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colAddDays = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colTotalSaleVolume = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colInCartVolume = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDiscount = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colScore = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colLastMonthIncomeAmount = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colAvailableBalance = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colMallDepositLimitAmount = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colWithdrawCashAmount = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); + this.colAvailableBalance = new System.Windows.Forms.DataGridViewLinkColumn(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -75,7 +71,7 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics this.splitContainer2.Panel2.SuspendLayout(); this.splitContainer2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dgvShop)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dgvOrder)).BeginInit(); this.SuspendLayout(); // // splitContainer1 @@ -193,7 +189,7 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics // this.splitContainer2.Panel1.BackColor = System.Drawing.Color.White; this.splitContainer2.Panel1.Controls.Add(this.pbLoading); - this.splitContainer2.Panel1.Controls.Add(this.dgvShop); + this.splitContainer2.Panel1.Controls.Add(this.dgvOrder); this.splitContainer2.Panel1.Padding = new System.Windows.Forms.Padding(4, 0, 4, 0); // // splitContainer2.Panel2 @@ -215,15 +211,15 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics this.pbLoading.TabStop = false; this.pbLoading.Visible = false; // - // dgvShop + // dgvOrder // - this.dgvShop.AllowUserToAddRows = false; - this.dgvShop.AllowUserToDeleteRows = false; + this.dgvOrder.AllowUserToAddRows = false; + this.dgvOrder.AllowUserToDeleteRows = false; dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; - this.dgvShop.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; - this.dgvShop.BackgroundColor = System.Drawing.Color.White; - this.dgvShop.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.dgvOrder.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + this.dgvOrder.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dgvOrder.BackgroundColor = System.Drawing.Color.White; + this.dgvOrder.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))); @@ -231,40 +227,50 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; - this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.dgvOrder.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; + this.dgvOrder.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dgvOrder.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colSelect, - this.colLoginStatus, - this.colDetail, - this.colShopLoginName, - this.colShopId, - this.colShopAccount, - this.colNotes, - this.colOnSaleProductNumber, + this.colSpu, + this.colSkc, + this.colProductSkcPic, this.colSaleVolume, this.colTodayProfit, this.colSevenDaysSaleVolume, this.colSevenDaysProfit, this.colThirtyDaysSaleVolume, this.colThirtyDaysProfit, - this.colHighPriceLimitNumber, - this.colAboutToSellOutNumber, - this.colAdvicePrepareSkcNumber, - this.colYesterdayIncomeAmount, - this.colThisMonthIncomeAmount, + this.colProductValue, + this.colProductCost, + this.colAddDays, + this.colTotalSaleVolume, + this.colInCartVolume, + this.colDiscount, + this.colScore, this.colLastMonthIncomeAmount, - this.colAvailableBalance, - this.colMallDepositLimitAmount, - this.colWithdrawCashAmount}); - this.dgvShop.Dock = System.Windows.Forms.DockStyle.Fill; - this.dgvShop.Location = new System.Drawing.Point(4, 0); - this.dgvShop.Name = "dgvShop"; - this.dgvShop.ReadOnly = true; - this.dgvShop.RowHeadersWidth = 36; - this.dgvShop.RowTemplate.Height = 23; - this.dgvShop.Size = new System.Drawing.Size(1356, 628); - this.dgvShop.TabIndex = 5; + this.colAvailableBalance}); + this.dgvOrder.Dock = System.Windows.Forms.DockStyle.Fill; + this.dgvOrder.Location = new System.Drawing.Point(4, 0); + this.dgvOrder.Name = "dgvOrder"; + this.dgvOrder.ReadOnly = true; + this.dgvOrder.RowHeadersWidth = 36; + this.dgvOrder.RowTemplate.Height = 23; + this.dgvOrder.Size = new System.Drawing.Size(1356, 628); + this.dgvOrder.TabIndex = 5; + this.dgvOrder.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvOrder_CellContentClick); + this.dgvOrder.Resize += new System.EventHandler(this.dgvShop_Resize); + // + // statusBar + // + this.statusBar.BackColor = System.Drawing.Color.White; + this.statusBar.Dock = System.Windows.Forms.DockStyle.Fill; + this.statusBar.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.statusBar.Location = new System.Drawing.Point(0, 0); + this.statusBar.Margin = new System.Windows.Forms.Padding(0); + this.statusBar.Name = "statusBar"; + this.statusBar.Size = new System.Drawing.Size(1364, 25); + this.statusBar.TabIndex = 1; + this.statusBar.Visible = false; // // colSelect // @@ -274,55 +280,32 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics this.colSelect.ReadOnly = true; this.colSelect.Resizable = System.Windows.Forms.DataGridViewTriState.True; this.colSelect.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colSelect.ThreeState = true; + this.colSelect.Visible = false; // - // colLoginStatus + // colSpu // - this.colLoginStatus.FillWeight = 35F; - this.colLoginStatus.HeaderText = "状态"; - this.colLoginStatus.Name = "colLoginStatus"; - this.colLoginStatus.ReadOnly = true; - this.colLoginStatus.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.colLoginStatus.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colSpu.FillWeight = 90F; + this.colSpu.HeaderText = "SPU"; + this.colSpu.Name = "colSpu"; + this.colSpu.ReadOnly = true; + this.colSpu.Visible = false; // - // colDetail + // colSkc // - this.colDetail.FillWeight = 35F; - this.colDetail.HeaderText = "详情"; - this.colDetail.Name = "colDetail"; - this.colDetail.ReadOnly = true; + this.colSkc.FillWeight = 80F; + this.colSkc.HeaderText = "SKC"; + this.colSkc.Name = "colSkc"; + this.colSkc.ReadOnly = true; // - // colShopLoginName + // colProductSkcPic // - this.colShopLoginName.FillWeight = 90F; - this.colShopLoginName.HeaderText = "店铺登录号码"; - this.colShopLoginName.Name = "colShopLoginName"; - this.colShopLoginName.ReadOnly = true; - // - // colShopId - // - this.colShopId.HeaderText = "店铺Id"; - this.colShopId.Name = "colShopId"; - this.colShopId.ReadOnly = true; - // - // colShopAccount - // - this.colShopAccount.HeaderText = "店铺名称"; - this.colShopAccount.Name = "colShopAccount"; - this.colShopAccount.ReadOnly = true; - // - // colNotes - // - this.colNotes.FillWeight = 90F; - this.colNotes.HeaderText = "备注/分组"; - this.colNotes.Name = "colNotes"; - this.colNotes.ReadOnly = true; - // - // colOnSaleProductNumber - // - this.colOnSaleProductNumber.FillWeight = 90F; - this.colOnSaleProductNumber.HeaderText = "在售商品数"; - this.colOnSaleProductNumber.Name = "colOnSaleProductNumber"; - this.colOnSaleProductNumber.ReadOnly = true; + this.colProductSkcPic.FillWeight = 20F; + this.colProductSkcPic.HeaderText = "图片"; + this.colProductSkcPic.Name = "colProductSkcPic"; + this.colProductSkcPic.ReadOnly = true; + this.colProductSkcPic.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colProductSkcPic.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; // // colSaleVolume // @@ -368,77 +351,67 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics this.colThirtyDaysProfit.ReadOnly = true; this.colThirtyDaysProfit.Visible = false; // - // colHighPriceLimitNumber + // colProductValue // - this.colHighPriceLimitNumber.HeaderText = "高价限流商品数"; - this.colHighPriceLimitNumber.Name = "colHighPriceLimitNumber"; - this.colHighPriceLimitNumber.ReadOnly = true; + this.colProductValue.FillWeight = 70F; + this.colProductValue.HeaderText = "货值"; + this.colProductValue.Name = "colProductValue"; + this.colProductValue.ReadOnly = true; // - // colAboutToSellOutNumber + // colProductCost // - this.colAboutToSellOutNumber.FillWeight = 75F; - this.colAboutToSellOutNumber.HeaderText = "即将售罄"; - this.colAboutToSellOutNumber.Name = "colAboutToSellOutNumber"; - this.colAboutToSellOutNumber.ReadOnly = true; - this.colAboutToSellOutNumber.Visible = false; + this.colProductCost.FillWeight = 70F; + this.colProductCost.HeaderText = "成本"; + this.colProductCost.Name = "colProductCost"; + this.colProductCost.ReadOnly = true; + this.colProductCost.Visible = false; // - // colAdvicePrepareSkcNumber + // colAddDays // - this.colAdvicePrepareSkcNumber.FillWeight = 75F; - this.colAdvicePrepareSkcNumber.HeaderText = "建议备货"; - this.colAdvicePrepareSkcNumber.Name = "colAdvicePrepareSkcNumber"; - this.colAdvicePrepareSkcNumber.ReadOnly = true; - this.colAdvicePrepareSkcNumber.Visible = false; + this.colAddDays.HeaderText = "加入站点时间"; + this.colAddDays.Name = "colAddDays"; + this.colAddDays.ReadOnly = true; // - // colYesterdayIncomeAmount + // colTotalSaleVolume // - this.colYesterdayIncomeAmount.HeaderText = "昨日到账金额"; - this.colYesterdayIncomeAmount.Name = "colYesterdayIncomeAmount"; - this.colYesterdayIncomeAmount.ReadOnly = true; + this.colTotalSaleVolume.FillWeight = 75F; + this.colTotalSaleVolume.HeaderText = "总销量"; + this.colTotalSaleVolume.Name = "colTotalSaleVolume"; + this.colTotalSaleVolume.ReadOnly = true; // - // colThisMonthIncomeAmount + // colInCartVolume // - this.colThisMonthIncomeAmount.HeaderText = "本月到账金额"; - this.colThisMonthIncomeAmount.Name = "colThisMonthIncomeAmount"; - this.colThisMonthIncomeAmount.ReadOnly = true; + this.colInCartVolume.HeaderText = "加购数量"; + this.colInCartVolume.Name = "colInCartVolume"; + this.colInCartVolume.ReadOnly = true; + // + // colDiscount + // + this.colDiscount.FillWeight = 40F; + this.colDiscount.HeaderText = "折扣"; + this.colDiscount.Name = "colDiscount"; + this.colDiscount.ReadOnly = true; + // + // colScore + // + this.colScore.FillWeight = 70F; + this.colScore.HeaderText = "品质分"; + this.colScore.Name = "colScore"; + this.colScore.ReadOnly = true; // // colLastMonthIncomeAmount // - this.colLastMonthIncomeAmount.HeaderText = "上月到账金额"; + this.colLastMonthIncomeAmount.HeaderText = "备注"; this.colLastMonthIncomeAmount.Name = "colLastMonthIncomeAmount"; this.colLastMonthIncomeAmount.ReadOnly = true; // // colAvailableBalance // - this.colAvailableBalance.FillWeight = 80F; - this.colAvailableBalance.HeaderText = "可提现余额"; + this.colAvailableBalance.FillWeight = 50F; + this.colAvailableBalance.HeaderText = "操作"; this.colAvailableBalance.Name = "colAvailableBalance"; this.colAvailableBalance.ReadOnly = true; - // - // colMallDepositLimitAmount - // - this.colMallDepositLimitAmount.HeaderText = "账户预留金额"; - this.colMallDepositLimitAmount.Name = "colMallDepositLimitAmount"; - this.colMallDepositLimitAmount.ReadOnly = true; - // - // colWithdrawCashAmount - // - this.colWithdrawCashAmount.FillWeight = 80F; - this.colWithdrawCashAmount.HeaderText = "提现总金额"; - this.colWithdrawCashAmount.Name = "colWithdrawCashAmount"; - this.colWithdrawCashAmount.ReadOnly = true; - // - // statusBar - // - this.statusBar.BackColor = System.Drawing.Color.White; - this.statusBar.Dock = System.Windows.Forms.DockStyle.Fill; - this.statusBar.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.statusBar.Location = new System.Drawing.Point(0, 0); - this.statusBar.Margin = new System.Windows.Forms.Padding(0); - this.statusBar.Name = "statusBar"; - this.statusBar.Size = new System.Drawing.Size(1364, 25); - this.statusBar.TabIndex = 1; - this.statusBar.Visible = false; + this.colAvailableBalance.Resizable = System.Windows.Forms.DataGridViewTriState.True; // // ShopOrderStatisticsDetailForm // @@ -447,7 +420,9 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics this.Controls.Add(this.splitContainer1); this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.MinimumSize = new System.Drawing.Size(800, 600); this.Name = "ShopOrderStatisticsDetailForm"; + this.ShowMaximizeBox = true; this.Text = "ShopOrderStatisticsDetailForm"; this.TitleText = "ShopOrderStatisticsDetailForm"; this.Load += new System.EventHandler(this.ShopOrderStatisticsDetailForm_Load); @@ -462,7 +437,7 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit(); this.splitContainer2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dgvShop)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dgvOrder)).EndInit(); this.ResumeLayout(false); } @@ -476,30 +451,26 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics private UserComponent.UcGroupBoxEx ucGroupBoxEx1; private System.Windows.Forms.SplitContainer splitContainer2; private System.Windows.Forms.PictureBox pbLoading; - private UserComponent.DataGridViewEx dgvShop; + private UserComponent.DataGridViewEx dgvOrder; + private UserControls.StatusBarUserControl statusBar; private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect; - private System.Windows.Forms.DataGridViewLinkColumn colLoginStatus; - private System.Windows.Forms.DataGridViewLinkColumn colDetail; - private System.Windows.Forms.DataGridViewTextBoxColumn colShopLoginName; - private System.Windows.Forms.DataGridViewTextBoxColumn colShopId; - private System.Windows.Forms.DataGridViewTextBoxColumn colShopAccount; - private System.Windows.Forms.DataGridViewTextBoxColumn colNotes; - private System.Windows.Forms.DataGridViewTextBoxColumn colOnSaleProductNumber; + private System.Windows.Forms.DataGridViewTextBoxColumn colSpu; + private System.Windows.Forms.DataGridViewTextBoxColumn colSkc; + private System.Windows.Forms.DataGridViewImageColumn colProductSkcPic; private System.Windows.Forms.DataGridViewTextBoxColumn colSaleVolume; private System.Windows.Forms.DataGridViewTextBoxColumn colTodayProfit; private System.Windows.Forms.DataGridViewTextBoxColumn colSevenDaysSaleVolume; private System.Windows.Forms.DataGridViewTextBoxColumn colSevenDaysProfit; private System.Windows.Forms.DataGridViewTextBoxColumn colThirtyDaysSaleVolume; private System.Windows.Forms.DataGridViewTextBoxColumn colThirtyDaysProfit; - private System.Windows.Forms.DataGridViewTextBoxColumn colHighPriceLimitNumber; - private System.Windows.Forms.DataGridViewTextBoxColumn colAboutToSellOutNumber; - private System.Windows.Forms.DataGridViewTextBoxColumn colAdvicePrepareSkcNumber; - private System.Windows.Forms.DataGridViewTextBoxColumn colYesterdayIncomeAmount; - private System.Windows.Forms.DataGridViewTextBoxColumn colThisMonthIncomeAmount; + private System.Windows.Forms.DataGridViewTextBoxColumn colProductValue; + private System.Windows.Forms.DataGridViewTextBoxColumn colProductCost; + private System.Windows.Forms.DataGridViewTextBoxColumn colAddDays; + private System.Windows.Forms.DataGridViewTextBoxColumn colTotalSaleVolume; + private System.Windows.Forms.DataGridViewTextBoxColumn colInCartVolume; + private System.Windows.Forms.DataGridViewTextBoxColumn colDiscount; + private System.Windows.Forms.DataGridViewTextBoxColumn colScore; private System.Windows.Forms.DataGridViewTextBoxColumn colLastMonthIncomeAmount; - private System.Windows.Forms.DataGridViewTextBoxColumn colAvailableBalance; - private System.Windows.Forms.DataGridViewTextBoxColumn colMallDepositLimitAmount; - private System.Windows.Forms.DataGridViewTextBoxColumn colWithdrawCashAmount; - private UserControls.StatusBarUserControl statusBar; + private System.Windows.Forms.DataGridViewLinkColumn colAvailableBalance; } } \ No newline at end of file diff --git a/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsDetailForm.cs b/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsDetailForm.cs index b35ac96..611f395 100644 --- a/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsDetailForm.cs +++ b/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsDetailForm.cs @@ -1,4 +1,5 @@ using AllBase.Model.Result; +using NaiBa.Util.Extension; using System; using System.Collections.Generic; using System.ComponentModel; @@ -14,18 +15,114 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics { public partial class ShopOrderStatisticsDetailForm : LRBaseForm { + public static ShopOrderStatisticsDetailForm orderStatisticsDetailInstance = null; + + public List lstSubOrderInfo = new List(); ShopLoginInfo shop = null; - public ShopOrderStatisticsDetailForm(ShopLoginInfo shopInfo) + public ShopOrderStatisticsDetailForm(ShopLoginInfo shopInfo, List subOrderInfoLst = null) { + if (orderStatisticsDetailInstance != null && !orderStatisticsDetailInstance.IsDisposed) + { + orderStatisticsDetailInstance.Dispose(); + orderStatisticsDetailInstance = null; + } + orderStatisticsDetailInstance = this; + InitializeComponent(); if (shopInfo != null) shop = shopInfo; + if (subOrderInfoLst != null) + lstSubOrderInfo.AddRange(subOrderInfoLst); + } + + public void SetOrderInfo(List subOrderInfoLst) + { + if (subOrderInfoLst == null) + subOrderInfoLst = new List(); + + lstSubOrderInfo.Clear(); + lstSubOrderInfo.AddRange(subOrderInfoLst); + + this.ShowOrderList(); } private void ShopOrderStatisticsDetailForm_Load(object sender, EventArgs e) { - this.dgvShop.Focus(); + this.TitleText = shop?.ShopId + " - " + shop?.ShopAccount + " - 订单详情"; + this.ShowOrderList(); + } + + private void dgvShop_Resize(object sender, EventArgs e) + { + var fillWeight = 0f; + foreach (DataGridViewColumn column in this.dgvOrder.Columns) + { + if (column.Visible == true && column.Name != "colProductSkcPic") + fillWeight += column.FillWeight; + } + this.dgvOrder.Columns["colProductSkcPic"].FillWeight = 50f * fillWeight / (this.dgvOrder.Width - 50); + } + + public void ShowOrderList() + { + foreach (WarehouseProductSubOrderInfo order in lstSubOrderInfo) + { + this.dgvOrder.Rows.Add( + false, + order.productId, + order.productSkcId, + defaultBitmap, + order.skuQuantityTotalInfo.todaySaleVolume, + order.skuQuantityTotalInfo.todayProfit.Value.ToString("0.00"), + order.skuQuantityTotalInfo.lastSevenDaysSaleVolume, + order.skuQuantityTotalInfo.sevenDaysProfit.Value.ToString("0.00"), + order.skuQuantityTotalInfo.lastThirtyDaysSaleVolume, + order.skuQuantityTotalInfo.thirtyDaysProfit.Value.ToString("0.00"), + order.skuQuantityTotalInfo.goodsValue * 0.01m, + order.skuQuantityTotalInfo.goodsCost * 0.01m, + order.onSalesDurationOffline, // 加入站点时间 + order.skuQuantityTotalInfo.totalSaleVolume, //总销量 + order.skuQuantityTotalInfo.inCardNumber, //加购数量 + order.discount.ParseToDecimal() * 0.01m, + order.goodsAfsScore == null ? null : order.goodsAfsScore?.ToString("f2"), //品质分 + "", //备注 + "设置进价" + ); + } + } + + Bitmap defaultBitmap = new Bitmap(50, 50); + + private void dgvOrder_CellContentClick(object sender, DataGridViewCellEventArgs e) + { + if (e.ColumnIndex < 0 || e.RowIndex < 0) + return; + string headerText = dgvOrder.Columns[e.ColumnIndex].HeaderText; + string orderProdId = dgvOrder.Rows[e.RowIndex].Cells["colSpu"].Value.ParseToString(); + WarehouseProductSubOrderInfo order = lstSubOrderInfo.FirstOrDefault(o=>o.productId.ParseToString() == orderProdId); + + switch (headerText) + { + case "检测": + break; + case "操作": + { + if (shop != null) + { + var subOrders = lstSubOrderInfo.Where(o => o.supplierId.ParseToString() == shop.ShopId).ToList(); + ShopSetPurchasePriceForm detailForm = new ShopSetPurchasePriceForm(shop, order); + detailForm.ShowDialog(); + } + } + break; + + case "状态": + break; + default: + //dgvShop.Rows[e.RowIndex].Cells["colSelect"].Value = !(bool)dgvShop.Rows[e.RowIndex].Cells["colSelect"].Value; + break; + } } } } diff --git a/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsDetailForm.resx b/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsDetailForm.resx index d40e6c9..b7f0844 100644 --- a/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsDetailForm.resx +++ b/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsDetailForm.resx @@ -120,25 +120,13 @@ True - + True - + True - - True - - - True - - - True - - - True - - + True @@ -159,19 +147,25 @@ True - + True - + True - + True - + True - + + True + + + True + + True @@ -180,12 +174,6 @@ True - - True - - - True - diff --git a/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsForm.cs b/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsForm.cs index d0380a7..80e0df6 100644 --- a/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsForm.cs +++ b/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsForm.cs @@ -15,6 +15,7 @@ using System.Threading.Tasks; using System.Windows.Forms; using TemuKJD.Extension; using TemuKJD.KJDForms.BaseForms; +using Work; namespace TemuKJD.KJDForms.ShopForms.Statistics { @@ -155,11 +156,11 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics shopEntity.Notes, statistics.onSaleProductNumber == null ? "-" : statistics.onSaleProductNumber.ToString(), //在售商品数 statistics.saleVolume == null ? "-" : statistics.saleVolume.ToString(), //今日销量 - statistics.todayProfit == null ? "-" : statistics.todayProfit.ToString(), //今日日利润 + statistics.todayProfit == null ? "-" : statistics.todayProfit.Value.ToString("0.00"), //今日日利润 statistics.sevenDaysSaleVolume == null ? "-" : statistics.sevenDaysSaleVolume.ToString(), //7日销量 - statistics.sevenDaysProfit == null ? "-" : statistics.sevenDaysProfit.ToString(), //7日利润 + statistics.sevenDaysProfit == null ? "-" : statistics.sevenDaysProfit.Value.ToString("0.00"), //7日利润 statistics.thirtyDaysSaleVolume == null ? "-" : statistics.thirtyDaysSaleVolume.ToString(), //30日销量 - statistics.thirtyDaysProfit == null ? "-" : statistics.thirtyDaysProfit.ToString(), //30日利润 + statistics.thirtyDaysProfit == null ? "-" : statistics.thirtyDaysProfit.Value.ToString("0.00"), //30日利润 statistics.highPriceLimitNumber == null ? "-" : statistics.highPriceLimitNumber.ToString(), //高价限流商品数 statistics.aboutToSellOutNumber == null ? "-" : statistics.aboutToSellOutNumber.ToString(), //即将售罄 statistics.advicePrepareSkcNumber == null ? "-" : statistics.advicePrepareSkcNumber.ToString(), //建议备货 @@ -191,11 +192,11 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics row.Cells["colNotes"].Value = shopEntity.Notes; row.Cells["colOnSaleProductNumber"].Value = statistics.onSaleProductNumber == null ? "-" : statistics.onSaleProductNumber.ToString(); //在售商品数 row.Cells["colSaleVolume"].Value = statistics.saleVolume == null ? "-" : statistics.saleVolume.ToString(); //今日销量 - row.Cells["colTodayProfit"].Value = statistics.todayProfit == null ? "-" : statistics.todayProfit.ToString(); //今日利润 + row.Cells["colTodayProfit"].Value = statistics.todayProfit == null ? "-" : statistics.todayProfit.Value.ToString("0.00"); //今日利润 row.Cells["colSevenDaysSaleVolume"].Value = statistics.sevenDaysSaleVolume == null ? "-" : statistics.sevenDaysSaleVolume.ToString(); //7日销量 - row.Cells["colSevenDaysProfit"].Value = statistics.sevenDaysProfit == null ? "-" : statistics.sevenDaysProfit.ToString(); //7日利润 + row.Cells["colSevenDaysProfit"].Value = statistics.sevenDaysProfit == null ? "-" : statistics.sevenDaysProfit.Value.ToString("0.00"); //7日利润 row.Cells["colThirtyDaysSaleVolume"].Value = statistics.thirtyDaysSaleVolume == null ? "-" : statistics.thirtyDaysSaleVolume.ToString(); //30日销量 - row.Cells["colThirtyDaysProfit"].Value = statistics.thirtyDaysProfit == null ? "-" : statistics.thirtyDaysProfit.ToString(); //30日利润 + row.Cells["colThirtyDaysProfit"].Value = statistics.thirtyDaysProfit == null ? "-" : statistics.thirtyDaysProfit.Value.ToString("0.00"); //30日利润 row.Cells["colHighPriceLimitNumber"].Value = statistics.highPriceLimitNumber == null ? "-" : statistics.highPriceLimitNumber.ToString(); //高价限流商品数 row.Cells["colAboutToSellOutNumber"].Value = statistics.aboutToSellOutNumber == null ? "-" : statistics.aboutToSellOutNumber.ToString(); //即将售罄 row.Cells["colAdvicePrepareSkcNumber"].Value = statistics.advicePrepareSkcNumber == null ? "-" : statistics.advicePrepareSkcNumber.ToString(); //建议备货 @@ -425,14 +426,34 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics int num30 = 0; foreach (var prodOrder in orderInfoLstTmp) { + prodOrder.skuQuantityTotalInfo.goodsValue = 0; + prodOrder.skuQuantityTotalInfo.goodsCost = 0; + prodOrder.skuQuantityTotalInfo.todayProfit = 0; + prodOrder.skuQuantityTotalInfo.sevenDaysProfit = 0; + prodOrder.skuQuantityTotalInfo.thirtyDaysProfit = 0; foreach (var sku in prodOrder.skuQuantityDetailList) { + var discount = prodOrder.discount.ParseToInt() * 0.01m; + sku.goodsValue = sku.supplierPrice.ParseToInt() * (sku.inventoryNumInfo?.warehouseInventoryNum).ParseToInt(); + sku.goodsValue = (sku.goodsValue * 0.01m * discount).ParseToInt(); // sku货值 = 单价 * 数量 * 乘以折扣 + sku.goodsCost = sku.purchasePrice * (sku.inventoryNumInfo?.warehouseInventoryNum).ParseToInt(); + prodOrder.skuQuantityTotalInfo.goodsValue += sku.goodsValue; // 合计得到总货值 + prodOrder.skuQuantityTotalInfo.goodsCost += sku.goodsCost; + + sku.todayProfit = 0.01m * sku.todaySaleVolume.ParseToInt() * (sku.supplierPrice.ParseToInt() * discount - sku.purchasePrice); + prodOrder.skuQuantityTotalInfo.todayProfit += sku.todayProfit; + sku.sevenDaysProfit = 0.01m * sku.lastSevenDaysSaleVolume.ParseToInt() * (sku.supplierPrice.ParseToInt() * discount - sku.purchasePrice); + prodOrder.skuQuantityTotalInfo.sevenDaysProfit += sku.sevenDaysProfit; + sku.thirtyDaysProfit = 0.01m * sku.lastThirtyDaysSaleVolume.ParseToInt() * (sku.supplierPrice.ParseToInt() * discount - sku.purchasePrice); + prodOrder.skuQuantityTotalInfo.thirtyDaysProfit += sku.thirtyDaysProfit; + num += sku.todaySaleVolume.ParseToInt(); num7 += sku.lastSevenDaysSaleVolume.ParseToInt(); num30 += sku.lastThirtyDaysSaleVolume.ParseToInt(); - statistics.todayProfit += 0.01m * sku.todaySaleVolume.ParseToInt() * (sku.supplierPrice.ParseToInt() - sku.purchasePrice); - statistics.sevenDaysProfit += 0.01m * sku.lastSevenDaysSaleVolume.ParseToInt() * (sku.supplierPrice.ParseToInt() - sku.purchasePrice); - statistics.thirtyDaysProfit += 0.01m * sku.lastThirtyDaysSaleVolume.ParseToInt() * (sku.supplierPrice.ParseToInt() - sku.purchasePrice); + statistics.todayProfit += sku.todayProfit; + statistics.sevenDaysProfit += sku.sevenDaysProfit; + statistics.thirtyDaysProfit += sku.lastThirtyDaysSaleVolume; + } } } @@ -552,6 +573,41 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics order.goodsAfsScore = qualityInfo.goodsAfsScore; } //--------------------------------------------------------------------------------------- + //--------------------------------------------------------------------------------------- + var purchasePriceList = GetPurchasePrice(subOrderInfoLstTmp.Select(o => o.productId.ParseToString()).ToList()); + foreach (var pPrice in purchasePriceList) + { + pPrice.dbSkuPurchasePriceList = JsonHelper.DeserializeJsonToList(pPrice.sku_purchase_price_json); + if (pPrice.dbSkuPurchasePriceList == null) + pPrice.dbSkuPurchasePriceList = new List(); + } + foreach (var purchasePrice in purchasePriceList) + { + var order = subOrderInfoLstTmp.FirstOrDefault(o => o.productId.ParseToString() == purchasePrice.spu_id); + if (order != null) + { + //order.hasDbPurchasePrice = true; + order.purchasePriceInfo = purchasePrice; + order.discount = purchasePrice.discount; + foreach (var sku in order.skuQuantityDetailList) + { + var purchaseSku = purchasePrice.dbSkuPurchasePriceList.FirstOrDefault(s => s.productSkuId == sku.productSkuId); + if (purchaseSku != null) + { + sku.purchasePrice = purchaseSku.purchasePriceValue.ParseToInt(); + } + } + } + } + foreach (var order in subOrderInfoLstTmp) + { + foreach (var sku in order.skuQuantityDetailList) + { + if (sku.purchasePrice == 0) + sku.purchasePrice = sku.supplierPrice.ParseToInt(); + } + } + //--------------------------------------------------------------------------------------- lstSubOrderInfo.AddRange(subOrderInfoLstTmp); int total = BaseRegex.GetStringJson(ref html, "total").ParseToInt(); @@ -657,8 +713,12 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics case "详情": IsOperate = true; { - ShopOrderStatisticsDetailForm detailForm = new ShopOrderStatisticsDetailForm(shop); - detailForm.ShowDialog(); + if (shop != null) + { + var subOrders = lstSubOrderInfo.Where(o => o.supplierId.ParseToString() == shop.ShopId).ToList(); + ShopOrderStatisticsDetailForm detailForm = new ShopOrderStatisticsDetailForm(shop, subOrders); + detailForm.Show(); + } IsOperate = false; } break; @@ -728,5 +788,38 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics this.pbLoading.Visible = true; GetShopStatistics(shopList, reGetShopIds); } + + List GetPurchasePrice(List productIdList) + { + List list = new List(); + + for (int i = 0; i < productIdList.Count; i++) + { + productIdList[i] = productIdList[i].Replace(",", "").Replace("'", "").Replace("\"", ""); + } + var url = BaseClass.BuildObjString("price/get_purchase_price_list"); + var data = UserLogin.GetSignaturex(); + data += "&page=1"; + data += "&page_size=" + productIdList.Count; + data += "&in_spu_id=" + string.Join(",", productIdList); + 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")) + { + return list; + } + + if (!html.Contains("data")) + return list; + + var jArr = JObject.Parse(html)["data"]; + if (jArr.Count() == 0) + return list; + + return JsonHelper.DeserializeJsonToList(jArr.ToString()); + } } } diff --git a/TEMUKJD/KJDForms/ShopForms/Statistics/ShopSetPurchasePriceForm.Designer.cs b/TEMUKJD/KJDForms/ShopForms/Statistics/ShopSetPurchasePriceForm.Designer.cs new file mode 100644 index 0000000..0641630 --- /dev/null +++ b/TEMUKJD/KJDForms/ShopForms/Statistics/ShopSetPurchasePriceForm.Designer.cs @@ -0,0 +1,479 @@ + +namespace TemuKJD.KJDForms.ShopForms.Statistics +{ + partial class ShopSetPurchasePriceForm + { + /// + /// 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() + { + this.components = new System.ComponentModel.Container(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ShopSetPurchasePriceForm)); + this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.numDiscount = new System.Windows.Forms.NumericUpDown(); + this.btnMultiChangePurchasePrice = new DevComponents.DotNetBar.PanelEx(); + this.numericUpDown1 = new System.Windows.Forms.NumericUpDown(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.splitContainer2 = new System.Windows.Forms.SplitContainer(); + this.ucGroupBoxEx3 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); + this.pbLoading = new System.Windows.Forms.PictureBox(); + this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); + this.btnGetSelect = new DevComponents.DotNetBar.PanelEx(); + this.btnGetNotGet = new DevComponents.DotNetBar.PanelEx(); + this.dgvOrder = new TemuKJD.UserComponent.DataGridViewEx(); + this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.colSpu = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colSkc = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colSkuId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colSkuName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colSkuPrice = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colSkuPurchasePrice = new DevComponents.DotNetBar.Controls.DataGridViewDoubleInputColumn(); + this.colAvailableBalance = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.btnSave = new DevComponents.DotNetBar.PanelEx(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); + this.splitContainer1.Panel1.SuspendLayout(); + this.splitContainer1.Panel2.SuspendLayout(); + this.splitContainer1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numDiscount)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit(); + this.splitContainer2.Panel1.SuspendLayout(); + this.splitContainer2.Panel2.SuspendLayout(); + this.splitContainer2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).BeginInit(); + this.ucGroupBoxEx1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dgvOrder)).BeginInit(); + this.SuspendLayout(); + // + // splitContainer1 + // + this.splitContainer1.BackColor = System.Drawing.Color.White; + this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; + this.splitContainer1.Location = new System.Drawing.Point(1, 33); + this.splitContainer1.Name = "splitContainer1"; + this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal; + // + // splitContainer1.Panel1 + // + this.splitContainer1.Panel1.Controls.Add(this.numDiscount); + this.splitContainer1.Panel1.Controls.Add(this.btnMultiChangePurchasePrice); + this.splitContainer1.Panel1.Controls.Add(this.numericUpDown1); + this.splitContainer1.Panel1.Controls.Add(this.label1); + this.splitContainer1.Panel1.Controls.Add(this.label2); + // + // splitContainer1.Panel2 + // + this.splitContainer1.Panel2.Controls.Add(this.splitContainer2); + this.splitContainer1.Panel2.Margin = new System.Windows.Forms.Padding(4); + this.splitContainer1.Size = new System.Drawing.Size(654, 550); + this.splitContainer1.SplitterDistance = 66; + this.splitContainer1.TabIndex = 36; + this.splitContainer1.TabStop = false; + // + // numDiscount + // + this.numDiscount.DecimalPlaces = 2; + this.numDiscount.Increment = new decimal(new int[] { + 1, + 0, + 0, + 65536}); + this.numDiscount.Location = new System.Drawing.Point(70, 21); + this.numDiscount.Maximum = new decimal(new int[] { + 99999, + 0, + 0, + 0}); + this.numDiscount.Name = "numDiscount"; + this.numDiscount.Size = new System.Drawing.Size(67, 23); + this.numDiscount.TabIndex = 443; + // + // btnMultiChangePurchasePrice + // + this.btnMultiChangePurchasePrice.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnMultiChangePurchasePrice.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnMultiChangePurchasePrice.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnMultiChangePurchasePrice.DisabledBackColor = System.Drawing.Color.Empty; + this.btnMultiChangePurchasePrice.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnMultiChangePurchasePrice.Location = new System.Drawing.Point(562, 21); + this.btnMultiChangePurchasePrice.Name = "btnMultiChangePurchasePrice"; + this.btnMultiChangePurchasePrice.Size = new System.Drawing.Size(80, 23); + this.btnMultiChangePurchasePrice.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnMultiChangePurchasePrice.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnMultiChangePurchasePrice.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnMultiChangePurchasePrice.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnMultiChangePurchasePrice.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnMultiChangePurchasePrice.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnMultiChangePurchasePrice.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnMultiChangePurchasePrice.Style.GradientAngle = 90; + this.btnMultiChangePurchasePrice.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnMultiChangePurchasePrice.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnMultiChangePurchasePrice.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnMultiChangePurchasePrice.TabIndex = 439; + this.btnMultiChangePurchasePrice.Text = "批量修改"; + this.btnMultiChangePurchasePrice.Click += new System.EventHandler(this.btnMultiChangePurchasePrice_Click); + // + // numericUpDown1 + // + this.numericUpDown1.DecimalPlaces = 2; + this.numericUpDown1.Location = new System.Drawing.Point(425, 21); + this.numericUpDown1.Maximum = new decimal(new int[] { + 99999, + 0, + 0, + 0}); + this.numericUpDown1.Name = "numericUpDown1"; + this.numericUpDown1.Size = new System.Drawing.Size(134, 23); + this.numericUpDown1.TabIndex = 0; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(359, 24); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(68, 17); + this.label1.TabIndex = 440; + this.label1.Text = "SKU进货价"; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(15, 24); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(56, 17); + this.label2.TabIndex = 444; + this.label2.Text = "活动折扣"; + // + // splitContainer2 + // + this.splitContainer2.BackColor = System.Drawing.Color.White; + this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer2.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; + this.splitContainer2.Location = new System.Drawing.Point(0, 0); + this.splitContainer2.Name = "splitContainer2"; + this.splitContainer2.Orientation = System.Windows.Forms.Orientation.Horizontal; + // + // splitContainer2.Panel1 + // + this.splitContainer2.Panel1.BackColor = System.Drawing.Color.White; + this.splitContainer2.Panel1.Controls.Add(this.ucGroupBoxEx3); + this.splitContainer2.Panel1.Controls.Add(this.pbLoading); + this.splitContainer2.Panel1.Controls.Add(this.ucGroupBoxEx1); + this.splitContainer2.Panel1.Controls.Add(this.dgvOrder); + this.splitContainer2.Panel1.Padding = new System.Windows.Forms.Padding(12, 0, 12, 0); + // + // splitContainer2.Panel2 + // + this.splitContainer2.Panel2.Controls.Add(this.btnSave); + this.splitContainer2.Size = new System.Drawing.Size(654, 480); + this.splitContainer2.SplitterDistance = 434; + this.splitContainer2.TabIndex = 0; + // + // ucGroupBoxEx3 + // + this.ucGroupBoxEx3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Right))); + this.ucGroupBoxEx3.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.ucGroupBoxEx3.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx3.Location = new System.Drawing.Point(519, 351); + this.ucGroupBoxEx3.Name = "ucGroupBoxEx3"; + this.ucGroupBoxEx3.Size = new System.Drawing.Size(103, 49); + this.ucGroupBoxEx3.TabIndex = 668; + this.ucGroupBoxEx3.TabStop = false; + this.ucGroupBoxEx3.Text = "统计查询"; + this.ucGroupBoxEx3.Visible = false; + // + // pbLoading + // + this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None; + this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue; + this.pbLoading.Location = new System.Drawing.Point(302, 192); + this.pbLoading.Name = "pbLoading"; + this.pbLoading.Size = new System.Drawing.Size(50, 50); + this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pbLoading.TabIndex = 6; + this.pbLoading.TabStop = false; + this.pbLoading.Visible = false; + // + // ucGroupBoxEx1 + // + this.ucGroupBoxEx1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx1.Controls.Add(this.btnGetSelect); + this.ucGroupBoxEx1.Controls.Add(this.btnGetNotGet); + this.ucGroupBoxEx1.Location = new System.Drawing.Point(320, 351); + this.ucGroupBoxEx1.Name = "ucGroupBoxEx1"; + this.ucGroupBoxEx1.Size = new System.Drawing.Size(198, 49); + this.ucGroupBoxEx1.TabIndex = 667; + this.ucGroupBoxEx1.TabStop = false; + this.ucGroupBoxEx1.Text = "统计汇总"; + this.ucGroupBoxEx1.Visible = false; + // + // btnGetSelect + // + this.btnGetSelect.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnGetSelect.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnGetSelect.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnGetSelect.DisabledBackColor = System.Drawing.Color.Empty; + this.btnGetSelect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnGetSelect.Location = new System.Drawing.Point(112, 10); + this.btnGetSelect.Name = "btnGetSelect"; + this.btnGetSelect.Size = new System.Drawing.Size(80, 23); + this.btnGetSelect.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnGetSelect.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnGetSelect.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnGetSelect.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnGetSelect.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnGetSelect.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnGetSelect.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnGetSelect.Style.GradientAngle = 90; + this.btnGetSelect.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnGetSelect.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnGetSelect.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnGetSelect.TabIndex = 427; + this.btnGetSelect.Text = "查询选中"; + // + // btnGetNotGet + // + this.btnGetNotGet.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnGetNotGet.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnGetNotGet.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnGetNotGet.DisabledBackColor = System.Drawing.Color.Empty; + this.btnGetNotGet.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnGetNotGet.Location = new System.Drawing.Point(26, 10); + this.btnGetNotGet.Name = "btnGetNotGet"; + this.btnGetNotGet.Size = new System.Drawing.Size(80, 23); + this.btnGetNotGet.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnGetNotGet.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnGetNotGet.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnGetNotGet.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnGetNotGet.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnGetNotGet.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnGetNotGet.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnGetNotGet.Style.GradientAngle = 90; + this.btnGetNotGet.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnGetNotGet.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnGetNotGet.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnGetNotGet.TabIndex = 431; + this.btnGetNotGet.Text = "查询未获取"; + // + // dgvOrder + // + this.dgvOrder.AllowUserToAddRows = false; + this.dgvOrder.AllowUserToDeleteRows = false; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvOrder.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + this.dgvOrder.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dgvOrder.BackgroundColor = System.Drawing.Color.White; + this.dgvOrder.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.dgvOrder.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; + this.dgvOrder.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dgvOrder.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.colSelect, + this.colSpu, + this.colSkc, + this.colSkuId, + this.colSkuName, + this.colSkuPrice, + this.colSkuPurchasePrice, + this.colAvailableBalance}); + this.dgvOrder.Dock = System.Windows.Forms.DockStyle.Fill; + this.dgvOrder.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter; + this.dgvOrder.Location = new System.Drawing.Point(12, 0); + this.dgvOrder.Name = "dgvOrder"; + this.dgvOrder.RowHeadersWidth = 36; + this.dgvOrder.RowTemplate.Height = 23; + this.dgvOrder.Size = new System.Drawing.Size(630, 434); + this.dgvOrder.TabIndex = 5; + // + // colSelect + // + this.colSelect.FillWeight = 28F; + this.colSelect.HeaderText = "选"; + this.colSelect.Name = "colSelect"; + this.colSelect.ReadOnly = true; + this.colSelect.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colSelect.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colSelect.ThreeState = true; + this.colSelect.Visible = false; + // + // colSpu + // + this.colSpu.FillWeight = 90F; + this.colSpu.HeaderText = "SPU"; + this.colSpu.Name = "colSpu"; + this.colSpu.ReadOnly = true; + this.colSpu.Visible = false; + // + // colSkc + // + this.colSkc.FillWeight = 80F; + this.colSkc.HeaderText = "SKC"; + this.colSkc.Name = "colSkc"; + this.colSkc.ReadOnly = true; + this.colSkc.Visible = false; + // + // colSkuId + // + this.colSkuId.FillWeight = 75F; + this.colSkuId.HeaderText = "SKU编号"; + this.colSkuId.Name = "colSkuId"; + this.colSkuId.ReadOnly = true; + // + // colSkuName + // + this.colSkuName.FillWeight = 75F; + this.colSkuName.HeaderText = "SKU名称"; + this.colSkuName.Name = "colSkuName"; + this.colSkuName.ReadOnly = true; + // + // colSkuPrice + // + this.colSkuPrice.FillWeight = 75F; + this.colSkuPrice.HeaderText = "SKU申报价"; + this.colSkuPrice.Name = "colSkuPrice"; + this.colSkuPrice.ReadOnly = true; + // + // colSkuPurchasePrice + // + // + // + // + this.colSkuPurchasePrice.BackgroundStyle.Class = "DataGridViewNumericBorder"; + this.colSkuPurchasePrice.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.colSkuPurchasePrice.DefaultCellStyle = dataGridViewCellStyle3; + this.colSkuPurchasePrice.DisplayControlForCurrentCellOnly = false; + this.colSkuPurchasePrice.FillWeight = 75F; + this.colSkuPurchasePrice.HeaderText = "SKU进货价"; + this.colSkuPurchasePrice.Increment = 1D; + this.colSkuPurchasePrice.Name = "colSkuPurchasePrice"; + this.colSkuPurchasePrice.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colSkuPurchasePrice.ShowUpDown = true; + // + // colAvailableBalance + // + this.colAvailableBalance.FillWeight = 60F; + this.colAvailableBalance.HeaderText = "操作"; + this.colAvailableBalance.Name = "colAvailableBalance"; + this.colAvailableBalance.ReadOnly = true; + this.colAvailableBalance.Visible = false; + // + // btnSave + // + this.btnSave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnSave.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnSave.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnSave.DisabledBackColor = System.Drawing.Color.Empty; + this.btnSave.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnSave.Location = new System.Drawing.Point(562, 3); + this.btnSave.Name = "btnSave"; + this.btnSave.Size = new System.Drawing.Size(80, 23); + this.btnSave.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnSave.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnSave.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnSave.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnSave.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnSave.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnSave.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnSave.Style.GradientAngle = 90; + this.btnSave.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnSave.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnSave.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnSave.TabIndex = 435; + this.btnSave.Text = "保存"; + this.btnSave.Click += new System.EventHandler(this.btnSave_Click); + // + // ShopSetPurchasePriceForm + // + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; + this.ClientSize = new System.Drawing.Size(656, 584); + this.Controls.Add(this.splitContainer1); + this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.Name = "ShopSetPurchasePriceForm"; + this.Text = "ShopSetPurchasePriceForm"; + this.TitleText = "ShopSetPurchasePriceForm"; + this.Load += new System.EventHandler(this.ShopSetPurchasePriceForm_Load); + this.Controls.SetChildIndex(this.splitContainer1, 0); + this.splitContainer1.Panel1.ResumeLayout(false); + this.splitContainer1.Panel1.PerformLayout(); + this.splitContainer1.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); + this.splitContainer1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.numDiscount)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit(); + this.splitContainer2.Panel1.ResumeLayout(false); + this.splitContainer2.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit(); + this.splitContainer2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).EndInit(); + this.ucGroupBoxEx1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dgvOrder)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.SplitContainer splitContainer1; + private UserComponent.UcGroupBoxEx ucGroupBoxEx3; + private UserComponent.UcGroupBoxEx ucGroupBoxEx1; + private DevComponents.DotNetBar.PanelEx btnGetSelect; + private DevComponents.DotNetBar.PanelEx btnGetNotGet; + private System.Windows.Forms.SplitContainer splitContainer2; + private System.Windows.Forms.PictureBox pbLoading; + private UserComponent.DataGridViewEx dgvOrder; + private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect; + private System.Windows.Forms.DataGridViewTextBoxColumn colSpu; + private System.Windows.Forms.DataGridViewTextBoxColumn colSkc; + private System.Windows.Forms.DataGridViewTextBoxColumn colSkuId; + private System.Windows.Forms.DataGridViewTextBoxColumn colSkuName; + private System.Windows.Forms.DataGridViewTextBoxColumn colSkuPrice; + private DevComponents.DotNetBar.Controls.DataGridViewDoubleInputColumn colSkuPurchasePrice; + private System.Windows.Forms.DataGridViewTextBoxColumn colAvailableBalance; + private DevComponents.DotNetBar.PanelEx btnMultiChangePurchasePrice; + private System.Windows.Forms.NumericUpDown numericUpDown1; + private DevComponents.DotNetBar.PanelEx btnSave; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.NumericUpDown numDiscount; + private System.Windows.Forms.Label label2; + } +} \ No newline at end of file diff --git a/TEMUKJD/KJDForms/ShopForms/Statistics/ShopSetPurchasePriceForm.cs b/TEMUKJD/KJDForms/ShopForms/Statistics/ShopSetPurchasePriceForm.cs new file mode 100644 index 0000000..adaa3fb --- /dev/null +++ b/TEMUKJD/KJDForms/ShopForms/Statistics/ShopSetPurchasePriceForm.cs @@ -0,0 +1,148 @@ +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.KJDForms.BaseForms; +using Work; + +namespace TemuKJD.KJDForms.ShopForms.Statistics +{ + public partial class ShopSetPurchasePriceForm : LRBaseForm + { + public WarehouseProductSubOrderInfo orderInfo = new WarehouseProductSubOrderInfo(); + ShopLoginInfo shop = null; + public ShopSetPurchasePriceForm(ShopLoginInfo shopInfo, WarehouseProductSubOrderInfo subOrderInfo = null) + { + InitializeComponent(); + + if (shopInfo != null) + shop = shopInfo; + if (subOrderInfo != null) + orderInfo = subOrderInfo; + } + + private void ShopSetPurchasePriceForm_Load(object sender, EventArgs e) + { + if (orderInfo == null) + return; + + this.numDiscount.Value = orderInfo.discount.ParseToDecimal() * 0.01m; + this.numericUpDown1.Value = (orderInfo.skuQuantityDetailList.FirstOrDefault()?.supplierPrice).ParseToDecimal() * 0.01m; + + this.TitleText = ("进货价修改 - " + orderInfo.productName); + foreach (var sku in this.orderInfo.skuQuantityDetailList) + { + var rowId = this.dgvOrder.Rows.Add( + false, + orderInfo.productId, + orderInfo.productSkcId, + sku.productSkuId, + "", + sku.supplierPrice * 0.01m, + sku.purchasePrice * 0.01m, + "" + ); + this.dgvOrder.Rows[rowId].Height = 30; + } + } + + private void btnMultiChangePurchasePrice_Click(object sender, EventArgs e) + { + foreach(DataGridViewRow row in this.dgvOrder.Rows) + { + row.Cells["colSkuPurchasePrice"].Value = this.numericUpDown1.Value; + } + } + + private void btnSave_Click(object sender, EventArgs e) + { + if (orderInfo == null) + return; + + TemuDBProductPurchasePriceInfo purchasePriceItem = new TemuDBProductPurchasePriceInfo() + { + add_time = DateTime.Now, + cat_id = "", + cat_name = "", + ext_code = orderInfo.skcExtCode, + main_img = orderInfo.productSkcPicture, + mdy_time = DateTime.Now, + notes = "", + price_text = "", + product_name = orderInfo.productName, + skc_id = orderInfo.productSkcId.ParseToString(), + spu_id = orderInfo.productId.ParseToString(), + shop_id = orderInfo.supplierId.ParseToString(), + shop_name = orderInfo.supplierName, + dbSkuPurchasePriceList = new List(), + discount = (this.numDiscount.Value * 100).ParseToInt(), + }; + foreach (DataGridViewRow row in dgvOrder.Rows) + { + var skuId = row.Cells["colSkuId"].Value.ParseToString(); + var purchasePriceValue = (row.Cells["colSkuPurchasePrice"].Value.ParseToDecimal() * 100).ParseToInt(); + var sku = orderInfo.skuQuantityDetailList.FirstOrDefault(s => s.productSkuId.ParseToString() == skuId); + if (sku != null) + { + sku.purchasePrice = purchasePriceValue; + purchasePriceItem.dbSkuPurchasePriceList.Add(new TemuDBSkuPurchasePriceInfo() + { + priceValue = sku.supplierPrice, + productSkuId = sku.productSkuId, + purchasePriceValue = purchasePriceValue, + className = sku.className, + }); + } + } + purchasePriceItem.sku_purchase_price_json = JsonHelper.SerializeObject(purchasePriceItem.dbSkuPurchasePriceList); + if (orderInfo.purchasePriceInfo != null) + purchasePriceItem.id = orderInfo.purchasePriceInfo.id; + + var url = BaseClass.BuildObjString("price/add_purchase_price"); + if (orderInfo.purchasePriceInfo != null) + url = BaseClass.BuildObjString("price/mdy_purchase_price"); + var data = UserLogin.GetSignaturex(); + if (orderInfo.purchasePriceInfo != null) + data += "&db_id=" + orderInfo.purchasePriceInfo.id; + data += "&shop_id=" + purchasePriceItem.shop_id; + data += "&shop_name=" + purchasePriceItem.shop_name; + data += "&spu_id=" + purchasePriceItem.spu_id; + data += "&skc_id=" + purchasePriceItem.skc_id; + data += "&cat_id=" + purchasePriceItem.cat_id; + data += "&cat_name=" + purchasePriceItem.cat_name; + data += "&ext_code=" + purchasePriceItem.ext_code; + data += "&product_name=" + purchasePriceItem.product_name; + data += "&main_img=" + purchasePriceItem.main_img; + data += "&discount=" + purchasePriceItem.discount; + data += "&price_text=" + purchasePriceItem.price_text; + data += "&sku_purchase_price_json=" + purchasePriceItem.sku_purchase_price_json; + data += "¬es=" + purchasePriceItem.notes; + 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 + { + orderInfo.discount = purchasePriceItem.discount; + orderInfo.purchasePriceInfo = purchasePriceItem; + this.Close(); + } + + //if (result) + // orderInfo.hasDbPurchasePrice = true; + } + } +} diff --git a/TEMUKJD/KJDForms/ShopForms/Statistics/ShopSetPurchasePriceForm.resx b/TEMUKJD/KJDForms/ShopForms/Statistics/ShopSetPurchasePriceForm.resx new file mode 100644 index 0000000..f5f9872 --- /dev/null +++ b/TEMUKJD/KJDForms/ShopForms/Statistics/ShopSetPurchasePriceForm.resx @@ -0,0 +1,322 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + + + 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