From 7c6dbc2da5bea1fa7b45a4c1fdaa26fc1be16be8 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 18 九月 2023 08:41:01 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj | 90 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 90 insertions(+), 0 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 1fa7ea3..02540f7 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -72,6 +72,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\ckou.js" />
<Content Include="layuiadmin\echarts.min.js" />
<Content Include="layuiadmin\grwebapp.js" />
<Content Include="layuiadmin\HideButton.js" />
@@ -93,6 +94,8 @@
<Content Include="layuiadmin\layui\layui.js" />
<Content Include="layuiadmin\layui\layui1.js" />
<Content Include="layuiadmin\layui\zgqlayui.js" />
+ <Content Include="layuiadmin\lib\extend\echarts.min.js" />
+ <Content Include="layuiadmin\lineBreakTransformer.js" />
<Content Include="layuiadmin\modules\excel.js" />
<Content Include="layuiadmin\modules\soulTable.js" />
<Content Include="layuiadmin\modules\tableChild.js" />
@@ -106,6 +109,7 @@
<Content Include="layuiadmin\myicon\鎴戠殑璁剧疆.svg" />
<Content Include="layuiadmin\myicon\绯荤粺璁剧疆.svg" />
<Content Include="layuiadmin\myicon\杞﹂棿绠$悊.svg" />
+ <Content Include="layuiadmin\serial-reader.js" />
<Content Include="layuiadmin\soulTable.slim.js" />
<Content Include="layuiadmin\treeTable.js" />
<Content Include="layuiadmin\PubCustom.js" />
@@ -118,6 +122,7 @@
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_ClassTimePrjList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_EquipFileBillMainList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_GetProcNoList.html" />
+ <Content Include="views\Baseset\鍩虹璧勬枡\Gy_InspectInstruMentList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_InspectValueList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_LineCenter.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_MaterialList_LSQP.html" />
@@ -136,6 +141,7 @@
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_TechParameterUnitList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_StockPlaceListNew.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_UnitGroup.html" />
+ <Content Include="views\Baseset\鍩虹璧勬枡\Gy_CustomerListNew.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_WarehouseListNew.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_WasterWHList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_WHList.html" />
@@ -190,6 +196,7 @@
<Content Include="views\PublicPage\HSourceReportHtml.html" />
<Content Include="views\PublicPage\transfer.html" />
<Content Include="views\ReportHtml.html" />
+ <Content Include="views\set\user\Gy_USERSet_PDA.html" />
<Content Include="views\test\testRenderAutomationList.html" />
<Content Include="views\userfiles\images\pda.jpg" />
<Content Include="views\userfiles\images\loginBackground-New.jpg" />
@@ -199,11 +206,14 @@
<Content Include="views\video\1.wav" />
<Content Include="views\video\jingbao.wav" />
<Content Include="views\video\success.wav" />
+ <Content Include="views\WMS鎵爜妯″潡\鍏朵粬鍏ュ簱\Kf_OtherInBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇绠$悊\鍒犳墭鍗昞Sc_DeletePackUnionBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇绠$悊\鐢熶骇缁勬墭鍗昞Sc_PackUnionBillList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇绠$悊\鐢熶骇缁勬墭鍗昞Sc_PackUnionBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\璋冩嫧鎹㈡墭\Kf_MoveStockBill_HuanTuo_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\璋冩嫧鎹㈡墭\Kf_MoveStockBillList_HuanTuo_PDA.html" />
+ <Content Include="views\浜轰簨绠$悊\寮傚父鍙嶉鍗昞OA_ErrMsgBackBillList_PDA.html" />
+ <Content Include="views\浜轰簨绠$悊\寮傚父鍙嶉鍗昞OA_ErrMsgBackBill_PDA.html" />
<Content Include="views\浠撳瓨绠$悊\鏉$爜鎶ヨ〃\Kf_MaterOutInReport.html" />
<Content Include="views\浠撳瓨绠$悊\鏉$爜鎶ヨ〃\Kf_ICInventory_Mater.html" />
<Content Include="views\浠撳瓨绠$悊\鏉$爜鎶ヨ〃\Kf_ICInventory_BarCode.html" />
@@ -212,9 +222,17 @@
<Content Include="views\浜轰簨绠$悊\鍏ヨ亴鐢宠\HR_EmpEngageRequestBillList.html" />
<Content Include="views\浜轰簨绠$悊\绂昏亴鐢宠\HR_EmpDimissionBill.html" />
<Content Include="views\浜轰簨绠$悊\绂昏亴鐢宠\HR_EmpDimissionBillList.html" />
+ <Content Include="views\浜轰簨绠$悊\鑱屽憳寮傚姩鍗昞HR_EmpChangeBill.html" />
+ <Content Include="views\浜轰簨绠$悊\鑱屽憳寮傚姩鍗昞HR_EmpChangeBillList.html" />
+ <Content Include="views\鍝佽川绠$悊\瀹㈣瘔澶勭悊\Crm_CustomerAppealBill.html" />
+ <Content Include="views\鍝佽川绠$悊\瀹㈣瘔澶勭悊\Crm_CustomerAppealBillList.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_TemporaryArea.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MaterType.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MaterTypeEdit.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_TemporaryArea.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\HBarPlanPrint_GXPG.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcessExchangeArrangement.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_MateOutBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_OtherOutBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_WarehouseList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_EmployeeList.aspx" />
@@ -223,26 +241,75 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcExchRecordBackBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcCommPrice.html" />
<Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcCommPriceList.html" />
+ <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_Souce_Excel.html" />
+ <Content Include="views\宸ヨ祫绠$悊\鍔犵彮鐢宠\Pay_OverApplyBill.html" />
+ <Content Include="views\宸ヨ祫绠$悊\鍔犵彮鐢宠\Pay_OverApplyBillList.html" />
+ <Content Include="views\宸ヨ祫绠$悊\瀹氶鐢宠\Pay_ProcPriceRequestBill.html" />
+ <Content Include="views\宸ヨ祫绠$悊\瀹氶鐢宠\Pay_ProcPriceRequestBillList.html" />
+ <Content Include="views\宸ヨ祫绠$悊\宸ヨ祫鍗昞Pay_PayMentBill.html" />
+ <Content Include="views\宸ヨ祫绠$悊\宸ヨ祫鍗昞Pay_PayMentBillList.html" />
<Content Include="views\宸ヨ祫绠$悊\宸ヨ祫缁撶畻鍗�%28涓汉%29\Pay_SingleBalBillEdit.html" />
<Content Include="views\宸ヨ祫绠$悊\宸ヨ祫缁撶畻鍗�%28涓汉%29\Pay_SingleBalBillList.html" />
<Content Include="views\宸ヨ祫绠$悊\宸ヨ祫缁撶畻鍗�%28闆嗕綋%29\Pay_GroupBalBillEdit.html" />
<Content Include="views\宸ヨ祫绠$悊\宸ヨ祫缁撶畻鍗�%28闆嗕綋%29\Pay_GroupBalBillList.html" />
+ <Content Include="views\宸ヨ祫绠$悊\宸ヨ祫璁$畻\Pay_SalaryCalculate.html" />
+ <Content Include="views\宸ヨ祫绠$悊\寮傚父宸ユ椂鐢宠鍗昞Pay_ErrWorkTimesRequestBill.html" />
+ <Content Include="views\宸ヨ祫绠$悊\寮傚父宸ユ椂鐢宠鍗昞Pay_ErrWorkTimesRequestBillList.html" />
+ <Content Include="views\宸ヨ祫绠$悊\鎵hˉ椤圭洰璐圭敤鍗昞Pay_DuSubsidyItemBill.html" />
+ <Content Include="views\宸ヨ祫绠$悊\鎵hˉ椤圭洰璐圭敤鍗昞Pay_DuSubsidyItemBillList.html" />
+ <Content Include="views\宸ヨ祫绠$悊\鎵hˉ椤圭洰璐圭敤鍗昞Pay_DuSubsidyItemBill_Import.html" />
+ <Content Include="views\宸ヨ祫绠$悊\鎵hˉ椤圭洰璐圭敤鍗昞Pay_DuSubsidyItemBill_KS.html" />
+ <Content Include="views\宸ヨ祫绠$悊\鑰冨嫟姹囨姤鍗昞Pay_WorkTimesSumQueryBillList.html" />
+ <Content Include="views\宸ヨ祫绠$悊\璇峰亣鐢宠\Pay_OutApplyBill.html" />
+ <Content Include="views\宸ヨ祫绠$悊\璇峰亣鐢宠\Pay_OutApplyBillList.html" />
<Content Include="views\鏉$爜鏄庣粏\Kf_BarCodeDetailQuery.html" />
<Content Include="views\鐢熶骇绠$悊\鏃ヨ鍒掑熀纭�璧勬枡\Cg_PODemandPlanConfigBill_Excel.html" />
<Content Include="views\鐢熶骇绠$悊\鏃ヨ鍒掓姤琛╘MaterialShorAnalysisReport.html" />
+ <Content Include="views\鐢熶骇绠$悊\鐢熶骇宸ヤ綅\Gy_SourceWorkStationSet.html" />
+ <Content Include="views\鐢熶骇绠$悊\鐢熶骇宸ヤ綅\Gy_SourceWorkStationSetList.html" />
<Content Include="views\鐢熶骇绠$悊\鐢熶骇璁″垝骞冲彴\Sc_ShopCalendar.html" />
<Content Include="views\绯荤粺绠$悊\蹇嵎鏂瑰紡鑷畾涔塡Xt_UserFastMenu.html" />
<Content Include="views\绯荤粺绠$悊\蹇嵎鏂瑰紡鑷畾涔塡Xt_UserFastMenu_IconSet.html" />
<Content Include="views\绯荤粺绠$悊\鎸夐挳璁剧疆\Xt_ModuleButtonSet.html" />
<Content Include="views\绯荤粺绠$悊\鑿滃崟鑷畾涔塡Xt_DefineMenuDisplay.html" />
+ <Content Include="views\璁″垝绠$悊\浜х嚎璐ㄦ骞冲彴\Sc_ICMOBillQualityStatus_Tmp.html" />
+ <Content Include="views\璁″垝绠$悊\浜х嚎杩斾慨骞冲彴\Sc_SourceLineRepairBill.html" />
+ <Content Include="views\璁″垝绠$悊\浜х嚎杩斾慨骞冲彴\Sc_SourceLineRepairBill_ChangeMater.html" />
<Content Include="views\璁″垝绠$悊\宸ヨ壓璺嚎\Gy_RoutingBillListQuery.html" />
<Content Include="views\璁″垝绠$悊\宸ヨ壓璺嚎\Gy_RoutingBillList_His.html" />
+ <Content Include="views\璁″垝绠$悊\宸ヨ壓璺嚎\Gy_RoutingBillSubList.html" />
+ <Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\Kf_BrushingOutReport.html" />
+ <Content Include="views\杞﹂棿绠$悊\浜х嚎缁勮杩芥函\Cj_AssemblyTraceability.html" />
+ <Content Include="views\杞﹂棿绠$悊\浜х嚎缁勮杩芥函\Cj_AssemblyTraceabilityList.html" />
+ <Content Include="views\杞﹂棿绠$悊\宸ュ簭鍑虹珯姹囨姤鍗昞Cj_StationOutBillSubList.html" />
+ <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆\MES_ColorRecordBill_PDA.html" />
+ <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆\MES_SampleRecordBill_PDA.html" />
+ <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆鍗MES_ColorRecordBillList.html" />
+ <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆鍗MES_SampleRecordBillList.html" />
+ <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeArrangement.html" />
<Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBillQuery_Mobile.html" />
+ <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBillSubList.html" />
<Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBill_Change.html" />
<Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBill_Copy_PL.html" />
+ <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆鍗WW_EntrustWorkOrderBillEdit.html" />
+ <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆鍗WW_EntrustWorkOrderBillList.html" />
+ <Content Include="views\杞﹂棿绠$悊\宸ュ簭杩涚珯鎺ユ敹鍗昞Cj_StationInBillSubList.html" />
+ <Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\Kf_ColorBlankLustringOutReport.html" />
+ <Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\Kf_FinalizeOutReport.html" />
+ <Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\Kf_FinalizeTheDesignOutReport.html" />
+ <Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\Kf_LustringOutReport.html" />
+ <Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\Kf_LustringReport.html" />
+ <Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\Kf_ShrinkBrushOutReport.html" />
+ <Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\Kf_ShrinkBrushReport.html" />
+ <Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\Kf_DigitalSprayPaintingReport.html" />
+ <Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\Kf_DryFinalizeOutReport.html" />
+ <Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\Kf_HairtipReport.html" />
+ <Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\Kf_PressurizedWaterOutReport.html" />
<Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\Kf_ProdProcessEntryReport_DyeColor.html" />
<Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\Kf_ProdProcessSumReport_DyeColor.html" />
<Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\Kf_ProdProcessSumReport_DyeColor_third.html" />
+ <Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\Kf_ShrinkBrushTeReport.html" />
+ <Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\Kf_SizingFinalizeOutReport.html" />
<Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\SC_DayRkReport.html" />
<Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\Sc_ICOMProBarCodeReport.html" />
<Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\sc_ICOMReport.html" />
@@ -392,6 +459,8 @@
<Content Include="views\grf\鍑哄簱鐮佸崟.grf" />
<Content Include="views\grf\娴佽浆鍗�.grf" />
<Content Include="views\grf\cs10.grf" />
+ <Content Include="views\grf\鎸囧紩鍗�1.grf" />
+ <Content Include="views\grf\鐢熶骇棰嗘枡鍗�.grf" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
@@ -1260,7 +1329,11 @@
<Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\Sc_StationInBillList.html" />
<Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\Sc_StationOutSumReport.html" />
<Content Include="views\杞﹂棿绠$悊\杞﹂棿鏀舵枡\JIT_SendGoodsBillList.html" />
+ <Content Include="views\閲囪喘绠$悊\鎶ヤ环鍗昞Sup_QuotePriceBillEdit.html" />
+ <Content Include="views\閲囪喘绠$悊\鎶ヤ环鍗昞Sup_QuotePriceBillList.html" />
<Content Include="views\閲囪喘绠$悊\鏀舵枡閫氱煡鍗昞Add_Edit_Cg_POInStockBillList.html" />
+ <Content Include="views\閲囪喘绠$悊\璇环鍗昞Sup_AskPriceBillEdit.html" />
+ <Content Include="views\閲囪喘绠$悊\璇环鍗昞Sup_AskPriceBillList.html" />
<Content Include="views\閲囪喘绠$悊\閫�鏂欓�氱煡鍗昞Add_Edit_Cg_POInStockBackBillList.html" />
<Content Include="views\閲囪喘绠$悊\閲囪喘璁㈠崟\Cg_POOrderBillEdit.html" />
<Content Include="views\閲囪喘绠$悊\閲囪喘璁㈠崟\Cg_POOrderBillList.html" />
@@ -1279,6 +1352,9 @@
<Content Include="views\椤圭洰绠$悊\宸ヤ綔浠诲姟\PM_WorkTaskBill.html" />
<Content Include="views\椤圭洰绠$悊\宸ョ▼椤圭洰\PM_ProjectBill.html" />
<Content Include="views\椤圭洰绠$悊\宸ョ▼椤圭洰\PM_ProjectBillList.html" />
+ <Content Include="views\椤圭洰绠$悊\鎶ヨ〃鍒嗘瀽\PM_WorkTaskReportMonthSumReport.html" />
+ <Content Include="views\椤圭洰绠$悊\鎶ヨ〃鍒嗘瀽\PM_ProjectWorkDaysSumReport.html" />
+ <Content Include="views\椤圭洰绠$悊\鎶ヨ〃鍒嗘瀽\PM_ProjectWorkDaysEntryReport.html" />
<Content Include="views\椤圭洰绠$悊\椤圭洰闃舵\Add_Edit_Gy_ProjectStage.html" />
<Content Include="views\椤圭洰绠$悊\椤圭洰闃舵\Gy_ProjectStage.html" />
<Content Include="views\椤圭洰绠$悊\椤圭洰闃舵\PM_ProjectReportBillList.html" />
@@ -1443,6 +1519,20 @@
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_EquipTypeBill.aspx.designer.cs">
<DependentUpon>xmlLBM_EquipTypeBill.aspx</DependentUpon>
</Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcessExchangeArrangement.aspx.cs">
+ <DependentUpon>xmlLBM_Sc_ProcessExchangeArrangement.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcessExchangeArrangement.aspx.designer.cs">
+ <DependentUpon>xmlLBM_Sc_ProcessExchangeArrangement.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_MateOutBillList.aspx.cs">
+ <DependentUpon>xmlLBM_Kf_MateOutBillList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_MateOutBillList.aspx.designer.cs">
+ <DependentUpon>xmlLBM_Kf_MateOutBillList.aspx</DependentUpon>
+ </Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_OtherOutBillList.aspx.cs">
<DependentUpon>xmlLBM_Kf_OtherOutBillList.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
--
Gitblit v1.9.1