From 81c93ee7a4bc6735ad8f69ea0ee7244eaa58d73f Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期二, 15 二月 2022 08:32:07 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/WebTM.csproj | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index e282ea6..17bc5a2 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -86,6 +86,7 @@
<Content Include="layuiadmin\PubCustom.js" />
<Content Include="layuiadmin\PubJs\PubCheck.js" />
<Content Include="views\Baseset\HBarPlanPrint.html" />
+ <Content Include="views\Baseset\鍩虹璧勬枡\Gy_ClassTimePrjList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_LineCenter.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_QCCheckProjectListView.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_RoutingGroup.html" />
@@ -133,6 +134,7 @@
<Content Include="views\浠撳瓨绠＄悊\濮斿鐢ㄦ枡鍗昞WW_PPBomBillList.html" />
<Content Include="views\浠撳瓨绠＄悊\鎵爜寮傚父璁板綍琛╘KF_PonderationBillList.html" />
<Content Include="views\浠撳瓨绠＄悊\鏉＄爜鍑哄叆搴撹褰曡〃\Kf_ICStockBillSubList.html" />
+ <Content Include="views\浠撳瓨绠＄悊\鏉＄爜搴撳瓨\KF_ICInventoryByMaterID.html" />
<Content Include="views\浠撳瓨绠＄悊\鏉＄爜搴撳瓨\KF_ICInventoryList_WMS.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_OrderBackInfo.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_OrderBackInfo.html.html" />
@@ -770,9 +772,11 @@
<Content Include="views\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫鍋滃伐\Sc_MESStopStepWorkBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫瀹屽伐\Sc_Add_MESEndStepWorkBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫瀹屽伐\Sc_MESEndStepWorkBillList.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫宸ュ簭姹囨姤\Sc_Add_ProcessReportBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫寮�宸Sc_Add_MESBeginStepWorkBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫寮�宸Sc_MESBeginStepWorkBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫鐢熶骇姹囨姤\Sc_ICMOReportBillList.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫宸ュ簭姹囨姤\Sc_ProcessReportBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫杩斿伐\Sc_Add_MESReturnStepWorkBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫杩斿伐\Sc_MESReturnStepWorkBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫闃查敊\Sc_Add_MaterToSourceStepBillList.html" />
@@ -792,8 +796,10 @@
<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_Gy_ICBomBillMainList.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇缁勮杩芥函鍗昞Sc_AssemblyBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇閫�搴撳崟\Sc_ProductionReturnList.html" />
<Content Include="views\鐢熶骇绠＄悊\缁勮鍗昞Sc_GroupOrderBillList.html" />
@@ -822,6 +828,7 @@
<Content Include="views\璁惧绠＄悊\Sb_EqpConkBookBillList.html" />
<Content Include="views\璁惧绠＄悊\Sb_EqpMaintenanceBillList.html" />
<Content Include="views\璁惧绠＄悊\Sb_EqpMaintenanceBillList_PDA.html" />
+ <Content Include="views\璁惧绠＄悊\Sb_EqpMaintenanceBillList_PDAEdit.html" />
<Content Include="views\璁惧绠＄悊\Sb_EqpRepairCheckBillList.html" />
<Content Include="views\璁惧绠＄悊\Sb_EquipDocCheckItemBillList_PDAEdit.html" />
<Content Include="views\璁惧绠＄悊\Sb_EquipDotCheckBillEdit.html" />
@@ -838,6 +845,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 +1186,6 @@
<ItemGroup>
<Folder Include="views\浠撳瓨绠＄悊\璋冩嫧鍗曟牳瀵筡" />
<Folder Include="views\浠撳瓨绠＄悊\璋冩嫧鍗曠ń鏍竆" />
- <Folder Include="views\鐢熶骇绠＄悊\鐢熶骇鎷嗙鍗昞" />
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
--
Gitblit v1.9.1