From 46b386cafba2ad5a568cd74bd14615510425da70 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 25 十一月 2022 17:16:57 +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 e21b6ed..a8bbdd1 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -111,7 +111,10 @@
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_QCCheckProjectListView.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_RoutingBillList.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_RoutingGroup.html" />
+    <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_UnitGroup.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_WarehouseListNew.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_WasterWHList.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_WHList.html" />
@@ -188,7 +191,7 @@
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_TechnologyParameterUnit_Add_Edit_.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_TechnologyParameter_Add_Edit_.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_TechParamByProcList.html" />
-    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_TechParamByProcList_Add_Edit_.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_TechParamByProc.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_WorkCenterDyCol.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_WorkPayType.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_WorkStationList.html" />
@@ -840,6 +843,7 @@
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_MouldFileList.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_MouldFile.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_MouldFileResume.html" />
+    <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱KF_BarCodeStatusChangeBill.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sb_Add_MouldRepairWorkBillList.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_Add_MouldConkBookBillList.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_Add_MouldDotCheckBillList.html" />

--
Gitblit v1.9.1