From 9a1ff8da2eea79f67694da99c3e09edd0ec8956e Mon Sep 17 00:00:00 2001
From: zhangrg <z18737863051@163.com>
Date: 星期四, 28 十二月 2023 17:45:35 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 5c6077b..634a5a4 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -214,6 +214,8 @@
<Content Include="views\user\login_pda.html" />
<Content Include="views\user\login_anrui.html" />
<Content Include="views\user\login.html" />
+ <Content Include="views\user\login_QiaoYi_PDA.html" />
+ <Content Include="views\user\login_QiaoYi_Web.html" />
<Content Include="views\video\1.wav" />
<Content Include="views\video\jingbao.wav" />
<Content Include="views\video\success.wav" />
@@ -248,7 +250,17 @@
<Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\Crm_CustomerAppealBill_KaiBei.html" />
<Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\Crm_CustomerAppealBill.html" />
<Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\Crm_CustomerAppealBillList.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_InspectBasis.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_InspectInstruMent.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_QualityStd.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_InspectMethod.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_InspectValue.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_TemporaryArea.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_InspectBasis.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_InspectInstruMent.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_QualityStd.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_InspectMethod.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_InspectValue.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_ConkTypeList_PDA.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MaterType.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MaterTypeEdit.html" />
@@ -272,7 +284,9 @@
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairCheckList_PDA.html" />
<Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcCommPrice.html" />
<Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcCommPriceList.html" />
+ <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Add_Edit_Gy_BadResult.html" />
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Add_Edit_Gy_BadType.html" />
+ <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_BadResult.html" />
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_BadType.html" />
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_Souce_Excel.html" />
<Content Include="views\宸ヨ祫绠＄悊\鍔犵彮鐢宠\Pay_OverApplyBill.html" />
@@ -298,6 +312,8 @@
<Content Include="views\搴旀敹绠＄悊\鎶ヨ〃鍒嗘瀽\YS_CusShouldIncomeEntryReport.html" />
<Content Include="views\搴旀敹绠＄悊\鎶ヨ〃鍒嗘瀽\YS_CusShouldIncomeReport.html" />
<Content Include="views\鏉＄爜鏄庣粏\Kf_BarCodeDetailQuery.html" />
+ <Content Include="views\妗堜緥浠ｇ爜\鏅�氬熀纭�璧勬枡\Gy_DepartmentEdit.html" />
+ <Content Include="views\妗堜緥浠ｇ爜\鏅�氬熀纭�璧勬枡\Gy_DepartmentList.html" />
<Content Include="views\鐢熶骇绠＄悊\浣滀笟鎸囧涔Gy_SOPBill_Video.html" />
<Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞Sc_Reply_MESExecptFeedBackBill.html" />
<Content Include="views\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫浜ч噺姹囨姤\Sc_ICMOBillQualityStatus_TmpList.html" />
@@ -306,6 +322,9 @@
<Content Include="views\鐢熶骇绠＄悊\鏃ヨ鍒掓姤琛╘MaterialShorAnalysisReport.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇宸ヤ綅\Gy_SourceWorkStationSet.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇宸ヤ綅\Gy_SourceWorkStationSetList.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鐢熶骇鎶ヨ〃\ProductionAnalysisReport.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鐢熶骇鎶ヨ〃\Sc_InventoryAgeReport.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鐢熶骇鎶ヨ〃\Sc_ProdOrderPickingStatusReport.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇璁″垝骞冲彴\Sc_ShopCalendar.html" />
<Content Include="views\鐢熶骇绠＄悊\璁㈠崟鐘舵�佸垎甯僜Sc_OrderStateDistribution.html" />
<Content Include="views\鐢熶骇绠＄悊\榻愬鍒嗘瀽\JIT_CompleteMaterlDetailList.html" />
@@ -314,6 +333,9 @@
<Content Include="views\绯荤粺绠＄悊\蹇嵎鏂瑰紡鑷畾涔塡Xt_UserFastMenu.html" />
<Content Include="views\绯荤粺绠＄悊\蹇嵎鏂瑰紡鑷畾涔塡Xt_UserFastMenu_IconSet.html" />
<Content Include="views\绯荤粺绠＄悊\鎸夐挳璁剧疆\Xt_ModuleButtonSet.html" />
+ <Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserEmployee_Excel.html" />
+ <Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserProcess_Excel.html" />
+ <Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Xt_UserSuplies_Excel.html" />
<Content Include="views\绯荤粺绠＄悊\鑿滃崟鑷畾涔塡Xt_DefineMenuDisplay.html" />
<Content Include="views\璁″垝绠＄悊\浜х嚎璐ㄦ骞冲彴\Sc_ICMOBillQualityStatus_Tmp.html" />
<Content Include="views\璁″垝绠＄悊\浜х嚎杩斾慨骞冲彴\Sc_SourceLineRepairBill.html" />
@@ -331,9 +353,19 @@
<Content Include="views\璁惧绠＄悊\Sb_EquipMaintainBill_PDA.html" />
<Content Include="views\璁惧绠＄悊\Sb_EquipRepairCheckBillList_PDA.html" />
<Content Include="views\璁惧绠＄悊\Sb_EquipRepairCheckBill_PDA.html" />
+ <Content Include="views\璁惧绠＄悊\璁惧鎶ヨ〃\Sb_EquipConkBookBillReport.html" />
+ <Content Include="views\璁惧绠＄悊\璁惧鎶ヨ〃\Sb_EquipRepairWorkBillReport.html" />
+ <Content Include="views\璁惧绠＄悊\璁惧鎶ヨ〃\Sb_EquipDotCheckBillReport.html" />
+ <Content Include="views\璁惧绠＄悊\璁惧鎶ヨ〃\Sb_EquipMaintainBillReport.html" />
<Content Include="views\璁惧绠＄悊\璁惧瑙勭▼鍗昞Sb_EquipDotCheckRuleList_PDA.html" />
<Content Include="views\璐ㄩ噺绠＄悊\宸ュ簭妫�楠屽崟\MES_ProcessCheckBillList_PDA.html" />
<Content Include="views\璐ㄩ噺绠＄悊\宸ュ簭妫�楠屽崟\MES_ProcessCheckBill_PDA.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_FirstPassRateReport.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_FirstPassRateWeekReport.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_ProdBadReasonStatistics.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_ProductQtyWarningReport.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_QualityTraceabilityReport.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_ProdBadReasonStatistics_Sum.html" />
<Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯\BadQueryReport.html" />
<Content Include="views\璐ㄩ噺绠＄悊\棣栦欢妫�楠屽崟\QC_Add_Edit_FirstPieceCheckBill - 澶嶅埗.html" />
<Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯\Cj_CollectionOfSingleProductDefects.html" />
--
Gitblit v1.9.1