From 2641aa010bcdb06308f9b49100cc62e76a3c066b Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 26 十月 2023 13:58:49 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

---
 WebTM/WebTM.csproj |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 9930db5..bedfdf6 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -227,6 +227,8 @@
     <Content Include="views\浜轰簨绠$悊\绂昏亴鐢宠\HR_EmpDimissionBillList.html" />
     <Content Include="views\浜轰簨绠$悊\鑱屽憳寮傚姩鍗昞HR_EmpChangeBill.html" />
     <Content Include="views\浜轰簨绠$悊\鑱屽憳寮傚姩鍗昞HR_EmpChangeBillList.html" />
+    <Content Include="views\鍝佽川绠$悊\瀹㈣瘔澶勭悊\QC_CustomerAppealReport_Customer.html" />
+    <Content Include="views\鍝佽川绠$悊\瀹㈣瘔澶勭悊\QC_CustomerAppealReport_Sum.html" />
     <Content Include="views\鍝佽川绠$悊\瀹㈣瘔澶勭悊\Crm_CustomerAppealBill_KaiBei.html" />
     <Content Include="views\鍝佽川绠$悊\瀹㈣瘔澶勭悊\Crm_CustomerAppealBill.html" />
     <Content Include="views\鍝佽川绠$悊\瀹㈣瘔澶勭悊\Crm_CustomerAppealBillList.html" />
@@ -268,6 +270,7 @@
     <Content Include="views\宸ヨ祫绠$悊\璇峰亣鐢宠\Pay_OutApplyBillList.html" />
     <Content Include="views\鏉$爜鏄庣粏\Kf_BarCodeDetailQuery.html" />
     <Content Include="views\鐢熶骇绠$悊\浣滀笟鎸囧涔Gy_SOPBill_Video.html" />
+    <Content Include="views\鐢熶骇绠$悊\寮傚父鍙嶉鍗昞Sc_Reply_MESExecptFeedBackBill.html" />
     <Content Include="views\鐢熶骇绠$悊\鏃ヨ鍒掑熀纭�璧勬枡\Cg_PODemandPlanConfigBill_Excel.html" />
     <Content Include="views\鐢熶骇绠$悊\鏃ヨ鍒掓姤琛╘MaterialShorAnalysisReport.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇宸ヤ綅\Gy_SourceWorkStationSet.html" />
@@ -285,6 +288,8 @@
     <Content Include="views\璁″垝绠$悊\宸ヨ壓璺嚎\Gy_RoutingBillListQuery.html" />
     <Content Include="views\璁″垝绠$悊\宸ヨ壓璺嚎\Gy_RoutingBillList_His.html" />
     <Content Include="views\璁″垝绠$悊\宸ヨ壓璺嚎\Gy_RoutingBillSubList.html" />
+    <Content Include="views\璐ㄩ噺绠$悊\宸ュ簭妫�楠屽崟\MES_ProcessCheckBillList_PDA.html" />
+    <Content Include="views\璐ㄩ噺绠$悊\宸ュ簭妫�楠屽崟\MES_ProcessCheckBill_PDA.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆\MES_Sc_ProcessExchangeBillMain_Note_PDA.html" />
     <Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\Sc_ProcessErrStationReport.html" />
     <Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\Kf_MateOutSumReport_QiaoYi.html" />

--
Gitblit v1.9.1