From 049030fadb51a710e1a8da6830443e911451218b Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期六, 29 五月 2021 15:26:22 +0800
Subject: [PATCH] 工序模块优化
---
WebTM/WebTM.csproj | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 117 insertions(+), 2 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 37ea3f9..2cc8dc0 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -60,10 +60,26 @@
</ItemGroup>
<ItemGroup>
<Content Include="layuiadmin\layui\css\modules\layim\html\getmsg.json" />
+ <Content Include="layuiadmin\layui\css\zgqlayui.css" />
<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" />
+ <Content Include="layuiadmin\layui\zgqlayui.js" />
+ <Content Include="layuiadmin\myicon\win.svg" />
+ <Content Include="layuiadmin\myicon\yidongduan.svg" />
+ <Content Include="layuiadmin\myicon\淇敼瀵嗙爜.svg" />
+ <Content Include="layuiadmin\myicon\鍗曟嵁褰曞埗.svg" />
+ <Content Include="layuiadmin\myicon\鎴戠殑璁剧疆.svg" />
+ <Content Include="layuiadmin\myicon\绯荤粺璁剧疆.svg" />
+ <Content Include="layuiadmin\myicon\杞﹂棿绠＄悊.svg" />
+ <Content Include="layuiadmin\treeTable.js" />
+ <Content Include="views\Baseset\HBarPlanPrint.html" />
+ <Content Include="views\CreateControl.js" />
+ <Content Include="views\grf\123.txt" />
+ <Content Include="views\grf\a.grf" />
+ <Content Include="views\grf\b1.grf" />
+ <Content Include="views\grf\b.grf" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
@@ -299,6 +315,7 @@
<Content Include="views\app\workorder\listform.html" />
<Content Include="views\app\璇存槑.txt" />
<Content Include="views\Baseset\SRM_OpenTmpList.html" />
+ <Content Include="views\Baseset\鍩虹璧勬枡\Gy_BadReasonList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_ProcList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_CustomerList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_DepartmentList.html" />
@@ -311,6 +328,7 @@
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_StockPlaceList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_SupplierList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_WarehouseList.html" />
+ <Content Include="views\Baseset\鍩虹璧勬枡\Sc_ProcessPlanViewList.html" />
<Content Include="views\component\anim\index.html" />
<Content Include="views\component\auxiliar\index.html" />
<Content Include="views\component\badge\index.html" />
@@ -376,10 +394,14 @@
<Content Include="views\component\upload\index.html" />
<Content Include="views\component\util\index.html" />
<Content Include="views\component\璇存槑.txt" />
+ <Content Include="views\GRInstall.js" />
+ <Content Include="views\GRUtility.js" />
+ <Content Include="views\home\console_Mobile.html" />
<Content Include="views\home\console.html" />
<Content Include="views\home\homepage1.html" />
<Content Include="views\home\homepage2.html" />
<Content Include="views\iframe\layer\iframe.html" />
+ <Content Include="views\index_Mobile.html" />
<Content Include="views\index.html" />
<Content Include="views\senior\echarts\bar.html" />
<Content Include="views\senior\echarts\line.html" />
@@ -408,6 +430,8 @@
<Content Include="views\template\璇存槑.txt" />
<Content Include="views\Test\qrscan.js" />
<Content Include="views\Test\Test.html" />
+ <Content Include="views\userfiles\images\2.jpg" />
+ <Content Include="views\userfiles\images\login_BackgroundImage.jpg" />
<Content Include="views\user\administrators\adminform.html" />
<Content Include="views\user\administrators\list.html" />
<Content Include="views\user\administrators\role.html" />
@@ -427,10 +451,22 @@
<Content Include="views\浠撳瓨绠＄悊\浠撳簱璋冩嫧\Kf_MoveStockBill_Fast.html" />
<Content Include="views\浠撳瓨绠＄悊\浠撳簱璋冩嫧\Kf_MoveStockBill_FastList.html" />
<Content Include="views\鍏叡椤甸潰\Kf_BarCodeEditDlg.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_WorkCenter.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Currency.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Unit - 澶嶅埗.html" />
+ <Content Include="views\鍝佽川绠＄悊\鎴愬搧鍏ュ簱妫�楠屽崟\QC_LastPieceCheckBillList.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\test.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Xt_ORGANIZATIONSList.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_PropertyList.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Department_Edit.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Material.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Unit.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_StockPlace.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Warehouse.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Employee.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Department.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\HBarPlanPrint.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_Department_Edit.aspx" />
<Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_Group.html" />
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_Source.html" />
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_BadReason.html" />
@@ -438,13 +474,69 @@
<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\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_CheckToolsFileMainList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_Mould.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sb_Add_MouldRepairWorkBillList.html" />
+ <Content Include="views\鐢熶骇宸ュ簭绠＄悊\濮斿宸ュ崟\WW__Add_EntrustWorkOrderBill.html" />
+ <Content Include="views\鐢熶骇宸ュ簭绠＄悊\濮斿宸ュ簭娲惧伐鍗昞WW_AddEntrustProcSendWork.html" />
+ <Content Include="views\鐢熶骇宸ュ簭绠＄悊\濮斿宸ュ簭璁″垝姹囨姤鍗昞WW_Add_EntrustProcessReport.html" />
+ <Content Include="views\鐢熶骇宸ュ簭绠＄悊\濮斿宸ュ簭璁″垝姹囨姤鍗昞WW_EntrustProcessReportBillList.html" />
+ <Content Include="views\鐢熶骇宸ュ簭绠＄悊\濮斿宸ュ簭娲惧伐鍗昞WW_EntrustProcSendWorkBillList.html" />
+ <Content Include="views\鐢熶骇宸ュ簭绠＄悊\濮斿宸ュ簭璁″垝姹囨姤鍗昞WW_EntrustProcessReport_PDA.html" />
+ <Content Include="views\鐢熶骇宸ュ簭绠＄悊\濮斿宸ュ簭璁″垝杞嚭鍗昞WW_Add_EntrustProcessSendOutBill.html" />
+ <Content Include="views\鐢熶骇宸ュ簭绠＄悊\濮斿宸ュ簭璁″垝杞嚭鍗昞WW_EntrustProcessSendOutBillList.html" />
+ <Content Include="views\鐢熶骇宸ュ簭绠＄悊\濮斿宸ュ簭璁″垝杞嚭鍗昞WW_EntrustProcessSendOutBill_PDA.html" />
+ <Content Include="views\鐢熶骇宸ュ簭绠＄悊\宸ュ簭姹囨姤鍗昞HBarPlanPrint.html" />
+ <Content Include="views\鐢熶骇宸ュ簭绠＄悊\宸ュ簭姹囨姤鍗昞xmlLBM_ProcessReport.aspx" />
+ <Content Include="views\鐢熶骇绠＄悊\涓婃枡鍗昞Sc_MaterToSourceBillList.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鐢熶骇缁勮杩芥函鍗昞Sc_AssemblyBillList.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鐢熶骇璐ㄩ噺姹囨姤鍗昞Sc_QualityReportBillList.html" />
+ <Content Include="views\绯荤粺绠＄悊\浼氳鏈熼棿\Xt_AccountPeriodList.html" />
+ <Content Include="views\绯荤粺绠＄悊\鍗曟嵁绫诲瀷\Xt_BillTypeList.html" />
+ <Content Include="views\绯荤粺绠＄悊\鏃ュ織绠＄悊\Xt_SystemLogList.html" />
+ <Content Include="views\绯荤粺绠＄悊\妯″潡绠＄悊\Xt_XtgnbList.html" />
+ <Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Xt_UserGroupList.html" />
+ <Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Xt_UserList.html" />
+ <Content Include="views\绯荤粺绠＄悊\绯荤粺鍙傛暟绠＄悊\Xt_SystemParameterList.html" />
+ <Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBill.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\宸℃璁板綍鍗昞QC_Add_Edit_PatrolProcCheckBill.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\浜у搧鍏ュ簱妫�楠屽崟\QC_LastPieceCheckBill.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\浜у搧鍏ュ簱妫�楠屽崟\QC_LastPieceCheckBillList.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\鍑哄巶妫�楠屽崟\QC_OutCompCheckBillList.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\宸℃璁板綍鍗昞QC_PatrolProcCheckBillList.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\鏉ユ枡妫�楠屽崟\QC_Add_Edit_POStockInCheckBill.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\宸ュ簭妫�楠屽崟\QC_ProcessCheckBill.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\宸ュ簭妫�楠屽崟\QC_ProcessCheckBillList.html" />
+ <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_FirstPieceCheckBillList.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" />
+ <Content Include="views\杞﹂棿绠＄悊\宸ュ簭杩涚珯鎺ユ敹鍗昞Cj_StationInBill.html" />
+ <Content Include="views\杞﹂棿绠＄悊\宸ュ簭杩涚珯鎺ユ敹鍗昞Cj_StationInBillList.html" />
+ <Content Include="views\楠屾敹鍏ュ簱\浜у搧鍏ュ簱\Kf_ProductInBillList.html" />
+ <Content Include="views\楠屾敹鍏ュ簱\鍏朵粬鍏ュ簱\Kf_OtherInBillList.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Kf_ProductInBillList.html" />
+ <Content Include="views\楠屾敹鍏ュ簱\澶栬喘鍏ュ簱\Kf_POStockInBillList.html" />
+ <Content Include="views\棰嗘枡鍙戣揣\濮斿鍑哄簱\Kf_EntrustOutBillList.html" />
+ <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" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_MouldRepairCheckBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_MouldConkBookBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_MouldMaintainPlanBillList.html" />
@@ -457,7 +549,6 @@
<Content Include="views\鐢熶骇宸ュ簭绠＄悊\澧炲姞涓嶈壇璇勫鍗昞QC_Add_NoPassProdCheckBill.html" />
<Content Include="views\鐢熶骇宸ュ簭绠＄悊\澧炲姞涓嶈壇璇勫鍗昞QC_NoPassProdCheckBillList.html" />
<Content Include="views\鐢熶骇宸ュ簭绠＄悊\濮斿宸ュ崟\WW_EntrustWorkOrderBillMainList.html" />
- <Content Include="views\鐢熶骇宸ュ簭绠＄悊\濮斿宸ュ簭姹囨姤鍗昞Sc_StationOutBillMainList.html" />
<Content Include="views\鐢熶骇宸ュ簭绠＄悊\宸ュ簭姹囨姤鍗昞Sc_Add_ProcessReportList.html" />
<Content Include="views\鐢熶骇宸ュ簭绠＄悊\宸ュ簭姹囨姤鍗昞Sc_ProcessReportList.html" />
<Content Include="views\鐢熶骇宸ュ簭绠＄悊\宸ュ簭姹囨姤鍗昞Sc_ProcessReport_PDA.html" />
@@ -480,11 +571,18 @@
<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_ProcessExchangeBill_loser.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\閲囪喘绠＄悊\濮斿璁㈠崟\WW_EntrustOrderBillList.html" />
+ <Content Include="views\閲囪喘绠＄悊\鏀舵枡閫氱煡鍗昞Cg_POInStockBillList.html" />
+ <Content Include="views\閲囪喘绠＄悊\閫�鏂欓�氱煡鍗昞Cg_POInStockBackBillList.html" />
+ <Content Include="views\閲囪喘绠＄悊\閲囪喘璁㈠崟\Cg_POOrderBillList.html" />
+ <Content Include="views\閿�鍞鐞哱閫�璐ч�氱煡鍗昞Xs_SeOutStockBackBillList.html" />
+ <Content Include="views\閿�鍞鐞哱鍙戣揣閫氱煡鍗昞Xs_SeOutStockBillList.html" />
+ <Content Include="views\閿�鍞鐞哱閿�鍞鍗昞Xs_SeOrderBillList.html" />
<Content Include="views\棰嗘枡鍙戣揣\鍏朵粬鍑哄簱\Kf_OtherOutBackBill_FastList.html" />
<Content Include="views\棰嗘枡鍙戣揣\鍏朵粬鍑哄簱\Kf_OtherOutBill_FastList.html" />
<Content Include="views\棰嗘枡鍙戣揣\鍏朵粬鍑哄簱\Kf_OtherOutBackBill_Fast.html" />
@@ -519,11 +617,28 @@
<Content Include="views\楠屾敹鍏ュ簱\濮斿鍏ュ簱\Kf_EntrustInBackBillList.html" />
<Content Include="views\楠屾敹鍏ュ簱\濮斿鍏ュ簱\Kf_EntrustInBackBill.html" />
<Content Include="views\楠屾敹鍏ュ簱\濮斿鍏ュ簱\Kf_EntrustInBill_FastList.html" />
+ <Content Include="views\楠屾敹鍏ュ簱\濮斿鍏ュ簱\Kf_EntrustInBillList.html" />
<Content Include="Web.config" />
<None Include="Properties\PublishProfiles\Web.pubxml" />
</ItemGroup>
<ItemGroup>
+ <Compile Include="App_Data\MssqlReportData.cs" />
+ <Compile Include="App_Data\ReportData.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_Department_Edit.aspx.cs">
+ <DependentUpon>xmlLBM_Gy_Department_Edit.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_Department_Edit.aspx.designer.cs">
+ <DependentUpon>xmlLBM_Gy_Department_Edit.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="views\鐢熶骇宸ュ簭绠＄悊\宸ュ簭姹囨姤鍗昞xmlLBM_ProcessReport.aspx.cs">
+ <DependentUpon>xmlLBM_ProcessReport.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鐢熶骇宸ュ簭绠＄悊\宸ュ簭姹囨姤鍗昞xmlLBM_ProcessReport.aspx.designer.cs">
+ <DependentUpon>xmlLBM_ProcessReport.aspx</DependentUpon>
+ </Compile>
</ItemGroup>
<ItemGroup>
<Folder Include="views\浠撳瓨绠＄悊\璋冩嫧鍗曟牳瀵筡" />
--
Gitblit v1.9.1