From c5cfa2df88c6d2e5b31e87e1d5a8fe49d585f0bb Mon Sep 17 00:00:00 2001
From: jinghz@oceic.com <jinghz@oceic.com>
Date: 星期四, 24 八月 2023 10:44:03 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
BaseSet/BaseSet.csproj | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/BaseSet/BaseSet.csproj b/BaseSet/BaseSet.csproj
index 4751d46..5ba733e 100644
--- a/BaseSet/BaseSet.csproj
+++ b/BaseSet/BaseSet.csproj
@@ -195,6 +195,12 @@
<Compile Include="鍏敤璧勬枡\鍏敤鍩虹璧勬枡\Gy_ConveyComp.designer.cs">
<DependentUpon>Gy_ConveyComp.cs</DependentUpon>
</Compile>
+ <Compile Include="鍏敤璧勬枡\鍏敤鍩虹璧勬枡\Gy_FactoryDayOff.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="鍏敤璧勬枡\鍏敤鍩虹璧勬枡\Gy_FactoryDayOff.designer.cs">
+ <DependentUpon>Gy_FactoryDayOff.cs</DependentUpon>
+ </Compile>
<Compile Include="鍏敤璧勬枡\鍏敤鍩虹璧勬枡\Gy_EntryComp.cs">
<SubType>Form</SubType>
</Compile>
@@ -1564,6 +1570,12 @@
<Compile Include="瀵煎叆妯℃澘\Gy_DataIn_WorkCenter.designer.cs">
<DependentUpon>Gy_DataIn_WorkCenter.cs</DependentUpon>
</Compile>
+ <Compile Include="瀵煎叆妯℃澘\Gy_DataIn_StdWorkTimes.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="瀵煎叆妯℃澘\Gy_DataIn_StdWorkTimes.Designer.cs">
+ <DependentUpon>Gy_DataIn_StdWorkTimes.cs</DependentUpon>
+ </Compile>
</ItemGroup>
<ItemGroup>
<COMReference Include="stdole">
@@ -1638,6 +1650,10 @@
</EmbeddedResource>
<EmbeddedResource Include="鍏敤璧勬枡\鍏敤鍩虹璧勬枡\Gy_ConveyComp.resx">
<DependentUpon>Gy_ConveyComp.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="鍏敤璧勬枡\鍏敤鍩虹璧勬枡\Gy_FactoryDayOff.resx">
+ <DependentUpon>Gy_FactoryDayOff.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="鍏敤璧勬枡\鍏敤鍩虹璧勬枡\Gy_EntryComp.resx">
@@ -2551,6 +2567,10 @@
<SubType>Designer</SubType>
<DependentUpon>Gy_DataIn_WorkCenter.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="瀵煎叆妯℃澘\Gy_DataIn_StdWorkTimes.resx">
+ <DependentUpon>Gy_DataIn_StdWorkTimes.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
</ItemGroup>
<ItemGroup>
<Folder Include="CLOUD鍩虹璧勬枡\" />
--
Gitblit v1.9.1