From b584bf98ad8314e51ad0bbf8c5ac99ecc278e87a Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期四, 09 一月 2025 08:09:58 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 82e176f..50e74b6 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -104,6 +104,8 @@
<Content Include="layuiadmin\ext\tableFilter.js" />
<Content Include="layuiadmin\ext\tableMerge.js" />
<Content Include="layuiadmin\grwebapp.js" />
+ <Content Include="layuiadmin\layui\layui.js" />
+ <Content Include="layuiadmin\modules\treeTable.js" />
<Content Include="layuiadmin\resize\ResizeLeftRight.css" />
<Content Include="layuiadmin\resize\ResizeLeftRight.js" />
<Content Include="layuiadmin\QueryScheme.js" />
@@ -127,7 +129,6 @@
<None Include="Properties\PublishProfiles\JFTM.pubxml" />
<Content Include="layuiadmin\layui\images\device.png" />
<Content Include="layuiadmin\layui\images\erro.png" />
- <Content Include="layuiadmin\layui\layui.js" />
<Content Include="layuiadmin\layui\layui1.js" />
<Content Include="layuiadmin\layui\lay\modules\table-鍓湰.js" />
<Content Include="layuiadmin\layui\lay\modules\table.js" />
@@ -315,6 +316,7 @@
<Content Include="views\WMS鎵爜妯″潡\鏉＄爜鍑哄叆搴撴煡璇Gy_BarCodeBillInOut__PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\濮斿棰嗘枡\Kf_EntrustOutBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鏉＄爜鏌ヨ\Gy_BarCodeBill_QiaoYi_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\鐢熶骇鍏ュ簱\Kf_ProductInBill_Check_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇鍏ュ簱\Kf_ProductInBill_CheckList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇鍏ュ簱\Kf_ProductInBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇鍏ュ簱\Kf_ProductInBackBillList_PDA.html" />
@@ -344,6 +346,8 @@
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇棰嗘枡\Kf_MateOutBillList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇棰嗘枡\Kf_MateOutBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇棰嗘枡\Kf_MateOutBill_CheckList_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\鐢熶骇棰嗘枡\Kf_MateOutBill_Check_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\閲囪喘鍏ュ簱\Kf_POStockInBill_Check_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\閲囪喘鍏ュ簱\Kf_POStockInBill_CheckList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\閲囪喘鍏ュ簱\Kf_POStockInBackBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\閲囪喘鍏ュ簱\Kf_POStockInBill_Mould_PDA.html" />
--
Gitblit v1.9.1