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

王 垚

2021-11-17 ba6d2fff0224e8694c782a7e1154d0abd7a32c20

 WorkM/WorkM.csproj

@@ -95,6 +95,12 @@
    <Compile Include="Form2.Designer.cs">
      <DependentUpon>Form2.cs</DependentUpon>
    </Compile>
    <Compile Include="报表分析\DefectiveDetailedYieldReport.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="报表分析\DefectiveDetailedYieldReport.designer.cs">
      <DependentUpon>DefectiveDetailedYieldReport.cs</DependentUpon>
    </Compile>
    <Compile Include="报表分析\Mes_ProductionLinePackagingList.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -148,6 +154,12 @@
    </Compile>
    <Compile Include="报表分析\Mes_TraceabilityList.Designer.cs">
      <DependentUpon>Mes_TraceabilityList.cs</DependentUpon>
    </Compile>
    <Compile Include="报表分析\MES_WIPProcReport _WIP.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="报表分析\MES_WIPProcReport _WIP.designer.cs">
      <DependentUpon>MES_WIPProcReport _WIP.cs</DependentUpon>
    </Compile>
    <Compile Include="报表分析\Mes_WIPSumReportDateReport.cs">
      <SubType>Form</SubType>
@@ -358,6 +370,18 @@
    </Compile>
    <Compile Include="流转卡管理\MES_StationOutBill.designer.cs">
      <DependentUpon>MES_StationOutBill.cs</DependentUpon>
    </Compile>
    <Compile Include="流转卡管理\MES_StationOutBillList_BaoFei.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="流转卡管理\MES_StationOutBillList_BaoFei.designer.cs">
      <DependentUpon>MES_StationOutBillList_BaoFei.cs</DependentUpon>
    </Compile>
    <Compile Include="流转卡管理\MES_StationOutBillList_GeLi.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="流转卡管理\MES_StationOutBillList_GeLi.designer.cs">
      <DependentUpon>MES_StationOutBillList_GeLi.cs</DependentUpon>
    </Compile>
    <Compile Include="流转卡管理\MES_StationOutBillList_Bad.cs">
      <SubType>Form</SubType>
@@ -819,6 +843,10 @@
      <SubType>Designer</SubType>
      <DependentUpon>Form2.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="报表分析\DefectiveDetailedYieldReport.resx">
      <DependentUpon>DefectiveDetailedYieldReport.cs</DependentUpon>
      <SubType>Designer</SubType>
    </EmbeddedResource>
    <EmbeddedResource Include="报表分析\Mes_ProductionLinePackagingList.resx">
      <DependentUpon>Mes_ProductionLinePackagingList.cs</DependentUpon>
    </EmbeddedResource>
@@ -852,6 +880,10 @@
    </EmbeddedResource>
    <EmbeddedResource Include="报表分析\Mes_TraceabilityList.resx">
      <DependentUpon>Mes_TraceabilityList.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="报表分析\MES_WIPProcReport _WIP.resx">
      <DependentUpon>MES_WIPProcReport _WIP.cs</DependentUpon>
      <SubType>Designer</SubType>
    </EmbeddedResource>
    <EmbeddedResource Include="报表分析\Mes_WIPSumReportDateReport.resx">
      <DependentUpon>Mes_WIPSumReportDateReport.cs</DependentUpon>
@@ -993,6 +1025,14 @@
      <DependentUpon>MES_StationOutBill.cs</DependentUpon>
      <SubType>Designer</SubType>
    </EmbeddedResource>
    <EmbeddedResource Include="流转卡管理\MES_StationOutBillList_BaoFei.resx">
      <DependentUpon>MES_StationOutBillList_BaoFei.cs</DependentUpon>
      <SubType>Designer</SubType>
    </EmbeddedResource>
    <EmbeddedResource Include="流转卡管理\MES_StationOutBillList_GeLi.resx">
      <DependentUpon>MES_StationOutBillList_GeLi.cs</DependentUpon>
      <SubType>Designer</SubType>
    </EmbeddedResource>
    <EmbeddedResource Include="流转卡管理\MES_StationOutBillList_Bad.resx">
      <DependentUpon>MES_StationOutBillList_Bad.cs</DependentUpon>
      <SubType>Designer</SubType>