From 15a2eca730d0cb1c4a8b115bd67e52f0b189ea95 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 28 十月 2024 17:55:29 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 8debef8..181a571 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -409,6 +409,11 @@
<Content Include="views\鍩虹璧勬枡\閫氱敤鍩虹璧勬枡\Gy_CommonBaseData.html" />
<Content Include="views\鍩虹璧勬枡\闅愯棌鍒楄缃甛Gy_GridView_Hide_New.html" />
<Content Include="views\宸ヨ祫绠＄悊\瀹氶鐢宠\Pay_ProcPriceRequestBillCheckQuery.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫鎶ヨ〃\Pay_PayWorkShopSumReport.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫鎶ヨ〃\Pay_PaymentDayCheckReport.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫鎶ヨ〃\Pay_PaymentMonthSumReport.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫鎶ヨ〃\Pay_PaymentTimeSumReport.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫鎶ヨ〃\Pay_PaymentPieceSumReport.html" />
<Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫杩愮畻\Pay_SalaryCalculate_New.html" />
<Content Include="views\宸ヨ祫绠＄悊\鎶�鑳借�冩牳\HR_EmployeeSkillExamBill.html" />
<Content Include="views\宸ヨ祫绠＄悊\鎶�鑳借�冩牳\HR_EmployeeSkillExamBillList.html" />
@@ -549,6 +554,7 @@
<Content Include="views\杞﹂棿绠＄悊\浜х嚎\MES_AssemblyTraceabilityList.html" />
<Content Include="views\杞﹂棿绠＄悊\浜х嚎\MES_ProductionLinePackaging.html" />
<Content Include="views\杞﹂棿绠＄悊\浜х嚎\MES_ProductionLinePackagingList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\浜х嚎\MES_WhiteLabelGeneration.html" />
<Content Include="views\杞﹂棿绠＄悊\浜х嚎\ProcessWIPReport.html" />
<Content Include="views\杞﹂棿绠＄悊\浜х嚎\RetrospectionCustomerReport.html" />
<Content Include="views\杞﹂棿绠＄悊\浜х嚎\Sc_GroupOrderBill.html" />
@@ -578,6 +584,7 @@
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_PressurizedWaterNoOutReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鍚姩鐐规鍗昞Gy_WorkBeginDotCheckListBill.html" />
<Content Include="views\杞﹂棿绠＄悊\鍚姩鐐规鍗昞Gy_WorkBeginDotCheckListBillList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Mes_OrderProcFlowAllReport_ICMO.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_MouldRequirementDay.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_CompareOrderToSelloutReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_HICMMaterStatisticsList.html" />
@@ -1136,6 +1143,7 @@
<Content Include="views\grf\閫佽揣鍗�%28鏍囩绾�%29.grf" />
<Content Include="views\grf\閫佽揣鍗�.grf" />
<Content Include="views\grf\鍙栨牱鍗�.grf" />
+ <Content Include="views\grf\15鐧芥爣鎵撳嵃.grf" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
--
Gitblit v1.9.1