From 3ed32b07e186ded864db245961399e95d4d869b6 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期三, 19 一月 2022 18:05:12 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/WebTM.csproj | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index c5af988..b280d0d 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -753,6 +753,7 @@
<Content Include="views\鐢熶骇宸ュ簭绠＄悊\濮斿宸ュ簭璁″垝杞嚭鍗昞WW_EntrustProcessSendOutBill_PDA.html" />
<Content Include="views\鐢熶骇宸ュ簭绠＄悊\宸ュ簭姹囨姤鍗昞HBarPlanPrint.html" />
<Content Include="views\鐢熶骇宸ュ簭绠＄悊\宸ュ簭姹囨姤鍗昞xmlLBM_ProcessReport.aspx" />
+ <Content Include="views\鐢熶骇宸ュ簭绠＄悊\宸ュ簭璁″垝鍗昞Sc_ProcessPlanEdit.html" />
<Content Include="views\鐢熶骇绠＄悊\涓婃枡闃查敊鍗昞Sc_Add_MaterToSourceBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\浜ч噺姹囨姤鍗昞Sc_Add_ProductReportBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\浜ч噺姹囨姤鍗昞Sc_ProductReportBillList.html" />
@@ -791,6 +792,7 @@
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇寮�宸ュ崟\Sc_Add_MESBeginWorkBillList - 澶嶅埗.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇寮�宸ュ崟\Sc_Add_MESBeginWorkBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇寮�宸ュ崟\Sc_MESBeginWorkBillList.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鐢熶骇鎷嗙鍗昞Sc_PackSplitBill_Fast.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇姹囨姤鍗昞Sc_ICMOReportBill_FastNew.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇姹囨姤鍗昞Sc_Add_ICMOReportBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇缁勮杩芥函鍗昞Sc_AssemblyBillList.html" />
@@ -838,6 +840,7 @@
<Content Include="views\璁惧绠＄悊\Sc_Add_MouldDotCheckBillList.html" />
<Content Include="views\璁惧绠＄悊\璁惧妗ｆ\Gy_EquipFileMainEdit.html" />
<Content Include="views\璁惧绠＄悊\璁惧妗ｆ\Gy_EquipFileMainList.html" />
+ <Content Include="views\璁惧绠＄悊\璁惧缁翠慨娲惧伐鍗昞Sb_EquipRepairSendWorkBillEdit.html" />
<Content Include="views\璁惧绠＄悊\璁惧缁翠慨娲惧伐鍗昞Sb_EquipRepairSendWorkBillList.html" />
<Content Include="views\璁惧绠＄悊\璁惧瑙勭▼鍗昞Sb_EquipDotCheckRuleEdit.html" />
<Content Include="views\璁惧绠＄悊\璁惧瑙勭▼鍗昞Sb_EquipDotCheckRuleList.html" />
@@ -1178,7 +1181,6 @@
<ItemGroup>
<Folder Include="views\浠撳瓨绠＄悊\璋冩嫧鍗曟牳瀵筡" />
<Folder Include="views\浠撳瓨绠＄悊\璋冩嫧鍗曠ń鏍竆" />
- <Folder Include="views\鐢熶骇绠＄悊\鐢熶骇鎷嗙鍗昞" />
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
--
Gitblit v1.9.1