dev前台代码
上一版本: 9702c6a4 | 补丁 | 提交 | 忽略空白
bug
lu
2 天以前 8a7bc73b5ac40d26ec72a5df94ca15c5a2976af0 
bug
已修改2个文件
163 ■■■■■ 文件已修改
DevApp/Gs.DevApp/App.config 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs 159 ●●●●● 补丁 | 查看 | 原始文档 | 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/Warehouse/Frm_ArrivalBarcode.Designer.cs


@@ -30,23 +30,23 @@


        private void InitializeComponent()


        {


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


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


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


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


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


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


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


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


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


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


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


            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 rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();


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


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


            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.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();


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


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


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


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


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


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


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


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


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


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


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


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


@@ -717,29 +717,29 @@


            this.layoutControlItem12});


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


            this.Root.Name = "Root";


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


            columnDefinition11.Width = 100D;


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


            columnDefinition12.Width = 100D;


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


            columnDefinition13.Width = 100D;


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


            columnDefinition14.Width = 100D;


            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;


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


            columnDefinition11,


            columnDefinition12,


            columnDefinition13,


            columnDefinition14});


            rowDefinition8.Height = 100D;


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


            rowDefinition9.Height = 100D;


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


            rowDefinition10.Height = 100D;


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


            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;


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


            rowDefinition8,


            rowDefinition9,


            rowDefinition10});


            rowDefinition1,


            rowDefinition2,


            rowDefinition3});


            this.Root.Size = new System.Drawing.Size(1323, 104);


            this.Root.TextVisible = false;


            // 


@@ -918,7 +918,7 @@


            // 


            this.layoutControl1.Controls.Add(this.txt_iCount_1);


            this.layoutControl1.Controls.Add(this.txt_yuliang_1);


            this.layoutControl1.Location = new System.Drawing.Point(692, 75);


            this.layoutControl1.Location = new System.Drawing.Point(692, 76);


            this.layoutControl1.Name = "layoutControl1";


            this.layoutControl1.Root = this.layoutControlGroup2;


            this.layoutControl1.Size = new System.Drawing.Size(336, 28);


@@ -956,17 +956,17 @@


            this.layoutControlItem27});


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


            this.layoutControlGroup2.Name = "layoutControlGroup2";


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


            columnDefinition15.Width = 100D;


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


            columnDefinition16.Width = 100D;


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


            columnDefinition5.Width = 100D;


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


            columnDefinition6.Width = 100D;


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


            columnDefinition15,


            columnDefinition16});


            rowDefinition11.Height = 100D;


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


            columnDefinition5,


            columnDefinition6});


            rowDefinition4.Height = 100D;


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


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


            rowDefinition11});


            rowDefinition4});


            this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);


            this.layoutControlGroup2.Size = new System.Drawing.Size(336, 28);


            this.layoutControlGroup2.TextVisible = false;


@@ -1004,7 +1004,7 @@


            // 


            this.ucBtnPrint1.allClickKey = null;


            this.ucBtnPrint1.guidKey = null;


            this.ucBtnPrint1.Location = new System.Drawing.Point(1030, 41);


            this.ucBtnPrint1.Location = new System.Drawing.Point(1030, 42);


            this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);


            this.ucBtnPrint1.Name = "ucBtnPrint1";


            this.ucBtnPrint1.rptParameter = "rpt_daa";


@@ -1013,7 +1013,7 @@


            // 


            // radOut


            // 


            this.radOut.Location = new System.Drawing.Point(1030, 9);


            this.radOut.Location = new System.Drawing.Point(1030, 10);


            this.radOut.Margin = new System.Windows.Forms.Padding(0);


            this.radOut.Name = "radOut";


            this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;


@@ -1028,7 +1028,7 @@


            // 


            // txt_psnQty_1


            // 


            this.txt_psnQty_1.Location = new System.Drawing.Point(794, 43);


            this.txt_psnQty_1.Location = new System.Drawing.Point(794, 44);


            this.txt_psnQty_1.Name = "txt_psnQty_1";


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


            this.txt_psnQty_1.Properties.UseMaskAsDisplayFormat = true;


@@ -1040,7 +1040,7 @@


            // 


            // txtWlid


            // 


            this.txtWlid.Location = new System.Drawing.Point(114, 11);


            this.txtWlid.Location = new System.Drawing.Point(114, 12);


            this.txtWlid.Name = "txtWlid";


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


            this.txtWlid.Properties.ReadOnly = true;


@@ -1050,7 +1050,7 @@


            // 


            // txtWlmc


            // 


            this.txtWlmc.Location = new System.Drawing.Point(114, 43);


            this.txtWlmc.Location = new System.Drawing.Point(114, 44);


            this.txtWlmc.Name = "txtWlmc";


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


            this.txtWlmc.Properties.ReadOnly = true;


@@ -1060,7 +1060,7 @@


            // 


            // txtWlgg


            // 


            this.txtWlgg.Location = new System.Drawing.Point(114, 75);


            this.txtWlgg.Location = new System.Drawing.Point(114, 76);


            this.txtWlgg.Name = "txtWlgg";


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


            this.txtWlgg.Properties.ReadOnly = true;


@@ -1070,7 +1070,7 @@


            // 


            // txt_kQty


            // 


            this.txt_kQty.Location = new System.Drawing.Point(794, 11);


            this.txt_kQty.Location = new System.Drawing.Point(794, 12);


            this.txt_kQty.Name = "txt_kQty";


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


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


@@ -1082,7 +1082,7 @@


            // 


            // txtQuantity


            // 


            this.txtQuantity.Location = new System.Drawing.Point(454, 11);


            this.txtQuantity.Location = new System.Drawing.Point(454, 12);


            this.txtQuantity.Name = "txtQuantity";


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


            this.txtQuantity.Properties.ReadOnly = true;


@@ -1092,7 +1092,7 @@


            // 


            // txt_yQty


            // 


            this.txt_yQty.Location = new System.Drawing.Point(454, 43);


            this.txt_yQty.Location = new System.Drawing.Point(454, 44);


            this.txt_yQty.Name = "txt_yQty";


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


            this.txt_yQty.Properties.ReadOnly = true;


@@ -1129,29 +1129,29 @@


            this.layoutControlItem25});


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


            this.layoutControlGroup1.Name = "Root";


            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;


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


            columnDefinition7.Width = 100D;


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


            columnDefinition8.Width = 100D;


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


            columnDefinition9.Width = 100D;


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


            columnDefinition10.Width = 100D;


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


            columnDefinition17,


            columnDefinition18,


            columnDefinition19,


            columnDefinition20});


            rowDefinition12.Height = 100D;


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


            rowDefinition13.Height = 100D;


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


            rowDefinition14.Height = 100D;


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


            columnDefinition7,


            columnDefinition8,


            columnDefinition9,


            columnDefinition10});


            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;


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


            rowDefinition12,


            rowDefinition13,


            rowDefinition14});


            rowDefinition5,


            rowDefinition6,


            rowDefinition7});


            this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 116);


            this.layoutControlGroup1.TextVisible = false;


            // 


@@ -1546,6 +1546,7 @@


            this.gvMx2.Name = "gvMx2";


            this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;


            this.gvMx2.OptionsFind.ShowSearchNavButtons = false;


            this.gvMx2.OptionsView.ShowFooter = true;


            this.gvMx2.OptionsView.ShowGroupPanel = false;


            // 


            // gvMx2guid


@@ -1620,6 +1621,8 @@


            this.gvMx2oldqty.FieldName = "quantity";


            this.gvMx2oldqty.MinWidth = 50;


            this.gvMx2oldqty.Name = "gvMx2oldqty";


            this.gvMx2oldqty.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {


            new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "quantity", "合计={0:0.##}")});


            this.gvMx2oldqty.Tag = "query_a.OLDQTY";


            this.gvMx2oldqty.Visible = true;


            this.gvMx2oldqty.VisibleIndex = 5;