From 9451b3f86064ca3c94e1eca0c7e2b4cdba648842 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期一, 29 三月 2021 16:48:45 +0800
Subject: [PATCH] 新增生产汇报单列表、生产用料清单列表、统一GetWEBURL方法
---
WebTM/WebTM.csproj | 66 +++++++++++++++++++++++++--------
1 files changed, 50 insertions(+), 16 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 5208101..99edfe0 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -63,6 +63,7 @@
<Content Include="layuiadmin\layui\font\iconfont.eot" />
<Content Include="layuiadmin\layui\font\iconfont.ttf" />
<Content Include="layuiadmin\layui\font\iconfont.woff" />
+ <None Include="Properties\PublishProfiles\JFTM.pubxml" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
@@ -206,9 +207,7 @@
<Content Include="layuiadmin\layui\images\face\8.gif" />
<Content Include="layuiadmin\layui\images\face\9.gif" />
<Content Include="layuiadmin\layui\layui.all.js" />
- <Content Include="layuiadmin\layui\layui.js">
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
- </Content>
+ <Content Include="layuiadmin\layui\layui.js" />
<Content Include="layuiadmin\layui\lay\all-mobile.js" />
<Content Include="layuiadmin\layui\lay\all.js" />
<Content Include="layuiadmin\layui\lay\modules\carousel.js" />
@@ -256,10 +255,15 @@
<None Include="layuiadmin\Scripts\jquery-1.4.1-vsdoc.js" />
<Content Include="layuiadmin\Scripts\jquery-1.4.1.js" />
<Content Include="layuiadmin\Scripts\jquery-1.4.1.min.js" />
+ <Content Include="layuiadmin\Scripts\jquery-3.5.1.min.js" />
<Content Include="layuiadmin\Scripts\json2.js" />
<Content Include="layuiadmin\Scripts\webConfig.js" />
- <Content Include="layuiadmin\style\admin.css" />
- <Content Include="layuiadmin\style\login.css" />
+ <Content Include="layuiadmin\style\admin.css">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="layuiadmin\style\login.css">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
<Content Include="layuiadmin\style\res\bg-none.jpg" />
<Content Include="layuiadmin\style\res\layui-logo.jpg" />
<Content Include="layuiadmin\style\res\logo-black.png" />
@@ -413,18 +417,49 @@
<Content Include="views\user\user\userform.html" />
<Content Include="views\user\璇存槑.txt" />
<Content Include="views\涓嶈壇姹囨姤\Xs_SeOrderPickUp.html" />
- <Content Include="views\浠撳簱璋冩嫧\浠撳簱璋冩嫧\Kf_MoveStockBill_Fast.html" />
- <Content Include="views\浠撳簱璋冩嫧\浠撳簱璋冩嫧\Kf_MoveStockBill_FastList.html" />
+ <Content Include="views\浠撳瓨绠＄悊\浠撳簱璋冩嫧\Cc_LookingForReturnBillList.html" />
+ <Content Include="views\浠撳瓨绠＄悊\浠撳簱璋冩嫧\Cc_LookingForReturnBill.html" />
+ <Content Include="views\浠撳瓨绠＄悊\浠撳簱璋冩嫧\Cc_LookingForBill.html" />
+ <Content Include="views\浠撳瓨绠＄悊\浠撳簱璋冩嫧\Kf_LookingForBillList.html" />
+ <Content Include="views\浠撳瓨绠＄悊\浠撳簱璋冩嫧\Kf_UpMoveStockBill.html" />
+ <Content Include="views\浠撳瓨绠＄悊\浠撳簱璋冩嫧\Kf_MoveStockBill_Fast.html" />
+ <Content Include="views\浠撳瓨绠＄悊\浠撳簱璋冩嫧\Kf_MoveStockBill_FastList.html" />
<Content Include="views\鍏叡椤甸潰\Kf_BarCodeEditDlg.html" />
- <Content Include="views\宸ュ簭姹囨姤\MES_StationInBill_PDA.html" />
- <Content Include="views\宸ュ簭姹囨姤\MES_StationInBill.html" />
- <Content Include="views\宸ュ簭姹囨姤\MES_StationInBillList.html" />
- <Content Include="views\宸ュ簭姹囨姤\MES_StationOutBill_PDA.html" />
- <Content Include="views\宸ュ簭姹囨姤\MES_StationOutBill.html" />
- <Content Include="views\宸ュ簭姹囨姤\MES_StationOutBillList.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Material.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Warehouse.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Employee.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Department.html" />
+ <Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_Group.html" />
+ <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_Source.html" />
+ <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_BadReason.html" />
+ <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_Process.html" />
+ <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\H_ProcessDetail.html" />
+ <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\H_ProcessList.html" />
+ <Content Include="views\鍩虹璧勬枡\閲囪喘鍩虹璧勬枡\Gy_Supplier.html" />
+ <Content Include="views\鍩虹璧勬枡\閿�鍞熀纭�璧勬枡\Gy_Customer.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_CheckToolsRepairWorkBillList.html" />
+ <Content Include="views\鐢熶骇宸ュ簭绠＄悊\濮斿宸ュ崟\WW_EntrustWorkOrderBillMainList.html" />
+ <Content Include="views\鐢熶骇宸ュ簭绠＄悊\濮斿宸ュ簭姹囨姤鍗昞Sc_StationOutBillMainList.html" />
+ <Content Include="views\鐢熶骇宸ュ簭绠＄悊\宸ュ簭姹囨姤鍗昞Sc_ProcessReportList.html" />
+ <Content Include="views\鐢熶骇宸ュ簭绠＄悊\宸ュ簭娲惧伐鍗昞Sc_ProcessSendWorkList.html" />
+ <Content Include="views\鐢熶骇宸ュ簭绠＄悊\宸ュ簭璁″垝鍗昞Sc_ProcessPlanList.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇浠诲姟鍗昞Sc_ICMOBillList.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鐢熶骇鎶曟枡鍗昞Sc_PPBomBillList.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鐢熶骇姹囨姤鍗昞Sc_ICMOReportBillList.html" />
<Content Include="views\缁勮鍗昞Sc_AssemblyBill_Fast.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBillList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\涓嶈壇鍝佽瘎瀹″崟\Cj_NoPassProcList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆\MES_StationInBill.html" />
+ <Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆\MES_StationInBillList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆\MES_StationInBill_PDA.html" />
+ <Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆\MES_StationOutBill.html" />
+ <Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆\MES_StationOutBillList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆\MES_StationOutBill_PDA.html" />
+ <Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBill.html" />
+ <Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBillList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Qk_OutProcessList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_ProductionProcessDetailsReport.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_WorkShopReport.html" />
<Content Include="views\棰嗘枡鍙戣揣\鍏朵粬鍑哄簱\Kf_OtherOutBackBill_FastList.html" />
<Content Include="views\棰嗘枡鍙戣揣\鍏朵粬鍑哄簱\Kf_OtherOutBill_FastList.html" />
<Content Include="views\棰嗘枡鍙戣揣\鍏朵粬鍑哄簱\Kf_OtherOutBackBill_Fast.html" />
@@ -461,14 +496,13 @@
<Content Include="views\楠屾敹鍏ュ簱\濮斿鍏ュ簱\Kf_EntrustInBill_FastList.html" />
<Content Include="Web.config" />
<None Include="Properties\PublishProfiles\Web.pubxml" />
- <None Include="Properties\PublishProfiles\webtm.pubxml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
- <Folder Include="views\浠撳簱璋冩嫧\璋冩嫧鍗曟牳瀵筡" />
- <Folder Include="views\浠撳簱璋冩嫧\璋冩嫧鍗曠ń鏍竆" />
+ <Folder Include="views\浠撳瓨绠＄悊\璋冩嫧鍗曟牳瀵筡" />
+ <Folder Include="views\浠撳瓨绠＄悊\璋冩嫧鍗曠ń鏍竆" />
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
--
Gitblit v1.9.1