From af065dd4a06281251a36de69052570c1c8be692d Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期三, 27 八月 2025 14:24:52 +0800
Subject: [PATCH] 增加组织机构的字段和查询条件
---
DevApp/Gs.DevApp/Gs.DevApp.csproj | 81 ++++++++++++++++++++++++++++++++++++----
1 files changed, 72 insertions(+), 9 deletions(-)
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 38862c9..9ccc9f6 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -127,6 +127,9 @@
<Reference Include="NModbus, Version=3.0.81.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\NModbus.3.0.81\lib\net46\NModbus.dll</HintPath>
</Reference>
+ <Reference Include="NModbus.Serial, Version=3.0.81.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\packages\NModbus.Serial.3.0.81\lib\net46\NModbus.Serial.dll</HintPath>
+ </Reference>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System" />
@@ -350,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>
@@ -523,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>
@@ -731,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>
@@ -749,11 +770,23 @@
<Compile Include="DevFrm\Rpt\CkYtmx.Designer.cs">
<DependentUpon>CkYtmx.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\Rpt\CPMX.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\CPMX.Designer.cs">
+ <DependentUpon>CPMX.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\Rpt\Frm_MesQL.cs">
<SubType>Form</SubType>
</Compile>
<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>
@@ -772,6 +805,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>
@@ -1080,12 +1119,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>
@@ -1150,6 +1183,12 @@
</Compile>
<Compile Include="UserControl\SelectSrm.Designer.cs">
<DependentUpon>SelectSrm.cs</DependentUpon>
+ </Compile>
+ <Compile Include="UserControl\UcCheckFlow.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="UserControl\UcCheckFlow.Designer.cs">
+ <DependentUpon>UcCheckFlow.cs</DependentUpon>
</Compile>
<Compile Include="UserControl\UcDictionaryComBox.cs">
<SubType>UserControl</SubType>
@@ -1614,6 +1653,9 @@
<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>
</EmbeddedResource>
@@ -1702,6 +1744,9 @@
<EmbeddedResource Include="DevFrm\PDA\SelectUser.resx">
<DependentUpon>SelectUser.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\PDA\SelectZZ.resx">
+ <DependentUpon>SelectZZ.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\QC\DefectCode.resx">
<DependentUpon>DefectCode.cs</DependentUpon>
</EmbeddedResource>
@@ -1777,6 +1822,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>
@@ -1786,8 +1834,14 @@
<EmbeddedResource Include="DevFrm\Rpt\CkYtmx.resx">
<DependentUpon>CkYtmx.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Rpt\CPMX.resx">
+ <DependentUpon>CPMX.cs</DependentUpon>
+ </EmbeddedResource>
<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>
@@ -1797,6 +1851,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>
@@ -1943,9 +2000,6 @@
<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>
</EmbeddedResource>
@@ -1975,6 +2029,9 @@
</EmbeddedResource>
<EmbeddedResource Include="UserControl\SelectSrm.resx">
<DependentUpon>SelectSrm.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="UserControl\UcCheckFlow.resx">
+ <DependentUpon>UcCheckFlow.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UserControl\UcDictionaryComBox.resx">
<DependentUpon>UcDictionaryComBox.cs</DependentUpon>
@@ -2458,6 +2515,12 @@
<None Include="Resources\useinformula_16x16.png" />
<None Include="Resources\boposition2_16x162.png" />
<None Include="Resources\apply_16x16.png" />
+ <None Include="Resources\ok12341.jpg" />
+ <None Include="Resources\error6.jpg" />
+ <None Include="Resources\error61.jpg" />
+ <None Include="Resources\error9.jpg" />
+ <None Include="Resources\error10.jpg" />
+ <None Include="Resources\ok10.jpg" />
<Content Include="Resources\user_16x16.png" />
</ItemGroup>
<ItemGroup />
--
Gitblit v1.9.3