Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

沈泽

2021-10-11 575d4fe3ad448bfc286becccbe5f3e7c6df1ae62

 WebTM/WebTM.csproj

@@ -118,6 +118,10 @@
    <Content Include="views\基础资料\公用基础资料\grf\b.grf" />
    <Content Include="views\grf\器具采购入库单.grf" />
    <Content Include="views\grf\容器采购入库.grf" />
    <Content Include="views\grf\器具分步式调入单.grf" />
    <Content Include="views\grf\器具分步式调出单.grf" />
    <Content Include="views\grf\器具领用退库单.grf" />
    <Content Include="views\grf\器具领用出库单.grf" />
    <None Include="Web.Debug.config">
      <DependentUpon>Web.config</DependentUpon>
    </None>
@@ -525,6 +529,7 @@
    <Content Include="views\基础资料\公用基础资料\Gy_Currency.html" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Gy_Material.aspx" />
    <Content Include="views\基础资料\公用基础资料\Gy_DepartmentList.html" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldProdInStockBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldRepairOutStockBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldRepairInStockBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldScrapInStockBill.aspx" />
@@ -536,7 +541,6 @@
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldOtherOutStockBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldProdMoveStockBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldProdOutStockBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldProdInStockBill.aspx" />
    <Content Include="views\基础资料\工资基础资料\Gy_ProcPriceList.html" />
    <Content Include="views\基础资料\工资基础资料\Gy_Group_Add_Edit.html" />
    <Content Include="views\基础资料\工资基础资料\Gy_ProcPrice.html" />
@@ -833,6 +837,13 @@
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Gy_Department_Edit.aspx.designer.cs">
      <DependentUpon>xmlLBM_Gy_Department_Edit.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_MouldProdInStockBill.aspx.cs">
      <DependentUpon>xmlLBM_MouldProdInStockBill.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_MouldProdInStockBill.aspx.designer.cs">
      <DependentUpon>xmlLBM_MouldProdInStockBill.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_MouldRepairOutStockBill.aspx.cs">
      <DependentUpon>xmlLBM_MouldRepairOutStockBill.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
@@ -909,13 +920,6 @@
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_MouldProdOutStockBill.aspx.designer.cs">
      <DependentUpon>xmlLBM_MouldProdOutStockBill.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_MouldProdInStockBill.aspx.cs">
      <DependentUpon>xmlLBM_MouldProdInStockBill.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_MouldProdInStockBill.aspx.designer.cs">
      <DependentUpon>xmlLBM_MouldProdInStockBill.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\生产工序管理\工序汇报单\xmlLBM_ProcessReport.aspx.cs">
      <DependentUpon>xmlLBM_ProcessReport.aspx</DependentUpon>