From f846c151c07eb296e4e6eac3e065d79f6c91f860 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 12 十一月 2024 16:57:39 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 9423d32..41110f5 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -421,10 +421,12 @@
<Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫鎶ヨ〃\Pay_PaymentMonthSumReport.html" />
<Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫鎶ヨ〃\Pay_PaymentTimeSumReport.html" />
<Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫鎶ヨ〃\Pay_PaymentPieceSumReport.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫缁撶畻鍗�%28涓汉%29\Pay_BatchCheck.html" />
<Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫杩愮畻\Pay_SalaryCalculate_New.html" />
<Content Include="views\宸ヨ祫绠＄悊\鎶�鑳借�冩牳\HR_EmployeeSkillExamBill.html" />
<Content Include="views\宸ヨ祫绠＄悊\鎶�鑳借�冩牳\HR_EmployeeSkillExamBillList.html" />
<Content Include="views\搴旀敹绠＄悊\鎶ヨ〃鍒嗘瀽\Xs_OutDoorBillReport.html" />
+ <Content Include="views\搴旀敹绠＄悊\鎶ヨ〃鍒嗘瀽\Xs_SellOutCompareToProductReport.html" />
<Content Include="views\搴旀敹绠＄悊\鎶ヨ〃鍒嗘瀽\Xs_SeOrderBarCodeInAndOutStockDetailReport.html" />
<Content Include="views\鏉＄爜鏄庣粏\Kf_MateOutBillList_CodeDetail.html" />
<Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿鎶ヨ〃\Sc_MouldLifeUsePicReport.html" />
@@ -439,6 +441,8 @@
<Content Include="views\妯℃不鍏风鐞哱妯″叿鍏朵粬鍏ュ簱鍗昞Sc_MouldOtherInBill_PDA_old.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿鍏朵粬鍑哄簱鍗昞Sc_MouldOtherOutBillList_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿鍏朵粬鍑哄簱鍗昞Sc_MouldOtherOutBill_PDA_old.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯″叿鎶曚骇楠屾敹鍗昞Sc_MouldBatchWorkCheckBillEdit.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯″叿鎶曚骇楠屾敹鍗昞Sc_MouldBatchWorkCheckBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿鎶ュ簾鍏ュ簱鍗昞Sc_MouldScrapInBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿鎶ュ簾鍏ュ簱鍗昞Sc_MouldScrapInBill_PDA_old.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿鎶ュ簾鍑哄簱鍗昞Sc_MouldScrapOutBill_PDA.html" />
@@ -515,6 +519,8 @@
<Content Include="views\璐ㄩ噺绠＄悊\鍩虹寤烘ā\Gy_ErrMsgBackType_Excel.html" />
<Content Include="views\璐ㄩ噺绠＄悊\鍩虹寤烘ā\Gy_ErrType_Excel.html" />
<Content Include="views\璐ㄩ噺绠＄悊\寮傚父鍙嶉\OA_ErrMsgBackSelfQuery_BGT.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_QualityDailyReprot_Sum.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_QualityDailyReprot.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_FiveMenOneRingList.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_EquipMentCollectionTechParam.html" />
<Content Include="views\璁惧绠＄悊\璁惧瑙勭▼鍗昞Sb_EquipDotCheckRule_Excel.html" />
@@ -532,7 +538,7 @@
<Content Include="views\璐ㄩ噺绠＄悊\妫�楠屽彇鏍疯繕鏍峰崟\QC_BackSampleCheckBillMainList.html" />
<Content Include="views\璐ㄩ噺绠＄悊\妫�楠屽彇鏍疯繕鏍峰崟\QC_TakeSampleCheckBillMainList.html" />
<Content Include="views\璐ㄩ噺绠＄悊\妫�楠屽彇鏍疯繕鏍峰崟\QC_Add_TakeSampleCheckBill.html" />
- <Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_ErrManagerLedgerReport_EquipTop3Issue.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_BadReasonTop3Report.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_ErrManagerLedgerReport_Issue.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_ErrManagerLedgerReport_SourceOfTheProblem.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_ErrManagerLedgerReport_Source.html" />
@@ -552,6 +558,7 @@
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_SkillExamMonthSumReport.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\SB_TechnologyParameterList.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_ProcessPerformanceFirstPass.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_QualityMonthReport.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\Sc_StationOutBil_HProc.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鏈堝害鐩爣鍗昞QC_MonthTarGetBill.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鏈堝害鐩爣鍗昞QC_MonthTarGetBillList.html" />
--
Gitblit v1.9.1