dev前台代码
上一版本: 114e86b4 | 补丁 | 提交 | 忽略空白
lg
2 天以前 84ef268f9151b0da348c550744390534d803cba5 
生产任务单显示erpId
已修改2个文件
146 ■■■■■ 文件已修改
DevApp/Gs.DevApp/App.config 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs 142 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 DevApp/Gs.DevApp/App.config


@@ -37,8 +37,8 @@




    <appSettings>


        <!--<add key="webapiurl" value="http://localhost:5263/" />-->


        <add key="WebApiUrl" value="http://192.168.1.145:8081/" />


        <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />-->


        <!--<add key="WebApiUrl" value="http://192.168.1.145:8081/" />-->


        <add key="WebApiUrl" value="http://192.168.1.145:81/" />


        <add key="LogPath" value="logs" />


        <add key="ProductName" value="G-MES V2.0" />


        <add key="PageSize" value="50" />




 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs


@@ -30,22 +30,22 @@


        private void InitializeComponent()


        {


            this.components = new System.ComponentModel.Container();


            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();


            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();


            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();


            DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();


            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();


            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();


            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();


            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();


            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();


            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();


            DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();


            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();


            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();


            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();


            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();


            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();


            DevExpress.XtraLayout.ColumnDefinition columnDefinition17 = new DevExpress.XtraLayout.ColumnDefinition();


            DevExpress.XtraLayout.ColumnDefinition columnDefinition18 = new DevExpress.XtraLayout.ColumnDefinition();


            DevExpress.XtraLayout.ColumnDefinition columnDefinition19 = new DevExpress.XtraLayout.ColumnDefinition();


            DevExpress.XtraLayout.ColumnDefinition columnDefinition20 = new DevExpress.XtraLayout.ColumnDefinition();


            DevExpress.XtraLayout.RowDefinition rowDefinition29 = new DevExpress.XtraLayout.RowDefinition();


            DevExpress.XtraLayout.RowDefinition rowDefinition30 = new DevExpress.XtraLayout.RowDefinition();


            DevExpress.XtraLayout.RowDefinition rowDefinition31 = new DevExpress.XtraLayout.RowDefinition();


            DevExpress.XtraLayout.RowDefinition rowDefinition32 = new DevExpress.XtraLayout.RowDefinition();


            DevExpress.XtraLayout.RowDefinition rowDefinition33 = new DevExpress.XtraLayout.RowDefinition();


            DevExpress.XtraLayout.RowDefinition rowDefinition34 = new DevExpress.XtraLayout.RowDefinition();


            DevExpress.XtraLayout.RowDefinition rowDefinition35 = new DevExpress.XtraLayout.RowDefinition();


            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions5 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();


            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject17 = new DevExpress.Utils.SerializableAppearanceObject();


            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject18 = new DevExpress.Utils.SerializableAppearanceObject();


            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject19 = new DevExpress.Utils.SerializableAppearanceObject();


            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject20 = new DevExpress.Utils.SerializableAppearanceObject();


            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();


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


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


@@ -202,6 +202,8 @@


            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();


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


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


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


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


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


            this.xtraTabControl1.SuspendLayout();


            this.xtraTabPage1.SuspendLayout();


@@ -696,7 +698,7 @@


            this.gridColumn23.MinWidth = 25;


            this.gridColumn23.Name = "gridColumn23";


            this.gridColumn23.Visible = true;


            this.gridColumn23.VisibleIndex = 18;


            this.gridColumn23.VisibleIndex = 19;


            this.gridColumn23.Width = 94;


            // 


            // gridColumn24


@@ -746,7 +748,7 @@


            this.gridColumn31.MinWidth = 25;


            this.gridColumn31.Name = "gridColumn31";


            this.gridColumn31.Visible = true;


            this.gridColumn31.VisibleIndex = 19;


            this.gridColumn31.VisibleIndex = 20;


            this.gridColumn31.Width = 94;


            // 


            // gridColumn32


@@ -755,6 +757,8 @@


            this.gridColumn32.FieldName = "erpid";


            this.gridColumn32.MinWidth = 25;


            this.gridColumn32.Name = "gridColumn32";


            this.gridColumn32.Visible = true;


            this.gridColumn32.VisibleIndex = 18;


            this.gridColumn32.Width = 94;


            // 


            // gridColumn33


@@ -796,7 +800,7 @@


            this.gridColumn38.MinWidth = 25;


            this.gridColumn38.Name = "gridColumn38";


            this.gridColumn38.Visible = true;


            this.gridColumn38.VisibleIndex = 20;


            this.gridColumn38.VisibleIndex = 21;


            this.gridColumn38.Width = 94;


            // 


            // gridColumn39


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


            this.gridColumn30.MinWidth = 25;


            this.gridColumn30.Name = "gridColumn30";


            this.gridColumn30.Visible = true;


            this.gridColumn30.VisibleIndex = 21;


            this.gridColumn30.VisibleIndex = 22;


            this.gridColumn30.Width = 94;


            // 


            // gridColumn34


@@ -1351,41 +1355,41 @@


            this.layoutControlItem23});


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


            this.Root.Name = "Root";


            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;


            columnDefinition1.Width = 100D;


            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;


            columnDefinition2.Width = 100D;


            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;


            columnDefinition3.Width = 100D;


            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;


            columnDefinition4.Width = 100D;


            columnDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;


            columnDefinition17.Width = 100D;


            columnDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;


            columnDefinition18.Width = 100D;


            columnDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;


            columnDefinition19.Width = 100D;


            columnDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;


            columnDefinition20.Width = 100D;


            this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {


            columnDefinition1,


            columnDefinition2,


            columnDefinition3,


            columnDefinition4});


            rowDefinition1.Height = 100D;


            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;


            rowDefinition2.Height = 100D;


            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;


            rowDefinition3.Height = 100D;


            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;


            rowDefinition4.Height = 100D;


            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;


            rowDefinition5.Height = 100D;


            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;


            rowDefinition6.Height = 100D;


            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;


            rowDefinition7.Height = 100D;


            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;


            columnDefinition17,


            columnDefinition18,


            columnDefinition19,


            columnDefinition20});


            rowDefinition29.Height = 100D;


            rowDefinition29.SizeType = System.Windows.Forms.SizeType.Percent;


            rowDefinition30.Height = 100D;


            rowDefinition30.SizeType = System.Windows.Forms.SizeType.Percent;


            rowDefinition31.Height = 100D;


            rowDefinition31.SizeType = System.Windows.Forms.SizeType.Percent;


            rowDefinition32.Height = 100D;


            rowDefinition32.SizeType = System.Windows.Forms.SizeType.Percent;


            rowDefinition33.Height = 100D;


            rowDefinition33.SizeType = System.Windows.Forms.SizeType.Percent;


            rowDefinition34.Height = 100D;


            rowDefinition34.SizeType = System.Windows.Forms.SizeType.Percent;


            rowDefinition35.Height = 100D;


            rowDefinition35.SizeType = System.Windows.Forms.SizeType.Percent;


            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {


            rowDefinition1,


            rowDefinition2,


            rowDefinition3,


            rowDefinition4,


            rowDefinition5,


            rowDefinition6,


            rowDefinition7});


            rowDefinition29,


            rowDefinition30,


            rowDefinition31,


            rowDefinition32,


            rowDefinition33,


            rowDefinition34,


            rowDefinition35});


            this.Root.Size = new System.Drawing.Size(1464, 221);


            this.Root.TextVisible = false;


            // 


@@ -1741,7 +1745,9 @@


            this.gridColumn18,


            this.gridColumn40,


            this.gridColumn42,


            this.gridColumn43});


            this.gridColumn43,


            this.gridColumn41,


            this.gridColumn44});


            this.gvMx1.GridControl = this.gcMx1;


            this.gvMx1.Name = "gvMx1";


            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;


@@ -2060,10 +2066,10 @@


            // repositoryItemButtonEdit1


            // 


            this.repositoryItemButtonEdit1.AutoHeight = false;


            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.bouser_16x16;


            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;


            editorButtonImageOptions5.Image = global::Gs.DevApp.Properties.Resources.bouser_16x16;


            editorButtonImageOptions5.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;


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


            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "解锁", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});


            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "解锁", -1, true, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});


            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";


            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;


            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);


@@ -2077,6 +2083,26 @@


            this.gridColumn43.Visible = true;


            this.gridColumn43.VisibleIndex = 1;


            this.gridColumn43.Width = 94;


            // 


            // gridColumn41


            // 


            this.gridColumn41.Caption = "Erp行ID";


            this.gridColumn41.FieldName = "eid";


            this.gridColumn41.MinWidth = 25;


            this.gridColumn41.Name = "gridColumn41";


            this.gridColumn41.Visible = true;


            this.gridColumn41.VisibleIndex = 26;


            this.gridColumn41.Width = 94;


            // 


            // gridColumn44


            // 


            this.gridColumn44.Caption = "Erp头ID";


            this.gridColumn44.FieldName = "pid";


            this.gridColumn44.MinWidth = 25;


            this.gridColumn44.Name = "gridColumn44";


            this.gridColumn44.Visible = true;


            this.gridColumn44.VisibleIndex = 27;


            this.gridColumn44.Width = 94;


            // 


            // Frm_Womcaa


            // 


@@ -2342,5 +2368,7 @@


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn42;


        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn43;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn41;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn44;


    }


}