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 | 43 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 43 insertions(+), 0 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 940ad38..52f3780 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -110,6 +110,7 @@
<Content Include="layuiadmin\PubCustom.js" />
<Content Include="layuiadmin\PubJs\PubCheck.js" />
<Content Include="views\Baseset\HBarPlanPrint.html" />
+ <Content Include="views\Baseset\SRM_OpenTmpList_GXPG.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_BadCountDevelopWHList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_BadWHList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_ClassTimePrjGroupEdit.html" />
@@ -117,6 +118,7 @@
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_EquipFileBillMainList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_GetProcNoList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_LineCenter.html" />
+ <Content Include="views\Baseset\鍩虹璧勬枡\Gy_MaterialList_LSQP.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_MaterList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_MouldFileMainList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_MouldList.html" />
@@ -157,6 +159,10 @@
<Content Include="views\grf\a.grf" />
<Content Include="views\grf\b1.grf" />
<Content Include="views\grf\b.grf" />
+ <Content Include="views\home\console_QiaoYi.html" />
+ <Content Include="views\home\console_Mobile_QiaoYi.html" />
+ <Content Include="views\index_Mobile_QiaoYi.html" />
+ <Content Include="views\index_QiaoYi.html" />
<Content Include="views\index - 澶嶅埗.html" />
<Content Include="views\indexMenu.html" />
<Content Include="views\IpadStepIndex.html" />
@@ -178,16 +184,28 @@
<Content Include="views\PublicPage\transfer.html" />
<Content Include="views\ReportHtml.html" />
<Content Include="views\test\testRenderAutomationList.html" />
+ <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" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_WarehouseList.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_EmployeeList.aspx" />
<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" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcExchRecordBackBillList.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcExchRecordBackBillEdit.html" />
@@ -319,6 +337,9 @@
<Content Include="views\grf\cabinet-SB.grf" />
<Content Include="views\grf\ces5.grf" />
<Content Include="views\grf\璁惧鏍囩.grf" />
+ <Content Include="views\grf\娴佽浆鍗℃淳宸ュ崟.grf" />
+ <Content Include="views\grf\eee.grf" />
+ <Content Include="views\grf\宸ュ簭娲惧伐鍗�.grf" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
@@ -1177,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" />
@@ -1357,6 +1379,13 @@
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_EquipTypeBill.aspx.designer.cs">
<DependentUpon>xmlLBM_EquipTypeBill.aspx</DependentUpon>
</Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_WarehouseList.aspx.cs">
+ <DependentUpon>xmlLBM_Gy_WarehouseList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_WarehouseList.aspx.designer.cs">
+ <DependentUpon>xmlLBM_Gy_WarehouseList.aspx</DependentUpon>
+ </Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_HEquipResumeBillList.aspx.cs">
<DependentUpon>xmlLBM_Gy_HEquipResumeBillList.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -1377,6 +1406,13 @@
</Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_Department_Edit.aspx.designer.cs">
<DependentUpon>xmlLBM_Gy_Department_Edit.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_EmployeeList.aspx.cs">
+ <DependentUpon>xmlLBM_Gy_EmployeeList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_EmployeeList.aspx.designer.cs">
+ <DependentUpon>xmlLBM_Gy_EmployeeList.aspx</DependentUpon>
</Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_SourceList.aspx.cs">
<DependentUpon>xmlLBM_Gy_SourceList.aspx</DependentUpon>
@@ -1595,6 +1631,13 @@
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ICMOBillList.aspx.designer.cs">
<DependentUpon>xmlLBM_Sc_ICMOBillList.aspx</DependentUpon>
</Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcExchSendWorkBillList.aspx.cs">
+ <DependentUpon>xmlLBM_Sc_ProcExchSendWorkBillList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcExchSendWorkBillList.aspx.designer.cs">
+ <DependentUpon>xmlLBM_Sc_ProcExchSendWorkBillList.aspx</DependentUpon>
+ </Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcessExchangeBillList.aspx.cs">
<DependentUpon>xmlLBM_Sc_ProcessExchangeBillList.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
--
Gitblit v1.9.1