From c890c969f056b949edae59c91b57cea2ccae3d06 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 26 十月 2023 17:09:14 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 70bc1e8..7e54464 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -227,6 +227,13 @@
<Content Include="views\浜轰簨绠＄悊\绂昏亴鐢宠\HR_EmpDimissionBillList.html" />
<Content Include="views\浜轰簨绠＄悊\鑱屽憳寮傚姩鍗昞HR_EmpChangeBill.html" />
<Content Include="views\浜轰簨绠＄悊\鑱屽憳寮傚姩鍗昞HR_EmpChangeBillList.html" />
+ <Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\QC_CustomerAppealReport_BadClass.html" />
+ <Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\QC_CustomerAppealReport_Material.html" />
+ <Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\QC_CustomerAppealReport_Emp.html" />
+ <Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\QC_CustomerAppealReport_Dept.html" />
+ <Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\QC_CustomerAppealReport_Customer.html" />
+ <Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\QC_CustomerAppealReport_Sum.html" />
+ <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_TemporaryArea.html" />
@@ -267,11 +274,14 @@
<Content Include="views\宸ヨ祫绠＄悊\璇峰亣鐢宠\Pay_OutApplyBillList.html" />
<Content Include="views\鏉＄爜鏄庣粏\Kf_BarCodeDetailQuery.html" />
<Content Include="views\鐢熶骇绠＄悊\浣滀笟鎸囧涔Gy_SOPBill_Video.html" />
+ <Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞Sc_Reply_MESExecptFeedBackBill.html" />
<Content Include="views\鐢熶骇绠＄悊\鏃ヨ鍒掑熀纭�璧勬枡\Cg_PODemandPlanConfigBill_Excel.html" />
<Content Include="views\鐢熶骇绠＄悊\鏃ヨ鍒掓姤琛╘MaterialShorAnalysisReport.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇宸ヤ綅\Gy_SourceWorkStationSet.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇宸ヤ綅\Gy_SourceWorkStationSetList.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇璁″垝骞冲彴\Sc_ShopCalendar.html" />
+ <Content Include="views\鐢熶骇绠＄悊\璁㈠崟鐘舵�佸垎甯僜Sc_OrderStateDistribution.html" />
+ <Content Include="views\鐢熶骇绠＄悊\榻愬鍒嗘瀽\JIT_CompleteMaterlDetailList.html" />
<Content Include="views\绯荤粺绠＄悊\蹇嵎鏂瑰紡鑷畾涔塡Xt_UserFastMenu.html" />
<Content Include="views\绯荤粺绠＄悊\蹇嵎鏂瑰紡鑷畾涔塡Xt_UserFastMenu_IconSet.html" />
<Content Include="views\绯荤粺绠＄悊\鎸夐挳璁剧疆\Xt_ModuleButtonSet.html" />
@@ -282,7 +292,11 @@
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBillListQuery.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBillList_His.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBillSubList.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\宸ュ簭妫�楠屽崟\MES_ProcessCheckBillList_PDA.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\宸ュ簭妫�楠屽崟\MES_ProcessCheckBill_PDA.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\棣栦欢妫�楠屽崟\QC_FirstPieceCheckReport_ZDQX.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆\MES_Sc_ProcessExchangeBillMain_Note_PDA.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_ProcessErrStationReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_MateOutSumReport_QiaoYi.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_BrushingOutReport.html" />
<Content Include="views\杞﹂棿绠＄悊\浜х嚎缁勮杩芥函\Cj_AssemblyTraceability.html" />
@@ -470,6 +484,7 @@
<Content Include="views\grf\cs10.grf" />
<Content Include="views\grf\鎸囧紩鍗�1.grf" />
<Content Include="views\grf\鐢熶骇棰嗘枡鍗�.grf" />
+ <Content Include="views\grf\宸ュ簭鍦ㄥ埗鎶ヨ〃.grf" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
@@ -1357,6 +1372,8 @@
<Content Include="views\閿�鍞鐞哱閿�鍞鍗昞Add_Edit_Xs_SeOrderBillList.html" />
<Content Include="views\椤圭洰绠＄悊\涓氱哗鎸囨爣\PM_YearEmployeeMoneyBillList.html" />
<Content Include="views\椤圭洰绠＄悊\涓氱哗鎸囨爣\PM_YearEmployeeMoneyBill.html" />
+ <Content Include="views\椤圭洰绠＄悊\鍛ㄨ鍒抃PM_WorkTaskWeekBillList.html" />
+ <Content Include="views\椤圭洰绠＄悊\鍛ㄨ鍒抃PM_WorkTaskWeekBill.html" />
<Content Include="views\椤圭洰绠＄悊\宸ヤ綔浠诲姟\PM_WorkTaskReportBillList.html" />
<Content Include="views\椤圭洰绠＄悊\宸ヤ綔浠诲姟\PM_WorkTaskReportBill.html" />
<Content Include="views\椤圭洰绠＄悊\宸ヤ綔浠诲姟\PM_WorkTaskBillList.html" />
--
Gitblit v1.9.1