From eed3b231710f649f3d91f6b0de507ebd23817cb4 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 30 七月 2024 14:00:31 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 27d8f38..df230b5 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -252,6 +252,7 @@
<Content Include="views\video\1.wav" />
<Content Include="views\video\jingbao.wav" />
<Content Include="views\video\success.wav" />
+ <Content Include="views\WMS鎵爜妯″潡\涓夌偣鐓у悎鎵爜璁板綍鍗昞WMS_CusBarCodeCheckBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\涓婃枡闃查敊鍗昞Sc_MaterToSourceBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\涓婃枡闃查敊鍗昞Sc_MaterToSourceBillList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鍏朵粬鍏ュ簱\Kf_OtherInBackBillList_PDA.html" />
@@ -310,6 +311,7 @@
<Content Include="views\WMS鎵爜妯″潡\閿�鍞嚭搴揬Kf_SellOutBill_QiaoYi_PDA.html" />
<Content Include="views\浜轰簨绠＄悊\寮傚父鍙嶉鍗昞OA_ErrMsgBackBillList_PDA.html" />
<Content Include="views\浜轰簨绠＄悊\寮傚父鍙嶉鍗昞OA_ErrMsgBackBill_PDA.html" />
+ <Content Include="views\浠撳瓨绠＄悊\涓夌偣鐓у悎鎵爜璁板綍鍗昞WMS_CusBarCodeCheckBillList.html" />
<Content Include="views\浠撳瓨绠＄悊\浠撳簱璋冩嫧\Add_Edit_Kf_MoveStockBill.html" />
<Content Include="views\浠撳瓨绠＄悊\鍒嗘寮忚皟鍏ュ崟\Fb_StepFoldinBillEdit.html" />
<Content Include="views\浠撳瓨绠＄悊\鏉＄爜搴撳瓨\KF_PonderationBillMain_Temp.html" />
@@ -411,6 +413,7 @@
<Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞Sc_MESExecptFeedBackBillType.html" />
<Content Include="views\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫寮�宸Sc_SwipeCardStart.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇浠诲姟鍗昞Sc_ICMOBillOrProcessExchangeResumeList.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鐢熶骇鎶ヨ〃\Sc_NutInspectionCCDPassRate.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇鎶ヨ〃\Sc_QualityReportBillMonth.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇鎶ヨ〃\Sc_QualityReportBillDay.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇璁″垝骞冲彴\JIT_DayPlanPlatForm_BCP.html" />
@@ -420,8 +423,6 @@
<Content Include="views\绯荤粺绠＄悊\澶氱骇瀹℃壒\瀹℃壒杩涘害\Xt_CheckFlowProgressList.html" />
<Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Xt_UserRightQuery.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Pay_ProcPriceTypeChangeReport.html" />
- <Content Include="views\璁惧绠＄悊\Sb_Add_EquipRepairSignBillList.html" />
- <Content Include="views\璁惧绠＄悊\Sb_EquipRepairSignBillMain.html" />
<Content Include="views\璁惧绠＄悊\璁惧鍋滄満鍗昞Sb_EquipStopBillList_PDA.html" />
<Content Include="views\璁惧绠＄悊\璁惧鍋滄満鍗昞Sb_EquipStopBill_PDA.html" />
<Content Include="views\璁惧绠＄悊\璁惧宸ヨ壓鍙傛暟璁㈠崟鐐规琛╘SB_EquipICMOTechParamBillList.html" />
@@ -448,6 +449,10 @@
<Content Include="views\璐ㄩ噺绠＄悊\妫�楠屽彇鏍疯繕鏍峰崟\QC_TakeSampleCheckBillMainList.html" />
<Content Include="views\璐ㄩ噺绠＄悊\妫�楠屽彇鏍疯繕鏍峰崟\QC_Add_TakeSampleCheckBill.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_InspectionFormReport.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_MoistureContentDataLedger.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_QualityStatisticsDailyReport.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鏈堝害鐩爣鍗昞QC_MonthTarGetBill.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鏈堝害鐩爣鍗昞QC_MonthTarGetBillList.html" />
<Content Include="views\璐ㄩ噺绠＄悊\杞﹂棿鑷鍗昞QC_Add_Edit_WorkSelfCheckBill.html" />
<Content Include="views\璐ㄩ噺绠＄悊\杞﹂棿鑷鍗昞QC_WorkSelfCheckBillList.html" />
<Content Include="views\杞﹂棿绠＄悊\浜х嚎\222.jpg" />
@@ -483,6 +488,8 @@
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_ProductedRateReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_HMaterYieldStatisticsList.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_RetentionTimeReport.html" />
+ <Content Include="views\杞﹂棿绠＄悊\杞﹂棿鍦ㄥ埗鍝佹湡鍒濆崟\CJ_WIPBeginStockBill.html" />
+ <Content Include="views\杞﹂棿绠＄悊\杞﹂棿鍦ㄥ埗鍝佹湡鍒濆崟\CJ_WIPBeginStockBillList.html" />
<Content Include="views\杞﹂棿绠＄悊\闃查敊楠岃瘉\Gy_MaterPreventErrMouldBill.html" />
<Content Include="views\杞﹂棿绠＄悊\闃查敊楠岃瘉\Gy_MaterPreventErrMouldBillList.html" />
<Content Include="views\杞﹂棿绠＄悊\闃查敊楠岃瘉\Qc_PreventErrMouldCheckBill.html" />
--
Gitblit v1.9.1