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

YL

2021-10-12 4405a1a3a5444795c19eb8a577f27078f0b810fa

 WebTM/WebTM.csproj

@@ -116,6 +116,12 @@
    <Content Include="views\基础资料\公用基础资料\Gy_WorkCenter_Add_Edit.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_MouldType.html" />
    <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>
@@ -523,6 +529,11 @@
    <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" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldScrapOutStockBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldProdBackStockBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldMoveStockStepInStockBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldMoveStockStepOutStockBill.aspx" />
@@ -530,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" />
@@ -572,6 +582,7 @@
    <Content Include="views\工资管理\工资结算单%28个人%29\Pay_SingleBalBillList.html" />
    <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\模治具管理\模具处理出库单\Sc_MouldScrapOutBill_PDA.html" />
    <Content Include="views\模治具管理\模具寿命调整单\Sc_MouldLifeChangeBill_PDA.html" />
@@ -826,6 +837,41 @@
    <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>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_MouldRepairOutStockBill.aspx.designer.cs">
      <DependentUpon>xmlLBM_MouldRepairOutStockBill.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_MouldRepairInStockBill.aspx.cs">
      <DependentUpon>xmlLBM_MouldRepairInStockBill.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_MouldRepairInStockBill.aspx.designer.cs">
      <DependentUpon>xmlLBM_MouldRepairInStockBill.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_MouldScrapInStockBill.aspx.cs">
      <DependentUpon>xmlLBM_MouldScrapInStockBill.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_MouldScrapInStockBill.aspx.designer.cs">
      <DependentUpon>xmlLBM_MouldScrapInStockBill.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_MouldScrapOutStockBill.aspx.cs">
      <DependentUpon>xmlLBM_MouldScrapOutStockBill.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_MouldScrapOutStockBill.aspx.designer.cs">
      <DependentUpon>xmlLBM_MouldScrapOutStockBill.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_MouldProdBackStockBill.aspx.cs">
      <DependentUpon>xmlLBM_MouldProdBackStockBill.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
@@ -874,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>