From b9500010e1d8687171b42c320342fe2dd5b6c704 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 30 八月 2023 08:58:55 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index a605058..b36449c 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" />
@@ -191,6 +195,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" />
@@ -205,6 +210,8 @@
<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" />
@@ -215,8 +222,10 @@
<Content Include="views\浜轰簨绠＄悊\绂昏亴鐢宠\HR_EmpDimissionBillList.html" />
<Content Include="views\浜轰簨绠＄悊\鑱屽憳寮傚姩鍗昞HR_EmpChangeBill.html" />
<Content Include="views\浜轰簨绠＄悊\鑱屽憳寮傚姩鍗昞HR_EmpChangeBillList.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_Kf_OtherOutBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_WarehouseList.aspx" />
@@ -241,6 +250,8 @@
<Content Include="views\宸ヨ祫绠＄悊\寮傚父宸ユ椂鐢宠鍗昞Pay_ErrWorkTimesRequestBillList.html" />
<Content Include="views\宸ヨ祫绠＄悊\鎵ｈˉ椤圭洰璐圭敤鍗昞Pay_DuSubsidyItemBill.html" />
<Content Include="views\宸ヨ祫绠＄悊\鎵ｈˉ椤圭洰璐圭敤鍗昞Pay_DuSubsidyItemBillList.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\鎵ｈˉ椤圭洰璐圭敤鍗昞Pay_DuSubsidyItemBill_Import.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\鎵ｈˉ椤圭洰璐圭敤鍗昞Pay_DuSubsidyItemBill_KS.html" />
<Content Include="views\宸ヨ祫绠＄悊\鑰冨嫟姹囨姤鍗昞Pay_WorkTimesSumQueryBillList.html" />
<Content Include="views\宸ヨ祫绠＄悊\璇峰亣鐢宠\Pay_OutApplyBill.html" />
<Content Include="views\宸ヨ祫绠＄悊\璇峰亣鐢宠\Pay_OutApplyBillList.html" />
@@ -254,15 +265,22 @@
<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\杞﹂棿绠＄悊\浜х嚎缁勮杩芥函\Cj_AssemblyTraceability.html" />
<Content Include="views\杞﹂棿绠＄悊\浜х嚎缁勮杩芥函\Cj_AssemblyTraceabilityList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\宸ュ簭鍑虹珯姹囨姤鍗昞Cj_StationOutBillSubList.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_ProdProcessEntryReport_DyeColor.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_ProdProcessSumReport_DyeColor.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_ProdProcessSumReport_DyeColor_third.html" />
--
Gitblit v1.9.1