From 2fb710372202d0ef4e64a308892169551d3b5110 Mon Sep 17 00:00:00 2001
From: cnf <3283105747@qq.com>
Date: 星期三, 12 十一月 2025 09:52:10 +0800
Subject: [PATCH] 合并领料
---
DevApp/Gs.DevApp/Gs.DevApp.csproj | 108 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 108 insertions(+), 0 deletions(-)
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 2851960..1ee7ba2 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -209,6 +209,12 @@
<Compile Include="DevFrm\BasicData\Frm_Department.Designer.cs">
<DependentUpon>Frm_Department.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\BasicData\Frm_MesDepotMin.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\BasicData\Frm_MesDepotMin.Designer.cs">
+ <DependentUpon>Frm_MesDepotMin.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\BasicData\Frm_MesItems.cs">
<SubType>Form</SubType>
</Compile>
@@ -794,6 +800,18 @@
<Compile Include="DevFrm\Rpt\CkYtmx.Designer.cs">
<DependentUpon>CkYtmx.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\Rpt\YS_iqcWeek.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\YS_iqcWeek.Designer.cs">
+ <DependentUpon>YS_iqcWeek.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\YS_iqcMonth.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\YS_iqcMonth.Designer.cs">
+ <DependentUpon>YS_iqcMonth.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\Rpt\IPQCSJMX.cs">
<SubType>Form</SubType>
</Compile>
@@ -866,6 +884,12 @@
<Compile Include="DevFrm\Rpt\YS_bgjlb.Designer.cs">
<DependentUpon>YS_bgjlb.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\Rpt\YS_iqcdjy.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\YS_iqcdjy.Designer.cs">
+ <DependentUpon>YS_iqcdjy.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\Rpt\YS_iqc_report.cs">
<SubType>Form</SubType>
</Compile>
@@ -878,11 +902,41 @@
<Compile Include="DevFrm\Rpt\YS_jhdcl.Designer.cs">
<DependentUpon>YS_jhdcl.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\Rpt\YS_mjczjlMax .cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\YS_mjczjlMax .Designer.cs">
+ <DependentUpon>YS_mjczjlMax .cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\YS_mjczjl.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\YS_mjczjl.Designer.cs">
+ <DependentUpon>YS_mjczjl.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\YS_mjtz.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\YS_mjtz.Designer.cs">
+ <DependentUpon>YS_mjtz.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\Rpt\YS_py_pk_d.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="DevFrm\Rpt\YS_py_pk_d.Designer.cs">
<DependentUpon>YS_py_pk_d.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\YS_drkmx.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\YS_drkmx.Designer.cs">
+ <DependentUpon>YS_drkmx.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\YS_rkmx.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\YS_rkmx.Designer.cs">
+ <DependentUpon>YS_rkmx.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\Rpt\YS_rkjreport.cs">
<SubType>Form</SubType>
@@ -1263,6 +1317,18 @@
<Compile Include="DevFrm\Work\Frm_WorkTechniqueShow.Designer.cs">
<DependentUpon>Frm_WorkTechniqueShow.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\WW\Frm_Wwgdhb.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\WW\Frm_Wwgdhb.Designer.cs">
+ <DependentUpon>Frm_Wwgdhb.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\WW\SelectWwgd.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\WW\SelectWwgd.Designer.cs">
+ <DependentUpon>SelectWwgd.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\WW\showWwZhongTai.cs">
<SubType>Form</SubType>
</Compile>
@@ -1309,6 +1375,12 @@
</Compile>
<Compile Include="UserControl\SelectSrm.Designer.cs">
<DependentUpon>SelectSrm.cs</DependentUpon>
+ </Compile>
+ <Compile Include="UserControl\UcBtnPrintOne.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="UserControl\UcBtnPrintOne.Designer.cs">
+ <DependentUpon>UcBtnPrintOne.cs</DependentUpon>
</Compile>
<Compile Include="UserControl\UcCheckFlow.cs">
<SubType>UserControl</SubType>
@@ -1704,6 +1776,9 @@
<EmbeddedResource Include="DevFrm\BasicData\Frm_Department.resx">
<DependentUpon>Frm_Department.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\BasicData\Frm_MesDepotMin.resx">
+ <DependentUpon>Frm_MesDepotMin.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\BasicData\Frm_MesItems.resx">
<DependentUpon>Frm_MesItems.cs</DependentUpon>
</EmbeddedResource>
@@ -1969,6 +2044,12 @@
<EmbeddedResource Include="DevFrm\Rpt\CkYtmx.resx">
<DependentUpon>CkYtmx.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Rpt\YS_iqcWeek.resx">
+ <DependentUpon>YS_iqcWeek.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Rpt\YS_iqcMonth.resx">
+ <DependentUpon>YS_iqcMonth.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\Rpt\IPQCSJMX.resx">
<DependentUpon>IPQCSJMX.cs</DependentUpon>
</EmbeddedResource>
@@ -2005,14 +2086,32 @@
<EmbeddedResource Include="DevFrm\Rpt\YS_bgjlb.resx">
<DependentUpon>YS_bgjlb.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Rpt\YS_iqcdjy.resx">
+ <DependentUpon>YS_iqcdjy.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\Rpt\YS_iqc_report.resx">
<DependentUpon>YS_iqc_report.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\Rpt\YS_jhdcl.resx">
<DependentUpon>YS_jhdcl.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Rpt\YS_mjczjlMax .resx">
+ <DependentUpon>YS_mjczjlMax .cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Rpt\YS_mjczjl.resx">
+ <DependentUpon>YS_mjczjl.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Rpt\YS_mjtz.resx">
+ <DependentUpon>YS_mjtz.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\Rpt\YS_py_pk_d.resx">
<DependentUpon>YS_py_pk_d.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Rpt\YS_drkmx.resx">
+ <DependentUpon>YS_drkmx.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Rpt\YS_rkmx.resx">
+ <DependentUpon>YS_rkmx.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\Rpt\YS_rkjreport.resx">
<DependentUpon>YS_rkjreport.cs</DependentUpon>
@@ -2198,6 +2297,12 @@
<EmbeddedResource Include="DevFrm\Work\Frm_WorkTechniqueShow.resx">
<DependentUpon>Frm_WorkTechniqueShow.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\WW\Frm_Wwgdhb.resx">
+ <DependentUpon>Frm_Wwgdhb.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\WW\SelectWwgd.resx">
+ <DependentUpon>SelectWwgd.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\WW\showWwZhongTai.resx">
<DependentUpon>showWwZhongTai.cs</DependentUpon>
</EmbeddedResource>
@@ -2219,6 +2324,9 @@
<EmbeddedResource Include="UserControl\SelectSrm.resx">
<DependentUpon>SelectSrm.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="UserControl\UcBtnPrintOne.resx">
+ <DependentUpon>UcBtnPrintOne.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="UserControl\UcCheckFlow.resx">
<DependentUpon>UcCheckFlow.cs</DependentUpon>
</EmbeddedResource>
--
Gitblit v1.9.3