From 6a2cf9f4e0180ca707c5e0eb188f92ab74da5763 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 02 八月 2024 15:09:55 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

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

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 012977f..4357019 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" />
@@ -432,6 +435,7 @@
     <Content Include="views\璁惧绠$悊\璁惧鎶ヨ〃\Sb_EquipRepairTaskReport.html" />
     <Content Include="views\璁惧绠$悊\璁惧鎶ヨ〃\Sb_EquipResumeCheckQuery.html" />
     <Content Include="views\璁惧绠$悊\璁惧瑙勭▼鍗昞Sb_EquipDotCheckRule_Excel.html" />
+    <Content Include="views\璐ㄩ噺绠$悊\宸℃璁板綍鍗昞MES_QC_PatrolProcCheckOtherBillList_PDA.html" />
     <Content Include="views\璐ㄩ噺绠$悊\宸ヤ綔鑱旂郴鍗昞OA_WorkLinkSelfQuery.html" />
     <Content Include="views\璐ㄩ噺绠$悊\宸ヤ綔鑱旂郴鍗昞OA_Add_Edit_WorkLinkBill.html" />
     <Content Include="views\璐ㄩ噺绠$悊\宸ヤ綔鑱旂郴鍗昞OA_WorkLinkBillList.html" />
@@ -446,6 +450,14 @@
     <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_ProcessPerformancePass.html" />
+    <Content Include="views\璐ㄩ噺绠$悊\璐ㄩ噺鎶ヨ〃\QC_QualityStatisticsDailyReport.html" />
+    <Content Include="views\璐ㄩ噺绠$悊\璐ㄩ噺鎶ヨ〃\QC_MoistureContentDataLedger.html" />
+    <Content Include="views\璐ㄩ噺绠$悊\璐ㄩ噺鎶ヨ〃\QC_QualityStatisticsDailyReport.html" />
+    <Content Include="views\璐ㄩ噺绠$悊\璐ㄩ噺鎶ヨ〃\SB_TechnologyParameterList.html" />
+    <Content Include="views\璐ㄩ噺绠$悊\璐ㄩ噺鎶ヨ〃\QC_ProcessPerformanceFirstPass.html" />
+    <Content Include="views\璐ㄩ噺绠$悊\璐ㄩ噺鎶ヨ〃\Sc_StationOutBil_HProc.html" />
     <Content Include="views\璐ㄩ噺绠$悊\璐ㄩ噺鏈堝害鐩爣鍗昞QC_MonthTarGetBill.html" />
     <Content Include="views\璐ㄩ噺绠$悊\璐ㄩ噺鏈堝害鐩爣鍗昞QC_MonthTarGetBillList.html" />
     <Content Include="views\璐ㄩ噺绠$悊\杞﹂棿鑷鍗昞QC_Add_Edit_WorkSelfCheckBill.html" />
@@ -472,6 +484,7 @@
     <Content Include="views\璁惧绠$悊\璁惧鍋滄満鍗昞Sb_EquipStopBillList.html" />
     <Content Include="views\璁惧绠$悊\璁惧寮�鏈哄崟\Sb_EquipBeginBill.html" />
     <Content Include="views\璁惧绠$悊\璁惧寮�鏈哄崟\Sb_EquipBeginBillList.html" />
+    <Content Include="views\璐ㄩ噺绠$悊\宸℃璁板綍鍗昞MES_QC_PatrolProcCheckOtherBill_PDA.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBillList_Source.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeArrangement_PG.html" />
     <Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\Cj_SPCOscillationCurve.html" />
@@ -479,7 +492,9 @@
     <Content Include="views\杞﹂棿绠$悊\鍚姩鐐规鍗昞Gy_WorkBeginDotCheckListBill.html" />
     <Content Include="views\杞﹂棿绠$悊\鍚姩鐐规鍗昞Gy_WorkBeginDotCheckListBillList.html" />
     <Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\Sc_CompareOrderToSelloutReport.html" />
+    <Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\Sc_HICMMaterStatisticsList.html" />
     <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" />

--
Gitblit v1.9.1