From 22ae2a27d1f66c6acbb126fdbd3d1446b6837acb Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期日, 16 四月 2023 21:52:37 +0800
Subject: [PATCH] 合并

---
 WebTM/WebTM.csproj |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 395cc11..52f3780 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -184,13 +184,16 @@
     <Content Include="views\PublicPage\transfer.html" />
     <Content Include="views\ReportHtml.html" />
     <Content Include="views\test\testRenderAutomationList.html" />
-    <Content Include="views\userfiles\images\IMG_5566.jpg" />
+    <Content Include="views\userfiles\images\pda.jpg" />
     <Content Include="views\userfiles\images\loginBackground-New.jpg" />
+    <Content Include="views\userfiles\images\wy.jpg" />
     <Content Include="views\user\login_anrui.html" />
     <Content Include="views\user\login2.html" />
     <Content Include="views\video\1.wav" />
     <Content Include="views\video\jingbao.wav" />
     <Content Include="views\video\success.wav" />
+    <Content Include="views\WMS鎵爜妯″潡\鐢熶骇绠$悊\鐢熶骇缁勬墭鍗昞Sc_PackUnionBillList_PDA.html" />
+    <Content Include="views\WMS鎵爜妯″潡\鐢熶骇绠$悊\鐢熶骇缁勬墭鍗昞Sc_PackUnionBill_PDA.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MaterType.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MaterTypeEdit.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\HBarPlanPrint_GXPG.html" />
@@ -199,6 +202,8 @@
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_SourceList.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcExchSendWorkBillList.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcExchRecordBackBillList.aspx" />
+    <Content Include="views\璁″垝绠$悊\宸ヨ壓璺嚎\Gy_RoutingBillListQuery.html" />
+    <Content Include="views\杞﹂棿绠$悊\宸ュ簭鍑虹珯姹囨姤鍗昞Cj_StationOutBill_QiaoYi.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆\MES_StationInBill_PDA_QiaoYi.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆\MES_StationOutBill_PDA_QiaoYi.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆\MES_StationOutBill_PDA_Detail.html" />
@@ -1193,6 +1198,7 @@
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆鍗Sc_ProcExchWorkBackBillList.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭杩涚珯鎺ユ敹鍗昞Cj_StationInBill.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭杩涚珯鎺ユ敹鍗昞Cj_StationInBillList.html" />
+    <Content Include="views\杞﹂棿绠$悊\宸ュ簭杩涚珯鎺ユ敹鍗昞Cj_StationInBill_QiaoYi.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭杩涚珯鎺ユ敹鍗昞Cj_StationQty.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭杩涚珯鎺ユ敹鍗昞MES_StationInBill_PDA.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭杩涚珯鎺ユ敹鍗昞Sc_StationInBill_Mul_PDA.html" />

--
Gitblit v1.9.1