dev前台代码
上一版本: 0cdc5148 | 补丁 | 提交 | 忽略空白
lu
2025-11-08 14ff395602c2c76825a3078446a1a17e46ccb3f9 
其它入库单推送报表
已修改4个文件
已添加1个文件
326 ■■■■■ 文件已修改
DevApp/Gs.DevApp/App.config 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.cs 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rpt/UcRptQtrkdj.Designer.cs 179 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rpt/UcRptQtrkdj.resx 123 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Gs.DevApp.csproj 3 ●●●●● 补丁 | 查看 | 原始文档 | 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/Rk/Frm_MesItemQtrkDj.cs


@@ -81,12 +81,17 @@


        /// <param name="e"></param>


        private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)


        {


            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;


            gridView1.ActiveFilter.Clear();


            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;


            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);


            frm.UpdateParent += Frm_UpdateParent;


            frm.ShowDialog();


            if (xtraTabControl1.SelectedTabPageIndex == 0)


            {


                gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;


                gridView1.ActiveFilter.Clear();


                gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;


                var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);


                frm.UpdateParent += Frm_UpdateParent;


                frm.ShowDialog();


                return;


            }


            ucRptQtrkdj1.ToolBarMenu1_btnQueryClick(sender, e);


        }


        /// <summary>


        /// æŸ¥è¯¢å›žè°ƒ




 DevApp/Gs.DevApp/DevFrm/Rpt/UcRptQtrkdj.Designer.cs


@@ -32,7 +32,7 @@


            this.gcMain1Report = new DevExpress.XtraGrid.GridControl();


            this.gridView1Report = new DevExpress.XtraGrid.Views.Grid.GridView();


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


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


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


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


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


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


@@ -43,16 +43,11 @@


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


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


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


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


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


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


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


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


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


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


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


            this.pageBar1 = new UserControls.Data.UcPageBar();


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


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


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


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


            this.SuspendLayout();


@@ -73,7 +68,7 @@


            this.gridView1Report.Appearance.Row.Options.UseFont = true;


            this.gridView1Report.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {


            this.gv_guid,


            this.gv_itemId,


            this.gridColumn12,


            this.gridColumn3,


            this.gridColumn2,


            this.gridColumn4,


@@ -84,14 +79,9 @@


            this.gv_depotSectionsCode,


            this.gv_ownerType,


            this.gv_ownerId,


            this.gridColumn5,


            this.gv_indepUserCode,


            this.gv_indepDate,


            this.gridColumn7,


            this.gridColumn8,


            this.gridColumn9,


            this.gridColumn10,


            this.gridColumn11});


            this.gridColumn5});


            this.gridView1Report.GridControl = this.gcMain1Report;


            this.gridView1Report.IndicatorWidth = 50;


            this.gridView1Report.Name = "gridView1Report";


@@ -103,7 +93,7 @@


            // gv_guid


            // 


            this.gv_guid.AppearanceCell.Options.UseFont = true;


            this.gv_guid.Caption = "主键GUID";


            this.gv_guid.Caption = "明细表主键GUID";


            this.gv_guid.FieldName = "guid";


            this.gv_guid.MinWidth = 50;


            this.gv_guid.Name = "gv_guid";


@@ -111,16 +101,13 @@


            this.gv_guid.Tag = "query_a.guid";


            this.gv_guid.Width = 94;


            // 


            // gv_itemId


            // gridColumn12


            // 


            this.gv_itemId.AppearanceCell.Options.UseFont = true;


            this.gv_itemId.Caption = "物料ID ";


            this.gv_itemId.FieldName = "itemId";


            this.gv_itemId.MinWidth = 50;


            this.gv_itemId.Name = "gv_itemId";


            this.gv_itemId.OptionsColumn.AllowEdit = false;


            this.gv_itemId.Tag = "query_a.ITEM_ID";


            this.gv_itemId.Width = 73;


            this.gridColumn12.Caption = "主表主键";


            this.gridColumn12.FieldName = "hGuid";


            this.gridColumn12.MinWidth = 25;


            this.gridColumn12.Name = "gridColumn12";


            this.gridColumn12.Width = 94;


            // 


            // gridColumn3


            // 


@@ -129,7 +116,7 @@


            this.gridColumn3.MinWidth = 25;


            this.gridColumn3.Name = "gridColumn3";


            this.gridColumn3.Visible = true;


            this.gridColumn3.VisibleIndex = 6;


            this.gridColumn3.VisibleIndex = 2;


            this.gridColumn3.Width = 74;


            // 


            // gridColumn2


@@ -139,7 +126,7 @@


            this.gridColumn2.MinWidth = 25;


            this.gridColumn2.Name = "gridColumn2";


            this.gridColumn2.Visible = true;


            this.gridColumn2.VisibleIndex = 7;


            this.gridColumn2.VisibleIndex = 3;


            this.gridColumn2.Width = 74;


            // 


            // gridColumn4


@@ -149,7 +136,7 @@


            this.gridColumn4.MinWidth = 25;


            this.gridColumn4.Name = "gridColumn4";


            this.gridColumn4.Visible = true;


            this.gridColumn4.VisibleIndex = 9;


            this.gridColumn4.VisibleIndex = 4;


            this.gridColumn4.Width = 74;


            // 


            // gv_quantity


@@ -159,169 +146,126 @@


            this.gv_quantity.AppearanceCell.Options.UseForeColor = true;


            this.gv_quantity.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;


            this.gv_quantity.AppearanceHeader.Options.UseForeColor = true;


            this.gv_quantity.Caption = "收料数量 ";


            this.gv_quantity.FieldName = "quantity";


            this.gv_quantity.Caption = "入库数量 ";


            this.gv_quantity.FieldName = "rkQty";


            this.gv_quantity.MinWidth = 50;


            this.gv_quantity.Name = "gv_quantity";


            this.gv_quantity.OptionsColumn.AllowEdit = false;


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


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


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


            this.gv_quantity.Tag = "query_a.QUANTITY";


            this.gv_quantity.Visible = true;


            this.gv_quantity.VisibleIndex = 2;


            this.gv_quantity.VisibleIndex = 5;


            this.gv_quantity.Width = 74;


            // 


            // gv_depotId


            // 


            this.gv_depotId.AppearanceCell.Options.UseFont = true;


            this.gv_depotId.Caption = "检验状态";


            this.gv_depotId.Caption = "单据状态";


            this.gv_depotId.FieldName = "txtColor";


            this.gv_depotId.MinWidth = 50;


            this.gv_depotId.Name = "gv_depotId";


            this.gv_depotId.OptionsColumn.AllowEdit = false;


            this.gv_depotId.Tag = "query_a.DEPOT_ID";


            this.gv_depotId.Visible = true;


            this.gv_depotId.VisibleIndex = 4;


            this.gv_depotId.VisibleIndex = 0;


            this.gv_depotId.Width = 73;


            // 


            // gridColumn6


            // 


            this.gridColumn6.Caption = "检验结果";


            this.gridColumn6.FieldName = "checkRes";


            this.gridColumn6.Caption = "主单据原因";


            this.gridColumn6.FieldName = "zbyy";


            this.gridColumn6.MinWidth = 25;


            this.gridColumn6.Name = "gridColumn6";


            this.gridColumn6.Visible = true;


            this.gridColumn6.VisibleIndex = 5;


            this.gridColumn6.VisibleIndex = 9;


            this.gridColumn6.Width = 74;


            // 


            // gridColumn1


            // 


            this.gridColumn1.Caption = "退货";


            this.gridColumn1.FieldName = "returnFlag";


            this.gridColumn1.Caption = "明细原因";


            this.gridColumn1.FieldName = "mxyy";


            this.gridColumn1.MinWidth = 25;


            this.gridColumn1.Name = "gridColumn1";


            this.gridColumn1.Visible = true;


            this.gridColumn1.VisibleIndex = 13;


            this.gridColumn1.VisibleIndex = 10;


            this.gridColumn1.Width = 74;


            // 


            // gv_depotSectionsCode


            // 


            this.gv_depotSectionsCode.AppearanceCell.Options.UseFont = true;


            this.gv_depotSectionsCode.Caption = "急料";


            this.gv_depotSectionsCode.FieldName = "urgentFlagTxt";


            this.gv_depotSectionsCode.Caption = "仓库";


            this.gv_depotSectionsCode.FieldName = "ckName";


            this.gv_depotSectionsCode.MinWidth = 50;


            this.gv_depotSectionsCode.Name = "gv_depotSectionsCode";


            this.gv_depotSectionsCode.OptionsColumn.AllowEdit = false;


            this.gv_depotSectionsCode.Tag = "query_a.DEPOT_SECTIONS_CODE";


            this.gv_depotSectionsCode.Visible = true;


            this.gv_depotSectionsCode.VisibleIndex = 10;


            this.gv_depotSectionsCode.VisibleIndex = 6;


            this.gv_depotSectionsCode.Width = 74;


            // 


            // gv_ownerType


            // 


            this.gv_ownerType.AppearanceCell.Options.UseFont = true;


            this.gv_ownerType.Caption = "收料组织";


            this.gv_ownerType.FieldName = "receivingOrg";


            this.gv_ownerType.Caption = "库存组织";


            this.gv_ownerType.FieldName = "kcOrg";


            this.gv_ownerType.MinWidth = 50;


            this.gv_ownerType.Name = "gv_ownerType";


            this.gv_ownerType.OptionsColumn.AllowEdit = false;


            this.gv_ownerType.Tag = "query_a.Owner_Type";


            this.gv_ownerType.Visible = true;


            this.gv_ownerType.VisibleIndex = 17;


            this.gv_ownerType.VisibleIndex = 11;


            this.gv_ownerType.Width = 74;


            // 


            // gv_ownerId


            // 


            this.gv_ownerId.AppearanceCell.Options.UseFont = true;


            this.gv_ownerId.Caption = "采购单号";


            this.gv_ownerId.FieldName = "ebeln";


            this.gv_ownerId.Caption = "入库单号";


            this.gv_ownerId.FieldName = "billNo";


            this.gv_ownerId.MinWidth = 50;


            this.gv_ownerId.Name = "gv_ownerId";


            this.gv_ownerId.OptionsColumn.AllowEdit = false;


            this.gv_ownerId.Tag = "query_a.Owner_Id";


            this.gv_ownerId.Visible = true;


            this.gv_ownerId.VisibleIndex = 0;


            this.gv_ownerId.VisibleIndex = 1;


            this.gv_ownerId.Width = 74;


            // 


            // gridColumn5


            // 


            this.gridColumn5.Caption = "到货单号";


            this.gridColumn5.FieldName = "dhdNo";


            this.gridColumn5.MinWidth = 25;


            this.gridColumn5.Name = "gridColumn5";


            this.gridColumn5.Visible = true;


            this.gridColumn5.VisibleIndex = 1;


            this.gridColumn5.Width = 74;


            // 


            // gv_indepUserCode


            // 


            this.gv_indepUserCode.AppearanceCell.Options.UseFont = true;


            this.gv_indepUserCode.Caption = "收货人";


            this.gv_indepUserCode.FieldName = "dhdUser";


            this.gv_indepUserCode.Caption = "入库人";


            this.gv_indepUserCode.FieldName = "userName";


            this.gv_indepUserCode.MinWidth = 50;


            this.gv_indepUserCode.Name = "gv_indepUserCode";


            this.gv_indepUserCode.OptionsColumn.AllowEdit = false;


            this.gv_indepUserCode.Tag = "query_a.INDEP_USER_CODE";


            this.gv_indepUserCode.Visible = true;


            this.gv_indepUserCode.VisibleIndex = 11;


            this.gv_indepUserCode.VisibleIndex = 7;


            this.gv_indepUserCode.Width = 74;


            // 


            // gv_indepDate


            // 


            this.gv_indepDate.AppearanceCell.Options.UseFont = true;


            this.gv_indepDate.Caption = "收货日期 ";


            this.gv_indepDate.FieldName = "dhdDate";


            this.gv_indepDate.Caption = "入库日期 ";


            this.gv_indepDate.FieldName = "createDate";


            this.gv_indepDate.MinWidth = 10;


            this.gv_indepDate.Name = "gv_indepDate";


            this.gv_indepDate.OptionsColumn.AllowEdit = false;


            this.gv_indepDate.Tag = "query_a.INDEP_DATE";


            this.gv_indepDate.Visible = true;


            this.gv_indepDate.VisibleIndex = 12;


            this.gv_indepDate.VisibleIndex = 8;


            this.gv_indepDate.Width = 80;


            // 


            // gridColumn7


            // gridColumn5


            // 


            this.gridColumn7.AppearanceCell.ForeColor = System.Drawing.Color.Blue;


            this.gridColumn7.AppearanceCell.Options.UseForeColor = true;


            this.gridColumn7.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;


            this.gridColumn7.AppearanceHeader.Options.UseForeColor = true;


            this.gridColumn7.Caption = "收料备注";


            this.gridColumn7.FieldName = "memo";


            this.gridColumn7.MinWidth = 25;


            this.gridColumn7.Name = "gridColumn7";


            this.gridColumn7.Visible = true;


            this.gridColumn7.VisibleIndex = 3;


            this.gridColumn7.Width = 77;


            // 


            // gridColumn8


            // 


            this.gridColumn8.Caption = "OA处理意见";


            this.gridColumn8.FieldName = "clyj";


            this.gridColumn8.MinWidth = 25;


            this.gridColumn8.Name = "gridColumn8";


            this.gridColumn8.Visible = true;


            this.gridColumn8.VisibleIndex = 14;


            this.gridColumn8.Width = 77;


            // 


            // gridColumn9


            // 


            this.gridColumn9.Caption = "OA挑选数量";


            this.gridColumn9.FieldName = "txsl";


            this.gridColumn9.MinWidth = 25;


            this.gridColumn9.Name = "gridColumn9";


            this.gridColumn9.Visible = true;


            this.gridColumn9.VisibleIndex = 15;


            this.gridColumn9.Width = 77;


            // 


            // gridColumn10


            // 


            this.gridColumn10.Caption = "OA选别类别";


            this.gridColumn10.FieldName = "xblb";


            this.gridColumn10.MinWidth = 25;


            this.gridColumn10.Name = "gridColumn10";


            this.gridColumn10.Visible = true;


            this.gridColumn10.VisibleIndex = 16;


            this.gridColumn10.Width = 88;


            this.gridColumn5.Caption = "物料ID";


            this.gridColumn5.FieldName = "itemId";


            this.gridColumn5.MinWidth = 25;


            this.gridColumn5.Name = "gridColumn5";


            this.gridColumn5.OptionsEditForm.Visible = DevExpress.Utils.DefaultBoolean.False;


            this.gridColumn5.Visible = true;


            this.gridColumn5.VisibleIndex = 12;


            this.gridColumn5.Width = 94;


            // 


            // pageBar1


            // 


@@ -335,23 +279,13 @@


            this.pageBar1.TabIndex = 4;


            this.pageBar1.TotalPages = 0;


            // 


            // gridColumn11


            // 


            this.gridColumn11.Caption = "供应商";


            this.gridColumn11.FieldName = "gysName";


            this.gridColumn11.MinWidth = 25;


            this.gridColumn11.Name = "gridColumn11";


            this.gridColumn11.Visible = true;


            this.gridColumn11.VisibleIndex = 8;


            this.gridColumn11.Width = 94;


            // 


            // UcRptCgdhd


            // UcRptQtrkdj


            // 


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


            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;


            this.Controls.Add(this.gcMain1Report);


            this.Controls.Add(this.pageBar1);


            this.Name = "UcRptCgdhd";


            this.Name = "UcRptQtrkdj";


            this.Size = new System.Drawing.Size(1339, 682);


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


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


@@ -362,7 +296,6 @@


        private DevExpress.XtraGrid.GridControl gcMain1Report;


        private DevExpress.XtraGrid.Views.Grid.GridView gridView1Report;


        private DevExpress.XtraGrid.Columns.GridColumn gv_guid;


        private DevExpress.XtraGrid.Columns.GridColumn gv_itemId;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;


@@ -373,15 +306,11 @@


        private DevExpress.XtraGrid.Columns.GridColumn gv_depotSectionsCode;


        private DevExpress.XtraGrid.Columns.GridColumn gv_ownerType;


        private DevExpress.XtraGrid.Columns.GridColumn gv_ownerId;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;


        private DevExpress.XtraGrid.Columns.GridColumn gv_indepUserCode;


        private DevExpress.XtraGrid.Columns.GridColumn gv_indepDate;


        private UserControls.Data.UcPageBar pageBar1;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;


        private DevExpress.Utils.ToolTipController tips;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;


    }


}




 DevApp/Gs.DevApp/DevFrm/Rpt/UcRptQtrkdj.resx


¶Ô±ÈÐÂÎļþ


@@ -0,0 +1,123 @@


<?xml version="1.0" encoding="utf-8"?>


<root>


  <!-- 


    Microsoft ResX Schema 


    


    Version 2.0


    


    The primary goals of this format is to allow a simple XML format 


    that is mostly human readable. The generation and parsing of the 


    various data types are done through the TypeConverter classes 


    associated with the data types.


    


    Example:


    


    ... ado.net/XML headers & schema ...


    <resheader name="resmimetype">text/microsoft-resx</resheader>


    <resheader name="version">2.0</resheader>


    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>


    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>


    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>


    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>


    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">


        <value>[base64 mime encoded serialized .NET Framework object]</value>


    </data>


    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">


        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>


        <comment>This is a comment</comment>


    </data>


                


    There are any number of "resheader" rows that contain simple 


    name/value pairs.


    


    Each data row contains a name, and value. The row also contains a 


    type or mimetype. Type corresponds to a .NET class that support 


    text/value conversion through the TypeConverter architecture. 


    Classes that don't support this are serialized and stored with the 


    mimetype set.


    


    The mimetype is used for serialized objects, and tells the 


    ResXResourceReader how to depersist the object. This is currently not 


    extensible. For a given mimetype the value must be set accordingly:


    


    Note - application/x-microsoft.net.object.binary.base64 is the format 


    that the ResXResourceWriter will generate, however the reader can 


    read any of the formats listed below.


    


    mimetype: application/x-microsoft.net.object.binary.base64


    value   : The object must be serialized with 


            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter


            : and then encoded with base64 encoding.


    


    mimetype: application/x-microsoft.net.object.soap.base64


    value   : The object must be serialized with 


            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter


            : and then encoded with base64 encoding.




    mimetype: application/x-microsoft.net.object.bytearray.base64


    value   : The object must be serialized into a byte array 


            : using a System.ComponentModel.TypeConverter


            : and then encoded with base64 encoding.


    -->


  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">


    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />


    <xsd:element name="root" msdata:IsDataSet="true">


      <xsd:complexType>


        <xsd:choice maxOccurs="unbounded">


          <xsd:element name="metadata">


            <xsd:complexType>


              <xsd:sequence>


                <xsd:element name="value" type="xsd:string" minOccurs="0" />


              </xsd:sequence>


              <xsd:attribute name="name" use="required" type="xsd:string" />


              <xsd:attribute name="type" type="xsd:string" />


              <xsd:attribute name="mimetype" type="xsd:string" />


              <xsd:attribute ref="xml:space" />


            </xsd:complexType>


          </xsd:element>


          <xsd:element name="assembly">


            <xsd:complexType>


              <xsd:attribute name="alias" type="xsd:string" />


              <xsd:attribute name="name" type="xsd:string" />


            </xsd:complexType>


          </xsd:element>


          <xsd:element name="data">


            <xsd:complexType>


              <xsd:sequence>


                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />


                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />


              </xsd:sequence>


              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />


              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />


              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />


              <xsd:attribute ref="xml:space" />


            </xsd:complexType>


          </xsd:element>


          <xsd:element name="resheader">


            <xsd:complexType>


              <xsd:sequence>


                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />


              </xsd:sequence>


              <xsd:attribute name="name" type="xsd:string" use="required" />


            </xsd:complexType>


          </xsd:element>


        </xsd:choice>


      </xsd:complexType>


    </xsd:element>


  </xsd:schema>


  <resheader name="resmimetype">


    <value>text/microsoft-resx</value>


  </resheader>


  <resheader name="version">


    <value>2.0</value>


  </resheader>


  <resheader name="reader">


    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>


  </resheader>


  <resheader name="writer">


    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>


  </resheader>


  <metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">


    <value>17, 17</value>


  </metadata>


</root>




 DevApp/Gs.DevApp/Gs.DevApp.csproj


@@ -2015,6 +2015,9 @@


    <EmbeddedResource Include="DevFrm\Rpt\UcRptCgdhdPrint.resx">


      <DependentUpon>UcRptCgdhdPrint.cs</DependentUpon>


    </EmbeddedResource>


    <EmbeddedResource Include="DevFrm\Rpt\UcRptQtrkdj.resx">


      <DependentUpon>UcRptQtrkdj.cs</DependentUpon>


    </EmbeddedResource>


    <EmbeddedResource Include="DevFrm\Rpt\WomShjh.resx">


      <DependentUpon>WomShjh.cs</DependentUpon>


    </EmbeddedResource>