From b54d247ffc912c4af1c96fe05bc6ca1630a77be0 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 03 四月 2025 23:58:51 +0800
Subject: [PATCH] 1
---
DevApp/Gs.DevApp/Gs.DevApp.csproj | 140 +++++++++++++++++++++++++++++++++-------------
1 files changed, 101 insertions(+), 39 deletions(-)
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 3874264..7b82d25 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -362,11 +362,11 @@
<Compile Include="DevFrm\QC\Frm_MesDefectCode.Designer.cs">
<DependentUpon>Frm_MesDefectCode.cs</DependentUpon>
</Compile>
- <Compile Include="DevFrm\QC\Frm_MesDefectType.cs">
+ <Compile Include="DevFrm\QC\Frm_MesDefectCodeShow.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Include="DevFrm\QC\Frm_MesDefectType.Designer.cs">
- <DependentUpon>Frm_MesDefectType.cs</DependentUpon>
+ <Compile Include="DevFrm\QC\Frm_MesDefectCodeShow.Designer.cs">
+ <DependentUpon>Frm_MesDefectCodeShow.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\QC\Frm_MesQaItemsDetect01.Designer.cs">
<DependentUpon>Frm_MesQaItemsDetect01.cs</DependentUpon>
@@ -423,7 +423,6 @@
<DependentUpon>MesQcExceptional.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\QC\Models\MesDefectCode.cs" />
- <Compile Include="DevFrm\QC\Models\MesDefectType.cs" />
<Compile Include="DevFrm\QC\Models\MesQaMj.cs" />
<Compile Include="DevFrm\QC\Models\MesQmAql1.cs" />
<Compile Include="DevFrm\QC\Models\MesQmAql2.cs" />
@@ -558,12 +557,6 @@
</Compile>
<Compile Include="DevFrm\Sys\DocNoRule.Designer.cs">
<DependentUpon>DocNoRule.cs</DependentUpon>
- </Compile>
- <Compile Include="DevFrm\Sys\EasyCode.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="DevFrm\Sys\EasyCode.Designer.cs">
- <DependentUpon>EasyCode.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\Sys\Frm_MesSysPageview.cs">
<SubType>Form</SubType>
@@ -719,17 +712,52 @@
<Compile Include="DevFrm\WOM\Frm_MesWorkProd.Designer.cs">
<DependentUpon>Frm_MesWorkProd.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\Work\Frm_Repair.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Work\Frm_Repair.Designer.cs">
+ <DependentUpon>Frm_Repair.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\Work\Frm_Work01.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Work\Frm_Work01.Designer.cs">
+ <DependentUpon>Frm_Work01.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\Work\Frm_WorkProcesses.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="DevFrm\Work\Frm_WorkProcesses.Designer.cs">
<DependentUpon>Frm_WorkProcesses.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\Work\Frm_WorkStart.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Work\Frm_WorkStart.Designer.cs">
+ <DependentUpon>Frm_WorkStart.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\Work\Frm_WorkTechnique.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="DevFrm\Work\Frm_WorkTechnique.Designer.cs">
<DependentUpon>Frm_WorkTechnique.cs</DependentUpon>
+ </Compile>
+ <Compile Include="Properties\Resources.Designer.cs">
+ <AutoGen>True</AutoGen>
+ <DesignTime>True</DesignTime>
+ <DependentUpon>Resources.resx</DependentUpon>
+ </Compile>
+ <Compile Include="UserControl\UcDictionarySelect.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="UserControl\UcDictionarySelect.Designer.cs">
+ <DependentUpon>UcDictionarySelect.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\Work\SelectProcess.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Work\SelectProcess.Designer.cs">
+ <DependentUpon>SelectProcess.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\WW\Frm_WwBlDj.cs">
<SubType>Form</SubType>
@@ -833,32 +861,14 @@
<Compile Include="DevFrm\WW\WwBlclDj.Designer.cs">
<DependentUpon>WwBlclDj.cs</DependentUpon>
</Compile>
- <Compile Include="DevFrm\XtraForm2.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="DevFrm\XtraForm2.Designer.cs">
- <DependentUpon>XtraForm2.cs</DependentUpon>
- </Compile>
<Compile Include="Entity\LoginInfoModel.cs" />
<Compile Include="Entity\PageQueryModel.cs" />
<Compile Include="Entity\ReturnModel.cs" />
<Compile Include="Entity\XlsOutModel.cs" />
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="Properties\Resources.Designer.cs">
- <AutoGen>True</AutoGen>
- <DesignTime>True</DesignTime>
- <DependentUpon>Resources.resx</DependentUpon>
- </Compile>
- <Compile Include="ToolBox\DragResizeHelp.cs" />
<Compile Include="ToolBox\LogHelper.cs" />
<Compile Include="ToolBox\MsgHelper.cs" />
- <Compile Include="ToolBox\SetDrag.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="ToolBox\SetDrag.Designer.cs">
- <DependentUpon>SetDrag.cs</DependentUpon>
- </Compile>
<Compile Include="ToolBox\UpdateParentEventArgs.cs" />
<Compile Include="ToolBox\UtilityHelper.cs" />
<Compile Include="UserControl\SelectCgMx.cs">
@@ -890,6 +900,12 @@
</Compile>
<Compile Include="UserControl\SelectCw.Designer.cs">
<DependentUpon>SelectCw.cs</DependentUpon>
+ </Compile>
+ <Compile Include="UserControl\SelectFont.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="UserControl\SelectFont.Designer.cs">
+ <DependentUpon>SelectFont.cs</DependentUpon>
</Compile>
<Compile Include="UserControl\SelectHz.cs">
<SubType>Form</SubType>
@@ -986,6 +1002,12 @@
</Compile>
<Compile Include="UserControl\UcComBox.Designer.cs">
<DependentUpon>UcComBox.cs</DependentUpon>
+ </Compile>
+ <Compile Include="UserControl\UcDictionary.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="UserControl\UcDictionary.Designer.cs">
+ <DependentUpon>UcDictionary.cs</DependentUpon>
</Compile>
<Compile Include="UserControl\UcLookCk.cs">
<SubType>UserControl</SubType>
@@ -1113,6 +1135,12 @@
<Compile Include="UserControl\UCUpFile.Designer.cs">
<DependentUpon>UCUpFile.cs</DependentUpon>
</Compile>
+ <Compile Include="UserControl\Toast.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="UserControl\Toast.Designer.cs">
+ <DependentUpon>Toast.cs</DependentUpon>
+ </Compile>
<Compile Include="XtraForm1.cs">
<SubType>Form</SubType>
</Compile>
@@ -1213,8 +1241,8 @@
<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 Include="DevFrm\QC\Frm_MesDefectCodeShow.resx">
+ <DependentUpon>Frm_MesDefectCodeShow.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\QC\Frm_MesQaItemsDetect01.resx">
<DependentUpon>Frm_MesQaItemsDetect01.cs</DependentUpon>
@@ -1264,6 +1292,9 @@
<EmbeddedResource Include="DevFrm\Sales\Frm_SalesReturnNotice.resx">
<DependentUpon>Frm_SalesReturnNotice.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Sales\Frm_SalesReturnNoticeDj.resx">
+ <DependentUpon>Frm_SalesReturnNoticeDj.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\Sys\EasyRptEdt.resx">
<DependentUpon>EasyRptEdt.cs</DependentUpon>
</EmbeddedResource>
@@ -1293,9 +1324,6 @@
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\Sys\DocNoRule.resx">
<DependentUpon>DocNoRule.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="DevFrm\Sys\EasyCode.resx">
- <DependentUpon>EasyCode.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\Sys\EasyRptDesign.resx">
<DependentUpon>EasyRptDesign.cs</DependentUpon>
@@ -1370,11 +1398,26 @@
<EmbeddedResource Include="DevFrm\WOM\Frm_MesWorkProd.resx">
<DependentUpon>Frm_MesWorkProd.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Work\Frm_Repair.resx">
+ <DependentUpon>Frm_Repair.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Work\Frm_Work01.resx">
+ <DependentUpon>Frm_Work01.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\Work\Frm_WorkProcesses.resx">
<DependentUpon>Frm_WorkProcesses.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Work\Frm_WorkStart.resx">
+ <DependentUpon>Frm_WorkStart.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\Work\Frm_WorkTechnique.resx">
<DependentUpon>Frm_WorkTechnique.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="UserControl\UcDictionarySelect.resx">
+ <DependentUpon>UcDictionarySelect.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Work\SelectProcess.resx">
+ <DependentUpon>SelectProcess.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\WW\Frm_WwBlDj.resx">
<DependentUpon>Frm_WwBlDj.cs</DependentUpon>
@@ -1427,17 +1470,11 @@
<EmbeddedResource Include="DevFrm\WW\WwBlclDj.resx">
<DependentUpon>WwBlclDj.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="DevFrm\XtraForm2.resx">
- <DependentUpon>XtraForm2.cs</DependentUpon>
- </EmbeddedResource>
<EmbeddedResource Include="Properties\licenses.licx" />
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<SubType>Designer</SubType>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
- </EmbeddedResource>
- <EmbeddedResource Include="ToolBox\SetDrag.resx">
- <DependentUpon>SetDrag.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UserControl\SelectCgMx.resx">
<DependentUpon>SelectCgMx.cs</DependentUpon>
@@ -1453,6 +1490,9 @@
</EmbeddedResource>
<EmbeddedResource Include="UserControl\SelectCw.resx">
<DependentUpon>SelectCw.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="UserControl\SelectFont.resx">
+ <DependentUpon>SelectFont.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UserControl\SelectHz.resx">
<DependentUpon>SelectHz.cs</DependentUpon>
@@ -1565,6 +1605,9 @@
<EmbeddedResource Include="UserControl\UCUpFile.resx">
<DependentUpon>UCUpFile.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="UserControl\Toast.resx">
+ <DependentUpon>Toast.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="XtraForm1.resx">
<DependentUpon>XtraForm1.cs</DependentUpon>
</EmbeddedResource>
@@ -1582,6 +1625,9 @@
</ItemGroup>
<ItemGroup>
<Content Include="logo_ico.ico" />
+ <None Include="Resources\zoom100_16x161.png" />
+ <None Include="Resources\user_32x32.png" />
+ <None Include="Resources\user_16x162.png" />
<None Include="Resources\wordwrap_32x32.png" />
<None Include="Resources\wraptext2_16x16.png" />
<None Include="Resources\wraptext2_32x32.png" />
@@ -1786,6 +1832,22 @@
<None Include="Resources\replace_32x32.png" />
<None Include="Resources\replace_16x161.png" />
<None Include="Resources\announcement_32x32.png" />
+ <None Include="Resources\fontsizeincrease_32x32.png" />
+ <None Include="Resources\fontsizeincrease_16x16.png" />
+ <None Include="Resources\fontsizeincrease_32x321.png" />
+ <None Include="Resources\fontsizeincrease_16x161.png" />
+ <None Include="Resources\operatingsystem_32x32.png" />
+ <None Include="Resources\operatingsystem_16x16.png" />
+ <None Include="Resources\calculatenow.svg" />
+ <None Include="Resources\subreport_32x32.png" />
+ <None Include="Resources\subreport_16x16.png" />
+ <None Include="Resources\checkbox2_32x324.png" />
+ <None Include="Resources\snapmodifytablecellstyle_32x32.png" />
+ <None Include="Resources\statistical_16x16.png" />
+ <None Include="Resources\ok1.png" />
+ <None Include="Resources\error1.png" />
+ <None Include="Resources\error123.jpg" />
+ <None Include="Resources\ok123.jpg" />
<Content Include="Resources\user_16x16.png" />
</ItemGroup>
<ItemGroup />
--
Gitblit v1.9.3