From c55106b0797ac56f8d3fd55b78a8dcc9b312880c Mon Sep 17 00:00:00 2001
From: 沈泽 <211959439@qq.com>
Date: 星期一, 30 八月 2021 08:43:29 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/WebTM.csproj | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 551c166..b0e17c5 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -105,6 +105,22 @@
<Content Include="views\grf\a.grf" />
<Content Include="views\grf\b1.grf" />
<Content Include="views\grf\b.grf" />
+ <Content Include="views\PublicPage\CustomerTypeInformation.html" />
+ <Content Include="views\PublicPage\SettleStyleInformation.html" />
+ <Content Include="views\PublicPage\CurrencyInformation.html" />
+ <Content Include="views\PublicPage\AreaInformation.html" />
+ <Content Include="views\PublicPage\LocationGroupInformation.html" />
+ <Content Include="views\PublicPage\BomGroupInformation.html" />
+ <Content Include="views\PublicPage\RouteInformation.html" />
+ <Content Include="views\PublicPage\Gy_MaterType.html" />
+ <Content Include="views\PublicPage\CheckItemInformation.html" />
+ <Content Include="views\PublicPage\Gy_Maintain.html" />
+ <Content Include="views\ReportHtml.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_Department.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_Warehouse.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Employee_Add_Edit_.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_WorkCenter_Add_Edit.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_MouldType.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\b.grf" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
@@ -502,7 +518,9 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_Currency.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_Employee.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_Unit.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_EmployeeList.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_CheckItem.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MouldType.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_QCCheckClass.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Warehouse_Edit.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_EquipMent_Edit.html" />
@@ -510,6 +528,9 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_WorkCenter.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Currency.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_Material.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_DepartmentList.html" />
+ <Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_Group_Add_Edit.html" />
+ <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Add_Edit_Gy_Process.html" />
<Content Include="views\鍩虹璧勬枡\閲囪喘鍩虹璧勬枡\Gy_Supplier_Edit.html" />
<Content Include="views\鍩虹璧勬枡\閿�鍞熀纭�璧勬枡\Gy_Customer_Edit.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_WorkCenter.html" />
@@ -521,8 +542,6 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Unit.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_StockPlace.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Warehouse.html" />
- <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Employee.html" />
- <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Department.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\HBarPlanPrint.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_Department_Edit.aspx" />
<Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Add_Edit_Gy_Group.html" />
@@ -591,6 +610,7 @@
<Content Include="views\鐢熶骇宸ュ簭绠＄悊\宸ュ簭姹囨姤鍗昞xmlLBM_ProcessReport.aspx" />
<Content Include="views\鐢熶骇绠＄悊\浜ч噺姹囨姤鍗昞Sc_Add_ProductReportBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\浜ч噺姹囨姤鍗昞Sc_ProductReportBillList.html" />
+ <Content Include="views\鐢熶骇绠＄悊\浜ч噺姹囨姤鍗昞Sc_ProductReportBillList_Web.html" />
<Content Include="views\鐢熶骇绠＄悊\鎶ュ伐骞冲彴鍔熻兘椤礬LineBind.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇涓婃枡鍗昞Sc_MaterToSourceBillList - 澶嶅埗.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇涓婃枡鍗昞Sc_MaterToSourceBillList.html" />
@@ -605,8 +625,9 @@
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇寮�宸ュ崟\Sc_MESBeginWorkBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇姹囨姤鍗昞Sc_Add_ICMOReportBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇缁勮杩芥函鍗昞Sc_AssemblyBillList.html" />
- <Content Include="views\鐢熶骇绠＄悊\鐢熶骇璐ㄩ噺姹囨姤鍗昞Sc_QualityReportBillList.html" />
+ <Content Include="views\鐢熶骇绠＄悊\璐ㄩ噺姹囨姤鍗昞Sc_QualityReportBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\缁勮鍗昞Sc_GroupOrderBillList.html" />
+ <Content Include="views\鐢熶骇绠＄悊\璐ㄩ噺姹囨姤鍗昞Sc_QualityReportBill.html" />
<Content Include="views\绯荤粺绠＄悊\浼氳鏈熼棿\Xt_AccountPeriodList.html" />
<Content Include="views\绯荤粺绠＄悊\浼氳鏈熼棿\Xt_AccountPeriod_Edit.html" />
<Content Include="views\绯荤粺绠＄悊\鍗曟嵁绫诲瀷\Xt_BillType_Edit.html" />
--
Gitblit v1.9.1