From 00ea07f0fcdb261bf088e8aed9443161064cce1e Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期三, 16 十月 2024 09:27:24 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 52 insertions(+), 0 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 4a37ae1..a404706 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -93,6 +93,7 @@
<Content Include="layuiadmin\ax\images\login-left.jpg" />
<Content Include="layuiadmin\ax\images\yanzhengma.jpg" />
<Content Include="layuiadmin\ax\main.css" />
+ <Content Include="layuiadmin\BillMainAutoLoad.js" />
<Content Include="layuiadmin\ckou.js" />
<Content Include="layuiadmin\echarts.min.js" />
<Content Include="layuiadmin\grwebapp.js" />
@@ -141,6 +142,7 @@
<Content Include="layuiadmin\treeTable.js" />
<Content Include="layuiadmin\PubCustom.js" />
<Content Include="layuiadmin\PubJs\PubCheck.js" />
+ <Content Include="layuiadmin\HideButton_New.js" />
<Content Include="views\Baseset\HBarPlanPrint.html" />
<Content Include="views\Baseset\SRM_OpenTmpList_GXPG.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_BadCountDevelopWHList.html" />
@@ -334,6 +336,7 @@
<Content Include="views\浠撳瓨绠＄悊\鏉＄爜鎶ヨ〃\Kf_ICInvBalList.html" />
<Content Include="views\浠撳瓨绠＄悊\鐢熶骇鍏ュ簱鍗昞Kf_ProductInBillList.html" />
<Content Include="views\鍏叡椤甸潰\Kf_ChaoBaoEditDlg.html" />
+ <Content Include="views\鍏叡椤甸潰\Kf_SourceBillEditDlg_PDA.html" />
<Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\QC_CustomerAppealReport_BadClass.html" />
<Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\QC_CustomerAppealReport_Material.html" />
<Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\QC_CustomerAppealReport_Emp.html" />
@@ -346,6 +349,19 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_CheckNoteItem.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_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_MaterType_Excel.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Material_Excel.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_PreventErrMould_Excel.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MouldType_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_TechnologyParameterType.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\SumAdd_Gy_RestDay.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_RestDay.html" />
@@ -366,21 +382,33 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_SellOutBillListByID.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ICMOReportBillList2.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ICMOReportBillList.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_QC_TakeSampleCheckBillMainList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Xs_SeOrderBill_StockInCodeNote.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlSRM_Web_BarCodeBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemMethodEdit.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemClassEdit.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemMethodList.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemClassList.html" />
+ <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_ConkReasonList_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairCheck_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_Repair_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_Maintain_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheck_Excel.html" />
+ <Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_WorkType_Excel.html" />
+ <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Add_Edit_Gy_ProcMul.html" />
+ <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_DisposeWay_Excel.html" />
+ <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_ProcMul.html" />
+ <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_PostSkill_Excel.html" />
+ <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_Post_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_Process_Excel.html" />
+ <Content Include="views\鍩虹璧勬枡\閫氱敤鍩虹璧勬枡\Gy_CommonBaseData.html" />
<Content Include="views\鍩虹璧勬枡\闅愯棌鍒楄缃甛Gy_GridView_Hide_New.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\瀹氶鐢宠\Pay_ProcPriceRequestBillCheckQuery.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫杩愮畻\Pay_SalaryCalculate_New.html" />
<Content Include="views\宸ヨ祫绠＄悊\鎶�鑳借�冩牳\HR_EmployeeSkillExamBill.html" />
<Content Include="views\宸ヨ祫绠＄悊\鎶�鑳借�冩牳\HR_EmployeeSkillExamBillList.html" />
<Content Include="views\搴旀敹绠＄悊\鎶ヨ〃鍒嗘瀽\Xs_SeOrderBarCodeInAndOutStockDetailReport.html" />
+ <Content Include="views\鏉＄爜鏄庣粏\Kf_MateOutBillList_CodeDetail.html" />
<Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿鎶ヨ〃\Sc_MouldLifeUsePicReport.html" />
<Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿鎶ヨ〃\Sc_MouldDotCheckTaskReport.html" />
<Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿鎶ヨ〃\Sc_MouldMaintainTaskReport.html" />
@@ -415,6 +443,7 @@
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风偣妫�淇濆吇\Sc_MouldDotCheckBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风偣妫�淇濆吇\Sc_MouldDotCheckBill_PDA_OLD.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风偣妫�淇濆吇\Sc_MouldMaintainBill_PDA.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_MouldFile_Excel.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_MouldMaintainRuleBillList_PDA.html" />
<Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞OA_ErrMsgBackSignBill_BrushCard.html" />
<Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞Sc_MESExecptFeedBackBillResumeList.html" />
@@ -433,6 +462,8 @@
<Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserDeptList.html" />
<Content Include="views\绯荤粺绠＄悊\澶氱骇瀹℃壒\瀹℃壒杩涘害\Xt_CheckFlowProgressList.html" />
<Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Xt_UserRightQuery.html" />
+ <Content Include="views\璁″垝绠＄悊\Excel\Gy_Group_Excel.html" />
+ <Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBillCheckQuery.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Pay_ProcPriceTypeChangeReport.html" />
<Content Include="views\璁惧绠＄悊\Sb_Add_EquipRepairSignBillList.html" />
<Content Include="views\璁惧绠＄悊\Sb_EquipRepairSignBillList_PDA.html" />
@@ -440,6 +471,8 @@
<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_Detail.html" />
+ <Content Include="views\璁惧绠＄悊\璁惧宸ヨ壓鍙傛暟璁㈠崟鐐规琛╘Sb_EquipMentCollectionTechParam_ERRList.html" />
<Content Include="views\璁惧绠＄悊\璁惧宸ヨ壓鍙傛暟璁㈠崟鐐规琛╘SB_EquipICMOTechParamBillList.html" />
<Content Include="views\璁惧绠＄悊\璁惧宸ヨ壓鍙傛暟璁㈠崟鐐规琛╘SB_EquipICMOTechParamBillEdit.html" />
<Content Include="views\璁惧绠＄悊\璁惧寮�鏈哄崟\Sb_EquipBeginBillList_PDA.html" />
@@ -455,6 +488,9 @@
<Content Include="views\璁惧绠＄悊\璁惧鎶ヨ〃\Sb_EquipResumeCheckQuery.html" />
<Content Include="views\璁惧绠＄悊\璁惧鎶ヨ〃\Sb_EquipRepairReport.html" />
<Content Include="views\璁惧绠＄悊\璁惧鎶ヨ〃\缂栬緫椤甸潰\Edit_Sb_EquipMentCollectionTechParam.html" />
+ <Content Include="views\璁惧绠＄悊\璁惧妗ｆ\Gy_EquipFile_Excel.html" />
+ <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_FiveMenOneRingList.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_EquipMentCollectionTechParam.html" />
@@ -514,6 +550,7 @@
<Content Include="views\杞﹂棿绠＄悊\浜х嚎\Sc_ProcessReportList_Last.html" />
<Content Include="views\杞﹂棿绠＄悊\浜х嚎\Sc_StationInBillList.html" />
<Content Include="views\杞﹂棿绠＄悊\浜х嚎\test.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鍏抽敭浠剁粦瀹歕Sc_KeyElementBinding.html" />
<Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯\SingleItemTransitList.html" />
<Content Include="views\杞﹂棿绠＄悊\鍚姩鐐规鍗昞Sc_WorkBeginDotCheckBill.html" />
<Content Include="views\杞﹂棿绠＄悊\鍚姩鐐规鍗昞Sc_WorkBeginDotCheckBillList.html" />
@@ -522,6 +559,8 @@
<Content Include="views\璁惧绠＄悊\璁惧寮�鏈哄崟\Sb_EquipBeginBill.html" />
<Content Include="views\璁惧绠＄悊\璁惧寮�鏈哄崟\Sb_EquipBeginBillList.html" />
<Content Include="views\璐ㄩ噺绠＄悊\宸℃璁板綍鍗昞MES_QC_PatrolProcCheckOtherBill_PDA.html" />
+ <Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆\MES_CenterCheckBill.html" />
+ <Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆\MES_CenterCheckBillList.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBillList_Source.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeArrangement_PG.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBill_BatchSplit.html" />
@@ -558,6 +597,9 @@
<Content Include="views\閲囪喘绠＄悊\閲囪喘鎶ヨ〃\Cg_POOrderBillProcessSumReport.html" />
<Content Include="views\閲囪喘绠＄悊\閲囪喘璁㈠崟\Cg_POOrderBillCheckQuery.html" />
<Content Include="views\閲囪喘绠＄悊\閲囪喘璁㈠崟\Cg_POOrderBillQuery.html" />
+ <Content Include="views\閿�鍞鐞哱鍙戣揣閫氱煡鍗昞Xs_SeOutStockBillQuery.html" />
+ <Content Include="views\閿�鍞鐞哱搴旀敹鍗昞Xs_ReceivableBillQuery.html" />
+ <Content Include="views\閿�鍞鐞哱鏀舵鍗昞YS_ReceiveBillQuery.html" />
<Content Include="views\閿�鍞鐞哱閿�鍞悎鍚孿Add_Edit_Xs_ContractBillList.html" />
<Content Include="views\閿�鍞鐞哱閿�鍞悎鍚孿Xs_ContractBillList.html" />
<Content Include="views\閿�鍞鐞哱閿�鍞鍗昞Xs_SeOrderBillQuery.html" />
@@ -1999,6 +2041,7 @@
<Content Include="views\椤圭洰绠＄悊\鍛ㄨ鍒抃PM_WorkReportWeekBillMainList.html" />
<Content Include="views\椤圭洰绠＄悊\鍛ㄨ鍒抃PM_WorkTaskWeekBillList.html" />
<Content Include="views\椤圭洰绠＄悊\鍛ㄨ鍒抃PM_WorkTaskWeekBill.html" />
+ <Content Include="views\椤圭洰绠＄悊\宸ヤ綔浠诲姟\PM_WorkTaskBill_AutoLoadBillMain.html" />
<Content Include="views\椤圭洰绠＄悊\宸ョ▼椤圭洰\PM_CustomerProInfoBillMainList.html" />
<Content Include="views\椤圭洰绠＄悊\宸ヤ綔浠诲姟\PM_WorkTaskMoneyBOMBill.html" />
<Content Include="views\椤圭洰绠＄悊\宸ヤ綔浠诲姟\PM_WorkTaskMoneyBOMBillList.html" />
@@ -2046,8 +2089,10 @@
<Content Include="views\棰嗘枡鍙戣揣\鏀舵枡鍏ュ簱\Kf_ReciveBill_Check.html" />
<Content Include="views\棰嗘枡鍙戣揣\鏀舵枡鍏ュ簱\Kf_ReciveBill_Fast_AR.html" />
<Content Include="views\棰嗘枡鍙戣揣\鏀舵枡鍏ュ簱\Kf_ReciveBill_Fast.html" />
+ <Content Include="views\棰嗘枡鍙戣揣\鏀舵枡鍏ュ簱\Kf_ReciveBill_Fast_TK.html" />
<Content Include="views\棰嗘枡鍙戣揣\鐢熶骇琛ユ枡\Kf_MateReplenishOutBill_Check_New.html" />
<Content Include="views\棰嗘枡鍙戣揣\鐢熶骇琛ユ枡\Kf_MateReplenishOutBill_CheckList_New.html" />
+ <Content Include="views\棰嗘枡鍙戣揣\閿�鍞嚭搴揬Kf_SellOutBillQuery.html" />
<Content Include="views\棰嗘枡鍙戣揣\閿�鍞嚭搴揬Kf_SellOutBill.html" />
<Content Include="views\棰嗘枡鍙戣揣\閿�鍞嚭搴揬Kf_SellOutBillList_LookDown.html" />
<Content Include="views\棰嗘枡鍙戣揣\閿�鍞嚭搴揬Kf_SellOutBill_CheckList_New.html" />
@@ -2330,6 +2375,13 @@
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ICMOReportBillList.aspx.designer.cs">
<DependentUpon>xmlLBM_Sc_ICMOReportBillList.aspx</DependentUpon>
</Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_QC_TakeSampleCheckBillMainList.aspx.cs">
+ <DependentUpon>xmlLBM_QC_TakeSampleCheckBillMainList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_QC_TakeSampleCheckBillMainList.aspx.designer.cs">
+ <DependentUpon>xmlLBM_QC_TakeSampleCheckBillMainList.aspx</DependentUpon>
+ </Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Xs_SellOutChangeBillList.aspx.cs">
<DependentUpon>xmlLBM_Xs_SellOutChangeBillList.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
--
Gitblit v1.9.1