From de3286883474ea9e9549801e0185480deb005497 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期三, 02 四月 2025 17:12:12 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

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

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 590b10c..63a7ce4 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -413,9 +413,14 @@
     <Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\Crm_CustomerAppealBillList.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_CheckNoteItem.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_EnvironmentTestItem.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_PiPe.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_PiPeMaterial.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_ProjectMoneyClass.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_TechnologyParameterType.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_MaintainLev.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_CheckItem_Excel.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_Customer_Excel.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_Department_excel.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_InspectBasis_Excel.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_InspectInstruMent_Excel.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_InspectMethod_Excel.html" />
@@ -423,7 +428,11 @@
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_InspectValue_Excel.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_QCCheckClass_Excel.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_QualityStd_Excel.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_Warehouse_Excel.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_BadPhenomena_Excel.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_PiPe.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_PiPeMaterial.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_ProjectMoneyClass.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_SupType_Excel.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_EquipType_Excel.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_CheckNoteItem_Excel.html" />
@@ -588,7 +597,9 @@
     <Content Include="views\鐢熶骇绠＄悊\娆犳枡杩愮畻\JIT_MaterialLevelShorAnalysisDetailReport.html" />
     <Content Include="views\鐢熶骇绠＄悊\娆犳枡杩愮畻\JIT_MaterialLevelShorAnalysisReport.html" />
     <Content Include="views\鐢熶骇绠＄悊\鏃ヨ鍒掓姤琛╘JIT_FuHeFenXiReport.html" />
+    <Content Include="views\鐢熶骇绠＄悊\鐝寮�鐝崟\Sc_ShiftsBeginInfoBillList_PDA.html" />
     <Content Include="views\鐢熶骇绠＄悊\鐝寮�鐝崟\Sc_ShiftsBeginInfoBillList.html" />
+    <Content Include="views\鐢熶骇绠＄悊\鐝寮�鐝崟\Sc_ShiftsBeginInfoBill_Add_Edit_PDA.html" />
     <Content Include="views\鐢熶骇绠＄悊\鐝寮�鐝崟\Sc_ShiftsBeginInfoBill_Add_Edit.html" />
     <Content Include="views\鐢熶骇绠＄悊\鎻愭枡璁″垝\JIT_PickUpCalculate.html" />
     <Content Include="views\鐢熶骇绠＄悊\鐢熶骇浠诲姟鍗昞Sc_ICMOBillOrProcessExchangeResumeList.html" />
@@ -2247,6 +2258,7 @@
     <Content Include="views\椤圭洰绠＄悊\鍩虹寤烘ā\Gy_TaskClass.html" />
     <Content Include="views\椤圭洰绠＄悊\宸ヤ綔浠诲姟\PM_WorkTaskBill_AutoLoadBillMain.html" />
     <Content Include="views\椤圭洰绠＄悊\宸ヤ綔浠诲姟\PM_WorkTaskBill_AutoLoadBillMain_20241226.html" />
+    <Content Include="views\椤圭洰绠＄悊\宸ョ▼椤圭洰\PM_ProjectTaskNeedSaveQuery.html" />
     <Content Include="views\椤圭洰绠＄悊\宸ョ▼椤圭洰\PM_ProjectTaskNeedCheckQuery.html" />
     <Content Include="views\椤圭洰绠＄悊\宸ョ▼椤圭洰\PM_CustomerProInfoBillMainList.html" />
     <Content Include="views\椤圭洰绠＄悊\宸ヤ綔浠诲姟\PM_WorkTaskMoneyBOMBill.html" />

--
Gitblit v1.9.1