From 03cc5d52bcd95ebd6c06cc279a8c240097b74e7d Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 28 十一月 2024 14:30:43 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 41110f5..da0cbe9 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -266,6 +266,7 @@
<Content Include="views\WMS鎵爜妯″潡\涓婃枡闃查敊鍗昞Sc_MaterToSourceBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\涓婃枡闃查敊鍗昞Sc_MaterToSourceBillList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鍏朵粬鍏ュ簱\Kf_OtherInBackBillList_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\鍏朵粬鍏ュ簱\Kf_OtherInBill_Check_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鍏朵粬鍏ュ簱\Kf_OtherInBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鍏朵粬鍏ュ簱\Kf_OtherInBillList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鍏朵粬鍑哄簱\Kf_OtherOutBill_PDA.html" />
@@ -355,17 +356,20 @@
<Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\Crm_CustomerAppealBill.html" />
<Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\Crm_CustomerAppealBillList.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_CheckNoteItem.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_EnvironmentTestItem.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_TechnologyParameterType.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_MaintainLev.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_CheckItem_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_InspectBasis_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_InspectInstruMent_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_InspectMethod_Excel.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_EnvironmentTestItem_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_InspectValue_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_QCCheckClass_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_QualityStd_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_EquipType_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_CheckNoteItem_Excel.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_EnvironmentTestItem.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MaterType_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Material_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_PreventErrMould_Excel.html" />
@@ -415,6 +419,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_PayrollReportByKD.html" />
<Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫鎶ヨ〃\Pay_PaymentEntryReport.html" />
<Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫鎶ヨ〃\Pay_PayWorkShopSumReport.html" />
<Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫鎶ヨ〃\Pay_PaymentDayCheckReport.html" />
@@ -472,6 +477,7 @@
<Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞Sc_MESExecptFeedBackBillType.html" />
<Content Include="views\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫寮�宸Sc_SwipeCardStart.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇浠诲姟鍗昞Sc_ICMOBillOrProcessExchangeResumeList.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鐢熶骇寮�宸ュ崟\Sc_MESBeginWorkBillList_PDA.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇鎶ヨ〃\Sc_ProductionInProgressReport.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇鎶ヨ〃\Sc_NutInspectionCCDPassRate.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇鎶ヨ〃\Sc_QualityReportBillMonth.html" />
@@ -519,6 +525,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_EnvironmentTestDotCheckBillEdit.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\鐜妫�娴嬪崟\QC_EnvironmentTestDotCheckBillList.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_QualityDailyReprot_Sum.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_QualityDailyReprot.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_FiveMenOneRingList.html" />
@@ -612,6 +620,8 @@
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_ProductedRateReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_HMaterYieldStatisticsList.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_RetentionTimeReport.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\鍩虹寤烘ā\Gy_EnvironmentTestSchemeBillEdit.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\鍩虹寤烘ā\Gy_EnvironmentTestSchemeBillList.html" />
<Content Include="views\杞﹂棿绠＄悊\杞﹂棿鍦ㄥ埗鍝佹湡鍒濆崟\CJ_WIPBeginStockBill.html" />
<Content Include="views\杞﹂棿绠＄悊\杞﹂棿鍦ㄥ埗鍝佹湡鍒濆崟\CJ_WIPBeginStockBillList.html" />
<Content Include="views\杞﹂棿绠＄悊\闃查敊楠岃瘉\Gy_MaterPreventErrMouldBill.html" />
@@ -631,6 +641,7 @@
<Content Include="views\閲囪喘绠＄悊\閲囪喘鎶ヨ〃\Cg_POInStockBillSumReport.html" />
<Content Include="views\閲囪喘绠＄悊\閲囪喘鎶ヨ〃\Cg_POMaterialPriceReport.html" />
<Content Include="views\閲囪喘绠＄悊\閲囪喘鎶ヨ〃\Cg_POOrderBillProcessSumReport.html" />
+ <Content Include="views\閲囪喘绠＄悊\閲囪喘鎶ヨ〃\Cg_POOrderInStockSumReport.html" />
<Content Include="views\閲囪喘绠＄悊\閲囪喘璁㈠崟\Cg_POOrderBillCheckQuery.html" />
<Content Include="views\閲囪喘绠＄悊\閲囪喘璁㈠崟\Cg_POOrderBillQuery.html" />
<Content Include="views\閿�鍞鐞哱鍑洪棬纭鍗昣鏂癨Xs_OutDoorBill.html" />
@@ -640,6 +651,7 @@
<Content Include="views\閿�鍞鐞哱鏀舵鍗昞YS_ReceiveBillQuery.html" />
<Content Include="views\閿�鍞鐞哱閿�鍞悎鍚孿Add_Edit_Xs_ContractBillList.html" />
<Content Include="views\閿�鍞鐞哱閿�鍞悎鍚孿Xs_ContractBillList.html" />
+ <Content Include="views\閿�鍞鐞哱閿�鍞姤琛╘Xs_SeOrderOutStockSumReport.html" />
<Content Include="views\閿�鍞鐞哱閿�鍞鍗昞Xs_SeOrderBillQuery.html" />
<Content Include="views\椤圭洰绠＄悊\鍩虹寤烘ā\Add_Edit_PM_CustomerProInfoBill.html" />
<Content Include="views\椤圭洰绠＄悊\鍩虹寤烘ā\Add_Edit_Gy_TaskClass.html" />
--
Gitblit v1.9.1