From da19f4f42dddbff9e32e463b142b3ed263d79921 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 20 六月 2025 08:47:23 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 5ece8ec..b3a24e0 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -88,7 +88,6 @@
<Content Include="HtmlPage1.html" />
<Content Include="img\AI鑺墖.png" />
<Content Include="img\ic鑺墖.png" />
- <Content Include="img\鍗庤繙鐩存柟鍥捐儗鏅�.jpeg" />
<Content Include="img\鏅鸿兘鑺墖.png" />
<Content Include="img\鏅鸿兘鑺墖锛�.png" />
<Content Include="img\鐢靛瓙鎶�鏈�.png" />
@@ -174,6 +173,7 @@
<Content Include="layuiadmin\PubCustom.js" />
<Content Include="layuiadmin\PubJs\PubCheck.js" />
<Content Include="layuiadmin\HideButton_New.js" />
+ <Content Include="layuiadmin\zy_dropdown.js" />
<Content Include="views\Baseset\HBarPlanPrint.html" />
<Content Include="views\Baseset\SRM_OpenTmpList_GXPG.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_BadCountDevelopWHList.html" />
@@ -450,6 +450,12 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_QualityStd_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_AreaSet_ExtendDoubleClickReturn.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_BadPhenomena_Excel.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_PNLInfoEdit.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_BarCodeBill_PNL_TempEdit.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_PNLInfoList.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_BarCodeBill_PNL_TempList.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_BarCodeBill_Set_TempEdit.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_BarCodeBill_Set_TempList.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_CusType_ExtendDoubleClickReturn.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_ManualSynchronization.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MaterialCorrection.html" />
@@ -736,6 +742,8 @@
<Content Include="views\璁惧绠＄悊\璁惧瑙勭▼鍗昞Sb_EquipPatrolCheckRuleEdit.html" />
<Content Include="views\璁惧绠＄悊\璁惧瑙勭▼鍗昞Sb_EquipPatrolCheckRuleList.html" />
<Content Include="views\璁惧绠＄悊\璁惧瑙勭▼鍗昞Sb_EquipMaintainRuleBill_Excel.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\PNL妫�楠屼俊鎭痋QC_CheckNote_PNL_TempEdit.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\PNL妫�楠屼俊鎭痋QC_CheckNote_PNL_TempList.html" />
<Content Include="views\璐ㄩ噺绠＄悊\鍩虹寤烘ā\Gy_ErrMsgBackType_Excel.html" />
<Content Include="views\璐ㄩ噺绠＄悊\鍩虹寤烘ā\Gy_ErrType_Excel.html" />
<Content Include="views\璐ㄩ噺绠＄悊\鍩虹寤烘ā\QC_SpcCenterlineList.html" />
--
Gitblit v1.9.1