From d22060f0235b8005e9259c4f13141df784152309 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 20 四月 2026 09:49:05 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index a452417..3626108 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -196,6 +196,8 @@
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_EnvironmentTestItem.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_ErrMsgBackType.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_EnvironmentTestSchemeBillList.html" />
+ <Content Include="views\WMS鎵爜妯″潡\鍙楁墭鍔犲伐鍏ュ簱\Kf_InceptEntInBillList_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\鍙楁墭鍔犲伐鍏ュ簱\Kf_InceptEntInBill_PDA.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" />
@@ -629,6 +631,8 @@
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CarTypeEdit.html" />
<Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_WorkType_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鎴愭湰鍩虹璧勬枡\Add_Edit_Gy_CostAverageType.html" />
+ <Content Include="views\鍩虹璧勬枡\鎴愭湰鍩虹璧勬枡\Cb_OtherOutBill_CostSubjectDetail.html" />
+ <Content Include="views\鍩虹璧勬枡\鎴愭湰鍩虹璧勬枡\Cb_OtherOutBill_CostSubjectDetail_excelimport.html" />
<Content Include="views\鍩虹璧勬枡\鎴愭湰鍩虹璧勬枡\CB_Wip_excelImport.html" />
<Content Include="views\鍩虹璧勬枡\鎴愭湰鍩虹璧勬枡\Gy_CostAverageTypeList.html" />
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Add_Edit_Gy_ProcMul.html" />
@@ -683,6 +687,9 @@
<Content Include="views\鎴愭湰绠$悊\璐圭敤鍗曞紩鍏CB_CostAccounting.html" />
<Content Include="views\鎴愭湰绠$悊\璐圭敤鍗曞紩鍏CB_ItemMoneyBillImport.html" />
<Content Include="views\鎴愭湰绠$悊\璐圭敤鍗曞紩鍏CB_ItemMoneyBill_Excel.html" />
+ <Content Include="views\鏁伴噰绠$悊\DAQ_EquipRunningSlice.html" />
+ <Content Include="views\鏁伴噰绠$悊\DAQ_EvidenceEquipmentCockpit.html" />
+ <Content Include="views\鏁伴噰绠$悊\DAQ_EvidenceEquipmentCockpitDetail.html" />
<Content Include="views\鏉$爜鏄庣粏\Kf_MateOutBillList_CodeDetail.html" />
<Content Include="views\妗堜緥浠g爜\鍗庤繙\HY_HistogramReport_ForPCSCheckNote.html" />
<Content Include="views\妗堜緥浠g爜\鍗庤繙\HY_HistogramReport.html" />
--
Gitblit v1.9.1