From 9dc32795c75ee417f45ef3b5b42a005ada0411bf Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期五, 10 四月 2026 12:55:17 +0800
Subject: [PATCH] 合并分支
---
WebTM/WebTM.csproj | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 0c054ba..17a6420 100644
--- a/WebTM/WebTM.csproj
+++ b/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>
--
Gitblit v1.9.1