修复bug,优化店铺筛选选项

This commit is contained in:
wule committed 2026-05-18 10:10:57 +08:00
1 parent aa45b35145
commit ad325eaec5
15 files changed
+596 -347

No files matched your search

+1 -1
View File
@@ -27,7 +27,7 @@ namespace AllBase
/// <summary> /// <summary>
/// 版本ID /// 版本ID
/// </summary> /// </summary>
public static int VersionCount = 1071; public static int VersionCount = 1075;
//public static int VersionCount = 613; //public static int VersionCount = 613;
/// <summary> /// <summary>
@@ -3444,7 +3444,7 @@ namespace KJD_Web.BLL.BXX
sql = "select count(*) FROM (SELECT DISTINCT coids.*,a.after_sale_json,p.from_shop_name,b.ban_wx,b.ban_pdd" + sql = "select count(*) FROM (SELECT DISTINCT coids.*,a.after_sale_json,p.from_shop_name,b.ban_wx,b.ban_pdd" +
" FROM (SELECT skc_id as coid FROM bxx.product WHERE product_get_type='厂商直采' UNION SELECT real_coid as coid FROM bxx.product WHERE product_get_type='厂商直采') as coids" + " FROM (SELECT skc_id as coid FROM bxx.product WHERE product_get_type='厂商直采' UNION SELECT real_coid as coid FROM bxx.product WHERE product_get_type='厂商直采') as coids" +
" LEFT JOIN wxxd.after_sale as a ON coids.coid=a.coid AND a.is_del = 0" + " LEFT JOIN wxxd.after_sale as a ON coids.coid=a.coid AND a.is_del = 0" +
" LEFT JOIN bxx.product p ON coids.coid=p.skc_id" + " LEFT JOIN bxx.product p ON coids.coid=p.skc_id AND p.product_get_type='厂商直采'" +
" LEFT JOIN bxx.jst_supplier_ban_platform b ON coids.coid=b.coid" + " LEFT JOIN bxx.jst_supplier_ban_platform b ON coids.coid=b.coid" +
" WHERE 1=1 AND coids.coid != ''"; " WHERE 1=1 AND coids.coid != ''";
string where = ""; string where = "";
@@ -3467,7 +3467,7 @@ namespace KJD_Web.BLL.BXX
sql = " SELECT DISTINCT coids.*,a.after_sale_json,p.from_shop_name,b.ban_wx,b.ban_pdd" + sql = " SELECT DISTINCT coids.*,a.after_sale_json,p.from_shop_name,b.ban_wx,b.ban_pdd" +
" FROM (SELECT skc_id as coid FROM bxx.product WHERE product_get_type='厂商直采' UNION SELECT real_coid as coid FROM bxx.product WHERE product_get_type='厂商直采') as coids" + " FROM (SELECT skc_id as coid FROM bxx.product WHERE product_get_type='厂商直采' UNION SELECT real_coid as coid FROM bxx.product WHERE product_get_type='厂商直采') as coids" +
" LEFT JOIN wxxd.after_sale as a ON coids.coid=a.coid AND a.is_del = 0" + " LEFT JOIN wxxd.after_sale as a ON coids.coid=a.coid AND a.is_del = 0" +
" LEFT JOIN bxx.product p ON coids.coid=p.skc_id" + " LEFT JOIN bxx.product p ON coids.coid=p.skc_id AND p.product_get_type='厂商直采'" +
" LEFT JOIN bxx.jst_supplier_ban_platform b ON coids.coid=b.coid" + " LEFT JOIN bxx.jst_supplier_ban_platform b ON coids.coid=b.coid" +
" WHERE 1=1 AND coids.coid != ''"; " WHERE 1=1 AND coids.coid != ''";
sql += where; sql += where;
@@ -361,7 +361,7 @@ namespace KJD_Web.BLL.WXXD
// 获取事先绑定的订单运单 // 获取事先绑定的订单运单
sql = " UPDATE wxxd.express_optimize SET order_id='" + order_id + "',status=1" + sql = " UPDATE wxxd.express_optimize SET order_id='" + order_id + "',status=1" +
" WHERE user_name='" + user_name + "' AND status=0 AND bind_order_id='" + order_id + "'" + " WHERE user_name='" + user_name + "' AND status=0 AND bind_order_id='" + order_id + "'" +
" LIMIT 1"; " ORDER BY RAND() LIMIT 1";
var cnt = mySql.ExecuteAffectedRows(sql); var cnt = mySql.ExecuteAffectedRows(sql);
if (!mySql.Message.IsNullOrEmpty()) if (!mySql.Message.IsNullOrEmpty())
{ {
@@ -378,7 +378,7 @@ namespace KJD_Web.BLL.WXXD
sql = " UPDATE wxxd.express_optimize SET order_id='" + order_id + "',status=1" + sql = " UPDATE wxxd.express_optimize SET order_id='" + order_id + "',status=1" +
" WHERE user_name='" + user_name + "' AND status=0 AND (order_id IS NULL OR order_id='') AND (bind_order_id IS NULL OR bind_order_id='')" + " WHERE user_name='" + user_name + "' AND status=0 AND (order_id IS NULL OR order_id='') AND (bind_order_id IS NULL OR bind_order_id='')" +
" AND waybill_pickup_time between '" + start_time + "' and '" + end_time + "'" + " AND waybill_pickup_time between '" + start_time + "' and '" + end_time + "'" +
" LIMIT 1"; " ORDER BY RAND() LIMIT 1";
cnt = mySql.ExecuteAffectedRows(sql); cnt = mySql.ExecuteAffectedRows(sql);
if (!mySql.Message.IsNullOrEmpty()) if (!mySql.Message.IsNullOrEmpty())
{ {
@@ -802,7 +802,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
"", "",
"是", "是",
"否"}); "否"});
this.cmbPddRelation.Location = new System.Drawing.Point(777, 5); this.cmbPddRelation.Location = new System.Drawing.Point(777, 7);
this.cmbPddRelation.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbPddRelation.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.cmbPddRelation.Name = "cmbPddRelation"; this.cmbPddRelation.Name = "cmbPddRelation";
this.cmbPddRelation.Size = new System.Drawing.Size(52, 25); this.cmbPddRelation.Size = new System.Drawing.Size(52, 25);
@@ -857,7 +857,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
// //
this.cmbCat2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.cmbCat2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
this.cmbCat2.FormattingEnabled = true; this.cmbCat2.FormattingEnabled = true;
this.cmbCat2.Location = new System.Drawing.Point(290, 77); this.cmbCat2.Location = new System.Drawing.Point(290, 75);
this.cmbCat2.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbCat2.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.cmbCat2.Name = "cmbCat2"; this.cmbCat2.Name = "cmbCat2";
this.cmbCat2.Size = new System.Drawing.Size(52, 25); this.cmbCat2.Size = new System.Drawing.Size(52, 25);
@@ -894,7 +894,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
"", "",
"普通商品", "普通商品",
"爆款数据"}); "爆款数据"});
this.cmbSpProdType.Location = new System.Drawing.Point(777, 40); this.cmbSpProdType.Location = new System.Drawing.Point(777, 42);
this.cmbSpProdType.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbSpProdType.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.cmbSpProdType.Name = "cmbSpProdType"; this.cmbSpProdType.Name = "cmbSpProdType";
this.cmbSpProdType.Size = new System.Drawing.Size(52, 25); this.cmbSpProdType.Size = new System.Drawing.Size(52, 25);
@@ -956,7 +956,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
"机会商品", "机会商品",
"以图搜品", "以图搜品",
"外部数据"}); "外部数据"});
this.cmbSourceType.Location = new System.Drawing.Point(290, 42); this.cmbSourceType.Location = new System.Drawing.Point(290, 40);
this.cmbSourceType.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbSourceType.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.cmbSourceType.Name = "cmbSourceType"; this.cmbSourceType.Name = "cmbSourceType";
this.cmbSourceType.Size = new System.Drawing.Size(52, 25); this.cmbSourceType.Size = new System.Drawing.Size(52, 25);
@@ -1013,7 +1013,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
"", "",
"是", "是",
"否"}); "否"});
this.cmbWxCat.Location = new System.Drawing.Point(651, 7); this.cmbWxCat.Location = new System.Drawing.Point(651, 5);
this.cmbWxCat.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbWxCat.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.cmbWxCat.Name = "cmbWxCat"; this.cmbWxCat.Name = "cmbWxCat";
this.cmbWxCat.Size = new System.Drawing.Size(52, 25); this.cmbWxCat.Size = new System.Drawing.Size(52, 25);
@@ -1035,7 +1035,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
this.cmbSort.Items.AddRange(new object[] { this.cmbSort.Items.AddRange(new object[] {
"入库时间", "入库时间",
"曝光量"}); "曝光量"});
this.cmbSort.Location = new System.Drawing.Point(399, 42); this.cmbSort.Location = new System.Drawing.Point(399, 40);
this.cmbSort.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbSort.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.cmbSort.Name = "cmbSort"; this.cmbSort.Name = "cmbSort";
this.cmbSort.Size = new System.Drawing.Size(52, 25); this.cmbSort.Size = new System.Drawing.Size(52, 25);
@@ -1111,7 +1111,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
// //
this.cmbGroupFilter.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.cmbGroupFilter.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
this.cmbGroupFilter.FormattingEnabled = true; this.cmbGroupFilter.FormattingEnabled = true;
this.cmbGroupFilter.Location = new System.Drawing.Point(181, 42); this.cmbGroupFilter.Location = new System.Drawing.Point(181, 40);
this.cmbGroupFilter.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbGroupFilter.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.cmbGroupFilter.Name = "cmbGroupFilter"; this.cmbGroupFilter.Name = "cmbGroupFilter";
this.cmbGroupFilter.Size = new System.Drawing.Size(52, 25); this.cmbGroupFilter.Size = new System.Drawing.Size(52, 25);
@@ -1126,7 +1126,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
"是", "是",
"否", "否",
"导出未拉回"}); "导出未拉回"});
this.cmbExportToOutServer.Location = new System.Drawing.Point(651, 42); this.cmbExportToOutServer.Location = new System.Drawing.Point(651, 40);
this.cmbExportToOutServer.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbExportToOutServer.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.cmbExportToOutServer.Name = "cmbExportToOutServer"; this.cmbExportToOutServer.Name = "cmbExportToOutServer";
this.cmbExportToOutServer.Size = new System.Drawing.Size(52, 25); this.cmbExportToOutServer.Size = new System.Drawing.Size(52, 25);
@@ -1162,7 +1162,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
"安全商品", "安全商品",
"违规商品", "违规商品",
"未校验"}); "未校验"});
this.cmbWxSafe.Location = new System.Drawing.Point(525, 42); this.cmbWxSafe.Location = new System.Drawing.Point(525, 40);
this.cmbWxSafe.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbWxSafe.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.cmbWxSafe.Name = "cmbWxSafe"; this.cmbWxSafe.Name = "cmbWxSafe";
this.cmbWxSafe.Size = new System.Drawing.Size(52, 25); this.cmbWxSafe.Size = new System.Drawing.Size(52, 25);
@@ -1204,7 +1204,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
// //
this.cmbCat1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.cmbCat1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
this.cmbCat1.FormattingEnabled = true; this.cmbCat1.FormattingEnabled = true;
this.cmbCat1.Location = new System.Drawing.Point(181, 77); this.cmbCat1.Location = new System.Drawing.Point(181, 75);
this.cmbCat1.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbCat1.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.cmbCat1.Name = "cmbCat1"; this.cmbCat1.Name = "cmbCat1";
this.cmbCat1.Size = new System.Drawing.Size(52, 25); this.cmbCat1.Size = new System.Drawing.Size(52, 25);
@@ -1226,7 +1226,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
// //
this.cmbCat3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.cmbCat3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
this.cmbCat3.FormattingEnabled = true; this.cmbCat3.FormattingEnabled = true;
this.cmbCat3.Location = new System.Drawing.Point(399, 77); this.cmbCat3.Location = new System.Drawing.Point(399, 75);
this.cmbCat3.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbCat3.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.cmbCat3.Name = "cmbCat3"; this.cmbCat3.Name = "cmbCat3";
this.cmbCat3.Size = new System.Drawing.Size(52, 25); this.cmbCat3.Size = new System.Drawing.Size(52, 25);
@@ -612,10 +612,8 @@ namespace TemuKJD.WXForms.ProductForms
canUse ? "在线" : "掉线", canUse ? "在线" : "掉线",
GlobalConfig.lstWxShopAuthInfo.FirstOrDefault(sa => sa.ShopId == shopEntity.ShopId)?.ExpiresTime > DateTime.Now.AddMinutes(5) ? "可用" : "过期", GlobalConfig.lstWxShopAuthInfo.FirstOrDefault(sa => sa.ShopId == shopEntity.ShopId)?.ExpiresTime > DateTime.Now.AddMinutes(5) ? "可用" : "过期",
canUse, canUse,
GlobalConfig.dicWxShopUploadInfo.ContainsKey(shopEntity.ShopId) && GlobalConfig.dicWxShopUploadInfo[shopEntity.ShopId].DicDayUploadCount.ContainsKey(day) ? GlobalConfig.dicWxShopUploadInfo.ContainsKey(shopEntity.ShopId) ? GlobalConfig.dicWxShopUploadInfo[shopEntity.ShopId].DicDayUploadCount[day] : 0,
GlobalConfig.dicWxShopUploadInfo[shopEntity.ShopId].DicDayUploadCount[day] : 0, GlobalConfig.dicWxShopUploadInfo.ContainsKey(shopEntity.ShopId) ? GlobalConfig.dicWxShopUploadInfo[shopEntity.ShopId].OnSaleCount : 0,
GlobalConfig.dicWxShopUploadInfo.ContainsKey(shopEntity.ShopId) && GlobalConfig.dicWxShopUploadInfo[shopEntity.ShopId].OnSaleRefreshDay == DateTime.Now.ToString("yyyyMMdd").ParseToInt() ?
GlobalConfig.dicWxShopUploadInfo[shopEntity.ShopId].OnSaleCount : 0,
shopEntity.AddProductRemaining, shopEntity.AddProductRemaining,
msg msg
); );
@@ -70,12 +70,10 @@ namespace TemuKJD.WXForms.ProductForms
this.ucGroupBoxEx3 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.ucGroupBoxEx3 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
this.cmbSaleSort = new System.Windows.Forms.ComboBox(); this.cmbSaleSort = new System.Windows.Forms.ComboBox();
this.label6 = new System.Windows.Forms.Label(); this.label6 = new System.Windows.Forms.Label();
this.label5 = new System.Windows.Forms.Label();
this.btnStopSearch = new DevComponents.DotNetBar.PanelEx(); this.btnStopSearch = new DevComponents.DotNetBar.PanelEx();
this.btnClearDgv = new DevComponents.DotNetBar.PanelEx(); this.btnClearDgv = new DevComponents.DotNetBar.PanelEx();
this.txtPageEnd = new System.Windows.Forms.TextBox(); this.txtPageEnd = new System.Windows.Forms.TextBox();
this.txtFiltSaleNumLessThan = new System.Windows.Forms.TextBox(); this.txtFiltSaleNumLessThan = new System.Windows.Forms.TextBox();
this.label4 = new System.Windows.Forms.Label();
this.btnFiltSelectLessThan = new DevComponents.DotNetBar.PanelEx(); this.btnFiltSelectLessThan = new DevComponents.DotNetBar.PanelEx();
this.txtFiltSaleNumMoreThan = new System.Windows.Forms.TextBox(); this.txtFiltSaleNumMoreThan = new System.Windows.Forms.TextBox();
this.btnSearchProd = new DevComponents.DotNetBar.PanelEx(); this.btnSearchProd = new DevComponents.DotNetBar.PanelEx();
@@ -84,6 +82,8 @@ namespace TemuKJD.WXForms.ProductForms
this.btnClearFilter = new DevComponents.DotNetBar.PanelEx(); this.btnClearFilter = new DevComponents.DotNetBar.PanelEx();
this.label3 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
this.label5 = new System.Windows.Forms.Label();
this.ucGroupBoxEx4 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.ucGroupBoxEx4 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
this.btnPromotion = new DevComponents.DotNetBar.PanelEx(); this.btnPromotion = new DevComponents.DotNetBar.PanelEx();
this.label8 = new System.Windows.Forms.Label(); this.label8 = new System.Windows.Forms.Label();
@@ -93,6 +93,8 @@ namespace TemuKJD.WXForms.ProductForms
this.btnStopOp = new DevComponents.DotNetBar.PanelEx(); this.btnStopOp = new DevComponents.DotNetBar.PanelEx();
this.btnEndPromotion = new DevComponents.DotNetBar.PanelEx(); this.btnEndPromotion = new DevComponents.DotNetBar.PanelEx();
this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
this.cmbFilterShopGroup = new TemuKJD.UserComponent.UcComboBoxMutiSelect();
this.label24 = new System.Windows.Forms.Label();
this.btnSelectOffline = new DevComponents.DotNetBar.PanelEx(); this.btnSelectOffline = new DevComponents.DotNetBar.PanelEx();
this.btnSelectOnline = new DevComponents.DotNetBar.PanelEx(); this.btnSelectOnline = new DevComponents.DotNetBar.PanelEx();
this.btnAddUnSelect = new DevComponents.DotNetBar.PanelEx(); this.btnAddUnSelect = new DevComponents.DotNetBar.PanelEx();
@@ -111,19 +113,6 @@ namespace TemuKJD.WXForms.ProductForms
this.txtPageBegin = new System.Windows.Forms.TextBox(); this.txtPageBegin = new System.Windows.Forms.TextBox();
this.label1 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label();
this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx(); this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx();
this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.colShopLoginName = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colShopNotes = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colSelectProduct = new System.Windows.Forms.DataGridViewLinkColumn();
this.colLoginStatus = new System.Windows.Forms.DataGridViewLinkColumn();
this.colApi = new System.Windows.Forms.DataGridViewLinkColumn();
this.colCanUse = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.colUploadCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colOnSaleNum = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colRemaining = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.pbLoading = new System.Windows.Forms.PictureBox(); this.pbLoading = new System.Windows.Forms.PictureBox();
this.chkTestNoAuditUpload = new TemuKJD.UserComponent.UcCheckBox(this.components); this.chkTestNoAuditUpload = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.dgvSelectProduct = new TemuKJD.UserComponent.DataGridViewEx(); this.dgvSelectProduct = new TemuKJD.UserComponent.DataGridViewEx();
@@ -156,6 +145,20 @@ namespace TemuKJD.WXForms.ProductForms
this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
this.btnClear = new DevComponents.DotNetBar.PanelEx(); this.btnClear = new DevComponents.DotNetBar.PanelEx();
this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.panelEx1 = new DevComponents.DotNetBar.PanelEx();
this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.colShopLoginName = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colShopNotes = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colGroup = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colSelectProduct = new System.Windows.Forms.DataGridViewLinkColumn();
this.colLoginStatus = new System.Windows.Forms.DataGridViewLinkColumn();
this.colApi = new System.Windows.Forms.DataGridViewLinkColumn();
this.colCanUse = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.colUploadCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colOnSaleNum = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colRemaining = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout();
@@ -229,9 +232,9 @@ namespace TemuKJD.WXForms.ProductForms
this.ucGroupBoxEx2.Controls.Add(this.label18); this.ucGroupBoxEx2.Controls.Add(this.label18);
this.ucGroupBoxEx2.Controls.Add(this.btnStop); this.ucGroupBoxEx2.Controls.Add(this.btnStop);
this.ucGroupBoxEx2.Controls.Add(this.btnSetPreSale); this.ucGroupBoxEx2.Controls.Add(this.btnSetPreSale);
this.ucGroupBoxEx2.Location = new System.Drawing.Point(518, 2); this.ucGroupBoxEx2.Location = new System.Drawing.Point(537, 2);
this.ucGroupBoxEx2.Name = "ucGroupBoxEx2"; this.ucGroupBoxEx2.Name = "ucGroupBoxEx2";
this.ucGroupBoxEx2.Size = new System.Drawing.Size(446, 165); this.ucGroupBoxEx2.Size = new System.Drawing.Size(443, 165);
this.ucGroupBoxEx2.TabIndex = 667; this.ucGroupBoxEx2.TabIndex = 667;
this.ucGroupBoxEx2.TabStop = false; this.ucGroupBoxEx2.TabStop = false;
this.ucGroupBoxEx2.Text = "爆单神器一阶段"; this.ucGroupBoxEx2.Text = "爆单神器一阶段";
@@ -241,7 +244,7 @@ namespace TemuKJD.WXForms.ProductForms
this.chkSkipSet.AutoSize = true; this.chkSkipSet.AutoSize = true;
this.chkSkipSet.Checked = true; this.chkSkipSet.Checked = true;
this.chkSkipSet.CheckState = System.Windows.Forms.CheckState.Checked; this.chkSkipSet.CheckState = System.Windows.Forms.CheckState.Checked;
this.chkSkipSet.Location = new System.Drawing.Point(16, 130); this.chkSkipSet.Location = new System.Drawing.Point(12, 130);
this.chkSkipSet.Name = "chkSkipSet"; this.chkSkipSet.Name = "chkSkipSet";
this.chkSkipSet.Size = new System.Drawing.Size(171, 21); this.chkSkipSet.Size = new System.Drawing.Size(171, 21);
this.chkSkipSet.TabIndex = 864; this.chkSkipSet.TabIndex = 864;
@@ -254,7 +257,7 @@ namespace TemuKJD.WXForms.ProductForms
this.btnClearCoupon.CanvasColor = System.Drawing.SystemColors.Control; this.btnClearCoupon.CanvasColor = System.Drawing.SystemColors.Control;
this.btnClearCoupon.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnClearCoupon.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnClearCoupon.DisabledBackColor = System.Drawing.Color.Empty; this.btnClearCoupon.DisabledBackColor = System.Drawing.Color.Empty;
this.btnClearCoupon.Location = new System.Drawing.Point(312, 128); this.btnClearCoupon.Location = new System.Drawing.Point(309, 128);
this.btnClearCoupon.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); this.btnClearCoupon.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2);
this.btnClearCoupon.Name = "btnClearCoupon"; this.btnClearCoupon.Name = "btnClearCoupon";
this.btnClearCoupon.Size = new System.Drawing.Size(58, 25); this.btnClearCoupon.Size = new System.Drawing.Size(58, 25);
@@ -277,7 +280,7 @@ namespace TemuKJD.WXForms.ProductForms
// label15 // label15
// //
this.label15.AutoSize = true; this.label15.AutoSize = true;
this.label15.Location = new System.Drawing.Point(189, 99); this.label15.Location = new System.Drawing.Point(185, 99);
this.label15.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label15.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
this.label15.Name = "label15"; this.label15.Name = "label15";
this.label15.Size = new System.Drawing.Size(20, 17); this.label15.Size = new System.Drawing.Size(20, 17);
@@ -286,7 +289,7 @@ namespace TemuKJD.WXForms.ProductForms
// //
// dtpEndTime // dtpEndTime
// //
this.dtpEndTime.Location = new System.Drawing.Point(209, 96); this.dtpEndTime.Location = new System.Drawing.Point(205, 96);
this.dtpEndTime.Name = "dtpEndTime"; this.dtpEndTime.Name = "dtpEndTime";
this.dtpEndTime.Size = new System.Drawing.Size(118, 23); this.dtpEndTime.Size = new System.Drawing.Size(118, 23);
this.dtpEndTime.TabIndex = 840; this.dtpEndTime.TabIndex = 840;
@@ -294,7 +297,7 @@ namespace TemuKJD.WXForms.ProductForms
// //
// dtpStartTime // dtpStartTime
// //
this.dtpStartTime.Location = new System.Drawing.Point(70, 96); this.dtpStartTime.Location = new System.Drawing.Point(66, 96);
this.dtpStartTime.Name = "dtpStartTime"; this.dtpStartTime.Name = "dtpStartTime";
this.dtpStartTime.Size = new System.Drawing.Size(118, 23); this.dtpStartTime.Size = new System.Drawing.Size(118, 23);
this.dtpStartTime.TabIndex = 839; this.dtpStartTime.TabIndex = 839;
@@ -303,7 +306,7 @@ namespace TemuKJD.WXForms.ProductForms
// label14 // label14
// //
this.label14.AutoSize = true; this.label14.AutoSize = true;
this.label14.Location = new System.Drawing.Point(13, 99); this.label14.Location = new System.Drawing.Point(9, 99);
this.label14.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label14.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
this.label14.Name = "label14"; this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(56, 17); this.label14.Size = new System.Drawing.Size(56, 17);
@@ -313,7 +316,7 @@ namespace TemuKJD.WXForms.ProductForms
// label10 // label10
// //
this.label10.AutoSize = true; this.label10.AutoSize = true;
this.label10.Location = new System.Drawing.Point(67, 64); this.label10.Location = new System.Drawing.Point(63, 64);
this.label10.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label10.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
this.label10.Name = "label10"; this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(32, 17); this.label10.Size = new System.Drawing.Size(32, 17);
@@ -323,7 +326,7 @@ namespace TemuKJD.WXForms.ProductForms
// txtTotalCnt // txtTotalCnt
// //
this.txtTotalCnt.Font = new System.Drawing.Font("微软雅黑", 10F); this.txtTotalCnt.Font = new System.Drawing.Font("微软雅黑", 10F);
this.txtTotalCnt.Location = new System.Drawing.Point(99, 60); this.txtTotalCnt.Location = new System.Drawing.Point(95, 60);
this.txtTotalCnt.Margin = new System.Windows.Forms.Padding(0); this.txtTotalCnt.Margin = new System.Windows.Forms.Padding(0);
this.txtTotalCnt.Name = "txtTotalCnt"; this.txtTotalCnt.Name = "txtTotalCnt";
this.txtTotalCnt.Size = new System.Drawing.Size(45, 25); this.txtTotalCnt.Size = new System.Drawing.Size(45, 25);
@@ -334,7 +337,7 @@ namespace TemuKJD.WXForms.ProductForms
// label12 // label12
// //
this.label12.AutoSize = true; this.label12.AutoSize = true;
this.label12.Location = new System.Drawing.Point(146, 64); this.label12.Location = new System.Drawing.Point(142, 64);
this.label12.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label12.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
this.label12.Name = "label12"; this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(80, 17); this.label12.Size = new System.Drawing.Size(80, 17);
@@ -344,7 +347,7 @@ namespace TemuKJD.WXForms.ProductForms
// txtLimitNumOnePerson // txtLimitNumOnePerson
// //
this.txtLimitNumOnePerson.Font = new System.Drawing.Font("微软雅黑", 10F); this.txtLimitNumOnePerson.Font = new System.Drawing.Font("微软雅黑", 10F);
this.txtLimitNumOnePerson.Location = new System.Drawing.Point(226, 60); this.txtLimitNumOnePerson.Location = new System.Drawing.Point(222, 60);
this.txtLimitNumOnePerson.Margin = new System.Windows.Forms.Padding(0); this.txtLimitNumOnePerson.Margin = new System.Windows.Forms.Padding(0);
this.txtLimitNumOnePerson.Name = "txtLimitNumOnePerson"; this.txtLimitNumOnePerson.Name = "txtLimitNumOnePerson";
this.txtLimitNumOnePerson.Size = new System.Drawing.Size(45, 25); this.txtLimitNumOnePerson.Size = new System.Drawing.Size(45, 25);
@@ -355,7 +358,7 @@ namespace TemuKJD.WXForms.ProductForms
// label13 // label13
// //
this.label13.AutoSize = true; this.label13.AutoSize = true;
this.label13.Location = new System.Drawing.Point(274, 64); this.label13.Location = new System.Drawing.Point(270, 64);
this.label13.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label13.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
this.label13.Name = "label13"; this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(20, 17); this.label13.Size = new System.Drawing.Size(20, 17);
@@ -365,7 +368,7 @@ namespace TemuKJD.WXForms.ProductForms
// label9 // label9
// //
this.label9.AutoSize = true; this.label9.AutoSize = true;
this.label9.Location = new System.Drawing.Point(25, 64); this.label9.Location = new System.Drawing.Point(21, 64);
this.label9.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label9.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
this.label9.Name = "label9"; this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(44, 17); this.label9.Size = new System.Drawing.Size(44, 17);
@@ -382,7 +385,7 @@ namespace TemuKJD.WXForms.ProductForms
this.flowLayoutPanel1.Controls.Add(this.lblProductCnt); this.flowLayoutPanel1.Controls.Add(this.lblProductCnt);
this.flowLayoutPanel1.Controls.Add(this.txtDiscountNum); this.flowLayoutPanel1.Controls.Add(this.txtDiscountNum);
this.flowLayoutPanel1.Controls.Add(this.lblDiscountNum); this.flowLayoutPanel1.Controls.Add(this.lblDiscountNum);
this.flowLayoutPanel1.Location = new System.Drawing.Point(162, 26); this.flowLayoutPanel1.Location = new System.Drawing.Point(158, 26);
this.flowLayoutPanel1.Name = "flowLayoutPanel1"; this.flowLayoutPanel1.Name = "flowLayoutPanel1";
this.flowLayoutPanel1.Size = new System.Drawing.Size(281, 25); this.flowLayoutPanel1.Size = new System.Drawing.Size(281, 25);
this.flowLayoutPanel1.TabIndex = 831; this.flowLayoutPanel1.TabIndex = 831;
@@ -488,7 +491,7 @@ namespace TemuKJD.WXForms.ProductForms
"直减", "直减",
"统一折扣", "统一折扣",
"条件折扣"}); "条件折扣"});
this.cmbCouponType.Location = new System.Drawing.Point(70, 26); this.cmbCouponType.Location = new System.Drawing.Point(66, 26);
this.cmbCouponType.Name = "cmbCouponType"; this.cmbCouponType.Name = "cmbCouponType";
this.cmbCouponType.Size = new System.Drawing.Size(88, 25); this.cmbCouponType.Size = new System.Drawing.Size(88, 25);
this.cmbCouponType.TabIndex = 830; this.cmbCouponType.TabIndex = 830;
@@ -498,7 +501,7 @@ namespace TemuKJD.WXForms.ProductForms
// label18 // label18
// //
this.label18.AutoSize = true; this.label18.AutoSize = true;
this.label18.Location = new System.Drawing.Point(13, 30); this.label18.Location = new System.Drawing.Point(9, 30);
this.label18.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label18.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
this.label18.Name = "label18"; this.label18.Name = "label18";
this.label18.Size = new System.Drawing.Size(56, 17); this.label18.Size = new System.Drawing.Size(56, 17);
@@ -511,7 +514,7 @@ namespace TemuKJD.WXForms.ProductForms
this.btnStop.CanvasColor = System.Drawing.SystemColors.Control; this.btnStop.CanvasColor = System.Drawing.SystemColors.Control;
this.btnStop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnStop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnStop.DisabledBackColor = System.Drawing.Color.Empty; this.btnStop.DisabledBackColor = System.Drawing.Color.Empty;
this.btnStop.Location = new System.Drawing.Point(374, 128); this.btnStop.Location = new System.Drawing.Point(371, 128);
this.btnStop.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); this.btnStop.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2);
this.btnStop.Name = "btnStop"; this.btnStop.Name = "btnStop";
this.btnStop.Size = new System.Drawing.Size(58, 25); this.btnStop.Size = new System.Drawing.Size(58, 25);
@@ -538,7 +541,7 @@ namespace TemuKJD.WXForms.ProductForms
this.btnSetPreSale.Cursor = System.Windows.Forms.Cursors.Hand; this.btnSetPreSale.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnSetPreSale.DisabledBackColor = System.Drawing.Color.Empty; this.btnSetPreSale.DisabledBackColor = System.Drawing.Color.Empty;
this.btnSetPreSale.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSetPreSale.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSetPreSale.Location = new System.Drawing.Point(250, 128); this.btnSetPreSale.Location = new System.Drawing.Point(247, 128);
this.btnSetPreSale.Name = "btnSetPreSale"; this.btnSetPreSale.Name = "btnSetPreSale";
this.btnSetPreSale.Size = new System.Drawing.Size(58, 25); this.btnSetPreSale.Size = new System.Drawing.Size(58, 25);
this.btnSetPreSale.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnSetPreSale.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -565,12 +568,10 @@ namespace TemuKJD.WXForms.ProductForms
this.ucGroupBoxEx3.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; this.ucGroupBoxEx3.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
this.ucGroupBoxEx3.Controls.Add(this.cmbSaleSort); this.ucGroupBoxEx3.Controls.Add(this.cmbSaleSort);
this.ucGroupBoxEx3.Controls.Add(this.label6); this.ucGroupBoxEx3.Controls.Add(this.label6);
this.ucGroupBoxEx3.Controls.Add(this.label5);
this.ucGroupBoxEx3.Controls.Add(this.btnStopSearch); this.ucGroupBoxEx3.Controls.Add(this.btnStopSearch);
this.ucGroupBoxEx3.Controls.Add(this.btnClearDgv); this.ucGroupBoxEx3.Controls.Add(this.btnClearDgv);
this.ucGroupBoxEx3.Controls.Add(this.txtPageEnd); this.ucGroupBoxEx3.Controls.Add(this.txtPageEnd);
this.ucGroupBoxEx3.Controls.Add(this.txtFiltSaleNumLessThan); this.ucGroupBoxEx3.Controls.Add(this.txtFiltSaleNumLessThan);
this.ucGroupBoxEx3.Controls.Add(this.label4);
this.ucGroupBoxEx3.Controls.Add(this.btnFiltSelectLessThan); this.ucGroupBoxEx3.Controls.Add(this.btnFiltSelectLessThan);
this.ucGroupBoxEx3.Controls.Add(this.txtFiltSaleNumMoreThan); this.ucGroupBoxEx3.Controls.Add(this.txtFiltSaleNumMoreThan);
this.ucGroupBoxEx3.Controls.Add(this.btnSearchProd); this.ucGroupBoxEx3.Controls.Add(this.btnSearchProd);
@@ -579,12 +580,15 @@ namespace TemuKJD.WXForms.ProductForms
this.ucGroupBoxEx3.Controls.Add(this.btnClearFilter); this.ucGroupBoxEx3.Controls.Add(this.btnClearFilter);
this.ucGroupBoxEx3.Controls.Add(this.label3); this.ucGroupBoxEx3.Controls.Add(this.label3);
this.ucGroupBoxEx3.Controls.Add(this.label2); this.ucGroupBoxEx3.Controls.Add(this.label2);
this.ucGroupBoxEx3.Location = new System.Drawing.Point(162, 2); this.ucGroupBoxEx3.Controls.Add(this.label4);
this.ucGroupBoxEx3.Controls.Add(this.label5);
this.ucGroupBoxEx3.Location = new System.Drawing.Point(186, 2);
this.ucGroupBoxEx3.Name = "ucGroupBoxEx3"; this.ucGroupBoxEx3.Name = "ucGroupBoxEx3";
this.ucGroupBoxEx3.Size = new System.Drawing.Size(357, 165); this.ucGroupBoxEx3.Size = new System.Drawing.Size(352, 165);
this.ucGroupBoxEx3.TabIndex = 668; this.ucGroupBoxEx3.TabIndex = 668;
this.ucGroupBoxEx3.TabStop = false; this.ucGroupBoxEx3.TabStop = false;
this.ucGroupBoxEx3.Text = "商品查询"; this.ucGroupBoxEx3.Text = "商品查询";
this.ucGroupBoxEx3.Enter += new System.EventHandler(this.ucGroupBoxEx3_Enter);
// //
// cmbSaleSort // cmbSaleSort
// //
@@ -610,23 +614,12 @@ namespace TemuKJD.WXForms.ProductForms
this.label6.TabIndex = 868; this.label6.TabIndex = 868;
this.label6.Text = "销量排序"; this.label6.Text = "销量排序";
// //
// label5
//
this.label5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(256, 28);
this.label5.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(56, 17);
this.label5.TabIndex = 844;
this.label5.Text = "销量小于";
//
// btnStopSearch // btnStopSearch
// //
this.btnStopSearch.CanvasColor = System.Drawing.SystemColors.Control; this.btnStopSearch.CanvasColor = System.Drawing.SystemColors.Control;
this.btnStopSearch.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnStopSearch.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnStopSearch.DisabledBackColor = System.Drawing.Color.Empty; this.btnStopSearch.DisabledBackColor = System.Drawing.Color.Empty;
this.btnStopSearch.Location = new System.Drawing.Point(288, 127); this.btnStopSearch.Location = new System.Drawing.Point(282, 127);
this.btnStopSearch.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); this.btnStopSearch.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2);
this.btnStopSearch.Name = "btnStopSearch"; this.btnStopSearch.Name = "btnStopSearch";
this.btnStopSearch.Size = new System.Drawing.Size(58, 25); this.btnStopSearch.Size = new System.Drawing.Size(58, 25);
@@ -686,24 +679,13 @@ namespace TemuKJD.WXForms.ProductForms
// txtFiltSaleNumLessThan // txtFiltSaleNumLessThan
// //
this.txtFiltSaleNumLessThan.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.txtFiltSaleNumLessThan.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.txtFiltSaleNumLessThan.Location = new System.Drawing.Point(312, 25); this.txtFiltSaleNumLessThan.Location = new System.Drawing.Point(310, 25);
this.txtFiltSaleNumLessThan.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.txtFiltSaleNumLessThan.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.txtFiltSaleNumLessThan.Name = "txtFiltSaleNumLessThan"; this.txtFiltSaleNumLessThan.Name = "txtFiltSaleNumLessThan";
this.txtFiltSaleNumLessThan.Size = new System.Drawing.Size(33, 23); this.txtFiltSaleNumLessThan.Size = new System.Drawing.Size(30, 23);
this.txtFiltSaleNumLessThan.TabIndex = 843; this.txtFiltSaleNumLessThan.TabIndex = 843;
this.txtFiltSaleNumLessThan.Text = "1"; this.txtFiltSaleNumLessThan.Text = "1";
// //
// label4
//
this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(256, 64);
this.label4.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(56, 17);
this.label4.TabIndex = 801;
this.label4.Text = "销量大于";
//
// btnFiltSelectLessThan // btnFiltSelectLessThan
// //
this.btnFiltSelectLessThan.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.btnFiltSelectLessThan.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@@ -711,7 +693,7 @@ namespace TemuKJD.WXForms.ProductForms
this.btnFiltSelectLessThan.Cursor = System.Windows.Forms.Cursors.Hand; this.btnFiltSelectLessThan.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnFiltSelectLessThan.DisabledBackColor = System.Drawing.Color.Empty; this.btnFiltSelectLessThan.DisabledBackColor = System.Drawing.Color.Empty;
this.btnFiltSelectLessThan.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnFiltSelectLessThan.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnFiltSelectLessThan.Location = new System.Drawing.Point(192, 24); this.btnFiltSelectLessThan.Location = new System.Drawing.Point(191, 24);
this.btnFiltSelectLessThan.Name = "btnFiltSelectLessThan"; this.btnFiltSelectLessThan.Name = "btnFiltSelectLessThan";
this.btnFiltSelectLessThan.Size = new System.Drawing.Size(62, 25); this.btnFiltSelectLessThan.Size = new System.Drawing.Size(62, 25);
this.btnFiltSelectLessThan.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnFiltSelectLessThan.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -732,10 +714,10 @@ namespace TemuKJD.WXForms.ProductForms
// txtFiltSaleNumMoreThan // txtFiltSaleNumMoreThan
// //
this.txtFiltSaleNumMoreThan.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.txtFiltSaleNumMoreThan.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.txtFiltSaleNumMoreThan.Location = new System.Drawing.Point(312, 61); this.txtFiltSaleNumMoreThan.Location = new System.Drawing.Point(310, 61);
this.txtFiltSaleNumMoreThan.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.txtFiltSaleNumMoreThan.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.txtFiltSaleNumMoreThan.Name = "txtFiltSaleNumMoreThan"; this.txtFiltSaleNumMoreThan.Name = "txtFiltSaleNumMoreThan";
this.txtFiltSaleNumMoreThan.Size = new System.Drawing.Size(33, 23); this.txtFiltSaleNumMoreThan.Size = new System.Drawing.Size(30, 23);
this.txtFiltSaleNumMoreThan.TabIndex = 795; this.txtFiltSaleNumMoreThan.TabIndex = 795;
this.txtFiltSaleNumMoreThan.Text = "0"; this.txtFiltSaleNumMoreThan.Text = "0";
// //
@@ -745,7 +727,7 @@ namespace TemuKJD.WXForms.ProductForms
this.btnSearchProd.Cursor = System.Windows.Forms.Cursors.Hand; this.btnSearchProd.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnSearchProd.DisabledBackColor = System.Drawing.Color.Empty; this.btnSearchProd.DisabledBackColor = System.Drawing.Color.Empty;
this.btnSearchProd.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSearchProd.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSearchProd.Location = new System.Drawing.Point(164, 127); this.btnSearchProd.Location = new System.Drawing.Point(158, 127);
this.btnSearchProd.Name = "btnSearchProd"; this.btnSearchProd.Name = "btnSearchProd";
this.btnSearchProd.Size = new System.Drawing.Size(58, 25); this.btnSearchProd.Size = new System.Drawing.Size(58, 25);
this.btnSearchProd.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnSearchProd.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -784,7 +766,7 @@ namespace TemuKJD.WXForms.ProductForms
this.btnFiltSelectMoreThan.Cursor = System.Windows.Forms.Cursors.Hand; this.btnFiltSelectMoreThan.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnFiltSelectMoreThan.DisabledBackColor = System.Drawing.Color.Empty; this.btnFiltSelectMoreThan.DisabledBackColor = System.Drawing.Color.Empty;
this.btnFiltSelectMoreThan.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnFiltSelectMoreThan.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnFiltSelectMoreThan.Location = new System.Drawing.Point(192, 60); this.btnFiltSelectMoreThan.Location = new System.Drawing.Point(191, 60);
this.btnFiltSelectMoreThan.Name = "btnFiltSelectMoreThan"; this.btnFiltSelectMoreThan.Name = "btnFiltSelectMoreThan";
this.btnFiltSelectMoreThan.Size = new System.Drawing.Size(62, 25); this.btnFiltSelectMoreThan.Size = new System.Drawing.Size(62, 25);
this.btnFiltSelectMoreThan.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnFiltSelectMoreThan.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -807,7 +789,7 @@ namespace TemuKJD.WXForms.ProductForms
this.btnClearFilter.CanvasColor = System.Drawing.SystemColors.Control; this.btnClearFilter.CanvasColor = System.Drawing.SystemColors.Control;
this.btnClearFilter.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnClearFilter.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnClearFilter.DisabledBackColor = System.Drawing.Color.Empty; this.btnClearFilter.DisabledBackColor = System.Drawing.Color.Empty;
this.btnClearFilter.Location = new System.Drawing.Point(226, 127); this.btnClearFilter.Location = new System.Drawing.Point(220, 127);
this.btnClearFilter.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); this.btnClearFilter.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2);
this.btnClearFilter.Name = "btnClearFilter"; this.btnClearFilter.Name = "btnClearFilter";
this.btnClearFilter.Size = new System.Drawing.Size(58, 25); this.btnClearFilter.Size = new System.Drawing.Size(58, 25);
@@ -850,6 +832,28 @@ namespace TemuKJD.WXForms.ProductForms
this.label2.TabIndex = 793; this.label2.TabIndex = 793;
this.label2.Text = "查询页数"; this.label2.Text = "查询页数";
// //
// label4
//
this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(255, 64);
this.label4.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(56, 17);
this.label4.TabIndex = 801;
this.label4.Text = "销量大于";
//
// label5
//
this.label5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(255, 28);
this.label5.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(56, 17);
this.label5.TabIndex = 844;
this.label5.Text = "销量小于";
//
// ucGroupBoxEx4 // ucGroupBoxEx4
// //
this.ucGroupBoxEx4.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.ucGroupBoxEx4.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
@@ -864,9 +868,9 @@ namespace TemuKJD.WXForms.ProductForms
this.ucGroupBoxEx4.Controls.Add(this.btnEndCoupon); this.ucGroupBoxEx4.Controls.Add(this.btnEndCoupon);
this.ucGroupBoxEx4.Controls.Add(this.btnStopOp); this.ucGroupBoxEx4.Controls.Add(this.btnStopOp);
this.ucGroupBoxEx4.Controls.Add(this.btnEndPromotion); this.ucGroupBoxEx4.Controls.Add(this.btnEndPromotion);
this.ucGroupBoxEx4.Location = new System.Drawing.Point(963, 2); this.ucGroupBoxEx4.Location = new System.Drawing.Point(979, 2);
this.ucGroupBoxEx4.Name = "ucGroupBoxEx4"; this.ucGroupBoxEx4.Name = "ucGroupBoxEx4";
this.ucGroupBoxEx4.Size = new System.Drawing.Size(459, 165); this.ucGroupBoxEx4.Size = new System.Drawing.Size(443, 165);
this.ucGroupBoxEx4.TabIndex = 666; this.ucGroupBoxEx4.TabIndex = 666;
this.ucGroupBoxEx4.TabStop = false; this.ucGroupBoxEx4.TabStop = false;
this.ucGroupBoxEx4.Text = "爆单神器二阶段"; this.ucGroupBoxEx4.Text = "爆单神器二阶段";
@@ -878,7 +882,7 @@ namespace TemuKJD.WXForms.ProductForms
this.btnPromotion.Cursor = System.Windows.Forms.Cursors.Hand; this.btnPromotion.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnPromotion.DisabledBackColor = System.Drawing.Color.Empty; this.btnPromotion.DisabledBackColor = System.Drawing.Color.Empty;
this.btnPromotion.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnPromotion.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnPromotion.Location = new System.Drawing.Point(298, 128); this.btnPromotion.Location = new System.Drawing.Point(282, 128);
this.btnPromotion.Name = "btnPromotion"; this.btnPromotion.Name = "btnPromotion";
this.btnPromotion.Size = new System.Drawing.Size(87, 25); this.btnPromotion.Size = new System.Drawing.Size(87, 25);
this.btnPromotion.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnPromotion.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -957,7 +961,7 @@ namespace TemuKJD.WXForms.ProductForms
this.btnStopOp.CanvasColor = System.Drawing.SystemColors.Control; this.btnStopOp.CanvasColor = System.Drawing.SystemColors.Control;
this.btnStopOp.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnStopOp.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnStopOp.DisabledBackColor = System.Drawing.Color.Empty; this.btnStopOp.DisabledBackColor = System.Drawing.Color.Empty;
this.btnStopOp.Location = new System.Drawing.Point(390, 128); this.btnStopOp.Location = new System.Drawing.Point(374, 128);
this.btnStopOp.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); this.btnStopOp.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2);
this.btnStopOp.Name = "btnStopOp"; this.btnStopOp.Name = "btnStopOp";
this.btnStopOp.Size = new System.Drawing.Size(58, 25); this.btnStopOp.Size = new System.Drawing.Size(58, 25);
@@ -985,7 +989,7 @@ namespace TemuKJD.WXForms.ProductForms
this.btnEndPromotion.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnEndPromotion.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnEndPromotion.Location = new System.Drawing.Point(134, 128); this.btnEndPromotion.Location = new System.Drawing.Point(134, 128);
this.btnEndPromotion.Name = "btnEndPromotion"; this.btnEndPromotion.Name = "btnEndPromotion";
this.btnEndPromotion.Size = new System.Drawing.Size(120, 25); this.btnEndPromotion.Size = new System.Drawing.Size(114, 25);
this.btnEndPromotion.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnEndPromotion.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnEndPromotion.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnEndPromotion.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnEndPromotion.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnEndPromotion.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
@@ -1007,6 +1011,8 @@ namespace TemuKJD.WXForms.ProductForms
| System.Windows.Forms.AnchorStyles.Left))); | System.Windows.Forms.AnchorStyles.Left)));
this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); 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.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
this.ucGroupBoxEx1.Controls.Add(this.cmbFilterShopGroup);
this.ucGroupBoxEx1.Controls.Add(this.label24);
this.ucGroupBoxEx1.Controls.Add(this.btnSelectOffline); this.ucGroupBoxEx1.Controls.Add(this.btnSelectOffline);
this.ucGroupBoxEx1.Controls.Add(this.btnSelectOnline); this.ucGroupBoxEx1.Controls.Add(this.btnSelectOnline);
this.ucGroupBoxEx1.Controls.Add(this.btnAddUnSelect); this.ucGroupBoxEx1.Controls.Add(this.btnAddUnSelect);
@@ -1019,22 +1025,45 @@ namespace TemuKJD.WXForms.ProductForms
this.ucGroupBoxEx1.Controls.Add(this.txtFilterShopName); this.ucGroupBoxEx1.Controls.Add(this.txtFilterShopName);
this.ucGroupBoxEx1.Controls.Add(this.btnRefreshShop); this.ucGroupBoxEx1.Controls.Add(this.btnRefreshShop);
this.ucGroupBoxEx1.Controls.Add(this.label17); this.ucGroupBoxEx1.Controls.Add(this.label17);
this.ucGroupBoxEx1.Location = new System.Drawing.Point(3, 2); this.ucGroupBoxEx1.Location = new System.Drawing.Point(2, 2);
this.ucGroupBoxEx1.Name = "ucGroupBoxEx1"; this.ucGroupBoxEx1.Name = "ucGroupBoxEx1";
this.ucGroupBoxEx1.Size = new System.Drawing.Size(160, 165); this.ucGroupBoxEx1.Size = new System.Drawing.Size(185, 165);
this.ucGroupBoxEx1.TabIndex = 399; this.ucGroupBoxEx1.TabIndex = 399;
this.ucGroupBoxEx1.TabStop = false; this.ucGroupBoxEx1.TabStop = false;
this.ucGroupBoxEx1.Text = "店铺筛选"; this.ucGroupBoxEx1.Text = "店铺筛选";
// //
// cmbFilterShopGroup
//
this.cmbFilterShopGroup.DefaultText = "全部";
this.cmbFilterShopGroup.DropDownHeight = 1;
this.cmbFilterShopGroup.DropDownWidth = 1;
this.cmbFilterShopGroup.FormattingEnabled = true;
this.cmbFilterShopGroup.IntegralHeight = false;
this.cmbFilterShopGroup.Location = new System.Drawing.Point(38, 92);
this.cmbFilterShopGroup.Name = "cmbFilterShopGroup";
this.cmbFilterShopGroup.Size = new System.Drawing.Size(137, 25);
this.cmbFilterShopGroup.TabIndex = 836;
this.cmbFilterShopGroup.Text = "全部";
//
// label24
//
this.label24.AutoSize = true;
this.label24.Location = new System.Drawing.Point(7, 96);
this.label24.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
this.label24.Name = "label24";
this.label24.Size = new System.Drawing.Size(32, 17);
this.label24.TabIndex = 837;
this.label24.Text = "分组";
//
// btnSelectOffline // btnSelectOffline
// //
this.btnSelectOffline.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnSelectOffline.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnSelectOffline.Cursor = System.Windows.Forms.Cursors.Hand; this.btnSelectOffline.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnSelectOffline.DisabledBackColor = System.Drawing.Color.Empty; this.btnSelectOffline.DisabledBackColor = System.Drawing.Color.Empty;
this.btnSelectOffline.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSelectOffline.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSelectOffline.Location = new System.Drawing.Point(61, 137); this.btnSelectOffline.Location = new System.Drawing.Point(59, 139);
this.btnSelectOffline.Name = "btnSelectOffline"; this.btnSelectOffline.Name = "btnSelectOffline";
this.btnSelectOffline.Size = new System.Drawing.Size(50, 20); this.btnSelectOffline.Size = new System.Drawing.Size(48, 18);
this.btnSelectOffline.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnSelectOffline.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnSelectOffline.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnSelectOffline.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnSelectOffline.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnSelectOffline.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
@@ -1056,9 +1085,9 @@ namespace TemuKJD.WXForms.ProductForms
this.btnSelectOnline.Cursor = System.Windows.Forms.Cursors.Hand; this.btnSelectOnline.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnSelectOnline.DisabledBackColor = System.Drawing.Color.Empty; this.btnSelectOnline.DisabledBackColor = System.Drawing.Color.Empty;
this.btnSelectOnline.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSelectOnline.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSelectOnline.Location = new System.Drawing.Point(9, 137); this.btnSelectOnline.Location = new System.Drawing.Point(9, 139);
this.btnSelectOnline.Name = "btnSelectOnline"; this.btnSelectOnline.Name = "btnSelectOnline";
this.btnSelectOnline.Size = new System.Drawing.Size(50, 20); this.btnSelectOnline.Size = new System.Drawing.Size(48, 18);
this.btnSelectOnline.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnSelectOnline.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnSelectOnline.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnSelectOnline.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnSelectOnline.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnSelectOnline.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
@@ -1080,9 +1109,9 @@ namespace TemuKJD.WXForms.ProductForms
this.btnAddUnSelect.Cursor = System.Windows.Forms.Cursors.Hand; this.btnAddUnSelect.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnAddUnSelect.DisabledBackColor = System.Drawing.Color.Empty; this.btnAddUnSelect.DisabledBackColor = System.Drawing.Color.Empty;
this.btnAddUnSelect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnAddUnSelect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAddUnSelect.Location = new System.Drawing.Point(81, 115); this.btnAddUnSelect.Location = new System.Drawing.Point(76, 119);
this.btnAddUnSelect.Name = "btnAddUnSelect"; this.btnAddUnSelect.Name = "btnAddUnSelect";
this.btnAddUnSelect.Size = new System.Drawing.Size(70, 20); this.btnAddUnSelect.Size = new System.Drawing.Size(65, 18);
this.btnAddUnSelect.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnAddUnSelect.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnAddUnSelect.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnAddUnSelect.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnAddUnSelect.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnAddUnSelect.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
@@ -1104,9 +1133,9 @@ namespace TemuKJD.WXForms.ProductForms
this.btnReverse.Cursor = System.Windows.Forms.Cursors.Hand; this.btnReverse.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnReverse.DisabledBackColor = System.Drawing.Color.Empty; this.btnReverse.DisabledBackColor = System.Drawing.Color.Empty;
this.btnReverse.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnReverse.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnReverse.Location = new System.Drawing.Point(113, 137); this.btnReverse.Location = new System.Drawing.Point(109, 139);
this.btnReverse.Name = "btnReverse"; this.btnReverse.Name = "btnReverse";
this.btnReverse.Size = new System.Drawing.Size(38, 20); this.btnReverse.Size = new System.Drawing.Size(32, 18);
this.btnReverse.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnReverse.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnReverse.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnReverse.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnReverse.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnReverse.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
@@ -1129,9 +1158,9 @@ namespace TemuKJD.WXForms.ProductForms
this.cmbFilterShopNotes.DropDownWidth = 1; this.cmbFilterShopNotes.DropDownWidth = 1;
this.cmbFilterShopNotes.FormattingEnabled = true; this.cmbFilterShopNotes.FormattingEnabled = true;
this.cmbFilterShopNotes.IntegralHeight = false; this.cmbFilterShopNotes.IntegralHeight = false;
this.cmbFilterShopNotes.Location = new System.Drawing.Point(38, 66); this.cmbFilterShopNotes.Location = new System.Drawing.Point(38, 65);
this.cmbFilterShopNotes.Name = "cmbFilterShopNotes"; this.cmbFilterShopNotes.Name = "cmbFilterShopNotes";
this.cmbFilterShopNotes.Size = new System.Drawing.Size(113, 25); this.cmbFilterShopNotes.Size = new System.Drawing.Size(137, 25);
this.cmbFilterShopNotes.TabIndex = 442; this.cmbFilterShopNotes.TabIndex = 442;
this.cmbFilterShopNotes.Text = "全部"; this.cmbFilterShopNotes.Text = "全部";
// //
@@ -1141,9 +1170,9 @@ namespace TemuKJD.WXForms.ProductForms
this.btnAddSelect.Cursor = System.Windows.Forms.Cursors.Hand; this.btnAddSelect.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnAddSelect.DisabledBackColor = System.Drawing.Color.Empty; this.btnAddSelect.DisabledBackColor = System.Drawing.Color.Empty;
this.btnAddSelect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnAddSelect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAddSelect.Location = new System.Drawing.Point(9, 115); this.btnAddSelect.Location = new System.Drawing.Point(9, 119);
this.btnAddSelect.Name = "btnAddSelect"; this.btnAddSelect.Name = "btnAddSelect";
this.btnAddSelect.Size = new System.Drawing.Size(70, 20); this.btnAddSelect.Size = new System.Drawing.Size(65, 18);
this.btnAddSelect.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnAddSelect.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnAddSelect.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnAddSelect.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnAddSelect.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnAddSelect.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
@@ -1156,7 +1185,7 @@ namespace TemuKJD.WXForms.ProductForms
this.btnAddSelect.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); this.btnAddSelect.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
this.btnAddSelect.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); this.btnAddSelect.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
this.btnAddSelect.TabIndex = 742; this.btnAddSelect.TabIndex = 742;
this.btnAddSelect.Text = "选中条件"; this.btnAddSelect.Text = "加选条件";
this.btnAddSelect.Click += new System.EventHandler(this.btnAddSelect_Click); this.btnAddSelect.Click += new System.EventHandler(this.btnAddSelect_Click);
// //
// btnEmptyShop // btnEmptyShop
@@ -1164,10 +1193,10 @@ namespace TemuKJD.WXForms.ProductForms
this.btnEmptyShop.CanvasColor = System.Drawing.SystemColors.Control; this.btnEmptyShop.CanvasColor = System.Drawing.SystemColors.Control;
this.btnEmptyShop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnEmptyShop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnEmptyShop.DisabledBackColor = System.Drawing.Color.Empty; this.btnEmptyShop.DisabledBackColor = System.Drawing.Color.Empty;
this.btnEmptyShop.Location = new System.Drawing.Point(113, 93); this.btnEmptyShop.Location = new System.Drawing.Point(143, 139);
this.btnEmptyShop.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); this.btnEmptyShop.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2);
this.btnEmptyShop.Name = "btnEmptyShop"; this.btnEmptyShop.Name = "btnEmptyShop";
this.btnEmptyShop.Size = new System.Drawing.Size(38, 20); this.btnEmptyShop.Size = new System.Drawing.Size(32, 18);
this.btnEmptyShop.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnEmptyShop.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnEmptyShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); this.btnEmptyShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
this.btnEmptyShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); this.btnEmptyShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
@@ -1190,9 +1219,9 @@ namespace TemuKJD.WXForms.ProductForms
this.btnFilterShop.Cursor = System.Windows.Forms.Cursors.Hand; this.btnFilterShop.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnFilterShop.DisabledBackColor = System.Drawing.Color.Empty; this.btnFilterShop.DisabledBackColor = System.Drawing.Color.Empty;
this.btnFilterShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnFilterShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnFilterShop.Location = new System.Drawing.Point(9, 93); this.btnFilterShop.Location = new System.Drawing.Point(143, 119);
this.btnFilterShop.Name = "btnFilterShop"; this.btnFilterShop.Name = "btnFilterShop";
this.btnFilterShop.Size = new System.Drawing.Size(102, 20); this.btnFilterShop.Size = new System.Drawing.Size(32, 18);
this.btnFilterShop.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnFilterShop.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnFilterShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnFilterShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnFilterShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnFilterShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
@@ -1205,13 +1234,13 @@ namespace TemuKJD.WXForms.ProductForms
this.btnFilterShop.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); this.btnFilterShop.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
this.btnFilterShop.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); this.btnFilterShop.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
this.btnFilterShop.TabIndex = 703; this.btnFilterShop.TabIndex = 703;
this.btnFilterShop.Text = "过滤店铺"; this.btnFilterShop.Text = "过滤";
this.btnFilterShop.Click += new System.EventHandler(this.btnFilterShop_Click); this.btnFilterShop.Click += new System.EventHandler(this.btnFilterShop_Click);
// //
// label16 // label16
// //
this.label16.AutoSize = true; this.label16.AutoSize = true;
this.label16.Location = new System.Drawing.Point(7, 70); this.label16.Location = new System.Drawing.Point(7, 69);
this.label16.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label16.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
this.label16.Name = "label16"; this.label16.Name = "label16";
this.label16.Size = new System.Drawing.Size(32, 17); this.label16.Size = new System.Drawing.Size(32, 17);
@@ -1221,10 +1250,10 @@ namespace TemuKJD.WXForms.ProductForms
// txtFilterShopName // txtFilterShopName
// //
this.txtFilterShopName.Font = new System.Drawing.Font("微软雅黑", 10F); this.txtFilterShopName.Font = new System.Drawing.Font("微软雅黑", 10F);
this.txtFilterShopName.Location = new System.Drawing.Point(38, 39); this.txtFilterShopName.Location = new System.Drawing.Point(38, 38);
this.txtFilterShopName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtFilterShopName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
this.txtFilterShopName.Name = "txtFilterShopName"; this.txtFilterShopName.Name = "txtFilterShopName";
this.txtFilterShopName.Size = new System.Drawing.Size(113, 25); this.txtFilterShopName.Size = new System.Drawing.Size(137, 25);
this.txtFilterShopName.TabIndex = 653; this.txtFilterShopName.TabIndex = 653;
// //
// btnRefreshShop // btnRefreshShop
@@ -1233,9 +1262,9 @@ namespace TemuKJD.WXForms.ProductForms
this.btnRefreshShop.Cursor = System.Windows.Forms.Cursors.Hand; this.btnRefreshShop.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnRefreshShop.DisabledBackColor = System.Drawing.Color.Empty; 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.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnRefreshShop.Location = new System.Drawing.Point(9, 17); this.btnRefreshShop.Location = new System.Drawing.Point(9, 18);
this.btnRefreshShop.Name = "btnRefreshShop"; this.btnRefreshShop.Name = "btnRefreshShop";
this.btnRefreshShop.Size = new System.Drawing.Size(142, 20); this.btnRefreshShop.Size = new System.Drawing.Size(166, 18);
this.btnRefreshShop.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnRefreshShop.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnRefreshShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnRefreshShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnRefreshShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnRefreshShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
@@ -1254,7 +1283,7 @@ namespace TemuKJD.WXForms.ProductForms
// label17 // label17
// //
this.label17.AutoSize = true; this.label17.AutoSize = true;
this.label17.Location = new System.Drawing.Point(7, 43); this.label17.Location = new System.Drawing.Point(7, 42);
this.label17.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label17.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
this.label17.Name = "label17"; this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(32, 17); this.label17.Size = new System.Drawing.Size(32, 17);
@@ -1365,6 +1394,7 @@ namespace TemuKJD.WXForms.ProductForms
this.colShopId, this.colShopId,
this.colShopName, this.colShopName,
this.colShopNotes, this.colShopNotes,
this.colGroup,
this.colSelectProduct, this.colSelectProduct,
this.colLoginStatus, this.colLoginStatus,
this.colApi, this.colApi,
@@ -1384,113 +1414,6 @@ namespace TemuKJD.WXForms.ProductForms
this.dgvShop.TabIndex = 6; this.dgvShop.TabIndex = 6;
this.dgvShop.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellContentClick); this.dgvShop.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellContentClick);
// //
// colSelect
//
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.Width = 28;
//
// colShopLoginName
//
this.colShopLoginName.HeaderText = "店铺登录名";
this.colShopLoginName.Name = "colShopLoginName";
this.colShopLoginName.ReadOnly = true;
this.colShopLoginName.Visible = false;
//
// colShopId
//
this.colShopId.HeaderText = "店铺Id";
this.colShopId.Name = "colShopId";
this.colShopId.ReadOnly = true;
this.colShopId.Visible = false;
this.colShopId.Width = 55;
//
// colShopName
//
this.colShopName.FillWeight = 150F;
this.colShopName.HeaderText = "店铺名称";
this.colShopName.Name = "colShopName";
this.colShopName.ReadOnly = true;
this.colShopName.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.colShopName.Width = 75;
//
// colShopNotes
//
this.colShopNotes.HeaderText = "备注";
this.colShopNotes.Name = "colShopNotes";
this.colShopNotes.ReadOnly = true;
this.colShopNotes.Width = 75;
//
// colSelectProduct
//
this.colSelectProduct.HeaderText = "选择商品";
this.colSelectProduct.Name = "colSelectProduct";
this.colSelectProduct.ReadOnly = true;
this.colSelectProduct.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.colSelectProduct.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
this.colSelectProduct.Visible = false;
this.colSelectProduct.Width = 62;
//
// colLoginStatus
//
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.colLoginStatus.Width = 38;
//
// colApi
//
this.colApi.HeaderText = "Api";
this.colApi.Name = "colApi";
this.colApi.ReadOnly = true;
this.colApi.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
this.colApi.Visible = false;
this.colApi.Width = 38;
//
// colCanUse
//
this.colCanUse.HeaderText = "可用";
this.colCanUse.Name = "colCanUse";
this.colCanUse.ReadOnly = true;
this.colCanUse.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.colCanUse.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
this.colCanUse.Visible = false;
this.colCanUse.Width = 28;
//
// colUploadCount
//
this.colUploadCount.HeaderText = "已传";
this.colUploadCount.Name = "colUploadCount";
this.colUploadCount.ReadOnly = true;
this.colUploadCount.Visible = false;
this.colUploadCount.Width = 38;
//
// colOnSaleNum
//
this.colOnSaleNum.HeaderText = "在售";
this.colOnSaleNum.Name = "colOnSaleNum";
this.colOnSaleNum.ReadOnly = true;
this.colOnSaleNum.Visible = false;
this.colOnSaleNum.Width = 38;
//
// colRemaining
//
this.colRemaining.HeaderText = "月限额";
this.colRemaining.Name = "colRemaining";
this.colRemaining.ReadOnly = true;
this.colRemaining.Visible = false;
//
// colMessage
//
this.colMessage.HeaderText = "消息";
this.colMessage.Name = "colMessage";
this.colMessage.ReadOnly = true;
//
// pbLoading // pbLoading
// //
this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None; this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None;
@@ -1854,6 +1777,124 @@ namespace TemuKJD.WXForms.ProductForms
this.panelEx1.Text = "停止当前操作"; this.panelEx1.Text = "停止当前操作";
this.panelEx1.Visible = false; this.panelEx1.Visible = false;
// //
// colSelect
//
this.colSelect.Frozen = true;
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.Width = 28;
//
// colShopLoginName
//
this.colShopLoginName.Frozen = true;
this.colShopLoginName.HeaderText = "店铺登录名";
this.colShopLoginName.Name = "colShopLoginName";
this.colShopLoginName.ReadOnly = true;
this.colShopLoginName.Visible = false;
//
// colShopId
//
this.colShopId.Frozen = true;
this.colShopId.HeaderText = "店铺Id";
this.colShopId.Name = "colShopId";
this.colShopId.ReadOnly = true;
this.colShopId.Visible = false;
this.colShopId.Width = 55;
//
// colShopName
//
this.colShopName.FillWeight = 150F;
this.colShopName.Frozen = true;
this.colShopName.HeaderText = "店铺名称";
this.colShopName.Name = "colShopName";
this.colShopName.ReadOnly = true;
this.colShopName.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.colShopName.Width = 75;
//
// colShopNotes
//
this.colShopNotes.HeaderText = "备注";
this.colShopNotes.Name = "colShopNotes";
this.colShopNotes.ReadOnly = true;
this.colShopNotes.Width = 66;
//
// colGroup
//
this.colGroup.HeaderText = "分组";
this.colGroup.Name = "colGroup";
this.colGroup.ReadOnly = true;
this.colGroup.Width = 66;
//
// colSelectProduct
//
this.colSelectProduct.HeaderText = "选择商品";
this.colSelectProduct.Name = "colSelectProduct";
this.colSelectProduct.ReadOnly = true;
this.colSelectProduct.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.colSelectProduct.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
this.colSelectProduct.Visible = false;
this.colSelectProduct.Width = 62;
//
// colLoginStatus
//
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.colLoginStatus.Width = 38;
//
// colApi
//
this.colApi.HeaderText = "Api";
this.colApi.Name = "colApi";
this.colApi.ReadOnly = true;
this.colApi.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
this.colApi.Visible = false;
this.colApi.Width = 38;
//
// colCanUse
//
this.colCanUse.HeaderText = "可用";
this.colCanUse.Name = "colCanUse";
this.colCanUse.ReadOnly = true;
this.colCanUse.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.colCanUse.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
this.colCanUse.Visible = false;
this.colCanUse.Width = 28;
//
// colUploadCount
//
this.colUploadCount.HeaderText = "已传";
this.colUploadCount.Name = "colUploadCount";
this.colUploadCount.ReadOnly = true;
this.colUploadCount.Visible = false;
this.colUploadCount.Width = 38;
//
// colOnSaleNum
//
this.colOnSaleNum.HeaderText = "在售";
this.colOnSaleNum.Name = "colOnSaleNum";
this.colOnSaleNum.ReadOnly = true;
this.colOnSaleNum.Visible = false;
this.colOnSaleNum.Width = 38;
//
// colRemaining
//
this.colRemaining.HeaderText = "月限额";
this.colRemaining.Name = "colRemaining";
this.colRemaining.ReadOnly = true;
this.colRemaining.Visible = false;
//
// colMessage
//
this.colMessage.HeaderText = "消息";
this.colMessage.Name = "colMessage";
this.colMessage.ReadOnly = true;
//
// WXProdCouponOrderBoomForm // WXProdCouponOrderBoomForm
// //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -1936,19 +1977,6 @@ namespace TemuKJD.WXForms.ProductForms
private DevComponents.DotNetBar.PanelEx btnAddSelect; private DevComponents.DotNetBar.PanelEx btnAddSelect;
private DevComponents.DotNetBar.PanelEx btnSelectOffline; private DevComponents.DotNetBar.PanelEx btnSelectOffline;
private DevComponents.DotNetBar.PanelEx btnSelectOnline; private DevComponents.DotNetBar.PanelEx btnSelectOnline;
private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect;
private System.Windows.Forms.DataGridViewTextBoxColumn colShopLoginName;
private System.Windows.Forms.DataGridViewTextBoxColumn colShopId;
private System.Windows.Forms.DataGridViewTextBoxColumn colShopName;
private System.Windows.Forms.DataGridViewTextBoxColumn colShopNotes;
private System.Windows.Forms.DataGridViewLinkColumn colSelectProduct;
private System.Windows.Forms.DataGridViewLinkColumn colLoginStatus;
private System.Windows.Forms.DataGridViewLinkColumn colApi;
private System.Windows.Forms.DataGridViewCheckBoxColumn colCanUse;
private System.Windows.Forms.DataGridViewTextBoxColumn colUploadCount;
private System.Windows.Forms.DataGridViewTextBoxColumn colOnSaleNum;
private System.Windows.Forms.DataGridViewTextBoxColumn colRemaining;
private System.Windows.Forms.DataGridViewTextBoxColumn colMessage;
private System.Windows.Forms.TextBox txtPageBegin; private System.Windows.Forms.TextBox txtPageBegin;
private System.Windows.Forms.TextBox txtPageEnd; private System.Windows.Forms.TextBox txtPageEnd;
private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label1;
@@ -2020,5 +2048,21 @@ namespace TemuKJD.WXForms.ProductForms
private System.Windows.Forms.DataGridViewTextBoxColumn colCouponNum; private System.Windows.Forms.DataGridViewTextBoxColumn colCouponNum;
private System.Windows.Forms.DataGridViewTextBoxColumn colOpResult; private System.Windows.Forms.DataGridViewTextBoxColumn colOpResult;
private UserComponent.UcCheckBox chkSkipSet; private UserComponent.UcCheckBox chkSkipSet;
private UserComponent.UcComboBoxMutiSelect cmbFilterShopGroup;
private System.Windows.Forms.Label label24;
private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect;
private System.Windows.Forms.DataGridViewTextBoxColumn colShopLoginName;
private System.Windows.Forms.DataGridViewTextBoxColumn colShopId;
private System.Windows.Forms.DataGridViewTextBoxColumn colShopName;
private System.Windows.Forms.DataGridViewTextBoxColumn colShopNotes;
private System.Windows.Forms.DataGridViewTextBoxColumn colGroup;
private System.Windows.Forms.DataGridViewLinkColumn colSelectProduct;
private System.Windows.Forms.DataGridViewLinkColumn colLoginStatus;
private System.Windows.Forms.DataGridViewLinkColumn colApi;
private System.Windows.Forms.DataGridViewCheckBoxColumn colCanUse;
private System.Windows.Forms.DataGridViewTextBoxColumn colUploadCount;
private System.Windows.Forms.DataGridViewTextBoxColumn colOnSaleNum;
private System.Windows.Forms.DataGridViewTextBoxColumn colRemaining;
private System.Windows.Forms.DataGridViewTextBoxColumn colMessage;
} }
} }
@@ -114,6 +114,7 @@ namespace TemuKJD.WXForms.ProductForms
{ {
pbLoadingShop.Visible = true; pbLoadingShop.Visible = true;
RefreshShopLogin(); RefreshShopLogin();
pbLoadingShop.Visible = false;
} }
private void UserSelectDbProductForm_VisibleChanged(object sender, EventArgs e) private void UserSelectDbProductForm_VisibleChanged(object sender, EventArgs e)
@@ -165,11 +166,15 @@ namespace TemuKJD.WXForms.ProductForms
BindShop(shopEntity, selectIds); BindShop(shopEntity, selectIds);
} }
cmbFilterShopNotes.Items.Clear(); cmbFilterShopNotes.Items.Clear();
//cmbFilterShopNotes.Items.Add("");
foreach (var note in GlobalConfig.ShopLoginList.Select(s => s.Notes).Where(s => !s.IsNullOrEmpty()).Distinct()) foreach (var note in GlobalConfig.ShopLoginList.Select(s => s.Notes).Where(s => !s.IsNullOrEmpty()).Distinct())
{ {
cmbFilterShopNotes.Items.Add(note); cmbFilterShopNotes.Items.Add(note);
} }
cmbFilterShopGroup.Items.Clear();
foreach (var group in GlobalConfig.ShopLoginList.Select(s => s.GroupName).Where(s => !s.IsNullOrEmpty()).Distinct())
{
cmbFilterShopGroup.Items.Add(group);
}
} }
private void BindShop(ShopLoginInfo shopEntity, List<string> selectShopId = null, string msg = "") private void BindShop(ShopLoginInfo shopEntity, List<string> selectShopId = null, string msg = "")
@@ -194,6 +199,7 @@ namespace TemuKJD.WXForms.ProductForms
shopEntity.ShopId, shopEntity.ShopId,
shopEntity.ShopAccount, shopEntity.ShopAccount,
shopEntity.Notes, shopEntity.Notes,
shopEntity.GroupName,
"选择商品", "选择商品",
canUse ? "在线" : "掉线", canUse ? "在线" : "掉线",
GlobalConfig.lstWxShopAuthInfo.FirstOrDefault(sa => sa.ShopId == shopEntity.ShopId)?.ExpiresTime > DateTime.Now.AddMinutes(5) ? "可用" : "过期", GlobalConfig.lstWxShopAuthInfo.FirstOrDefault(sa => sa.ShopId == shopEntity.ShopId)?.ExpiresTime > DateTime.Now.AddMinutes(5) ? "可用" : "过期",
@@ -211,6 +217,7 @@ namespace TemuKJD.WXForms.ProductForms
row.Cells["colShopLoginName"].Value = shopEntity.LoginName; row.Cells["colShopLoginName"].Value = shopEntity.LoginName;
row.Cells["colShopName"].Value = shopEntity.ShopAccount; row.Cells["colShopName"].Value = shopEntity.ShopAccount;
row.Cells["colShopNotes"].Value = shopEntity.Notes; row.Cells["colShopNotes"].Value = shopEntity.Notes;
row.Cells["colGroup"].Value = shopEntity.GroupName;
row.Cells["colLoginStatus"].Value = canUse ? "在线" : "掉线"; row.Cells["colLoginStatus"].Value = canUse ? "在线" : "掉线";
row.Cells["colLoginStatus"].Style.ForeColor = canUse ? Color.Green : Color.Red; row.Cells["colLoginStatus"].Style.ForeColor = canUse ? Color.Green : Color.Red;
row.Cells["colCanUse"].Value = canUse; row.Cells["colCanUse"].Value = canUse;
@@ -818,13 +825,18 @@ namespace TemuKJD.WXForms.ProductForms
private void btnFilterShop_Click(object sender, EventArgs e) private void btnFilterShop_Click(object sender, EventArgs e)
{ {
foreach(DataGridViewRow row in dgvShop.Rows) string notes = cmbFilterShopNotes.Text.Trim().Trim(';');
{ if (notes == "全部")
string notes = cmbFilterShopNotes.Text.Trim().Trim(';'); notes = "";
if (notes == "全部") List<string> notesLst = notes.Split(new string[] { ";", ";", ",", "," }, StringSplitOptions.RemoveEmptyEntries).ToList();
notes = "";
List<string> notesLst = notes.Split(new string[] { ";", ";", ",", "," }, StringSplitOptions.RemoveEmptyEntries).ToList();
string group = cmbFilterShopGroup.Text.Trim().Trim(';');
if (group == "全部")
group = "";
List<string> groupLst = group.Split(new string[] { ";", ";", ",", "," }, StringSplitOptions.RemoveEmptyEntries).ToList();
foreach (DataGridViewRow row in dgvShop.Rows)
{
if (!row.Cells["colShopName"].Value.ParseToString().Contains(txtFilterShopName.Text.Trim())) if (!row.Cells["colShopName"].Value.ParseToString().Contains(txtFilterShopName.Text.Trim()))
{ {
row.Visible = false; row.Visible = false;
@@ -837,6 +849,12 @@ namespace TemuKJD.WXForms.ProductForms
row.Cells["colSelect"].Value = false; row.Cells["colSelect"].Value = false;
continue; continue;
} }
if (!string.IsNullOrWhiteSpace(group) && !groupLst.Contains(row.Cells["colGroup"].Value.ParseToString()))
{
row.Visible = false;
row.Cells["colSelect"].Value = false;
continue;
}
row.Visible = true; row.Visible = true;
} }
} }
@@ -845,6 +863,7 @@ namespace TemuKJD.WXForms.ProductForms
{ {
txtFilterShopName.Text = ""; txtFilterShopName.Text = "";
cmbFilterShopNotes.Text = "全部"; cmbFilterShopNotes.Text = "全部";
cmbFilterShopGroup.Text = "全部";
btnFilterShop_Click(null, null); btnFilterShop_Click(null, null);
} }
@@ -864,16 +883,24 @@ namespace TemuKJD.WXForms.ProductForms
notes = ""; notes = "";
List<string> notesLst = notes.Split(new string[] { ";", ";", ",", "," }, StringSplitOptions.RemoveEmptyEntries).ToList(); List<string> notesLst = notes.Split(new string[] { ";", ";", ",", "," }, StringSplitOptions.RemoveEmptyEntries).ToList();
string group = cmbFilterShopGroup.Text.Trim().Trim(';');
if (group == "全部")
group = "";
List<string> groupLst = group.Split(new string[] { ";", ";", ",", "," }, StringSplitOptions.RemoveEmptyEntries).ToList();
foreach (DataGridViewRow row in dgvShop.Rows) foreach (DataGridViewRow row in dgvShop.Rows)
{ {
if (row.Visible == true) if (row.Visible == false)
{ continue;
if (row.Cells["colShopName"].Value.ParseToString().Contains(txtFilterShopName.Text.Trim()) &&
(string.IsNullOrWhiteSpace(notes) || notesLst.Contains(row.Cells["colShopNotes"].Value.ParseToString()))) if (!row.Cells["colShopName"].Value.ParseToString().Contains(txtFilterShopName.Text.Trim()))
{ continue;
row.Cells["colSelect"].Value = true; if (!string.IsNullOrWhiteSpace(notes) && !notesLst.Contains(row.Cells["colShopNotes"].Value.ParseToString()))
} continue;
} if (!string.IsNullOrWhiteSpace(group) && !groupLst.Contains(row.Cells["colGroup"].Value.ParseToString()))
continue;
row.Cells["colSelect"].Value = true;
} }
} }
@@ -884,16 +911,24 @@ namespace TemuKJD.WXForms.ProductForms
notes = ""; notes = "";
List<string> notesLst = notes.Split(new string[] { ";", ";", ",", "," }, StringSplitOptions.RemoveEmptyEntries).ToList(); List<string> notesLst = notes.Split(new string[] { ";", ";", ",", "," }, StringSplitOptions.RemoveEmptyEntries).ToList();
string group = cmbFilterShopGroup.Text.Trim().Trim(';');
if (group == "全部")
group = "";
List<string> groupLst = group.Split(new string[] { ";", ";", ",", "," }, StringSplitOptions.RemoveEmptyEntries).ToList();
foreach (DataGridViewRow row in dgvShop.Rows) foreach (DataGridViewRow row in dgvShop.Rows)
{ {
if (row.Visible == true) if (row.Visible == false)
{ continue;
if (row.Cells["colShopName"].Value.ParseToString().Contains(txtFilterShopName.Text.Trim()) &&
(string.IsNullOrWhiteSpace(notes) || notesLst.Contains(row.Cells["colShopNotes"].Value.ParseToString()))) if (!row.Cells["colShopName"].Value.ParseToString().Contains(txtFilterShopName.Text.Trim()))
{ continue;
row.Cells["colSelect"].Value = false; if (!string.IsNullOrWhiteSpace(notes) && !notesLst.Contains(row.Cells["colShopNotes"].Value.ParseToString()))
} continue;
} if (!string.IsNullOrWhiteSpace(group) && !groupLst.Contains(row.Cells["colGroup"].Value.ParseToString()))
continue;
row.Cells["colSelect"].Value = false;
} }
} }
@@ -1606,6 +1641,11 @@ namespace TemuKJD.WXForms.ProductForms
} }
} }
} }
private void ucGroupBoxEx3_Enter(object sender, EventArgs e)
{
}
} }
public class WxCoupon public class WxCoupon
@@ -129,6 +129,9 @@
<metadata name="colShopNotes.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="colShopNotes.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<metadata name="colGroup.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="colSelectProduct.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="colSelectProduct.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
@@ -201,6 +201,7 @@ namespace TemuKJD.WXForms.ProductForms
{ {
pbLoadingShop.Visible = true; pbLoadingShop.Visible = true;
RefreshShopLogin(); RefreshShopLogin();
pbLoadingShop.Visible = false;
} }
private void UserSelectDbProductForm_VisibleChanged(object sender, EventArgs e) private void UserSelectDbProductForm_VisibleChanged(object sender, EventArgs e)
@@ -135,6 +135,7 @@ namespace TemuKJD.WXForms.ProductForms
{ {
pbLoadingShop.Visible = true; pbLoadingShop.Visible = true;
RefreshShopLogin(); RefreshShopLogin();
pbLoadingShop.Visible = false;
} }
private void UserSelectDbProductForm_VisibleChanged(object sender, EventArgs e) private void UserSelectDbProductForm_VisibleChanged(object sender, EventArgs e)
+48 -26
View File
@@ -107,6 +107,7 @@ namespace TemuKJD.WXForms.ShopForms
{ {
pbLoadingShop.Visible = true; pbLoadingShop.Visible = true;
RefreshShopLogin(); RefreshShopLogin();
pbLoadingShop.Visible = false;
} }
private void UserSelectDbProductForm_VisibleChanged(object sender, EventArgs e) private void UserSelectDbProductForm_VisibleChanged(object sender, EventArgs e)
@@ -686,9 +687,9 @@ namespace TemuKJD.WXForms.ShopForms
{ {
var ov = optimizeLst.FirstOrDefault(o => o.order_id == orderAfterSale.orderInfo.orderId); var ov = optimizeLst.FirstOrDefault(o => o.order_id == orderAfterSale.orderInfo.orderId);
orderAfterSale.optimizeWaybillId = ov == null ? "" : ov.waybill_id; orderAfterSale.optimizeWaybillId = ov == null ? "" : ov.waybill_id;
orderAfterSale.optimizeTime = ov == null ? "" : ov?.use_time?.ToString("yyyy-MM-dd HH:mm"); orderAfterSale.optimizeTime = ov == null ? "" : ov?.use_time?.ToString("MM-dd HH:mm");
if (!string.IsNullOrEmpty(orderAfterSale.optimizeWaybillId)) if (!string.IsNullOrEmpty(orderAfterSale.optimizeWaybillId))
orderAfterSale.optimizeWaybillId = "已补发"; orderAfterSale.optimizeWaybillId = "已补发" + "\r\n" + ov?.delivery_id + ":" + ov?.waybill_id;
} }
} }
catch (Exception ex) catch (Exception ex)
@@ -737,7 +738,7 @@ namespace TemuKJD.WXForms.ShopForms
if (ov != null) if (ov != null)
{ {
orderAfterSale.optimizeWaybillId = ov == null ? "" : ov.optimize_rst; orderAfterSale.optimizeWaybillId = ov == null ? "" : ov.optimize_rst;
orderAfterSale.optimizeTime = ov == null ? "" : ov?.mdy_time.ToString("yyyy-MM-dd HH:mm"); orderAfterSale.optimizeTime = ov == null ? "" : ov?.mdy_time.ToString("MM-dd HH:mm");
} }
} }
} }
@@ -818,12 +819,17 @@ namespace TemuKJD.WXForms.ShopForms
refundOrder.province + refundOrder.city + refundOrder.district, refundOrder.province + refundOrder.city + refundOrder.district,
BaseClass.StampToDateTime(refundOrder.orderInfo.createTime.ParseToInt()).ToString("yyyy-MM-dd HH:mm:ss"), BaseClass.StampToDateTime(refundOrder.orderInfo.createTime.ParseToInt()).ToString("yyyy-MM-dd HH:mm:ss"),
refundOrder.reason, refundOrder.reason,
refundOrder.optimizeWaybillId + "\r\n" + refundOrder.optimizeTime, refundOrder.optimizeTime + "\r\n" + refundOrder.optimizeWaybillId.Replace("修改物流信息失败", "补发失败"),
"补发", "补发",
refundOrder.remark.Trim().IsNullOrEmpty() ? "添加备注" : refundOrder.remark.Trim() refundOrder.remark.Trim().IsNullOrEmpty() ? "添加备注" : refundOrder.remark.Trim()
); );
dgvData1.Rows[rowIndex].Height = 60; var row = dgvData1.Rows[rowIndex];
row.Height = 60;
if (refundOrder.optimizeWaybillId.Contains("失败"))
row.Cells["colDgv1OptimizeStatus"].Style.ForeColor = Color.Red;
else if (!refundOrder.optimizeTime.IsNullOrEmpty() && !refundOrder.optimizeTime.ParseToString().StartsWith(DateTime.Now.ToString("MM-dd")))
row.Cells["colDgv1OptimizeStatus"].Style.ForeColor = Color.Orange;
})); }));
} }
} }
@@ -988,9 +994,9 @@ namespace TemuKJD.WXForms.ShopForms
{ {
var ov = optimizeLst.FirstOrDefault(o => o.order_id == evaluationInfo.order_id); var ov = optimizeLst.FirstOrDefault(o => o.order_id == evaluationInfo.order_id);
evaluationInfo.optimizeWaybillId = ov == null ? "" : ov.waybill_id; evaluationInfo.optimizeWaybillId = ov == null ? "" : ov.waybill_id;
evaluationInfo.optimizeTime = ov == null ? "" : ov?.use_time?.ToString("yyyy-MM-dd HH:mm"); evaluationInfo.optimizeTime = ov == null ? "" : ov?.use_time?.ToString("MM-dd HH:mm");
if (!string.IsNullOrEmpty(evaluationInfo.optimizeWaybillId)) if (!string.IsNullOrEmpty(evaluationInfo.optimizeWaybillId))
evaluationInfo.optimizeWaybillId = "已补发"; evaluationInfo.optimizeWaybillId = "已补发" + "\r\n" + ov?.delivery_id + ":" + ov?.waybill_id;
} }
} }
catch (Exception ex) catch (Exception ex)
@@ -1039,7 +1045,7 @@ namespace TemuKJD.WXForms.ShopForms
if (ov != null) if (ov != null)
{ {
evaluationInfo.optimizeWaybillId = ov == null ? "" : ov.optimize_rst; evaluationInfo.optimizeWaybillId = ov == null ? "" : ov.optimize_rst;
evaluationInfo.optimizeTime = ov == null ? "" : ov?.mdy_time.ToString("yyyy-MM-dd HH:mm"); evaluationInfo.optimizeTime = ov == null ? "" : ov?.mdy_time.ToString("MM-dd HH:mm");
} }
} }
} }
@@ -1126,12 +1132,17 @@ namespace TemuKJD.WXForms.ShopForms
prodEvaluationInfo.evaluationInfo.buyer.identity.nickname, prodEvaluationInfo.evaluationInfo.buyer.identity.nickname,
BaseClass.StampToDateTime(prodEvaluationInfo.evaluationInfo.firstEvaluationInfo.buyerEvaluationInfo.createTime.ParseToInt()).ToString("yyyy-MM-dd HH:mm:ss"), BaseClass.StampToDateTime(prodEvaluationInfo.evaluationInfo.firstEvaluationInfo.buyerEvaluationInfo.createTime.ParseToInt()).ToString("yyyy-MM-dd HH:mm:ss"),
(content + " " + (lblLst == null ? "" : string.Join(" ", lblLst.Select(e => e.labelName)))).Trim(), (content + " " + (lblLst == null ? "" : string.Join(" ", lblLst.Select(e => e.labelName)))).Trim(),
prodEvaluationInfo.optimizeWaybillId + "\r\n" + prodEvaluationInfo.optimizeTime, prodEvaluationInfo.optimizeTime + "\r\n" + prodEvaluationInfo.optimizeWaybillId.Replace("修改物流信息失败", "补发失败"),
"补发", "补发",
prodEvaluationInfo.remark.Trim().IsNullOrEmpty() ? "添加备注" : prodEvaluationInfo.remark.Trim() prodEvaluationInfo.remark.Trim().IsNullOrEmpty() ? "添加备注" : prodEvaluationInfo.remark.Trim()
); );
dgvData2.Rows[rowIndex].Height = 60; var row = dgvData2.Rows[rowIndex];
row.Height = 60;
if (prodEvaluationInfo.optimizeWaybillId.Contains("失败"))
row.Cells["colDgv2OptimizeStatus"].Style.ForeColor = Color.Red;
else if (!prodEvaluationInfo.optimizeTime.IsNullOrEmpty() && !prodEvaluationInfo.optimizeTime.ParseToString().StartsWith(DateTime.Now.ToString("MM-dd")))
row.Cells["colDgv2OptimizeStatus"].Style.ForeColor = Color.Orange;
})); }));
} }
} }
@@ -1342,9 +1353,9 @@ namespace TemuKJD.WXForms.ShopForms
{ {
var ov = optimizeLst.FirstOrDefault(o => o.order_id == orderWaybill.orderInfo.orderId); var ov = optimizeLst.FirstOrDefault(o => o.order_id == orderWaybill.orderInfo.orderId);
orderWaybill.optimizeWaybillId = ov == null ? "" : ov.waybill_id; orderWaybill.optimizeWaybillId = ov == null ? "" : ov.waybill_id;
orderWaybill.optimizeTime = ov == null ? "" : ov?.use_time?.ToString("yyyy-MM-dd HH:mm"); orderWaybill.optimizeTime = ov == null ? "" : ov?.use_time?.ToString("MM-dd HH:mm");
if (!string.IsNullOrEmpty(orderWaybill.optimizeWaybillId)) if (!string.IsNullOrEmpty(orderWaybill.optimizeWaybillId))
orderWaybill.optimizeWaybillId = "已补发"; orderWaybill.optimizeWaybillId = "已补发" + "\r\n" + ov?.delivery_id + ":" + ov?.waybill_id;
} }
} }
catch (Exception ex) catch (Exception ex)
@@ -1397,7 +1408,7 @@ namespace TemuKJD.WXForms.ShopForms
if (ov != null) if (ov != null)
{ {
orderWaybill.optimizeWaybillId = ov == null ? "" : ov.optimize_rst; orderWaybill.optimizeWaybillId = ov == null ? "" : ov.optimize_rst;
orderWaybill.optimizeTime = ov == null ? "" : ov?.mdy_time.ToString("yyyy-MM-dd HH:mm"); orderWaybill.optimizeTime = ov == null ? "" : ov?.mdy_time.ToString("MM-dd HH:mm");
} }
} }
} }
@@ -1481,12 +1492,17 @@ namespace TemuKJD.WXForms.ShopForms
orderWaybill.pickupDuration.ParseToInt().IsNullOrZero() ? "" : ((orderWaybill.pickupDuration.ParseToInt() / 3600.0m).ToString("f2") + "小时" + "\r\n" + "[" + (is24 ? "次日" : "48小时") + "]"), orderWaybill.pickupDuration.ParseToInt().IsNullOrZero() ? "" : ((orderWaybill.pickupDuration.ParseToInt() / 3600.0m).ToString("f2") + "小时" + "\r\n" + "[" + (is24 ? "次日" : "48小时") + "]"),
orderWaybill.delivery.deliveryName, orderWaybill.delivery.deliveryName,
orderWaybill.waybillId, orderWaybill.waybillId,
orderWaybill.optimizeWaybillId + "\r\n" + orderWaybill.optimizeTime, orderWaybill.optimizeTime + "\r\n" + orderWaybill.optimizeWaybillId.Replace("修改物流信息失败", "补发失败"),
"补发", "补发",
orderWaybill.remark.Trim().IsNullOrEmpty() ? "添加备注" : orderWaybill.remark.Trim() orderWaybill.remark.Trim().IsNullOrEmpty() ? "添加备注" : orderWaybill.remark.Trim()
); );
dgvData3.Rows[rowIndex].Height = 60; var row = dgvData3.Rows[rowIndex];
row.Height = 60;
if (orderWaybill.optimizeWaybillId.Contains("失败"))
row.Cells["colDgv3OptimizeStatus"].Style.ForeColor = Color.Red;
else if (!orderWaybill.optimizeTime.IsNullOrEmpty() && !orderWaybill.optimizeTime.ParseToString().StartsWith(DateTime.Now.ToString("MM-dd")))
row.Cells["colDgv3OptimizeStatus"].Style.ForeColor = Color.Orange;
})); }));
} }
} }
@@ -1683,9 +1699,9 @@ namespace TemuKJD.WXForms.ShopForms
{ {
var ov = optimizeLst.FirstOrDefault(o => o.order_id == linerCgi.order_id); var ov = optimizeLst.FirstOrDefault(o => o.order_id == linerCgi.order_id);
linerCgi.optimizeWaybillId = ov == null ? "" : ov.waybill_id; linerCgi.optimizeWaybillId = ov == null ? "" : ov.waybill_id;
linerCgi.optimizeTime = ov == null ? "" : ov?.use_time?.ToString("yyyy-MM-dd HH:mm"); linerCgi.optimizeTime = ov == null ? "" : ov?.use_time?.ToString("MM-dd HH:mm");
if (!string.IsNullOrEmpty(linerCgi.optimizeWaybillId)) if (!string.IsNullOrEmpty(linerCgi.optimizeWaybillId))
linerCgi.optimizeWaybillId = "已补发"; linerCgi.optimizeWaybillId = "已补发" + "\r\n" + ov?.delivery_id + ":" + ov?.waybill_id;
} }
} }
catch (Exception ex) catch (Exception ex)
@@ -1732,7 +1748,7 @@ namespace TemuKJD.WXForms.ShopForms
{ {
var ov = optimizeLst.FirstOrDefault(o => o.order_id == linerCgi.order_id); var ov = optimizeLst.FirstOrDefault(o => o.order_id == linerCgi.order_id);
linerCgi.optimizeWaybillId = ov == null ? "" : ov.optimize_rst; linerCgi.optimizeWaybillId = ov == null ? "" : ov.optimize_rst;
linerCgi.optimizeTime = ov == null ? "" : ov?.mdy_time.ToString("yyyy-MM-dd HH:mm"); linerCgi.optimizeTime = ov == null ? "" : ov?.mdy_time.ToString("MM-dd HH:mm");
} }
} }
} }
@@ -1815,12 +1831,17 @@ namespace TemuKJD.WXForms.ShopForms
BaseClass.StampToDateTime(orderLinerCgiInfo.collect_time.ParseToInt()).ToString("yy-MM-dd HH:mm:ss") + "\r\n" + BaseClass.StampToDateTime(orderLinerCgiInfo.receipt_time.ParseToInt()).ToString("yy-MM-dd HH:mm:ss"), BaseClass.StampToDateTime(orderLinerCgiInfo.collect_time.ParseToInt()).ToString("yy-MM-dd HH:mm:ss") + "\r\n" + BaseClass.StampToDateTime(orderLinerCgiInfo.receipt_time.ParseToInt()).ToString("yy-MM-dd HH:mm:ss"),
"发货地:" + orderLinerCgiInfo.ship_city + "\r\n" + "收货地:" + orderLinerCgiInfo.ship_province + orderLinerCgiInfo.receipt_city, "发货地:" + orderLinerCgiInfo.ship_city + "\r\n" + "收货地:" + orderLinerCgiInfo.ship_province + orderLinerCgiInfo.receipt_city,
(orderLinerCgiInfo.transport_duration.ParseToInt() / 3600) + "小时" + (orderLinerCgiInfo.transport_duration.ParseToInt() % 3600) / 60 + "分" + "\r\n标准时长" + (orderLinerCgiInfo.transport_std_duration.ParseToInt() / 3600) + "小时", (orderLinerCgiInfo.transport_duration.ParseToInt() / 3600) + "小时" + (orderLinerCgiInfo.transport_duration.ParseToInt() % 3600) / 60 + "分" + "\r\n标准时长" + (orderLinerCgiInfo.transport_std_duration.ParseToInt() / 3600) + "小时",
orderLinerCgiInfo.optimizeWaybillId + "\r\n" + orderLinerCgiInfo.optimizeTime, orderLinerCgiInfo.optimizeTime + "\r\n" + orderLinerCgiInfo.optimizeWaybillId.Replace("修改物流信息失败", "补发失败"),
"补发", "补发",
orderLinerCgiInfo.remark.Trim().IsNullOrEmpty() ? "添加备注" : orderLinerCgiInfo.remark.Trim() orderLinerCgiInfo.remark.Trim().IsNullOrEmpty() ? "添加备注" : orderLinerCgiInfo.remark.Trim()
); );
dgvData4.Rows[rowIndex].Height = 60; var row = dgvData4.Rows[rowIndex];
row.Height = 60;
if (orderLinerCgiInfo.optimizeWaybillId.Contains("失败"))
row.Cells["colDgv4OptimizeStatus"].Style.ForeColor = Color.Red;
else if (!orderLinerCgiInfo.optimizeTime.IsNullOrEmpty() && !orderLinerCgiInfo.optimizeTime.ParseToString().StartsWith(DateTime.Now.ToString("MM-dd")))
row.Cells["colDgv4OptimizeStatus"].Style.ForeColor = Color.Orange;
})); }));
} }
} }
@@ -1894,11 +1915,11 @@ namespace TemuKJD.WXForms.ShopForms
{ {
data += "&waybill_id=" + waybill_id; data += "&waybill_id=" + waybill_id;
data += "&delivery_name=" + delivery_name; data += "&delivery_name=" + delivery_name;
data += "&optimize_rst=补发成功"; data += "&optimize_rst=补发成功" + " " + delivery_id + ":" + waybill_id;
} }
else else
{ {
data += "&optimize_rst=" + (msg.IsNullOrEmpty() ? "补发失败" : msg); data += "&optimize_rst=" + (msg.IsNullOrEmpty() ? "补发失败" : msg) + " " + delivery_id + ":" + waybill_id;
} }
html = GetHtml.PostUtf8(url, data); html = GetHtml.PostUtf8(url, data);
@@ -1926,13 +1947,13 @@ namespace TemuKJD.WXForms.ShopForms
{ {
var errMsg = BaseRegex.GetStringJson(ref html, "msg"); var errMsg = BaseRegex.GetStringJson(ref html, "msg");
if (!optimizeExpressRst.ParseToString().Contains("修改物流信息成功") && !optimizeExpressRst.ParseToString().Contains("<code>200</code>")) if (!optimizeExpressRst.ParseToString().Contains("修改物流信息成功") && !optimizeExpressRst.ParseToString().Contains("<code>200</code>"))
return "补发失败,还原失败\r\n" + errMsg + " " + msg; return "补发失败,还原失败\r\n" + errMsg + " " + msg + " " + delivery_id + ":" + waybill_id;
else else
return "补发失败\r\n" + errMsg; return "补发状态记录失败\r\n" + errMsg + " " + delivery_id + ":" + waybill_id;
} }
if (!optimizeExpressRst.ParseToString().Contains("修改物流信息成功") && !optimizeExpressRst.ParseToString().Contains("<code>200</code>")) if (!optimizeExpressRst.ParseToString().Contains("修改物流信息成功") && !optimizeExpressRst.ParseToString().Contains("<code>200</code>"))
return "补发失败,已还原\r\n" + msg; return "补发失败,已还原\r\n" + msg + " " + delivery_id + ":" + waybill_id;
return "补发成功"; return "补发成功" + " " + delivery_id + ":" + waybill_id;
} }
private void dgvData_CellContentClick(object sender, DataGridViewCellEventArgs e) private void dgvData_CellContentClick(object sender, DataGridViewCellEventArgs e)
@@ -2008,6 +2029,7 @@ namespace TemuKJD.WXForms.ShopForms
} }
var rst = OptimizeExpress(shop, orderId, row.Cells[$"colDgv{dgvNum}OrderTime"].Value.ParseToString()); var rst = OptimizeExpress(shop, orderId, row.Cells[$"colDgv{dgvNum}OrderTime"].Value.ParseToString());
row.Cells[$"colDgv{dgvNum}OptimizeStatus"].Value = rst; row.Cells[$"colDgv{dgvNum}OptimizeStatus"].Value = rst;
row.Cells[$"colDgv{dgvNum}OptimizeStatus"].Style.ForeColor = rst.Contains("成功") ? Control.DefaultForeColor : Color.Red;
break; break;
} }
case "备注": case "备注":
+131 -42
View File
@@ -36,6 +36,10 @@ namespace TemuKJD.WXForms.TalkForms
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(OtherBuyerOrderListForm)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(OtherBuyerOrderListForm));
this.panel1 = new System.Windows.Forms.Panel(); this.panel1 = new System.Windows.Forms.Panel();
this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.label5 = new System.Windows.Forms.Label();
this.btnClear = new DevComponents.DotNetBar.PanelEx();
this.btnFilterOrder = new DevComponents.DotNetBar.PanelEx();
this.txtFilter = new System.Windows.Forms.TextBox();
this.cmbBuyerName = new System.Windows.Forms.ComboBox(); this.cmbBuyerName = new System.Windows.Forms.ComboBox();
this.txtOrderAmount = new System.Windows.Forms.TextBox(); this.txtOrderAmount = new System.Windows.Forms.TextBox();
this.label4 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label();
@@ -46,7 +50,7 @@ namespace TemuKJD.WXForms.TalkForms
this.btnSendOrder = new DevComponents.DotNetBar.PanelEx(); this.btnSendOrder = new DevComponents.DotNetBar.PanelEx();
this.btnRestore = new DevComponents.DotNetBar.PanelEx(); this.btnRestore = new DevComponents.DotNetBar.PanelEx();
this.label2 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label();
this.dgvPddBuyerOrder = new TemuKJD.UserComponent.DataGridViewEx(); this.dgvBuyerOrder = new TemuKJD.UserComponent.DataGridViewEx();
this.dataGridViewCheckBoxColumn1 = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.dataGridViewCheckBoxColumn1 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.colOBuyerId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colOBuyerId = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colOBuyerName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colOBuyerName = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -60,6 +64,7 @@ namespace TemuKJD.WXForms.TalkForms
this.colOExpressName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colOExpressName = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colOExpressId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colOExpressId = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colOMsg = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colOMsg = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colOEdit = new System.Windows.Forms.DataGridViewLinkColumn();
this.colSend = new System.Windows.Forms.DataGridViewLinkColumn(); this.colSend = new System.Windows.Forms.DataGridViewLinkColumn();
this.colAfterSale = new System.Windows.Forms.DataGridViewLinkColumn(); this.colAfterSale = new System.Windows.Forms.DataGridViewLinkColumn();
this.panel1.SuspendLayout(); this.panel1.SuspendLayout();
@@ -67,7 +72,7 @@ namespace TemuKJD.WXForms.TalkForms
this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout();
this.splitContainer1.SuspendLayout(); this.splitContainer1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dgvPddBuyerOrder)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dgvBuyerOrder)).BeginInit();
this.SuspendLayout(); this.SuspendLayout();
// //
// panel1 // panel1
@@ -78,7 +83,7 @@ namespace TemuKJD.WXForms.TalkForms
this.panel1.Location = new System.Drawing.Point(1, 33); this.panel1.Location = new System.Drawing.Point(1, 33);
this.panel1.Name = "panel1"; this.panel1.Name = "panel1";
this.panel1.Padding = new System.Windows.Forms.Padding(4); this.panel1.Padding = new System.Windows.Forms.Padding(4);
this.panel1.Size = new System.Drawing.Size(907, 483); this.panel1.Size = new System.Drawing.Size(1098, 516);
this.panel1.TabIndex = 1; this.panel1.TabIndex = 1;
// //
// splitContainer1 // splitContainer1
@@ -90,6 +95,10 @@ namespace TemuKJD.WXForms.TalkForms
// //
// splitContainer1.Panel1 // splitContainer1.Panel1
// //
this.splitContainer1.Panel1.Controls.Add(this.label5);
this.splitContainer1.Panel1.Controls.Add(this.btnClear);
this.splitContainer1.Panel1.Controls.Add(this.btnFilterOrder);
this.splitContainer1.Panel1.Controls.Add(this.txtFilter);
this.splitContainer1.Panel1.Controls.Add(this.cmbBuyerName); this.splitContainer1.Panel1.Controls.Add(this.cmbBuyerName);
this.splitContainer1.Panel1.Controls.Add(this.txtOrderAmount); this.splitContainer1.Panel1.Controls.Add(this.txtOrderAmount);
this.splitContainer1.Panel1.Controls.Add(this.label4); this.splitContainer1.Panel1.Controls.Add(this.label4);
@@ -103,16 +112,81 @@ namespace TemuKJD.WXForms.TalkForms
// //
// splitContainer1.Panel2 // splitContainer1.Panel2
// //
this.splitContainer1.Panel2.Controls.Add(this.dgvPddBuyerOrder); this.splitContainer1.Panel2.Controls.Add(this.dgvBuyerOrder);
this.splitContainer1.Size = new System.Drawing.Size(899, 475); this.splitContainer1.Size = new System.Drawing.Size(1090, 508);
this.splitContainer1.SplitterDistance = 77; this.splitContainer1.SplitterDistance = 82;
this.splitContainer1.TabIndex = 0; this.splitContainer1.TabIndex = 0;
// //
// label5
//
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(14, 19);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(126, 17);
this.label5.TabIndex = 982;
this.label5.Text = "买手/订单号/物流单号";
//
// btnClear
//
this.btnClear.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnClear.CanvasColor = System.Drawing.SystemColors.Control;
this.btnClear.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnClear.DisabledBackColor = System.Drawing.Color.Empty;
this.btnClear.Location = new System.Drawing.Point(1011, 45);
this.btnClear.Name = "btnClear";
this.btnClear.Size = new System.Drawing.Size(57, 23);
this.btnClear.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnClear.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
this.btnClear.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
this.btnClear.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
this.btnClear.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnClear.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
this.btnClear.Style.GradientAngle = 90;
this.btnClear.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
this.btnClear.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
this.btnClear.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnClear.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnClear.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
this.btnClear.TabIndex = 969;
this.btnClear.Text = "置空";
this.btnClear.Click += new System.EventHandler(this.btnClear_Click);
//
// btnFilterOrder
//
this.btnFilterOrder.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnFilterOrder.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnFilterOrder.DisabledBackColor = System.Drawing.Color.Empty;
this.btnFilterOrder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnFilterOrder.Location = new System.Drawing.Point(215, 45);
this.btnFilterOrder.Name = "btnFilterOrder";
this.btnFilterOrder.Size = new System.Drawing.Size(45, 23);
this.btnFilterOrder.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnFilterOrder.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnFilterOrder.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnFilterOrder.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
this.btnFilterOrder.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
this.btnFilterOrder.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
this.btnFilterOrder.Style.ForeColor.Color = System.Drawing.Color.White;
this.btnFilterOrder.Style.GradientAngle = 90;
this.btnFilterOrder.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
this.btnFilterOrder.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
this.btnFilterOrder.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
this.btnFilterOrder.TabIndex = 965;
this.btnFilterOrder.Text = "过滤";
this.btnFilterOrder.Click += new System.EventHandler(this.btnFilterOrder_Click);
//
// txtFilter
//
this.txtFilter.Location = new System.Drawing.Point(140, 16);
this.txtFilter.Name = "txtFilter";
this.txtFilter.Size = new System.Drawing.Size(169, 23);
this.txtFilter.TabIndex = 961;
//
// cmbBuyerName // cmbBuyerName
// //
this.cmbBuyerName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.cmbBuyerName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.cmbBuyerName.FormattingEnabled = true; this.cmbBuyerName.FormattingEnabled = true;
this.cmbBuyerName.Location = new System.Drawing.Point(430, 11); this.cmbBuyerName.Location = new System.Drawing.Point(618, 15);
this.cmbBuyerName.Name = "cmbBuyerName"; this.cmbBuyerName.Name = "cmbBuyerName";
this.cmbBuyerName.Size = new System.Drawing.Size(160, 25); this.cmbBuyerName.Size = new System.Drawing.Size(160, 25);
this.cmbBuyerName.TabIndex = 954; this.cmbBuyerName.TabIndex = 954;
@@ -120,7 +194,7 @@ namespace TemuKJD.WXForms.TalkForms
// txtOrderAmount // txtOrderAmount
// //
this.txtOrderAmount.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.txtOrderAmount.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.txtOrderAmount.Location = new System.Drawing.Point(657, 12); this.txtOrderAmount.Location = new System.Drawing.Point(845, 16);
this.txtOrderAmount.Name = "txtOrderAmount"; this.txtOrderAmount.Name = "txtOrderAmount";
this.txtOrderAmount.Size = new System.Drawing.Size(160, 23); this.txtOrderAmount.Size = new System.Drawing.Size(160, 23);
this.txtOrderAmount.TabIndex = 947; this.txtOrderAmount.TabIndex = 947;
@@ -129,7 +203,7 @@ namespace TemuKJD.WXForms.TalkForms
// //
this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.label4.AutoSize = true; this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(601, 15); this.label4.Location = new System.Drawing.Point(789, 19);
this.label4.Name = "label4"; this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(56, 17); this.label4.Size = new System.Drawing.Size(56, 17);
this.label4.TabIndex = 946; this.label4.TabIndex = 946;
@@ -138,7 +212,7 @@ namespace TemuKJD.WXForms.TalkForms
// txtExpressSn // txtExpressSn
// //
this.txtExpressSn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.txtExpressSn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.txtExpressSn.Location = new System.Drawing.Point(657, 41); this.txtExpressSn.Location = new System.Drawing.Point(845, 45);
this.txtExpressSn.Name = "txtExpressSn"; this.txtExpressSn.Name = "txtExpressSn";
this.txtExpressSn.Size = new System.Drawing.Size(160, 23); this.txtExpressSn.Size = new System.Drawing.Size(160, 23);
this.txtExpressSn.TabIndex = 945; this.txtExpressSn.TabIndex = 945;
@@ -147,7 +221,7 @@ namespace TemuKJD.WXForms.TalkForms
// //
this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.label3.AutoSize = true; this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(601, 44); this.label3.Location = new System.Drawing.Point(789, 48);
this.label3.Name = "label3"; this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(56, 17); this.label3.Size = new System.Drawing.Size(56, 17);
this.label3.TabIndex = 944; this.label3.TabIndex = 944;
@@ -156,7 +230,7 @@ namespace TemuKJD.WXForms.TalkForms
// txtBuyerOrderSn // txtBuyerOrderSn
// //
this.txtBuyerOrderSn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.txtBuyerOrderSn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.txtBuyerOrderSn.Location = new System.Drawing.Point(430, 41); this.txtBuyerOrderSn.Location = new System.Drawing.Point(618, 45);
this.txtBuyerOrderSn.Name = "txtBuyerOrderSn"; this.txtBuyerOrderSn.Name = "txtBuyerOrderSn";
this.txtBuyerOrderSn.Size = new System.Drawing.Size(160, 23); this.txtBuyerOrderSn.Size = new System.Drawing.Size(160, 23);
this.txtBuyerOrderSn.TabIndex = 942; this.txtBuyerOrderSn.TabIndex = 942;
@@ -165,7 +239,7 @@ namespace TemuKJD.WXForms.TalkForms
// //
this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.label1.AutoSize = true; this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(374, 15); this.label1.Location = new System.Drawing.Point(562, 19);
this.label1.Name = "label1"; this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(56, 17); this.label1.Size = new System.Drawing.Size(56, 17);
this.label1.TabIndex = 941; this.label1.TabIndex = 941;
@@ -178,7 +252,7 @@ namespace TemuKJD.WXForms.TalkForms
this.btnSendOrder.Cursor = System.Windows.Forms.Cursors.Hand; this.btnSendOrder.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnSendOrder.DisabledBackColor = System.Drawing.Color.Empty; this.btnSendOrder.DisabledBackColor = System.Drawing.Color.Empty;
this.btnSendOrder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSendOrder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSendOrder.Location = new System.Drawing.Point(823, 12); this.btnSendOrder.Location = new System.Drawing.Point(1011, 16);
this.btnSendOrder.Name = "btnSendOrder"; this.btnSendOrder.Name = "btnSendOrder";
this.btnSendOrder.Size = new System.Drawing.Size(57, 23); this.btnSendOrder.Size = new System.Drawing.Size(57, 23);
this.btnSendOrder.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnSendOrder.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -201,7 +275,7 @@ namespace TemuKJD.WXForms.TalkForms
this.btnRestore.CanvasColor = System.Drawing.SystemColors.Control; this.btnRestore.CanvasColor = System.Drawing.SystemColors.Control;
this.btnRestore.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnRestore.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnRestore.DisabledBackColor = System.Drawing.Color.Empty; this.btnRestore.DisabledBackColor = System.Drawing.Color.Empty;
this.btnRestore.Location = new System.Drawing.Point(3, 3); this.btnRestore.Location = new System.Drawing.Point(264, 45);
this.btnRestore.Name = "btnRestore"; this.btnRestore.Name = "btnRestore";
this.btnRestore.Size = new System.Drawing.Size(45, 23); this.btnRestore.Size = new System.Drawing.Size(45, 23);
this.btnRestore.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnRestore.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -218,28 +292,28 @@ namespace TemuKJD.WXForms.TalkForms
this.btnRestore.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; this.btnRestore.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
this.btnRestore.TabIndex = 939; this.btnRestore.TabIndex = 939;
this.btnRestore.Text = "还原"; this.btnRestore.Text = "还原";
this.btnRestore.Visible = false; this.btnRestore.Click += new System.EventHandler(this.btnRestore_Click);
// //
// label2 // label2
// //
this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.label2.AutoSize = true; this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(362, 44); this.label2.Location = new System.Drawing.Point(550, 48);
this.label2.Name = "label2"; this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(68, 17); this.label2.Size = new System.Drawing.Size(68, 17);
this.label2.TabIndex = 943; this.label2.TabIndex = 943;
this.label2.Text = "拍单订单号"; this.label2.Text = "拍单订单号";
// //
// dgvPddBuyerOrder // dgvBuyerOrder
// //
this.dgvPddBuyerOrder.AllowUserToAddRows = false; this.dgvBuyerOrder.AllowUserToAddRows = false;
this.dgvPddBuyerOrder.AllowUserToDeleteRows = false; this.dgvBuyerOrder.AllowUserToDeleteRows = false;
dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke; dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke;
this.dgvPddBuyerOrder.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; this.dgvBuyerOrder.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
this.dgvPddBuyerOrder.AutoRowNumber = true; this.dgvBuyerOrder.AutoRowNumber = true;
this.dgvPddBuyerOrder.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.dgvBuyerOrder.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
this.dgvPddBuyerOrder.BackgroundColor = System.Drawing.Color.White; this.dgvBuyerOrder.BackgroundColor = System.Drawing.Color.White;
this.dgvPddBuyerOrder.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.dgvBuyerOrder.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -247,9 +321,9 @@ namespace TemuKJD.WXForms.TalkForms
dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvPddBuyerOrder.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; this.dgvBuyerOrder.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
this.dgvPddBuyerOrder.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvBuyerOrder.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvPddBuyerOrder.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.dgvBuyerOrder.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.dataGridViewCheckBoxColumn1, this.dataGridViewCheckBoxColumn1,
this.colOBuyerId, this.colOBuyerId,
this.colOBuyerName, this.colOBuyerName,
@@ -263,17 +337,18 @@ namespace TemuKJD.WXForms.TalkForms
this.colOExpressName, this.colOExpressName,
this.colOExpressId, this.colOExpressId,
this.colOMsg, this.colOMsg,
this.colOEdit,
this.colSend, this.colSend,
this.colAfterSale}); this.colAfterSale});
this.dgvPddBuyerOrder.Dock = System.Windows.Forms.DockStyle.Fill; this.dgvBuyerOrder.Dock = System.Windows.Forms.DockStyle.Fill;
this.dgvPddBuyerOrder.Location = new System.Drawing.Point(0, 0); this.dgvBuyerOrder.Location = new System.Drawing.Point(0, 0);
this.dgvPddBuyerOrder.MultiSelectCheckBox = true; this.dgvBuyerOrder.MultiSelectCheckBox = true;
this.dgvPddBuyerOrder.Name = "dgvPddBuyerOrder"; this.dgvBuyerOrder.Name = "dgvBuyerOrder";
this.dgvPddBuyerOrder.ReadOnly = true; this.dgvBuyerOrder.ReadOnly = true;
this.dgvPddBuyerOrder.RowTemplate.Height = 23; this.dgvBuyerOrder.RowTemplate.Height = 23;
this.dgvPddBuyerOrder.Size = new System.Drawing.Size(899, 394); this.dgvBuyerOrder.Size = new System.Drawing.Size(1090, 422);
this.dgvPddBuyerOrder.TabIndex = 887; this.dgvBuyerOrder.TabIndex = 887;
this.dgvPddBuyerOrder.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvPddBuyerOrder_CellContentClick); this.dgvBuyerOrder.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvPddBuyerOrder_CellContentClick);
// //
// dataGridViewCheckBoxColumn1 // dataGridViewCheckBoxColumn1
// //
@@ -375,9 +450,18 @@ namespace TemuKJD.WXForms.TalkForms
this.colOMsg.Name = "colOMsg"; this.colOMsg.Name = "colOMsg";
this.colOMsg.ReadOnly = true; this.colOMsg.ReadOnly = true;
// //
// colOEdit
//
this.colOEdit.FillWeight = 40F;
this.colOEdit.HeaderText = "编辑";
this.colOEdit.Name = "colOEdit";
this.colOEdit.ReadOnly = true;
this.colOEdit.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.colOEdit.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
//
// colSend // colSend
// //
this.colSend.FillWeight = 50F; this.colSend.FillWeight = 40F;
this.colSend.HeaderText = "发送"; this.colSend.HeaderText = "发送";
this.colSend.Name = "colSend"; this.colSend.Name = "colSend";
this.colSend.ReadOnly = true; this.colSend.ReadOnly = true;
@@ -395,7 +479,7 @@ namespace TemuKJD.WXForms.TalkForms
// OtherBuyerOrderListForm // OtherBuyerOrderListForm
// //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.ClientSize = new System.Drawing.Size(909, 517); this.ClientSize = new System.Drawing.Size(1100, 550);
this.Controls.Add(this.panel1); this.Controls.Add(this.panel1);
this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
@@ -412,7 +496,7 @@ namespace TemuKJD.WXForms.TalkForms
this.splitContainer1.Panel2.ResumeLayout(false); this.splitContainer1.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
this.splitContainer1.ResumeLayout(false); this.splitContainer1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.dgvPddBuyerOrder)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dgvBuyerOrder)).EndInit();
this.ResumeLayout(false); this.ResumeLayout(false);
} }
@@ -421,7 +505,7 @@ namespace TemuKJD.WXForms.TalkForms
private System.Windows.Forms.Panel panel1; private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.SplitContainer splitContainer1; private System.Windows.Forms.SplitContainer splitContainer1;
private UserComponent.DataGridViewEx dgvPddBuyerOrder; private UserComponent.DataGridViewEx dgvBuyerOrder;
private System.Windows.Forms.TextBox txtExpressSn; private System.Windows.Forms.TextBox txtExpressSn;
private System.Windows.Forms.Label label3; private System.Windows.Forms.Label label3;
private System.Windows.Forms.TextBox txtBuyerOrderSn; private System.Windows.Forms.TextBox txtBuyerOrderSn;
@@ -431,6 +515,10 @@ namespace TemuKJD.WXForms.TalkForms
private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label2;
private System.Windows.Forms.Label label4; private System.Windows.Forms.Label label4;
private System.Windows.Forms.TextBox txtOrderAmount; private System.Windows.Forms.TextBox txtOrderAmount;
private System.Windows.Forms.ComboBox cmbBuyerName;
private System.Windows.Forms.TextBox txtFilter;
private DevComponents.DotNetBar.PanelEx btnClear;
private DevComponents.DotNetBar.PanelEx btnFilterOrder;
private System.Windows.Forms.DataGridViewCheckBoxColumn dataGridViewCheckBoxColumn1; private System.Windows.Forms.DataGridViewCheckBoxColumn dataGridViewCheckBoxColumn1;
private System.Windows.Forms.DataGridViewTextBoxColumn colOBuyerId; private System.Windows.Forms.DataGridViewTextBoxColumn colOBuyerId;
private System.Windows.Forms.DataGridViewTextBoxColumn colOBuyerName; private System.Windows.Forms.DataGridViewTextBoxColumn colOBuyerName;
@@ -444,8 +532,9 @@ namespace TemuKJD.WXForms.TalkForms
private System.Windows.Forms.DataGridViewTextBoxColumn colOExpressName; private System.Windows.Forms.DataGridViewTextBoxColumn colOExpressName;
private System.Windows.Forms.DataGridViewTextBoxColumn colOExpressId; private System.Windows.Forms.DataGridViewTextBoxColumn colOExpressId;
private System.Windows.Forms.DataGridViewTextBoxColumn colOMsg; private System.Windows.Forms.DataGridViewTextBoxColumn colOMsg;
private System.Windows.Forms.DataGridViewLinkColumn colOEdit;
private System.Windows.Forms.DataGridViewLinkColumn colSend; private System.Windows.Forms.DataGridViewLinkColumn colSend;
private System.Windows.Forms.DataGridViewLinkColumn colAfterSale; private System.Windows.Forms.DataGridViewLinkColumn colAfterSale;
private System.Windows.Forms.ComboBox cmbBuyerName; private System.Windows.Forms.Label label5;
} }
} }
@@ -70,10 +70,10 @@ namespace TemuKJD.WXForms.TalkForms
if (order == null) if (order == null)
return; return;
var row = dgvPddBuyerOrder.Rows.Cast<DataGridViewRow>().FirstOrDefault(p => p.Cells.GetCellValueFromColumnName("colOOtherOrderSn").ParseToString() == order.order_sn); var row = dgvBuyerOrder.Rows.Cast<DataGridViewRow>().FirstOrDefault(p => p.Cells.GetCellValueFromColumnName("colOOtherOrderSn").ParseToString() == order.order_sn);
if (row == null) if (row == null)
{ {
var rowIndex = this.dgvPddBuyerOrder.Rows.Add( var rowIndex = this.dgvBuyerOrder.Rows.Add(
false, false,
order.buyerId, order.buyerId,
order.buyerName, order.buyerName,
@@ -87,10 +87,11 @@ namespace TemuKJD.WXForms.TalkForms
order.outExpressCompanyName, order.outExpressCompanyName,
order.tracking_number, order.tracking_number,
order.sendStatus, order.sendStatus,
"编辑",
"发送", "发送",
"退货" "退货"
); );
row = dgvPddBuyerOrder.Rows[rowIndex]; row = dgvBuyerOrder.Rows[rowIndex];
row.Height = 40; row.Height = 40;
} }
@@ -170,7 +171,7 @@ namespace TemuKJD.WXForms.TalkForms
order.order_time = BaseClass.DateTimeToTimestampSeconds(DateTime.Now); order.order_time = BaseClass.DateTimeToTimestampSeconds(DateTime.Now);
order.order_status_prompt = ""; order.order_status_prompt = "";
if (order.buyerName.IsNullOrEmpty() || order.order_amount == 0 || order.order_sn.IsNullOrEmpty() || order.tracking_number.IsNullOrEmpty()) if (order.buyerName.IsNullOrEmpty() || order.order_amount == 0 || order.order_sn.IsNullOrEmpty() /*|| order.tracking_number.IsNullOrEmpty()*/)
{ {
BaseMsgForm.ShowError("请完整填写拍单信息"); BaseMsgForm.ShowError("请完整填写拍单信息");
return; return;
@@ -181,8 +182,11 @@ namespace TemuKJD.WXForms.TalkForms
lstOtherBuyerOrderInfoLite.Add(order); lstOtherBuyerOrderInfoLite.Add(order);
else else
{ {
if (BaseMsgForm.ShowConfirm("已存在该买手订单,是否覆盖并重复发送?").DialogResult != DialogResult.OK) if (!orderExist.tracking_number.IsNullOrEmpty() || order.tracking_number.IsNullOrEmpty())
return; {
if (BaseMsgForm.ShowConfirm("已存在买手订单,是否覆盖并重复发送?").DialogResult != DialogResult.OK)
return;
}
orderExist.order_amount = order.order_amount; orderExist.order_amount = order.order_amount;
orderExist.buyerName = order.buyerName; orderExist.buyerName = order.buyerName;
orderExist.outExpressCompanyMsg = order.outExpressCompanyMsg; orderExist.outExpressCompanyMsg = order.outExpressCompanyMsg;
@@ -216,7 +220,7 @@ namespace TemuKJD.WXForms.TalkForms
return; return;
if (resetSendStatus) if (resetSendStatus)
order.sendStatus = ""; order.sendStatus = "";
var row = dgvPddBuyerOrder.Rows.Cast<DataGridViewRow>().FirstOrDefault(p => p.Cells.GetCellValueFromColumnName("colOPddOrderSn").ParseToString() == order.order_sn); var row = dgvBuyerOrder.Rows.Cast<DataGridViewRow>().FirstOrDefault(p => p.Cells.GetCellValueFromColumnName("colOPddOrderSn").ParseToString() == order.order_sn);
Invoke(new Action(() => Invoke(new Action(() =>
{ {
if (row != null) if (row != null)
@@ -329,23 +333,26 @@ namespace TemuKJD.WXForms.TalkForms
{ {
if (e.ColumnIndex < 0 || e.RowIndex < 0) if (e.ColumnIndex < 0 || e.RowIndex < 0)
return; return;
string headerText = dgvPddBuyerOrder.Columns[e.ColumnIndex].HeaderText; string headerText = dgvBuyerOrder.Columns[e.ColumnIndex].HeaderText;
var orderSn = dgvPddBuyerOrder.Rows[e.RowIndex].Cells["colOOtherOrderSn"].Value.ParseToString(); var orderSn = dgvBuyerOrder.Rows[e.RowIndex].Cells["colOOtherOrderSn"].Value.ParseToString();
var order = lstOtherBuyerOrderInfoLite.FirstOrDefault(p => p.order_sn == orderSn); var order = lstOtherBuyerOrderInfoLite.FirstOrDefault(p => p.order_sn == orderSn);
var row = dgvBuyerOrder.Rows[e.RowIndex];
switch (headerText) switch (headerText)
{ {
case "详情": case "编辑":
case "编辑/详情": cmbBuyerName.Text = row.Cells["colOBuyerName"].Value.ParseToString();
txtOrderAmount.Text = row.Cells["colOOrderAmount"].Value.ParseToString();
txtBuyerOrderSn.Text = row.Cells["colOOtherOrderSn"].Value.ParseToString();
txtExpressSn.Text = row.Cells["colOExpressId"].Value.ParseToString();
break; break;
case "图片": case "图片":
ShowImgForm imgFrom = new ShowImgForm(dgvPddBuyerOrder.Rows[e.RowIndex].Cells["colImgUrl"].Value.ParseToString().Replace("?imageView2/2/w/90/h/90", "")); ShowImgForm imgFrom = new ShowImgForm(dgvBuyerOrder.Rows[e.RowIndex].Cells["colImgUrl"].Value.ParseToString().Replace("?imageView2/2/w/90/h/90", ""));
imgFrom.ShowDialog(); imgFrom.ShowDialog();
break; break;
case "": case "":
case "全选": case "全选":
dgvPddBuyerOrder.Rows[e.RowIndex].Cells["colCheck"].Value = !(bool)dgvPddBuyerOrder.Rows[e.RowIndex].Cells["colCheck"].Value; dgvBuyerOrder.Rows[e.RowIndex].Cells["colCheck"].Value = !(bool)dgvBuyerOrder.Rows[e.RowIndex].Cells["colCheck"].Value;
break; break;
case "发送": case "发送":
if (tempWaitOrderLst.Any(o => o.order_sn == order.order_sn)) if (tempWaitOrderLst.Any(o => o.order_sn == order.order_sn))
@@ -368,5 +375,42 @@ namespace TemuKJD.WXForms.TalkForms
break; break;
} }
} }
private void btnClear_Click(object sender, EventArgs e)
{
cmbBuyerName.Text = "";
txtBuyerOrderSn.Text = "";
txtExpressSn.Text = "";
txtOrderAmount.Text = "";
}
private void btnFilterOrder_Click(object sender, EventArgs e)
{
foreach(DataGridViewRow row in dgvBuyerOrder.Rows)
{
if (row.Cells["colOBuyerName"].Value.ParseToString().Contains(txtFilter.Text.Trim()))
{
row.Visible = true;
continue;
}
if (row.Cells["colOOtherOrderSn"].Value.ParseToString().Contains(txtFilter.Text.Trim()))
{
row.Visible = true;
continue;
}
if (row.Cells["colOExpressId"].Value.ParseToString().Contains(txtFilter.Text.Trim()))
{
row.Visible = true;
continue;
}
row.Visible = false;
}
}
private void btnRestore_Click(object sender, EventArgs e)
{
txtFilter.Text = "";
btnFilterOrder_Click(null, null);
}
} }
} }
@@ -156,6 +156,9 @@
<metadata name="colOMsg.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="colOMsg.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<metadata name="colOEdit.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="colSend.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="colSend.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
@@ -881,10 +881,14 @@ namespace TemuKJD.WXForms.TalkForms
if (DateTime.Now > nextGetOrderTime) if (DateTime.Now > nextGetOrderTime)
{ {
nextGetOrderTime = DateTime.Now.AddMinutes(30); nextGetOrderTime = DateTime.Now.AddMinutes(25);
GetPddOrder(); GetPddOrder();
MakeWxToPddAfterSales(); MakeWxToPddAfterSales();
} }
if (isReadOrder)
{
nextGetOrderTime = DateTime.Now.AddMinutes(25);
}
Thread.Sleep(1000); Thread.Sleep(1000);
Invoke(new Action(() => Invoke(new Action(() =>
{ {
@@ -1071,7 +1075,7 @@ namespace TemuKJD.WXForms.TalkForms
private void btnSearch_Click(object sender, EventArgs e) private void btnSearch_Click(object sender, EventArgs e)
{ {
nextGetOrderTime = DateTime.Now.AddMinutes(30); nextGetOrderTime = DateTime.Now.AddMinutes(25);
GetPddOrder(); GetPddOrder();
MakeWxToPddAfterSales(); MakeWxToPddAfterSales();
} }