From 7f7179d00825d06ec064f8bbbccdf406424a4609 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 12 四月 2024 17:42:14 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 1aa88c8..b47b7f6 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -127,6 +127,7 @@
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_ConveyCompList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_ConveyTypeList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_GroupList.html" />
+ <Content Include="views\Baseset\鍩虹璧勬枡\Gy_Source.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_SupplierListNew.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_EquipFileBillMainList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_GetProcNoList.html" />
@@ -382,6 +383,8 @@
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_DisposeWayList.html" />
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_ScrapReasonList.html" />
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_Souce_Excel.html" />
+ <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_ShiftsList.html" />
+ <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_ShiftsEdit.html" />
<Content Include="views\鍩虹璧勬枡\璁惧鍩虹璧勬枡\Gy_CardAddress.html" />
<Content Include="views\鍩虹璧勬枡\璁惧鍩虹璧勬枡\Gy_CardChangeType.html" />
<Content Include="views\鍩虹璧勬枡\璁惧鍩虹璧勬枡\Gy_CardStatus.html" />
@@ -438,6 +441,8 @@
<Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿鎶ヨ〃\Sc_MouldRepairWorkBillReport.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_SplitBarCode.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_MaterialMouldBillMainList.html" />
+ <Content Include="views\鐢熶骇宸ュ簭绠＄悊\澧炲姞涓嶈壇璇勫鍗昞QC_NoPassProdConclusionBillMain.html" />
+ <Content Include="views\鐢熶骇宸ュ簭绠＄悊\澧炲姞涓嶈壇璇勫鍗昞QC_NoPassProdConclusionBillMainList.html" />
<Content Include="views\鐢熶骇宸ュ簭绠＄悊\澧炲姞涓嶈壇璇勫鍗昞QC_NoPassProdDisposeCheckBillMain.html" />
<Content Include="views\鐢熶骇宸ュ簭绠＄悊\澧炲姞涓嶈壇璇勫鍗昞QC_NoPassProdDisposeBillMain.html" />
<Content Include="views\鐢熶骇宸ュ簭绠＄悊\澧炲姞涓嶈壇璇勫鍗昞QC_NoPassProdDisposeCheckBillMainList.html" />
@@ -456,6 +461,8 @@
<Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞OA_ErrMsgBackReceiveBillMain.html" />
<Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞OA_ErrMsgBackReceiveBillMainList.html" />
<Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞Sc_Reply_MESExecptFeedBackBill.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫涓嶈壇閲囬泦\Sc_QualityReportStepBillList_New.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫涓嶈壇閲囬泦\Sc_QualityReportStepBill_New.html" />
<Content Include="views\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫浜ч噺姹囨姤\Sc_ICMOBillQualityStatus_TmpList.html" />
<Content Include="views\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫浜ч噺姹囨姤\Sc_ICMOBillWorkQtyStatus_TmpList.html" />
<Content Include="views\鐢熶骇绠＄悊\鏃ヨ鍒掑熀纭�璧勬枡\Cg_PODemandPlanConfigBill_Excel.html" />
--
Gitblit v1.9.1