From f6c9440828b2fef051f6ec8ee15c0359e31b4e0e Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 31 五月 2023 11:05:13 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/WebTM.csproj | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 8810eb4..029e6d1 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -74,6 +74,7 @@
<Content Include="layuiadmin\ax\main.css" />
<Content Include="layuiadmin\echarts.min.js" />
<Content Include="layuiadmin\grwebapp.js" />
+ <Content Include="layuiadmin\HideButton.js" />
<Content Include="layuiadmin\layui\css\global.css" />
<Content Include="layuiadmin\layui\css\layui - 澶嶅埗.css" />
<Content Include="layuiadmin\layui\css\layui_AllHeight.css" />
@@ -204,7 +205,13 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcExchSendWorkBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcExchRecordBackBillList.aspx" />
<Content Include="views\鏉＄爜鏄庣粏\Kf_BarCodeDetailQuery.html" />
+ <Content Include="views\绯荤粺绠＄悊\鎸夐挳璁剧疆\Xt_ModuleButtonSet.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBillListQuery.html" />
+ <Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBill_Change.html" />
+ <Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBill_Copy_PL.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\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_WorkShopProcessWIPSumReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_WorkShopProcessWIPReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_EmployeePieceWorkReport.html" />
@@ -348,6 +355,8 @@
<Content Include="views\grf\eee.grf" />
<Content Include="views\grf\宸ュ簭娲惧伐鍗�.grf" />
<Content Include="views\grf\鍑哄簱鐮佸崟.grf" />
+ <Content Include="views\grf\娴佽浆鍗�.grf" />
+ <Content Include="views\grf\cs10.grf" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
@@ -1212,6 +1221,8 @@
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭杩涚珯鎺ユ敹鍗昞Sc_StationInBill_Mul_PDA.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭杩涚珯鎺ユ敹鍗昞Sc_StationInBill_Mul.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\DefectiveDetailedYieldReport.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_MaterOutEntryReport_Cloth.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_MaterOutSumReport_Cloth.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Mes_OrderProcFlowAllReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Mes_WIPProcReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\ProductionPlanReportList.html" />
--
Gitblit v1.9.1