1商品上传测试标题逻辑修改 2商品退货包裹详情获取

2025-08-08 16:18:38 +08:00
1 parent d7550ae559
commit 16aae6cc86
@@ -201,6 +201,7 @@
    <Compile Include="Model\Result\TemuProductInfo.cs" />
    <Compile Include="Model\Param\TemuProductManage\TemuProductParam.cs" />
    <Compile Include="Model\Result\TemuDBProduct.cs" />
+    <Compile Include="Model\Result\TemuReturnPackageDetailInfo.cs" />
    <Compile Include="Model\Result\TemuStockInfo.cs" />
    <Compile Include="Model\Param\UploadManage\UploadCommissionParam.cs" />
    <Compile Include="Model\Param\UploadManage\UploadErrorParam.cs" />
@@ -27,8 +27,8 @@ namespace AllBase
        /// <summary>
        /// 版本ID
        /// </summary>
-        public static int VersionCount = 505;
-        //public static int VersionCount = 505;
+        public static int VersionCount = 508;
+        //public static int VersionCount = 508;

        /// <summary>
        /// 版本号
@@ -658,7 +658,7 @@ namespace AllBase.Model.Param.TemuProductManage
        /// <summary>
        /// 
        /// </summary>
-        public long? productDraftId { get; set; }
+        public long? productDraftId { get; set; } = 0;
    }

    public class productCarouseVideoReqItem
@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AllBase.Model.Result
+{
+    public class TemuReturnPackageDetailInfo
+    {
+        public long? productSpuId { get; set; }
+        public long? productSkuId { get; set; }
+        /// <summary>
+        /// 备货单号
+        /// </summary>
+        public string purchaseSubOrderSn { get; set; }
+        /// <summary>
+        /// 退货包裹号
+        /// </summary>
+        public string packageSn { get; set; }
+        /// <summary>
+        /// sku件数
+        /// </summary>
+        public int? quantity { get; set; }
+        /// <summary>
+        /// 出库时间
+        /// </summary>
+        public long? outboundTime { get; set; }
+        public string thumbUrl { get; set; }
+        public long? productSkcId { get; set; }
+        public string mainSaleSpec { get; set; }
+        public string secondarySaleSpec { get; set; }
+        public int? orderType { get; set; }
+        /// <summary>
+        /// 退货类型描述
+        /// </summary>
+        public string orderTypeDesc { get; set; }
+        /// <summary>
+        /// 退货原因
+        /// </summary>
+        public List<string> reasonDesc { get; set; } 
+        public string remark { get; set; }
+    }
+}
@@ -481,6 +481,12 @@
    <Compile Include="KJDForms\ShopForms\Old\MaterialManageForm.Designer.cs">
      <DependentUpon>MaterialManageForm.cs</DependentUpon>
    </Compile>
+    <Compile Include="KJDForms\ShopForms\ReturnPackageDetailForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="KJDForms\ShopForms\ReturnPackageDetailForm.Designer.cs">
+      <DependentUpon>ReturnPackageDetailForm.cs</DependentUpon>
+    </Compile>
    <Compile Include="KJDForms\ShopForms\ShopAddEditForm.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -1024,6 +1030,9 @@
    <EmbeddedResource Include="KJDForms\ShopForms\Old\MaterialManageForm.resx">
      <DependentUpon>MaterialManageForm.cs</DependentUpon>
    </EmbeddedResource>
+    <EmbeddedResource Include="KJDForms\ShopForms\ReturnPackageDetailForm.resx">
+      <DependentUpon>ReturnPackageDetailForm.cs</DependentUpon>
+    </EmbeddedResource>
    <EmbeddedResource Include="KJDForms\ShopForms\ShopAddEditForm.resx">
      <DependentUpon>ShopAddEditForm.cs</DependentUpon>
    </EmbeddedResource>
@@ -46,6 +46,7 @@
            this.chkCloseAfterLogin = new DevComponents.DotNetBar.Controls.CheckBoxX();
            this.splitContainer2 = new System.Windows.Forms.SplitContainer();
            this.txtAddress = new System.Windows.Forms.TextBox();
+            this.btnReturnPackage = new TemuKJD.UserControls.ButtonEx();
            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
            this.splitContainer1.Panel2.SuspendLayout();
            this.splitContainer1.SuspendLayout();
@@ -69,6 +70,7 @@
            // splitContainer1.Panel2
            // 
            this.splitContainer1.Panel2.BackColor = System.Drawing.Color.White;
+            this.splitContainer1.Panel2.Controls.Add(this.btnReturnPackage);
            this.splitContainer1.Panel2.Controls.Add(this.btnLoginAgain);
            this.splitContainer1.Panel2.Controls.Add(this.pnlMultiLogin);
            this.splitContainer1.Panel2.Controls.Add(this.label2);
@@ -81,7 +83,7 @@
            this.splitContainer1.Panel2.Controls.Add(this.btnReload);
            this.splitContainer1.Panel2.Controls.Add(this.chkCloseAfterLogin);
            this.splitContainer1.Size = new System.Drawing.Size(1438, 736);
-            this.splitContainer1.SplitterDistance = 674;
+            this.splitContainer1.SplitterDistance = 675;
            this.splitContainer1.SplitterWidth = 3;
            this.splitContainer1.TabIndex = 4;
            // 
@@ -107,7 +109,7 @@
            this.pnlMultiLogin.Controls.Add(this.cmbMultiCookieName);
            this.pnlMultiLogin.Controls.Add(this.btnMultiLogin);
            this.pnlMultiLogin.Controls.Add(this.btnDel);
-            this.pnlMultiLogin.Location = new System.Drawing.Point(403, 1);
+            this.pnlMultiLogin.Location = new System.Drawing.Point(370, 8);
            this.pnlMultiLogin.Name = "pnlMultiLogin";
            this.pnlMultiLogin.Size = new System.Drawing.Size(270, 33);
            this.pnlMultiLogin.TabIndex = 461;
@@ -319,7 +321,7 @@
            // 
            // txtAddress
            // 
-            this.txtAddress.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+            this.txtAddress.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
            | System.Windows.Forms.AnchorStyles.Right)));
            this.txtAddress.Location = new System.Drawing.Point(3, 3);
            this.txtAddress.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
@@ -328,14 +330,31 @@
            this.txtAddress.TabIndex = 7;
            this.txtAddress.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtAddress_KeyDown);
            // 
-            // ShopLoginForm
+            // btnReturnPackage
+            // 
+            this.btnReturnPackage.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnReturnPackage.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnReturnPackage.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.btnReturnPackage.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnReturnPackage.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnReturnPackage.ForeColor = System.Drawing.Color.White;
+            this.btnReturnPackage.Location = new System.Drawing.Point(674, 17);
+            this.btnReturnPackage.Margin = new System.Windows.Forms.Padding(2);
+            this.btnReturnPackage.Name = "btnReturnPackage";
+            this.btnReturnPackage.Size = new System.Drawing.Size(136, 25);
+            this.btnReturnPackage.TabIndex = 463;
+            this.btnReturnPackage.Text = "提交退货到库存管理";
+            this.btnReturnPackage.UseVisualStyleBackColor = false;
+            this.btnReturnPackage.Click += new System.EventHandler(this.btnReturnPackage_Click);
+            // 
+            // AdminShopLoginForm
            // 
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
            this.ClientSize = new System.Drawing.Size(1440, 800);
            this.Controls.Add(this.splitContainer2);
            this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-            this.Name = "ShopLoginForm";
+            this.Name = "AdminShopLoginForm";
            this.ShowMaximizeBox = true;
            this.Text = "店铺登录";
            this.TitleText = "店铺登录";
@@ -375,5 +394,6 @@
        private DevComponents.DotNetBar.PanelEx btnMultiLogin;
        private System.Windows.Forms.Panel pnlMultiLogin;
        private UserControls.ButtonEx btnLoginAgain;
+        private UserControls.ButtonEx btnReturnPackage;
    }
 }
@@ -894,5 +894,13 @@ function getElementWithText(sText)
                InputUserNameAndPassword(cefWebBrowser, shop.LoginName, DataOpenSSL.DecryptString(shop.Password));
            });
        }
+
+
+
+        private void btnReturnPackage_Click(object sender, EventArgs e)
+        {
+            ReturnPackageDetailForm form = new ReturnPackageDetailForm(this.shop);
+            form.ShowDialog();
+        }
    }
 }
@@ -32,18 +32,19 @@
            System.Windows.Forms.TreeNode treeNode2 = new System.Windows.Forms.TreeNode("调价管理");
            System.Windows.Forms.TreeNode treeNode3 = new System.Windows.Forms.TreeNode("商品认领");
            System.Windows.Forms.TreeNode treeNode4 = new System.Windows.Forms.TreeNode("库存上传");
-            System.Windows.Forms.TreeNode treeNode5 = new System.Windows.Forms.TreeNode("商品发布");
-            System.Windows.Forms.TreeNode treeNode6 = new System.Windows.Forms.TreeNode("佣金设置");
-            System.Windows.Forms.TreeNode treeNode7 = new System.Windows.Forms.TreeNode("净化数据");
-            System.Windows.Forms.TreeNode treeNode8 = new System.Windows.Forms.TreeNode("产品数据库");
-            System.Windows.Forms.TreeNode treeNode9 = new System.Windows.Forms.TreeNode("商品上下架");
-            System.Windows.Forms.TreeNode treeNode10 = new System.Windows.Forms.TreeNode("清理无流量");
-            System.Windows.Forms.TreeNode treeNode11 = new System.Windows.Forms.TreeNode("库存管理");
-            System.Windows.Forms.TreeNode treeNode12 = new System.Windows.Forms.TreeNode("特殊延迟发货");
-            System.Windows.Forms.TreeNode treeNode13 = new System.Windows.Forms.TreeNode("云违规排查");
-            System.Windows.Forms.TreeNode treeNode14 = new System.Windows.Forms.TreeNode("跳转上家");
-            System.Windows.Forms.TreeNode treeNode15 = new System.Windows.Forms.TreeNode("上传错误列表");
-            System.Windows.Forms.TreeNode treeNode16 = new System.Windows.Forms.TreeNode("商品管理", new System.Windows.Forms.TreeNode[] {
+            System.Windows.Forms.TreeNode treeNode5 = new System.Windows.Forms.TreeNode("活动报名");
+            System.Windows.Forms.TreeNode treeNode6 = new System.Windows.Forms.TreeNode("商品发布");
+            System.Windows.Forms.TreeNode treeNode7 = new System.Windows.Forms.TreeNode("佣金设置");
+            System.Windows.Forms.TreeNode treeNode8 = new System.Windows.Forms.TreeNode("净化数据");
+            System.Windows.Forms.TreeNode treeNode9 = new System.Windows.Forms.TreeNode("产品数据库");
+            System.Windows.Forms.TreeNode treeNode10 = new System.Windows.Forms.TreeNode("商品上下架");
+            System.Windows.Forms.TreeNode treeNode11 = new System.Windows.Forms.TreeNode("清理无流量");
+            System.Windows.Forms.TreeNode treeNode12 = new System.Windows.Forms.TreeNode("库存管理");
+            System.Windows.Forms.TreeNode treeNode13 = new System.Windows.Forms.TreeNode("特殊延迟发货");
+            System.Windows.Forms.TreeNode treeNode14 = new System.Windows.Forms.TreeNode("云违规排查");
+            System.Windows.Forms.TreeNode treeNode15 = new System.Windows.Forms.TreeNode("跳转上家");
+            System.Windows.Forms.TreeNode treeNode16 = new System.Windows.Forms.TreeNode("上传错误列表");
+            System.Windows.Forms.TreeNode treeNode17 = new System.Windows.Forms.TreeNode("商品管理", new System.Windows.Forms.TreeNode[] {
            treeNode1,
            treeNode2,
            treeNode3,
@@ -58,7 +59,8 @@
            treeNode12,
            treeNode13,
            treeNode14,
-            treeNode15});
+            treeNode15,
+            treeNode16});
            this.panel1 = new System.Windows.Forms.Panel();
            this.panel3 = new System.Windows.Forms.Panel();
            this.panel2 = new System.Windows.Forms.Panel();
@@ -157,33 +159,35 @@
            treeNode3.Text = "商品认领";
            treeNode4.Name = "库存上传";
            treeNode4.Text = "库存上传";
-            treeNode5.Name = "商品发布";
-            treeNode5.Text = "商品发布";
-            treeNode6.Name = "佣金设置";
-            treeNode6.Text = "佣金设置";
-            treeNode7.Name = "净化数据";
-            treeNode7.Text = "净化数据";
-            treeNode8.Name = "产品数据库";
-            treeNode8.Text = "产品数据库";
-            treeNode9.Name = "商品上下架";
-            treeNode9.Text = "商品上下架";
-            treeNode10.Name = "清理无流量";
-            treeNode10.Text = "清理无流量";
-            treeNode11.Name = "库存管理";
-            treeNode11.Text = "库存管理";
-            treeNode12.Name = "特殊延迟发货";
-            treeNode12.Text = "特殊延迟发货";
-            treeNode13.Name = "云违规排查";
-            treeNode13.Text = "云违规排查";
-            treeNode14.Name = "跳转上家";
-            treeNode14.Tag = "bottom";
-            treeNode14.Text = "跳转上家";
-            treeNode15.Name = "上传错误列表";
-            treeNode15.Text = "上传错误列表";
-            treeNode16.Name = "商品管理";
-            treeNode16.Text = "商品管理";
+            treeNode5.Name = "活动报名";
+            treeNode5.Text = "活动报名";
+            treeNode6.Name = "商品发布";
+            treeNode6.Text = "商品发布";
+            treeNode7.Name = "佣金设置";
+            treeNode7.Text = "佣金设置";
+            treeNode8.Name = "净化数据";
+            treeNode8.Text = "净化数据";
+            treeNode9.Name = "产品数据库";
+            treeNode9.Text = "产品数据库";
+            treeNode10.Name = "商品上下架";
+            treeNode10.Text = "商品上下架";
+            treeNode11.Name = "清理无流量";
+            treeNode11.Text = "清理无流量";
+            treeNode12.Name = "库存管理";
+            treeNode12.Text = "库存管理";
+            treeNode13.Name = "特殊延迟发货";
+            treeNode13.Text = "特殊延迟发货";
+            treeNode14.Name = "云违规排查";
+            treeNode14.Text = "云违规排查";
+            treeNode15.Name = "跳转上家";
+            treeNode15.Tag = "bottom";
+            treeNode15.Text = "跳转上家";
+            treeNode16.Name = "上传错误列表";
+            treeNode16.Text = "上传错误列表";
+            treeNode17.Name = "商品管理";
+            treeNode17.Text = "商品管理";
            this.tv.Nodes.AddRange(new System.Windows.Forms.TreeNode[] {
-            treeNode16});
+            treeNode17});
            this.tv.OverForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
            this.tv.Size = new System.Drawing.Size(140, 521);
            this.tv.TabIndex = 1;
@@ -24,6 +24,7 @@ namespace TemuKJD.KJDForms.ProductForms
        public Lazy<PriceManageForm> priceManageForm = new Lazy<PriceManageForm>();
        public Lazy<DbProductUserSelectForm> userSelectDbProductForm = new Lazy<DbProductUserSelectForm>();
        public Lazy<ProductThirdUserSelectForm> userSelectThirdProductForm = new Lazy<ProductThirdUserSelectForm>();
+        public Lazy<MarketingActivityForm> marketingActivityForm = new Lazy<MarketingActivityForm>();


        public Lazy<UploadProductForm> uploadProductForm = new Lazy<UploadProductForm>();
@@ -71,6 +72,9 @@ namespace TemuKJD.KJDForms.ProductForms
                        case "库存上传":
                            SetForm(userSelectThirdProductForm.Value);
                            break;
+                        case "活动报名":
+                            SetForm(marketingActivityForm.Value);
+                            break;
                        case "商品发布":
                            SetForm(uploadProductForm.Value);
                            break;
@@ -42,17 +42,13 @@
            this.btnReFission = new TemuKJD.UserControls.ButtonEx();
            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
            this.label6 = new System.Windows.Forms.Label();
-            this.chkShowDel = new TemuKJD.UserComponent.UcCheckBox(this.components);
-            this.chkNoSubSa = new TemuKJD.UserComponent.UcCheckBox(this.components);
            this.txtShopId = new System.Windows.Forms.TextBox();
            this.chkUploadProd = new TemuKJD.UserComponent.UcCheckBox(this.components);
            this.cmbStatus = new System.Windows.Forms.ComboBox();
-            this.pnlEmpty = new DevComponents.DotNetBar.PanelEx();
            this.label7 = new System.Windows.Forms.Label();
            this.label8 = new System.Windows.Forms.Label();
            this.txtShopName = new System.Windows.Forms.TextBox();
            this.label5 = new System.Windows.Forms.Label();
-            this.btnSearch = new TemuKJD.UserControls.ButtonEx();
            this.txtSKC = new System.Windows.Forms.TextBox();
            this.txtSPU = new System.Windows.Forms.TextBox();
            this.label1 = new System.Windows.Forms.Label();
@@ -67,11 +63,18 @@
            this.txtSkuHeadText = new System.Windows.Forms.TextBox();
            this.label10 = new System.Windows.Forms.Label();
            this.txtSkuEndText = new System.Windows.Forms.TextBox();
+            this.chkHeadWords = new TemuKJD.UserComponent.UcCheckBox(this.components);
+            this.chkEndWords = new TemuKJD.UserComponent.UcCheckBox(this.components);
+            this.chkFission = new TemuKJD.UserComponent.UcCheckBox(this.components);
            this.chkReFissionAllProdName = new TemuKJD.UserComponent.UcCheckBox(this.components);
            this.chkRandomSkuOrder = new TemuKJD.UserComponent.UcCheckBox(this.components);
            this.chkSkuRandomPrice = new TemuKJD.UserComponent.UcCheckBox(this.components);
            this.numSkuRandomPrice = new System.Windows.Forms.NumericUpDown();
            this.label11 = new System.Windows.Forms.Label();
+            this.btnSearch = new TemuKJD.UserControls.ButtonEx();
+            this.chkNoSubSa = new TemuKJD.UserComponent.UcCheckBox(this.components);
+            this.pnlEmpty = new DevComponents.DotNetBar.PanelEx();
+            this.chkShowDel = new TemuKJD.UserComponent.UcCheckBox(this.components);
            this.btnSetSubSa = new TemuKJD.UserControls.ButtonEx();
            this.btnAdd = new TemuKJD.UserControls.ButtonEx();
            this.splitContainer2 = new System.Windows.Forms.SplitContainer();
@@ -186,17 +189,13 @@
            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
            this.tableLayoutPanel1.Controls.Add(this.label6, 0, 0);
-            this.tableLayoutPanel1.Controls.Add(this.chkShowDel, 19, 0);
-            this.tableLayoutPanel1.Controls.Add(this.chkNoSubSa, 18, 0);
            this.tableLayoutPanel1.Controls.Add(this.txtShopId, 1, 0);
            this.tableLayoutPanel1.Controls.Add(this.chkUploadProd, 20, 0);
            this.tableLayoutPanel1.Controls.Add(this.cmbStatus, 15, 0);
-            this.tableLayoutPanel1.Controls.Add(this.pnlEmpty, 17, 0);
            this.tableLayoutPanel1.Controls.Add(this.label7, 2, 0);
            this.tableLayoutPanel1.Controls.Add(this.label8, 14, 0);
            this.tableLayoutPanel1.Controls.Add(this.txtShopName, 3, 0);
            this.tableLayoutPanel1.Controls.Add(this.label5, 4, 0);
-            this.tableLayoutPanel1.Controls.Add(this.btnSearch, 16, 0);
            this.tableLayoutPanel1.Controls.Add(this.txtSKC, 7, 0);
            this.tableLayoutPanel1.Controls.Add(this.txtSPU, 5, 0);
            this.tableLayoutPanel1.Controls.Add(this.label1, 6, 0);
@@ -207,67 +206,48 @@
            this.tableLayoutPanel1.Controls.Add(this.label4, 12, 0);
            this.tableLayoutPanel1.Controls.Add(this.txtProdName, 11, 0);
            this.tableLayoutPanel1.Controls.Add(this.flowLayoutPanel1, 0, 1);
-            this.tableLayoutPanel1.Location = new System.Drawing.Point(3, 5);
+            this.tableLayoutPanel1.Controls.Add(this.btnSearch, 19, 0);
+            this.tableLayoutPanel1.Controls.Add(this.chkNoSubSa, 16, 0);
+            this.tableLayoutPanel1.Controls.Add(this.pnlEmpty, 18, 0);
+            this.tableLayoutPanel1.Controls.Add(this.chkShowDel, 17, 0);
+            this.tableLayoutPanel1.Location = new System.Drawing.Point(3, 3);
            this.tableLayoutPanel1.Name = "tableLayoutPanel1";
            this.tableLayoutPanel1.RowCount = 2;
            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(1145, 56);
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(1145, 60);
            this.tableLayoutPanel1.TabIndex = 190;
            // 
            // label6
            // 
            this.label6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
            this.label6.AutoSize = true;
-            this.label6.Location = new System.Drawing.Point(3, 5);
+            this.label6.Location = new System.Drawing.Point(3, 7);
            this.label6.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
            this.label6.Name = "label6";
            this.label6.Size = new System.Drawing.Size(44, 17);
            this.label6.TabIndex = 449;
            this.label6.Text = "店铺Id";
            // 
-            // chkShowDel
-            // 
-            this.chkShowDel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.chkShowDel.AutoSize = true;
-            this.chkShowDel.Location = new System.Drawing.Point(966, 3);
-            this.chkShowDel.Margin = new System.Windows.Forms.Padding(0);
-            this.chkShowDel.Name = "chkShowDel";
-            this.chkShowDel.Size = new System.Drawing.Size(75, 21);
-            this.chkShowDel.TabIndex = 468;
-            this.chkShowDel.Text = "显示删除";
-            this.chkShowDel.UseVisualStyleBackColor = true;
-            this.chkShowDel.CheckedChanged += new System.EventHandler(this.chkShowDel_CheckedChanged);
-            // 
-            // chkNoSubSa
-            // 
-            this.chkNoSubSa.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.chkNoSubSa.AutoSize = true;
-            this.chkNoSubSa.Location = new System.Drawing.Point(879, 3);
-            this.chkNoSubSa.Margin = new System.Windows.Forms.Padding(4, 0, 0, 0);
-            this.chkNoSubSa.Name = "chkNoSubSa";
-            this.chkNoSubSa.Size = new System.Drawing.Size(87, 21);
-            this.chkNoSubSa.TabIndex = 467;
-            this.chkNoSubSa.Text = "未分配超管";
-            this.chkNoSubSa.UseVisualStyleBackColor = true;
-            // 
            // txtShopId
            // 
            this.txtShopId.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtShopId.Location = new System.Drawing.Point(47, 2);
+            this.txtShopId.Location = new System.Drawing.Point(47, 4);
            this.txtShopId.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
            this.txtShopId.Name = "txtShopId";
-            this.txtShopId.Size = new System.Drawing.Size(49, 23);
+            this.txtShopId.Size = new System.Drawing.Size(48, 23);
            this.txtShopId.TabIndex = 448;
            // 
            // chkUploadProd
            // 
            this.chkUploadProd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
            this.chkUploadProd.AutoSize = true;
-            this.chkUploadProd.Location = new System.Drawing.Point(1041, 3);
-            this.chkUploadProd.Margin = new System.Windows.Forms.Padding(0);
+            this.chkUploadProd.Location = new System.Drawing.Point(1039, 19);
+            this.chkUploadProd.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
            this.chkUploadProd.Name = "chkUploadProd";
-            this.chkUploadProd.Size = new System.Drawing.Size(104, 21);
+            this.tableLayoutPanel1.SetRowSpan(this.chkUploadProd, 2);
+            this.chkUploadProd.Size = new System.Drawing.Size(106, 21);
            this.chkUploadProd.TabIndex = 470;
            this.chkUploadProd.Text = "上传到未发布";
            this.chkUploadProd.UseVisualStyleBackColor = true;
@@ -280,44 +260,18 @@
            "待上传",
            "已上传",
            "全部"});
-            this.cmbStatus.Location = new System.Drawing.Point(702, 4);
+            this.cmbStatus.Location = new System.Drawing.Point(695, 6);
            this.cmbStatus.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
            this.cmbStatus.Name = "cmbStatus";
-            this.cmbStatus.Size = new System.Drawing.Size(49, 25);
+            this.cmbStatus.Size = new System.Drawing.Size(48, 25);
            this.cmbStatus.TabIndex = 459;
            this.cmbStatus.Text = "待上传";
            // 
-            // pnlEmpty
-            // 
-            this.pnlEmpty.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.pnlEmpty.CanvasColor = System.Drawing.SystemColors.Control;
-            this.pnlEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.pnlEmpty.DisabledBackColor = System.Drawing.Color.Empty;
-            this.pnlEmpty.Location = new System.Drawing.Point(817, 3);
-            this.pnlEmpty.Margin = new System.Windows.Forms.Padding(2);
-            this.pnlEmpty.Name = "pnlEmpty";
-            this.pnlEmpty.Size = new System.Drawing.Size(56, 22);
-            this.pnlEmpty.Style.Alignment = System.Drawing.StringAlignment.Center;
-            this.pnlEmpty.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
-            this.pnlEmpty.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
-            this.pnlEmpty.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
-            this.pnlEmpty.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
-            this.pnlEmpty.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
-            this.pnlEmpty.Style.GradientAngle = 90;
-            this.pnlEmpty.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
-            this.pnlEmpty.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
-            this.pnlEmpty.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
-            this.pnlEmpty.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
-            this.pnlEmpty.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
-            this.pnlEmpty.TabIndex = 431;
-            this.pnlEmpty.Text = "清空条件";
-            this.pnlEmpty.Click += new System.EventHandler(this.pnlEmpty_Click);
-            // 
            // label7
            // 
            this.label7.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
            this.label7.AutoSize = true;
-            this.label7.Location = new System.Drawing.Point(102, 5);
+            this.label7.Location = new System.Drawing.Point(101, 7);
            this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
            this.label7.Name = "label7";
            this.label7.Size = new System.Drawing.Size(56, 17);
@@ -328,7 +282,7 @@
            // 
            this.label8.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
            this.label8.AutoSize = true;
-            this.label8.Location = new System.Drawing.Point(646, 5);
+            this.label8.Location = new System.Drawing.Point(639, 7);
            this.label8.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
            this.label8.Name = "label8";
            this.label8.Size = new System.Drawing.Size(56, 17);
@@ -338,63 +292,46 @@
            // txtShopName
            // 
            this.txtShopName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtShopName.Location = new System.Drawing.Point(158, 2);
+            this.txtShopName.Location = new System.Drawing.Point(157, 4);
            this.txtShopName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
            this.txtShopName.Name = "txtShopName";
-            this.txtShopName.Size = new System.Drawing.Size(49, 23);
+            this.txtShopName.Size = new System.Drawing.Size(48, 23);
            this.txtShopName.TabIndex = 451;
            // 
            // label5
            // 
            this.label5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
            this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(213, 5);
+            this.label5.Location = new System.Drawing.Point(211, 7);
            this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
            this.label5.Name = "label5";
            this.label5.Size = new System.Drawing.Size(31, 17);
            this.label5.TabIndex = 435;
            this.label5.Text = "SPU";
            // 
-            // btnSearch
-            // 
-            this.btnSearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnSearch.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
-            this.btnSearch.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.btnSearch.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnSearch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnSearch.ForeColor = System.Drawing.Color.White;
-            this.btnSearch.Location = new System.Drawing.Point(757, 2);
-            this.btnSearch.Margin = new System.Windows.Forms.Padding(6, 2, 2, 2);
-            this.btnSearch.Name = "btnSearch";
-            this.btnSearch.Size = new System.Drawing.Size(56, 24);
-            this.btnSearch.TabIndex = 424;
-            this.btnSearch.Text = "搜索";
-            this.btnSearch.UseVisualStyleBackColor = false;
-            this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click);
-            // 
            // txtSKC
            // 
            this.txtSKC.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtSKC.Location = new System.Drawing.Point(330, 2);
+            this.txtSKC.Location = new System.Drawing.Point(327, 4);
            this.txtSKC.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
            this.txtSKC.Name = "txtSKC";
-            this.txtSKC.Size = new System.Drawing.Size(49, 23);
+            this.txtSKC.Size = new System.Drawing.Size(48, 23);
            this.txtSKC.TabIndex = 432;
            // 
            // txtSPU
            // 
            this.txtSPU.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtSPU.Location = new System.Drawing.Point(244, 2);
+            this.txtSPU.Location = new System.Drawing.Point(242, 4);
            this.txtSPU.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
            this.txtSPU.Name = "txtSPU";
-            this.txtSPU.Size = new System.Drawing.Size(49, 23);
+            this.txtSPU.Size = new System.Drawing.Size(48, 23);
            this.txtSPU.TabIndex = 434;
            // 
            // label1
            // 
            this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(299, 5);
+            this.label1.Location = new System.Drawing.Point(296, 7);
            this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
            this.label1.Name = "label1";
            this.label1.Size = new System.Drawing.Size(31, 17);
@@ -405,7 +342,7 @@
            // 
            this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(385, 5);
+            this.label2.Location = new System.Drawing.Point(381, 7);
            this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
            this.label2.Name = "label2";
            this.label2.Size = new System.Drawing.Size(32, 17);
@@ -415,26 +352,26 @@
            // txtCat
            // 
            this.txtCat.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtCat.Location = new System.Drawing.Point(417, 2);
+            this.txtCat.Location = new System.Drawing.Point(413, 4);
            this.txtCat.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
            this.txtCat.Name = "txtCat";
-            this.txtCat.Size = new System.Drawing.Size(49, 23);
+            this.txtCat.Size = new System.Drawing.Size(48, 23);
            this.txtCat.TabIndex = 425;
            // 
            // txtExtCode
            // 
            this.txtExtCode.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtExtCode.Location = new System.Drawing.Point(591, 2);
+            this.txtExtCode.Location = new System.Drawing.Point(585, 4);
            this.txtExtCode.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
            this.txtExtCode.Name = "txtExtCode";
-            this.txtExtCode.Size = new System.Drawing.Size(49, 23);
+            this.txtExtCode.Size = new System.Drawing.Size(48, 23);
            this.txtExtCode.TabIndex = 429;
            // 
            // label3
            // 
            this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
            this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(472, 5);
+            this.label3.Location = new System.Drawing.Point(467, 7);
            this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
            this.label3.Name = "label3";
            this.label3.Size = new System.Drawing.Size(32, 17);
@@ -445,7 +382,7 @@
            // 
            this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
            this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(559, 5);
+            this.label4.Location = new System.Drawing.Point(553, 7);
            this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
            this.label4.Name = "label4";
            this.label4.Size = new System.Drawing.Size(32, 17);
@@ -455,29 +392,32 @@
            // txtProdName
            // 
            this.txtProdName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtProdName.Location = new System.Drawing.Point(504, 2);
+            this.txtProdName.Location = new System.Drawing.Point(499, 4);
            this.txtProdName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
            this.txtProdName.Name = "txtProdName";
-            this.txtProdName.Size = new System.Drawing.Size(49, 23);
+            this.txtProdName.Size = new System.Drawing.Size(48, 23);
            this.txtProdName.TabIndex = 427;
            // 
            // flowLayoutPanel1
            // 
            this.flowLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.tableLayoutPanel1.SetColumnSpan(this.flowLayoutPanel1, 100);
+            this.tableLayoutPanel1.SetColumnSpan(this.flowLayoutPanel1, 18);
            this.flowLayoutPanel1.Controls.Add(this.label9);
            this.flowLayoutPanel1.Controls.Add(this.txtSkuHeadText);
            this.flowLayoutPanel1.Controls.Add(this.label10);
            this.flowLayoutPanel1.Controls.Add(this.txtSkuEndText);
+            this.flowLayoutPanel1.Controls.Add(this.chkFission);
+            this.flowLayoutPanel1.Controls.Add(this.chkHeadWords);
+            this.flowLayoutPanel1.Controls.Add(this.chkEndWords);
            this.flowLayoutPanel1.Controls.Add(this.chkReFissionAllProdName);
            this.flowLayoutPanel1.Controls.Add(this.chkRandomSkuOrder);
            this.flowLayoutPanel1.Controls.Add(this.chkSkuRandomPrice);
            this.flowLayoutPanel1.Controls.Add(this.numSkuRandomPrice);
            this.flowLayoutPanel1.Controls.Add(this.label11);
-            this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 28);
+            this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 32);
            this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(0);
            this.flowLayoutPanel1.Name = "flowLayoutPanel1";
-            this.flowLayoutPanel1.Size = new System.Drawing.Size(1145, 28);
+            this.flowLayoutPanel1.Size = new System.Drawing.Size(909, 28);
            this.flowLayoutPanel1.TabIndex = 471;
            // 
            // label9
@@ -497,7 +437,7 @@
            this.txtSkuHeadText.Location = new System.Drawing.Point(55, 3);
            this.txtSkuHeadText.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
            this.txtSkuHeadText.Name = "txtSkuHeadText";
-            this.txtSkuHeadText.Size = new System.Drawing.Size(156, 23);
+            this.txtSkuHeadText.Size = new System.Drawing.Size(91, 23);
            this.txtSkuHeadText.TabIndex = 452;
            this.txtSkuHeadText.TextChanged += new System.EventHandler(this.txtSkuHeadText_TextChanged);
            // 
@@ -505,7 +445,7 @@
            // 
            this.label10.Anchor = System.Windows.Forms.AnchorStyles.None;
            this.label10.AutoSize = true;
-            this.label10.Location = new System.Drawing.Point(214, 6);
+            this.label10.Location = new System.Drawing.Point(149, 6);
            this.label10.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
            this.label10.Name = "label10";
            this.label10.Size = new System.Drawing.Size(52, 17);
@@ -515,23 +455,59 @@
            // txtSkuEndText
            // 
            this.txtSkuEndText.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtSkuEndText.Location = new System.Drawing.Point(266, 3);
+            this.txtSkuEndText.Location = new System.Drawing.Point(201, 3);
            this.txtSkuEndText.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
            this.txtSkuEndText.Name = "txtSkuEndText";
-            this.txtSkuEndText.Size = new System.Drawing.Size(159, 23);
+            this.txtSkuEndText.Size = new System.Drawing.Size(92, 23);
            this.txtSkuEndText.TabIndex = 454;
            this.txtSkuEndText.TextChanged += new System.EventHandler(this.txtSkuEndText_TextChanged);
            // 
+            // chkHeadWords
+            // 
+            this.chkHeadWords.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.chkHeadWords.AutoSize = true;
+            this.chkHeadWords.Location = new System.Drawing.Point(380, 4);
+            this.chkHeadWords.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
+            this.chkHeadWords.Name = "chkHeadWords";
+            this.chkHeadWords.Size = new System.Drawing.Size(75, 21);
+            this.chkHeadWords.TabIndex = 473;
+            this.chkHeadWords.Text = "标题前缀";
+            this.chkHeadWords.UseVisualStyleBackColor = true;
+            // 
+            // chkEndWords
+            // 
+            this.chkEndWords.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.chkEndWords.AutoSize = true;
+            this.chkEndWords.Location = new System.Drawing.Point(461, 4);
+            this.chkEndWords.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
+            this.chkEndWords.Name = "chkEndWords";
+            this.chkEndWords.Size = new System.Drawing.Size(75, 21);
+            this.chkEndWords.TabIndex = 474;
+            this.chkEndWords.Text = "标题后缀";
+            this.chkEndWords.UseVisualStyleBackColor = true;
+            // 
+            // chkFission
+            // 
+            this.chkFission.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.chkFission.AutoSize = true;
+            this.chkFission.Location = new System.Drawing.Point(299, 4);
+            this.chkFission.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
+            this.chkFission.Name = "chkFission";
+            this.chkFission.Size = new System.Drawing.Size(75, 21);
+            this.chkFission.TabIndex = 475;
+            this.chkFission.Text = "标题重组";
+            this.chkFission.UseVisualStyleBackColor = true;
+            // 
            // chkReFissionAllProdName
            // 
            this.chkReFissionAllProdName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
            this.chkReFissionAllProdName.AutoSize = true;
-            this.chkReFissionAllProdName.Location = new System.Drawing.Point(431, 4);
+            this.chkReFissionAllProdName.Location = new System.Drawing.Point(542, 4);
            this.chkReFissionAllProdName.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
            this.chkReFissionAllProdName.Name = "chkReFissionAllProdName";
-            this.chkReFissionAllProdName.Size = new System.Drawing.Size(147, 21);
+            this.chkReFissionAllProdName.Size = new System.Drawing.Size(99, 21);
            this.chkReFissionAllProdName.TabIndex = 472;
-            this.chkReFissionAllProdName.Text = "商品标题二次完全打乱";
+            this.chkReFissionAllProdName.Text = "标题完全打乱";
            this.chkReFissionAllProdName.UseVisualStyleBackColor = true;
            this.chkReFissionAllProdName.CheckedChanged += new System.EventHandler(this.chkReFissionAllProdName_CheckedChanged);
            // 
@@ -539,7 +515,7 @@
            // 
            this.chkRandomSkuOrder.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
            this.chkRandomSkuOrder.AutoSize = true;
-            this.chkRandomSkuOrder.Location = new System.Drawing.Point(582, 4);
+            this.chkRandomSkuOrder.Location = new System.Drawing.Point(645, 4);
            this.chkRandomSkuOrder.Margin = new System.Windows.Forms.Padding(4, 0, 0, 0);
            this.chkRandomSkuOrder.Name = "chkRandomSkuOrder";
            this.chkRandomSkuOrder.Size = new System.Drawing.Size(95, 21);
@@ -552,7 +528,7 @@
            // 
            this.chkSkuRandomPrice.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
            this.chkSkuRandomPrice.AutoSize = true;
-            this.chkSkuRandomPrice.Location = new System.Drawing.Point(683, 4);
+            this.chkSkuRandomPrice.Location = new System.Drawing.Point(746, 4);
            this.chkSkuRandomPrice.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
            this.chkSkuRandomPrice.Name = "chkSkuRandomPrice";
            this.chkSkuRandomPrice.Size = new System.Drawing.Size(119, 21);
@@ -569,10 +545,10 @@
            0,
            0,
            131072});
-            this.numSkuRandomPrice.Location = new System.Drawing.Point(802, 3);
+            this.numSkuRandomPrice.Location = new System.Drawing.Point(865, 3);
            this.numSkuRandomPrice.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
            this.numSkuRandomPrice.Name = "numSkuRandomPrice";
-            this.numSkuRandomPrice.Size = new System.Drawing.Size(55, 23);
+            this.numSkuRandomPrice.Size = new System.Drawing.Size(44, 23);
            this.numSkuRandomPrice.TabIndex = 470;
            this.numSkuRandomPrice.Value = new decimal(new int[] {
            20,
@@ -585,13 +561,83 @@
            // 
            this.label11.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
            this.label11.AutoSize = true;
-            this.label11.Location = new System.Drawing.Point(863, 6);
+            this.label11.Location = new System.Drawing.Point(6, 29);
            this.label11.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
            this.label11.Name = "label11";
            this.label11.Size = new System.Drawing.Size(20, 17);
            this.label11.TabIndex = 471;
            this.label11.Text = "元";
            // 
+            // btnSearch
+            // 
+            this.btnSearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnSearch.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnSearch.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.btnSearch.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnSearch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnSearch.ForeColor = System.Drawing.Color.White;
+            this.btnSearch.Location = new System.Drawing.Point(975, 18);
+            this.btnSearch.Margin = new System.Windows.Forms.Padding(6, 2, 2, 2);
+            this.btnSearch.Name = "btnSearch";
+            this.tableLayoutPanel1.SetRowSpan(this.btnSearch, 2);
+            this.btnSearch.Size = new System.Drawing.Size(56, 24);
+            this.btnSearch.TabIndex = 424;
+            this.btnSearch.Text = "搜索";
+            this.btnSearch.UseVisualStyleBackColor = false;
+            this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click);
+            // 
+            // chkNoSubSa
+            // 
+            this.chkNoSubSa.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.chkNoSubSa.AutoSize = true;
+            this.chkNoSubSa.Location = new System.Drawing.Point(747, 5);
+            this.chkNoSubSa.Margin = new System.Windows.Forms.Padding(4, 0, 0, 0);
+            this.chkNoSubSa.Name = "chkNoSubSa";
+            this.chkNoSubSa.Size = new System.Drawing.Size(87, 21);
+            this.chkNoSubSa.TabIndex = 467;
+            this.chkNoSubSa.Text = "未分配超管";
+            this.chkNoSubSa.UseVisualStyleBackColor = true;
+            // 
+            // pnlEmpty
+            // 
+            this.pnlEmpty.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.pnlEmpty.CanvasColor = System.Drawing.SystemColors.Control;
+            this.pnlEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.pnlEmpty.DisabledBackColor = System.Drawing.Color.Empty;
+            this.pnlEmpty.Location = new System.Drawing.Point(911, 19);
+            this.pnlEmpty.Margin = new System.Windows.Forms.Padding(2);
+            this.pnlEmpty.Name = "pnlEmpty";
+            this.tableLayoutPanel1.SetRowSpan(this.pnlEmpty, 2);
+            this.pnlEmpty.Size = new System.Drawing.Size(56, 22);
+            this.pnlEmpty.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.pnlEmpty.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
+            this.pnlEmpty.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
+            this.pnlEmpty.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+            this.pnlEmpty.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.pnlEmpty.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+            this.pnlEmpty.Style.GradientAngle = 90;
+            this.pnlEmpty.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
+            this.pnlEmpty.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+            this.pnlEmpty.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.pnlEmpty.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.pnlEmpty.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
+            this.pnlEmpty.TabIndex = 431;
+            this.pnlEmpty.Text = "清空条件";
+            this.pnlEmpty.Click += new System.EventHandler(this.pnlEmpty_Click);
+            // 
+            // chkShowDel
+            // 
+            this.chkShowDel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.chkShowDel.AutoSize = true;
+            this.chkShowDel.Location = new System.Drawing.Point(834, 5);
+            this.chkShowDel.Margin = new System.Windows.Forms.Padding(0);
+            this.chkShowDel.Name = "chkShowDel";
+            this.chkShowDel.Size = new System.Drawing.Size(75, 21);
+            this.chkShowDel.TabIndex = 468;
+            this.chkShowDel.Text = "显示删除";
+            this.chkShowDel.UseVisualStyleBackColor = true;
+            this.chkShowDel.CheckedChanged += new System.EventHandler(this.chkShowDel_CheckedChanged);
+            // 
            // btnSetSubSa
            // 
            this.btnSetSubSa.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@@ -1039,5 +1085,8 @@
        private System.Windows.Forms.NumericUpDown numSkuRandomPrice;
        private System.Windows.Forms.Label label11;
        private UserComponent.UcCheckBox chkReFissionAllProdName;
+        private UserComponent.UcCheckBox chkHeadWords;
+        private UserComponent.UcCheckBox chkEndWords;
+        private UserComponent.UcCheckBox chkFission;
    }
 }
@@ -592,7 +592,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms
                var result = "";
                try
                {
-                    result = UploadProduct(shop, temuDBProd, prod); //将商品上传至草稿箱
+                    result = UploadProduct(shop, temuDBProd, prod, row.Cells["colOpResult"]); //将商品上传至草稿箱

                    if (result.Contains("登录过期"))
                    { 
@@ -713,21 +713,29 @@ namespace TemuKJD.KJDForms.ProductSelectForms
            }
        }

-        string UploadProduct(ShopLoginInfo shop, TemuDBProduct dbProd, TemuDBProductSelect selectProd)
+        string UploadProduct(ShopLoginInfo shop, TemuDBProduct dbProd, TemuDBProductSelect selectProd, DataGridViewCell cell)
        {
            if (shop == null || string.IsNullOrEmpty(shop.ShopId) || shop.LoginStatus != "登录成功" || shop.LoginStatus2 != "国际版在线")
            {
                return "店铺为空或未登录!";
            }

+            if (cell != null)
+            {
+                Invoke(new Action(() =>
+                {
+                    cell.Value = "正在初始化上传";
+                }));
+            }
+
            //var prodDetailStr = GetHtml.UrlDecode(dbProd.product_json);
            //var prodInfo = JsonHelper.DeserializeJsonToObject<TemuProductInfo>(prodDetailStr);
            var prodInfo = JsonHelper.DeserializeJsonToObject<TemuProductInfo>(dbProd.product_json);
            var sTemuSizeSpec = dbProd.size_json;

            TemuProductParam prodParam = new TemuProductParam();
-            prodParam.carouselImageI18nReqs = prodInfo.carouselImageI18nVOList;
-            prodParam.carouselImageUrls = prodInfo.carouselImageUrls;
+            prodParam.productDraftId = 0;
+
            prodParam.cat1Id = prodInfo.categories.cat1.catId;
            prodParam.cat2Id = prodInfo.categories.cat2.catId;
            prodParam.cat3Id = prodInfo.categories.cat3.catId;
@@ -738,12 +746,43 @@ namespace TemuKJD.KJDForms.ProductSelectForms
            prodParam.cat8Id = prodInfo.categories.cat8.catId;
            prodParam.cat9Id = prodInfo.categories.cat9.catId;
            prodParam.cat10Id = prodInfo.categories.cat10.catId;
+
+            // 先根据类目获取draftid
+            long catId = prodParam.cat10Id.ParseToLong();
+            if (catId == 0) catId = prodParam.cat9Id.ParseToLong();
+            if (catId == 0) catId = prodParam.cat8Id.ParseToLong();
+            if (catId == 0) catId = prodParam.cat7Id.ParseToLong();
+            if (catId == 0) catId = prodParam.cat6Id.ParseToLong();
+            if (catId == 0) catId = prodParam.cat5Id.ParseToLong();
+            if (catId == 0) catId = prodParam.cat4Id.ParseToLong();
+            if (catId == 0) catId = prodParam.cat3Id.ParseToLong();
+            if (catId == 0) catId = prodParam.cat2Id.ParseToLong();
+            if (catId == 0) catId = prodParam.cat1Id.ParseToLong();
+
+            var html = AddDraft(shop, catId.ToString());
+            if (html.Contains("{\"success\":true"))
+                prodParam.productDraftId = BaseRegex.GetLongJson(ref html, "productDraftId");
+            else
+            {
+                var error = BaseRegex.GetStringJson(ref html, "errorMsg");
+                if (string.IsNullOrEmpty(error))
+                    error = BaseRegex.GetStringJson(ref html, "error_msg");
+                return "上传失败 " + error;
+            }
+            if (prodParam.productDraftId <= 0)
+            {
+                return "上传失败 " + html;
+            }
+
+            prodParam.carouselImageI18nReqs = prodInfo.carouselImageI18nVOList;
+            prodParam.carouselImageUrls = prodInfo.carouselImageUrls;
+
            prodParam.goodsAdvantageLabelTypes = prodInfo.goodsAdvantageLabelVOList != null ?
                                                 prodInfo.goodsAdvantageLabelVOList : new List<object>();
            prodParam.goodsLayerDecorationCustomizeI18nReqs = prodInfo.goodsLayerDecorationCustomizeI18nVOList;
            prodParam.goodsLayerDecorationReqs = new List<GoodsLayerDecorationReqsItem>();
-            foreach (var goodsLayerDecorationVOInfo in
-                (prodInfo.goodsLayerDecorationVOList == null ? new List<TemuGoodsLayerDecorationVO>() : prodInfo.goodsLayerDecorationVOList))
+            foreach (var goodsLayerDecorationVOInfo in (prodInfo.goodsLayerDecorationVOList == null ?
+                new List<TemuGoodsLayerDecorationVO>() : prodInfo.goodsLayerDecorationVOList))
            {
                var goodsLayerDecorationItem = new GoodsLayerDecorationReqsItem()
                {
@@ -783,21 +822,32 @@ namespace TemuKJD.KJDForms.ProductSelectForms
                protocolUrl = "https://bdl.cdnfe.com/upload_bdl/seller-protocol/00f56a69-7bee-4768-8cef-e1682ffd58e3.html",
            };
            prodParam.productDetailVideoReqList = prodInfo.detailVideoVOList;
-            //是否需要存疑
-            prodParam.productDraftId = 0;
            prodParam.productGuideFileI18nReqs = prodInfo.productGuideFileI18nList;
            prodParam.productGuideFileNewReqList = prodInfo.productGuideFileNewVOList;
            //prodParam.productName = prodInfo.productName;
            prodParam.productName = selectProd.fission_product_name;
-            if(this.chkReFissionAllProdName.Checked)
-            {
-                int[] heads = dbProd.head_words.Split(new string[] { "-", "个" }, StringSplitOptions.RemoveEmptyEntries)
-                    .Select(s=>s.ParseToInt()).ToArray();
-                string headWords = "";
-                if (heads.Length > 1 && heads[1] > heads[0])
-                    headWords = Randomx.GetId(heads[0], heads[1]) + "个";
-                string endWords = string.IsNullOrEmpty(dbProd.end_words) ? "" : dbProd.end_words;

+            string headWords = "";
+            string endWords = "";
+            if (this.chkFission.Checked)
+            {
+                // 头词
+                if (chkHeadWords.Checked)
+                {
+                    int[] heads = dbProd.head_words.Split(new string[] { "-", "个" }, StringSplitOptions.RemoveEmptyEntries)
+                        .Select(s => s.ParseToInt()).ToArray();
+
+                    if (heads.Length > 1 && heads[1] > heads[0])
+                        headWords = Randomx.GetId(heads[0], heads[1]) + "个";
+                }
+
+                // 尾词
+                if (this.chkEndWords.Checked)
+                {
+                    endWords = string.IsNullOrEmpty(dbProd.end_words) ? "" : dbProd.end_words;
+                }
+
+                // 标题部分打乱
                List<string> fissionLst = new List<string>();
                fissionLst.AddRange(dbProd.fission_words.ParseToString().Split(new string[] { "\r", "\n" }, StringSplitOptions.RemoveEmptyEntries));
                string centerWords = "，";
@@ -806,8 +856,8 @@ namespace TemuKJD.KJDForms.ProductSelectForms
                    int id = Randomx.GetId(fissionLst.Count);
                    var fissionTxt = fissionLst[id];
                    fissionLst.RemoveAt(id);
-                    //var allTxt = headWords + dbProd.product_name + centerWords + fissionTxt + "，" + endWords;
-                    var allTxt = dbProd.product_name + centerWords + fissionTxt + "，";
+                    var allTxt = headWords + dbProd.product_name + centerWords + fissionTxt + "，" + endWords;
+                    //var allTxt = dbProd.product_name + centerWords + fissionTxt + "，";
                    byte[] bytes = Encoding.GetEncoding("gb2312").GetBytes(allTxt);
                    if (bytes.Length > 250)
                    {
@@ -815,19 +865,27 @@ namespace TemuKJD.KJDForms.ProductSelectForms
                    }
                    centerWords += fissionTxt + "，";
                }
-                List<string> centerNameLst = (dbProd.product_name + centerWords.ParseToString())
-                    .Split(new string[] { "，" }, StringSplitOptions.RemoveEmptyEntries).ToList();
-                string centerName = "";
-                while (centerNameLst.Count > 0)
-                {
-                    int id = Randomx.GetId(centerNameLst.Count);
-                    centerName += centerNameLst[id] + "，";
-                    centerNameLst.RemoveAt(id);
-                }
+                string centerName = dbProd.product_name + centerWords.ParseToString();

+                // 标题完全打乱
+                if (chkReFissionAllProdName.Checked)
+                {
+                    List<string> centerNameLst = centerName
+                        .Split(new string[] { "，", "," }, StringSplitOptions.RemoveEmptyEntries).ToList();
+
+                    string newCenterName = "";
+                    while (centerNameLst.Count > 0)
+                    {
+                        int id = Randomx.GetId(centerNameLst.Count);
+                        newCenterName += centerNameLst[id] + "，";
+                        centerNameLst.RemoveAt(id);
+                    }
+                    centerName = newCenterName;
+                }
                prodParam.productName = (headWords + centerName + endWords).Trim('，');
-                prodParam.productName = centerName.Trim('，');
+                //prodParam.productName = centerName.Trim('，');
            }
+
            prodParam.productNonAuditExtAttrReq = new ProductNonAuditExtAttrReq()
            {
                california65WarningInfoReq = new California65WarningInfoReq()
@@ -951,8 +1009,10 @@ namespace TemuKJD.KJDForms.ProductSelectForms
                {
                    var speck = skuInfo.productSkuSpecList.FirstOrDefault(s => s.parentSpecName == "颜色");
                    if (speck != null)
+                    {
                        skuNameDic[speck.specName] = skuHead[Randomx.GetId(skuHead.Count)] + 
-                            speck.specName + skuEnd[Randomx.GetId(skuEnd.Count)];
+                            speck.specName + skuEnd[Randomx.GetId(skuEnd.Count)]; 
+                    }
                    else
                        skuNameDic[speck.specName] = speck.specName;
                }
@@ -965,6 +1025,13 @@ namespace TemuKJD.KJDForms.ProductSelectForms
                while (skuListTmp.Count > 0)
                {
                    skuCount++;
+                    if (cell != null)
+                    {
+                        Invoke(new Action(() =>
+                        {
+                            cell.Value = "正在生成sku " + skuCount + "/" + skcInfo.productSkuList.Count;
+                        }));
+                    }

                    #region 随机打乱sku顺序
                    int id = 0;
@@ -1010,8 +1077,22 @@ namespace TemuKJD.KJDForms.ProductSelectForms
                            vid = prodParam.productSpecPropertyReqs.FirstOrDefault(p => p.specId == skuSpecInfo.specId)?.vid,
                        };
                        //前后缀映射
-                        if (skuSpecInfo.parentSpecName == "颜色")
+                        if (skuSpecInfo.parentSpecName == "颜色" && skuNameDic[skuSpecItem.specName] != skuSpecItem.specName)
+                        {
                            skuSpecItem.specName = skuNameDic[skuSpecItem.specName];
+                            string draftId = prodParam.productDraftId.ParseToString();
+                            string parentSpecId = skuSpecItem.parentSpecId.ParseToString();
+                            var rst = QueryOrAddSpec(shop, draftId, parentSpecId, skuSpecItem.specName);
+                            if (rst.Contains("\"success\":true"))
+                            {
+                                long specId = BaseRegex.GetLongJson(ref rst, "specId");
+                                if (specId > 0)
+                                {
+                                    skuSpecItem.specId = specId;
+                                }
+                            }
+                            Thread.Sleep(Randomx.GetId(100, 500));
+                        }
                        skuItem.productSkuSpecReqs.Add(skuSpecItem);
                    }
                    skuItem.productSkuSuggestedPriceReq = JsonHelper.DeserializeJsonToObject<ProductSkuSuggestedPriceReq>(
@@ -1048,7 +1129,6 @@ namespace TemuKJD.KJDForms.ProductSelectForms
                    #region 使用随机sku价格上传(第一个sku价格不变，此处有bug，平台最后的sku排列不是按照提交上去的顺序排的)
                    if (skuCount != 1 && chkSkuRandomPrice.Checked)
                    {
-
                        for (int x = 0; x < 5 && skcItem.productSkuReqs.Any(s => s.supplierPrice == skuItem.supplierPrice); x++)
                        {
                            int randomPrice = (this.numSkuRandomPrice.Value * 100).ParseToInt();
@@ -1075,37 +1155,19 @@ namespace TemuKJD.KJDForms.ProductSelectForms
                prodParam.productSkcReqs.Add(skcItem);
            }

-            long catId = prodParam.cat10Id.ParseToLong();
-            if (catId == 0) catId = prodParam.cat9Id.ParseToLong();
-            if (catId == 0) catId = prodParam.cat8Id.ParseToLong();
-            if (catId == 0) catId = prodParam.cat7Id.ParseToLong();
-            if (catId == 0) catId = prodParam.cat6Id.ParseToLong();
-            if (catId == 0) catId = prodParam.cat5Id.ParseToLong();
-            if (catId == 0) catId = prodParam.cat4Id.ParseToLong();
-            if (catId == 0) catId = prodParam.cat3Id.ParseToLong();
-            if (catId == 0) catId = prodParam.cat2Id.ParseToLong();
-            if (catId == 0) catId = prodParam.cat1Id.ParseToLong();
-
-            var html = AddDraft(shop, catId.ToString());
-            if (html.Contains("{\"success\":true"))
-                prodParam.productDraftId = BaseRegex.GetLongJson(ref html, "productDraftId");
-            else
-            {
-                var error = BaseRegex.GetStringJson(ref html, "errorMsg");
-                if (string.IsNullOrEmpty(error))
-                    error = BaseRegex.GetStringJson(ref html, "error_msg"); 
-                return "上传失败 " + error;
-            }
-
-            if (prodParam.productDraftId <= 0)
-            {
-                return "上传失败 " + html;
-            }
-
+            #region 尺码表
            string sizeError = "";
            //上传尺码表（如果有）
            if (!string.IsNullOrEmpty(sTemuSizeSpec))
            {
+                if (cell != null)
+                {
+                    Invoke(new Action(() =>
+                    {
+                        cell.Value = "正在生成尺码";
+                    }));
+                }
+
                sTemuSizeSpec = GetHtml.UrlDecode(sTemuSizeSpec);
                if (sTemuSizeSpec.Contains("sizeSpecDataVO"))
                {
@@ -1132,7 +1194,15 @@ namespace TemuKJD.KJDForms.ProductSelectForms
                    }
                }
            }
+            #endregion

+            if (cell != null)
+            {
+                Invoke(new Action(() =>
+                {
+                    cell.Value = "正在保存草稿";
+                }));
+            }
            html = SaveDraft(shop, prodParam.productDraftId.ToString(), prodParam);
            if (html.Contains("{\"success\":true"))
            {
@@ -1154,6 +1224,14 @@ namespace TemuKJD.KJDForms.ProductSelectForms
            }

            #region 草稿箱编辑后立即上传商品
+
+            if (cell != null)
+            {
+                Invoke(new Action(() =>
+                {
+                    cell.Value = "正在提交到未发布";
+                }));
+            }
            Thread.Sleep(Randomx.GetId(1000, 2000));
            html = AddProduct(shop, prodParam.productDraftId.ToString(), prodParam);
            if (html.Contains("\"success\":true"))
@@ -1218,6 +1296,15 @@ namespace TemuKJD.KJDForms.ProductSelectForms
            return KJDHttpResponse.PostResponse2(shop, url, body, refere);
        }

+        private string QueryOrAddSpec(ShopLoginInfo shop, string draftId, string parentSpecId, string specName)
+        {
+            string url = "https://agentseller.temu.com/anniston-agent-seller/sku/spec/byName/queryOrAdd";
+            string body = @"{""parentSpecId"":" + parentSpecId + @",""specName"":""" + specName + @"""}";
+
+            string refere = "https://agentseller.temu.com/goods/edit?productDraftId=" + draftId + "&from=productDraftList";
+            return KJDHttpResponse.PostResponse2(shop, url, body, refere);
+        }
+
        private void btnSetSubSa_Click(object sender, EventArgs e)
        {
            var lstProdId = dgvSelectProduct.Rows.Cast<DataGridViewRow>().Where(row
@@ -40,13 +40,12 @@
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ProductThirdSelectListManageForm));
            this.splitContainer1 = new System.Windows.Forms.SplitContainer();
            this.pbFissionSetting = new System.Windows.Forms.PictureBox();
-            this.chkShowDel = new TemuKJD.UserComponent.UcCheckBox(this.components);
-            this.chkNoSubSa = new TemuKJD.UserComponent.UcCheckBox(this.components);
            this.btnReFission = new TemuKJD.UserControls.ButtonEx();
            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
            this.label6 = new System.Windows.Forms.Label();
+            this.chkShowDel = new TemuKJD.UserComponent.UcCheckBox(this.components);
            this.txtShopId = new System.Windows.Forms.TextBox();
-            this.cmbStatus = new System.Windows.Forms.ComboBox();
+            this.chkNoSubSa = new TemuKJD.UserComponent.UcCheckBox(this.components);
            this.pnlEmpty = new DevComponents.DotNetBar.PanelEx();
            this.label7 = new System.Windows.Forms.Label();
            this.label8 = new System.Windows.Forms.Label();
@@ -62,6 +61,7 @@
            this.label3 = new System.Windows.Forms.Label();
            this.label4 = new System.Windows.Forms.Label();
            this.txtProdName = new System.Windows.Forms.TextBox();
+            this.cmbStatus = new System.Windows.Forms.ComboBox();
            this.btnSetSubSa = new TemuKJD.UserControls.ButtonEx();
            this.btnAdd = new TemuKJD.UserControls.ButtonEx();
            this.splitContainer2 = new System.Windows.Forms.SplitContainer();
@@ -120,8 +120,6 @@
            // splitContainer1.Panel1
            // 
            this.splitContainer1.Panel1.Controls.Add(this.pbFissionSetting);
-            this.splitContainer1.Panel1.Controls.Add(this.chkShowDel);
-            this.splitContainer1.Panel1.Controls.Add(this.chkNoSubSa);
            this.splitContainer1.Panel1.Controls.Add(this.btnReFission);
            this.splitContainer1.Panel1.Controls.Add(this.tableLayoutPanel1);
            this.splitContainer1.Panel1.Controls.Add(this.btnSetSubSa);
@@ -138,7 +136,7 @@
            // 
            this.pbFissionSetting.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
            this.pbFissionSetting.Image = global::TemuKJD.Properties.Resources.齿轮;
-            this.pbFissionSetting.Location = new System.Drawing.Point(1129, 21);
+            this.pbFissionSetting.Location = new System.Drawing.Point(1129, 20);
            this.pbFissionSetting.Name = "pbFissionSetting";
            this.pbFissionSetting.Size = new System.Drawing.Size(24, 24);
            this.pbFissionSetting.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -147,29 +145,6 @@
            this.pbFissionSetting.Visible = false;
            this.pbFissionSetting.Click += new System.EventHandler(this.pbFissionSetting_Click);
            // 
-            // chkShowDel
-            // 
-            this.chkShowDel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.chkShowDel.AutoSize = true;
-            this.chkShowDel.Location = new System.Drawing.Point(1024, 23);
-            this.chkShowDel.Name = "chkShowDel";
-            this.chkShowDel.Size = new System.Drawing.Size(99, 21);
-            this.chkShowDel.TabIndex = 471;
-            this.chkShowDel.Text = "显示删除功能";
-            this.chkShowDel.UseVisualStyleBackColor = true;
-            this.chkShowDel.CheckedChanged += new System.EventHandler(this.chkShowDel_CheckedChanged);
-            // 
-            // chkNoSubSa
-            // 
-            this.chkNoSubSa.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.chkNoSubSa.AutoSize = true;
-            this.chkNoSubSa.Location = new System.Drawing.Point(930, 23);
-            this.chkNoSubSa.Name = "chkNoSubSa";
-            this.chkNoSubSa.Size = new System.Drawing.Size(99, 21);
-            this.chkNoSubSa.TabIndex = 470;
-            this.chkNoSubSa.Text = "仅未分配超管";
-            this.chkNoSubSa.UseVisualStyleBackColor = true;
-            // 
            // btnReFission
            // 
            this.btnReFission.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@@ -178,7 +153,7 @@
            this.btnReFission.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
            this.btnReFission.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.btnReFission.ForeColor = System.Drawing.Color.White;
-            this.btnReFission.Location = new System.Drawing.Point(1153, 20);
+            this.btnReFission.Location = new System.Drawing.Point(1153, 19);
            this.btnReFission.Margin = new System.Windows.Forms.Padding(2);
            this.btnReFission.Name = "btnReFission";
            this.btnReFission.Size = new System.Drawing.Size(90, 26);
@@ -192,7 +167,7 @@
            // 
            this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
            | System.Windows.Forms.AnchorStyles.Right)));
-            this.tableLayoutPanel1.ColumnCount = 18;
+            this.tableLayoutPanel1.ColumnCount = 20;
            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.5F));
            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
@@ -211,9 +186,12 @@
            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.5F));
            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
            this.tableLayoutPanel1.Controls.Add(this.label6, 0, 0);
+            this.tableLayoutPanel1.Controls.Add(this.chkShowDel, 19, 0);
            this.tableLayoutPanel1.Controls.Add(this.txtShopId, 1, 0);
-            this.tableLayoutPanel1.Controls.Add(this.cmbStatus, 15, 0);
+            this.tableLayoutPanel1.Controls.Add(this.chkNoSubSa, 18, 0);
            this.tableLayoutPanel1.Controls.Add(this.pnlEmpty, 17, 0);
            this.tableLayoutPanel1.Controls.Add(this.label7, 2, 0);
            this.tableLayoutPanel1.Controls.Add(this.label8, 14, 0);
@@ -229,54 +207,65 @@
            this.tableLayoutPanel1.Controls.Add(this.label3, 10, 0);
            this.tableLayoutPanel1.Controls.Add(this.label4, 12, 0);
            this.tableLayoutPanel1.Controls.Add(this.txtProdName, 11, 0);
-            this.tableLayoutPanel1.Location = new System.Drawing.Point(3, 19);
+            this.tableLayoutPanel1.Controls.Add(this.cmbStatus, 15, 0);
+            this.tableLayoutPanel1.Location = new System.Drawing.Point(3, 17);
            this.tableLayoutPanel1.Name = "tableLayoutPanel1";
            this.tableLayoutPanel1.RowCount = 1;
            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(929, 28);
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(1120, 32);
            this.tableLayoutPanel1.TabIndex = 469;
            // 
            // label6
            // 
            this.label6.Anchor = System.Windows.Forms.AnchorStyles.Left;
            this.label6.AutoSize = true;
-            this.label6.Location = new System.Drawing.Point(3, 5);
+            this.label6.Location = new System.Drawing.Point(3, 7);
            this.label6.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
            this.label6.Name = "label6";
            this.label6.Size = new System.Drawing.Size(44, 17);
            this.label6.TabIndex = 449;
            this.label6.Text = "店铺Id";
            // 
+            // chkShowDel
+            // 
+            this.chkShowDel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.chkShowDel.AutoSize = true;
+            this.chkShowDel.Location = new System.Drawing.Point(1042, 5);
+            this.chkShowDel.Name = "chkShowDel";
+            this.chkShowDel.Size = new System.Drawing.Size(75, 21);
+            this.chkShowDel.TabIndex = 471;
+            this.chkShowDel.Text = "显示删除";
+            this.chkShowDel.UseVisualStyleBackColor = true;
+            this.chkShowDel.CheckedChanged += new System.EventHandler(this.chkShowDel_CheckedChanged);
+            // 
            // txtShopId
            // 
-            this.txtShopId.Dock = System.Windows.Forms.DockStyle.Top;
-            this.txtShopId.Location = new System.Drawing.Point(47, 2);
+            this.txtShopId.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.txtShopId.Location = new System.Drawing.Point(47, 4);
            this.txtShopId.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
            this.txtShopId.Name = "txtShopId";
-            this.txtShopId.Size = new System.Drawing.Size(55, 23);
+            this.txtShopId.Size = new System.Drawing.Size(57, 23);
            this.txtShopId.TabIndex = 448;
            // 
-            // cmbStatus
+            // chkNoSubSa
            // 
-            this.cmbStatus.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.cmbStatus.FormattingEnabled = true;
-            this.cmbStatus.Items.AddRange(new object[] {
-            "待上传",
-            "已上传",
-            "全部"});
-            this.cmbStatus.Location = new System.Drawing.Point(744, 1);
-            this.cmbStatus.Margin = new System.Windows.Forms.Padding(0, 1, 0, 1);
-            this.cmbStatus.Name = "cmbStatus";
-            this.cmbStatus.Size = new System.Drawing.Size(55, 25);
-            this.cmbStatus.TabIndex = 459;
-            this.cmbStatus.Text = "待上传";
+            this.chkNoSubSa.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.chkNoSubSa.AutoSize = true;
+            this.chkNoSubSa.Location = new System.Drawing.Point(949, 5);
+            this.chkNoSubSa.Margin = new System.Windows.Forms.Padding(8, 3, 3, 3);
+            this.chkNoSubSa.Name = "chkNoSubSa";
+            this.chkNoSubSa.Size = new System.Drawing.Size(87, 21);
+            this.chkNoSubSa.TabIndex = 470;
+            this.chkNoSubSa.Text = "未分配超管";
+            this.chkNoSubSa.UseVisualStyleBackColor = true;
            // 
            // pnlEmpty
            // 
+            this.pnlEmpty.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
            this.pnlEmpty.CanvasColor = System.Drawing.SystemColors.Control;
            this.pnlEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
            this.pnlEmpty.DisabledBackColor = System.Drawing.Color.Empty;
-            this.pnlEmpty.Location = new System.Drawing.Point(866, 3);
+            this.pnlEmpty.Location = new System.Drawing.Point(882, 5);
            this.pnlEmpty.Name = "pnlEmpty";
            this.pnlEmpty.Size = new System.Drawing.Size(56, 22);
            this.pnlEmpty.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -299,7 +288,7 @@
            // 
            this.label7.Anchor = System.Windows.Forms.AnchorStyles.Left;
            this.label7.AutoSize = true;
-            this.label7.Location = new System.Drawing.Point(108, 5);
+            this.label7.Location = new System.Drawing.Point(110, 7);
            this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
            this.label7.Name = "label7";
            this.label7.Size = new System.Drawing.Size(56, 17);
@@ -310,7 +299,7 @@
            // 
            this.label8.Anchor = System.Windows.Forms.AnchorStyles.Left;
            this.label8.AutoSize = true;
-            this.label8.Location = new System.Drawing.Point(688, 5);
+            this.label8.Location = new System.Drawing.Point(702, 7);
            this.label8.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
            this.label8.Name = "label8";
            this.label8.Size = new System.Drawing.Size(56, 17);
@@ -319,18 +308,18 @@
            // 
            // txtShopName
            // 
-            this.txtShopName.Dock = System.Windows.Forms.DockStyle.Top;
-            this.txtShopName.Location = new System.Drawing.Point(164, 2);
+            this.txtShopName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.txtShopName.Location = new System.Drawing.Point(166, 4);
            this.txtShopName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
            this.txtShopName.Name = "txtShopName";
-            this.txtShopName.Size = new System.Drawing.Size(55, 23);
+            this.txtShopName.Size = new System.Drawing.Size(57, 23);
            this.txtShopName.TabIndex = 451;
            // 
            // label5
            // 
            this.label5.Anchor = System.Windows.Forms.AnchorStyles.Left;
            this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(225, 5);
+            this.label5.Location = new System.Drawing.Point(229, 7);
            this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
            this.label5.Name = "label5";
            this.label5.Size = new System.Drawing.Size(31, 17);
@@ -339,12 +328,13 @@
            // 
            // btnSearch
            // 
+            this.btnSearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
            this.btnSearch.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
            this.btnSearch.Cursor = System.Windows.Forms.Cursors.Hand;
            this.btnSearch.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
            this.btnSearch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.btnSearch.ForeColor = System.Drawing.Color.White;
-            this.btnSearch.Location = new System.Drawing.Point(805, 2);
+            this.btnSearch.Location = new System.Drawing.Point(821, 4);
            this.btnSearch.Margin = new System.Windows.Forms.Padding(6, 2, 2, 2);
            this.btnSearch.Name = "btnSearch";
            this.btnSearch.Size = new System.Drawing.Size(56, 24);
@@ -355,27 +345,27 @@
            // 
            // txtSKC
            // 
-            this.txtSKC.Dock = System.Windows.Forms.DockStyle.Top;
-            this.txtSKC.Location = new System.Drawing.Point(348, 2);
+            this.txtSKC.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.txtSKC.Location = new System.Drawing.Point(354, 4);
            this.txtSKC.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
            this.txtSKC.Name = "txtSKC";
-            this.txtSKC.Size = new System.Drawing.Size(55, 23);
+            this.txtSKC.Size = new System.Drawing.Size(57, 23);
            this.txtSKC.TabIndex = 432;
            // 
            // txtSPU
            // 
-            this.txtSPU.Dock = System.Windows.Forms.DockStyle.Top;
-            this.txtSPU.Location = new System.Drawing.Point(256, 2);
+            this.txtSPU.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.txtSPU.Location = new System.Drawing.Point(260, 4);
            this.txtSPU.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
            this.txtSPU.Name = "txtSPU";
-            this.txtSPU.Size = new System.Drawing.Size(55, 23);
+            this.txtSPU.Size = new System.Drawing.Size(57, 23);
            this.txtSPU.TabIndex = 434;
            // 
            // label1
            // 
            this.label1.Anchor = System.Windows.Forms.AnchorStyles.Left;
            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(317, 5);
+            this.label1.Location = new System.Drawing.Point(323, 7);
            this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
            this.label1.Name = "label1";
            this.label1.Size = new System.Drawing.Size(31, 17);
@@ -386,7 +376,7 @@
            // 
            this.label2.Anchor = System.Windows.Forms.AnchorStyles.Left;
            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(409, 5);
+            this.label2.Location = new System.Drawing.Point(417, 7);
            this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
            this.label2.Name = "label2";
            this.label2.Size = new System.Drawing.Size(32, 17);
@@ -395,27 +385,27 @@
            // 
            // txtCat
            // 
-            this.txtCat.Dock = System.Windows.Forms.DockStyle.Top;
-            this.txtCat.Location = new System.Drawing.Point(441, 2);
+            this.txtCat.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.txtCat.Location = new System.Drawing.Point(449, 4);
            this.txtCat.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
            this.txtCat.Name = "txtCat";
-            this.txtCat.Size = new System.Drawing.Size(55, 23);
+            this.txtCat.Size = new System.Drawing.Size(57, 23);
            this.txtCat.TabIndex = 425;
            // 
            // txtExtCode
            // 
-            this.txtExtCode.Dock = System.Windows.Forms.DockStyle.Top;
-            this.txtExtCode.Location = new System.Drawing.Point(627, 2);
+            this.txtExtCode.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.txtExtCode.Location = new System.Drawing.Point(639, 4);
            this.txtExtCode.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
            this.txtExtCode.Name = "txtExtCode";
-            this.txtExtCode.Size = new System.Drawing.Size(55, 23);
+            this.txtExtCode.Size = new System.Drawing.Size(57, 23);
            this.txtExtCode.TabIndex = 429;
            // 
            // label3
            // 
            this.label3.Anchor = System.Windows.Forms.AnchorStyles.Left;
            this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(502, 5);
+            this.label3.Location = new System.Drawing.Point(512, 7);
            this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
            this.label3.Name = "label3";
            this.label3.Size = new System.Drawing.Size(32, 17);
@@ -426,7 +416,7 @@
            // 
            this.label4.Anchor = System.Windows.Forms.AnchorStyles.Left;
            this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(595, 5);
+            this.label4.Location = new System.Drawing.Point(607, 7);
            this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
            this.label4.Name = "label4";
            this.label4.Size = new System.Drawing.Size(32, 17);
@@ -435,13 +425,28 @@
            // 
            // txtProdName
            // 
-            this.txtProdName.Dock = System.Windows.Forms.DockStyle.Top;
-            this.txtProdName.Location = new System.Drawing.Point(534, 2);
+            this.txtProdName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.txtProdName.Location = new System.Drawing.Point(544, 4);
            this.txtProdName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
            this.txtProdName.Name = "txtProdName";
-            this.txtProdName.Size = new System.Drawing.Size(55, 23);
+            this.txtProdName.Size = new System.Drawing.Size(57, 23);
            this.txtProdName.TabIndex = 427;
            // 
+            // cmbStatus
+            // 
+            this.cmbStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.cmbStatus.FormattingEnabled = true;
+            this.cmbStatus.Items.AddRange(new object[] {
+            "待上传",
+            "已上传",
+            "全部"});
+            this.cmbStatus.Location = new System.Drawing.Point(758, 6);
+            this.cmbStatus.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
+            this.cmbStatus.Name = "cmbStatus";
+            this.cmbStatus.Size = new System.Drawing.Size(57, 25);
+            this.cmbStatus.TabIndex = 459;
+            this.cmbStatus.Text = "待上传";
+            // 
            // btnSetSubSa
            // 
            this.btnSetSubSa.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@@ -450,7 +455,7 @@
            this.btnSetSubSa.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
            this.btnSetSubSa.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.btnSetSubSa.ForeColor = System.Drawing.Color.White;
-            this.btnSetSubSa.Location = new System.Drawing.Point(1247, 20);
+            this.btnSetSubSa.Location = new System.Drawing.Point(1247, 19);
            this.btnSetSubSa.Margin = new System.Windows.Forms.Padding(2);
            this.btnSetSubSa.Name = "btnSetSubSa";
            this.btnSetSubSa.Size = new System.Drawing.Size(90, 26);
@@ -467,12 +472,12 @@
            this.btnAdd.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
            this.btnAdd.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.btnAdd.ForeColor = System.Drawing.Color.White;
-            this.btnAdd.Location = new System.Drawing.Point(1341, 20);
+            this.btnAdd.Location = new System.Drawing.Point(1341, 19);
            this.btnAdd.Margin = new System.Windows.Forms.Padding(2);
            this.btnAdd.Name = "btnAdd";
            this.btnAdd.Size = new System.Drawing.Size(90, 26);
            this.btnAdd.TabIndex = 444;
-            this.btnAdd.Text = "一键上传";
+            this.btnAdd.Text = "一键上传草稿";
            this.btnAdd.UseVisualStyleBackColor = false;
            this.btnAdd.Click += new System.EventHandler(this.btnAdd_Click);
            // 
@@ -804,7 +809,6 @@
            this.VisibleChanged += new System.EventHandler(this.ProductThirdSelectListManageForm_VisibleChanged);
            this.Controls.SetChildIndex(this.splitContainer1, 0);
            this.splitContainer1.Panel1.ResumeLayout(false);
-            this.splitContainer1.Panel1.PerformLayout();
            this.splitContainer1.Panel2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
            this.splitContainer1.ResumeLayout(false);
@@ -30,19 +30,13 @@ namespace TemuKJD.KJDForms.SalesCenterForms
        private void InitializeComponent()
        {
            this.components = new System.ComponentModel.Container();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle33 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle35 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle36 = new System.Windows.Forms.DataGridViewCellStyle();
            this.splitContainer1 = new System.Windows.Forms.SplitContainer();
-            this.splitContainer3 = new System.Windows.Forms.SplitContainer();
-            this.splitContainer2 = new System.Windows.Forms.SplitContainer();
-            this.splitContainer5 = new System.Windows.Forms.SplitContainer();
-            this.splitContainer4 = new System.Windows.Forms.SplitContainer();
-            this.panelEx1 = new DevComponents.DotNetBar.PanelEx();
-            this.btnClear = new DevComponents.DotNetBar.PanelEx();
            this.ucGroupBoxEx3 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
            this.actDiscount80 = new TemuKJD.KJDForms.SalesCenterForms.UcActivityDiscountCtrl();
            this.object_6dcc57fe_428d_475c_90c2_d99d71a7014f = new TemuKJD.UserComponent.UcCheckBox(this.components);
@@ -58,14 +52,20 @@ namespace TemuKJD.KJDForms.SalesCenterForms
            this.chkFullShop = new TemuKJD.UserComponent.UcCheckBox(this.components);
            this.chkNoSaleProd = new TemuKJD.UserComponent.UcCheckBox(this.components);
            this.panel1 = new System.Windows.Forms.Panel();
+            this.numSaleCount = new System.Windows.Forms.NumericUpDown();
+            this.cmbDays = new System.Windows.Forms.ComboBox();
+            this.label4 = new System.Windows.Forms.Label();
+            this.label3 = new System.Windows.Forms.Label();
            this.label2 = new System.Windows.Forms.Label();
-            this.numNoSaleDays = new System.Windows.Forms.NumericUpDown();
+            this.numOnSaleDays = new System.Windows.Forms.NumericUpDown();
            this.label1 = new System.Windows.Forms.Label();
            this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
            this.btnRefreshShop = new DevComponents.DotNetBar.PanelEx();
            this.ucGroupBoxEx2 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
            this.chkGetDiscount = new TemuKJD.UserComponent.UcCheckBox(this.components);
            this.btnSearchActivity = new DevComponents.DotNetBar.PanelEx();
+            this.splitContainer3 = new System.Windows.Forms.SplitContainer();
+            this.splitContainer2 = new System.Windows.Forms.SplitContainer();
            this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx();
            this.colSelect = new TemuKJD.UserComponent.UcDataGridViewCheckBoxColumn(this.components);
            this.colShopLoginName = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -74,7 +74,15 @@ namespace TemuKJD.KJDForms.SalesCenterForms
            this.colLoginStatus = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.colCanUse = new System.Windows.Forms.DataGridViewCheckBoxColumn();
            this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.splitContainer5 = new System.Windows.Forms.SplitContainer();
            this.dgvActivity = new TemuKJD.UserComponent.DataGridViewEx();
+            this.colCheckActivity = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.colActivityId = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colActivityName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colActivityTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colSignUpTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colDiscount = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colActivityMsg = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.dgvProduct = new TemuKJD.UserComponent.DataGridViewEx();
            this.colCheckProduct = new System.Windows.Forms.DataGridViewCheckBoxColumn();
            this.colSupplierId = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -91,18 +99,23 @@ namespace TemuKJD.KJDForms.SalesCenterForms
            this.colPrcie = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.colInventory = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.colMsg = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.splitContainer4 = new System.Windows.Forms.SplitContainer();
            this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
-            this.colCheckActivity = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.colActivityId = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.colActivityName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.colActivityTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.colSignUpTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.colDiscount = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.colActivityMsg = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.panelEx1 = new DevComponents.DotNetBar.PanelEx();
+            this.btnClear = new DevComponents.DotNetBar.PanelEx();
            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
            this.splitContainer1.Panel1.SuspendLayout();
            this.splitContainer1.Panel2.SuspendLayout();
            this.splitContainer1.SuspendLayout();
+            this.ucGroupBoxEx3.SuspendLayout();
+            this.actDiscount80.SuspendLayout();
+            this.actDiscount85.SuspendLayout();
+            this.actDiscount70.SuspendLayout();
+            this.panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.numSaleCount)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numOnSaleDays)).BeginInit();
+            this.ucGroupBoxEx1.SuspendLayout();
+            this.ucGroupBoxEx2.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).BeginInit();
            this.splitContainer3.Panel1.SuspendLayout();
            this.splitContainer3.Panel2.SuspendLayout();
@@ -111,25 +124,17 @@ namespace TemuKJD.KJDForms.SalesCenterForms
            this.splitContainer2.Panel1.SuspendLayout();
            this.splitContainer2.Panel2.SuspendLayout();
            this.splitContainer2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvShop)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.splitContainer5)).BeginInit();
            this.splitContainer5.Panel1.SuspendLayout();
            this.splitContainer5.Panel2.SuspendLayout();
            this.splitContainer5.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvActivity)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvProduct)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.splitContainer4)).BeginInit();
            this.splitContainer4.Panel1.SuspendLayout();
            this.splitContainer4.Panel2.SuspendLayout();
            this.splitContainer4.SuspendLayout();
-            this.ucGroupBoxEx3.SuspendLayout();
-            this.actDiscount80.SuspendLayout();
-            this.actDiscount85.SuspendLayout();
-            this.actDiscount70.SuspendLayout();
-            this.panel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.numNoSaleDays)).BeginInit();
-            this.ucGroupBoxEx1.SuspendLayout();
-            this.ucGroupBoxEx2.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvShop)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvActivity)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvProduct)).BeginInit();
            this.SuspendLayout();
            // 
            // splitContainer1
@@ -149,136 +154,10 @@ namespace TemuKJD.KJDForms.SalesCenterForms
            // splitContainer1.Panel2
            // 
            this.splitContainer1.Panel2.Controls.Add(this.splitContainer3);
-            this.splitContainer1.Size = new System.Drawing.Size(978, 544);
+            this.splitContainer1.Size = new System.Drawing.Size(1029, 544);
            this.splitContainer1.SplitterDistance = 120;
            this.splitContainer1.TabIndex = 11;
            // 
-            // splitContainer3
-            // 
-            this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.splitContainer3.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
-            this.splitContainer3.Location = new System.Drawing.Point(0, 0);
-            this.splitContainer3.Name = "splitContainer3";
-            this.splitContainer3.Orientation = System.Windows.Forms.Orientation.Horizontal;
-            // 
-            // splitContainer3.Panel1
-            // 
-            this.splitContainer3.Panel1.Controls.Add(this.splitContainer2);
-            // 
-            // splitContainer3.Panel2
-            // 
-            this.splitContainer3.Panel2.Controls.Add(this.splitContainer4);
-            this.splitContainer3.Size = new System.Drawing.Size(978, 420);
-            this.splitContainer3.SplitterDistance = 390;
-            this.splitContainer3.TabIndex = 1;
-            // 
-            // splitContainer2
-            // 
-            this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.splitContainer2.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
-            this.splitContainer2.Location = new System.Drawing.Point(0, 0);
-            this.splitContainer2.Name = "splitContainer2";
-            // 
-            // splitContainer2.Panel1
-            // 
-            this.splitContainer2.Panel1.Controls.Add(this.dgvShop);
-            this.splitContainer2.Panel1.Padding = new System.Windows.Forms.Padding(4, 0, 0, 0);
-            // 
-            // splitContainer2.Panel2
-            // 
-            this.splitContainer2.Panel2.Controls.Add(this.splitContainer5);
-            this.splitContainer2.Panel2.Padding = new System.Windows.Forms.Padding(0, 0, 4, 0);
-            this.splitContainer2.Size = new System.Drawing.Size(978, 390);
-            this.splitContainer2.SplitterDistance = 270;
-            this.splitContainer2.TabIndex = 0;
-            // 
-            // splitContainer5
-            // 
-            this.splitContainer5.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.splitContainer5.Location = new System.Drawing.Point(0, 0);
-            this.splitContainer5.Name = "splitContainer5";
-            this.splitContainer5.Orientation = System.Windows.Forms.Orientation.Horizontal;
-            // 
-            // splitContainer5.Panel1
-            // 
-            this.splitContainer5.Panel1.Controls.Add(this.dgvActivity);
-            // 
-            // splitContainer5.Panel2
-            // 
-            this.splitContainer5.Panel2.Controls.Add(this.dgvProduct);
-            this.splitContainer5.Size = new System.Drawing.Size(700, 390);
-            this.splitContainer5.SplitterDistance = 134;
-            this.splitContainer5.TabIndex = 0;
-            // 
-            // splitContainer4
-            // 
-            this.splitContainer4.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.splitContainer4.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
-            this.splitContainer4.Location = new System.Drawing.Point(0, 0);
-            this.splitContainer4.Name = "splitContainer4";
-            // 
-            // splitContainer4.Panel1
-            // 
-            this.splitContainer4.Panel1.Controls.Add(this.statusBar);
-            // 
-            // splitContainer4.Panel2
-            // 
-            this.splitContainer4.Panel2.Controls.Add(this.panelEx1);
-            this.splitContainer4.Panel2.Controls.Add(this.btnClear);
-            this.splitContainer4.Size = new System.Drawing.Size(978, 26);
-            this.splitContainer4.SplitterDistance = 700;
-            this.splitContainer4.TabIndex = 3;
-            // 
-            // panelEx1
-            // 
-            this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control;
-            this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty;
-            this.panelEx1.Location = new System.Drawing.Point(155, 0);
-            this.panelEx1.Name = "panelEx1";
-            this.panelEx1.Size = new System.Drawing.Size(115, 21);
-            this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center;
-            this.panelEx1.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
-            this.panelEx1.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
-            this.panelEx1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
-            this.panelEx1.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
-            this.panelEx1.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
-            this.panelEx1.Style.GradientAngle = 90;
-            this.panelEx1.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
-            this.panelEx1.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
-            this.panelEx1.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
-            this.panelEx1.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
-            this.panelEx1.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
-            this.panelEx1.TabIndex = 668;
-            this.panelEx1.Text = "停止当前操作";
-            this.panelEx1.Click += new System.EventHandler(this.btnStop_Click);
-            // 
-            // btnClear
-            // 
-            this.btnClear.Anchor = System.Windows.Forms.AnchorStyles.Right;
-            this.btnClear.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.btnClear.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.btnClear.DisabledBackColor = System.Drawing.Color.Empty;
-            this.btnClear.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnClear.Location = new System.Drawing.Point(47, 0);
-            this.btnClear.Name = "btnClear";
-            this.btnClear.Size = new System.Drawing.Size(90, 21);
-            this.btnClear.Style.Alignment = System.Drawing.StringAlignment.Center;
-            this.btnClear.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
-            this.btnClear.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
-            this.btnClear.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
-            this.btnClear.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
-            this.btnClear.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
-            this.btnClear.Style.ForeColor.Color = System.Drawing.Color.White;
-            this.btnClear.Style.GradientAngle = 90;
-            this.btnClear.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
-            this.btnClear.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
-            this.btnClear.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
-            this.btnClear.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
-            this.btnClear.TabIndex = 440;
-            this.btnClear.Text = "清空结果";
-            this.btnClear.Visible = false;
-            // 
            // ucGroupBoxEx3
            // 
            this.ucGroupBoxEx3.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
@@ -296,7 +175,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms
            this.ucGroupBoxEx3.Controls.Add(this.panel1);
            this.ucGroupBoxEx3.Location = new System.Drawing.Point(272, 2);
            this.ucGroupBoxEx3.Name = "ucGroupBoxEx3";
-            this.ucGroupBoxEx3.Size = new System.Drawing.Size(704, 120);
+            this.ucGroupBoxEx3.Size = new System.Drawing.Size(755, 120);
            this.ucGroupBoxEx3.TabIndex = 666;
            this.ucGroupBoxEx3.TabStop = false;
            this.ucGroupBoxEx3.Text = "活动设置";
@@ -423,7 +302,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms
            this.panelEx2.Cursor = System.Windows.Forms.Cursors.Hand;
            this.panelEx2.DisabledBackColor = System.Drawing.Color.Empty;
            this.panelEx2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.panelEx2.Location = new System.Drawing.Point(619, 32);
+            this.panelEx2.Location = new System.Drawing.Point(670, 32);
            this.panelEx2.Name = "panelEx2";
            this.panelEx2.Size = new System.Drawing.Size(70, 23);
            this.panelEx2.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -467,31 +346,73 @@ namespace TemuKJD.KJDForms.SalesCenterForms
            // 
            // panel1
            // 
+            this.panel1.Controls.Add(this.numSaleCount);
+            this.panel1.Controls.Add(this.cmbDays);
+            this.panel1.Controls.Add(this.label4);
+            this.panel1.Controls.Add(this.label3);
            this.panel1.Controls.Add(this.label2);
-            this.panel1.Controls.Add(this.numNoSaleDays);
+            this.panel1.Controls.Add(this.numOnSaleDays);
            this.panel1.Controls.Add(this.label1);
            this.panel1.Location = new System.Drawing.Point(223, 24);
            this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(311, 24);
+            this.panel1.Size = new System.Drawing.Size(397, 26);
            this.panel1.TabIndex = 722;
            this.panel1.Visible = false;
            // 
+            // numSaleCount
+            // 
+            this.numSaleCount.Location = new System.Drawing.Point(286, 1);
+            this.numSaleCount.Name = "numSaleCount";
+            this.numSaleCount.Size = new System.Drawing.Size(40, 21);
+            this.numSaleCount.TabIndex = 726;
+            // 
+            // cmbDays
+            // 
+            this.cmbDays.Font = new System.Drawing.Font("微软雅黑", 7.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.cmbDays.FormattingEnabled = true;
+            this.cmbDays.Items.AddRange(new object[] {
+            "7",
+            "30"});
+            this.cmbDays.Location = new System.Drawing.Point(203, 1);
+            this.cmbDays.Name = "cmbDays";
+            this.cmbDays.Size = new System.Drawing.Size(38, 24);
+            this.cmbDays.TabIndex = 729;
+            this.cmbDays.Text = "7";
+            // 
+            // label4
+            // 
+            this.label4.AutoSize = true;
+            this.label4.Location = new System.Drawing.Point(243, 5);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(41, 12);
+            this.label4.TabIndex = 728;
+            this.label4.Text = "天销量";
+            // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.Location = new System.Drawing.Point(328, 5);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(65, 12);
+            this.label3.TabIndex = 727;
+            this.label3.Text = "以内的商品";
+            // 
            // label2
            // 
            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(156, 5);
+            this.label2.Location = new System.Drawing.Point(148, 5);
            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(101, 12);
+            this.label2.Size = new System.Drawing.Size(53, 12);
            this.label2.TabIndex = 725;
-            this.label2.Text = "天，且未出单商品";
+            this.label2.Text = "天，且近";
            // 
-            // numNoSaleDays
+            // numOnSaleDays
            // 
-            this.numNoSaleDays.Location = new System.Drawing.Point(110, 1);
-            this.numNoSaleDays.Name = "numNoSaleDays";
-            this.numNoSaleDays.Size = new System.Drawing.Size(40, 21);
-            this.numNoSaleDays.TabIndex = 724;
-            this.numNoSaleDays.Value = new decimal(new int[] {
+            this.numOnSaleDays.Location = new System.Drawing.Point(106, 1);
+            this.numOnSaleDays.Name = "numOnSaleDays";
+            this.numOnSaleDays.Size = new System.Drawing.Size(40, 21);
+            this.numOnSaleDays.TabIndex = 724;
+            this.numOnSaleDays.Value = new decimal(new int[] {
            30,
            0,
            0,
@@ -596,22 +517,61 @@ namespace TemuKJD.KJDForms.SalesCenterForms
            this.btnSearchActivity.Text = "查询活动";
            this.btnSearchActivity.Click += new System.EventHandler(this.btnSearchActivity_Click);
            // 
+            // splitContainer3
+            // 
+            this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitContainer3.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
+            this.splitContainer3.Location = new System.Drawing.Point(0, 0);
+            this.splitContainer3.Name = "splitContainer3";
+            this.splitContainer3.Orientation = System.Windows.Forms.Orientation.Horizontal;
+            // 
+            // splitContainer3.Panel1
+            // 
+            this.splitContainer3.Panel1.Controls.Add(this.splitContainer2);
+            // 
+            // splitContainer3.Panel2
+            // 
+            this.splitContainer3.Panel2.Controls.Add(this.splitContainer4);
+            this.splitContainer3.Size = new System.Drawing.Size(1029, 420);
+            this.splitContainer3.SplitterDistance = 390;
+            this.splitContainer3.TabIndex = 1;
+            // 
+            // splitContainer2
+            // 
+            this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitContainer2.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
+            this.splitContainer2.Location = new System.Drawing.Point(0, 0);
+            this.splitContainer2.Name = "splitContainer2";
+            // 
+            // splitContainer2.Panel1
+            // 
+            this.splitContainer2.Panel1.Controls.Add(this.dgvShop);
+            this.splitContainer2.Panel1.Padding = new System.Windows.Forms.Padding(4, 0, 0, 0);
+            // 
+            // splitContainer2.Panel2
+            // 
+            this.splitContainer2.Panel2.Controls.Add(this.splitContainer5);
+            this.splitContainer2.Panel2.Padding = new System.Windows.Forms.Padding(0, 0, 4, 0);
+            this.splitContainer2.Size = new System.Drawing.Size(1029, 390);
+            this.splitContainer2.SplitterDistance = 270;
+            this.splitContainer2.TabIndex = 0;
+            // 
            // dgvShop
            // 
            this.dgvShop.AllowUserToAddRows = false;
            this.dgvShop.AllowUserToDeleteRows = false;
-            dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke;
-            this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+            dataGridViewCellStyle31.BackColor = System.Drawing.Color.WhiteSmoke;
+            this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle31;
            this.dgvShop.BackgroundColor = System.Drawing.Color.White;
            this.dgvShop.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+            dataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle32.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle32.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle32.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle32.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle32.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle32.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle32;
            this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
            this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
            this.colSelect,
@@ -688,23 +648,41 @@ namespace TemuKJD.KJDForms.SalesCenterForms
            this.colMessage.ReadOnly = true;
            this.colMessage.Width = 120;
            // 
+            // splitContainer5
+            // 
+            this.splitContainer5.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitContainer5.Location = new System.Drawing.Point(0, 0);
+            this.splitContainer5.Name = "splitContainer5";
+            this.splitContainer5.Orientation = System.Windows.Forms.Orientation.Horizontal;
+            // 
+            // splitContainer5.Panel1
+            // 
+            this.splitContainer5.Panel1.Controls.Add(this.dgvActivity);
+            // 
+            // splitContainer5.Panel2
+            // 
+            this.splitContainer5.Panel2.Controls.Add(this.dgvProduct);
+            this.splitContainer5.Size = new System.Drawing.Size(751, 390);
+            this.splitContainer5.SplitterDistance = 134;
+            this.splitContainer5.TabIndex = 0;
+            // 
            // dgvActivity
            // 
            this.dgvActivity.AllowUserToAddRows = false;
            this.dgvActivity.AllowUserToDeleteRows = false;
-            dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke;
-            this.dgvActivity.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3;
+            dataGridViewCellStyle33.BackColor = System.Drawing.Color.WhiteSmoke;
+            this.dgvActivity.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle33;
            this.dgvActivity.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
            this.dgvActivity.BackgroundColor = System.Drawing.Color.White;
            this.dgvActivity.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvActivity.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4;
+            dataGridViewCellStyle34.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle34.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle34.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle34.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle34.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle34.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle34.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvActivity.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle34;
            this.dgvActivity.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
            this.dgvActivity.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
            this.colCheckActivity,
@@ -719,26 +697,74 @@ namespace TemuKJD.KJDForms.SalesCenterForms
            this.dgvActivity.Name = "dgvActivity";
            this.dgvActivity.ReadOnly = true;
            this.dgvActivity.RowTemplate.Height = 23;
-            this.dgvActivity.Size = new System.Drawing.Size(700, 134);
+            this.dgvActivity.Size = new System.Drawing.Size(751, 134);
            this.dgvActivity.TabIndex = 189;
            this.dgvActivity.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvActivity_CellContentClick);
            // 
+            // colCheckActivity
+            // 
+            this.colCheckActivity.FillWeight = 15F;
+            this.colCheckActivity.HeaderText = "选择";
+            this.colCheckActivity.Name = "colCheckActivity";
+            this.colCheckActivity.ReadOnly = true;
+            this.colCheckActivity.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.colCheckActivity.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            // 
+            // colActivityId
+            // 
+            this.colActivityId.HeaderText = "活动编号";
+            this.colActivityId.Name = "colActivityId";
+            this.colActivityId.ReadOnly = true;
+            this.colActivityId.Visible = false;
+            // 
+            // colActivityName
+            // 
+            this.colActivityName.HeaderText = "活动主题";
+            this.colActivityName.Name = "colActivityName";
+            this.colActivityName.ReadOnly = true;
+            // 
+            // colActivityTime
+            // 
+            this.colActivityTime.HeaderText = "活动时间";
+            this.colActivityTime.Name = "colActivityTime";
+            this.colActivityTime.ReadOnly = true;
+            // 
+            // colSignUpTime
+            // 
+            this.colSignUpTime.FillWeight = 50F;
+            this.colSignUpTime.HeaderText = "报名截止";
+            this.colSignUpTime.Name = "colSignUpTime";
+            this.colSignUpTime.ReadOnly = true;
+            // 
+            // colDiscount
+            // 
+            this.colDiscount.FillWeight = 50F;
+            this.colDiscount.HeaderText = "活动折扣";
+            this.colDiscount.Name = "colDiscount";
+            this.colDiscount.ReadOnly = true;
+            // 
+            // colActivityMsg
+            // 
+            this.colActivityMsg.HeaderText = "状态";
+            this.colActivityMsg.Name = "colActivityMsg";
+            this.colActivityMsg.ReadOnly = true;
+            // 
            // dgvProduct
            // 
            this.dgvProduct.AllowUserToAddRows = false;
            this.dgvProduct.AllowUserToDeleteRows = false;
-            dataGridViewCellStyle5.BackColor = System.Drawing.Color.WhiteSmoke;
-            this.dgvProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle5;
+            dataGridViewCellStyle35.BackColor = System.Drawing.Color.WhiteSmoke;
+            this.dgvProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle35;
            this.dgvProduct.BackgroundColor = System.Drawing.Color.White;
            this.dgvProduct.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle6;
+            dataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle36.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle36.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle36.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle36.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle36.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle36.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle36;
            this.dgvProduct.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
            this.dgvProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
            this.colCheckProduct,
@@ -761,7 +787,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms
            this.dgvProduct.Name = "dgvProduct";
            this.dgvProduct.ReadOnly = true;
            this.dgvProduct.RowTemplate.Height = 23;
-            this.dgvProduct.Size = new System.Drawing.Size(700, 252);
+            this.dgvProduct.Size = new System.Drawing.Size(751, 252);
            this.dgvProduct.TabIndex = 188;
            // 
            // colCheckProduct
@@ -877,6 +903,25 @@ namespace TemuKJD.KJDForms.SalesCenterForms
            this.colMsg.ReadOnly = true;
            this.colMsg.Width = 400;
            // 
+            // splitContainer4
+            // 
+            this.splitContainer4.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitContainer4.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
+            this.splitContainer4.Location = new System.Drawing.Point(0, 0);
+            this.splitContainer4.Name = "splitContainer4";
+            // 
+            // splitContainer4.Panel1
+            // 
+            this.splitContainer4.Panel1.Controls.Add(this.statusBar);
+            // 
+            // splitContainer4.Panel2
+            // 
+            this.splitContainer4.Panel2.Controls.Add(this.panelEx1);
+            this.splitContainer4.Panel2.Controls.Add(this.btnClear);
+            this.splitContainer4.Size = new System.Drawing.Size(1029, 26);
+            this.splitContainer4.SplitterDistance = 751;
+            this.splitContainer4.TabIndex = 3;
+            // 
            // statusBar
            // 
            this.statusBar.BackColor = System.Drawing.Color.White;
@@ -885,62 +930,64 @@ namespace TemuKJD.KJDForms.SalesCenterForms
            this.statusBar.Location = new System.Drawing.Point(0, 0);
            this.statusBar.Margin = new System.Windows.Forms.Padding(0);
            this.statusBar.Name = "statusBar";
-            this.statusBar.Size = new System.Drawing.Size(700, 26);
+            this.statusBar.Size = new System.Drawing.Size(751, 26);
            this.statusBar.TabIndex = 2;
            // 
-            // colCheckActivity
+            // panelEx1
            // 
-            this.colCheckActivity.FillWeight = 15F;
-            this.colCheckActivity.HeaderText = "选择";
-            this.colCheckActivity.Name = "colCheckActivity";
-            this.colCheckActivity.ReadOnly = true;
-            this.colCheckActivity.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-            this.colCheckActivity.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control;
+            this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty;
+            this.panelEx1.Location = new System.Drawing.Point(155, 0);
+            this.panelEx1.Name = "panelEx1";
+            this.panelEx1.Size = new System.Drawing.Size(115, 21);
+            this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.panelEx1.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
+            this.panelEx1.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
+            this.panelEx1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+            this.panelEx1.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.panelEx1.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+            this.panelEx1.Style.GradientAngle = 90;
+            this.panelEx1.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
+            this.panelEx1.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+            this.panelEx1.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.panelEx1.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.panelEx1.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
+            this.panelEx1.TabIndex = 668;
+            this.panelEx1.Text = "停止当前操作";
+            this.panelEx1.Click += new System.EventHandler(this.btnStop_Click);
            // 
-            // colActivityId
+            // btnClear
            // 
-            this.colActivityId.HeaderText = "活动编号";
-            this.colActivityId.Name = "colActivityId";
-            this.colActivityId.ReadOnly = true;
-            this.colActivityId.Visible = false;
-            // 
-            // colActivityName
-            // 
-            this.colActivityName.HeaderText = "活动主题";
-            this.colActivityName.Name = "colActivityName";
-            this.colActivityName.ReadOnly = true;
-            // 
-            // colActivityTime
-            // 
-            this.colActivityTime.HeaderText = "活动时间";
-            this.colActivityTime.Name = "colActivityTime";
-            this.colActivityTime.ReadOnly = true;
-            // 
-            // colSignUpTime
-            // 
-            this.colSignUpTime.FillWeight = 50F;
-            this.colSignUpTime.HeaderText = "报名截止";
-            this.colSignUpTime.Name = "colSignUpTime";
-            this.colSignUpTime.ReadOnly = true;
-            // 
-            // colDiscount
-            // 
-            this.colDiscount.FillWeight = 50F;
-            this.colDiscount.HeaderText = "活动折扣";
-            this.colDiscount.Name = "colDiscount";
-            this.colDiscount.ReadOnly = true;
-            // 
-            // colActivityMsg
-            // 
-            this.colActivityMsg.HeaderText = "状态";
-            this.colActivityMsg.Name = "colActivityMsg";
-            this.colActivityMsg.ReadOnly = true;
+            this.btnClear.Anchor = System.Windows.Forms.AnchorStyles.Right;
+            this.btnClear.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnClear.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.btnClear.DisabledBackColor = System.Drawing.Color.Empty;
+            this.btnClear.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnClear.Location = new System.Drawing.Point(47, 0);
+            this.btnClear.Name = "btnClear";
+            this.btnClear.Size = new System.Drawing.Size(90, 21);
+            this.btnClear.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnClear.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnClear.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnClear.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+            this.btnClear.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+            this.btnClear.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
+            this.btnClear.Style.ForeColor.Color = System.Drawing.Color.White;
+            this.btnClear.Style.GradientAngle = 90;
+            this.btnClear.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnClear.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+            this.btnClear.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+            this.btnClear.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
+            this.btnClear.TabIndex = 440;
+            this.btnClear.Text = "清空结果";
+            this.btnClear.Visible = false;
            // 
            // MarketingActivityForm
            // 
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
            this.BackColor = System.Drawing.Color.White;
-            this.ClientSize = new System.Drawing.Size(978, 544);
+            this.ClientSize = new System.Drawing.Size(1029, 544);
            this.Controls.Add(this.splitContainer1);
            this.Name = "MarketingActivityForm";
            this.Text = "店铺优化";
@@ -950,22 +997,6 @@ namespace TemuKJD.KJDForms.SalesCenterForms
            this.splitContainer1.Panel2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
            this.splitContainer1.ResumeLayout(false);
-            this.splitContainer3.Panel1.ResumeLayout(false);
-            this.splitContainer3.Panel2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).EndInit();
-            this.splitContainer3.ResumeLayout(false);
-            this.splitContainer2.Panel1.ResumeLayout(false);
-            this.splitContainer2.Panel2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit();
-            this.splitContainer2.ResumeLayout(false);
-            this.splitContainer5.Panel1.ResumeLayout(false);
-            this.splitContainer5.Panel2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer5)).EndInit();
-            this.splitContainer5.ResumeLayout(false);
-            this.splitContainer4.Panel1.ResumeLayout(false);
-            this.splitContainer4.Panel2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer4)).EndInit();
-            this.splitContainer4.ResumeLayout(false);
            this.ucGroupBoxEx3.ResumeLayout(false);
            this.ucGroupBoxEx3.PerformLayout();
            this.actDiscount80.ResumeLayout(false);
@@ -976,13 +1007,30 @@ namespace TemuKJD.KJDForms.SalesCenterForms
            this.actDiscount70.PerformLayout();
            this.panel1.ResumeLayout(false);
            this.panel1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.numNoSaleDays)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numSaleCount)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numOnSaleDays)).EndInit();
            this.ucGroupBoxEx1.ResumeLayout(false);
            this.ucGroupBoxEx2.ResumeLayout(false);
            this.ucGroupBoxEx2.PerformLayout();
+            this.splitContainer3.Panel1.ResumeLayout(false);
+            this.splitContainer3.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).EndInit();
+            this.splitContainer3.ResumeLayout(false);
+            this.splitContainer2.Panel1.ResumeLayout(false);
+            this.splitContainer2.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit();
+            this.splitContainer2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.dgvShop)).EndInit();
+            this.splitContainer5.Panel1.ResumeLayout(false);
+            this.splitContainer5.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer5)).EndInit();
+            this.splitContainer5.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.dgvActivity)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.dgvProduct)).EndInit();
+            this.splitContainer4.Panel1.ResumeLayout(false);
+            this.splitContainer4.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer4)).EndInit();
+            this.splitContainer4.ResumeLayout(false);
            this.ResumeLayout(false);

        }
@@ -1028,7 +1076,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms
        private UserComponent.UcCheckBox ucCheckBox3;
        private System.Windows.Forms.Panel panel1;
        private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.NumericUpDown numNoSaleDays;
+        private System.Windows.Forms.NumericUpDown numOnSaleDays;
        private System.Windows.Forms.Label label1;
        private System.Windows.Forms.DataGridViewCheckBoxColumn colCheckProduct;
        private System.Windows.Forms.DataGridViewTextBoxColumn colSupplierId;
@@ -1052,5 +1100,9 @@ namespace TemuKJD.KJDForms.SalesCenterForms
        private System.Windows.Forms.DataGridViewTextBoxColumn colSignUpTime;
        private System.Windows.Forms.DataGridViewTextBoxColumn colDiscount;
        private System.Windows.Forms.DataGridViewTextBoxColumn colActivityMsg;
+        private System.Windows.Forms.NumericUpDown numSaleCount;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.ComboBox cmbDays;
+        private System.Windows.Forms.Label label4;
    }
 }
@@ -678,11 +678,18 @@ namespace TemuKJD.KJDForms.SalesCenterForms
        /// </summary>
        public List<string> GetNoSaleProd(string shopId)
        {
+            int onSaleDays = 0;
+            int saleCount = 0;
+            string days = "7";
            //int i = 0;
            //foreach (var shopId in lstShopIdSelect)
            //{
            this.Invoke(new Action(() =>
            {
+                days = cmbDays.Text;
+                onSaleDays = numOnSaleDays.Value.ParseToInt();
+                saleCount = numSaleCount.Value.ParseToInt();
+
                this.statusBar.lblTaskStatus.Text = "正在查询无销量商品...";
                this.statusBar.pgbTaskProgress.Maximum = lstShopIdSelect.Count;
                //this.statusBar.UpdateProgressBar(i + 1);
@@ -714,7 +721,8 @@ namespace TemuKJD.KJDForms.SalesCenterForms
            while (page < totalPage)
            {
                page++;
-                string jsonRst = GetNoSaleProd(shop, numNoSaleDays.Value.ParseToInt(), page);
+
+                string jsonRst = GetNoSaleProd(shop, days, onSaleDays, saleCount, page);

                if (!jsonRst.Contains("\"success\":true"))
                {
@@ -825,9 +833,10 @@ namespace TemuKJD.KJDForms.SalesCenterForms
                        }));
                        continue;
                    }
-                    if (jsonRst.Contains("当前操作人数太多，请稍后重试") && tryCount < 5)
+                    if ((jsonRst.Contains("当前操作人数太多，请稍后重试") || jsonRst.Contains("too quickly")) && tryCount < 5)
                    {
                        tryCount++;
+                        Thread.Sleep(500 + Randomx.GetId(500));
                        goto tryAgain;
                    }

@@ -1058,12 +1067,16 @@ namespace TemuKJD.KJDForms.SalesCenterForms
        /// <param name="onSalesDays">加入站点天数</param>
        /// <param name="page"></param>
        /// <returns></returns>
-        private string GetNoSaleProd(ShopLoginInfo shop, int onSalesDays, int page=1)
+        private string GetNoSaleProd(ShopLoginInfo shop, string days, int onSalesDays, int saleCount = 0, int page=1)
        {
            string url = "https://agentseller.temu.com/mms/venom/api/supplier/sales/management/listWarehouse";
            string body;
-            body = @"{""pageNo"":" + page + @",""pageSize"":40,""isLack"":0,""selectStatusList"":[12],""priceAdjustRecentDays"":7,
-""thirtyDaysSaleVolumMax"":0,""onSalesDurationOfflineGte"":" + onSalesDays + "}";
+            if (days == "7")
+                body = @"{""pageNo"":" + page + @",""pageSize"":40,""isLack"":0,""selectStatusList"":[12],""priceAdjustRecentDays"":7,
+""sevenDaysSaleVolumMin"":0, ""sevenDaysSaleVolumMax"":" + saleCount + @",""onSalesDurationOfflineGte"":" + onSalesDays + "}";
+            else
+                body = @"{""pageNo"":" + page + @",""pageSize"":40,""isLack"":0,""selectStatusList"":[12],""priceAdjustRecentDays"":7,
+""thirtyDaysSaleVolumMin"":0, ""thirtyDaysSaleVolumMax"":" + saleCount + @",""onSalesDurationOfflineGte"":" + onSalesDays + "}";
            string refere = "https://agentseller.temu.com/stock/fully-mgt/sale-manage/main";
            return KJDHttpResponse.PostResponse2(shop, url, body, refere);
        }
@@ -0,0 +1,734 @@
+
+namespace TemuKJD.KJDForms.ShopForms
+{
+    partial class ReturnPackageDetailForm
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ReturnPackageDetailForm));
+            this.panel2 = new System.Windows.Forms.Panel();
+            this.splitContainer1 = new System.Windows.Forms.SplitContainer();
+            this.dtpEndDate = new System.Windows.Forms.DateTimePicker();
+            this.label10 = new System.Windows.Forms.Label();
+            this.label9 = new System.Windows.Forms.Label();
+            this.dtpStartDate = new System.Windows.Forms.DateTimePicker();
+            this.btnAdd = new TemuKJD.UserControls.ButtonEx();
+            this.splitContainer2 = new System.Windows.Forms.SplitContainer();
+            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
+            this.label6 = new System.Windows.Forms.Label();
+            this.chkShowDel = new TemuKJD.UserComponent.UcCheckBox(this.components);
+            this.txtShopId = new System.Windows.Forms.TextBox();
+            this.chkNoSubSa = new TemuKJD.UserComponent.UcCheckBox(this.components);
+            this.pnlEmpty = new DevComponents.DotNetBar.PanelEx();
+            this.label7 = new System.Windows.Forms.Label();
+            this.label8 = new System.Windows.Forms.Label();
+            this.txtShopName = new System.Windows.Forms.TextBox();
+            this.label5 = new System.Windows.Forms.Label();
+            this.btnSearch = new TemuKJD.UserControls.ButtonEx();
+            this.txtSKC = new System.Windows.Forms.TextBox();
+            this.txtSPU = new System.Windows.Forms.TextBox();
+            this.label1 = new System.Windows.Forms.Label();
+            this.label2 = new System.Windows.Forms.Label();
+            this.txtCat = new System.Windows.Forms.TextBox();
+            this.txtExtCode = new System.Windows.Forms.TextBox();
+            this.label3 = new System.Windows.Forms.Label();
+            this.label4 = new System.Windows.Forms.Label();
+            this.txtProdName = new System.Windows.Forms.TextBox();
+            this.cmbStatus = new System.Windows.Forms.ComboBox();
+            this.pbLoading = new System.Windows.Forms.PictureBox();
+            this.dgvSelectProduct = new TemuKJD.UserComponent.DataGridViewEx();
+            this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.colSpu = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colSku = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colPic = new System.Windows.Forms.DataGridViewImageColumn();
+            this.colSkc = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colSkuName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colPurchaseSubOrderSn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colReason = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colPackageSn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colSkuNumber = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colOutboundTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colOpResult = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage();
+            this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
+            this.panel2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
+            this.splitContainer1.Panel1.SuspendLayout();
+            this.splitContainer1.Panel2.SuspendLayout();
+            this.splitContainer1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit();
+            this.splitContainer2.Panel1.SuspendLayout();
+            this.splitContainer2.Panel2.SuspendLayout();
+            this.splitContainer2.SuspendLayout();
+            this.tableLayoutPanel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvSelectProduct)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // panel2
+            // 
+            this.panel2.BackColor = System.Drawing.Color.White;
+            this.panel2.Controls.Add(this.splitContainer1);
+            this.panel2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel2.Location = new System.Drawing.Point(1, 33);
+            this.panel2.Name = "panel2";
+            this.panel2.Size = new System.Drawing.Size(1197, 403);
+            this.panel2.TabIndex = 1;
+            // 
+            // splitContainer1
+            // 
+            this.splitContainer1.BackColor = System.Drawing.Color.White;
+            this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
+            this.splitContainer1.Location = new System.Drawing.Point(0, 0);
+            this.splitContainer1.Name = "splitContainer1";
+            this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal;
+            // 
+            // splitContainer1.Panel1
+            // 
+            this.splitContainer1.Panel1.Controls.Add(this.dtpEndDate);
+            this.splitContainer1.Panel1.Controls.Add(this.label10);
+            this.splitContainer1.Panel1.Controls.Add(this.label9);
+            this.splitContainer1.Panel1.Controls.Add(this.dtpStartDate);
+            this.splitContainer1.Panel1.Controls.Add(this.btnAdd);
+            // 
+            // splitContainer1.Panel2
+            // 
+            this.splitContainer1.Panel2.Controls.Add(this.splitContainer2);
+            this.splitContainer1.Size = new System.Drawing.Size(1197, 403);
+            this.splitContainer1.SplitterDistance = 66;
+            this.splitContainer1.TabIndex = 3;
+            // 
+            // dtpEndDate
+            // 
+            this.dtpEndDate.Location = new System.Drawing.Point(256, 21);
+            this.dtpEndDate.Name = "dtpEndDate";
+            this.dtpEndDate.Size = new System.Drawing.Size(112, 21);
+            this.dtpEndDate.TabIndex = 452;
+            // 
+            // label10
+            // 
+            this.label10.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.label10.AutoSize = true;
+            this.label10.Location = new System.Drawing.Point(199, 25);
+            this.label10.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
+            this.label10.Name = "label10";
+            this.label10.Size = new System.Drawing.Size(53, 12);
+            this.label10.TabIndex = 451;
+            this.label10.Text = "结束时间";
+            // 
+            // label9
+            // 
+            this.label9.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.label9.AutoSize = true;
+            this.label9.Location = new System.Drawing.Point(3, 25);
+            this.label9.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
+            this.label9.Name = "label9";
+            this.label9.Size = new System.Drawing.Size(53, 12);
+            this.label9.TabIndex = 450;
+            this.label9.Text = "开始时间";
+            // 
+            // dtpStartDate
+            // 
+            this.dtpStartDate.Location = new System.Drawing.Point(60, 21);
+            this.dtpStartDate.Name = "dtpStartDate";
+            this.dtpStartDate.Size = new System.Drawing.Size(112, 21);
+            this.dtpStartDate.TabIndex = 445;
+            // 
+            // btnAdd
+            // 
+            this.btnAdd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnAdd.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnAdd.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.btnAdd.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnAdd.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnAdd.ForeColor = System.Drawing.Color.White;
+            this.btnAdd.Location = new System.Drawing.Point(1019, 19);
+            this.btnAdd.Margin = new System.Windows.Forms.Padding(2);
+            this.btnAdd.Name = "btnAdd";
+            this.btnAdd.Size = new System.Drawing.Size(171, 26);
+            this.btnAdd.TabIndex = 444;
+            this.btnAdd.Text = "搜索并上传到库存管理";
+            this.btnAdd.UseVisualStyleBackColor = false;
+            this.btnAdd.Click += new System.EventHandler(this.btnAdd_Click);
+            // 
+            // splitContainer2
+            // 
+            this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitContainer2.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
+            this.splitContainer2.Location = new System.Drawing.Point(0, 0);
+            this.splitContainer2.Name = "splitContainer2";
+            this.splitContainer2.Orientation = System.Windows.Forms.Orientation.Horizontal;
+            // 
+            // splitContainer2.Panel1
+            // 
+            this.splitContainer2.Panel1.Controls.Add(this.tableLayoutPanel1);
+            this.splitContainer2.Panel1.Controls.Add(this.pbLoading);
+            this.splitContainer2.Panel1.Controls.Add(this.dgvSelectProduct);
+            this.splitContainer2.Panel1.Padding = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            // 
+            // splitContainer2.Panel2
+            // 
+            this.splitContainer2.Panel2.Controls.Add(this.ucSplitPage1);
+            this.splitContainer2.Panel2.Controls.Add(this.statusBar);
+            this.splitContainer2.Size = new System.Drawing.Size(1197, 333);
+            this.splitContainer2.SplitterDistance = 304;
+            this.splitContainer2.TabIndex = 0;
+            // 
+            // tableLayoutPanel1
+            // 
+            this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.tableLayoutPanel1.ColumnCount = 20;
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.5F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.5F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.5F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.5F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.5F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.5F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.5F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.5F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+            this.tableLayoutPanel1.Controls.Add(this.label6, 0, 0);
+            this.tableLayoutPanel1.Controls.Add(this.chkShowDel, 19, 0);
+            this.tableLayoutPanel1.Controls.Add(this.txtShopId, 1, 0);
+            this.tableLayoutPanel1.Controls.Add(this.chkNoSubSa, 18, 0);
+            this.tableLayoutPanel1.Controls.Add(this.pnlEmpty, 17, 0);
+            this.tableLayoutPanel1.Controls.Add(this.label7, 2, 0);
+            this.tableLayoutPanel1.Controls.Add(this.label8, 14, 0);
+            this.tableLayoutPanel1.Controls.Add(this.txtShopName, 3, 0);
+            this.tableLayoutPanel1.Controls.Add(this.label5, 4, 0);
+            this.tableLayoutPanel1.Controls.Add(this.btnSearch, 16, 0);
+            this.tableLayoutPanel1.Controls.Add(this.txtSKC, 7, 0);
+            this.tableLayoutPanel1.Controls.Add(this.txtSPU, 5, 0);
+            this.tableLayoutPanel1.Controls.Add(this.label1, 6, 0);
+            this.tableLayoutPanel1.Controls.Add(this.label2, 8, 0);
+            this.tableLayoutPanel1.Controls.Add(this.txtCat, 9, 0);
+            this.tableLayoutPanel1.Controls.Add(this.txtExtCode, 13, 0);
+            this.tableLayoutPanel1.Controls.Add(this.label3, 10, 0);
+            this.tableLayoutPanel1.Controls.Add(this.label4, 12, 0);
+            this.tableLayoutPanel1.Controls.Add(this.txtProdName, 11, 0);
+            this.tableLayoutPanel1.Controls.Add(this.cmbStatus, 15, 0);
+            this.tableLayoutPanel1.Location = new System.Drawing.Point(7, 250);
+            this.tableLayoutPanel1.Name = "tableLayoutPanel1";
+            this.tableLayoutPanel1.RowCount = 1;
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(879, 32);
+            this.tableLayoutPanel1.TabIndex = 469;
+            this.tableLayoutPanel1.Visible = false;
+            // 
+            // label6
+            // 
+            this.label6.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.label6.AutoSize = true;
+            this.label6.Location = new System.Drawing.Point(3, 10);
+            this.label6.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
+            this.label6.Name = "label6";
+            this.label6.Size = new System.Drawing.Size(41, 12);
+            this.label6.TabIndex = 449;
+            this.label6.Text = "店铺Id";
+            // 
+            // chkShowDel
+            // 
+            this.chkShowDel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.chkShowDel.AutoSize = true;
+            this.chkShowDel.Location = new System.Drawing.Point(797, 8);
+            this.chkShowDel.Name = "chkShowDel";
+            this.chkShowDel.Size = new System.Drawing.Size(79, 16);
+            this.chkShowDel.TabIndex = 471;
+            this.chkShowDel.Text = "显示删除";
+            this.chkShowDel.UseVisualStyleBackColor = true;
+            // 
+            // txtShopId
+            // 
+            this.txtShopId.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.txtShopId.Location = new System.Drawing.Point(44, 5);
+            this.txtShopId.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
+            this.txtShopId.Name = "txtShopId";
+            this.txtShopId.Size = new System.Drawing.Size(31, 21);
+            this.txtShopId.TabIndex = 448;
+            // 
+            // chkNoSubSa
+            // 
+            this.chkNoSubSa.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.chkNoSubSa.AutoSize = true;
+            this.chkNoSubSa.Location = new System.Drawing.Point(707, 8);
+            this.chkNoSubSa.Margin = new System.Windows.Forms.Padding(8, 3, 3, 3);
+            this.chkNoSubSa.Name = "chkNoSubSa";
+            this.chkNoSubSa.Size = new System.Drawing.Size(84, 16);
+            this.chkNoSubSa.TabIndex = 470;
+            this.chkNoSubSa.Text = "未分配超管";
+            this.chkNoSubSa.UseVisualStyleBackColor = true;
+            // 
+            // pnlEmpty
+            // 
+            this.pnlEmpty.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.pnlEmpty.CanvasColor = System.Drawing.SystemColors.Control;
+            this.pnlEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.pnlEmpty.DisabledBackColor = System.Drawing.Color.Empty;
+            this.pnlEmpty.Location = new System.Drawing.Point(640, 5);
+            this.pnlEmpty.Name = "pnlEmpty";
+            this.pnlEmpty.Size = new System.Drawing.Size(56, 22);
+            this.pnlEmpty.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.pnlEmpty.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
+            this.pnlEmpty.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
+            this.pnlEmpty.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+            this.pnlEmpty.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.pnlEmpty.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+            this.pnlEmpty.Style.GradientAngle = 90;
+            this.pnlEmpty.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
+            this.pnlEmpty.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+            this.pnlEmpty.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.pnlEmpty.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.pnlEmpty.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
+            this.pnlEmpty.TabIndex = 431;
+            this.pnlEmpty.Text = "清空条件";
+            // 
+            // label7
+            // 
+            this.label7.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.label7.AutoSize = true;
+            this.label7.Location = new System.Drawing.Point(81, 10);
+            this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
+            this.label7.Name = "label7";
+            this.label7.Size = new System.Drawing.Size(53, 12);
+            this.label7.TabIndex = 452;
+            this.label7.Text = "店铺名称";
+            // 
+            // label8
+            // 
+            this.label8.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.label8.AutoSize = true;
+            this.label8.Location = new System.Drawing.Point(489, 10);
+            this.label8.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
+            this.label8.Name = "label8";
+            this.label8.Size = new System.Drawing.Size(53, 12);
+            this.label8.TabIndex = 458;
+            this.label8.Text = "认领状态";
+            // 
+            // txtShopName
+            // 
+            this.txtShopName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.txtShopName.Location = new System.Drawing.Point(134, 5);
+            this.txtShopName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
+            this.txtShopName.Name = "txtShopName";
+            this.txtShopName.Size = new System.Drawing.Size(31, 21);
+            this.txtShopName.TabIndex = 451;
+            // 
+            // label5
+            // 
+            this.label5.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.label5.AutoSize = true;
+            this.label5.Location = new System.Drawing.Point(171, 10);
+            this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(23, 12);
+            this.label5.TabIndex = 435;
+            this.label5.Text = "SPU";
+            // 
+            // btnSearch
+            // 
+            this.btnSearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnSearch.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnSearch.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.btnSearch.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnSearch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnSearch.ForeColor = System.Drawing.Color.White;
+            this.btnSearch.Location = new System.Drawing.Point(579, 4);
+            this.btnSearch.Margin = new System.Windows.Forms.Padding(6, 2, 2, 2);
+            this.btnSearch.Name = "btnSearch";
+            this.btnSearch.Size = new System.Drawing.Size(56, 24);
+            this.btnSearch.TabIndex = 424;
+            this.btnSearch.Text = "搜索";
+            this.btnSearch.UseVisualStyleBackColor = false;
+            // 
+            // txtSKC
+            // 
+            this.txtSKC.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.txtSKC.Location = new System.Drawing.Point(254, 5);
+            this.txtSKC.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
+            this.txtSKC.Name = "txtSKC";
+            this.txtSKC.Size = new System.Drawing.Size(31, 21);
+            this.txtSKC.TabIndex = 432;
+            // 
+            // txtSPU
+            // 
+            this.txtSPU.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.txtSPU.Location = new System.Drawing.Point(194, 5);
+            this.txtSPU.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
+            this.txtSPU.Name = "txtSPU";
+            this.txtSPU.Size = new System.Drawing.Size(31, 21);
+            this.txtSPU.TabIndex = 434;
+            // 
+            // label1
+            // 
+            this.label1.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(231, 10);
+            this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(23, 12);
+            this.label1.TabIndex = 433;
+            this.label1.Text = "SKC";
+            // 
+            // label2
+            // 
+            this.label2.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(291, 10);
+            this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(29, 12);
+            this.label2.TabIndex = 426;
+            this.label2.Text = "类目";
+            // 
+            // txtCat
+            // 
+            this.txtCat.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.txtCat.Location = new System.Drawing.Point(320, 5);
+            this.txtCat.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
+            this.txtCat.Name = "txtCat";
+            this.txtCat.Size = new System.Drawing.Size(31, 21);
+            this.txtCat.TabIndex = 425;
+            // 
+            // txtExtCode
+            // 
+            this.txtExtCode.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.txtExtCode.Location = new System.Drawing.Point(452, 5);
+            this.txtExtCode.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
+            this.txtExtCode.Name = "txtExtCode";
+            this.txtExtCode.Size = new System.Drawing.Size(31, 21);
+            this.txtExtCode.TabIndex = 429;
+            // 
+            // label3
+            // 
+            this.label3.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.label3.AutoSize = true;
+            this.label3.Location = new System.Drawing.Point(357, 10);
+            this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(29, 12);
+            this.label3.TabIndex = 428;
+            this.label3.Text = "标题";
+            // 
+            // label4
+            // 
+            this.label4.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.label4.AutoSize = true;
+            this.label4.Location = new System.Drawing.Point(423, 10);
+            this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(29, 12);
+            this.label4.TabIndex = 430;
+            this.label4.Text = "货号";
+            // 
+            // txtProdName
+            // 
+            this.txtProdName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.txtProdName.Location = new System.Drawing.Point(386, 5);
+            this.txtProdName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
+            this.txtProdName.Name = "txtProdName";
+            this.txtProdName.Size = new System.Drawing.Size(31, 21);
+            this.txtProdName.TabIndex = 427;
+            // 
+            // cmbStatus
+            // 
+            this.cmbStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.cmbStatus.FormattingEnabled = true;
+            this.cmbStatus.Items.AddRange(new object[] {
+            "待上传",
+            "已上传",
+            "全部"});
+            this.cmbStatus.Location = new System.Drawing.Point(542, 6);
+            this.cmbStatus.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
+            this.cmbStatus.Name = "cmbStatus";
+            this.cmbStatus.Size = new System.Drawing.Size(31, 20);
+            this.cmbStatus.TabIndex = 459;
+            this.cmbStatus.Text = "待上传";
+            // 
+            // pbLoading
+            // 
+            this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None;
+            this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue;
+            this.pbLoading.Location = new System.Drawing.Point(573, 111);
+            this.pbLoading.Name = "pbLoading";
+            this.pbLoading.Size = new System.Drawing.Size(50, 50);
+            this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+            this.pbLoading.TabIndex = 7;
+            this.pbLoading.TabStop = false;
+            // 
+            // dgvSelectProduct
+            // 
+            this.dgvSelectProduct.AllowUserToAddRows = false;
+            this.dgvSelectProduct.AllowUserToDeleteRows = false;
+            dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke;
+            this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+            this.dgvSelectProduct.BackgroundColor = System.Drawing.Color.White;
+            this.dgvSelectProduct.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvSelectProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+            this.dgvSelectProduct.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.dgvSelectProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.colSelect,
+            this.colSpu,
+            this.colSku,
+            this.colPic,
+            this.colSkc,
+            this.colSkuName,
+            this.colPurchaseSubOrderSn,
+            this.colReason,
+            this.colPackageSn,
+            this.colSkuNumber,
+            this.colOutboundTime,
+            this.colOpResult});
+            this.dgvSelectProduct.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.dgvSelectProduct.Location = new System.Drawing.Point(4, 0);
+            this.dgvSelectProduct.Name = "dgvSelectProduct";
+            this.dgvSelectProduct.ReadOnly = true;
+            this.dgvSelectProduct.RowHeadersWidth = 51;
+            this.dgvSelectProduct.RowTemplate.Height = 23;
+            this.dgvSelectProduct.Size = new System.Drawing.Size(1189, 304);
+            this.dgvSelectProduct.TabIndex = 190;
+            // 
+            // 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.Visible = false;
+            this.colSelect.Width = 30;
+            // 
+            // colSpu
+            // 
+            this.colSpu.HeaderText = "SPU";
+            this.colSpu.Name = "colSpu";
+            this.colSpu.ReadOnly = true;
+            this.colSpu.Width = 125;
+            // 
+            // colSku
+            // 
+            this.colSku.HeaderText = "SKU";
+            this.colSku.Name = "colSku";
+            this.colSku.ReadOnly = true;
+            this.colSku.Width = 120;
+            // 
+            // colPic
+            // 
+            this.colPic.HeaderText = "图片";
+            this.colPic.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Zoom;
+            this.colPic.Name = "colPic";
+            this.colPic.ReadOnly = true;
+            this.colPic.Width = 60;
+            // 
+            // colSkc
+            // 
+            this.colSkc.HeaderText = "SKC";
+            this.colSkc.Name = "colSkc";
+            this.colSkc.ReadOnly = true;
+            this.colSkc.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            // 
+            // colSkuName
+            // 
+            this.colSkuName.HeaderText = "属性集";
+            this.colSkuName.Name = "colSkuName";
+            this.colSkuName.ReadOnly = true;
+            this.colSkuName.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.colSkuName.Width = 140;
+            // 
+            // colPurchaseSubOrderSn
+            // 
+            this.colPurchaseSubOrderSn.HeaderText = "备货单号";
+            this.colPurchaseSubOrderSn.Name = "colPurchaseSubOrderSn";
+            this.colPurchaseSubOrderSn.ReadOnly = true;
+            this.colPurchaseSubOrderSn.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.colPurchaseSubOrderSn.Width = 120;
+            // 
+            // colReason
+            // 
+            this.colReason.HeaderText = "退货原因";
+            this.colReason.Name = "colReason";
+            this.colReason.ReadOnly = true;
+            this.colReason.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.colReason.Width = 140;
+            // 
+            // colPackageSn
+            // 
+            this.colPackageSn.HeaderText = "退货包裹号";
+            this.colPackageSn.Name = "colPackageSn";
+            this.colPackageSn.ReadOnly = true;
+            this.colPackageSn.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.colPackageSn.Width = 120;
+            // 
+            // colSkuNumber
+            // 
+            this.colSkuNumber.FillWeight = 150F;
+            this.colSkuNumber.HeaderText = "SKU件数";
+            this.colSkuNumber.Name = "colSkuNumber";
+            this.colSkuNumber.ReadOnly = true;
+            this.colSkuNumber.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.colSkuNumber.Width = 80;
+            // 
+            // colOutboundTime
+            // 
+            dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.colOutboundTime.DefaultCellStyle = dataGridViewCellStyle3;
+            this.colOutboundTime.HeaderText = "出库时间";
+            this.colOutboundTime.Name = "colOutboundTime";
+            this.colOutboundTime.ReadOnly = true;
+            this.colOutboundTime.Width = 120;
+            // 
+            // colOpResult
+            // 
+            this.colOpResult.HeaderText = "上传结果";
+            this.colOpResult.Name = "colOpResult";
+            this.colOpResult.ReadOnly = true;
+            this.colOpResult.Width = 150;
+            // 
+            // ucSplitPage1
+            // 
+            this.ucSplitPage1.CurrentPage = 1;
+            this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Right;
+            this.ucSplitPage1.Location = new System.Drawing.Point(835, 0);
+            this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0);
+            this.ucSplitPage1.Name = "ucSplitPage1";
+            this.ucSplitPage1.Padding = new System.Windows.Forms.Padding(0, 0, 1, 0);
+            this.ucSplitPage1.Size = new System.Drawing.Size(362, 25);
+            this.ucSplitPage1.TabIndex = 6;
+            this.ucSplitPage1.TotalPage = 1;
+            // 
+            // statusBar
+            // 
+            this.statusBar.BackColor = System.Drawing.Color.White;
+            this.statusBar.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.statusBar.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.statusBar.Location = new System.Drawing.Point(0, 0);
+            this.statusBar.Margin = new System.Windows.Forms.Padding(0);
+            this.statusBar.Name = "statusBar";
+            this.statusBar.Size = new System.Drawing.Size(1197, 25);
+            this.statusBar.TabIndex = 5;
+            // 
+            // ReturnPackageDetailForm
+            // 
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
+            this.ClientSize = new System.Drawing.Size(1199, 437);
+            this.Controls.Add(this.panel2);
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.Name = "ReturnPackageDetailForm";
+            this.Text = "退货明细";
+            this.TitleText = "退货明细";
+            this.Load += new System.EventHandler(this.ReturnPackageDetailForm_Load);
+            this.Controls.SetChildIndex(this.panel2, 0);
+            this.panel2.ResumeLayout(false);
+            this.splitContainer1.Panel1.ResumeLayout(false);
+            this.splitContainer1.Panel1.PerformLayout();
+            this.splitContainer1.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
+            this.splitContainer1.ResumeLayout(false);
+            this.splitContainer2.Panel1.ResumeLayout(false);
+            this.splitContainer2.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit();
+            this.splitContainer2.ResumeLayout(false);
+            this.tableLayoutPanel1.ResumeLayout(false);
+            this.tableLayoutPanel1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvSelectProduct)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Panel panel2;
+        private System.Windows.Forms.SplitContainer splitContainer1;
+        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
+        private System.Windows.Forms.Label label6;
+        private UserComponent.UcCheckBox chkShowDel;
+        private System.Windows.Forms.TextBox txtShopId;
+        private UserComponent.UcCheckBox chkNoSubSa;
+        private DevComponents.DotNetBar.PanelEx pnlEmpty;
+        private System.Windows.Forms.Label label7;
+        private System.Windows.Forms.Label label8;
+        private System.Windows.Forms.TextBox txtShopName;
+        private System.Windows.Forms.Label label5;
+        private UserControls.ButtonEx btnSearch;
+        private System.Windows.Forms.TextBox txtSKC;
+        private System.Windows.Forms.TextBox txtSPU;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.TextBox txtCat;
+        private System.Windows.Forms.TextBox txtExtCode;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.TextBox txtProdName;
+        private System.Windows.Forms.ComboBox cmbStatus;
+        private UserControls.ButtonEx btnAdd;
+        private System.Windows.Forms.SplitContainer splitContainer2;
+        private System.Windows.Forms.PictureBox pbLoading;
+        private UserComponent.DataGridViewEx dgvSelectProduct;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colSpu;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colSku;
+        private System.Windows.Forms.DataGridViewImageColumn colPic;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colSkc;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colSkuName;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colPurchaseSubOrderSn;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colReason;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colPackageSn;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colSkuNumber;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colOutboundTime;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colOpResult;
+        private UserControls.UcSplitPage ucSplitPage1;
+        private UserControls.StatusBarUserControl statusBar;
+        private System.Windows.Forms.DateTimePicker dtpEndDate;
+        private System.Windows.Forms.Label label10;
+        private System.Windows.Forms.Label label9;
+        private System.Windows.Forms.DateTimePicker dtpStartDate;
+    }
+}
@@ -0,0 +1,37 @@
+using AllBase.Model.Result;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using TemuKJD.KJDForms.BaseForms;
+
+namespace TemuKJD.KJDForms.ShopForms
+{
+    public partial class ReturnPackageDetailForm : LRBaseForm
+    {
+        ShopLoginInfo shop = null;
+        public ReturnPackageDetailForm(ShopLoginInfo _shop)
+        {
+            InitializeComponent();
+
+            if (_shop!= null)
+                this.shop = _shop;
+        }
+
+        private void ReturnPackageDetailForm_Load(object sender, EventArgs e)
+        {
+            this.dtpEndDate.Value = DateTime.Now.Date.AddDays(1).AddSeconds(-1);
+            this.dtpStartDate.Value = DateTime.Now.Date.AddYears(-1);
+        }
+
+        private void btnAdd_Click(object sender, EventArgs e)
+        {
+
+        }
+    }
+}
@@ -0,0 +1,331 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="colSelect.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colSpu.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colSku.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colPic.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colSkc.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colSkuName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colPurchaseSubOrderSn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colReason.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colPackageSn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colOutboundTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colOpResult.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAABAAEAgIAQAAAAAABoKAAAFgAAACgAAACAAAAAAAEAAAEABAAAAAAAACgAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAgICAAMDAwAAAAP8AAP8AAAD//wD/AAAA/wD/AP//
+        AAD///8AAAAAAAAAAAAAAAAzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMQ
+        AAAAAAAAAAAAAAAAAAAAAAAAABM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZkzEAAAAAAAAAAAAAAAAAAAAAADOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZMwAAAAAAAAAAAAAAAAAAABOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZkzAAAAAAAAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmTEAAAAAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAAAAAAAA5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAAAAAADmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAAAA5mZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAADmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAGZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAJmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZAAAAAA
+        OZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmT
+        AAAAAZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmRAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZkwAAAZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZkwAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZMAAJmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZEAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTADmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkwCZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkRmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZOZmZOZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmP+JmZmZmZmZj///////
+        ///4OZmZj/eZmZmZmZmZmPg5OZmZmZuI//iIuZmZmZmZmZmZmZM5mZmZmZmZmZmZmb//+JmZmZmZmP//
+        //////////OZmP//uZmZmZmZmY//+ZmZOZf///////h5k5mZmZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZ
+        mZ/////////////4mZ///4mZmZmZmZP///uZmZmP////////+JmZmZmZmZmZkzmZmZmZmZmZmZmZj//4
+        mZmZmZmf////////////+Jmf//+JmZmZmZmb///4mZmY//////////+JmZmZmZmZmZM5mZmZmZmZmZmZ
+        mY//+JmZmZmZn/////////////mZmP//iZmZmZmZk///+5mZj/////iP////+JmZmZmZmZmTOZmZmZmZ
+        mZmZmZmP//iZmZmZmZ////iIiIiIiIiZOZj//4mZmZmZmZP///uZmf////eZmT////+ZmZmZmZmZkzmZ
+        mZmZmZmZmZmZj//4mZmZmZmf//+JmZmZmZmZk5mY//+JmZmZmZmT///7mZj///+ZmZmZj///uZmZmZmZ
+        mZM5mZmZmZmZmZmZmY//+JmZmZmZn///iZmZmZmZmZmZmP//iZmZN5k5k///+5mY///zk5mZOT///4mZ
+        mZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZmZ///4mZmZmZmZmZmZj//4mZmP/5k5P///uZmP//+ZmZmZmY
+        //+JmZmZmZmZkzmZmZmZmZmZmZmZj//4mZmZmZmf///4iIiIiIg5mZmY//+JOb//+JmT///7mZj//4mZ
+        mZmZmP//+ZmZmZmZmZM5mZmZmZmZmZmZmY//+JmZmZmZn///////////85mZmP//iZn///+Jk///+5mf
+        //+JmZmZmZj///mZmZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZmZ////////////+ZmZj//4mY////85v/
+        //uZmP//iZmZmZmY///5mZmZmZmZkzmZmZmZmZmZmZmZj//4mZmZmZmf////////////mZmY//+Jv///
+        //+Z///7mZj//4mZmZmZmP//+ZmZmZmZmZM5mZmZmZmZmZmZmY//+JmZmZmZn///////////+JmZmP//
+        if//////if//+5mY//+JmZmZmZj///mZmZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZmZ///////////4mZ
+        mZj//4j///////j///uZmP//iZmZmZmY///5mZmZmZmZkzmZmZmZmZmZmZmZj//4mZmZmZmf//+JMzMz
+        MzOZOZmY//////+D///////7mZj//4mZmZmZmP//+ZmZmZmZmZM5mZmZmZmZmZmZmY//+JmZmZmZn///
+        iZmZmZmZmZmZmP//////mY//////+5mY//+JmZmZmZj///mZmZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZ
+        mZ///4mZmZmZmZmZmZj/////+5mf//////uZmP//iZmZmZmY///5mZmZmZmZkzmZmZmZmZmZMzM5j//4
+        kzMzmZmf//+JMzMzMzM5mZmY/////4mTk//////7mZj//4mZmZmZmP//+ZmZmZmZmZM5mZmZmZmZmP//
+        /////////4mZn////////////4mZmP////+ZmZmP////+5mY//+JmZmZmZj///mZmZmZmZmTOZmZmZmZ
+        mY/////////////4mZ/////////////7mZj////7mZmZn/////uZmP//iZmZmZmY///5mZmZmZmZkzmZ
+        mZmZmZn//////////////5mf////////////+Jmf////iZmZk5P////4mZ///4mZmZmZmP//+ZmZmZmZ
+        mZM5mZmZmZmZj/////////////iZn/////////////iZmP///5mZmZmZj///+5mY//+JmZmZmZj//4mZ
+        mZmZmZmTOZmZmZmZmZ/////////////zmZP///////////+JmZP///uTmZmZmZj//4mZm///mZmZmZmZ
+        //85mZmZmZmZkzmZmZmZmZOZiIiIiIiIiIiImTmZOIiIiIiIiIiImTmZOIi5mZmZmZOZiIuZmZk4iZOZ
+        mZmZOZiDmZmZmZmZmZM5mZmZmZmZOZmZmZmZmZmZmZOZmZmZmZmZmZmZmZOZmZmZmZmZmZmZOZmZmZmZ
+        mZk5mZmZmZOZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmTuIiIiIs5mZmZmZmZ
+        mTu4i7mZmZmZmZmZmTMzmZOZmZkzOZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmTmbj///////+HmT
+        mZmZk4j/////iJmZmZk4iP////iZOZmZj/mZOZOIiIiIiIiIiDmZmZmZmZmZkzmZmZmZmZmZj///////
+        ///4mZk5k4///4iI///4OZOY////////iZOZmb/5mZmP///////////4mZmZmZmZmZM5mZmZmZmZn///
+        //////////mZmY///5mZmZP///iZmP////////+ZOZk/iZmY/////////////4mZmZmZmZmTOZmZmZmZ
+        mZ/////////////5mZ////+JmZmY////iZl/////////+ZmZP4mZP//////////////7mZmZmZmZkzmZ
+        mZmZmZmb////////////uZP/j///+HM3j/////+ZmYj///////iZmT+JmY//////////////+JmZmZmZ
+        mZM5mZmZmZmZmY//////////+JmT+Jv///////////iPmTmZOI/4mP//uTk/iZmP//////////////iZ
+        mZmZmZmTOZmZmZmZmZmf//////////mZmZmZ///////////5mZmZmZmTOZk///mZP4mZj///////////
+        ///4mZmZmZmZkzmZmZmZmZmTmP////////+JOZmZOY//////////iZmZmZmZmZk5mf/4mT+JmY//////
+        ////////+JmZmZmZmZM5mZmZmZmZmZn/////////mZmZmZk//////////zmZmZmZmZmZmTmP/zm/iZmP
+        //////////////iZmZmZmZmTOZmZmZmZmZk5v///////85OZmZkzmP////////iZmZmZmZmZmZmZn//4
+        /4mZj/////hzN4/////4mZmZmZmZkzmZmZmZmZmZmZj//////4mZmTmY/4j////////4mZmZmZmZmZmZ
+        mZj///+JmY////+JmZmY////+JmZmZmZmZM5mZmZmZmZmZmZ//////+ZmZmZj////////////4mZmZmZ
+        mZmZmZmb////+ZmP///4mZu5mY////iZmZmZmZmTOZmZmZmZmZmZOb/////4k5mZmP/////////////7
+        mZmZmZmZmZmZk/////OZv///+ZmP+Jmf///4mZmZmZmZkzmZmZmZmZmZmZmf////+ZmZmZj////////4
+        eI//+JmZmZmZmZmZmZP////4mb///4mY//+JmP//+5mZmZmZmZM5mZmZmZmZmZk5v/////uTmZmb////
+        ///4mZmX//iZmZmZmZmZmZmZ////+Jmf//95n///+Zj///OZmZmZmZmTOZmZmZmZmZmZmf//////mZmZ
+        mY//////+ZOZmZiJmZmZmZmZmZmZmY////+ZmP//+I////iP//+JmZmZmZmZkzmZmZmZmZmZmZj/////
+        /4mZmZmf/////5k5mZOZmTmZmZmZmZmZmZmP///4mZP/////////////OZmZmZmZmZM5mZmZmZmZmZk/
+        ///////zmZmZm/////iZmZmZmZmZmZmZmZmZmZmZj///85mZj///////////+JmZmZmZmZmTOZmZmZmZ
+        mZmZv///////+5mZmZmP///5mZmZmZmZmZmZmZmZmZmZmZ///3mZmZj//////////4mZmZmZmZmZkzmZ
+        mZmZmZmZmb///4j///uZmZmZmP//mTmZmZmZmZmZmZmZmZmZmZmY/4OZmZmZeP///////4eZmZmZmZmZ
+        mZM5mZmZmZmZmZmY/4OZOP+JmZmZmZmIiZOZmZmZmZmZmZmZmZmZmZmZmYiZmZmZmZk4iIiIiIOZmZmZ
+        mZmZmZmTOZmZmZmZmZmZmTOZmZkzmZmZmZmZmZk5mZmZmZmZmZmZmZmZmZmZmZmZk5mZmZmZmZmZmZmZ
+        mZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmTGZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZkwmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZADmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZkwA5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZMACZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmQAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAABmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTAAADmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAJmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmRAAAAA5mZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAACZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmQAAAAAAGZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAOZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkwAAAAAA
+        AAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTAA
+        AAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZMAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZkwAAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmTAAAAAAAAAAAAAAGZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZEAAAAAAAAAAAAAAAA5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZMAAAAAAAAAAAAAAAAAATmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZMQAAAAAAAAAAAAAAAAAAABOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZMQAAAAAAAAAAAAAAAAAAAAAAAzmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTMAAAAAAAAAAAAAAAAAAAAAAAAAAAEzMzMzMzMzMzMzMzMzMz
+        MzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMxAAAAAAAAAAAAAAD////////////////////////4AAAA
+        AAAAAAAAAB//////wAAAAAAAAAAAAAAD/////wAAAAAAAAAAAAAAAP////wAAAAAAAAAAAAAAAA////w
+        AAAAAAAAAAAAAAAAD///4AAAAAAAAAAAAAAAAAf//8AAAAAAAAAAAAAAAAAD//+AAAAAAAAAAAAAAAAA
+        Af//AAAAAAAAAAAAAAAAAAD//gAAAAAAAAAAAAAAAAAAf/wAAAAAAAAAAAAAAAAAAD/4AAAAAAAAAAAA
+        AAAAAAAf+AAAAAAAAAAAAAAAAAAAH/AAAAAAAAAAAAAAAAAAAA/wAAAAAAAAAAAAAAAAAAAP4AAAAAAA
+        AAAAAAAAAAAAB+AAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAADwAAAAAAAAAAAAAAAAAAAA8AA
+        AAAAAAAAAAAAAAAAAAOAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA
+        AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA
+        AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA
+        AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA
+        AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA
+        AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA
+        AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA
+        AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA
+        AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA
+        AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA
+        AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA
+        AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA
+        AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA
+        AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA
+        AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA
+        AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA
+        AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA
+        AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA
+        AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA
+        AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA
+        AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA
+        AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA
+        AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA
+        AAAAAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAPAAAAAAAAAAAAAAAAAAAAD4AAAAAAAAAAAAAAAAAAAA+AA
+        AAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAH8AAAAAAAAAAAAAAAAAAAD/AAAAAAAAAAAAAAAAAA
+        AA/4AAAAAAAAAAAAAAAAAAAf/AAAAAAAAAAAAAAAAAAAH/wAAAAAAAAAAAAAAAAAAD/+AAAAAAAAAAAA
+        AAAAAAB//wAAAAAAAAAAAAAAAAAA//+AAAAAAAAAAAAAAAAAAf//wAAAAAAAAAAAAAAAAAP//+AAAAAA
+        AAAAAAAAAAAH///4AAAAAAAAAAAAAAAAD////AAAAAAAAAAAAAAAAD////8AAAAAAAAAAAAAAAD/////
+        wAAAAAAAAAAAAAAD//////wAAAAAAAAAAAAAH////////////////////////w==
+</value>
+  </data>
+</root>
@@ -247,6 +247,7 @@ namespace TemuKJD
            this.pnlMarket.StyleMouseOver.MarginTop = 63;
            this.pnlMarket.TabIndex = 3;
            this.pnlMarket.Text = "营销中心";
+            this.pnlMarket.Visible = false;
            this.pnlMarket.Click += new System.EventHandler(this.pnlMarket_Click);
            // 
            // pnlCollect