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

lu

2025-09-05 550cb6847bf4c8586bd5430b10ac9d25e8469f5a

 DevApp/Gs.DevApp/Gs.DevApp.csproj

@@ -509,6 +509,12 @@
    <Compile Include="DevFrm\PDA\SelectItem.Designer.cs">
      <DependentUpon>SelectItem.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\PDA\SelectKW.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\PDA\SelectKW.Designer.cs">
      <DependentUpon>SelectKW.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\PDA\SelectLine.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -758,6 +764,12 @@
    <Compile Include="DevFrm\Rpt\Ckcgmx.Designer.cs">
      <DependentUpon>Ckcgmx.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Rpt\CkKuCun.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\Rpt\CkKuCun.Designer.cs">
      <DependentUpon>CkKuCun.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Rpt\CKTmkc.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -847,6 +859,12 @@
    </Compile>
    <Compile Include="DevFrm\Sales\Frm_SalesReturnNoticeSelect.Designer.cs">
      <DependentUpon>Frm_SalesReturnNoticeSelect.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Sales\Frm_SalesReturnNoticeSelect2.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\Sales\Frm_SalesReturnNoticeSelect2.Designer.cs">
      <DependentUpon>Frm_SalesReturnNoticeSelect2.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Sales\Frm_SalesReturnNoticeSelectLink.cs">
      <SubType>Form</SubType>
@@ -1153,6 +1171,12 @@
      <AutoGen>True</AutoGen>
      <DesignTime>True</DesignTime>
      <DependentUpon>Resources.resx</DependentUpon>
    </Compile>
    <Compile Include="UserControl\CopyXls.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="UserControl\CopyXls.Designer.cs">
      <DependentUpon>CopyXls.cs</DependentUpon>
    </Compile>
    <Compile Include="UserControl\SelectCk.cs">
      <SubType>Form</SubType>
@@ -1732,6 +1756,9 @@
    <EmbeddedResource Include="DevFrm\PDA\SelectItem.resx">
      <DependentUpon>SelectItem.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\PDA\SelectKW.resx">
      <DependentUpon>SelectKW.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\PDA\SelectLine.resx">
      <DependentUpon>SelectLine.cs</DependentUpon>
    </EmbeddedResource>
@@ -1828,6 +1855,9 @@
    <EmbeddedResource Include="DevFrm\Rpt\Ckcgmx.resx">
      <DependentUpon>Ckcgmx.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Rpt\CkKuCun.resx">
      <DependentUpon>CkKuCun.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Rpt\CKTmkc.resx">
      <DependentUpon>CKTmkc.cs</DependentUpon>
    </EmbeddedResource>
@@ -1872,6 +1902,12 @@
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Sales\Frm_SalesReturnNoticeSelect.resx">
      <DependentUpon>Frm_SalesReturnNoticeSelect.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Sales\Frm_SalesReturnNoticeSelect2.resx">
      <DependentUpon>Frm_SalesReturnNoticeSelect2.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Sales\Frm_SalesReturnNoticeSelectLink.resx">
      <DependentUpon>Frm_SalesReturnNoticeSelectLink.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Sys\EasyRptEdt.resx">
      <DependentUpon>EasyRptEdt.cs</DependentUpon>
@@ -2015,6 +2051,9 @@
    <EmbeddedResource Include="DevFrm\WW\showWwZhongTai.resx">
      <DependentUpon>showWwZhongTai.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\CopyXls.resx">
      <DependentUpon>CopyXls.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\SelectCk.resx">
      <DependentUpon>SelectCk.cs</DependentUpon>
    </EmbeddedResource>