From cd6ba9f8c5fb2a30f8ea98a09d53a244848e7666 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 29 十二月 2023 17:46:32 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 9d508d0..b3e3080 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -220,12 +220,24 @@
<Content Include="views\video\jingbao.wav" />
<Content Include="views\video\success.wav" />
<Content Include="views\WMS鎵爜妯″潡\鍏朵粬鍏ュ簱\Kf_OtherInBill_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\鍏朵粬鍏ュ簱\Kf_OtherInBillList_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\鍏朵粬鍑哄簱\Kf_OtherOutBillList_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\濮斿鍏ュ簱\Kf_EntrustInBillList_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\濮斿棰嗘枡\Kf_EntrustOutBillList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鏉＄爜鏌ヨ\Gy_BarCodeBill_QiaoYi_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\鐢熶骇鍏ュ簱\Kf_ProductInBillList_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\鐢熶骇姹囨姤\Sc_ICMOReportBillList_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_MateOutBillList_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\閲囪喘鍏ュ簱\Kf_POStockInBillList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇绠＄悊\鍒犳墭鍗昞Sc_DeletePackUnionBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇绠＄悊\鐢熶骇缁勬墭鍗昞Sc_PackUnionBillList_PDA.html" />
<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_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\閿�鍞嚭搴揬Kf_SellOutBillList_QiaoYi_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\閿�鍞嚭搴揬Kf_SellOutBill_QiaoYi_PDA.html" />
<Content Include="views\浜轰簨绠＄悊\寮傚父鍙嶉鍗昞OA_ErrMsgBackBillList_PDA.html" />
@@ -333,6 +345,10 @@
<Content Include="views\绯荤粺绠＄悊\蹇嵎鏂瑰紡鑷畾涔塡Xt_UserFastMenu.html" />
<Content Include="views\绯荤粺绠＄悊\蹇嵎鏂瑰紡鑷畾涔塡Xt_UserFastMenu_IconSet.html" />
<Content Include="views\绯荤粺绠＄悊\鎸夐挳璁剧疆\Xt_ModuleButtonSet.html" />
+ <Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserCustomer_ImportByExcel.html" />
+ <Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserEmployee_Excel.html" />
+ <Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserProcess_Excel.html" />
+ <Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Xt_UserSuplies_Excel.html" />
<Content Include="views\绯荤粺绠＄悊\鑿滃崟鑷畾涔塡Xt_DefineMenuDisplay.html" />
<Content Include="views\璁″垝绠＄悊\浜х嚎璐ㄦ骞冲彴\Sc_ICMOBillQualityStatus_Tmp.html" />
<Content Include="views\璁″垝绠＄悊\浜х嚎杩斾慨骞冲彴\Sc_SourceLineRepairBill.html" />
@@ -355,6 +371,8 @@
<Content Include="views\璁惧绠＄悊\璁惧鎶ヨ〃\Sb_EquipDotCheckBillReport.html" />
<Content Include="views\璁惧绠＄悊\璁惧鎶ヨ〃\Sb_EquipMaintainBillReport.html" />
<Content Include="views\璁惧绠＄悊\璁惧瑙勭▼鍗昞Sb_EquipDotCheckRuleList_PDA.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\鍩虹寤烘ā\Add_Edit_Gy_ErrType.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\鍩虹寤烘ā\Gy_ErrType.html" />
<Content Include="views\璐ㄩ噺绠＄悊\宸ュ簭妫�楠屽崟\MES_ProcessCheckBillList_PDA.html" />
<Content Include="views\璐ㄩ噺绠＄悊\宸ュ簭妫�楠屽崟\MES_ProcessCheckBill_PDA.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_FirstPassRateReport.html" />
@@ -578,6 +596,8 @@
<Content Include="views\grf\閿�鍞嚭搴撳崟2.grf" />
<Content Include="views\grf\閿�鍞鍗�2.grf" />
<Content Include="views\grf\閿�鍞鍗曞彉鏇村崟2.grf" />
+ <Content Include="views\grf\涓嶈壇绫诲瀷.grf" />
+ <Content Include="views\grf\寮傚父绫诲瀷.grf" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
--
Gitblit v1.9.1