From f4d5aa97370f698c63b0b9f185f06e7bae56975c Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期二, 19 八月 2025 08:15:50 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

---
 DevApp/Gs.DevApp/Gs.DevApp.csproj |   55 ++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 0b5697d..ff2fd02 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -500,6 +500,12 @@
     <Compile Include="DevFrm\PDA\SelectItem.Designer.cs">
       <DependentUpon>SelectItem.cs</DependentUpon>
     </Compile>
+    <Compile Include="DevFrm\PDA\SelectLine.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\PDA\SelectLine.Designer.cs">
+      <DependentUpon>SelectLine.cs</DependentUpon>
+    </Compile>
     <Compile Include="DevFrm\PDA\SelectPage.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -683,23 +689,17 @@
     <Compile Include="DevFrm\RkQC\Frm_QtrkDetect01.Designer.cs">
       <DependentUpon>Frm_QtrkDetect01.cs</DependentUpon>
     </Compile>
-    <Compile Include="DevFrm\RkQC\Frm_SctlDetect01.cs">
+    <Compile Include="DevFrm\RkQC\Frm_ShouTuoDetect01.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="DevFrm\RkQC\Frm_SctlDetect01.Designer.cs">
-      <DependentUpon>Frm_SctlDetect01.cs</DependentUpon>
+    <Compile Include="DevFrm\RkQC\Frm_ShouTuoDetect01.Designer.cs">
+      <DependentUpon>Frm_ShouTuoDetect01.cs</DependentUpon>
     </Compile>
     <Compile Include="DevFrm\RkQC\Frm_WwrkDetect01.cs">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="DevFrm\RkQC\Frm_WwrkDetect01.Designer.cs">
       <DependentUpon>Frm_WwrkDetect01.cs</DependentUpon>
-    </Compile>
-    <Compile Include="DevFrm\RkQC\Frm_XsthDetect01.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="DevFrm\RkQC\Frm_XsthDetect01.Designer.cs">
-      <DependentUpon>Frm_XsthDetect01.cs</DependentUpon>
     </Compile>
     <Compile Include="DevFrm\RkQC\RkDetect01.cs">
       <SubType>UserControl</SubType>
@@ -773,6 +773,12 @@
     <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>
     </Compile>
@@ -802,6 +808,18 @@
     </Compile>
     <Compile Include="DevFrm\Sales\Frm_SalesReturnNoticeDj.Designer.cs">
       <DependentUpon>Frm_SalesReturnNoticeDj.cs</DependentUpon>
+    </Compile>
+    <Compile Include="DevFrm\Sales\Frm_SalesReturnNoticeSelect.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\Sales\Frm_SalesReturnNoticeSelect.Designer.cs">
+      <DependentUpon>Frm_SalesReturnNoticeSelect.cs</DependentUpon>
+    </Compile>
+    <Compile Include="DevFrm\Sales\Frm_SalesReturnNoticeSelectLink.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\Sales\Frm_SalesReturnNoticeSelectLink.Designer.cs">
+      <DependentUpon>Frm_SalesReturnNoticeSelectLink.cs</DependentUpon>
     </Compile>
     <Compile Include="DevFrm\Sys\EasyRptEdt.cs">
       <SubType>Form</SubType>
@@ -1678,6 +1696,9 @@
     <EmbeddedResource Include="DevFrm\PDA\SelectItem.resx">
       <DependentUpon>SelectItem.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\PDA\SelectLine.resx">
+      <DependentUpon>SelectLine.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="DevFrm\PDA\SelectPage.resx">
       <DependentUpon>SelectPage.cs</DependentUpon>
     </EmbeddedResource>
@@ -1744,8 +1765,8 @@
     <EmbeddedResource Include="DevFrm\RkQC\Frm_Cqsq.resx">
       <DependentUpon>Frm_Cqsq.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="DevFrm\RkQC\Frm_SctlDetect01.resx">
-      <DependentUpon>Frm_SctlDetect01.cs</DependentUpon>
+    <EmbeddedResource Include="DevFrm\RkQC\Frm_ShouTuoDetect01.resx">
+      <DependentUpon>Frm_ShouTuoDetect01.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="DevFrm\RkQC\RkDetect01.resx">
       <DependentUpon>RkDetect01.cs</DependentUpon>
@@ -1783,6 +1804,9 @@
     <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>
     </EmbeddedResource>
@@ -1797,6 +1821,9 @@
     </EmbeddedResource>
     <EmbeddedResource Include="DevFrm\Sales\Frm_SalesReturnNoticeDj.resx">
       <DependentUpon>Frm_SalesReturnNoticeDj.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\Sales\Frm_SalesReturnNoticeSelect.resx">
+      <DependentUpon>Frm_SalesReturnNoticeSelect.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="DevFrm\Sys\EasyRptEdt.resx">
       <DependentUpon>EasyRptEdt.cs</DependentUpon>
@@ -2440,6 +2467,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