From 71e5f5614c403ed7cda5de7bc5f25e026c1f8f93 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 10 三月 2025 19:17:44 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 BaseSet/BaseSet.csproj |   44 +++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 43 insertions(+), 1 deletions(-)

diff --git a/BaseSet/BaseSet.csproj b/BaseSet/BaseSet.csproj
index 5e2b2ac..7e74db1 100644
--- a/BaseSet/BaseSet.csproj
+++ b/BaseSet/BaseSet.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>BaseSet</RootNamespace>
     <AssemblyName>BaseSet</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>
@@ -42,6 +42,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -50,6 +51,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -58,6 +60,7 @@
     <DebugType>full</DebugType>
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <OutputPath>bin\x86\Release\</OutputPath>
@@ -66,6 +69,7 @@
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="AxInterop.gregn6Lib">
@@ -194,6 +198,12 @@
     </Compile>
     <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>
@@ -362,6 +372,18 @@
     </Compile>
     <Compile Include="鍏敤璧勬枡\鍏朵粬鍩虹璧勬枡\Gy_SalePresentRateList.designer.cs">
       <DependentUpon>Gy_SalePresentRateList.cs</DependentUpon>
+    </Compile>
+    <Compile Include="鍏敤璧勬枡\鍏朵粬鍩虹璧勬枡\Gy_StdWorkTimes.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="鍏敤璧勬枡\鍏朵粬鍩虹璧勬枡\Gy_StdWorkTimes.Designer.cs">
+      <DependentUpon>Gy_StdWorkTimes.cs</DependentUpon>
+    </Compile>
+    <Compile Include="鍏敤璧勬枡\鍏朵粬鍩虹璧勬枡\Gy_StdWorkTimesList.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="鍏敤璧勬枡\鍏朵粬鍩虹璧勬枡\Gy_StdWorkTimesList.Designer.cs">
+      <DependentUpon>Gy_StdWorkTimesList.cs</DependentUpon>
     </Compile>
     <Compile Include="鍏敤璧勬枡\鍏朵粬鍩虹璧勬枡\Gy_TechParamByProc.cs">
       <SubType>Form</SubType>
@@ -1552,6 +1574,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">
@@ -1626,6 +1654,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">
@@ -1739,6 +1771,12 @@
     <EmbeddedResource Include="鍏敤璧勬枡\鍏朵粬鍩虹璧勬枡\Gy_SalePresentRateList.resx">
       <DependentUpon>Gy_SalePresentRateList.cs</DependentUpon>
       <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="鍏敤璧勬枡\鍏朵粬鍩虹璧勬枡\Gy_StdWorkTimes.resx">
+      <DependentUpon>Gy_StdWorkTimes.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="鍏敤璧勬枡\鍏朵粬鍩虹璧勬枡\Gy_StdWorkTimesList.resx">
+      <DependentUpon>Gy_StdWorkTimesList.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="鍏敤璧勬枡\鍏朵粬鍩虹璧勬枡\Gy_TechParamByProc.resx">
       <DependentUpon>Gy_TechParamByProc.cs</DependentUpon>
@@ -2533,6 +2571,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