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

YL

2021-10-19 f779a7abb0bc5a96f11d79bf3aab8161853a6ca5

 WebTM/WebTM.csproj

@@ -536,6 +536,8 @@
    <Content Include="views\基础资料\公用基础资料\Gy_DepartmentList.html" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldDotCheckBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldDotCheckPlanBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldMaintainBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldMaintainPlanBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldProdInStockBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldRepairOutStockBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldRepairInStockBill.aspx" />
@@ -591,6 +593,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\工资管理\工资结算单%28集体%29\Pay_GroupBalBill.html" />
    <Content Include="views\工资管理\工资结算单%28集体%29\Pay_GroupBalBillList.html" />
    <Content Include="views\工资管理\考勤汇报单\Pay_WorkTimesBill.html" />
    <Content Include="views\工资管理\考勤汇报单\Pay_WorkTimesBillList.html" />
    <Content Include="views\模治具管理\模具处理出库单\Sc_MouldScrapOutBill_PDA.html" />
@@ -721,8 +725,10 @@
    <Content Include="views\质量管理\检验方案单\QC_CheckProjectList.html" />
    <Content Include="views\质量管理\首件检验单\QC_FirstPieceCheckBillList.html" />
    <Content Include="views\质量管理\首件检验单\QC_Add_Edit_FirstPieceCheckBill.html" />
    <Content Include="views\车间管理\委外工序发出单\Cj_StationEntrustInBill_Mul_PDA.html" />
    <Content Include="views\车间管理\委外工序发出单\Cj_StationEntrustInBill_PDA.html" />
    <Content Include="views\车间管理\委外工序发出单\Cj_StationEntrustInBill_Mul.html" />
    <Content Include="views\车间管理\委外工序接收单\Cj_StationEntrustOutBill_Mul_PDA.html" />
    <Content Include="views\车间管理\委外工序接收单\Cj_StationEntrustOutBill_Mul.html" />
    <Content Include="views\车间管理\委外工序接收单\Cj_StationEntrustOutBill_PDA.html" />
    <Content Include="views\车间管理\工序出站汇报单\Cj_StationOutBill.html" />
@@ -737,6 +743,7 @@
    <Content Include="views\车间管理\工序进站接收单\MES_StationInBill_PDA.html" />
    <Content Include="views\车间管理\工序进站接收单\Sc_StationInBill_Mul_PDA.html" />
    <Content Include="views\车间管理\工序进站接收单\Sc_StationInBill_Mul.html" />
    <Content Include="views\采购管理\采购订单\Cg_POOrderBillList1111.html" />
    <Content Include="views\验收入库\产品入库\Kf_ProductInBillList.html" />
    <Content Include="views\验收入库\其他入库\Kf_OtherInBillList.html" />
    <Content Include="views\模治具管理\模治具管理\Kf_ProductInBillList.html" />
@@ -881,6 +888,20 @@
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_MouldDotCheckPlanBill.aspx.designer.cs">
      <DependentUpon>xmlLBM_MouldDotCheckPlanBill.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_MouldMaintainBill.aspx.cs">
      <DependentUpon>xmlLBM_MouldMaintainBill.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_MouldMaintainBill.aspx.designer.cs">
      <DependentUpon>xmlLBM_MouldMaintainBill.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_MouldMaintainPlanBill.aspx.cs">
      <DependentUpon>xmlLBM_MouldMaintainPlanBill.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_MouldMaintainPlanBill.aspx.designer.cs">
      <DependentUpon>xmlLBM_MouldMaintainPlanBill.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_MouldProdInStockBill.aspx.cs">
      <DependentUpon>xmlLBM_MouldProdInStockBill.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
@@ -983,7 +1004,6 @@
  <ItemGroup>
    <Folder Include="views\仓存管理\调拨单核对\" />
    <Folder Include="views\仓存管理\调拨单稽核\" />
    <Folder Include="views\工资管理\工资结算单%28集体%29\" />
  </ItemGroup>
  <PropertyGroup>
    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>