From b0cebba8ea5393c5de74f4b09078f7a4d3d3e8cf Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 13 十二月 2024 10:38:09 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/Gs.DevApp.csproj | 106 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 88 insertions(+), 18 deletions(-)
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 0230a99..7a78a04 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -162,6 +162,7 @@
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
</Reference>
+ <Reference Include="System.Web" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Xaml" />
<Reference Include="System.Xml.Linq" />
@@ -247,6 +248,18 @@
<Compile Include="DevFrm\QC\Frm_IQCLookups.Designer.cs">
<DependentUpon>Frm_IQCLookups.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\QC\Frm_MesDefectCode.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\QC\Frm_MesDefectCode.Designer.cs">
+ <DependentUpon>Frm_MesDefectCode.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\QC\Frm_MesDefectType.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\QC\Frm_MesDefectType.Designer.cs">
+ <DependentUpon>Frm_MesDefectType.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\QC\Frm_MesQaItemsDetect01.Designer.cs">
<DependentUpon>Frm_MesQaItemsDetect01.cs</DependentUpon>
</Compile>
@@ -283,6 +296,8 @@
<Compile Include="DevFrm\QC\Frm_MesSysLookups.Designer.cs">
<DependentUpon>Frm_MesSysLookups.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\QC\Models\MesDefectCode.cs" />
+ <Compile Include="DevFrm\QC\Models\MesDefectType.cs" />
<Compile Include="DevFrm\QC\Models\MesQaItemsDetect01.cs" />
<Compile Include="DevFrm\QC\Models\MesQaItemsDetectDetail12.cs" />
<Compile Include="DevFrm\QC\Models\MesQaItemsDetectDetail5.cs" />
@@ -355,6 +370,20 @@
<Compile Include="DevFrm\Sys\Frm_MesSysPageview.Designer.cs">
<DependentUpon>Frm_MesSysPageview.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\Sys\Frm_PrintInfo.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Sys\Frm_PrintInfo.Designer.cs">
+ <DependentUpon>Frm_PrintInfo.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\Sys\Frm_PrintUser.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Sys\Frm_PrintUser.Designer.cs">
+ <DependentUpon>Frm_PrintUser.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\Sys\Mode\PrintInfo.cs" />
+ <Compile Include="DevFrm\Sys\Mode\PrintUser.cs" />
<Compile Include="DevFrm\Sys\SysHelp.cs">
<SubType>Form</SubType>
</Compile>
@@ -576,17 +605,17 @@
<Compile Include="UserControl\ShowUp.Designer.cs">
<DependentUpon>ShowUp.cs</DependentUpon>
</Compile>
+ <Compile Include="UserControl\showZhongTai.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="UserControl\showZhongTai.Designer.cs">
+ <DependentUpon>showZhongTai.cs</DependentUpon>
+ </Compile>
<Compile Include="UserControl\UcComBox.cs">
<SubType>UserControl</SubType>
</Compile>
<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>
@@ -600,6 +629,18 @@
<Compile Include="UserControl\UcLookCustomer.Designer.cs">
<DependentUpon>UcLookCustomer.cs</DependentUpon>
</Compile>
+ <Compile Include="UserControl\UcLookDefectType.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="UserControl\UcLookDefectType.Designer.cs">
+ <DependentUpon>UcLookDefectType.cs</DependentUpon>
+ </Compile>
+ <Compile Include="UserControl\UcLookDepartment.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="UserControl\UcLookDepartment.Designer.cs">
+ <DependentUpon>UcLookDepartment.cs</DependentUpon>
+ </Compile>
<Compile Include="UserControl\UcLookItems.cs">
<SubType>UserControl</SubType>
</Compile>
@@ -611,6 +652,12 @@
</Compile>
<Compile Include="UserControl\UcLookOrg.Designer.cs">
<DependentUpon>UcLookOrg.cs</DependentUpon>
+ </Compile>
+ <Compile Include="UserControl\UcLookPrint.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="UserControl\UcLookPrint.Designer.cs">
+ <DependentUpon>UcLookPrint.cs</DependentUpon>
</Compile>
<Compile Include="UserControl\UcLookStaff.cs">
<SubType>UserControl</SubType>
@@ -630,6 +677,12 @@
<Compile Include="UserControl\UcLookUnit.Designer.cs">
<DependentUpon>UcLookUnit.cs</DependentUpon>
</Compile>
+ <Compile Include="UserControl\UcLookUser.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="UserControl\UcLookUser.Designer.cs">
+ <DependentUpon>UcLookUser.cs</DependentUpon>
+ </Compile>
<Compile Include="UserControl\UcLookWorkline.cs">
<SubType>UserControl</SubType>
</Compile>
@@ -647,12 +700,6 @@
</Compile>
<Compile Include="UserControl\UcPageBar.Designer.cs">
<DependentUpon>UcPageBar.cs</DependentUpon>
- </Compile>
- <Compile Include="UserControl\ShowDialogForm.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="UserControl\ShowDialogForm.designer.cs">
- <DependentUpon>ShowDialogForm.cs</DependentUpon>
</Compile>
<Compile Include="UserControl\ShowFilter.cs">
<SubType>Form</SubType>
@@ -714,6 +761,12 @@
<EmbeddedResource Include="DevFrm\QC\Frm_IQCLookups.resx">
<DependentUpon>Frm_IQCLookups.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\QC\Frm_MesDefectCode.resx">
+ <DependentUpon>Frm_MesDefectCode.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\QC\Frm_MesDefectType.resx">
+ <DependentUpon>Frm_MesDefectType.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\QC\Frm_MesQaItemsDetect01.resx">
<DependentUpon>Frm_MesQaItemsDetect01.cs</DependentUpon>
</EmbeddedResource>
@@ -756,6 +809,12 @@
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\Sys\Frm_MesSysPageview.resx">
<DependentUpon>Frm_MesSysPageview.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Sys\Frm_PrintInfo.resx">
+ <DependentUpon>Frm_PrintInfo.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Sys\Frm_PrintUser.resx">
+ <DependentUpon>Frm_PrintUser.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\Sys\SysHelp.resx">
<DependentUpon>SysHelp.cs</DependentUpon>
@@ -859,11 +918,11 @@
<EmbeddedResource Include="UserControl\ShowUp.resx">
<DependentUpon>ShowUp.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="UserControl\showZhongTai.resx">
+ <DependentUpon>showZhongTai.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>
@@ -871,11 +930,20 @@
<EmbeddedResource Include="UserControl\UcLookCustomer.resx">
<DependentUpon>UcLookCustomer.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="UserControl\UcLookDefectType.resx">
+ <DependentUpon>UcLookDefectType.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="UserControl\UcLookDepartment.resx">
+ <DependentUpon>UcLookDepartment.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="UserControl\UcLookItems.resx">
<DependentUpon>UcLookItems.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UserControl\UcLookOrg.resx">
<DependentUpon>UcLookOrg.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="UserControl\UcLookPrint.resx">
+ <DependentUpon>UcLookPrint.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UserControl\UcLookStaff.resx">
<DependentUpon>UcLookStaff.cs</DependentUpon>
@@ -886,6 +954,9 @@
<EmbeddedResource Include="UserControl\UcLookUnit.resx">
<DependentUpon>UcLookUnit.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="UserControl\UcLookUser.resx">
+ <DependentUpon>UcLookUser.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="UserControl\UcLookWorkline.resx">
<DependentUpon>UcLookWorkline.cs</DependentUpon>
</EmbeddedResource>
@@ -894,9 +965,6 @@
</EmbeddedResource>
<EmbeddedResource Include="UserControl\UcPageBar.resx">
<DependentUpon>UcPageBar.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="UserControl\ShowDialogForm.resx">
- <DependentUpon>ShowDialogForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UserControl\ShowFilter.resx">
<DependentUpon>ShowFilter.cs</DependentUpon>
@@ -1076,6 +1144,8 @@
<None Include="Resources\renamedatasource_16x161.png" />
<None Include="Resources\deletelist2_16x16.png" />
<None Include="Resources\reset_16x16.png" />
+ <None Include="Resources\exportfile_16x161.png" />
+ <None Include="Resources\cleartablestyle_16x161.png" />
<Content Include="Resources\user_16x16.png" />
</ItemGroup>
<ItemGroup />
--
Gitblit v1.9.3