合并分支

chenhaozhe

2026-04-10 9dc32795c75ee417f45ef3b5b42a005ada0411bf

 WebTM/WebTM.csproj

@@ -119,7 +119,11 @@
    <Content Include="layuiadmin\layui\layui.js" />
    <Content Include="layuiadmin\layui\layui2.10.0.js" />
    <Content Include="layuiadmin\modules\dropdown-disable.js" />
    <Content Include="layuiadmin\modules\numinput.js" />
    <Content Include="layuiadmin\modules\timerManager.js" />
    <Content Include="layuiadmin\modules\treeTable.js" />
    <Content Include="layuiadmin\qrcode\qrcode.js" />
    <Content Include="layuiadmin\qrcode\qrcode.min.js" />
    <Content Include="layuiadmin\resize\ResizeLeftRight.css" />
    <Content Include="layuiadmin\resize\ResizeLeftRight.js" />
    <Content Include="layuiadmin\QueryScheme.js" />
@@ -194,6 +198,7 @@
    <Content Include="views\Baseset\基础资料\Gy_EnvironmentTestSchemeBillList.html" />
    <Content Include="views\WMS扫码模块\委外领料\Kf_EntrustOutBackBill_CheckList_PDA.html" />
    <Content Include="views\WMS扫码模块\委外领料\Kf_EntrustOutBackBill_Check_PDA.html" />
    <Content Include="views\WMS扫码模块\库存查询\KF_ICInventory_WorkShop_PDA.html" />
    <Content Include="views\WMS扫码模块\生产入库\Kf_ProductInBackBill_CheckList_PDA.html" />
    <Content Include="views\WMS扫码模块\生产入库\Kf_ProductInBackBill_Check_PDA.html" />
    <Content Include="views\WMS扫码模块\生产领料\Kf_MateOutBackBill_Check_PDA.html" />
@@ -681,6 +686,8 @@
    <Content Include="views\案例代码\华远\HY_HistogramReport_ForPCSCheckNote.html" />
    <Content Include="views\案例代码\华远\HY_HistogramReport.html" />
    <Content Include="views\案例代码\华远\HY_InterfaceTest.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MouldDailyUseReport.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MouldMonthUseReport.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MoldMainoverdueWarnReport.html" />
    <Content Include="views\模治具管理\器具领用申请单\Sc_MouldOutRequestBillEdit.html" />
    <Content Include="views\模治具管理\器具领用申请单\Sc_MouldOutRequestBillList.html" />
@@ -2756,6 +2763,10 @@
    <Compile Include="App_Data\MssqlReportData.cs" />
    <Compile Include="App_Data\ReportData.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Cj_StationOutBillList_HZ.aspx.cs">
      <DependentUpon>xmlLBM_Cj_StationOutBillList_HZ.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Gy_WorkStationList.aspx.cs">
      <DependentUpon>xmlLBM_Gy_WorkStationList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>