From 50dadff3581c449fe6b239ec486038e0771e1315 Mon Sep 17 00:00:00 2001
From: fcx <2246384483@qq.com.com>
Date: 星期二, 28 十月 2025 17:25:34 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~kyy/LB_MesClient
---
DevApp/Gs.DevApp/Gs.DevApp.csproj | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 insertions(+), 0 deletions(-)
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 1f56e91..97bf6bb 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>
@@ -883,6 +901,12 @@
</Compile>
<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>
@@ -1734,6 +1758,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>
@@ -1999,6 +2026,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>
@@ -2044,6 +2077,9 @@
<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>
--
Gitblit v1.9.3