From 5c43b0d29fdab9e9c891dc64a0bf4051b4b3957d Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 03 七月 2025 13:23:38 +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 a539d4d..3afc85e 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -427,6 +427,7 @@
     <Content Include="views\浜轰簨绠$悊\鑱屽憳寮傚姩鍗昞HR_EmpChangeBill.html" />
     <Content Include="views\浜轰簨绠$悊\鑱屽憳寮傚姩鍗昞HR_EmpChangeBillList.html" />
     <Content Include="views\浠撳瓨绠$悊\鏉$爜鎶ヨ〃\Kf_ICInvBalList.html" />
+    <Content Include="views\浠撳瓨绠$悊\鏉$爜鐢熸垚\Gy_BarCodeBill_JiaNan.html" />
     <Content Include="views\浠撳瓨绠$悊\鐢熶骇鍏ュ簱鍗昞Kf_ProductInBillList.html" />
     <Content Include="views\浠撳瓨绠$悊\缁勬墭鍗昞Sc_PackUnionBillMain_Setto.html" />
     <Content Include="views\浠撳瓨绠$悊\瑁呯鍗昞Sc_PackUnionBillMain_Packing.html" />
@@ -671,6 +672,7 @@
     <Content Include="views\鐢熶骇绠$悊\鏃ヨ鍒掑熀纭�璧勬枡\JIT_NeedMaterPlanConfigBill_Excel.html" />
     <Content Include="views\鐢熶骇绠$悊\鏃ヨ鍒掓姤琛╘JIT_DayPlanPlatFormHistoryNoteReport.html" />
     <Content Include="views\鐢熶骇绠$悊\鏃ヨ鍒掓姤琛╘JIT_FuHeFenXiReportDetail.html" />
+    <Content Include="views\鐢熶骇绠$悊\鏃ヨ鍒掓姤琛╘Sc_ArrangeRiskICMOBillReport.html" />
     <Content Include="views\鐢熶骇绠$悊\鏃ヨ鍒掓姤琛╘ReportMOMaterReadysBillTotalList.html" />
     <Content Include="views\鐢熶骇绠$悊\娆犳枡杩愮畻\JIT_MaterialLevelShorAnalysisReport_His.html" />
     <Content Include="views\鐢熶骇绠$悊\娆犳枡杩愮畻\JIT_MaterialLevelShorAnalysis.html" />
@@ -887,6 +889,7 @@
     <Content Include="views\閲囪喘绠$悊\搴斾粯鍗昞Cg_PayableBillQuery.html" />
     <Content Include="views\閲囪喘绠$悊\搴斾粯鍗昞Cg_PayableBillCheckQuery.html" />
     <Content Include="views\閲囪喘绠$悊\鏀舵枡閫氱煡鍗昞Cg_POInStockBillQuery.html" />
+    <Content Include="views\閲囪喘绠$悊\鏀舵枡閫氱煡鍗昞Cg_POInStockBillList_JiaNan.html" />
     <Content Include="views\閲囪喘绠$悊\閲囪喘鎶ヨ〃\Gy_SupplierPayPlanReport.html" />
     <Content Include="views\閲囪喘绠$悊\閲囪喘鍚堝悓\Add_Edit_Cg_ContractBillList.html" />
     <Content Include="views\閲囪喘绠$悊\閲囪喘鍚堝悓\Cg_ContractBillList.html" />
@@ -1446,6 +1449,10 @@
     <Content Include="views\grf\15鐧芥爣鎵撳嵃.grf" />
     <Content Include="views\grf\杩芥函鐮�.grf" />
     <Content Include="views\grf\娉曞緥鏍囩.grf" />
+    <Content Include="views\grf\鐗╂枡鏉$爜_杩﹀崡.grf" />
+    <Content Include="views\grf\鍖呮潯鐮乢杩﹀崡1.grf" />
+    <Content Include="views\grf\鎵樻潯鐮乢杩﹀崡1.grf" />
+    <Content Include="views\grf\绠辨潯鐮乢杩﹀崡1.grf" />
     <None Include="Web.Debug.config">
       <DependentUpon>Web.config</DependentUpon>
     </None>

--
Gitblit v1.9.1