From 74202f2545445ed080b3bd2536474b9661990378 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 29 十月 2024 14:28:11 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~tjx/GsMesClient

---
 DevApp/Gs.DevApp/Gs.DevApp.csproj |   69 ++++++++++++++++++++++++++++++++++
 1 files changed, 68 insertions(+), 1 deletions(-)

diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 3fb0f50..185da0a 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -229,6 +229,18 @@
     <Compile Include="DevFrm\QC\Frm_IQCLookups.Designer.cs">
       <DependentUpon>Frm_IQCLookups.cs</DependentUpon>
     </Compile>
+    <Compile Include="DevFrm\QC\Frm_MesQaItemsDetect01.Designer.cs">
+      <DependentUpon>Frm_MesQaItemsDetect01.cs</DependentUpon>
+    </Compile>
+    <Compile Include="DevFrm\QC\Frm_MesQaItemsDetect01.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\QC\Frm_MesQaMj.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\QC\Frm_MesQaMj.Designer.cs">
+      <DependentUpon>Frm_MesQaMj.cs</DependentUpon>
+    </Compile>
     <Compile Include="DevFrm\QC\Frm_MesQmAql1.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -247,6 +259,10 @@
     <Compile Include="DevFrm\QC\Frm_MesSysLookups.Designer.cs">
       <DependentUpon>Frm_MesSysLookups.cs</DependentUpon>
     </Compile>
+    <Compile Include="DevFrm\QC\Models\MesQaMj.cs" />
+    <Compile Include="DevFrm\QC\Models\MesQaItemsDetect01.cs" />
+    <Compile Include="DevFrm\QC\Models\MesQaItemsDetectDetail12.cs" />
+    <Compile Include="DevFrm\QC\Models\MesQaItemsDetectDetail5.cs" />
     <Compile Include="DevFrm\QC\Models\MesQmAql1.cs" />
     <Compile Include="DevFrm\QC\Models\MesQmAql2.cs" />
     <Compile Include="DevFrm\QC\Models\MesQmAql3.cs" />
@@ -382,6 +398,12 @@
     <Compile Include="UserControl\SelectCgMx.Designer.cs">
       <DependentUpon>SelectCgMx.cs</DependentUpon>
     </Compile>
+    <Compile Include="UserControl\SelectCheckDt.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="UserControl\SelectCheckDt.Designer.cs">
+      <DependentUpon>SelectCheckDt.cs</DependentUpon>
+    </Compile>
     <Compile Include="UserControl\ShowRptWizard.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -394,11 +416,23 @@
     <Compile Include="UserControl\UcComBox.Designer.cs">
       <DependentUpon>UcComBox.cs</DependentUpon>
     </Compile>
+    <Compile Include="UserControl\UcLoading.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="UserControl\UcLoading.Designer.cs">
+      <DependentUpon>UcLoading.cs</DependentUpon>
+    </Compile>
     <Compile Include="UserControl\UcLookCk.cs">
       <SubType>UserControl</SubType>
     </Compile>
     <Compile Include="UserControl\UcLookCk.Designer.cs">
       <DependentUpon>UcLookCk.cs</DependentUpon>
+    </Compile>
+    <Compile Include="UserControl\UcLookItems.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="UserControl\UcLookItems.Designer.cs">
+      <DependentUpon>UcLookItems.cs</DependentUpon>
     </Compile>
     <Compile Include="UserControl\UcLookSupplier.cs">
       <SubType>UserControl</SubType>
@@ -429,6 +463,12 @@
     </Compile>
     <Compile Include="UserControl\UcToolBarMenu.Designer.cs">
       <DependentUpon>UcToolBarMenu.cs</DependentUpon>
+    </Compile>
+    <Compile Include="UserControl\XtraUserControl1.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="UserControl\XtraUserControl1.Designer.cs">
+      <DependentUpon>XtraUserControl1.cs</DependentUpon>
     </Compile>
     <EmbeddedResource Include="DevFrm\BasicData\Frm_Customer.resx">
       <DependentUpon>Frm_Customer.cs</DependentUpon>
@@ -468,6 +508,12 @@
     </EmbeddedResource>
     <EmbeddedResource Include="DevFrm\QC\Frm_IQCLookups.resx">
       <DependentUpon>Frm_IQCLookups.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\QC\Frm_MesQaItemsDetect01.resx">
+      <DependentUpon>Frm_MesQaItemsDetect01.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\QC\Frm_MesQaMj.resx">
+      <DependentUpon>Frm_MesQaMj.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="DevFrm\QC\Frm_MesQmAql1.resx">
       <DependentUpon>Frm_MesQmAql1.cs</DependentUpon>
@@ -524,8 +570,8 @@
     <EmbeddedResource Include="Properties\licenses.licx" />
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
       <SubType>Designer</SubType>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
     <EmbeddedResource Include="TestForm\XtraForm1.resx">
       <DependentUpon>XtraForm1.cs</DependentUpon>
@@ -533,14 +579,23 @@
     <EmbeddedResource Include="UserControl\SelectCgMx.resx">
       <DependentUpon>SelectCgMx.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="UserControl\SelectCheckDt.resx">
+      <DependentUpon>SelectCheckDt.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="UserControl\ShowRptWizard.resx">
       <DependentUpon>ShowRptWizard.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="UserControl\UcComBox.resx">
       <DependentUpon>UcComBox.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="UserControl\UcLoading.resx">
+      <DependentUpon>UcLoading.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="UserControl\UcLookCk.resx">
       <DependentUpon>UcLookCk.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="UserControl\UcLookItems.resx">
+      <DependentUpon>UcLookItems.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="UserControl\UcLookSupplier.resx">
       <DependentUpon>UcLookSupplier.cs</DependentUpon>
@@ -556,6 +611,9 @@
     </EmbeddedResource>
     <EmbeddedResource Include="UserControl\UcToolBarMenu.resx">
       <DependentUpon>UcToolBarMenu.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="UserControl\XtraUserControl1.resx">
+      <DependentUpon>XtraUserControl1.cs</DependentUpon>
     </EmbeddedResource>
     <None Include="App.config" />
     <None Include="packages.config" />
@@ -652,6 +710,15 @@
     <None Include="Resources\lookup&amp;reference_16x16.png" />
     <None Include="Resources\task_16x16.png" />
     <None Include="Resources\checkbuttons_16x161.png" />
+    <None Include="Resources\boposition2_32x32.png" />
+    <None Include="Resources\boposition2_16x161.png" />
+    <None Include="Resources\ide_16x16.png" />
+    <None Include="Resources\spellcheck_16x16.png" />
+    <None Include="Resources\clearformatting_16x16.png" />
+    <None Include="Resources\sortandfilter_16x16.png" />
+    <Compile Include="DevFrm\QC\Models\MesQaItemsDetect01.cs" />
+    <Compile Include="DevFrm\QC\Models\MesQaItemsDetectDetail12.cs" />
+    <Compile Include="DevFrm\QC\Models\MesQaItemsDetectDetail5.cs" />
     <Content Include="Resources\user_16x16.png" />
   </ItemGroup>
   <ItemGroup />

--
Gitblit v1.9.3