From acadfc413aeea932667c60ccfdf8866d994ddd2b Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期四, 05 八月 2021 10:54:07 +0800
Subject: [PATCH] 1
---
WebTM/WebTM.csproj | 42 ++++++++++++++++++++++++++++++------------
1 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 8783e3d..abe926a 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -59,10 +59,6 @@
<Reference Include="System.EnterpriseServices" />
</ItemGroup>
<ItemGroup>
- <Content Include="bin\layuiadmin\style\admin.css" />
- <Content Include="bin\layuiadmin\style\login.css" />
- <Content Include="bin\WebTM.dll" />
- <Content Include="bin\WebTM.pdb" />
<Content Include="layuiadmin\echarts.min.js" />
<Content Include="layuiadmin\layui\css\global.css" />
<Content Include="layuiadmin\layui\css\modules\layim\html\getmsg.json" />
@@ -73,8 +69,8 @@
<Content Include="layuiadmin\layui\font\iconfont.woff" />
<Content Include="layuiadmin\layui\font\iconfont.woff2" />
<Content Include="layuiadmin\json\Test.json" />
- <Content Include="bin\WebTM.dll.config" />
<None Include="Properties\PublishProfiles\JFTM.pubxml" />
+ <Content Include="layuiadmin\layui\images\device.png" />
<Content Include="layuiadmin\layui\images\erro.png" />
<Content Include="layuiadmin\layui\layui.js" />
<Content Include="layuiadmin\layui\zgqlayui.js" />
@@ -86,7 +82,13 @@
<Content Include="layuiadmin\myicon\绯荤粺璁剧疆.svg" />
<Content Include="layuiadmin\myicon\杞﹂棿绠＄悊.svg" />
<Content Include="layuiadmin\treeTable.js" />
+ <Content Include="layuiadmin\PubCustom.js" />
+ <Content Include="layuiadmin\PubJs\PubCheck.js" />
<Content Include="views\Baseset\HBarPlanPrint.html" />
+ <Content Include="views\Baseset\鍩虹璧勬枡\Gy_QCCheckProjectListView.html" />
+ <Content Include="views\Baseset\鍩虹璧勬枡\Sc_ICMOBillListView2.html" />
+ <Content Include="views\Baseset\鍩虹璧勬枡\Sc_ProcessExchangeBillListView.html" />
+ <Content Include="views\Baseset\鍩虹璧勬枡\Gy_QCCheckItemListView.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\WMSBarCodeDetailsList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_RepairList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_ScrapReasonList.html" />
@@ -103,6 +105,8 @@
<Content Include="views\grf\a.grf" />
<Content Include="views\grf\b1.grf" />
<Content Include="views\grf\b.grf" />
+ <Content Include="views\ReportHtml.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\b.grf" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
@@ -493,6 +497,7 @@
<Content Include="views\浠撳瓨绠＄悊\浠撳簱璋冩嫧\Kf_MoveStockBill_FastList.html" />
<Content Include="views\鍏叡椤甸潰\Kf_BarCodeEditDlg.html" />
<Content Include="views\鍝佽川绠＄悊\鎴愬搧鍏ュ簱妫�楠屽崟\QC_LastPieceCheckBillList.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_Material.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_QCCheckClass.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_CheckItem.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_Currency.html" />
@@ -505,6 +510,7 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_EquipMent.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_WorkCenter.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Currency.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_Material.aspx" />
<Content Include="views\鍩虹璧勬枡\閲囪喘鍩虹璧勬枡\Gy_Supplier_Edit.html" />
<Content Include="views\鍩虹璧勬枡\閿�鍞熀纭�璧勬枡\Gy_Customer_Edit.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_WorkCenter.html" />
@@ -589,10 +595,13 @@
<Content Include="views\鐢熶骇绠＄悊\鎶ュ伐骞冲彴鍔熻兘椤礬LineBind.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇涓婃枡鍗昞Sc_MaterToSourceBillList - 澶嶅埗.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇涓婃枡鍗昞Sc_MaterToSourceBillList.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鐢熶骇鍋滃伐鍗昞Sc_Add_MESStopWorkBillList - 澶嶅埗.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇鍋滃伐鍗昞Sc_Add_MESStopWorkBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇鍋滃伐鍗昞Sc_MESStopWorkBillList.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鐢熶骇瀹屽伐鍗昞Sc_Add_MESEndWorkBillList - 澶嶅埗.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇瀹屽伐鍗昞Sc_Add_MESEndWorkBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇瀹屽伐鍗昞Sc_MESEndWorkBillList.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鐢熶骇寮�宸ュ崟\Sc_Add_MESBeginWorkBillList - 澶嶅埗.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇寮�宸ュ崟\Sc_Add_MESBeginWorkBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇寮�宸ュ崟\Sc_MESBeginWorkBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇姹囨姤鍗昞Sc_Add_ICMOReportBillList.html" />
@@ -641,12 +650,11 @@
<Content Include="views\璐ㄩ噺绠＄悊\鏉ユ枡妫�楠屽崟\QC_POStockInCheckBillList.html" />
<Content Include="views\璐ㄩ噺绠＄悊\妫�楠屾柟妗堝崟\QC_Add_CheckProject.html" />
<Content Include="views\璐ㄩ噺绠＄悊\妫�楠屾柟妗堝崟\QC_CheckProjectList.html" />
- <Content Include="views\璐ㄩ噺绠＄悊\棣栦欢妫�楠屽崟\QC_Add_Edit_FirstPieceCheckBill.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\棣栦欢妫�楠屽崟\QC_Add_Edit_FirstPieceCheckBill-X.html" />
<Content Include="views\璐ㄩ噺绠＄悊\棣栦欢妫�楠屽崟\QC_FirstPieceCheckBillList.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\棣栦欢妫�楠屽崟\QC_Add_Edit_FirstPieceCheckBill.html" />
<Content Include="views\杞﹂棿绠＄悊\濮斿宸ュ簭鍙戝嚭鍗昞Cj_StationEntrustInBill_PDA.html" />
<Content Include="views\杞﹂棿绠＄悊\濮斿宸ュ簭鎺ユ敹鍗昞Cj_StationEntrustOutBill_PDA.html" />
- <Content Include="views\杞﹂棿绠＄悊\宸ュ簭鍑虹珯姹囨姤鍗昞Cj_StationOutBill.html" />
- <Content Include="views\杞﹂棿绠＄悊\宸ュ簭鍑虹珯姹囨姤鍗昞Cj_StationOutBillList.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭鍑虹珯姹囨姤鍗昞Cj_StationOutBill.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭鍑虹珯姹囨姤鍗昞Cj_StationOutBillList.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBill.html" />
@@ -660,6 +668,10 @@
<Content Include="views\棰嗘枡鍙戣揣\鍏朵粬鍑哄簱\Kf_OtherOutBillList.html" />
<Content Include="views\棰嗘枡鍙戣揣\閿�鍞嚭搴揬Kf_SellOutBillList.html" />
<Content Include="views\棰嗘枡鍙戣揣\棰嗘枡鍑哄簱\Kf_MateOutBillList.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_CheckToolsConkBookBillList.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_CheckToolsDotCheckBillList.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_CheckToolsMaintainPlanBillList.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_CheckToolsRepairCheckBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sb_MouldRepairWorkBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_BarCodeBillList.html" />
<Content Include="views\浠撳瓨绠＄悊\浠撳簱璋冩嫧\Kf_MoveStockBillList.html" />
@@ -669,6 +681,9 @@
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_MouldDotCheckBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_MouldDotCheckPlanBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_MouldMaintainBillList.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_CheckToolsMaintainBillList.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_CheckToolsDotCheckPlanBillList.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_CheckToolsRepairWorkBillList.html" />
<Content Include="views\鐢熶骇宸ュ簭绠＄悊\澧炲姞涓嶈壇璇勫鍗昞QC_Add_NoPassProdCheckBill.html" />
<Content Include="views\鐢熶骇宸ュ簭绠＄悊\澧炲姞涓嶈壇璇勫鍗昞QC_NoPassProdCheckBillList.html" />
<Content Include="views\鐢熶骇宸ュ簭绠＄悊\濮斿宸ュ崟\WW_EntrustWorkOrderBillMainList.html" />
@@ -694,7 +709,6 @@
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆\MES_StationOutBill.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆\MES_StationOutBillList.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆\MES_StationOutBill_PDA.html" />
- <Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBill_loser.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBillList.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Qk_OutProcessList.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_ProductionProcessDetailsReport.html" />
@@ -747,9 +761,14 @@
<ItemGroup>
<Compile Include="App_Data\MssqlReportData.cs" />
<Compile Include="App_Data\ReportData.cs" />
- <Compile Include="obj\Debug\.NETFramework,Version=v4.5.AssemblyAttributes.cs" />
- <Compile Include="obj\Release\.NETFramework,Version=v4.5.AssemblyAttributes.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_Material.aspx.cs">
+ <DependentUpon>xmlLBM_Gy_Material.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_Material.aspx.designer.cs">
+ <DependentUpon>xmlLBM_Gy_Material.aspx</DependentUpon>
+ </Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_Department_Edit.aspx.cs">
<DependentUpon>xmlLBM_Gy_Department_Edit.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -766,7 +785,6 @@
</Compile>
</ItemGroup>
<ItemGroup>
- <Folder Include="bin\layuiadmin\layui\" />
<Folder Include="views\浠撳瓨绠＄悊\璋冩嫧鍗曟牳瀵筡" />
<Folder Include="views\浠撳瓨绠＄悊\璋冩嫧鍗曠ń鏍竆" />
</ItemGroup>
--
Gitblit v1.9.1