dev前台代码
上一版本: 89d64f80 | 补丁 | 提交 | 忽略空白
bug
lu
3 天以前 78ded57d2cf4fd2cc6ae731a625a4d6528bede49 
bug
已修改2个文件
106 ■■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs 100 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs


@@ -128,10 +128,8 @@


            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();


            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();


            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();


            this.lab_daa014 = new DevExpress.XtraLayout.LayoutControlItem();


            this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();


            this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();


            this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem();


            this.tabMx = new DevExpress.XtraTab.XtraTabControl();


            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();


            this.split99 = new DevExpress.XtraEditors.SplitContainerControl();


@@ -203,6 +201,8 @@


            this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.picCheckBox = new System.Windows.Forms.PictureBox();


            this.tips = new DevExpress.Utils.ToolTipController(this.components);


            this.lab_daa014 = new DevExpress.XtraLayout.LayoutControlItem();


            this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem();


            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();


            this.xtraTabControl1.SuspendLayout();


            this.xtraTabPage1.SuspendLayout();


@@ -259,10 +259,8 @@


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.lab_daa014)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();


            this.tabMx.SuspendLayout();


            this.tabMxPage1.SuspendLayout();


@@ -310,6 +308,8 @@


            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.lab_daa014)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit();


            this.SuspendLayout();


            // 


            // toolBarMenu1


@@ -716,7 +716,7 @@


            // btnSelect


            // 


            this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;


            this.btnSelect.Location = new System.Drawing.Point(12, 136);


            this.btnSelect.Location = new System.Drawing.Point(12, 131);


            this.btnSelect.Name = "btnSelect";


            this.btnSelect.Size = new System.Drawing.Size(96, 27);


            this.btnSelect.StyleController = this.layoutMx1;


@@ -726,7 +726,7 @@


            // txt_tbl023


            // 


            this.txt_tbl023.IsReadly = false;


            this.txt_tbl023.Location = new System.Drawing.Point(84, 43);


            this.txt_tbl023.Location = new System.Drawing.Point(84, 38);


            this.txt_tbl023.Name = "txt_tbl023";


            this.txt_tbl023.Size = new System.Drawing.Size(228, 24);


            this.txt_tbl023.TabIndex = 462;


@@ -734,7 +734,7 @@


            // txt_tbl005


            // 


            this.txt_tbl005.EditValue = "-请选择-";


            this.txt_tbl005.Location = new System.Drawing.Point(84, 105);


            this.txt_tbl005.Location = new System.Drawing.Point(84, 100);


            this.txt_tbl005.Name = "txt_tbl005";


            this.txt_tbl005.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {


            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});


@@ -750,7 +750,7 @@


            // 


            // txt_tbl006


            // 


            this.txt_tbl006.Location = new System.Drawing.Point(388, 105);


            this.txt_tbl006.Location = new System.Drawing.Point(388, 100);


            this.txt_tbl006.Name = "txt_tbl006";


            this.txt_tbl006.Properties.Appearance.Options.UseFont = true;


            this.txt_tbl006.Size = new System.Drawing.Size(228, 24);


@@ -761,14 +761,14 @@


            // 


            this.txt_tbl002.category = null;


            this.txt_tbl002.IsReadly = false;


            this.txt_tbl002.Location = new System.Drawing.Point(84, 74);


            this.txt_tbl002.Location = new System.Drawing.Point(84, 69);


            this.txt_tbl002.Name = "txt_tbl002";


            this.txt_tbl002.Size = new System.Drawing.Size(228, 24);


            this.txt_tbl002.TabIndex = 458;


            // 


            // txt_workName


            // 


            this.txt_workName.Location = new System.Drawing.Point(388, 43);


            this.txt_workName.Location = new System.Drawing.Point(388, 38);


            this.txt_workName.Name = "txt_workName";


            this.txt_workName.Properties.Appearance.Options.UseFont = true;


            this.txt_workName.Size = new System.Drawing.Size(228, 24);


@@ -778,7 +778,7 @@


            // 


            // txt_tbl012


            // 


            this.txt_tbl012.Location = new System.Drawing.Point(996, 43);


            this.txt_tbl012.Location = new System.Drawing.Point(996, 38);


            this.txt_tbl012.Name = "txt_tbl012";


            this.txt_tbl012.Properties.Appearance.Options.UseFont = true;


            this.txt_tbl012.Size = new System.Drawing.Size(229, 24);


@@ -788,7 +788,7 @@


            // 


            // txt_billNo


            // 


            this.txt_billNo.Location = new System.Drawing.Point(84, 12);


            this.txt_billNo.Location = new System.Drawing.Point(84, 7);


            this.txt_billNo.Name = "txt_billNo";


            this.txt_billNo.Properties.Appearance.Options.UseFont = true;


            this.txt_billNo.Size = new System.Drawing.Size(228, 24);


@@ -798,7 +798,7 @@


            // 


            // txt_rwd


            // 


            this.txt_rwd.Location = new System.Drawing.Point(388, 12);


            this.txt_rwd.Location = new System.Drawing.Point(388, 7);


            this.txt_rwd.Name = "txt_rwd";


            this.txt_rwd.Properties.Appearance.Options.UseFont = true;


            this.txt_rwd.Size = new System.Drawing.Size(228, 24);


@@ -808,7 +808,7 @@


            // 


            // txt_tbl011


            // 


            this.txt_tbl011.Location = new System.Drawing.Point(996, 12);


            this.txt_tbl011.Location = new System.Drawing.Point(996, 7);


            this.txt_tbl011.Name = "txt_tbl011";


            this.txt_tbl011.Properties.Appearance.Options.UseFont = true;


            this.txt_tbl011.Size = new System.Drawing.Size(229, 24);


@@ -818,7 +818,7 @@


            // 


            // txt_itemName


            // 


            this.txt_itemName.Location = new System.Drawing.Point(388, 74);


            this.txt_itemName.Location = new System.Drawing.Point(388, 69);


            this.txt_itemName.Name = "txt_itemName";


            this.txt_itemName.Properties.Appearance.Options.UseFont = true;


            this.txt_itemName.Size = new System.Drawing.Size(228, 24);


@@ -828,7 +828,7 @@


            // 


            // txt_tbl013


            // 


            this.txt_tbl013.Location = new System.Drawing.Point(924, 74);


            this.txt_tbl013.Location = new System.Drawing.Point(924, 69);


            this.txt_tbl013.Name = "txt_tbl013";


            this.txt_tbl013.Properties.Caption = "审核状态";


            this.txt_tbl013.RightToLeft = System.Windows.Forms.RightToLeft.No;


@@ -839,7 +839,7 @@


            // 


            // txt_tbl009


            // 


            this.txt_tbl009.Location = new System.Drawing.Point(692, 12);


            this.txt_tbl009.Location = new System.Drawing.Point(692, 7);


            this.txt_tbl009.Name = "txt_tbl009";


            this.txt_tbl009.Size = new System.Drawing.Size(228, 24);


            this.txt_tbl009.StyleController = this.layoutMx1;


@@ -848,7 +848,7 @@


            // 


            // txt_tbl010


            // 


            this.txt_tbl010.Location = new System.Drawing.Point(692, 43);


            this.txt_tbl010.Location = new System.Drawing.Point(692, 38);


            this.txt_tbl010.Name = "txt_tbl010";


            this.txt_tbl010.Size = new System.Drawing.Size(228, 24);


            this.txt_tbl010.StyleController = this.layoutMx1;


@@ -867,7 +867,7 @@


            // 


            // txt_itemNo


            // 


            this.txt_itemNo.Location = new System.Drawing.Point(692, 74);


            this.txt_itemNo.Location = new System.Drawing.Point(692, 69);


            this.txt_itemNo.Name = "txt_itemNo";


            this.txt_itemNo.Size = new System.Drawing.Size(228, 24);


            this.txt_itemNo.StyleController = this.layoutMx1;


@@ -885,7 +885,7 @@


            // 


            // txt_daa014


            // 


            this.txt_daa014.Location = new System.Drawing.Point(692, 105);


            this.txt_daa014.Location = new System.Drawing.Point(692, 131);


            this.txt_daa014.Name = "txt_daa014";


            this.txt_daa014.Size = new System.Drawing.Size(228, 24);


            this.txt_daa014.StyleController = this.layoutMx1;


@@ -894,7 +894,7 @@


            // 


            // txt_tbl026


            // 


            this.txt_tbl026.Location = new System.Drawing.Point(996, 105);


            this.txt_tbl026.Location = new System.Drawing.Point(996, 100);


            this.txt_tbl026.Name = "txt_tbl026";


            this.txt_tbl026.Size = new System.Drawing.Size(229, 24);


            this.txt_tbl026.StyleController = this.layoutMx1;


@@ -903,7 +903,7 @@


            // 


            // txt_tbl025


            // 


            this.txt_tbl025.Location = new System.Drawing.Point(996, 136);


            this.txt_tbl025.Location = new System.Drawing.Point(996, 131);


            this.txt_tbl025.Name = "txt_tbl025";


            this.txt_tbl025.Size = new System.Drawing.Size(229, 24);


            this.txt_tbl025.StyleController = this.layoutMx1;


@@ -912,8 +912,10 @@


            // 


            // txt_chkOut


            // 


            this.txt_chkOut.Location = new System.Drawing.Point(316, 136);


            this.txt_chkOut.Location = new System.Drawing.Point(620, 100);


            this.txt_chkOut.Name = "txt_chkOut";


            this.txt_chkOut.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;


            this.txt_chkOut.Properties.Appearance.Options.UseForeColor = true;


            this.txt_chkOut.Properties.Caption = "是否自动生成补料单";


            this.txt_chkOut.Size = new System.Drawing.Size(300, 24);


            this.txt_chkOut.StyleController = this.layoutMx1;


@@ -974,9 +976,9 @@


            this.layoutControlItem8,


            this.layoutControlItem6,


            this.layoutControlItem2,


            this.lab_daa014,


            this.layoutControlItem19,


            this.layoutControlItem20,


            this.lab_daa014,


            this.layoutControlItem34});


            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;


            this.Root.Name = "Root";


@@ -1173,17 +1175,6 @@


            this.layoutControlItem2.Text = "任务单号";


            this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);


            // 


            // lab_daa014


            // 


            this.lab_daa014.Control = this.txt_daa014;


            this.lab_daa014.Location = new System.Drawing.Point(608, 93);


            this.lab_daa014.Name = "lab_daa014";


            this.lab_daa014.OptionsTableLayoutItem.ColumnIndex = 2;


            this.lab_daa014.OptionsTableLayoutItem.RowIndex = 3;


            this.lab_daa014.Size = new System.Drawing.Size(304, 31);


            this.lab_daa014.Text = "投料单号";


            this.lab_daa014.TextSize = new System.Drawing.Size(60, 18);


            // 


            // layoutControlItem19


            // 


            this.layoutControlItem19.Control = this.txt_tbl026;


@@ -1205,17 +1196,6 @@


            this.layoutControlItem20.Size = new System.Drawing.Size(305, 31);


            this.layoutControlItem20.Text = "批准时间";


            this.layoutControlItem20.TextSize = new System.Drawing.Size(60, 18);


            // 


            // layoutControlItem34


            // 


            this.layoutControlItem34.Control = this.txt_chkOut;


            this.layoutControlItem34.Location = new System.Drawing.Point(304, 124);


            this.layoutControlItem34.Name = "layoutControlItem34";


            this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 1;


            this.layoutControlItem34.OptionsTableLayoutItem.RowIndex = 4;


            this.layoutControlItem34.Size = new System.Drawing.Size(304, 31);


            this.layoutControlItem34.TextSize = new System.Drawing.Size(0, 0);


            this.layoutControlItem34.TextVisible = false;


            // 


            // tabMx


            // 


@@ -2083,6 +2063,28 @@


            this.picCheckBox.TabStop = false;


            this.picCheckBox.Visible = false;


            // 


            // lab_daa014


            // 


            this.lab_daa014.Control = this.txt_daa014;


            this.lab_daa014.Location = new System.Drawing.Point(608, 124);


            this.lab_daa014.Name = "lab_daa014";


            this.lab_daa014.OptionsTableLayoutItem.ColumnIndex = 2;


            this.lab_daa014.OptionsTableLayoutItem.RowIndex = 4;


            this.lab_daa014.Size = new System.Drawing.Size(304, 31);


            this.lab_daa014.Text = "投料单号";


            this.lab_daa014.TextSize = new System.Drawing.Size(60, 18);


            // 


            // layoutControlItem34


            // 


            this.layoutControlItem34.Control = this.txt_chkOut;


            this.layoutControlItem34.Location = new System.Drawing.Point(608, 93);


            this.layoutControlItem34.Name = "layoutControlItem34";


            this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 2;


            this.layoutControlItem34.OptionsTableLayoutItem.RowIndex = 3;


            this.layoutControlItem34.Size = new System.Drawing.Size(304, 31);


            this.layoutControlItem34.TextSize = new System.Drawing.Size(0, 0);


            this.layoutControlItem34.TextVisible = false;


            // 


            // Frm_MesItemTbl


            // 


            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);


@@ -2149,10 +2151,8 @@


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.lab_daa014)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();


            this.tabMx.ResumeLayout(false);


            this.tabMxPage1.ResumeLayout(false);


@@ -2200,6 +2200,8 @@


            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.lab_daa014)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit();


            this.ResumeLayout(false);




        }


@@ -2310,7 +2312,6 @@


        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptBl;


        private DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit repositoryItemMemoEdit1;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;


        private DevExpress.XtraLayout.LayoutControlItem lab_daa014;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;


        private DevExpress.XtraEditors.TextEdit txt_tbl026;


        private DevExpress.XtraEditors.TextEdit txt_tbl025;


@@ -2347,6 +2348,7 @@


        private DevExpress.XtraEditors.LabelControl lbMxGuid;


        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33;


        private DevExpress.XtraEditors.CheckEdit txt_chkOut;


        private DevExpress.XtraLayout.LayoutControlItem lab_daa014;


        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34;


    }


}




 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs


@@ -441,6 +441,12 @@


                txt_tbl005.Focus();


                return;


            }


            if (string.IsNullOrEmpty(txt_tbl005.Text.Trim()))


            {


                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择原因！");


                txt_tbl005.Focus();


                return;


            }


            var _obj = new


            {


                guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //主建