From 0f0e24b90a8180268c19c25d12f66fb08bcf622d Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期三, 11 十二月 2024 09:42:26 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 7bda792..b1a2d78 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -97,6 +97,7 @@
<Content Include="layuiadmin\ckou.js" />
<Content Include="layuiadmin\echarts.min.js" />
<Content Include="layuiadmin\grwebapp.js" />
+ <Content Include="layuiadmin\SetColumn.js" />
<Content Include="layuiadmin\modules\tableFilter2.js" />
<Content Include="layuiadmin\PlateBinding.js" />
<Content Include="layuiadmin\PageTitle.js" />
@@ -302,16 +303,25 @@
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇姹囨姤\Sc_ICMOReportBillList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇琛ユ枡\Kf_MateReplenishOutBillList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇琛ユ枡\Kf_MateReplenishOutBill_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\Kf_MoveStockBillList_Mould_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\Kf_MoveStockBill_CusBar_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\Kf_MoveStockBill_Mould_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\Kf_MoveStockStepInBill_Mould_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\Kf_MoveStockStepInBill_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\Kf_MoveStockStepOutBillList_Mould_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\Kf_MoveStockStepOutBill_CusBar_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\Kf_MoveStockStepOutBill_Mould_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\Kf_MoveStockStepOutBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\Kf_MoveStockStepInBillList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\Kf_MoveStockStepOutBillList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\Kf_MoveStockBillList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\Kf_MoveStockBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇棰嗘枡\Kf_MateOutBackBillList_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\鐢熶骇棰嗘枡\Kf_MateOutBackBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇棰嗘枡\Kf_MateOutBillList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇棰嗘枡\Kf_MateOutBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\閲囪喘鍏ュ簱\Kf_POStockInBackBill_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\閲囪喘鍏ュ簱\Kf_POStockInBill_Mould_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\閲囪喘鍏ュ簱\Kf_POStockInBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\閲囪喘鍏ュ簱\Kf_POStockInBackBillList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\閲囪喘鍏ュ簱\Kf_POStockInBillList_PDA.html" />
@@ -320,6 +330,9 @@
<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\WMS鎵爜妯″潡\閿�鍞嚭搴揬Kf_SellOutBillList_Mould_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\閿�鍞嚭搴揬Kf_SellOutBill_CusBar_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\閿�鍞嚭搴揬Kf_SellOutBill_Mould_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\閿�鍞嚭搴揬Kf_SellOutBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\閿�鍞嚭搴揬Kf_SellOutBackBillList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\閿�鍞嚭搴揬Kf_SellOutBillList_PDA.html" />
@@ -640,6 +653,7 @@
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_PressurizedWaterNoOutReport.html" />
<Content Include="views\閲囪喘绠＄悊\浠樻鍗昞YF_PayMentBillQuery.html" />
<Content Include="views\閲囪喘绠＄悊\搴斾粯鍗昞Cg_PayableBillQuery.html" />
+ <Content Include="views\閲囪喘绠＄悊\搴斾粯鍗昞Cg_PayableBillCheckQuery.html" />
<Content Include="views\閲囪喘绠＄悊\鏀舵枡閫氱煡鍗昞Cg_POInStockBillQuery.html" />
<Content Include="views\閲囪喘绠＄悊\閲囪喘鎶ヨ〃\Gy_SupplierPayPlanReport.html" />
<Content Include="views\閲囪喘绠＄悊\閲囪喘鍚堝悓\Add_Edit_Cg_ContractBillList.html" />
--
Gitblit v1.9.1