~tjx/GsMesClient.git

2024-10-25 d40c0bc5756470a1a57793373a9461f7d7ebb9ba

修改bug

已修改6个文件

	DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.Designer.cs	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.resx	38 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.Designer.cs	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.cs	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.resx	38 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.Designer.cs

@@ -198,11 +198,11 @@
            this.toolBarMenu1.isSetBtn = false;
            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
            this.toolBarMenu1.Name = "toolBarMenu1";
            
            this.toolBarMenu1.rptParameter = null;
            this.toolBarMenu1.Size = new System.Drawing.Size(1139, 80);
            this.toolBarMenu1.TabIndex = 0;
            this.toolBarMenu1.xlsInService = null;
           
            this.toolBarMenu1.xlsOutParameter = "xlsOut_holiday{}";
            // 
            // gcMain
            // 
@@ -320,7 +320,7 @@
            this.xtraTabPage2.Controls.Add(this.panel1);
            this.xtraTabPage2.Name = "xtraTabPage2";
            this.xtraTabPage2.PageEnabled = false;
            this.xtraTabPage2.Size = new System.Drawing.Size(479, 384);
            this.xtraTabPage2.Size = new System.Drawing.Size(1137, 384);
            this.xtraTabPage2.Text = "数据编辑";
            // 
            // panel1

 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs

@@ -365,7 +365,7 @@
                var dt = dd.rtnData.list;
                txt_workshopNo.Properties.DataSource = dt;
                txt_workshopNo.Properties.DisplayMember = "name"; // 显示的列
                txt_workshopNo.Properties.ValueMember = "itemNo"; // 实际值的列
                txt_workshopNo.Properties.ValueMember = "workshopNo"; // 实际值的列
                txt_workshopNo.Properties.TextEditStyle =
                    TextEditStyles.DisableTextEditor;
            }

 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.resx

@@ -59,8 +59,7 @@
              : using a System.ComponentModel.TypeConverter
              : and then encoded with base64 encoding.
      -->
    <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root"
                xmlns="">
  <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>
@@ -68,11 +67,9 @@
                    <xsd:element name="metadata">
                        <xsd:complexType>
                            <xsd:sequence>
                                <xsd:element name="value" type="xsd:string"
                                             minOccurs="0"/>
                <xsd:element name="value" type="xsd:string" minOccurs="0" />
                            </xsd:sequence>
                            <xsd:attribute name="name" use="required"
                                           type="xsd:string"/>
              <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"/>
@@ -87,28 +84,21 @@
                    <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: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 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:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
                            </xsd:sequence>
                            <xsd:attribute name="name" type="xsd:string"
                                           use="required"/>
              <xsd:attribute name="name" type="xsd:string" use="required" />
                        </xsd:complexType>
                    </xsd:element>
                </xsd:choice>
@@ -122,13 +112,9 @@
        <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>
    <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>
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
    </resheader>
</root>

 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.Designer.cs

@@ -1110,11 +1110,11 @@
            this.toolBarMenu1.isSetBtn = false;
            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
            this.toolBarMenu1.Name = "toolBarMenu1";
            
            this.toolBarMenu1.rptParameter = null;
            this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
            this.toolBarMenu1.TabIndex = 0;
            this.toolBarMenu1.xlsInService = null;
           
            this.toolBarMenu1.xlsInService = "xlsOut_depots{}";
            this.toolBarMenu1.xlsOutParameter = null;
            // 
            // gcMain
            // 

 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.cs

@@ -392,6 +392,11 @@
                var mxGuid = dr["guid"].ToString();
                if (!MsgHelper.AskQuestion("你选择了1条数据，确定删除吗？"))
                    return;
                if (string.IsNullOrEmpty(mxGuid))
                {
                    gvMx1.DeleteRow(rowhandle);
                    return;
                }
                var strJson = "";
                var lst = new List<string>();
                lst.Add(mxGuid);

 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.resx

@@ -59,8 +59,7 @@
              : using a System.ComponentModel.TypeConverter
              : and then encoded with base64 encoding.
      -->
    <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root"
                xmlns="">
  <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>
@@ -68,11 +67,9 @@
                    <xsd:element name="metadata">
                        <xsd:complexType>
                            <xsd:sequence>
                                <xsd:element name="value" type="xsd:string"
                                             minOccurs="0"/>
                <xsd:element name="value" type="xsd:string" minOccurs="0" />
                            </xsd:sequence>
                            <xsd:attribute name="name" use="required"
                                           type="xsd:string"/>
              <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"/>
@@ -87,28 +84,21 @@
                    <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: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 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:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
                            </xsd:sequence>
                            <xsd:attribute name="name" type="xsd:string"
                                           use="required"/>
              <xsd:attribute name="name" type="xsd:string" use="required" />
                        </xsd:complexType>
                    </xsd:element>
                </xsd:choice>
@@ -122,13 +112,9 @@
        <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>
    <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>
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
    </resheader>
</root>

			@@ -198,11 +198,11 @@
			this.toolBarMenu1.isSetBtn = false;
			this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
			this.toolBarMenu1.Name = "toolBarMenu1";

			this.toolBarMenu1.rptParameter = null;
			this.toolBarMenu1.Size = new System.Drawing.Size(1139, 80);
			this.toolBarMenu1.TabIndex = 0;
			this.toolBarMenu1.xlsInService = null;

			this.toolBarMenu1.xlsOutParameter = "xlsOut_holiday{}";
			//
			// gcMain
			//
			@@ -320,7 +320,7 @@
			this.xtraTabPage2.Controls.Add(this.panel1);
			this.xtraTabPage2.Name = "xtraTabPage2";
			this.xtraTabPage2.PageEnabled = false;
			this.xtraTabPage2.Size = new System.Drawing.Size(479, 384);
			this.xtraTabPage2.Size = new System.Drawing.Size(1137, 384);
			this.xtraTabPage2.Text = "数据编辑";
			//
			// panel1

			@@ -365,7 +365,7 @@
			var dt = dd.rtnData.list;
			txt_workshopNo.Properties.DataSource = dt;
			txt_workshopNo.Properties.DisplayMember = "name"; // 显示的列
			txt_workshopNo.Properties.ValueMember = "itemNo"; // 实际值的列
			txt_workshopNo.Properties.ValueMember = "workshopNo"; // 实际值的列
			txt_workshopNo.Properties.TextEditStyle =
			TextEditStyles.DisableTextEditor;
			}

			@@ -59,8 +59,7 @@
			: using a System.ComponentModel.TypeConverter
			: and then encoded with base64 encoding.
			-->
			<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root"
			xmlns="">
			<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>
			@@ -68,11 +67,9 @@
			<xsd:element name="metadata">
			<xsd:complexType>
			<xsd:sequence>
			<xsd:element name="value" type="xsd:string"
			minOccurs="0"/>
			<xsd:element name="value" type="xsd:string" minOccurs="0" />
			</xsd:sequence>
			<xsd:attribute name="name" use="required"
			type="xsd:string"/>
			<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"/>
			@@ -87,28 +84,21 @@
			<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: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 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:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
			</xsd:sequence>
			<xsd:attribute name="name" type="xsd:string"
			use="required"/>
			<xsd:attribute name="name" type="xsd:string" use="required" />
			</xsd:complexType>
			</xsd:element>
			</xsd:choice>
			@@ -122,13 +112,9 @@
			<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>
			<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>
			<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
			</resheader>
			</root>

			@@ -1110,11 +1110,11 @@
			this.toolBarMenu1.isSetBtn = false;
			this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
			this.toolBarMenu1.Name = "toolBarMenu1";

			this.toolBarMenu1.rptParameter = null;
			this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
			this.toolBarMenu1.TabIndex = 0;
			this.toolBarMenu1.xlsInService = null;

			this.toolBarMenu1.xlsInService = "xlsOut_depots{}";
			this.toolBarMenu1.xlsOutParameter = null;
			//
			// gcMain
			//

			@@ -392,6 +392,11 @@
			var mxGuid = dr["guid"].ToString();
			if (!MsgHelper.AskQuestion("你选择了1条数据，确定删除吗？"))
			return;
			if (string.IsNullOrEmpty(mxGuid))
			{
			gvMx1.DeleteRow(rowhandle);
			return;
			}
			var strJson = "";
			var lst = new List<string>();
			lst.Add(mxGuid);