Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

lu

2025-08-22 555986b6d59f85869a31d376f13b522b2c699ed0

 DevApp/Gs.DevApp/Gs.DevApp.csproj

@@ -353,6 +353,12 @@
    <Compile Include="DevFrm\FQC\Frm_FqcDetect01.Designer.cs">
      <DependentUpon>Frm_FqcDetect01.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\FQC\Frm_FQCItem.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\FQC\Frm_FQCItem.Designer.cs">
      <DependentUpon>Frm_FQCItem.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\FQC\MesFqcExceptional.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -526,6 +532,12 @@
    </Compile>
    <Compile Include="DevFrm\PDA\SelectUser.Designer.cs">
      <DependentUpon>SelectUser.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\PDA\SelectZZ.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\PDA\SelectZZ.Designer.cs">
      <DependentUpon>SelectZZ.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\QC\DefectCode.cs">
      <SubType>UserControl</SubType>
@@ -734,6 +746,12 @@
    <Compile Include="DevFrm\Rk\HistoryDhmxcs.Designer.cs">
      <DependentUpon>HistoryDhmxcs.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Rpt\BTDetails.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\Rpt\BTDetails.Designer.cs">
      <DependentUpon>BTDetails.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Rpt\Ckcgmx.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -758,6 +776,12 @@
    <Compile Include="DevFrm\Rpt\Frm_MesQL.Designer.cs">
      <DependentUpon>Frm_MesQL.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Rpt\ItemQL.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\Rpt\ItemQL.Designer.cs">
      <DependentUpon>ItemQL.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Rpt\QLCX.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -775,6 +799,12 @@
    </Compile>
    <Compile Include="DevFrm\Rpt\WomShjhShow.Designer.cs">
      <DependentUpon>WomShjhShow.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Rpt\WOTraceCodes.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\Rpt\WOTraceCodes.Designer.cs">
      <DependentUpon>WOTraceCodes.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Sales\Frm_SalesDeliverDj.cs">
      <SubType>Form</SubType>
@@ -1083,12 +1113,6 @@
    <Compile Include="DevFrm\Work\Frm_Work01.Designer.cs">
      <DependentUpon>Frm_Work01.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Work\Frm_Work09.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\Work\Frm_Work09.Designer.cs">
      <DependentUpon>Frm_Work09.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Work\Frm_WorkProcesses.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -1119,18 +1143,10 @@
    <Compile Include="DevFrm\WW\showWwZhongTai.Designer.cs">
      <DependentUpon>showWwZhongTai.cs</DependentUpon>
    </Compile>
    <Compile Include="test\LoggerHelper.cs" />
    <Compile Include="Properties\Resources.Designer.cs">
      <AutoGen>True</AutoGen>
      <DesignTime>True</DesignTime>
      <DependentUpon>Resources.resx</DependentUpon>
    </Compile>
    <Compile Include="test\SQLHelper.cs" />
    <Compile Include="test\MainForm.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="test\MainForm.Designer.cs">
      <DependentUpon>MainForm.cs</DependentUpon>
    </Compile>
    <Compile Include="UserControl\SelectCk.cs">
      <SubType>Form</SubType>
@@ -1538,12 +1554,6 @@
    <Compile Include="XtraForm1.Designer.cs">
      <DependentUpon>XtraForm1.cs</DependentUpon>
    </Compile>
    <Compile Include="XtraForm2.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="XtraForm2.Designer.cs">
      <DependentUpon>XtraForm2.cs</DependentUpon>
    </Compile>
    <EmbeddedResource Include="DevFrm\BasicData\Frm_Customer.resx">
      <DependentUpon>Frm_Customer.cs</DependentUpon>
    </EmbeddedResource>
@@ -1624,6 +1634,9 @@
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\FQC\Frm_FqcDetect01.resx">
      <DependentUpon>Frm_FqcDetect01.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\FQC\Frm_FQCItem.resx">
      <DependentUpon>Frm_FQCItem.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\FQC\MesFqcExceptional.resx">
      <DependentUpon>MesFqcExceptional.cs</DependentUpon>
@@ -1788,6 +1801,9 @@
    <EmbeddedResource Include="DevFrm\Rk\HistoryDhmxcs.resx">
      <DependentUpon>HistoryDhmxcs.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Rpt\BTDetails.resx">
      <DependentUpon>BTDetails.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Rpt\Ckcgmx.resx">
      <DependentUpon>Ckcgmx.cs</DependentUpon>
    </EmbeddedResource>
@@ -1800,6 +1816,9 @@
    <EmbeddedResource Include="DevFrm\Rpt\Frm_MesQL.resx">
      <DependentUpon>Frm_MesQL.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Rpt\ItemQL.resx">
      <DependentUpon>ItemQL.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Rpt\QLCX.resx">
      <DependentUpon>QLCX.cs</DependentUpon>
    </EmbeddedResource>
@@ -1808,6 +1827,9 @@
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Rpt\WomShjhShow.resx">
      <DependentUpon>WomShjhShow.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Rpt\WOTraceCodes.resx">
      <DependentUpon>WOTraceCodes.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Sales\Frm_SalesDeliverDj.resx">
      <DependentUpon>Frm_SalesDeliverDj.cs</DependentUpon>
@@ -1953,9 +1975,6 @@
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Work\Frm_Work01.resx">
      <DependentUpon>Frm_Work01.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Work\Frm_Work09.resx">
      <DependentUpon>Frm_Work09.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Work\Frm_WorkProcesses.resx">
      <DependentUpon>Frm_WorkProcesses.cs</DependentUpon>
@@ -2172,9 +2191,6 @@
    </EmbeddedResource>
    <EmbeddedResource Include="XtraForm1.resx">
      <DependentUpon>XtraForm1.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="XtraForm2.resx">
      <DependentUpon>XtraForm2.cs</DependentUpon>
    </EmbeddedResource>
    <None Include="App.config" />
    <None Include="packages.config" />