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 |   51 ++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 0c63b47..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>
@@ -363,6 +375,12 @@
     <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\MesQaMj.cs" />
@@ -373,10 +391,10 @@
     <Compile Include="DevFrm\QC\Models\MesQmCheckitemDt.cs" />
     <Compile Include="DevFrm\QC\Models\MesSysLookups.cs" />
     <Compile Include="DevFrm\QC\Models\MesSysLookupTypes.cs" />
-    <Compile Include="DevFrm\Report\CK.cs">
+    <Compile Include="DevFrm\Rpt\CK.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="DevFrm\Report\CK.Designer.cs">
+    <Compile Include="DevFrm\Rpt\CK.Designer.cs">
       <DependentUpon>CK.cs</DependentUpon>
     </Compile>
     <Compile Include="DevFrm\Rk\Frm_MesInvItemIns.cs">
@@ -390,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>
@@ -762,12 +786,6 @@
     <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" />
     <Compile Include="Entity\ReturnModel.cs" />
@@ -1111,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>
@@ -1141,14 +1162,20 @@
     <EmbeddedResource Include="DevFrm\QC\Frm_MesSysLookups.resx">
       <DependentUpon>Frm_MesSysLookups.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="DevFrm\Report\CK.resx">
-      <DependentUpon>CK.cs</DependentUpon>
+    <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>
@@ -1319,9 +1346,7 @@
     <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">
       <Generator>ResXFileCodeGenerator</Generator>
       <SubType>Designer</SubType>

--
Gitblit v1.9.3