From dfc7396c35ca421b88b1a2b61f4cdcbc5f8950e8 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期一, 08 十二月 2025 08:49:26 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index d7c2376..6bdf05c 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -690,7 +690,7 @@
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_BarCodeBillList_JiaNan.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_MouldFile_Excel.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_QCVerificationBillMain.html" />
- <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sb_Add_Gy_QCVerificationBillList.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Add_Edit_Gy_QCVerificationBill.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_MouldMaintainRuleBill_Excel.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_MouldMaintainRuleBillList_PDA.html" />
<Content Include="views\鐢熶骇绠＄悊\涓夊崌鎺掍骇\JIT_DayPlanPlatForm_Sec.html" />
@@ -860,6 +860,7 @@
<Content Include="views\璐ㄩ噺绠＄悊\鐜妫�娴嬪崟\QC_EnvironmentTestDotCheckBillList.html" />
<Content Include="views\璐ㄩ噺绠＄悊\鐜妫�娴嬪崟\QC_EnvironmentTestDotCheckBillEdit_PDA.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_FiveMenOneRingList_ICMO.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_MeasuringToolsyWarningReport.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_QualityDailyReprot_Sum.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_QualityDailyReprot.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_FiveMenOneRingList.html" />
@@ -936,11 +937,14 @@
<Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_ProcessItemStationPlatform_checkSN.html" />
<Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_ProcessItemStationPlatform_generateCaseCode.html" />
<Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_ProcessItemStationPlatform_checkPackage.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_ProcessItemStationPlatform_checkPackage_Sec.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_ProcessItemStationPlatform_KeyElement_Sec.html" />
<Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_ProcessItemStationPlatform_UnbindEdit.html" />
<Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_ProcessItemStationPlatform_UnbindList.html" />
<Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_ProcessItemStationPlatform_KeyElement.html" />
<Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_ProcessItemStationPlatform_batchKeyElement.html" />
<Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_ProcessItemStationPlatform_batch.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_SachetBarCodePrint.html" />
<Content Include="views\杞﹂棿绠＄悊\鍚姩鐐规鍗昞Gy_WorkBeginDotCheckListBill_Excel.html" />
<Content Include="views\杞﹂棿绠＄悊\鍚姩鐐规鍗昞Sc_WorkBeginDotCheckBill.html" />
<Content Include="views\杞﹂棿绠＄悊\鍚姩鐐规鍗昞Sc_WorkBeginDotCheckBillList.html" />
--
Gitblit v1.9.1