From 5e2937e5de5ae9e643dc57f145384ea1cb568f32 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期三, 17 十一月 2021 08:49:09 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/WebTM.csproj | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index e5f698f..14a64eb 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -107,6 +107,8 @@
<Content Include="views\grf\b1.grf" />
<Content Include="views\grf\b.grf" />
<Content Include="views\indexMenu.html" />
+ <Content Include="views\PublicPage\MouldDotCheckRuleInterList.html" />
+ <Content Include="views\PublicPage\MouldMaintainRuleInterList.html" />
<Content Include="views\PublicPage\OrderBackInfomation.html" />
<Content Include="views\PublicPage\OrderLevInformation.html" />
<Content Include="views\PublicPage\Gy_MaterType.html" />
@@ -116,6 +118,7 @@
<Content Include="views\PublicPage\PeopleInformations.html" />
<Content Include="views\PublicPage\PeopleInformation.html" />
<Content Include="views\PublicPage\PowerInformation.html" />
+ <Content Include="views\PublicPage\PurchOrder.html" />
<Content Include="views\ReportHtml.html" />
<Content Include="views\test\testRenderAutomationList.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_ClassTimePrjSub.html" />
@@ -644,6 +647,7 @@
<Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫缁撶畻鍗�%28闆嗕綋%29\Pay_GroupBalBillList.html" />
<Content Include="views\宸ヨ祫绠＄悊\鑰冨嫟姹囨姤鍗昞Pay_WorkTimesBill.html" />
<Content Include="views\宸ヨ祫绠＄悊\鑰冨嫟姹囨姤鍗昞Pay_WorkTimesBillList.html" />
+ <Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿鎶ヨ〃\ReportMouldStock.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿澶勭悊鍑哄簱鍗昞Sc_MouldScrapOutBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿瀵垮懡璋冩暣鍗昞Sc_MouldLifeChangeBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿鏀瑰埗鍏ュ簱鍗昞Sc_MouldRepairInBill_PDA.html" />
@@ -807,11 +811,13 @@
<Content Include="views\閲囪喘绠＄悊\鏀舵枡閫氱煡鍗昞Add_Edit_Cg_POInStockBillList.html" />
<Content Include="views\閲囪喘绠＄悊\閫�鏂欓�氱煡鍗昞Add_Edit_Cg_POInStockBackBillList.html" />
<Content Include="views\閲囪喘绠＄悊\閲囪喘璁㈠崟\Cg_POOrderBillList.html" />
+ <Content Include="views\閿�鍞鐞哱閿�鍞鍗昞Add_Edit_Xs_SeOrderBillList.html" />
<Content Include="views\棰嗘枡鍙戣揣\鏀舵枡鍏ュ簱\Kf_ReciveBill_Fast.html" />
<Content Include="views\棰嗘枡鍙戣揣\棰嗘枡鍑哄簱\Kf_MateOutBillLEdit.html" />
<Content Include="views\楠屾敹鍏ュ簱\浜у搧鍏ュ簱\Kf_ProductInBillList.html" />
<Content Include="views\楠屾敹鍏ュ簱\鍏朵粬鍏ュ簱\Kf_OtherInBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Kf_ProductInBillList.html" />
+ <Content Include="views\楠屾敹鍏ュ簱\澶栬喘鍏ュ簱\Add_Edit_Kf_POStockInBillList.html" />
<Content Include="views\楠屾敹鍏ュ簱\澶栬喘鍏ュ簱\Kf_POStockInBillList.html" />
<Content Include="views\棰嗘枡鍙戣揣\濮斿鍑哄簱\Kf_EntrustOutBillList.html" />
<Content Include="views\棰嗘枡鍙戣揣\鍏朵粬鍑哄簱\Kf_OtherOutBillList.html" />
--
Gitblit v1.9.1