Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

yusijie

4 小时以前 5d7ba2518694f6694794bebb7389f9a85374720b

 PlanM/PlanM.csproj

@@ -10,7 +10,7 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>PlanM</RootNamespace>
    <AssemblyName>PlanM</AssemblyName>
    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
    <UpgradeBackupLocation>
@@ -41,6 +41,7 @@
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>pdbonly</DebugType>
@@ -49,6 +50,7 @@
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    <DebugSymbols>true</DebugSymbols>
@@ -57,6 +59,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>
@@ -65,6 +68,7 @@
    <DebugType>pdbonly</DebugType>
    <PlatformTarget>x86</PlatformTarget>
    <ErrorReport>prompt</ErrorReport>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="AxInterop.gregn6Lib">
@@ -183,12 +187,6 @@
    <Compile Include="数据导入\Gy_DataIn_RoutingBill.designer.cs">
      <DependentUpon>Gy_DataIn_RoutingBill.cs</DependentUpon>
    </Compile>
    <Compile Include="数据导入\Gy_StdWorkTimes_RoutingBill.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="数据导入\Gy_StdWorkTimes_RoutingBill.designer.cs">
      <DependentUpon>Gy_StdWorkTimes_RoutingBill.cs</DependentUpon>
    </Compile>
    <Compile Include="数据导入\Gy_DataIn_RoutingBill_New.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -285,10 +283,6 @@
    </EmbeddedResource>
    <EmbeddedResource Include="数据导入\Gy_DataIn_RoutingBill.resx">
      <DependentUpon>Gy_DataIn_RoutingBill.cs</DependentUpon>
      <SubType>Designer</SubType>
    </EmbeddedResource>
    <EmbeddedResource Include="数据导入\Gy_StdWorkTimes_RoutingBill.resx">
      <DependentUpon>Gy_StdWorkTimes_RoutingBill.cs</DependentUpon>
      <SubType>Designer</SubType>
    </EmbeddedResource>
    <EmbeddedResource Include="数据导入\Gy_DataIn_RoutingBill_New.resx">