From 6ef89c7ecf836c80d64b16a33478032e5c854be8 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期六, 02 十一月 2024 11:19:48 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

---
 WebTM/WebTM.csproj |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 3d78034..bdd5222 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -284,6 +284,7 @@
     <Content Include="views\WMS鎵爜妯″潡\瀹㈡埛鏉$爜鎵弿\Gy_getCusBarCodeBillList_BarCodeList.html" />
     <Content Include="views\WMS鎵爜妯″潡\瀹㈡埛鏉$爜鎵弿\Gy_getCusBarCodeBill_PDA.html" />
     <Content Include="views\WMS鎵爜妯″潡\瀹㈡埛鏉$爜鎵弿\Gy_getCusBarCodeBillList_PDA.html" />
+    <Content Include="views\WMS鎵爜妯″潡\搴撳瓨鏌ヨ\KF_ICInventoryByCLD_PDA.html" />
     <Content Include="views\WMS鎵爜妯″潡\鎵爜楠岃瘉\Gy_BarCodeConfirmBill_PDA.html" />
     <Content Include="views\WMS鎵爜妯″潡\鎵爜楠岃瘉\Gy_BarCodeConfirmBillList_PDA.html" />
     <Content Include="views\WMS鎵爜妯″潡\鎵爜楠岃瘉\Gy_BarCodeConfirmBillList.html" />
@@ -414,6 +415,7 @@
     <Content Include="views\鍩虹璧勬枡\閫氱敤鍩虹璧勬枡\Gy_CommonBaseData.html" />
     <Content Include="views\鍩虹璧勬枡\闅愯棌鍒楄缃甛Gy_GridView_Hide_New.html" />
     <Content Include="views\宸ヨ祫绠$悊\瀹氶鐢宠\Pay_ProcPriceRequestBillCheckQuery.html" />
+    <Content Include="views\宸ヨ祫绠$悊\宸ヨ祫鎶ヨ〃\Pay_PaymentEntryReport.html" />
     <Content Include="views\宸ヨ祫绠$悊\宸ヨ祫鎶ヨ〃\Pay_PayWorkShopSumReport.html" />
     <Content Include="views\宸ヨ祫绠$悊\宸ヨ祫鎶ヨ〃\Pay_PaymentDayCheckReport.html" />
     <Content Include="views\宸ヨ祫绠$悊\宸ヨ祫鎶ヨ〃\Pay_PaymentMonthSumReport.html" />
@@ -471,6 +473,7 @@
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇鎶ヨ〃\Sc_QualityReportBillMonth.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇鎶ヨ〃\Sc_QualityReportBillDay.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇璁″垝骞冲彴\JIT_DayPlanPlatForm_BCP.html" />
+    <Content Include="views\鐢熶骇绠$悊\璐ㄩ噺姹囨姤鍗昞Sc_QualityReportBill_PDA.html" />
     <Content Include="views\鐢熶骇绠$悊\璐ㄩ噺姹囨姤鍗昞Sc_QualityReportBillSumSave.html" />
     <Content Include="views\鐪嬫澘\閲囪喘鏀舵枡\KB_CGSL.html" />
     <Content Include="views\鐪嬫澘\閿�鍞彂璐KB_XSFH.html" />
@@ -496,6 +499,7 @@
     <Content Include="views\璁惧绠$悊\璁惧寮�鏈哄崟\Sb_EquipBeginBillList_PDA.html" />
     <Content Include="views\璁惧绠$悊\璁惧寮�鏈哄崟\Sb_EquipBeginBill_PDA.html" />
     <Content Include="views\璁惧绠$悊\璁惧鎶ヨ〃\Sb_EquipDotCheckTaskReport.html" />
+    <Content Include="views\璁惧绠$悊\璁惧鎶ヨ〃\SB_EquipICMOTechParamReport.html" />
     <Content Include="views\璁惧绠$悊\璁惧鎶ヨ〃\Sb_EquipMentCollectionTechParam_Temp.html" />
     <Content Include="views\璁惧绠$悊\璁惧鎶ヨ〃\Sb_EquipMentCollectionTechParam.html" />
     <Content Include="views\璁惧绠$悊\璁惧鎶ヨ〃\Sb_EquipRepairMonthSumReport.html" />
@@ -557,6 +561,7 @@
     <Content Include="views\杞﹂棿绠$悊\浜х嚎\Gy_WorkDay.html" />
     <Content Include="views\杞﹂棿绠$悊\浜х嚎\MES_AssemblyTraceability.html" />
     <Content Include="views\杞﹂棿绠$悊\浜х嚎\MES_AssemblyTraceabilityList.html" />
+    <Content Include="views\杞﹂棿绠$悊\浜х嚎\MES_ProductionLinePackaging_MXG.html" />
     <Content Include="views\杞﹂棿绠$悊\浜х嚎\MES_ProductionLinePackaging.html" />
     <Content Include="views\杞﹂棿绠$悊\浜х嚎\MES_ProductionLinePackagingList.html" />
     <Content Include="views\杞﹂棿绠$悊\浜х嚎\MES_WhiteLabelGeneration.html" />

--
Gitblit v1.9.1