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

YL

2021-10-15 78f964174e7ecab03d227a859a9605ab57d799f5

 WebTM/WebTM.csproj

@@ -528,6 +528,8 @@
    <Content Include="views\基础资料\公用基础资料\Gy_EquipMent.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_WorkCenter.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_Currency.html" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_EquipMaintainBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_EquipMaintainPlanBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Gy_Material.aspx" />
    <Content Include="views\基础资料\公用基础资料\Gy_DepartmentList.html" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldProdInStockBill.aspx" />
@@ -542,6 +544,7 @@
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldOtherOutStockBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldProdMoveStockBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldProdOutStockBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldTypeBill.aspx" />
    <Content Include="views\基础资料\工资基础资料\Gy_ProcPriceList.html" />
    <Content Include="views\基础资料\工资基础资料\Gy_Group_Add_Edit.html" />
    <Content Include="views\基础资料\工资基础资料\Gy_ProcPrice.html" />
@@ -584,7 +587,8 @@
    <Content Include="views\工资管理\工资结算单%28个人%29\Pay_SingleBalBill.html" />
    <Content Include="views\工资管理\工资结算单%28其他%29\Pay_OtherBalBill.html" />
    <Content Include="views\工资管理\工资结算单%28其他%29\Pay_OtherBalBillList.html" />
    <Content Include="views\工资管理\考勤汇报单\Kf_BarCodeEditDlg.html" />
    <Content Include="views\工资管理\考勤汇报单\Pay_WorkTimesBill.html" />
    <Content Include="views\工资管理\考勤汇报单\Pay_WorkTimesBillList.html" />
    <Content Include="views\模治具管理\模具处理出库单\Sc_MouldScrapOutBill_PDA.html" />
    <Content Include="views\模治具管理\模具寿命调整单\Sc_MouldLifeChangeBill_PDA.html" />
    <Content Include="views\模治具管理\模具生产退库单\Sc_MouldProdBackBill_PDA.html" />
@@ -825,6 +829,20 @@
    <Compile Include="App_Data\MssqlReportData.cs" />
    <Compile Include="App_Data\ReportData.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_EquipMaintainBill.aspx.cs">
      <DependentUpon>xmlLBM_EquipMaintainBill.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_EquipMaintainBill.aspx.designer.cs">
      <DependentUpon>xmlLBM_EquipMaintainBill.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_EquipMaintainPlanBill.aspx.cs">
      <DependentUpon>xmlLBM_EquipMaintainPlanBill.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_EquipMaintainPlanBill.aspx.designer.cs">
      <DependentUpon>xmlLBM_EquipMaintainPlanBill.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Gy_Material.aspx.cs">
      <DependentUpon>xmlLBM_Gy_Material.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
@@ -923,6 +941,13 @@
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_MouldProdOutStockBill.aspx.designer.cs">
      <DependentUpon>xmlLBM_MouldProdOutStockBill.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_MouldTypeBill.aspx.cs">
      <DependentUpon>xmlLBM_MouldTypeBill.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_MouldTypeBill.aspx.designer.cs">
      <DependentUpon>xmlLBM_MouldTypeBill.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\生产工序管理\工序汇报单\xmlLBM_ProcessReport.aspx.cs">
      <DependentUpon>xmlLBM_ProcessReport.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>