From b71d1372394ba9fffa04f3e55fcfcd32c545c85a Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 18 三月 2025 09:04:24 +0800
Subject: [PATCH] erp改主键

---
 DevApp/Gs.DevApp/Gs.DevApp.csproj |   92 ++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 80 insertions(+), 12 deletions(-)

diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 1bbd542..6e86e4b 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -303,6 +303,18 @@
     <Compile Include="DevFrm\Ck\UcBlclDj.Designer.cs">
       <DependentUpon>UcBlclDj.cs</DependentUpon>
     </Compile>
+    <Compile Include="DevFrm\IPQC\Frm_ShouJian.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\IPQC\Frm_ShouJian.Designer.cs">
+      <DependentUpon>Frm_ShouJian.cs</DependentUpon>
+    </Compile>
+    <Compile Include="DevFrm\IPQC\Frm_XunJian.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\IPQC\Frm_XunJian.Designer.cs">
+      <DependentUpon>Frm_XunJian.cs</DependentUpon>
+    </Compile>
     <Compile Include="DevFrm\QC\Frm_IQCLookups.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -333,6 +345,12 @@
     <Compile Include="DevFrm\QC\Frm_MesQaItemsDetect01Check.Designer.cs">
       <DependentUpon>Frm_MesQaItemsDetect01Check.cs</DependentUpon>
     </Compile>
+    <Compile Include="DevFrm\QC\Frm_MesQaItemsDetect01Input.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\QC\Frm_MesQaItemsDetect01Input.Designer.cs">
+      <DependentUpon>Frm_MesQaItemsDetect01Input.cs</DependentUpon>
+    </Compile>
     <Compile Include="DevFrm\QC\Frm_MesQaMj.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -357,11 +375,14 @@
     <Compile Include="DevFrm\QC\Frm_MesSysLookups.Designer.cs">
       <DependentUpon>Frm_MesSysLookups.cs</DependentUpon>
     </Compile>
+    <Compile Include="DevFrm\QC\Jyxm.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="DevFrm\QC\Jyxm.Designer.cs">
+      <DependentUpon>Jyxm.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" />
     <Compile Include="DevFrm\QC\Models\MesQaMj.cs" />
     <Compile Include="DevFrm\QC\Models\MesQmAql1.cs" />
     <Compile Include="DevFrm\QC\Models\MesQmAql2.cs" />
@@ -370,6 +391,12 @@
     <Compile Include="DevFrm\QC\Models\MesQmCheckitemDt.cs" />
     <Compile Include="DevFrm\QC\Models\MesSysLookups.cs" />
     <Compile Include="DevFrm\QC\Models\MesSysLookupTypes.cs" />
+    <Compile Include="DevFrm\Rpt\CK.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\Rpt\CK.Designer.cs">
+      <DependentUpon>CK.cs</DependentUpon>
+    </Compile>
     <Compile Include="DevFrm\Rk\Frm_MesInvItemIns.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -381,6 +408,12 @@
     </Compile>
     <Compile Include="DevFrm\Rk\Frm_MesItemQtrkDj.Designer.cs">
       <DependentUpon>Frm_MesItemQtrkDj.cs</DependentUpon>
+    </Compile>
+    <Compile Include="DevFrm\Rpt\CKTmkc.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\Rpt\CKTmkc.Designer.cs">
+      <DependentUpon>CKTmkc.cs</DependentUpon>
     </Compile>
     <Compile Include="DevFrm\Sales\Frm_SalesDeliverDj.cs">
       <SubType>Form</SubType>
@@ -411,6 +444,18 @@
     </Compile>
     <Compile Include="DevFrm\Sales\Frm_SalesReturnNoticeDj.Designer.cs">
       <DependentUpon>Frm_SalesReturnNoticeDj.cs</DependentUpon>
+    </Compile>
+    <Compile Include="DevFrm\Sys\EasyRptEdt.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\Sys\EasyRptEdt.Designer.cs">
+      <DependentUpon>EasyRptEdt.cs</DependentUpon>
+    </Compile>
+    <Compile Include="DevFrm\User\ViewRole.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\User\ViewRole.Designer.cs">
+      <DependentUpon>ViewRole.cs</DependentUpon>
     </Compile>
     <Compile Include="DevFrm\Warehouse\Frm_MesShouTui.cs">
       <SubType>Form</SubType>
@@ -740,12 +785,6 @@
     </Compile>
     <Compile Include="DevFrm\WW\WwBlclDj.Designer.cs">
       <DependentUpon>WwBlclDj.cs</DependentUpon>
-    </Compile>
-    <Compile Include="DevFrm\XtraForm1.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="DevFrm\XtraForm1.Designer.cs">
-      <DependentUpon>XtraForm1.cs</DependentUpon>
     </Compile>
     <Compile Include="Entity\LoginInfoModel.cs" />
     <Compile Include="Entity\PageQueryModel.cs" />
@@ -1090,6 +1129,9 @@
     <EmbeddedResource Include="DevFrm\FrmMain.resx">
       <DependentUpon>FrmMain.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\IPQC\Frm_ShouJian.resx">
+      <DependentUpon>Frm_ShouJian.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="DevFrm\QC\Frm_IQCLookups.resx">
       <DependentUpon>Frm_IQCLookups.cs</DependentUpon>
     </EmbeddedResource>
@@ -1105,6 +1147,9 @@
     <EmbeddedResource Include="DevFrm\QC\Frm_MesQaItemsDetect01Check.resx">
       <DependentUpon>Frm_MesQaItemsDetect01Check.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\QC\Frm_MesQaItemsDetect01Input.resx">
+      <DependentUpon>Frm_MesQaItemsDetect01Input.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="DevFrm\QC\Frm_MesQaMj.resx">
       <DependentUpon>Frm_MesQaMj.cs</DependentUpon>
     </EmbeddedResource>
@@ -1117,11 +1162,20 @@
     <EmbeddedResource Include="DevFrm\QC\Frm_MesSysLookups.resx">
       <DependentUpon>Frm_MesSysLookups.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\QC\Jyxm.resx">
+      <DependentUpon>Jyxm.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="DevFrm\Rk\Frm_MesInvItemIns.resx">
       <DependentUpon>Frm_MesInvItemIns.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="DevFrm\Rk\Frm_MesItemQtrkDj.resx">
       <DependentUpon>Frm_MesItemQtrkDj.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\Rpt\CK.resx">
+      <DependentUpon>CK.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\Rpt\CKTmkc.resx">
+      <DependentUpon>CKTmkc.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="DevFrm\Sales\Frm_SalesDeliverDj.resx">
       <DependentUpon>Frm_SalesDeliverDj.cs</DependentUpon>
@@ -1134,6 +1188,12 @@
     </EmbeddedResource>
     <EmbeddedResource Include="DevFrm\Sales\Frm_SalesReturnNotice.resx">
       <DependentUpon>Frm_SalesReturnNotice.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\Sys\EasyRptEdt.resx">
+      <DependentUpon>EasyRptEdt.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\User\ViewRole.resx">
+      <DependentUpon>ViewRole.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="DevFrm\Warehouse\Frm_MesShouTui.resx">
       <DependentUpon>Frm_MesShouTui.cs</DependentUpon>
@@ -1285,9 +1345,6 @@
     </EmbeddedResource>
     <EmbeddedResource Include="DevFrm\WW\WwBlclDj.resx">
       <DependentUpon>WwBlclDj.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="DevFrm\XtraForm1.resx">
-      <DependentUpon>XtraForm1.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Properties\licenses.licx" />
     <EmbeddedResource Include="Properties\Resources.resx">
@@ -1619,6 +1676,17 @@
     <None Include="Resources\edit_16x16.png" />
     <None Include="Resources\meeting_32x321.png" />
     <None Include="Resources\meeting_16x16.png" />
+    <None Include="Resources\bodetails_16x16.png" />
+    <None Include="Resources\show_16x162.png" />
+    <None Include="Resources\bodetails_16x161.png" />
+    <None Include="Resources\upload_16x16.png" />
+    <None Include="Resources\editname_32x321.png" />
+    <None Include="Resources\refresh_16x16.png" />
+    <None Include="Resources\dafualtfax_32x32.png" />
+    <None Include="Resources\defaultprinter_32x32.png" />
+    <None Include="Resources\printarea_32x32.png" />
+    <None Include="Resources\defaultprinter.svg" />
+    <None Include="Resources\3dclusteredcolumn_32x32.png" />
     <Content Include="Resources\user_16x16.png" />
   </ItemGroup>
   <ItemGroup />

--
Gitblit v1.9.3