From 0f0e24b90a8180268c19c25d12f66fb08bcf622d Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期三, 11 十二月 2024 09:42:26 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

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

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index a099b9b..b1a2d78 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -156,6 +156,8 @@
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_ClassTimePrjList.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_ConveyCompList.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_ConveyTypeList.html" />
+    <Content Include="views\Baseset\鍩虹璧勬枡\Gy_ErrMsgBackType.html" />
+    <Content Include="views\Baseset\鍩虹璧勬枡\Gy_Shifts.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_GroupList.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_Source.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_ProcessList.html" />
@@ -471,6 +473,12 @@
     <Content Include="views\妯℃不鍏风鐞哱妯″叿鏀瑰埗鍏ュ簱鍗昞Sc_MouldRepairInBill_PDA_old.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯″叿鏀瑰埗鍑哄簱鍗昞Sc_MouldRepairOutBillList_PDA.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯″叿鏀瑰埗鍑哄簱鍗昞Sc_MouldRepairOutBill_PDA_old.html" />
+    <Content Include="views\妯℃不鍏风鐞哱妯″叿鏁呴殰缁翠慨鍗昉DA\Sc_MouldRepairWorkBill_PDAEdit.html" />
+    <Content Include="views\妯℃不鍏风鐞哱妯″叿鏁呴殰缁翠慨鍗昉DA\Sc_MouldRepairWorkBillList_PDA.html" />
+    <Content Include="views\妯℃不鍏风鐞哱妯″叿鏁呴殰缁翠慨鍗昉DA\Sc_MouldRepairWorkBill_PDA.html" />
+    <Content Include="views\妯℃不鍏风鐞哱妯″叿鏁呴殰缁翠慨鍗昉DA\Sc_MouldConkBookBill_PDAEdit.html" />
+    <Content Include="views\妯℃不鍏风鐞哱妯″叿鏁呴殰缁翠慨鍗昉DA\Sc_MouldConkBookBillList_PDA.html" />
+    <Content Include="views\妯℃不鍏风鐞哱妯″叿鏁呴殰缁翠慨鍗昉DA\Sc_MouldConkBookBill_PDA.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯″叿鐢熶骇閫�搴撳崟\Sc_MouldProdBackBillList_PDA.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯″叿鐢熶骇閫�搴撳崟\Sc_MouldProdBackBill_PDA_old.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯″叿鐢熶骇棰嗙敤鍗昞Sc_MouldProdOutBillList_PDA.html" />
@@ -645,6 +653,7 @@
     <Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\Kf_PressurizedWaterNoOutReport.html" />
     <Content Include="views\閲囪喘绠$悊\浠樻鍗昞YF_PayMentBillQuery.html" />
     <Content Include="views\閲囪喘绠$悊\搴斾粯鍗昞Cg_PayableBillQuery.html" />
+    <Content Include="views\閲囪喘绠$悊\搴斾粯鍗昞Cg_PayableBillCheckQuery.html" />
     <Content Include="views\閲囪喘绠$悊\鏀舵枡閫氱煡鍗昞Cg_POInStockBillQuery.html" />
     <Content Include="views\閲囪喘绠$悊\閲囪喘鎶ヨ〃\Gy_SupplierPayPlanReport.html" />
     <Content Include="views\閲囪喘绠$悊\閲囪喘鍚堝悓\Add_Edit_Cg_ContractBillList.html" />

--
Gitblit v1.9.1