From 5216d4fd3f01e4dc9a77231e9ab7f118f189e5f3 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期五, 03 三月 2023 15:24:14 +0800
Subject: [PATCH] 合并
---
WebTM/WebTM.csproj | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 27216dd..aa62024 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" />
@@ -65,6 +66,7 @@
<ItemGroup>
<Content Include="HtmlPage1.html" />
<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\modules\layim\html\getmsg.json" />
@@ -161,14 +163,18 @@
<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\loginBackground-New.jpg" />
+ <Content Include="views\user\login_anrui.html" />
<Content Include="views\video\1.wav" />
<Content Include="views\video\jingbao.wav" />
<Content Include="views\video\success.wav" />
+ <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" />
@@ -218,6 +224,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" />
@@ -290,6 +298,7 @@
<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" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
@@ -901,6 +910,8 @@
<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" />
@@ -1135,11 +1146,15 @@
<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_StationQty.html" />
@@ -1237,10 +1252,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" />
--
Gitblit v1.9.1