Merge branch 'master' of ssh://pscg.dongkesoft.com:9003/mes/hg5020

DK.Client/Client.Controls/Layout/F_MST_012001.resx

@@ -123,6 +123,9 @@
   <metadata name="logonamecode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="PrintTypeName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="goodstypecode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

DK.Client/Client.Controls/Layout/F_MST_012002.cs

@@ -155,7 +155,7 @@ namespace Dongke.IBOSS.PRD.Client.Controls
 			if (this._canChangedText)
 			{
 				this.txtInvoiceName.Text = this.scbGoodsType.Text
-					+ "【" + this.ftcLogo.Text + "】";
+					+ "【" + this.ftcLogo.Text + "】" + ddlPrintType.Text;
 				this._canChangedText = true;
 			}
 		}
@@ -165,17 +165,28 @@ namespace Dongke.IBOSS.PRD.Client.Controls
 			if (this._canChangedText)
 			{
 				this.txtInvoiceName.Text = this.scbGoodsType.Text
-					+ "【" + this.ftcLogo.Text + "】";
+					+ "【" + this.ftcLogo.Text + "】" + ddlPrintType.Text;
 				this._canChangedText = true;
 			}
 		}
 
-		/// <summary>
-		/// 列表的选择项发生改变事件
-		/// </summary>
-		/// <param name="sender"></param>
-		/// <param name="e"></param>
-		private void dgrdPaperSize_SelectionChanged(object sender, System.EventArgs e)
+        //xuwei add 2019-11-20 增加 打印类型 并拼合名称
+        private void ddlPrintType_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (this._canChangedText)
+            {
+                this.txtInvoiceName.Text = this.scbGoodsType.Text
+                    + "【" + this.ftcLogo.Text + "】" + ddlPrintType.Text;
+                this._canChangedText = true;
+            }
+        }
+
+        /// <summary>
+        /// 列表的选择项发生改变事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void dgrdPaperSize_SelectionChanged(object sender, System.EventArgs e)
 		{
 			if (dgrdPaperSize.CurrentRow != null && _allowChangeSize
 			  && 0 < dgrdPaperSize.SelectedRows.Count)
@@ -253,7 +264,7 @@ namespace Dongke.IBOSS.PRD.Client.Controls
 				}
 
 				// 给票据编辑画面赋值，并打开
-
+                //xuwei modify 2019-11-20
 				F_MST_012003 frmINV0301 = new F_MST_012003(scbGoodsType.SearchedPKMember,
 														scbGoodsType.SearchedValue + "",
 														scbGoodsType.SearchedText,
@@ -262,6 +273,7 @@ namespace Dongke.IBOSS.PRD.Client.Controls
 														this.PaperWidth,
 														this.PaperHeight,
 														this.txtInvoiceName.Text.Trim(),
+                                                        Convert.ToInt32(this.ddlPrintType.SelectedValue),
 														this.txtRemark.Text.Trim());
 				this.Hide();
 				DialogResult dialogresult = frmINV0301.ShowDialog();
@@ -303,7 +315,17 @@ namespace Dongke.IBOSS.PRD.Client.Controls
 		{
 			try
 			{
-				DataSet logoInfo = SystemModuleProxy.Service.GetLogoInfo();
+                //加载 打印类型 xuwei begin 2019-11-20
+                this.ddlPrintType.DisplayMember = "PRINTTYPENAME";
+                this.ddlPrintType.ValueMember = "PRINTTYPEID";
+                ClientRequestEntity ptCre = new ClientRequestEntity();
+                ptCre.NameSpace = "PrintInfo";
+                ptCre.Name = "GetPrintType";
+                DataTable dtPrintType = SystemModuleProxy.Service.DoBarCodePrint(ptCre).Data.Tables[0];
+                this.ddlPrintType.DataSource = dtPrintType;
+                //加载 打印类型 xuwei end
+
+                DataSet logoInfo = SystemModuleProxy.Service.GetLogoInfo();
 				if (logoInfo != null && logoInfo.Tables.Count > 0)
 				{
 					this.ftcLogo.DataSource = logoInfo.Tables[0];
@@ -390,6 +412,9 @@ namespace Dongke.IBOSS.PRD.Client.Controls
 				this._clientRequestEntity.Name = "IsExistBarCodePrintLayout";
 				this._clientRequestEntity.Properties["GoodsTypeID"] = goodsTypeID.Value;
 				this._clientRequestEntity.Properties["LogoID"] = this.ftcLogo.SelectedValue;
+                //xuwei add 2019-11-20
+				this._clientRequestEntity.Properties["PrintType"] = this.ddlPrintType.SelectedValue;
+
 				ServiceResultEntity sre = DoAsync<ServiceResultEntity>(() =>
 				{
 					return SystemModuleProxy.Service.DoBarCodePrint(this._clientRequestEntity);
@@ -403,6 +428,8 @@ namespace Dongke.IBOSS.PRD.Client.Controls
 			}
 		}
 
-		#endregion
-	}
+        #endregion
+
+
+    }
 }

DK.Client/Client.Controls/Layout/F_MST_012002.designer.cs

@@ -28,386 +28,440 @@
         /// </summary>
         private void InitializeComponent()
         {
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
-			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(F_MST_012002));
-			this.txtInvoiceName = new Dongke.WinForm.Controls.TxtTextBox();
-			this.lblInvoiceName = new Dongke.WinForm.Controls.LblLabel();
-			this.gbxPaperSize = new System.Windows.Forms.GroupBox();
-			this.dgrdPaperSize = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
-			this.colSize = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.colHeight = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.colWidth = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.numerWidth = new System.Windows.Forms.NumericUpDown();
-			this.numerHeight = new System.Windows.Forms.NumericUpDown();
-			this.lblHeightUnit = new System.Windows.Forms.Label();
-			this.lblWidthUnit = new System.Windows.Forms.Label();
-			this.lblHeight = new Dongke.WinForm.Controls.LblLabel();
-			this.lblWidth = new Dongke.WinForm.Controls.LblLabel();
-			this.btnCancel = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
-			this.btnSave = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
-			this.lblRemark = new Dongke.WinForm.Controls.LblLabel();
-			this.txtRemark = new Dongke.WinForm.Controls.TxtTextBox();
-			this.lblLabel1 = new Dongke.WinForm.Controls.LblLabel();
-			this.ftcLogo = new Dongke.WinForm.Controls.FtcFilterComboBox();
-			this.lblGoodsType = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
-			this.scbGoodsType = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbGoodsType();
-			this.gbxPaperSize.SuspendLayout();
-			((System.ComponentModel.ISupportInitialize)(this.dgrdPaperSize)).BeginInit();
-			((System.ComponentModel.ISupportInitialize)(this.numerWidth)).BeginInit();
-			((System.ComponentModel.ISupportInitialize)(this.numerHeight)).BeginInit();
-			this.SuspendLayout();
-			// 
-			// txtInvoiceName
-			// 
-			this.txtInvoiceName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-			this.txtInvoiceName.Location = new System.Drawing.Point(69, 66);
-			this.txtInvoiceName.MaxLength = 50;
-			this.txtInvoiceName.Name = "txtInvoiceName";
-			this.txtInvoiceName.Size = new System.Drawing.Size(310, 21);
-			this.txtInvoiceName.TabIndex = 5;
-			this.txtInvoiceName.TextChanged += new System.EventHandler(this.txtInvoiceName_TextChanged);
-			// 
-			// lblInvoiceName
-			// 
-			this.lblInvoiceName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.lblInvoiceName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
-			this.lblInvoiceName.Location = new System.Drawing.Point(11, 70);
-			this.lblInvoiceName.Name = "lblInvoiceName";
-			this.lblInvoiceName.Size = new System.Drawing.Size(53, 12);
-			this.lblInvoiceName.TabIndex = 4;
-			this.lblInvoiceName.Text = "标签名称";
-			// 
-			// gbxPaperSize
-			// 
-			this.gbxPaperSize.BackColor = System.Drawing.Color.Transparent;
-			this.gbxPaperSize.Controls.Add(this.dgrdPaperSize);
-			this.gbxPaperSize.Controls.Add(this.numerWidth);
-			this.gbxPaperSize.Controls.Add(this.numerHeight);
-			this.gbxPaperSize.Controls.Add(this.lblHeightUnit);
-			this.gbxPaperSize.Controls.Add(this.lblWidthUnit);
-			this.gbxPaperSize.Controls.Add(this.lblHeight);
-			this.gbxPaperSize.Controls.Add(this.lblWidth);
-			this.gbxPaperSize.Location = new System.Drawing.Point(11, 141);
-			this.gbxPaperSize.Name = "gbxPaperSize";
-			this.gbxPaperSize.Size = new System.Drawing.Size(370, 267);
-			this.gbxPaperSize.TabIndex = 8;
-			this.gbxPaperSize.TabStop = false;
-			this.gbxPaperSize.Text = "纸张设定";
-			// 
-			// dgrdPaperSize
-			// 
-			this.dgrdPaperSize.AllowUserToAddRows = false;
-			this.dgrdPaperSize.AllowUserToDeleteRows = false;
-			this.dgrdPaperSize.AllowUserToModifyRows = true;
-			this.dgrdPaperSize.AllowUserToResizeRows = false;
-			this.dgrdPaperSize.AllowUserToSortRows = false;
-			dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
-			this.dgrdPaperSize.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4;
-			this.dgrdPaperSize.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            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(F_MST_012002));
+            this.txtInvoiceName = new Dongke.WinForm.Controls.TxtTextBox();
+            this.lblInvoiceName = new Dongke.WinForm.Controls.LblLabel();
+            this.gbxPaperSize = new System.Windows.Forms.GroupBox();
+            this.dgrdPaperSize = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
+            this.colSize = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colHeight = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colWidth = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.numerWidth = new System.Windows.Forms.NumericUpDown();
+            this.numerHeight = new System.Windows.Forms.NumericUpDown();
+            this.lblHeightUnit = new System.Windows.Forms.Label();
+            this.lblWidthUnit = new System.Windows.Forms.Label();
+            this.lblHeight = new Dongke.WinForm.Controls.LblLabel();
+            this.lblWidth = new Dongke.WinForm.Controls.LblLabel();
+            this.btnCancel = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
+            this.btnSave = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
+            this.lblRemark = new Dongke.WinForm.Controls.LblLabel();
+            this.txtRemark = new Dongke.WinForm.Controls.TxtTextBox();
+            this.lblLabel1 = new Dongke.WinForm.Controls.LblLabel();
+            this.ftcLogo = new Dongke.WinForm.Controls.FtcFilterComboBox();
+            this.lblGoodsType = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.scbGoodsType = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbGoodsType();
+            this.ddlPrintType = new Dongke.WinForm.Controls.FtcFilterComboBox();
+            this.lblLabel2 = new Dongke.WinForm.Controls.LblLabel();
+            this.gbxPaperSize.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dgrdPaperSize)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numerWidth)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numerHeight)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // txtInvoiceName
+            // 
+            this.txtInvoiceName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.txtInvoiceName.Location = new System.Drawing.Point(92, 108);
+            this.txtInvoiceName.Margin = new System.Windows.Forms.Padding(4);
+            this.txtInvoiceName.MaxLength = 50;
+            this.txtInvoiceName.Name = "txtInvoiceName";
+            this.txtInvoiceName.Size = new System.Drawing.Size(412, 25);
+            this.txtInvoiceName.TabIndex = 5;
+            this.txtInvoiceName.TextChanged += new System.EventHandler(this.txtInvoiceName_TextChanged);
+            // 
+            // lblInvoiceName
+            // 
+            this.lblInvoiceName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblInvoiceName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+            this.lblInvoiceName.Location = new System.Drawing.Point(15, 114);
+            this.lblInvoiceName.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblInvoiceName.Name = "lblInvoiceName";
+            this.lblInvoiceName.Size = new System.Drawing.Size(67, 15);
+            this.lblInvoiceName.TabIndex = 4;
+            this.lblInvoiceName.Text = "标签名称";
+            // 
+            // gbxPaperSize
+            // 
+            this.gbxPaperSize.BackColor = System.Drawing.Color.Transparent;
+            this.gbxPaperSize.Controls.Add(this.dgrdPaperSize);
+            this.gbxPaperSize.Controls.Add(this.numerWidth);
+            this.gbxPaperSize.Controls.Add(this.numerHeight);
+            this.gbxPaperSize.Controls.Add(this.lblHeightUnit);
+            this.gbxPaperSize.Controls.Add(this.lblWidthUnit);
+            this.gbxPaperSize.Controls.Add(this.lblHeight);
+            this.gbxPaperSize.Controls.Add(this.lblWidth);
+            this.gbxPaperSize.Location = new System.Drawing.Point(15, 201);
+            this.gbxPaperSize.Margin = new System.Windows.Forms.Padding(4);
+            this.gbxPaperSize.Name = "gbxPaperSize";
+            this.gbxPaperSize.Padding = new System.Windows.Forms.Padding(4);
+            this.gbxPaperSize.Size = new System.Drawing.Size(493, 309);
+            this.gbxPaperSize.TabIndex = 8;
+            this.gbxPaperSize.TabStop = false;
+            this.gbxPaperSize.Text = "纸张设定";
+            // 
+            // dgrdPaperSize
+            // 
+            this.dgrdPaperSize.AllowUserToAddRows = false;
+            this.dgrdPaperSize.AllowUserToDeleteRows = false;
+            this.dgrdPaperSize.AllowUserToModifyRows = true;
+            this.dgrdPaperSize.AllowUserToResizeRows = false;
+            this.dgrdPaperSize.AllowUserToSortRows = false;
+            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+            this.dgrdPaperSize.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+            this.dgrdPaperSize.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-			this.dgrdPaperSize.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
-			this.dgrdPaperSize.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
-			this.dgrdPaperSize.CellHeight = 23;
-			this.dgrdPaperSize.ChildNodeColumnName = null;
-			this.dgrdPaperSize.ChildNodeColumnText = null;
-			this.dgrdPaperSize.ColumnDeep = 1;
-			this.dgrdPaperSize.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-			dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-			dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
-			dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			dataGridViewCellStyle5.ForeColor = System.Drawing.Color.White;
-			dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-			dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-			dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-			this.dgrdPaperSize.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5;
-			this.dgrdPaperSize.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
-			this.dgrdPaperSize.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.dgrdPaperSize.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+            this.dgrdPaperSize.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
+            this.dgrdPaperSize.CellHeight = 23;
+            this.dgrdPaperSize.ChildNodeColumnName = null;
+            this.dgrdPaperSize.ChildNodeColumnText = null;
+            this.dgrdPaperSize.ColumnDeep = 1;
+            this.dgrdPaperSize.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgrdPaperSize.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+            this.dgrdPaperSize.ColumnHeadersHeight = 29;
+            this.dgrdPaperSize.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+            this.dgrdPaperSize.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.colSize,
             this.colHeight,
             this.colWidth});
-			this.dgrdPaperSize.ColumnTreeView = null;
-			this.dgrdPaperSize.ContextMenuVisible = Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.None;
-			this.dgrdPaperSize.DynamicColumnName = "";
-			this.dgrdPaperSize.EnableHeadersVisualStyles = false;
-			this.dgrdPaperSize.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.dgrdPaperSize.FormatQuantityColumns = null;
-			this.dgrdPaperSize.HorizontalMergeColumn = null;
-			this.dgrdPaperSize.IsAutoCountSum = true;
-			this.dgrdPaperSize.IsAutoResizeColumns = false;
-			this.dgrdPaperSize.IsClickF12 = false;
-			this.dgrdPaperSize.IsOpenMergeCellFlag = false;
-			this.dgrdPaperSize.IsSubTotalFlag = false;
-			this.dgrdPaperSize.IsTopDeep = false;
-			this.dgrdPaperSize.Location = new System.Drawing.Point(2, 47);
-			this.dgrdPaperSize.MergeColumnNames = null;
-			this.dgrdPaperSize.MergeDetailColumnNames = null;
-			this.dgrdPaperSize.MergeDetailOnlyColumn = null;
-			this.dgrdPaperSize.MergeOnlyColumn = null;
-			this.dgrdPaperSize.MultiSelect = false;
-			this.dgrdPaperSize.Name = "dgrdPaperSize";
-			this.dgrdPaperSize.ReadOnly = true;
-			this.dgrdPaperSize.RefreshAtHscroll = false;
-			this.dgrdPaperSize.RowHeadersWidth = 40;
-			this.dgrdPaperSize.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-			dataGridViewCellStyle6.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
-			this.dgrdPaperSize.RowsDefaultCellStyle = dataGridViewCellStyle6;
-			this.dgrdPaperSize.RowTemplate.Height = 21;
-			this.dgrdPaperSize.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-			this.dgrdPaperSize.Size = new System.Drawing.Size(366, 214);
-			this.dgrdPaperSize.SortOrderColumnName = null;
-			this.dgrdPaperSize.TabIndex = 6;
-			this.dgrdPaperSize.Tag = true;
-			this.dgrdPaperSize.TotalSumColumns = null;
-			this.dgrdPaperSize.ViewRowFilter = "";
-			this.dgrdPaperSize.SelectionChanged += new System.EventHandler(this.dgrdPaperSize_SelectionChanged);
-			this.dgrdPaperSize.Leave += new System.EventHandler(this.dgrdPaperSize_Leave);
-			// 
-			// colSize
-			// 
-			this.colSize.DataPropertyName = "SizeName";
-			this.colSize.HeaderText = "纸张尺寸";
-			this.colSize.Name = "colSize";
-			this.colSize.ReadOnly = true;
-			this.colSize.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-			this.colSize.Width = 290;
-			// 
-			// colHeight
-			// 
-			this.colHeight.DataPropertyName = "Height";
-			this.colHeight.HeaderText = "Height";
-			this.colHeight.Name = "colHeight";
-			this.colHeight.ReadOnly = true;
-			this.colHeight.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-			this.colHeight.Visible = false;
-			// 
-			// colWidth
-			// 
-			this.colWidth.DataPropertyName = "Width";
-			this.colWidth.HeaderText = "Width";
-			this.colWidth.Name = "colWidth";
-			this.colWidth.ReadOnly = true;
-			this.colWidth.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-			this.colWidth.Visible = false;
-			// 
-			// numerWidth
-			// 
-			this.numerWidth.Location = new System.Drawing.Point(65, 20);
-			this.numerWidth.Maximum = new decimal(new int[] {
+            this.dgrdPaperSize.ColumnTreeView = null;
+            this.dgrdPaperSize.ContextMenuVisible = Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.None;
+            this.dgrdPaperSize.DynamicColumnName = "";
+            this.dgrdPaperSize.EnableHeadersVisualStyles = false;
+            this.dgrdPaperSize.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dgrdPaperSize.FormatQuantityColumns = null;
+            this.dgrdPaperSize.HorizontalMergeColumn = null;
+            this.dgrdPaperSize.IsAutoCountSum = true;
+            this.dgrdPaperSize.IsAutoResizeColumns = false;
+            this.dgrdPaperSize.IsClickF12 = false;
+            this.dgrdPaperSize.IsOpenMergeCellFlag = false;
+            this.dgrdPaperSize.IsSubTotalFlag = false;
+            this.dgrdPaperSize.IsTopDeep = false;
+            this.dgrdPaperSize.Location = new System.Drawing.Point(3, 59);
+            this.dgrdPaperSize.Margin = new System.Windows.Forms.Padding(4);
+            this.dgrdPaperSize.MergeColumnNames = null;
+            this.dgrdPaperSize.MergeDetailColumnNames = null;
+            this.dgrdPaperSize.MergeDetailOnlyColumn = null;
+            this.dgrdPaperSize.MergeOnlyColumn = null;
+            this.dgrdPaperSize.MultiSelect = false;
+            this.dgrdPaperSize.Name = "dgrdPaperSize";
+            this.dgrdPaperSize.ReadOnly = true;
+            this.dgrdPaperSize.RefreshAtHscroll = false;
+            this.dgrdPaperSize.RowHeadersWidth = 40;
+            this.dgrdPaperSize.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
+            dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+            this.dgrdPaperSize.RowsDefaultCellStyle = dataGridViewCellStyle3;
+            this.dgrdPaperSize.RowTemplate.Height = 21;
+            this.dgrdPaperSize.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+            this.dgrdPaperSize.Size = new System.Drawing.Size(488, 243);
+            this.dgrdPaperSize.SortOrderColumnName = null;
+            this.dgrdPaperSize.TabIndex = 6;
+            this.dgrdPaperSize.Tag = true;
+            this.dgrdPaperSize.TotalSumColumns = null;
+            this.dgrdPaperSize.ViewRowFilter = "";
+            this.dgrdPaperSize.SelectionChanged += new System.EventHandler(this.dgrdPaperSize_SelectionChanged);
+            this.dgrdPaperSize.Leave += new System.EventHandler(this.dgrdPaperSize_Leave);
+            // 
+            // colSize
+            // 
+            this.colSize.DataPropertyName = "SizeName";
+            this.colSize.HeaderText = "纸张尺寸";
+            this.colSize.MinimumWidth = 6;
+            this.colSize.Name = "colSize";
+            this.colSize.ReadOnly = true;
+            this.colSize.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.colSize.Width = 290;
+            // 
+            // colHeight
+            // 
+            this.colHeight.DataPropertyName = "Height";
+            this.colHeight.HeaderText = "Height";
+            this.colHeight.MinimumWidth = 6;
+            this.colHeight.Name = "colHeight";
+            this.colHeight.ReadOnly = true;
+            this.colHeight.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.colHeight.Visible = false;
+            this.colHeight.Width = 125;
+            // 
+            // colWidth
+            // 
+            this.colWidth.DataPropertyName = "Width";
+            this.colWidth.HeaderText = "Width";
+            this.colWidth.MinimumWidth = 6;
+            this.colWidth.Name = "colWidth";
+            this.colWidth.ReadOnly = true;
+            this.colWidth.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.colWidth.Visible = false;
+            this.colWidth.Width = 125;
+            // 
+            // numerWidth
+            // 
+            this.numerWidth.Location = new System.Drawing.Point(87, 25);
+            this.numerWidth.Margin = new System.Windows.Forms.Padding(4);
+            this.numerWidth.Maximum = new decimal(new int[] {
             4200,
             0,
             0,
             65536});
-			this.numerWidth.Minimum = new decimal(new int[] {
+            this.numerWidth.Minimum = new decimal(new int[] {
             10,
             0,
             0,
             0});
-			this.numerWidth.Name = "numerWidth";
-			this.numerWidth.Size = new System.Drawing.Size(65, 21);
-			this.numerWidth.TabIndex = 1;
-			this.numerWidth.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
-			this.numerWidth.Value = new decimal(new int[] {
+            this.numerWidth.Name = "numerWidth";
+            this.numerWidth.Size = new System.Drawing.Size(87, 25);
+            this.numerWidth.TabIndex = 1;
+            this.numerWidth.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
+            this.numerWidth.Value = new decimal(new int[] {
             210,
             0,
             0,
             0});
-			// 
-			// numerHeight
-			// 
-			this.numerHeight.Location = new System.Drawing.Point(276, 20);
-			this.numerHeight.Maximum = new decimal(new int[] {
+            // 
+            // numerHeight
+            // 
+            this.numerHeight.Location = new System.Drawing.Point(368, 25);
+            this.numerHeight.Margin = new System.Windows.Forms.Padding(4);
+            this.numerHeight.Maximum = new decimal(new int[] {
             4200,
             0,
             0,
             65536});
-			this.numerHeight.Minimum = new decimal(new int[] {
+            this.numerHeight.Minimum = new decimal(new int[] {
             10,
             0,
             0,
             0});
-			this.numerHeight.Name = "numerHeight";
-			this.numerHeight.Size = new System.Drawing.Size(65, 21);
-			this.numerHeight.TabIndex = 4;
-			this.numerHeight.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
-			this.numerHeight.Value = new decimal(new int[] {
+            this.numerHeight.Name = "numerHeight";
+            this.numerHeight.Size = new System.Drawing.Size(87, 25);
+            this.numerHeight.TabIndex = 4;
+            this.numerHeight.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
+            this.numerHeight.Value = new decimal(new int[] {
             297,
             0,
             0,
             0});
-			// 
-			// lblHeightUnit
-			// 
-			this.lblHeightUnit.AutoSize = true;
-			this.lblHeightUnit.BackColor = System.Drawing.Color.Transparent;
-			this.lblHeightUnit.Location = new System.Drawing.Point(347, 24);
-			this.lblHeightUnit.Name = "lblHeightUnit";
-			this.lblHeightUnit.Size = new System.Drawing.Size(17, 12);
-			this.lblHeightUnit.TabIndex = 5;
-			this.lblHeightUnit.Text = "mm";
-			// 
-			// lblWidthUnit
-			// 
-			this.lblWidthUnit.AutoSize = true;
-			this.lblWidthUnit.BackColor = System.Drawing.Color.Transparent;
-			this.lblWidthUnit.Location = new System.Drawing.Point(136, 22);
-			this.lblWidthUnit.Name = "lblWidthUnit";
-			this.lblWidthUnit.Size = new System.Drawing.Size(17, 12);
-			this.lblWidthUnit.TabIndex = 2;
-			this.lblWidthUnit.Text = "mm";
-			// 
-			// lblHeight
-			// 
-			this.lblHeight.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.lblHeight.Location = new System.Drawing.Point(217, 24);
-			this.lblHeight.Name = "lblHeight";
-			this.lblHeight.Size = new System.Drawing.Size(53, 12);
-			this.lblHeight.TabIndex = 3;
-			this.lblHeight.Text = "纸张高度";
-			// 
-			// lblWidth
-			// 
-			this.lblWidth.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.lblWidth.Location = new System.Drawing.Point(6, 24);
-			this.lblWidth.Name = "lblWidth";
-			this.lblWidth.Size = new System.Drawing.Size(53, 12);
-			this.lblWidth.TabIndex = 0;
-			this.lblWidth.Text = "纸张宽度";
-			// 
-			// btnCancel
-			// 
-			this.btnCancel.BackColor = System.Drawing.Color.Transparent;
-			this.btnCancel.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnCancel.BackgroundImage")));
-			this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.btnCancel.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.btnCancel.ForeColor = System.Drawing.Color.White;
-			this.btnCancel.Location = new System.Drawing.Point(297, 414);
-			this.btnCancel.Name = "btnCancel";
-			this.btnCancel.Size = new System.Drawing.Size(85, 33);
-			this.btnCancel.TabIndex = 10;
-			this.btnCancel.Text = "取消";
-			this.btnCancel.UseVisualStyleBackColor = false;
-			this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
-			// 
-			// btnSave
-			// 
-			this.btnSave.BackColor = System.Drawing.Color.Transparent;
-			this.btnSave.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnSave.BackgroundImage")));
-			this.btnSave.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.btnSave.ForeColor = System.Drawing.Color.White;
-			this.btnSave.Location = new System.Drawing.Point(205, 413);
-			this.btnSave.Name = "btnSave";
-			this.btnSave.Size = new System.Drawing.Size(85, 33);
-			this.btnSave.TabIndex = 9;
-			this.btnSave.Text = "确定";
-			this.btnSave.UseVisualStyleBackColor = false;
-			this.btnSave.Click += new System.EventHandler(this.btnOK_Click);
-			// 
-			// lblRemark
-			// 
-			this.lblRemark.Location = new System.Drawing.Point(34, 93);
-			this.lblRemark.Name = "lblRemark";
-			this.lblRemark.Size = new System.Drawing.Size(29, 12);
-			this.lblRemark.TabIndex = 6;
-			this.lblRemark.Text = "备注";
-			// 
-			// txtRemark
-			// 
-			this.txtRemark.Location = new System.Drawing.Point(69, 93);
-			this.txtRemark.MaxLength = 500;
-			this.txtRemark.Multiline = true;
-			this.txtRemark.Name = "txtRemark";
-			this.txtRemark.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-			this.txtRemark.Size = new System.Drawing.Size(310, 42);
-			this.txtRemark.TabIndex = 7;
-			// 
-			// lblLabel1
-			// 
-			this.lblLabel1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.lblLabel1.Location = new System.Drawing.Point(11, 43);
-			this.lblLabel1.Name = "lblLabel1";
-			this.lblLabel1.Size = new System.Drawing.Size(53, 12);
-			this.lblLabel1.TabIndex = 1;
-			this.lblLabel1.Text = "产品商标";
-			// 
-			// ftcLogo
-			// 
-			this.ftcLogo.FormattingEnabled = true;
-			this.ftcLogo.HasNullData = true;
-			this.ftcLogo.Location = new System.Drawing.Point(69, 39);
-			this.ftcLogo.Name = "ftcLogo";
-			this.ftcLogo.Size = new System.Drawing.Size(310, 20);
-			this.ftcLogo.TabIndex = 2;
-			this.ftcLogo.SelectedValueChanged += new System.EventHandler(this.ftcLogo_SelectedValueChanged);
-			// 
-			// lblGoodsType
-			// 
-			this.lblGoodsType.AutoSize = true;
-			this.lblGoodsType.BackColor = System.Drawing.SystemColors.Control;
-			this.lblGoodsType.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.lblGoodsType.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
-			this.lblGoodsType.IsMustInput = true;
-			this.lblGoodsType.Location = new System.Drawing.Point(12, 18);
-			this.lblGoodsType.Name = "lblGoodsType";
-			this.lblGoodsType.Size = new System.Drawing.Size(53, 12);
-			this.lblGoodsType.TabIndex = 23;
-			this.lblGoodsType.Text = "产品类别";
-			// 
-			// scbGoodsType
-			// 
-			this.scbGoodsType.Location = new System.Drawing.Point(69, 14);
-			this.scbGoodsType.MultiSelect = false;
-			this.scbGoodsType.Name = "scbGoodsType";
-			this.scbGoodsType.Size = new System.Drawing.Size(310, 21);
-			this.scbGoodsType.TabIndex = 22;
-			this.scbGoodsType.SearchedItemChanged += new System.EventHandler(this.scbGoodsType_SearchedItemChanged);
-			// 
-			// F_MST_012002
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.CancelButton = this.btnCancel;
-			this.ClientSize = new System.Drawing.Size(394, 472);
-			this.Controls.Add(this.lblGoodsType);
-			this.Controls.Add(this.scbGoodsType);
-			this.Controls.Add(this.ftcLogo);
-			this.Controls.Add(this.lblLabel1);
-			this.Controls.Add(this.btnSave);
-			this.Controls.Add(this.lblRemark);
-			this.Controls.Add(this.gbxPaperSize);
-			this.Controls.Add(this.btnCancel);
-			this.Controls.Add(this.txtRemark);
-			this.Controls.Add(this.lblInvoiceName);
-			this.Controls.Add(this.txtInvoiceName);
-			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
-			this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-			this.IsSaveFormSize = false;
-			this.MaximizeBox = false;
-			this.MinimizeBox = false;
-			this.Name = "F_MST_012002";
-			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-			this.Text = "";
-			this.Load += new System.EventHandler(this.F_MST_012002_Load);
-			this.Controls.SetChildIndex(this.txtInvoiceName, 0);
-			this.Controls.SetChildIndex(this.lblInvoiceName, 0);
-			this.Controls.SetChildIndex(this.txtRemark, 0);
-			this.Controls.SetChildIndex(this.btnCancel, 0);
-			this.Controls.SetChildIndex(this.gbxPaperSize, 0);
-			this.Controls.SetChildIndex(this.lblRemark, 0);
-			this.Controls.SetChildIndex(this.btnSave, 0);
-			this.Controls.SetChildIndex(this.lblLabel1, 0);
-			this.Controls.SetChildIndex(this.ftcLogo, 0);
-			this.Controls.SetChildIndex(this.scbGoodsType, 0);
-			this.Controls.SetChildIndex(this.lblGoodsType, 0);
-			this.gbxPaperSize.ResumeLayout(false);
-			this.gbxPaperSize.PerformLayout();
-			((System.ComponentModel.ISupportInitialize)(this.dgrdPaperSize)).EndInit();
-			((System.ComponentModel.ISupportInitialize)(this.numerWidth)).EndInit();
-			((System.ComponentModel.ISupportInitialize)(this.numerHeight)).EndInit();
-			this.ResumeLayout(false);
-			this.PerformLayout();
+            // 
+            // lblHeightUnit
+            // 
+            this.lblHeightUnit.AutoSize = true;
+            this.lblHeightUnit.BackColor = System.Drawing.Color.Transparent;
+            this.lblHeightUnit.Location = new System.Drawing.Point(463, 30);
+            this.lblHeightUnit.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblHeightUnit.Name = "lblHeightUnit";
+            this.lblHeightUnit.Size = new System.Drawing.Size(23, 15);
+            this.lblHeightUnit.TabIndex = 5;
+            this.lblHeightUnit.Text = "mm";
+            // 
+            // lblWidthUnit
+            // 
+            this.lblWidthUnit.AutoSize = true;
+            this.lblWidthUnit.BackColor = System.Drawing.Color.Transparent;
+            this.lblWidthUnit.Location = new System.Drawing.Point(181, 28);
+            this.lblWidthUnit.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblWidthUnit.Name = "lblWidthUnit";
+            this.lblWidthUnit.Size = new System.Drawing.Size(23, 15);
+            this.lblWidthUnit.TabIndex = 2;
+            this.lblWidthUnit.Text = "mm";
+            // 
+            // lblHeight
+            // 
+            this.lblHeight.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblHeight.Location = new System.Drawing.Point(289, 30);
+            this.lblHeight.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblHeight.Name = "lblHeight";
+            this.lblHeight.Size = new System.Drawing.Size(67, 15);
+            this.lblHeight.TabIndex = 3;
+            this.lblHeight.Text = "纸张高度";
+            // 
+            // lblWidth
+            // 
+            this.lblWidth.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblWidth.Location = new System.Drawing.Point(8, 30);
+            this.lblWidth.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblWidth.Name = "lblWidth";
+            this.lblWidth.Size = new System.Drawing.Size(67, 15);
+            this.lblWidth.TabIndex = 0;
+            this.lblWidth.Text = "纸张宽度";
+            // 
+            // btnCancel
+            // 
+            this.btnCancel.BackColor = System.Drawing.Color.Transparent;
+            this.btnCancel.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnCancel.BackgroundImage")));
+            this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.btnCancel.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnCancel.ForeColor = System.Drawing.Color.White;
+            this.btnCancel.Location = new System.Drawing.Point(396, 518);
+            this.btnCancel.Margin = new System.Windows.Forms.Padding(4);
+            this.btnCancel.Name = "btnCancel";
+            this.btnCancel.Size = new System.Drawing.Size(113, 41);
+            this.btnCancel.TabIndex = 10;
+            this.btnCancel.Text = "取消";
+            this.btnCancel.UseVisualStyleBackColor = false;
+            this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
+            // 
+            // btnSave
+            // 
+            this.btnSave.BackColor = System.Drawing.Color.Transparent;
+            this.btnSave.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnSave.BackgroundImage")));
+            this.btnSave.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnSave.ForeColor = System.Drawing.Color.White;
+            this.btnSave.Location = new System.Drawing.Point(273, 516);
+            this.btnSave.Margin = new System.Windows.Forms.Padding(4);
+            this.btnSave.Name = "btnSave";
+            this.btnSave.Size = new System.Drawing.Size(113, 41);
+            this.btnSave.TabIndex = 9;
+            this.btnSave.Text = "确定";
+            this.btnSave.UseVisualStyleBackColor = false;
+            this.btnSave.Click += new System.EventHandler(this.btnOK_Click);
+            // 
+            // lblRemark
+            // 
+            this.lblRemark.Location = new System.Drawing.Point(45, 142);
+            this.lblRemark.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblRemark.Name = "lblRemark";
+            this.lblRemark.Size = new System.Drawing.Size(37, 15);
+            this.lblRemark.TabIndex = 6;
+            this.lblRemark.Text = "备注";
+            // 
+            // txtRemark
+            // 
+            this.txtRemark.Location = new System.Drawing.Point(92, 142);
+            this.txtRemark.Margin = new System.Windows.Forms.Padding(4);
+            this.txtRemark.MaxLength = 500;
+            this.txtRemark.Multiline = true;
+            this.txtRemark.Name = "txtRemark";
+            this.txtRemark.ScrollBars = System.Windows.Forms.ScrollBars.Both;
+            this.txtRemark.Size = new System.Drawing.Size(412, 52);
+            this.txtRemark.TabIndex = 7;
+            // 
+            // lblLabel1
+            // 
+            this.lblLabel1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblLabel1.Location = new System.Drawing.Point(15, 54);
+            this.lblLabel1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblLabel1.Name = "lblLabel1";
+            this.lblLabel1.Size = new System.Drawing.Size(67, 15);
+            this.lblLabel1.TabIndex = 1;
+            this.lblLabel1.Text = "产品商标";
+            // 
+            // ftcLogo
+            // 
+            this.ftcLogo.FormattingEnabled = true;
+            this.ftcLogo.HasNullData = true;
+            this.ftcLogo.Location = new System.Drawing.Point(92, 49);
+            this.ftcLogo.Margin = new System.Windows.Forms.Padding(4);
+            this.ftcLogo.Name = "ftcLogo";
+            this.ftcLogo.Size = new System.Drawing.Size(412, 23);
+            this.ftcLogo.TabIndex = 2;
+            this.ftcLogo.SelectedValueChanged += new System.EventHandler(this.ftcLogo_SelectedValueChanged);
+            // 
+            // lblGoodsType
+            // 
+            this.lblGoodsType.AutoSize = true;
+            this.lblGoodsType.BackColor = System.Drawing.SystemColors.Control;
+            this.lblGoodsType.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblGoodsType.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+            this.lblGoodsType.IsMustInput = true;
+            this.lblGoodsType.Location = new System.Drawing.Point(16, 22);
+            this.lblGoodsType.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblGoodsType.Name = "lblGoodsType";
+            this.lblGoodsType.Size = new System.Drawing.Size(67, 15);
+            this.lblGoodsType.TabIndex = 23;
+            this.lblGoodsType.Text = "产品类别";
+            // 
+            // scbGoodsType
+            // 
+            this.scbGoodsType.CheckedData = null;
+            this.scbGoodsType.IsOnlyDisplayEnd = false;
+            this.scbGoodsType.Location = new System.Drawing.Point(92, 18);
+            this.scbGoodsType.Margin = new System.Windows.Forms.Padding(4);
+            this.scbGoodsType.Name = "scbGoodsType";
+            this.scbGoodsType.Size = new System.Drawing.Size(413, 26);
+            this.scbGoodsType.TabIndex = 22;
+            this.scbGoodsType.SearchedItemChanged += new System.EventHandler(this.scbGoodsType_SearchedItemChanged);
+            // 
+            // ddlPrintType
+            // 
+            this.ddlPrintType.FormattingEnabled = true;
+            this.ddlPrintType.HasNullData = true;
+            this.ddlPrintType.Location = new System.Drawing.Point(92, 78);
+            this.ddlPrintType.Margin = new System.Windows.Forms.Padding(4);
+            this.ddlPrintType.Name = "ddlPrintType";
+            this.ddlPrintType.Size = new System.Drawing.Size(412, 23);
+            this.ddlPrintType.TabIndex = 25;
+            this.ddlPrintType.SelectedIndexChanged += new System.EventHandler(this.ddlPrintType_SelectedIndexChanged);
+            // 
+            // lblLabel2
+            // 
+            this.lblLabel2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblLabel2.Location = new System.Drawing.Point(15, 83);
+            this.lblLabel2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblLabel2.Name = "lblLabel2";
+            this.lblLabel2.Size = new System.Drawing.Size(67, 15);
+            this.lblLabel2.TabIndex = 24;
+            this.lblLabel2.Text = "打印类别";
+            // 
+            // F_MST_012002
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.CancelButton = this.btnCancel;
+            this.ClientSize = new System.Drawing.Size(525, 590);
+            this.Controls.Add(this.ddlPrintType);
+            this.Controls.Add(this.lblLabel2);
+            this.Controls.Add(this.lblGoodsType);
+            this.Controls.Add(this.scbGoodsType);
+            this.Controls.Add(this.ftcLogo);
+            this.Controls.Add(this.lblLabel1);
+            this.Controls.Add(this.btnSave);
+            this.Controls.Add(this.lblRemark);
+            this.Controls.Add(this.gbxPaperSize);
+            this.Controls.Add(this.btnCancel);
+            this.Controls.Add(this.txtRemark);
+            this.Controls.Add(this.lblInvoiceName);
+            this.Controls.Add(this.txtInvoiceName);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.IsSaveFormSize = false;
+            this.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "F_MST_012002";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            this.Text = "";
+            this.Load += new System.EventHandler(this.F_MST_012002_Load);
+            this.Controls.SetChildIndex(this.txtInvoiceName, 0);
+            this.Controls.SetChildIndex(this.lblInvoiceName, 0);
+            this.Controls.SetChildIndex(this.txtRemark, 0);
+            this.Controls.SetChildIndex(this.btnCancel, 0);
+            this.Controls.SetChildIndex(this.gbxPaperSize, 0);
+            this.Controls.SetChildIndex(this.lblRemark, 0);
+            this.Controls.SetChildIndex(this.btnSave, 0);
+            this.Controls.SetChildIndex(this.lblLabel1, 0);
+            this.Controls.SetChildIndex(this.ftcLogo, 0);
+            this.Controls.SetChildIndex(this.scbGoodsType, 0);
+            this.Controls.SetChildIndex(this.lblGoodsType, 0);
+            this.Controls.SetChildIndex(this.lblLabel2, 0);
+            this.Controls.SetChildIndex(this.ddlPrintType, 0);
+            this.gbxPaperSize.ResumeLayout(false);
+            this.gbxPaperSize.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dgrdPaperSize)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numerWidth)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numerHeight)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
 
         }
 
@@ -434,5 +488,7 @@
         private WinForm.Controls.FtcFilterComboBox ftcLogo;
 		private Basics.BaseControls.C_Label lblGoodsType;
 		private SearchBox.ScbGoodsType scbGoodsType;
-	}
+        private WinForm.Controls.FtcFilterComboBox ddlPrintType;
+        private WinForm.Controls.LblLabel lblLabel2;
+    }
 }

DK.Client/Client.Controls/Layout/F_MST_012003.cs

@@ -39,6 +39,8 @@ namespace Dongke.IBOSS.PRD.Client.Controls
         private bool _isFormDataChanged = false;				// 画面的数据是否有改变
         private ClientRequestEntity _clientRequestEntity;       // 查询条件实体
         //private string _remarks;                                // 总单备注
+        //xuwei add 2019-11-20
+        private int? _printType;                                 //打印类别
         #endregion
 
         #region 属性
@@ -49,7 +51,7 @@ namespace Dongke.IBOSS.PRD.Client.Controls
         /// 构造函数
         /// </summary>
         public F_MST_012003(int goodstypeID, string goodstypeCode, string goodstypeName, int? logoid, string logoname,
-            float paperWidth, float paperHeight, string layoutName, string remarks)
+            float paperWidth, float paperHeight, string layoutName,int printType, string remarks)
         {
             InitializeComponent();
             this.Text = string.Format(F_MST_012001.TITLE_F_MST_012001_NEW, layoutName);
@@ -67,6 +69,7 @@ namespace Dongke.IBOSS.PRD.Client.Controls
             this._logoid = logoid;
             this.txtRemarks.Text = remarks;
             this.lbxInvoice.LayoutMode = LayoutMode.Edit;
+            this._printType = printType;
         }
 
         /// <summary>
@@ -219,6 +222,8 @@ namespace Dongke.IBOSS.PRD.Client.Controls
                 frmINV0302.GoodsTypeName = this._goodstypeName;
                 frmINV0302.LogoID = this._logoid;
                 frmINV0302.LogoName = this.txtLogo.Text;
+                //xuwei add 2019-11-20
+                frmINV0302.PrintType = this._printType;
                 frmINV0302.FromForm = 1;
                 DialogResult dialogResult = frmINV0302.ShowDialog();
 
@@ -233,6 +238,8 @@ namespace Dongke.IBOSS.PRD.Client.Controls
                     this.txtGoodsType.Text = _goodstypeName + "【" + _goodstypeCode + "】";
                     this._logoid = frmINV0302.LogoID;
                     this.txtLogo.Text = frmINV0302.LogoName;
+                    //xuwei add 2019-11-20
+                    this._printType = frmINV0302.PrintType;
 
                     _saveData = new DataSet();
                     // 更新票据主信息的DataTable
@@ -1850,6 +1857,8 @@ namespace Dongke.IBOSS.PRD.Client.Controls
                     tempDataRow["Width"] = lbxInvoice.PaperWidth;
                     tempDataRow["Height"] = lbxInvoice.PaperHeight;
                     tempDataRow["Remarks"] = this.txtRemarks.Text.Trim();
+                    //xuwei add 2019-11-20
+                    tempDataRow["PrintType"] = this._printType;
                     layout.Rows.Clear(); 
                     layout.Rows.Add(tempDataRow);
                 }

DK.Client/Client.Controls/Layout/F_MST_012004.cs

@@ -102,6 +102,14 @@ namespace Dongke.IBOSS.PRD.Client.Controls
 			set;
 		}
 
+        /// <summary>
+        /// 打印类型 xuwei add 2019-11-20
+        /// </summary>
+        public int? PrintType
+        {
+            get;
+            set;
+        }
 
 		/// <summary>
 		/// 备注
@@ -135,7 +143,17 @@ namespace Dongke.IBOSS.PRD.Client.Controls
 		{
 			try
 			{
-				if (1 == FromForm)
+                //加载 打印类型 xuwei begin 2019-11-20
+                this.ddlPrintType.DisplayMember = "PRINTTYPENAME";
+                this.ddlPrintType.ValueMember = "PRINTTYPEID";
+                ClientRequestEntity ptCre = new ClientRequestEntity();
+                ptCre.NameSpace = "PrintInfo";
+                ptCre.Name = "GetPrintType";
+                DataTable dtPrintType = SystemModuleProxy.Service.DoBarCodePrint(ptCre).Data.Tables[0];
+                this.ddlPrintType.DataSource = dtPrintType;
+                //加载 打印类型 xuwei end
+
+                if (1 == FromForm)
 				{
 					this.chkValueFlag.Checked = true;
 					this.chkValueFlag.Visible = false;
@@ -209,6 +227,10 @@ namespace Dongke.IBOSS.PRD.Client.Controls
 						//    this.ftcLogo.SelectedValue = DBNull.Value;
 						//}
 						this.ftcLogo.InitValue(layout["LogoNameCode"].ToString(), layout["LogoID"]);
+
+                        //xuwei add 2019-11-20
+                        if(layout["PrintType"].ToString()!="")
+                            this.ddlPrintType.SelectedValue = layout["PrintType"].ToString();
 					}
 				}
 			}
@@ -293,6 +315,9 @@ namespace Dongke.IBOSS.PRD.Client.Controls
 					this.GoodsTypeName = scbGoodsType.SearchedText;
 					this.LayoutName = this.txtInvoiceName.Text.Trim();
 					this.Remarks = this.txtRemark.Text.Trim();
+                    //xuwei add 2019-11-20
+                    this.PrintType = Convert.ToInt32(ddlPrintType.SelectedValue);
+
 					object objLogoID = this.ftcLogo.SelectedValue;
 					if (objLogoID != null && objLogoID != DBNull.Value)
 					{
@@ -365,6 +390,9 @@ namespace Dongke.IBOSS.PRD.Client.Controls
 				this._clientRequestEntity.Properties["GoodsTypeID"] = goodsTypeID.Value;
 				this._clientRequestEntity.Properties["layoutid"] = LayoutID;
 				this._clientRequestEntity.Properties["LogoID"] = value;
+                //xuwei add 2019-11-20
+				this._clientRequestEntity.Properties["PrintType"] = this.ddlPrintType.SelectedValue;
+
 				ServiceResultEntity sre = DoAsync<ServiceResultEntity>(() =>
 				{
 					return SystemModuleProxy.Service.DoBarCodePrint(this._clientRequestEntity);
@@ -399,6 +427,9 @@ namespace Dongke.IBOSS.PRD.Client.Controls
 				this._clientRequestEntity.Properties["GoodsTypeID"] = scbGoodsType.SearchedPKMember;
 				this._clientRequestEntity.Properties["GoodsTypeCode"] = scbGoodsType.SearchedValue;
 				this._clientRequestEntity.Properties["GoodsTypeName"] = scbGoodsType.SearchedText;
+                //xuwei add 2019-11-20
+				this._clientRequestEntity.Properties["PrintType"] = this.ddlPrintType.SelectedValue;
+
 				// 正常标识
 				if (this.chkValueFlag.Checked)
 				{

DK.Client/Client.Controls/Layout/F_MST_012004.designer.cs

@@ -28,171 +28,210 @@
         /// </summary>
         private void InitializeComponent()
         {
-			this.txtInvoiceName = new Dongke.WinForm.Controls.TxtTextBox();
-			this.lblInvoiceName = new Dongke.WinForm.Controls.LblLabel();
-			this.chkValueFlag = new Dongke.WinForm.Controls.ChkCheckBox();
-			this.btnOK = new Dongke.WinForm.Controls.BtnButton();
-			this.btnCancel = new Dongke.WinForm.Controls.BtnButton();
-			this.lblRemark = new Dongke.WinForm.Controls.LblLabel();
-			this.txtRemark = new Dongke.WinForm.Controls.TxtTextBox();
-			this.lblLabel1 = new Dongke.WinForm.Controls.LblLabel();
-			this.ftcLogo = new Dongke.WinForm.Controls.FtcFilterComboBox();
-			this.scbGoodsType = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbGoodsType();
-			this.lblGoodsType = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
-			this.SuspendLayout();
-			// 
-			// txtInvoiceName
-			// 
-			this.txtInvoiceName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-			this.txtInvoiceName.Location = new System.Drawing.Point(71, 65);
-			this.txtInvoiceName.MaxLength = 50;
-			this.txtInvoiceName.Name = "txtInvoiceName";
-			this.txtInvoiceName.Size = new System.Drawing.Size(328, 21);
-			this.txtInvoiceName.TabIndex = 4;
-			this.txtInvoiceName.TextChanged += new System.EventHandler(this.txtInvoiceName_TextChanged);
-			// 
-			// lblInvoiceName
-			// 
-			this.lblInvoiceName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.lblInvoiceName.Location = new System.Drawing.Point(12, 43);
-			this.lblInvoiceName.Name = "lblInvoiceName";
-			this.lblInvoiceName.Size = new System.Drawing.Size(53, 12);
-			this.lblInvoiceName.TabIndex = 1;
-			this.lblInvoiceName.Text = "产品商标";
-			// 
-			// chkValueFlag
-			// 
-			this.chkValueFlag.Checked = true;
-			this.chkValueFlag.CheckState = System.Windows.Forms.CheckState.Checked;
-			this.chkValueFlag.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.chkValueFlag.Location = new System.Drawing.Point(71, 161);
-			this.chkValueFlag.Name = "chkValueFlag";
-			this.chkValueFlag.Size = new System.Drawing.Size(48, 16);
-			this.chkValueFlag.TabIndex = 7;
-			this.chkValueFlag.Text = "有效";
-			this.chkValueFlag.UseVisualStyleBackColor = true;
-			this.chkValueFlag.Visible = false;
-			// 
-			// btnOK
-			// 
-			this.btnOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.btnOK.Location = new System.Drawing.Point(223, 157);
-			this.btnOK.Name = "btnOK";
-			this.btnOK.Size = new System.Drawing.Size(85, 30);
-			this.btnOK.TabIndex = 8;
-			this.btnOK.Text = "确定";
-			this.btnOK.UseVisualStyleBackColor = true;
-			this.btnOK.Click += new System.EventHandler(this.btnOK_Click);
-			// 
-			// btnCancel
-			// 
-			this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.btnCancel.Location = new System.Drawing.Point(314, 157);
-			this.btnCancel.Name = "btnCancel";
-			this.btnCancel.Size = new System.Drawing.Size(85, 30);
-			this.btnCancel.TabIndex = 9;
-			this.btnCancel.Text = "取消";
-			this.btnCancel.UseVisualStyleBackColor = true;
-			this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
-			// 
-			// lblRemark
-			// 
-			this.lblRemark.Location = new System.Drawing.Point(36, 92);
-			this.lblRemark.Name = "lblRemark";
-			this.lblRemark.Size = new System.Drawing.Size(29, 12);
-			this.lblRemark.TabIndex = 5;
-			this.lblRemark.Text = "备注";
-			// 
-			// txtRemark
-			// 
-			this.txtRemark.Location = new System.Drawing.Point(71, 92);
-			this.txtRemark.MaxLength = 500;
-			this.txtRemark.Multiline = true;
-			this.txtRemark.Name = "txtRemark";
-			this.txtRemark.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-			this.txtRemark.Size = new System.Drawing.Size(328, 59);
-			this.txtRemark.TabIndex = 6;
-			// 
-			// lblLabel1
-			// 
-			this.lblLabel1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.lblLabel1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
-			this.lblLabel1.Location = new System.Drawing.Point(12, 69);
-			this.lblLabel1.Name = "lblLabel1";
-			this.lblLabel1.Size = new System.Drawing.Size(53, 12);
-			this.lblLabel1.TabIndex = 3;
-			this.lblLabel1.Text = "标签名称";
-			// 
-			// ftcLogo
-			// 
-			this.ftcLogo.FormattingEnabled = true;
-			this.ftcLogo.HasNullData = true;
-			this.ftcLogo.Location = new System.Drawing.Point(71, 39);
-			this.ftcLogo.Name = "ftcLogo";
-			this.ftcLogo.Size = new System.Drawing.Size(328, 20);
-			this.ftcLogo.TabIndex = 2;
-			this.ftcLogo.SelectedIndexChanged += new System.EventHandler(this.ftcLogo_SelectedIndexChanged);
-			// 
-			// scbGoodsType
-			// 
-			this.scbGoodsType.Location = new System.Drawing.Point(71, 12);
-			this.scbGoodsType.MultiSelect = false;
-			this.scbGoodsType.Name = "scbGoodsType";
-			this.scbGoodsType.Size = new System.Drawing.Size(328, 21);
-			this.scbGoodsType.TabIndex = 21;
-			this.scbGoodsType.SearchedItemChanged += new System.EventHandler(this.scbGoodsType_SearchedItemChanged);
-			// 
-			// lblGoodsType
-			// 
-			this.lblGoodsType.AutoSize = true;
-			this.lblGoodsType.BackColor = System.Drawing.SystemColors.Control;
-			this.lblGoodsType.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.lblGoodsType.ForeColor = System.Drawing.SystemColors.ControlText;
-			this.lblGoodsType.Location = new System.Drawing.Point(12, 17);
-			this.lblGoodsType.Name = "lblGoodsType";
-			this.lblGoodsType.Size = new System.Drawing.Size(53, 12);
-			this.lblGoodsType.TabIndex = 22;
-			this.lblGoodsType.Text = "产品类别";
-			// 
-			// F_MST_012004
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.CancelButton = this.btnCancel;
-			this.ClientSize = new System.Drawing.Size(411, 212);
-			this.Controls.Add(this.lblGoodsType);
-			this.Controls.Add(this.scbGoodsType);
-			this.Controls.Add(this.ftcLogo);
-			this.Controls.Add(this.txtInvoiceName);
-			this.Controls.Add(this.lblRemark);
-			this.Controls.Add(this.lblLabel1);
-			this.Controls.Add(this.lblInvoiceName);
-			this.Controls.Add(this.txtRemark);
-			this.Controls.Add(this.chkValueFlag);
-			this.Controls.Add(this.btnCancel);
-			this.Controls.Add(this.btnOK);
-			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
-			this.IsSaveFormSize = false;
-			this.MaximizeBox = false;
-			this.MinimizeBox = false;
-			this.Name = "F_MST_012004";
-			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-			this.Text = "";
-			this.Load += new System.EventHandler(this.F_MST_012004_Load);
-			this.Controls.SetChildIndex(this.btnOK, 0);
-			this.Controls.SetChildIndex(this.btnCancel, 0);
-			this.Controls.SetChildIndex(this.chkValueFlag, 0);
-			this.Controls.SetChildIndex(this.txtRemark, 0);
-			this.Controls.SetChildIndex(this.lblInvoiceName, 0);
-			this.Controls.SetChildIndex(this.lblLabel1, 0);
-			this.Controls.SetChildIndex(this.lblRemark, 0);
-			this.Controls.SetChildIndex(this.txtInvoiceName, 0);
-			this.Controls.SetChildIndex(this.ftcLogo, 0);
-			this.Controls.SetChildIndex(this.scbGoodsType, 0);
-			this.Controls.SetChildIndex(this.lblGoodsType, 0);
-			this.ResumeLayout(false);
-			this.PerformLayout();
+            this.txtInvoiceName = new Dongke.WinForm.Controls.TxtTextBox();
+            this.lblInvoiceName = new Dongke.WinForm.Controls.LblLabel();
+            this.chkValueFlag = new Dongke.WinForm.Controls.ChkCheckBox();
+            this.btnOK = new Dongke.WinForm.Controls.BtnButton();
+            this.btnCancel = new Dongke.WinForm.Controls.BtnButton();
+            this.lblRemark = new Dongke.WinForm.Controls.LblLabel();
+            this.txtRemark = new Dongke.WinForm.Controls.TxtTextBox();
+            this.lblLabel1 = new Dongke.WinForm.Controls.LblLabel();
+            this.ftcLogo = new Dongke.WinForm.Controls.FtcFilterComboBox();
+            this.scbGoodsType = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbGoodsType();
+            this.lblGoodsType = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.ddlPrintType = new Dongke.WinForm.Controls.FtcFilterComboBox();
+            this.lblLabel2 = new Dongke.WinForm.Controls.LblLabel();
+            this.SuspendLayout();
+            // 
+            // txtInvoiceName
+            // 
+            this.txtInvoiceName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.txtInvoiceName.Location = new System.Drawing.Point(95, 111);
+            this.txtInvoiceName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txtInvoiceName.MaxLength = 50;
+            this.txtInvoiceName.Name = "txtInvoiceName";
+            this.txtInvoiceName.Size = new System.Drawing.Size(436, 25);
+            this.txtInvoiceName.TabIndex = 4;
+            this.txtInvoiceName.TextChanged += new System.EventHandler(this.txtInvoiceName_TextChanged);
+            // 
+            // lblInvoiceName
+            // 
+            this.lblInvoiceName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblInvoiceName.Location = new System.Drawing.Point(16, 54);
+            this.lblInvoiceName.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblInvoiceName.Name = "lblInvoiceName";
+            this.lblInvoiceName.Size = new System.Drawing.Size(67, 15);
+            this.lblInvoiceName.TabIndex = 1;
+            this.lblInvoiceName.Text = "产品商标";
+            // 
+            // chkValueFlag
+            // 
+            this.chkValueFlag.Checked = true;
+            this.chkValueFlag.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.chkValueFlag.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.chkValueFlag.Location = new System.Drawing.Point(95, 231);
+            this.chkValueFlag.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.chkValueFlag.Name = "chkValueFlag";
+            this.chkValueFlag.Size = new System.Drawing.Size(59, 19);
+            this.chkValueFlag.TabIndex = 7;
+            this.chkValueFlag.Text = "有效";
+            this.chkValueFlag.UseVisualStyleBackColor = true;
+            this.chkValueFlag.Visible = false;
+            // 
+            // btnOK
+            // 
+            this.btnOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnOK.Location = new System.Drawing.Point(297, 252);
+            this.btnOK.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.btnOK.Name = "btnOK";
+            this.btnOK.Size = new System.Drawing.Size(113, 38);
+            this.btnOK.TabIndex = 8;
+            this.btnOK.Text = "确定";
+            this.btnOK.UseVisualStyleBackColor = true;
+            this.btnOK.Click += new System.EventHandler(this.btnOK_Click);
+            // 
+            // btnCancel
+            // 
+            this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.btnCancel.Location = new System.Drawing.Point(419, 252);
+            this.btnCancel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.btnCancel.Name = "btnCancel";
+            this.btnCancel.Size = new System.Drawing.Size(113, 38);
+            this.btnCancel.TabIndex = 9;
+            this.btnCancel.Text = "取消";
+            this.btnCancel.UseVisualStyleBackColor = true;
+            this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
+            // 
+            // lblRemark
+            // 
+            this.lblRemark.Location = new System.Drawing.Point(48, 145);
+            this.lblRemark.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblRemark.Name = "lblRemark";
+            this.lblRemark.Size = new System.Drawing.Size(37, 15);
+            this.lblRemark.TabIndex = 5;
+            this.lblRemark.Text = "备注";
+            // 
+            // txtRemark
+            // 
+            this.txtRemark.Location = new System.Drawing.Point(95, 145);
+            this.txtRemark.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txtRemark.MaxLength = 500;
+            this.txtRemark.Multiline = true;
+            this.txtRemark.Name = "txtRemark";
+            this.txtRemark.ScrollBars = System.Windows.Forms.ScrollBars.Both;
+            this.txtRemark.Size = new System.Drawing.Size(436, 73);
+            this.txtRemark.TabIndex = 6;
+            // 
+            // lblLabel1
+            // 
+            this.lblLabel1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblLabel1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+            this.lblLabel1.Location = new System.Drawing.Point(16, 116);
+            this.lblLabel1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblLabel1.Name = "lblLabel1";
+            this.lblLabel1.Size = new System.Drawing.Size(67, 15);
+            this.lblLabel1.TabIndex = 3;
+            this.lblLabel1.Text = "标签名称";
+            // 
+            // ftcLogo
+            // 
+            this.ftcLogo.FormattingEnabled = true;
+            this.ftcLogo.HasNullData = true;
+            this.ftcLogo.Location = new System.Drawing.Point(95, 49);
+            this.ftcLogo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ftcLogo.Name = "ftcLogo";
+            this.ftcLogo.Size = new System.Drawing.Size(436, 23);
+            this.ftcLogo.TabIndex = 2;
+            this.ftcLogo.SelectedIndexChanged += new System.EventHandler(this.ftcLogo_SelectedIndexChanged);
+            // 
+            // scbGoodsType
+            // 
+            this.scbGoodsType.CheckedData = null;
+            this.scbGoodsType.IsOnlyDisplayEnd = false;
+            this.scbGoodsType.Location = new System.Drawing.Point(95, 15);
+            this.scbGoodsType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.scbGoodsType.Name = "scbGoodsType";
+            this.scbGoodsType.Size = new System.Drawing.Size(437, 26);
+            this.scbGoodsType.TabIndex = 21;
+            this.scbGoodsType.SearchedItemChanged += new System.EventHandler(this.scbGoodsType_SearchedItemChanged);
+            // 
+            // lblGoodsType
+            // 
+            this.lblGoodsType.AutoSize = true;
+            this.lblGoodsType.BackColor = System.Drawing.SystemColors.Control;
+            this.lblGoodsType.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblGoodsType.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.lblGoodsType.Location = new System.Drawing.Point(16, 21);
+            this.lblGoodsType.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblGoodsType.Name = "lblGoodsType";
+            this.lblGoodsType.Size = new System.Drawing.Size(67, 15);
+            this.lblGoodsType.TabIndex = 22;
+            this.lblGoodsType.Text = "产品类别";
+            // 
+            // ddlPrintType
+            // 
+            this.ddlPrintType.FormattingEnabled = true;
+            this.ddlPrintType.HasNullData = true;
+            this.ddlPrintType.Location = new System.Drawing.Point(95, 80);
+            this.ddlPrintType.Margin = new System.Windows.Forms.Padding(4);
+            this.ddlPrintType.Name = "ddlPrintType";
+            this.ddlPrintType.Size = new System.Drawing.Size(436, 23);
+            this.ddlPrintType.TabIndex = 24;
+            // 
+            // lblLabel2
+            // 
+            this.lblLabel2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblLabel2.Location = new System.Drawing.Point(16, 85);
+            this.lblLabel2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblLabel2.Name = "lblLabel2";
+            this.lblLabel2.Size = new System.Drawing.Size(67, 15);
+            this.lblLabel2.TabIndex = 23;
+            this.lblLabel2.Text = "打印类型";
+            // 
+            // F_MST_012004
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.CancelButton = this.btnCancel;
+            this.ClientSize = new System.Drawing.Size(548, 321);
+            this.Controls.Add(this.ddlPrintType);
+            this.Controls.Add(this.lblLabel2);
+            this.Controls.Add(this.lblGoodsType);
+            this.Controls.Add(this.scbGoodsType);
+            this.Controls.Add(this.ftcLogo);
+            this.Controls.Add(this.txtInvoiceName);
+            this.Controls.Add(this.lblRemark);
+            this.Controls.Add(this.lblLabel1);
+            this.Controls.Add(this.lblInvoiceName);
+            this.Controls.Add(this.txtRemark);
+            this.Controls.Add(this.chkValueFlag);
+            this.Controls.Add(this.btnCancel);
+            this.Controls.Add(this.btnOK);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+            this.IsSaveFormSize = false;
+            this.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "F_MST_012004";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            this.Text = "";
+            this.Load += new System.EventHandler(this.F_MST_012004_Load);
+            this.Controls.SetChildIndex(this.btnOK, 0);
+            this.Controls.SetChildIndex(this.btnCancel, 0);
+            this.Controls.SetChildIndex(this.chkValueFlag, 0);
+            this.Controls.SetChildIndex(this.txtRemark, 0);
+            this.Controls.SetChildIndex(this.lblInvoiceName, 0);
+            this.Controls.SetChildIndex(this.lblLabel1, 0);
+            this.Controls.SetChildIndex(this.lblRemark, 0);
+            this.Controls.SetChildIndex(this.txtInvoiceName, 0);
+            this.Controls.SetChildIndex(this.ftcLogo, 0);
+            this.Controls.SetChildIndex(this.scbGoodsType, 0);
+            this.Controls.SetChildIndex(this.lblGoodsType, 0);
+            this.Controls.SetChildIndex(this.lblLabel2, 0);
+            this.Controls.SetChildIndex(this.ddlPrintType, 0);
+            this.ResumeLayout(false);
+            this.PerformLayout();
 
         }
 
@@ -209,5 +248,7 @@
         private WinForm.Controls.FtcFilterComboBox ftcLogo;
 		private SearchBox.ScbGoodsType scbGoodsType;
 		private Basics.BaseControls.C_Label lblGoodsType;
-	}
+        private WinForm.Controls.FtcFilterComboBox ddlPrintType;
+        private WinForm.Controls.LblLabel lblLabel2;
+    }
 }

DK.Service/SystemModuleLogic/SystemModuleLogic.cs

@@ -3864,11 +3864,14 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 					"      ,decode(t.logoid, null, '', logo.logoname || '[' || logo.logocode || ']') logonamecode\n" +
 					"      ,t.remarks\n" +
 					"      ,t.valueflag\n" +
+                    "      ,t.PrintType\n" + //xuwei add 2019-11-20
+                    "      ,s.PrintTypeName\n" + //xuwei add 2019-11-20
 					"  FROM tp_mst_barcodeprintlayout t\n" +
 					" INNER JOIN tp_mst_goodstype gt\n" +
 					"    ON gt.goodstypeid = t.goodstypeid\n" +
 					"  LEFT JOIN tp_mst_Logo logo\n" +
 					"    ON logo.logoid = t.logoid\n" +
+                    "  left join TP_SYS_BARCODEPRINTTYPE s on t.printtype = s.printtypeid \n" + //xuwei add 2019-11-20
 					" WHERE t.accountid = :accountid\n" +
 					"   AND (:layoutname IS NULL OR instr(t.layoutname, :layoutname) > 0)\n" +
 					"   AND (:goodstypecode IS NULL OR\n" +
@@ -3928,11 +3931,13 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 					"SELECT t.layoutid\n" +
 					"  FROM tp_mst_barcodeprintlayout t\n" +
 					" WHERE t.goodstypeid = :goodstypeid\n" +
-					"   AND ((:logoid is null and t.logoid is null) or (t.logoid = :logoid))\n" +
+                    "   AND ((:printtype is null and t.printtype is null) or (t.printtype = :printtype))\n" + //xuwei add 2019-11-20
+                    "   AND ((:logoid is null and t.logoid is null) or (t.logoid = :logoid))\n" +
 					"   AND (:layoutid is null or :layoutid <> t.layoutid)";
 
 				List<OracleParameter> parameters = new List<OracleParameter>();
 				//parameters.Add(new OracleParameter(":accountid", OracleDbType.Int32, sUserInfo.AccountID, ParameterDirection.Input));
+				parameters.Add(new OracleParameter(":printtype", OracleDbType.Int32, cre.Properties["PrintType"], ParameterDirection.Input));
 				parameters.Add(new OracleParameter(":goodstypeid", OracleDbType.Int32, cre.Properties["GoodsTypeID"], ParameterDirection.Input));
 				parameters.Add(new OracleParameter(":layoutid", OracleDbType.Int32, cre.Properties["layoutid"], ParameterDirection.Input));
 				parameters.Add(new OracleParameter(":logoid", OracleDbType.Int32, cre.Properties["LogoID"], ParameterDirection.Input));
@@ -4024,6 +4029,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 					"      ,gt.goodstypecode\n" +
 					"      ,gt.goodstypename\n" +
 					"      ,t.logoid\n" +
+					"      ,t.printtype\n" + //xuwei add 2019-11-20
 					"      ,decode(t.logoid, null, '', logo.logoname || '[' || logo.logocode || ']') logoName\n" +
 					//"      ,logo.logoName || '[' || logo.logocode || ']' logoName\n" + 
 					"      ,t.width\n" +
@@ -4102,6 +4108,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 				"  ,GOODSTYPEID\n" +
 				"  ,GOODSTYPECODE\n" +
 				"  ,LOGOID\n" +
+                "  ,PRINTTYPE\n" + //xuwei add 2019-11-20
 				"  ,WIDTH\n" +
 				"  ,HEIGHT\n" +
 				"  ,REMARKS\n" +
@@ -4115,6 +4122,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 				"  ,:GOODSTYPEID\n" +
 				"  ,:GOODSTYPECODE\n" +
 				"  ,:LOGOID\n" +
+                "  ,:PRINTTYPE\n" + //xuwei add 2019-11-20
 				"  ,:WIDTH\n" +
 				"  ,:HEIGHT\n" +
 				"  ,:REMARKS\n" +
@@ -4128,6 +4136,8 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 				parameters.Add(new OracleParameter(":GOODSTYPEID", OracleDbType.Int32, layoutdata["GOODSTYPEID"], ParameterDirection.Input));
 				parameters.Add(new OracleParameter(":GOODSTYPECODE", OracleDbType.NVarchar2, layoutdata["GOODSTYPECODE"], ParameterDirection.Input));
 				parameters.Add(new OracleParameter(":LOGOID", OracleDbType.Int32, layoutdata["LOGOID"], ParameterDirection.Input));
+                //xuwei add 2019-11-20
+				parameters.Add(new OracleParameter(":PRINTTYPE", OracleDbType.Int32, layoutdata["PRINTTYPE"], ParameterDirection.Input));
 				parameters.Add(new OracleParameter(":WIDTH", OracleDbType.Int32, layoutdata["WIDTH"], ParameterDirection.Input));
 				parameters.Add(new OracleParameter(":HEIGHT", OracleDbType.Int32, layoutdata["HEIGHT"], ParameterDirection.Input));
 				parameters.Add(new OracleParameter(":REMARKS", OracleDbType.NVarchar2, layoutdata["REMARKS"], ParameterDirection.Input));
@@ -4293,6 +4303,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 					"      ,gt.goodstypecode\n" +
 					"      ,gt.goodstypename\n" +
 					"      ,t.logoid\n" +
+					"      ,t.printtype\n" + //xuwei add 2019-11-20
 					"      ,decode(t.logoid, null, '', logo.logoname || '[' || logo.logocode || ']') logoNameCode\n" +
 					//"      ,logo.logoName || '[' || logo.logocode || ']' logoNameCode\n" + 
 					"      ,t.remarks\n" +
@@ -4346,6 +4357,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 				" SET t.LAYOUTNAME = :LAYOUTNAME, t.GOODSTYPEID = :GOODSTYPEID, t.GOODSTYPECODE = :GOODSTYPECODE\n" +
 				"    ,t.REMARKS = :REMARKS, t.Valueflag = :Valueflag, t.UPDATEUSERID=:UPDATEUSERID\n" +
 				"    ,t.LogoID = :LogoID\n" +
+                "    ,t.PrintType = :PrintType\n" + //xuwei add 2019-11-20
 				" WHERE t.LAYOUTID = :LAYOUTID";
 
 				List<OracleParameter> parameters = new List<OracleParameter>();
@@ -4357,6 +4369,8 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 				parameters.Add(new OracleParameter(":Valueflag", OracleDbType.NVarchar2, cre.Properties["ValueFlag"], ParameterDirection.Input));
 				parameters.Add(new OracleParameter(":UPDATEUSERID", OracleDbType.Int32, sUserInfo.UserID, ParameterDirection.Input));
 				parameters.Add(new OracleParameter(":LogoID", OracleDbType.Int32, cre.Properties["LogoID"], ParameterDirection.Input));
+				//xuwei add 2019-11-20
+                parameters.Add(new OracleParameter(":PrintType", OracleDbType.Int32, cre.Properties["PrintType"], ParameterDirection.Input));
 
 				int result = oracleTrConn.ExecuteNonQuery(sqlString, parameters.ToArray());
 				if (result == 0)