From ceeb1a367bee96d0ce18209fc1862f270a3dca65 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期三, 20 十月 2021 22:10:57 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

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

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 804c8c4..9d856c9 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -113,10 +113,13 @@
     <Content Include="views\PublicPage\Organizations.html" />
     <Content Include="views\PublicPage\PeopleInformation.html" />
     <Content Include="views\ReportHtml.html" />
+    <Content Include="views\test\testRenderAutomationList.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_Warehouse.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Xt_ORGANIZATIONSList.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_Department.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Employee_Add_Edit_.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_EquipType.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_EquipTypeEdit.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_WorkCenter_Add_Edit.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_MouldType.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\b.grf" />
@@ -534,6 +537,7 @@
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Currency.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_EquipMaintainBill.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_EquipMaintainPlanBill.aspx" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_EquipTypeBill.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_Material.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_DepartmentList.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldDotCheckBill.aspx" />
@@ -746,7 +750,7 @@
     <Content Include="views\杞﹂棿绠＄悊\宸ュ簭杩涚珯鎺ユ敹鍗昞MES_StationInBill_PDA.html" />
     <Content Include="views\杞﹂棿绠＄悊\宸ュ簭杩涚珯鎺ユ敹鍗昞Sc_StationInBill_Mul_PDA.html" />
     <Content Include="views\杞﹂棿绠＄悊\宸ュ簭杩涚珯鎺ユ敹鍗昞Sc_StationInBill_Mul.html" />
-    <Content Include="views\閲囪喘绠＄悊\閲囪喘璁㈠崟\Cg_POOrderBillList1111.html" />
+    <Content Include="views\閲囪喘绠＄悊\閲囪喘璁㈠崟\Cg_POOrderBillList.html" />
     <Content Include="views\楠屾敹鍏ュ簱\浜у搧鍏ュ簱\Kf_ProductInBillList.html" />
     <Content Include="views\楠屾敹鍏ュ簱\鍏朵粬鍏ュ簱\Kf_OtherInBillList.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Kf_ProductInBillList.html" />
@@ -803,7 +807,6 @@
     <Content Include="views\閲囪喘绠＄悊\濮斿璁㈠崟\WW_EntrustOrderBillList.html" />
     <Content Include="views\閲囪喘绠＄悊\鏀舵枡閫氱煡鍗昞Cg_POInStockBillList.html" />
     <Content Include="views\閲囪喘绠＄悊\閫�鏂欓�氱煡鍗昞Cg_POInStockBackBillList.html" />
-    <Content Include="views\閲囪喘绠＄悊\閲囪喘璁㈠崟\Cg_POOrderBillList.html" />
     <Content Include="views\閿�鍞鐞哱閫�璐ч�氱煡鍗昞Xs_SeOutStockBackBillList.html" />
     <Content Include="views\閿�鍞鐞哱鍙戣揣閫氱煡鍗昞Xs_SeOutStockBillList.html" />
     <Content Include="views\閿�鍞鐞哱閿�鍞鍗昞Xs_SeOrderBillList.html" />
@@ -863,6 +866,13 @@
     <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_EquipMaintainPlanBill.aspx.designer.cs">
       <DependentUpon>xmlLBM_EquipMaintainPlanBill.aspx</DependentUpon>
     </Compile>
+    <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_EquipTypeBill.aspx.cs">
+      <DependentUpon>xmlLBM_EquipTypeBill.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_EquipTypeBill.aspx.designer.cs">
+      <DependentUpon>xmlLBM_EquipTypeBill.aspx</DependentUpon>
+    </Compile>
     <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_Material.aspx.cs">
       <DependentUpon>xmlLBM_Gy_Material.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>

--
Gitblit v1.9.1