From dd3064d7f5bb6c7d570f21e87b29012bfd95b1d2 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 17 二月 2025 11:29:12 +0800
Subject: [PATCH] 生产退料
---
DevApp/Gs.DevApp/Gs.DevApp.csproj | 84 ++++++++++++++++++++++++++++++++---------
1 files changed, 65 insertions(+), 19 deletions(-)
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 4ce386e..1e61b9f 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -138,6 +138,7 @@
<Reference Include="System.Formats.Asn1, Version=8.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Formats.Asn1.8.0.1\lib\net462\System.Formats.Asn1.dll</HintPath>
</Reference>
+ <Reference Include="System.Management" />
<Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
</Reference>
@@ -284,11 +285,11 @@
<Compile Include="DevFrm\Ck\Frm_MesItemClDj.Designer.cs">
<DependentUpon>Frm_MesItemClDj.cs</DependentUpon>
</Compile>
- <Compile Include="DevFrm\Ck\Frm_MesItemQtCk.cs">
+ <Compile Include="DevFrm\Ck\Frm_MesItemQtDj.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Include="DevFrm\Ck\Frm_MesItemQtCk.Designer.cs">
- <DependentUpon>Frm_MesItemQtCk.cs</DependentUpon>
+ <Compile Include="DevFrm\Ck\Frm_MesItemQtDj.Designer.cs">
+ <DependentUpon>Frm_MesItemQtDj.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\Ck\UcBlcl.cs">
<SubType>UserControl</SubType>
@@ -369,6 +370,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\Rk\Frm_MesInvItemIns.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Rk\Frm_MesInvItemIns.Designer.cs">
+ <DependentUpon>Frm_MesInvItemIns.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\Warehouse\Frm_MesDbck.cs">
<SubType>Form</SubType>
</Compile>
@@ -387,11 +394,11 @@
<Compile Include="DevFrm\Rk\Frm_MesItemQtrk.Designer.cs">
<DependentUpon>Frm_MesItemQtrk.cs</DependentUpon>
</Compile>
- <Compile Include="DevFrm\Rk\Frm_MesItemQtrk_Rk.cs">
+ <Compile Include="DevFrm\Rk\Frm_MesItemQtrkDj.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Include="DevFrm\Rk\Frm_MesItemQtrk_Rk.Designer.cs">
- <DependentUpon>Frm_MesItemQtrk_Rk.cs</DependentUpon>
+ <Compile Include="DevFrm\Rk\Frm_MesItemQtrkDj.Designer.cs">
+ <DependentUpon>Frm_MesItemQtrkDj.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\Rk\Frm_MesItemTbl.cs">
<SubType>Form</SubType>
@@ -540,12 +547,6 @@
<Compile Include="DevFrm\Warehouse\Frm_InitialBarcode.Designer.cs">
<DependentUpon>Frm_InitialBarcode.cs</DependentUpon>
</Compile>
- <Compile Include="DevFrm\Rk\Frm_MesInvItemIns.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="DevFrm\Rk\Frm_MesInvItemIns.Designer.cs">
- <DependentUpon>Frm_MesInvItemIns.cs</DependentUpon>
- </Compile>
<Compile Include="DevFrm\Warehouse\Frm_MesRohIn.cs">
<SubType>Form</SubType>
</Compile>
@@ -566,6 +567,18 @@
<Compile Include="DevFrm\Warehouse\Models\VArrivalBarcode.cs" />
<Compile Include="DevFrm\Warehouse\Models\VArrivalBarcodeItem.cs" />
<Compile Include="DevFrm\Warehouse\Models\VArrivalBarcodeItem3.cs" />
+ <Compile Include="DevFrm\WOM\Frm_MesScrkDj.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\WOM\Frm_MesScrkDj.Designer.cs">
+ <DependentUpon>Frm_MesScrkDj.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\WOM\Frm_MesWorkProd.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\WOM\Frm_MesWorkProd.Designer.cs">
+ <DependentUpon>Frm_MesWorkProd.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\WW\Frm_WwBlDj.cs">
<SubType>Form</SubType>
</Compile>
@@ -661,6 +674,12 @@
</Compile>
<Compile Include="DevFrm\WW\WwBlcl.Designer.cs">
<DependentUpon>WwBlcl.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\WW\WwBlclDj.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="DevFrm\WW\WwBlclDj.Designer.cs">
+ <DependentUpon>WwBlclDj.cs</DependentUpon>
</Compile>
<Compile Include="Entity\LoginInfoModel.cs" />
<Compile Include="Entity\PageQueryModel.cs" />
@@ -796,6 +815,12 @@
</Compile>
<Compile Include="UserControl\UcLookDepartment.Designer.cs">
<DependentUpon>UcLookDepartment.cs</DependentUpon>
+ </Compile>
+ <Compile Include="UserControl\UcLookHuoZhu.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="UserControl\UcLookHuoZhu.Designer.cs">
+ <DependentUpon>UcLookHuoZhu.cs</DependentUpon>
</Compile>
<Compile Include="UserControl\UcLookItems.cs">
<SubType>UserControl</SubType>
@@ -935,8 +960,8 @@
<EmbeddedResource Include="DevFrm\Ck\Frm_MesItemClDj.resx">
<DependentUpon>Frm_MesItemClDj.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="DevFrm\Ck\Frm_MesItemQtCk.resx">
- <DependentUpon>Frm_MesItemQtCk.cs</DependentUpon>
+ <EmbeddedResource Include="DevFrm\Ck\Frm_MesItemQtDj.resx">
+ <DependentUpon>Frm_MesItemQtDj.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\Ck\UcBlcl.resx">
<DependentUpon>UcBlcl.cs</DependentUpon>
@@ -977,6 +1002,9 @@
<EmbeddedResource Include="DevFrm\QC\Frm_MesSysLookups.resx">
<DependentUpon>Frm_MesSysLookups.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Rk\Frm_MesInvItemIns.resx">
+ <DependentUpon>Frm_MesInvItemIns.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\Warehouse\Frm_MesDbck.resx">
<DependentUpon>Frm_MesDbck.cs</DependentUpon>
</EmbeddedResource>
@@ -986,8 +1014,8 @@
<EmbeddedResource Include="DevFrm\Rk\Frm_MesItemQtrk.resx">
<DependentUpon>Frm_MesItemQtrk.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="DevFrm\Rk\Frm_MesItemQtrk_Rk.resx">
- <DependentUpon>Frm_MesItemQtrk_Rk.cs</DependentUpon>
+ <EmbeddedResource Include="DevFrm\Rk\Frm_MesItemQtrkDj.resx">
+ <DependentUpon>Frm_MesItemQtrkDj.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\Rk\Frm_MesItemTbl.resx">
<DependentUpon>Frm_MesItemTbl.cs</DependentUpon>
@@ -1056,11 +1084,14 @@
<EmbeddedResource Include="DevFrm\Warehouse\Frm_InitialBarcode.resx">
<DependentUpon>Frm_InitialBarcode.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="DevFrm\Rk\Frm_MesInvItemIns.resx">
- <DependentUpon>Frm_MesInvItemIns.cs</DependentUpon>
- </EmbeddedResource>
<EmbeddedResource Include="DevFrm\Warehouse\Frm_MesRohIn.resx">
<DependentUpon>Frm_MesRohIn.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\WOM\Frm_MesScrkDj.resx">
+ <DependentUpon>Frm_MesScrkDj.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\WOM\Frm_MesWorkProd.resx">
+ <DependentUpon>Frm_MesWorkProd.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\WW\Frm_WwBlDj.resx">
<DependentUpon>Frm_WwBlDj.cs</DependentUpon>
@@ -1106,6 +1137,12 @@
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\WW\SelectWwTbl.resx">
<DependentUpon>SelectWwTbl.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\WW\WwBlcl.resx">
+ <DependentUpon>WwBlcl.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\WW\WwBlclDj.resx">
+ <DependentUpon>WwBlclDj.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\licenses.licx" />
<EmbeddedResource Include="Properties\Resources.resx">
@@ -1172,6 +1209,9 @@
</EmbeddedResource>
<EmbeddedResource Include="UserControl\UcLookDepartment.resx">
<DependentUpon>UcLookDepartment.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="UserControl\UcLookHuoZhu.resx">
+ <DependentUpon>UcLookHuoZhu.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UserControl\UcLookItems.resx">
<DependentUpon>UcLookItems.cs</DependentUpon>
@@ -1389,6 +1429,12 @@
<None Include="Resources\printernetwork_16x16.png" />
<None Include="Resources\printlayoutview_16x161.png" />
<None Include="Resources\richeditcleartablestyle_16x16.png" />
+ <None Include="Resources\lookup&reference_16x161.png" />
+ <None Include="Resources\lookup&reference_32x32.png" />
+ <None Include="Resources\employee_16x16.png" />
+ <None Include="Resources\employee_32x321.png" />
+ <None Include="Resources\publicfix_16x16.png" />
+ <None Include="Resources\publicfix_32x321.png" />
<Content Include="Resources\user_16x16.png" />
</ItemGroup>
<ItemGroup />
--
Gitblit v1.9.3