111

jinghuanzhang

2023-04-05 85f4b040cf6b6b622b18a2890de6e7a7ba988cef

111

 BaseSet/BaseSet.csproj

@@ -71,10 +71,10 @@
    <Compile Include="Form1.Designer.cs">
      <DependentUpon>Form1.cs</DependentUpon>
    </Compile>
    <Compile Include="Gy_ORGANIZATIONS.cs">
    <Compile Include="公用基础资料\Gy_ORGANIZATIONS.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="Gy_ORGANIZATIONS.designer.cs">
    <Compile Include="公用基础资料\Gy_ORGANIZATIONS.designer.cs">
      <DependentUpon>Gy_ORGANIZATIONS.cs</DependentUpon>
    </Compile>
    <Compile Include="Program.cs" />
@@ -82,7 +82,7 @@
    <EmbeddedResource Include="Form1.resx">
      <DependentUpon>Form1.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="Gy_ORGANIZATIONS.resx">
    <EmbeddedResource Include="公用基础资料\Gy_ORGANIZATIONS.resx">
      <DependentUpon>Gy_ORGANIZATIONS.cs</DependentUpon>
      <SubType>Designer</SubType>
    </EmbeddedResource>

 BaseSet/¹«Óûù´¡×ÊÁÏ/Gy_ORGANIZATIONS.cs

File was renamed from BaseSet/Gy_ORGANIZATIONS.cs
@@ -441,18 +441,18 @@
            //    return false;
            //}
            //审核代码是否合理
            if (!DBUtility.ClsPub.AllowNumber(txtHNumber.Text.Trim()))
            {
                MessageBox.Show("代码中不能出现连续‘.’并且首位末位不能为‘.’！", "提示");
                return false;
            }
            //if (!DBUtility.ClsPub.AllowNumber(txtHNumber.Text.Trim()))
            //{
            //    MessageBox.Show("代码中不能出现连续‘.’并且首位末位不能为‘.’！", "提示");
            //    return false;
            //}

            //是否重复代码
            if (oDept.HavSameNumber(HItemID, txtHNumber.Text.Trim()))
            {
                MessageBox.Show("代码重复！", "提示");
                return false;
            }
            ////是否重复代码
            //if (oDept.HavSameNumber(HItemID, txtHNumber.Text.Trim()))
            //{
            //    MessageBox.Show("代码重复！", "提示");
            //    return false;
            //}
            return true;
        }

@@ -498,7 +498,7 @@
            //}
            //得到短代码
            string sShortNumber;
            sShortNumber = DBUtility.ClsPub.GetShortNumber(txtHNumber.Text.Trim());
            sShortNumber =  txtHNumber.Text.Trim() ;
            if (sShortNumber.Trim() == "")
            {
                return false;

 BaseSet/¹«Óûù´¡×ÊÁÏ/Gy_ORGANIZATIONS.designer.cs

 BaseSet/¹«Óûù´¡×ÊÁÏ/Gy_ORGANIZATIONS.resx