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 |  125 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 123 insertions(+), 2 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 11acd9b..52f3780 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -45,6 +45,7 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\鍔炲叕\K3Cloud\WebSite\bin\Newtonsoft.Json.dll</HintPath>
     </Reference>
+    <Reference Include="System.ServiceModel.Web" />
     <Reference Include="System.Web.DynamicData" />
     <Reference Include="System.Web.Entity" />
     <Reference Include="System.Web.ApplicationServices" />
@@ -64,9 +65,19 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="HtmlPage1.html" />
+    <Content Include="layuiadmin\ax\ax-response.css" />
+    <Content Include="layuiadmin\ax\ax.css" />
+    <Content Include="layuiadmin\ax\ax.min.js" />
+    <Content Include="layuiadmin\ax\images\login-bg.jpg" />
+    <Content Include="layuiadmin\ax\images\login-left.jpg" />
+    <Content Include="layuiadmin\ax\images\yanzhengma.jpg" />
+    <Content Include="layuiadmin\ax\main.css" />
     <Content Include="layuiadmin\echarts.min.js" />
+    <Content Include="layuiadmin\grwebapp.js" />
     <Content Include="layuiadmin\layui\css\global.css" />
     <Content Include="layuiadmin\layui\css\layui - 澶嶅埗.css" />
+    <Content Include="layuiadmin\layui\css\layui_AllHeight.css" />
+    <Content Include="layuiadmin\layui\css\layui_TableHeight.css" />
     <Content Include="layuiadmin\layui\css\modules\layim\html\getmsg.json" />
     <Content Include="layuiadmin\layui\css\ReportPlatform.css" />
     <Content Include="layuiadmin\layui\css\zgqlayui.css" />
@@ -99,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" />
@@ -106,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" />
@@ -146,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" />
@@ -161,16 +178,43 @@
     <Content Include="views\PublicPage\PeopleInformations.html" />
     <Content Include="views\PublicPage\PeopleInformation.html" />
     <Content Include="views\PublicPage\PowerInformation.html" />
+    <Content Include="views\PublicPage\ProcessInformation.html" />
     <Content Include="views\PublicPage\PurchOrder.html" />
     <Content Include="views\PublicPage\HSourceReportHtml.html" />
     <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" />
+    <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆鍗Sc_ProcessSendWorkEdit.html" />
+    <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆鍗Sc_ProcessSendWorkList.html" />
+    <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆鍗WindowPrint.html" />
     <Content Include="views\浠撳瓨绠$悊\浠撳簱璋冩嫧\Kf_MoveStockBill_CheckList_New.html" />
     <Content Include="views\浠撳瓨绠$悊\浠撳簱璋冩嫧\Kf_MoveStockBill_Check_New.html" />
+    <Content Include="views\浠撳瓨绠$悊\浠撳簱璋冩嫧\Kf_ARPD.html" />
     <Content Include="views\浠撳瓨绠$悊\浠撳簱璋冩嫧\Kf_MoveStockOutBill_Fast.html" />
     <Content Include="views\浠撳瓨绠$悊\浠撳簱璋冩嫧\Kf_MoveStockRequestBillEdit.html" />
     <Content Include="views\浠撳瓨绠$悊\浠撳簱璋冩嫧\Kf_MoveStockRequestBillList.html" />
@@ -183,6 +227,8 @@
     <Content Include="views\浠撳瓨绠$悊\鏉$爜搴撳瓨\KF_ICInventoryByMaterID.html" />
     <Content Include="views\浠撳瓨绠$悊\鏉$爜搴撳瓨\KF_ICInventoryList_WMS.html" />
     <Content Include="views\浠撳瓨绠$悊\鏉$爜鐢熸垚\Gy_BarCodeBill.html" />
+    <Content Include="views\鍩虹璧勬枡\浜у搧鍩虹璧勬枡\Gy_StdMinPickQty.html" />
+    <Content Include="views\鍩虹璧勬枡\浜у搧鍩虹璧勬枡\Gy_StdMinPickQtyList.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_ConkType.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_OrderBackInfo.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_OrderLev.html" />
@@ -193,10 +239,16 @@
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_ConkType.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_PackType.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_PackType.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_StockPlace_Edit.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_StockPlace_List.html" />
     <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CustLocationEdit.html" />
     <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CustLocationList.html" />
+    <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_EquipStatus.html" />
+    <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_EquipStatusEdit.html" />
     <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MatePriceSup.html" />
     <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MatePriceSupEdit.html" />
+    <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MouldStatus.html" />
+    <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MouldStatusEdit.html" />
     <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_Operator.html" />
     <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_OperatorEdit.html" />
     <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PaymentConditionEdit.html" />
@@ -209,6 +261,8 @@
     <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_SettleStyleEdit.html" />
     <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_Staff.html" />
     <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_StaffEdit.html" />
+    <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_TaxMIX.html" />
+    <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_TaxMIXEdit.html" />
     <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_TaxRateEdit.html" />
     <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_TaxRateList.html" />
     <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RecConditionList.html" />
@@ -281,6 +335,11 @@
     <Content Include="views\grf\cabinet-CG.grf" />
     <Content Include="views\grf\鐟炰笌绁烘睙鑻忔墦鍗版ā鏉�.grf" />
     <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>
@@ -844,6 +903,8 @@
     <Content Include="views\妯℃不鍏风鐞哱妯″叿鍏朵粬鍑哄簱鍗昞Sc_MouldOtherOutBill_PDA.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯″叿鍏朵粬鍏ュ簱鍗昞Sc_MouldOtherInBill_PDA.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯″叿閲囪喘鍏ュ簱鍗昞Sc_MouldProdInBill_PDA.html" />
+    <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_Add_MouldLifeUseBillList.html" />
+    <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldLifeUseBillList.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldMoveStockStepOutBill.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldMoveStockStepInBill.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldMoveStockStepInBillList.html" />
@@ -873,6 +934,10 @@
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldProdOutBillList.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldScrapInBillList.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldScrapOutBillList.html" />
+    <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldScrapRequestBill.html" />
+    <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldScrapRequestBillList.html" />
+    <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldStatusChangeBill.html" />
+    <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldStatusChangeBillList.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风偣妫�淇濆吇\Sc_MouldDotCheckBill_PDA.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风偣妫�淇濆吇\Sc_MouldMaintainBill_PDA.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱BatchGen_MouldFile.html" />
@@ -885,6 +950,13 @@
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱KF_BarCodeStatusChangeBill.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱KF_BarCodeStatusChangeBillList.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sb_Add_MouldRepairWorkBillList.html" />
+    <Content Include="views\鐢熶骇宸ュ簭绠$悊\宸ュ簭姹囨姤鍗昞Sc_ProcessReportList_Last.html" />
+    <Content Include="views\绯荤粺绠$悊\鐢ㄦ埛绠$悊\Gy_UserProcess.html" />
+    <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBill_Mul.html" />
+    <Content Include="views\绯荤粺绠$悊\鍗曟嵁绫诲瀷\Xt_BillSubTypeList.html" />
+    <Content Include="views\绯荤粺绠$悊\鍗曟嵁绫诲瀷\Xt_BillSubType_Edit.html" />
+    <Content Include="views\璁惧绠$悊\璁惧鍏ュ簱妫�楠岄獙鏀跺崟\Sb_EquipStockInCheckBillEdit.html" />
+    <Content Include="views\璁惧绠$悊\璁惧鍏ュ簱妫�楠岄獙鏀跺崟\Sb_EquipStockInCheckBillList.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_Add_MouldConkBookBillList.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_Add_MouldDotCheckBillList.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_Add_MouldDotCheckPlanBillList.html" />
@@ -1058,13 +1130,21 @@
     <Content Include="views\璁惧绠$悊\Sb_EquipMaintainPlanBillEdit.html" />
     <Content Include="views\璁惧绠$悊\Sb_EquipMaintainPlanBillList.html" />
     <Content Include="views\璁惧绠$悊\Sc_Add_MouldDotCheckBillList.html" />
+    <Content Include="views\璁惧绠$悊\璁惧鍏ュ簱\Sb_EquipStockInCheckBill.html" />
+    <Content Include="views\璁惧绠$悊\璁惧鍏ュ簱\Sb_EquipStockInCheckBillList.html" />
     <Content Include="views\璁惧绠$悊\璁惧澶囧搧澶囦欢\Sb_EquipSparepartsBill.html" />
     <Content Include="views\璁惧绠$悊\璁惧澶囧搧澶囦欢\Sb_EquipSparepartsBillList.html" />
     <Content Include="views\璁惧绠$悊\璁惧澶囧搧澶囦欢\Sb_EquipSparepartsChangeBill.html" />
     <Content Include="views\璁惧绠$悊\璁惧澶囧搧澶囦欢\Sb_EquipSparepartsChangeBillList.html" />
+    <Content Include="views\璁惧绠$悊\璁惧鎶曚骇妫�楠岄獙鏀跺崟\Sb_EquipWorkBeforeCheckBillEdit.html" />
+    <Content Include="views\璁惧绠$悊\璁惧鎶曚骇妫�楠岄獙鏀跺崟\Sb_EquipWorkBeforeCheckBillList.html" />
+    <Content Include="views\璁惧绠$悊\璁惧鎶曚骇\Sb_EquipWorkBeforeCheckBill.html" />
+    <Content Include="views\璁惧绠$悊\璁惧鎶曚骇\Sb_EquipWorkBeforeCheckBillList.html" />
     <Content Include="views\璁惧绠$悊\璁惧妗f\Gy_EquipFileBillResume.html" />
     <Content Include="views\璁惧绠$悊\璁惧妗f\Gy_EquipFileMainEdit.html" />
     <Content Include="views\璁惧绠$悊\璁惧妗f\Gy_EquipFileMainList.html" />
+    <Content Include="views\璁惧绠$悊\璁惧鐘舵�乗Sb_EquipStatusChangeBill.html" />
+    <Content Include="views\璁惧绠$悊\璁惧鐘舵�乗Sb_EquipStatusChangeBillList.html" />
     <Content Include="views\璁惧绠$悊\璁惧缁翠慨娲惧伐鍗昞Sb_EquipRepairSendWorkBillEdit.html" />
     <Content Include="views\璁惧绠$悊\璁惧缁翠慨娲惧伐鍗昞Sb_EquipRepairSendWorkBillList.html" />
     <Content Include="views\璁惧绠$悊\璁惧瑙勭▼鍗昞Sb_EquipDotCheckRuleEdit.html" />
@@ -1107,12 +1187,18 @@
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭鍑虹珯姹囨姤鍗昞Sc_StationOutBill_Mul_PDA.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭鍑虹珯姹囨姤鍗昞Sc_StationOutBill_Mul.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭鍑虹珯姹囨姤鍗昞Cj_StationOutBillList.html" />
+    <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆\MES_StationInBill_PDA.html" />
+    <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆\MES_StationOutBill_PDA.html" />
+    <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBill_CF.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangePlanDate.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeIssue.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBill.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeIssueBillList.html" />
+    <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆鍗Sc_ProcExchWorkBackBillEdit.html" />
+    <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" />
@@ -1208,10 +1294,10 @@
     <Content Include="views\杞﹂棿绠$悊\濮斿宸ュ簭鎺ユ敹鍗昞Cj_StationEntrustOutBillList.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆\MES_StationInBill.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆\MES_StationInBillList.html" />
-    <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆\MES_StationInBill_PDA.html" />
+    <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆\MES_StationInBill_PDA_OLD.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆\MES_StationOutBill.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆\MES_StationOutBillList.html" />
-    <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆\MES_StationOutBill_PDA.html" />
+    <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆\MES_StationOutBill_PDA_OLD.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBillList.html" />
     <Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\Qk_OutProcessList.html" />
     <Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\Sc_ProductionProcessDetailsReport.html" />
@@ -1293,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>
@@ -1313,6 +1406,20 @@
     </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>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_SourceList.aspx.designer.cs">
+      <DependentUpon>xmlLBM_Gy_SourceList.aspx</DependentUpon>
     </Compile>
     <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_BarCodeBill.aspx.cs">
       <DependentUpon>xmlLBM_HGy_BarCodeBill.aspx</DependentUpon>
@@ -1524,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>
@@ -1538,6 +1652,13 @@
     <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcessExchangeBillList_SubList.aspx.designer.cs">
       <DependentUpon>xmlLBM_Sc_ProcessExchangeBillList_SubList.aspx</DependentUpon>
     </Compile>
+    <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcExchRecordBackBillList.aspx.cs">
+      <DependentUpon>xmlLBM_Sc_ProcExchRecordBackBillList.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcExchRecordBackBillList.aspx.designer.cs">
+      <DependentUpon>xmlLBM_Sc_ProcExchRecordBackBillList.aspx</DependentUpon>
+    </Compile>
     <Compile Include="views\鐢熶骇宸ュ簭绠$悊\宸ュ簭姹囨姤鍗昞xmlLBM_ProcessReport.aspx.cs">
       <DependentUpon>xmlLBM_ProcessReport.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>

--
Gitblit v1.9.1