From c3c7ccae2e0292e12223200b8e6c4965365cc3de Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 06 三月 2024 09:22:53 +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 1779acd..738fbf0 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -389,6 +389,8 @@
     <Content Include="views\宸ヨ祫绠$悊\鑰冨嫟姹囨姤鍗昞Pay_WorkTimesSumQueryBillList.html" />
     <Content Include="views\宸ヨ祫绠$悊\璇峰亣鐢宠\Pay_OutApplyBill.html" />
     <Content Include="views\宸ヨ祫绠$悊\璇峰亣鐢宠\Pay_OutApplyBillList.html" />
+    <Content Include="views\搴旀敹绠$悊\鎶ヨ〃鍒嗘瀽\Xs_CusBalanceReport.html" />
+    <Content Include="views\搴旀敹绠$悊\鎶ヨ〃鍒嗘瀽\Xs_CusBalanceReport_HIsUsingBalanceEntry.html" />
     <Content Include="views\搴旀敹绠$悊\鎶ヨ〃鍒嗘瀽\YS_ContactBalReport_ImportByExcel.html" />
     <Content Include="views\搴旀敹绠$悊\鎶ヨ〃鍒嗘瀽\YS_ContactBalReport.html" />
     <Content Include="views\搴旀敹绠$悊\鎶ヨ〃鍒嗘瀽\YS_CusShouldIncomeEntryReport.html" />
@@ -477,6 +479,7 @@
     <Content Include="views\璐ㄩ噺绠$悊\璐ㄩ噺鎶ヨ〃\QC_ProductQtyWarningReport.html" />
     <Content Include="views\璐ㄩ噺绠$悊\璐ㄩ噺鎶ヨ〃\QC_QualityTraceabilityReport.html" />
     <Content Include="views\璐ㄩ噺绠$悊\璐ㄩ噺鎶ヨ〃\QC_ProdBadReasonStatistics_Sum.html" />
+    <Content Include="views\璐ㄩ噺绠$悊\棣栦欢妫�楠屽崟\MES_ColorRecordBillList_PDA.html" />
     <Content Include="views\杞﹂棿绠$悊\鍗曞搧杩囩珯\BadQueryReport.html" />
     <Content Include="views\璐ㄩ噺绠$悊\棣栦欢妫�楠屽崟\QC_Add_Edit_FirstPieceCheckBill - 澶嶅埗.html" />
     <Content Include="views\杞﹂棿绠$悊\鍗曞搧杩囩珯\Cj_CollectionOfSingleProductDefects.html" />
@@ -1584,6 +1587,8 @@
     <Content Include="views\閲囪喘绠$悊\閲囪喘閫�鏂欏崟\Cg_PurchaseReturn_Add_Up.html" />
     <Content Include="views\閿�鍞鐞哱淇$敤棰濆害鐢宠鍗昞Xs_CusRatingChangeBill.html" />
     <Content Include="views\閿�鍞鐞哱淇$敤棰濆害鐢宠鍗昞Xs_CusRatingChangeBillList.html" />
+    <Content Include="views\閿�鍞鐞哱鍏朵粬搴斾粯鍗昞YF_PayMentOtherBillMain.html" />
+    <Content Include="views\閿�鍞鐞哱鍏朵粬搴斾粯鍗昞YF_PayMentOtherBillMainList.html" />
     <Content Include="views\閿�鍞鐞哱鍏朵粬搴旀敹鍗昞YS_ReceiveOtherBillMain.htmlList.html" />
     <Content Include="views\閿�鍞鐞哱鍏朵粬搴旀敹鍗昞YS_ReceiveOtherBillMain.html" />
     <Content Include="views\閿�鍞鐞哱鍙戣揣閫氱煡鍗昞Add_Edit_Xs_SeOutStockBillList.html" />

--
Gitblit v1.9.1