From 9a03fabcc94ed2acacc19f97fbf531d99ee619e7 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期五, 05 十一月 2021 15:45:14 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/WebTM.csproj | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 5e72093..ae4eb38 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -116,12 +116,18 @@
<Content Include="views\PublicPage\PeopleInformation.html" />
<Content Include="views\ReportHtml.html" />
<Content Include="views\test\testRenderAutomationList.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_OrderBackInfo.html.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_OrderLev.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_OrderBackInfo.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_OrderLev.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_Warehouse.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Xt_ORGANIZATIONSList.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_Department.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Employee_Add_Edit_.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_EquipType.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_EquipTypeEdit.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_ClassTimePrj.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_ClassTimePrj.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_WorkCenter_Add_Edit.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_MouldType.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\b.grf" />
@@ -132,6 +138,13 @@
<Content Include="views\grf\鍣ㄥ叿棰嗙敤閫�搴撳崟.grf" />
<Content Include="views\grf\鍣ㄥ叿棰嗙敤鍑哄簱鍗�.grf" />
<Content Include="views\grf\鍣ㄥ叿鐩存帴璋冩嫧鍗�.grf" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\鍣ㄥ叿鍏朵粬鍑哄簱鍗�.grf" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\鍣ㄥ叿澶勭悊鍑哄簱鍗�.grf" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\鍣ㄥ叿鎶ュ簾鍏ュ簱鍗�.grf" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\鍣ㄥ叿鏀瑰埗鍏ュ簱鍗�.grf" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\鍣ㄥ叿鏀瑰埗鍑哄簱鍗�.grf" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\鍣ㄥ叿閲囪喘鍏ュ簱鍗�.grf" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\鍣ㄥ叿鍏朵粬鍏ュ簱鍗�.grf" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
@@ -559,11 +572,21 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldProdMoveStockBill.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldProdOutStockBill.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldTypeBill.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckEdit.html" />
+ <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckList.html" />
+ <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MaintainEdit.html" />
+ <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MaintainList.html" />
+ <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairCheckEdit.html" />
+ <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairCheckList.html" />
+ <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairEdit.html" />
+ <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairList.html" />
<Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcPriceList.html" />
<Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_Group_Add_Edit.html" />
<Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcPrice.html" />
+ <Content Include="views\鍩虹璧勬枡\鏁版嵁瀛楀吀\Xt_DataDictionary_Proc.html" />
<Content Include="views\鍩虹璧勬枡\鏁版嵁瀛楀吀\Xt_DataDictionary_View.html" />
<Content Include="views\鍩虹璧勬枡\鏁版嵁瀛楀吀\Xt_DataDictionary_Table.html" />
+ <Content Include="views\鍩虹璧勬枡\鏁版嵁瀛楀吀\Xt_DataDictionary_ProcList.html" />
<Content Include="views\鍩虹璧勬枡\鏁版嵁瀛楀吀\Xt_DataDictionary_ViewList.html" />
<Content Include="views\鍩虹璧勬枡\鏁版嵁瀛楀吀\Xt_DataDictionary_TableList.html" />
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Add_Edit_Gy_Process.html" />
@@ -611,11 +634,14 @@
<Content Include="views\宸ヨ祫绠＄悊\鑰冨嫟姹囨姤鍗昞Pay_WorkTimesBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿澶勭悊鍑哄簱鍗昞Sc_MouldScrapOutBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿瀵垮懡璋冩暣鍗昞Sc_MouldLifeChangeBill_PDA.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯″叿鏀瑰埗鍏ュ簱鍗昞Sc_MouldRepairInBill_PDA.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯″叿鏀瑰埗鍑哄簱鍗昞Sc_MouldRepairOutBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿鐢熶骇閫�搴撳崟\Sc_MouldProdBackBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿鐢熶骇棰嗙敤鍗昞Sc_MouldProdOutBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿缁翠慨璁板綍鍗昞Sc_MouldRepairWorkBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿鍏朵粬鍑哄簱鍗昞Sc_MouldOtherOutBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿鍏朵粬鍏ュ簱鍗昞Sc_MouldOtherInBill_PDA.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯″叿閲囪喘鍏ュ簱鍗昞Sc_MouldProdInBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldMoveStockStepOutBill.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldMoveStockStepInBill.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldMoveStockStepInBillList.html" />
@@ -631,7 +657,7 @@
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldRepairOutBillEdit.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldRepairOutBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldRepairInBillList.html" />
- <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldScrapInBill_PDA.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯″叿鎶ュ簾鍏ュ簱鍗昞Sc_MouldScrapInBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldOtherOutBillEdit.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldOtherOutBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_Add_MouldLifeChangeBillList.html" />
@@ -660,6 +686,9 @@
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_MouldOtherInBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_MouldOtherOutBill.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_MouldOtherOutBillList.html" />
+ <Content Include="views\妯℃不鍏风鐞哱璁惧淇濆吇璁板綍鍗昞Sb_EquipMaintainBill_PDA.html" />
+ <Content Include="views\妯℃不鍏风鐞哱璁惧鐐规璁板綍鍗昞Sb_EquipDotCheckBill_PDA.html" />
+ <Content Include="views\妯℃不鍏风鐞哱璁惧缁翠慨璁板綍鍗昞Sb_EquipRepairWorkBill_PDA.html" />
<Content Include="views\鐢熶骇宸ュ簭绠＄悊\濮斿宸ュ崟\WW__Add_EntrustWorkOrderBill.html" />
<Content Include="views\鐢熶骇宸ュ簭绠＄悊\濮斿宸ュ簭娲惧伐鍗昞WW_AddEntrustProcSendWork.html" />
<Content Include="views\鐢熶骇宸ュ簭绠＄悊\濮斿宸ュ簭璁″垝姹囨姤鍗昞WW_Add_EntrustProcessReport.html" />
@@ -724,12 +753,15 @@
<Content Include="views\璁惧绠＄悊\Sb_EquipMaintainPlanBillEdit.html" />
<Content Include="views\璁惧绠＄悊\Sb_EquipMaintainPlanBillList.html" />
<Content Include="views\璁惧绠＄悊\Sc_Add_MouldDotCheckBillList.html" />
+ <Content Include="views\璁惧绠＄悊\璁惧妗ｆ\Gy_EquipFileMainEdit.html" />
+ <Content Include="views\璁惧绠＄悊\璁惧妗ｆ\Gy_EquipFileMainList.html" />
<Content Include="views\璐ㄩ噺绠＄悊\鍑哄巶妫�楠屽崟\QC_OutCompCheckBill.html" />
<Content Include="views\璐ㄩ噺绠＄悊\宸℃璁板綍鍗昞QC_Add_Edit_PatrolProcCheckBill.html" />
<Content Include="views\璐ㄩ噺绠＄悊\浜у搧鍏ュ簱妫�楠屽崟\QC_LastPieceCheckBill.html" />
<Content Include="views\璐ㄩ噺绠＄悊\浜у搧鍏ュ簱妫�楠屽崟\QC_LastPieceCheckBillList.html" />
<Content Include="views\璐ㄩ噺绠＄悊\鍑哄巶妫�楠屽崟\QC_OutCompCheckBillList.html" />
<Content Include="views\璐ㄩ噺绠＄悊\宸℃璁板綍鍗昞QC_PatrolProcCheckBillList.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\鏉ユ枡妫�楠屽崟\QC_Add_Edit_POStockInCheckBillList.html" />
<Content Include="views\璐ㄩ噺绠＄悊\鏉ユ枡妫�楠屽崟\QC_Add_Edit_POStockInCheckBill.html" />
<Content Include="views\璐ㄩ噺绠＄悊\宸ュ簭妫�楠屽崟\QC_ProcessCheckBill.html" />
<Content Include="views\璐ㄩ噺绠＄悊\宸ュ簭妫�楠屽崟\QC_ProcessCheckBillList.html" />
@@ -757,6 +789,7 @@
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭杩涚珯鎺ユ敹鍗昞Sc_StationInBill_Mul_PDA.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭杩涚珯鎺ユ敹鍗昞Sc_StationInBill_Mul.html" />
<Content Include="views\閲囪喘绠＄悊\閲囪喘璁㈠崟\Cg_POOrderBillList.html" />
+ <Content Include="views\棰嗘枡鍙戣揣\鏀舵枡鍏ュ簱\Kf_ReciveBill_Fast.html" />
<Content Include="views\楠屾敹鍏ュ簱\浜у搧鍏ュ簱\Kf_ProductInBillList.html" />
<Content Include="views\楠屾敹鍏ュ簱\鍏朵粬鍏ュ簱\Kf_OtherInBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Kf_ProductInBillList.html" />
--
Gitblit v1.9.1