From 40047734f70cd03a8e67634deca7b3a0f99f1a68 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期三, 07 九月 2022 13:33:52 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

---
 WebTM/WebTM.csproj |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 400ba40..f0d1e69 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -80,6 +80,11 @@
     <Content Include="layuiadmin\layui\images\erro.png" />
     <Content Include="layuiadmin\layui\layui.js" />
     <Content Include="layuiadmin\layui\zgqlayui.js" />
+    <Content Include="layuiadmin\modules\excel.js" />
+    <Content Include="layuiadmin\modules\soulTable.js" />
+    <Content Include="layuiadmin\modules\tableChild.js" />
+    <Content Include="layuiadmin\modules\tableFilter.js" />
+    <Content Include="layuiadmin\modules\tableMerge.js" />
     <Content Include="layuiadmin\modules\transfer.js" />
     <Content Include="layuiadmin\myicon\win.svg" />
     <Content Include="layuiadmin\myicon\yidongduan.svg" />
@@ -88,6 +93,7 @@
     <Content Include="layuiadmin\myicon\鎴戠殑璁剧疆.svg" />
     <Content Include="layuiadmin\myicon\绯荤粺璁剧疆.svg" />
     <Content Include="layuiadmin\myicon\杞﹂棿绠$悊.svg" />
+    <Content Include="layuiadmin\soulTable.slim.js" />
     <Content Include="layuiadmin\treeTable.js" />
     <Content Include="layuiadmin\PubCustom.js" />
     <Content Include="layuiadmin\PubJs\PubCheck.js" />
@@ -989,13 +995,16 @@
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭鍑虹珯姹囨姤鍗昞Sc_StationOutBill_Mul_PDA.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭鍑虹珯姹囨姤鍗昞Sc_StationOutBill_Mul.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭鍑虹珯姹囨姤鍗昞Cj_StationOutBillList.html" />
+    <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeIssue.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBill.html" />
+    <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeIssueBillList.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭杩涚珯鎺ユ敹鍗昞Cj_StationInBill.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭杩涚珯鎺ユ敹鍗昞Cj_StationInBillList.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭杩涚珯鎺ユ敹鍗昞Cj_StationQty.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭杩涚珯鎺ユ敹鍗昞MES_StationInBill_PDA.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭杩涚珯鎺ユ敹鍗昞Sc_StationInBill_Mul_PDA.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭杩涚珯鎺ユ敹鍗昞Sc_StationInBill_Mul.html" />
+    <Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\ProductionPlanReportList.html" />
     <Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\Sc_StationInBillList.html" />
     <Content Include="views\杞﹂棿绠$悊\杞﹂棿鏀舵枡\JIT_SendGoodsBillList.html" />
     <Content Include="views\閲囪喘绠$悊\鏀舵枡閫氱煡鍗昞Add_Edit_Cg_POInStockBillList.html" />

--
Gitblit v1.9.1