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

cwjbxqmz

2024-02-06 0a56001e1b8e9ae7d2f39c982912cd6d10c22032

 WorkM/WorkM.csproj

@@ -107,6 +107,12 @@
    <Compile Include="报表分析\JIT_GetPPBomInfo.designer.cs">
      <DependentUpon>JIT_GetPPBomInfo.cs</DependentUpon>
    </Compile>
    <Compile Include="报表分析\Sc_ProcExchangeNoInReport.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="报表分析\Sc_ProcExchangeNoInReport.designer.cs">
      <DependentUpon>Sc_ProcExchangeNoInReport.cs</DependentUpon>
    </Compile>
    <Compile Include="报表分析\MES_ProdHoursSumReport.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -220,6 +226,24 @@
    </Compile>
    <Compile Include="报表分析\Pt_RadiumCarvingCodeBillList.designer.cs">
      <DependentUpon>Pt_RadiumCarvingCodeBillList.cs</DependentUpon>
    </Compile>
    <Compile Include="报表分析\Sc_WareHouseReport.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="报表分析\Sc_WareHouseReport.Designer.cs">
      <DependentUpon>Sc_WareHouseReport.cs</DependentUpon>
    </Compile>
    <Compile Include="报表分析\Sc_OverProdReport.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="报表分析\Sc_OverProdReport.Designer.cs">
      <DependentUpon>Sc_OverProdReport.cs</DependentUpon>
    </Compile>
    <Compile Include="报表分析\Sc_WorkShopReport.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="报表分析\Sc_WorkShopReport.Designer.cs">
      <DependentUpon>Sc_WorkShopReport.cs</DependentUpon>
    </Compile>
    <Compile Include="报表分析\WMS_BarCodeBackInfoReport.cs">
      <SubType>Form</SubType>
@@ -412,6 +436,12 @@
    </Compile>
    <Compile Include="流转卡管理\MES_StationOutBill.designer.cs">
      <DependentUpon>MES_StationOutBill.cs</DependentUpon>
    </Compile>
    <Compile Include="流转卡管理\MES_StationOutBillList_LastProc.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="流转卡管理\MES_StationOutBillList_LastProc.designer.cs">
      <DependentUpon>MES_StationOutBillList_LastProc.cs</DependentUpon>
    </Compile>
    <Compile Include="流转卡管理\MES_StationOutBillList_BaoFei.cs">
      <SubType>Form</SubType>
@@ -893,6 +923,10 @@
      <DependentUpon>JIT_GetPPBomInfo.cs</DependentUpon>
      <SubType>Designer</SubType>
    </EmbeddedResource>
    <EmbeddedResource Include="报表分析\Sc_ProcExchangeNoInReport.resx">
      <DependentUpon>Sc_ProcExchangeNoInReport.cs</DependentUpon>
      <SubType>Designer</SubType>
    </EmbeddedResource>
    <EmbeddedResource Include="报表分析\MES_ProdHoursSumReport.resx">
      <DependentUpon>MES_ProdHoursSumReport.cs</DependentUpon>
      <SubType>Designer</SubType>
@@ -964,6 +998,15 @@
    </EmbeddedResource>
    <EmbeddedResource Include="报表分析\Pt_RadiumCarvingCodeBillList.resx">
      <DependentUpon>Pt_RadiumCarvingCodeBillList.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="报表分析\Sc_WareHouseReport.resx">
      <DependentUpon>Sc_WareHouseReport.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="报表分析\Sc_OverProdReport.resx">
      <DependentUpon>Sc_OverProdReport.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="报表分析\Sc_WorkShopReport.resx">
      <DependentUpon>Sc_WorkShopReport.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="报表分析\WMS_BarCodeBackInfoReport.resx">
      <DependentUpon>WMS_BarCodeBackInfoReport.cs</DependentUpon>
@@ -1094,6 +1137,10 @@
      <DependentUpon>MES_StationOutBill.cs</DependentUpon>
      <SubType>Designer</SubType>
    </EmbeddedResource>
    <EmbeddedResource Include="流转卡管理\MES_StationOutBillList_LastProc.resx">
      <DependentUpon>MES_StationOutBillList_LastProc.cs</DependentUpon>
      <SubType>Designer</SubType>
    </EmbeddedResource>
    <EmbeddedResource Include="流转卡管理\MES_StationOutBillList_BaoFei.resx">
      <DependentUpon>MES_StationOutBillList_BaoFei.cs</DependentUpon>
      <SubType>Designer</SubType>