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

yusijie

2024-10-23 b78ab7df8843b43c7a5078dfafbc23e76f5175c8

 WebTM/WebTM.csproj

@@ -315,6 +315,7 @@
    <Content Include="views\WMS扫码模块\销售出库\Kf_SellOutBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\销售出库\Kf_SellOutBillList_QiaoYi_PDA.html" />
    <Content Include="views\WMS扫码模块\销售出库\Kf_SellOutBill_QiaoYi_PDA.html" />
    <Content Include="views\人事管理\人员履历\HR_PersonnelResumeList.html" />
    <Content Include="views\人事管理\异常反馈单\OA_ErrMsgBackBillList_PDA.html" />
    <Content Include="views\人事管理\异常反馈单\OA_ErrMsgBackBill_PDA.html" />
    <Content Include="views\仓存管理\三点照合扫码记录单\WMS_CusBarCodeCheckBillList.html" />
@@ -380,6 +381,7 @@
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HPOInStockBillByID.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HSeOutStockBillListByID.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Kf_SellOutBillListByID.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ICMOBillListTK.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ICMOReportBillList2.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ICMOReportBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_QC_TakeSampleCheckBillMainList.aspx" />
@@ -464,6 +466,7 @@
    <Content Include="views\系统管理\用户管理\Xt_UserRightQuery.html" />
    <Content Include="views\计划管理\Excel\Gy_Group_Excel.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBillCheckQuery.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBillCloseList.html" />
    <Content Include="views\计划管理\工艺路线\Pay_ProcPriceTypeChangeReport.html" />
    <Content Include="views\设备管理\Sb_Add_EquipRepairSignBillList.html" />
    <Content Include="views\设备管理\Sb_EquipRepairSignBillList_PDA.html" />
@@ -2355,6 +2358,13 @@
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Pay_WorkTimesBillList.aspx.designer.cs">
      <DependentUpon>xmlLBM_Pay_WorkTimesBillList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_ICMOBillListTK.aspx.cs">
      <DependentUpon>xmlLBM_Sc_ICMOBillListTK.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_ICMOBillListTK.aspx.designer.cs">
      <DependentUpon>xmlLBM_Sc_ICMOBillListTK.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_ICMOReportBillList2.aspx.cs">
      <DependentUpon>xmlLBM_Sc_ICMOReportBillList2.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
@@ -2736,9 +2746,6 @@
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcessExchangeBillList.aspx.cs">
      <DependentUpon>xmlLBM_Sc_ProcessExchangeBillList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcessExchangeBillList.aspx.designer.cs">
      <DependentUpon>xmlLBM_Sc_ProcessExchangeBillList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcessExchangeBillList_SubList.aspx.cs">
      <DependentUpon>xmlLBM_Sc_ProcessExchangeBillList_SubList.aspx</DependentUpon>