From 19a2c2bd5463b295771f31e169ef9db976e94973 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 26 九月 2022 15:41:33 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

---
 WebTM/WebTM.csproj |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 5d0bbed..8e9be20 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -101,6 +101,8 @@
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_ClassTimePrjGroupEdit.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_ClassTimePrjList.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_LineCenter.html" />
+    <Content Include="views\Baseset\鍩虹璧勬枡\Gy_MaterList.html" />
+    <Content Include="views\Baseset\鍩虹璧勬枡\Gy_MouldList.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_OrganizationtList.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_QCCheckProjectListView.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_RoutingBillList.html" />
@@ -161,11 +163,11 @@
     <Content Include="views\浠撳瓨绠$悊\鏉$爜搴撳瓨\KF_ICInventoryList_WMS.html" />
     <Content Include="views\浠撳瓨绠$悊\鏉$爜鐢熸垚\Gy_BarCodeBill.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_OrderBackInfo.html" />
-    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_OrderBackInfo.html.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_OrderLev.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_WorkPayType.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_WorkType.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Pay_PeriodInfoSet.html" />
+    <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MateMouldList.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_TechnologyParameterUnitList.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_TechnologyParameterUnit_Add_Edit_.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_TechnologyParameter_Add_Edit_.html" />
@@ -679,6 +681,7 @@
     <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckList.html" />
     <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MaintainEdit.html" />
     <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MaintainList.html" />
+    <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MateMould.html" />
     <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairCheckEdit.html" />
     <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairCheckList.html" />
     <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairEdit.html" />
@@ -1003,6 +1006,7 @@
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭鍑虹珯姹囨姤鍗昞Sc_StationOutBill_Mul_PDA.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭鍑虹珯姹囨姤鍗昞Sc_StationOutBill_Mul.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭鍑虹珯姹囨姤鍗昞Cj_StationOutBillList.html" />
+    <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangePlanDate.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeIssue.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBill.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeIssueBillList.html" />

--
Gitblit v1.9.1