From 8066717769fced33300ce3ba86fa74e128aa34ef Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 05 十一月 2024 09:17:47 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 32a3cf7..913abae 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" />
@@ -478,6 +481,7 @@
<Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserDeptList.html" />
<Content Include="views\绯荤粺绠＄悊\澶氱骇瀹℃壒\瀹℃壒杩涘害\Xt_CheckFlowProgressList.html" />
<Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Xt_UserRightQuery.html" />
+ <Content Include="views\绯荤粺绠＄悊\绯荤粺閰嶇疆\Xt_AutoLoadBillList.html" />
<Content Include="views\璁″垝绠＄悊\Excel\Gy_Group_Excel.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBillCheckQuery.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBillCloseList.html" />
@@ -496,6 +500,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" />
@@ -1151,6 +1156,7 @@
<Content Include="views\grf\閫佽揣鍗�.grf" />
<Content Include="views\grf\鍙栨牱鍗�.grf" />
<Content Include="views\grf\15鐧芥爣鎵撳嵃.grf" />
+ <Content Include="views\grf\杩芥函鐮�.grf" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
--
Gitblit v1.9.1