bug
lu
4 天以前 3ba209dab53170b3450ceeaea07f9499790a56a5
bug
已修改3个文件
94 ■■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.Designer.cs 72 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcBtnPrint.cs 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.Designer.cs
@@ -62,15 +62,16 @@
            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
            this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
            this.lbGuid = new System.Windows.Forms.Label();
            this.txt_suppName = new DevExpress.XtraEditors.TextEdit();
            this.txt_depotName = new DevExpress.XtraEditors.TextEdit();
            this.txt_checkUser = new DevExpress.XtraEditors.TextEdit();
            this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
            this.txt_depotName = new DevExpress.XtraEditors.TextEdit();
            this.txt_suppName = new DevExpress.XtraEditors.TextEdit();
            this.txt_reason = new DevExpress.XtraEditors.ComboBoxEdit();
            this.txt_fmrmode = new DevExpress.XtraEditors.ComboBoxEdit();
            this.txt_itemOutNo = new DevExpress.XtraEditors.TextEdit();
@@ -137,7 +138,6 @@
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -157,10 +157,10 @@
            this.splitMx1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
            this.layoutMx1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_depotName.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_depotName.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_reason.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemOutNo.Properties)).BeginInit();
@@ -498,6 +498,16 @@
            this.gridColumn19.Name = "gridColumn19";
            this.gridColumn19.Width = 94;
            // 
            // gridColumn20
            //
            this.gridColumn20.Caption = "源单";
            this.gridColumn20.FieldName = "fHasLinkTxt";
            this.gridColumn20.MinWidth = 25;
            this.gridColumn20.Name = "gridColumn20";
            this.gridColumn20.Visible = true;
            this.gridColumn20.VisibleIndex = 17;
            this.gridColumn20.Width = 94;
            //
            // pageBar1
            // 
            this.pageBar1.CurrentPage = 1;
@@ -541,10 +551,10 @@
            // layoutMx1
            // 
            this.layoutMx1.Controls.Add(this.lbGuid);
            this.layoutMx1.Controls.Add(this.txt_suppName);
            this.layoutMx1.Controls.Add(this.txt_depotName);
            this.layoutMx1.Controls.Add(this.txt_checkUser);
            this.layoutMx1.Controls.Add(this.txt_checkDate);
            this.layoutMx1.Controls.Add(this.txt_depotName);
            this.layoutMx1.Controls.Add(this.txt_suppName);
            this.layoutMx1.Controls.Add(this.txt_reason);
            this.layoutMx1.Controls.Add(this.txt_fmrmode);
            this.layoutMx1.Controls.Add(this.txt_itemOutNo);
@@ -575,14 +585,14 @@
            this.lbGuid.TabIndex = 527;
            this.lbGuid.Text = "lbGuid";
            // 
            // txt_suppName
            // txt_depotName
            // 
            this.txt_suppName.Location = new System.Drawing.Point(84, 70);
            this.txt_suppName.Name = "txt_suppName";
            this.txt_suppName.Properties.Appearance.Options.UseFont = true;
            this.txt_suppName.Size = new System.Drawing.Size(200, 24);
            this.txt_suppName.StyleController = this.layoutMx1;
            this.txt_suppName.TabIndex = 524;
            this.txt_depotName.Location = new System.Drawing.Point(84, 70);
            this.txt_depotName.Name = "txt_depotName";
            this.txt_depotName.Properties.Appearance.Options.UseFont = true;
            this.txt_depotName.Size = new System.Drawing.Size(200, 24);
            this.txt_depotName.StyleController = this.layoutMx1;
            this.txt_depotName.TabIndex = 524;
            // 
            // txt_checkUser
            // 
@@ -602,14 +612,14 @@
            this.txt_checkDate.StyleController = this.layoutMx1;
            this.txt_checkDate.TabIndex = 252;
            // 
            // txt_depotName
            // txt_suppName
            // 
            this.txt_depotName.Location = new System.Drawing.Point(84, 41);
            this.txt_depotName.Name = "txt_depotName";
            this.txt_depotName.Properties.Appearance.Options.UseFont = true;
            this.txt_depotName.Size = new System.Drawing.Size(200, 24);
            this.txt_depotName.StyleController = this.layoutMx1;
            this.txt_depotName.TabIndex = 523;
            this.txt_suppName.Location = new System.Drawing.Point(84, 41);
            this.txt_suppName.Name = "txt_suppName";
            this.txt_suppName.Properties.Appearance.Options.UseFont = true;
            this.txt_suppName.Size = new System.Drawing.Size(200, 24);
            this.txt_suppName.StyleController = this.layoutMx1;
            this.txt_suppName.TabIndex = 523;
            // 
            // txt_reason
            // 
@@ -783,7 +793,7 @@
            // 
            // layoutControlItem2
            // 
            this.layoutControlItem2.Control = this.txt_depotName;
            this.layoutControlItem2.Control = this.txt_suppName;
            this.layoutControlItem2.Location = new System.Drawing.Point(0, 29);
            this.layoutControlItem2.Name = "layoutControlItem2";
            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
@@ -802,7 +812,7 @@
            // 
            // layoutControlItem6
            // 
            this.layoutControlItem6.Control = this.txt_suppName;
            this.layoutControlItem6.Control = this.txt_depotName;
            this.layoutControlItem6.Location = new System.Drawing.Point(0, 58);
            this.layoutControlItem6.Name = "layoutControlItem6";
            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
@@ -1358,16 +1368,6 @@
            this.layoutControlItem4.Size = new System.Drawing.Size(138, 73);
            this.layoutControlItem4.TextSize = new System.Drawing.Size(50, 20);
            // 
            // gridColumn20
            //
            this.gridColumn20.Caption = "源单";
            this.gridColumn20.FieldName = "fHasLinkTxt";
            this.gridColumn20.MinWidth = 25;
            this.gridColumn20.Name = "gridColumn20";
            this.gridColumn20.Visible = true;
            this.gridColumn20.VisibleIndex = 17;
            this.gridColumn20.Width = 94;
            //
            // Frm_MesCgthSqDj
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1397,10 +1397,10 @@
            this.splitMx1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
            this.layoutMx1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_depotName.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_depotName.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_reason.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemOutNo.Properties)).EndInit();
@@ -1468,8 +1468,8 @@
        private DevExpress.XtraEditors.SplitContainerControl splitMx1;
        private DevExpress.XtraLayout.LayoutControl layoutMx1;
        private DevExpress.XtraLayout.LayoutControlGroup Root;
        private DevExpress.XtraEditors.TextEdit txt_suppName;
        private DevExpress.XtraEditors.TextEdit txt_depotName;
        private DevExpress.XtraEditors.TextEdit txt_suppName;
        private DevExpress.XtraEditors.ComboBoxEdit txt_fmrmode;
        private DevExpress.XtraEditors.ComboBoxEdit txt_reason;
        private DevExpress.XtraEditors.TextEdit txt_checkUser;
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
@@ -116,6 +116,7 @@
            {
                Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut, txt_yuliang_1);
            };
            this.ucBtnPrint1.SetPrintButton(false);
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
DevApp/Gs.DevApp/UserControl/UcBtnPrint.cs
@@ -128,6 +128,11 @@
            return false;
        }
        /// <summary>
        /// 设置批量按钮可见性
        /// </summary>
        /// <param name="blPiLiang"></param>
        public void SetPlButton(bool blPiLiang)
        {
            if (blPiLiang == true)
@@ -137,9 +142,22 @@
        }
        /// <summary>
        /// 设置确定按钮可见性
        /// </summary>
        /// <param name="blPiLiang"></param>
        public void SetPrintButton(bool blPiLiang)
        {
            if (blPiLiang == true)
                this.lay1.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
            else
                this.lay1.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
        }
        /// <summary>
        /// 
        /// </summary>
        private void _print() {
        private void _print()
        {
            var _bl = false;
            _bl = _ckRptService();
            if (_bl)
@@ -159,5 +177,6 @@
            }
            MsgHelper.ShowError("没有设计模板,请先设计模板!");
        }
    }
}