From 1e70a508038cd47bed7a00f33bf444a64d7ffbc0 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 26 八月 2024 17:37:41 +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 1ebb2ea..3d31fb5 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -173,6 +173,7 @@
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_TechnologyParameterList.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_TechParameterUnitList.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_StockPlaceListNew.html" />
+    <Content Include="views\Baseset\鍩虹璧勬枡\Gy_HProjectGroup.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_UnitGroup.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_CustomerListNew.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_WarehouseListNew.html" />
@@ -377,6 +378,7 @@
     <Content Include="views\鍩虹璧勬枡\闅愯棌鍒楄缃甛Gy_GridView_Hide_New.html" />
     <Content Include="views\宸ヨ祫绠$悊\鎶�鑳借�冩牳\HR_EmployeeSkillExamBill.html" />
     <Content Include="views\宸ヨ祫绠$悊\鎶�鑳借�冩牳\HR_EmployeeSkillExamBillList.html" />
+    <Content Include="views\搴旀敹绠$悊\鎶ヨ〃鍒嗘瀽\Xs_SeOrderBarCodeInAndOutStockDetailReport.html" />
     <Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿鎶ヨ〃\Sc_MouldLifeUsePicReport.html" />
     <Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿鎶ヨ〃\Sc_MouldDotCheckTaskReport.html" />
     <Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿鎶ヨ〃\Sc_MouldMaintainTaskReport.html" />
@@ -480,7 +482,9 @@
     <Content Include="views\璐ㄩ噺绠$悊\璐ㄩ噺鎶ヨ〃\QC_RegistrationForTestingReport.html" />
     <Content Include="views\璐ㄩ噺绠$悊\璐ㄩ噺鎶ヨ〃\QC_MoistureContentDataLedger.html" />
     <Content Include="views\璐ㄩ噺绠$悊\璐ㄩ噺鎶ヨ〃\QC_QualityStatisticsDailyReport.html" />
+    <Content Include="views\璐ㄩ噺绠$悊\璐ㄩ噺鎶ヨ〃\QC_PPMReport.html" />
     <Content Include="views\璐ㄩ噺绠$悊\璐ㄩ噺鎶ヨ〃\QC_TechnologyParameterClass.html" />
+    <Content Include="views\璐ㄩ噺绠$悊\璐ㄩ噺鎶ヨ〃\QC_SkillExamMonthSumReport.html" />
     <Content Include="views\璐ㄩ噺绠$悊\璐ㄩ噺鎶ヨ〃\SB_TechnologyParameterList.html" />
     <Content Include="views\璐ㄩ噺绠$悊\璐ㄩ噺鎶ヨ〃\QC_ProcessPerformanceFirstPass.html" />
     <Content Include="views\璐ㄩ噺绠$悊\璐ㄩ噺鎶ヨ〃\Sc_StationOutBil_HProc.html" />
@@ -541,6 +545,7 @@
     <Content Include="views\閲囪喘绠$悊\閲囪喘鎶ヨ〃\Cg_POMaterialPriceReport.html" />
     <Content Include="views\閲囪喘绠$悊\閲囪喘鎶ヨ〃\Cg_POOrderBillProcessSumReport.html" />
     <Content Include="views\閲囪喘绠$悊\閲囪喘璁㈠崟\Cg_POOrderBillCheckQuery.html" />
+    <Content Include="views\閲囪喘绠$悊\閲囪喘璁㈠崟\Cg_POOrderBillQuery.html" />
     <Content Include="views\閿�鍞鐞哱閿�鍞悎鍚孿Add_Edit_Xs_ContractBillList.html" />
     <Content Include="views\閿�鍞鐞哱閿�鍞悎鍚孿Xs_ContractBillList.html" />
     <Content Include="views\椤圭洰绠$悊\鍩虹寤烘ā\Add_Edit_PM_CustomerProInfoBill.html" />

--
Gitblit v1.9.1