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 | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 78679ee..17bc5a2 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -86,7 +86,10 @@
<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" />
<Content Include="views\Baseset\鍩虹璧勬枡\Sc_ICMOBillListView2.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Sc_ProcessExchangeBillListView.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_QCCheckItemListView.html" />
@@ -125,8 +128,14 @@
<Content Include="views\ReportHtml.html" />
<Content Include="views\test\testRenderAutomationList.html" />
<Content Include="views\video\jingbao.wav" />
+ <Content Include="views\浠撳瓨绠＄悊\浠撳簱璋冩嫧\Kf_MoveStockRequestBillList.html" />
<Content Include="views\浠撳瓨绠＄悊\浠撳簱璋冩嫧\Kf_MoveStockStepOutBill_Fast.html" />
<Content Include="views\浠撳瓨绠＄悊\鍒嗘寮忚皟鍏ュ崟\Fb_StepFoldinBillList.html" />
+ <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" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_OrderLev.html" />
@@ -674,6 +683,8 @@
<Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿鎶ヨ〃\ReportInventoryAccount.html" />
<Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿鎶ヨ〃\ReportMaterialReceipt.html" />
<Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿鎶ヨ〃\ReportMouldStock.html" />
+ <Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿缁翠慨娲惧伐鍗昞Sc_MouldRepairSendWorkBillEdit.html" />
+ <Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿缁翠慨娲惧伐鍗昞Sc_MouldRepairSendWorkBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿澶勭悊鍑哄簱鍗昞Sc_MouldScrapOutBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿瀵垮懡璋冩暣鍗昞Sc_MouldLifeChangeBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿鏀瑰埗鍏ュ簱鍗昞Sc_MouldRepairInBill_PDA.html" />
@@ -744,6 +755,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" />
@@ -760,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" />
@@ -782,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" />
@@ -805,13 +821,16 @@
<Content Include="views\绯荤粺绠＄悊\绯荤粺鍙傛暟绠＄悊\Xt_SystemParameter_Edit.html" />
<Content Include="views\绯荤粺绠＄悊\绯荤粺鍙傛暟绠＄悊\Xt_SystemParameterList.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBill.html" />
+ <Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎澶х被\Gy_RoutingGroupList.html" />
<Content Include="views\璁惧绠＄悊\Sb_Add_EqpConkBookBillList.html" />
<Content Include="views\璁惧绠＄悊\Sb_Add_EqpMaintenanceBillList.html" />
<Content Include="views\璁惧绠＄悊\Sb_Add_EqpRepairCheckBillList.html" />
<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" />
<Content Include="views\璁惧绠＄悊\Sb_EquipDotCheckBillList.html" />
<Content Include="views\璁惧绠＄悊\Sb_EquipDotCheckBillList_PDA.html" />
@@ -826,8 +845,11 @@
<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" />
+ <Content Include="views\璁惧绠＄悊\Sb_EquipMaintainBillList_MulEdit.html" />
<Content Include="views\璁惧绠＄悊\璁惧瑙勭▼鍗昞Sb_EquipMaintainRuleEdit.html" />
<Content Include="views\璁惧绠＄悊\璁惧瑙勭▼鍗昞Sb_EquipMaintainRuleList.html" />
<Content Include="views\璐ㄩ噺绠＄悊\鍑哄巶妫�楠屽崟\QC_OutCompCheckBill.html" />
@@ -863,6 +885,7 @@
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭杩涚珯鎺ユ敹鍗昞MES_StationInBill_PDA.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭杩涚珯鎺ユ敹鍗昞Sc_StationInBill_Mul_PDA.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭杩涚珯鎺ユ敹鍗昞Sc_StationInBill_Mul.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_StationInBillList.html" />
<Content Include="views\閲囪喘绠＄悊\鏀舵枡閫氱煡鍗昞Add_Edit_Cg_POInStockBillList.html" />
<Content Include="views\閲囪喘绠＄悊\閫�鏂欓�氱煡鍗昞Add_Edit_Cg_POInStockBackBillList.html" />
<Content Include="views\閲囪喘绠＄悊\閲囪喘璁㈠崟\Cg_POOrderBillList.html" />
@@ -969,6 +992,7 @@
<Content Include="views\楠屾敹鍏ュ簱\濮斿鍏ュ簱\Kf_EntrustInBackBill.html" />
<Content Include="views\楠屾敹鍏ュ簱\濮斿鍏ュ簱\Kf_EntrustInBill_FastList.html" />
<Content Include="views\楠屾敹鍏ュ簱\濮斿鍏ュ簱\Kf_EntrustInBillList.html" />
+ <Content Include="views\楠屾敹鍏ュ簱\濮斿鍏ュ簱\Kf_EntrustOutBackBill.html" />
<Content Include="Web.config" />
<None Include="Properties\PublishProfiles\Web.pubxml" />
</ItemGroup>
--
Gitblit v1.9.1