From 2accba697d08fbdfa334ee19c39c905b490c1045 Mon Sep 17 00:00:00 2001
From: 杨乐 <yang.le.192@qq.com>
Date: 星期一, 27 十二月 2021 08:49:42 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

---
 WebTM/WebTM.csproj |   28 ++++++++++++++++++++++++----
 1 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index b106070..6984a82 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -125,13 +125,11 @@
     <Content Include="views\ReportHtml.html" />
     <Content Include="views\test\testRenderAutomationList.html" />
     <Content Include="views\浠撳瓨绠＄悊\浠撳簱璋冩嫧\Kf_MoveStockStepOutBill_Fast.html" />
-    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_ClassTimePrjSub.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\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_ClassTimePrjSub.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Pay_PeriodInfoSet.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_WorkPayType.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_WorkType.html" />
@@ -144,8 +142,6 @@
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Employee_Add_Edit_.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_EquipType.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_EquipTypeEdit.html" />
-    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_ClassTimePrj.html" />
-    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_ClassTimePrj.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_WorkCenter_Add_Edit.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_MouldType.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\b.grf" />
@@ -169,6 +165,8 @@
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\鍣ㄥ叿鏀瑰埗鍏ュ簱鍗�.grf" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\鍣ㄥ叿鏀瑰埗鍑哄簱鍗�.grf" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\鍣ㄥ叿閲囪喘鍏ュ簱鍗�.grf" />
+    <Content Include="views\grf\璁惧妗ｆ.grf" />
+    <Content Include="views\grf\鍣ㄥ叿妗ｆ.grf" />
     <None Include="Web.Debug.config">
       <DependentUpon>Web.config</DependentUpon>
     </None>
@@ -574,6 +572,7 @@
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_EquipMent.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_WorkCenter.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Currency.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_EquipFileMainBill.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_EquipMaintainBill.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_EquipMaintainPlanBill.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_EquipTypeBill.aspx" />
@@ -581,6 +580,7 @@
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_DepartmentList.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldDotCheckBill.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldDotCheckPlanBill.aspx" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldFileMainBill.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldMaintainBill.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldMaintainPlanBill.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldProdInStockBill.aspx" />
@@ -658,6 +658,12 @@
     <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫缁撶畻鍗�%28鍏朵粬%29\Pay_OtherBalBillList.html" />
     <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫缁撶畻鍗�%28闆嗕綋%29\Pay_GroupBalBillEdit.html" />
     <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫缁撶畻鍗�%28闆嗕綋%29\Pay_GroupBalBillList.html" />
+    <Content Include="views\宸ヨ祫绠＄悊\鏍哥畻鏂瑰紡\Gy_ClassTimePrjSubBillEdit.html" />
+    <Content Include="views\宸ヨ祫绠＄悊\鏍哥畻鏂瑰紡\Gy_ClassTimePrjBillEdit.html" />
+    <Content Include="views\宸ヨ祫绠＄悊\鏍哥畻鏂瑰紡\Gy_ClassTimePrjBillList.html" />
+    <Content Include="views\宸ヨ祫绠＄悊\鏍哥畻鏂瑰紡\Gy_ClassTimePrjSubBillList.html" />
+    <Content Include="views\宸ヨ祫绠＄悊\鐝粍鑱屽憳娓呭崟\Gy_GroupEmpBillEdit.html" />
+    <Content Include="views\宸ヨ祫绠＄悊\鐝粍鑱屽憳娓呭崟\Gy_GroupEmpBillList.html" />
     <Content Include="views\宸ヨ祫绠＄悊\鑰冨嫟姹囨姤鍗昞Pay_WorkTimesBillEdit.html" />
     <Content Include="views\宸ヨ祫绠＄悊\鑰冨嫟姹囨姤鍗昞Pay_WorkTimesBillList.html" />
     <Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿鎶ヨ〃\ReportInventoryAccount.html" />
@@ -956,6 +962,13 @@
     <Compile Include="App_Data\MssqlReportData.cs" />
     <Compile Include="App_Data\ReportData.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_EquipFileMainBill.aspx.cs">
+      <DependentUpon>xmlLBM_EquipFileMainBill.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_EquipFileMainBill.aspx.designer.cs">
+      <DependentUpon>xmlLBM_EquipFileMainBill.aspx</DependentUpon>
+    </Compile>
     <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_EquipMaintainBill.aspx.cs">
       <DependentUpon>xmlLBM_EquipMaintainBill.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -1005,6 +1018,13 @@
     <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldDotCheckPlanBill.aspx.designer.cs">
       <DependentUpon>xmlLBM_MouldDotCheckPlanBill.aspx</DependentUpon>
     </Compile>
+    <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldFileMainBill.aspx.cs">
+      <DependentUpon>xmlLBM_MouldFileMainBill.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldFileMainBill.aspx.designer.cs">
+      <DependentUpon>xmlLBM_MouldFileMainBill.aspx</DependentUpon>
+    </Compile>
     <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldMaintainBill.aspx.cs">
       <DependentUpon>xmlLBM_MouldMaintainBill.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>

--
Gitblit v1.9.1