From 1f04de10815fda88229254f445820cab8b759f31 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 27 五月 2024 16:08:58 +0800
Subject: [PATCH] 设备/模具模块添加字段，保养计划添加安全结束时间点；根据产品+工序查看sop
---
WebTM/WebTM.csproj | 103 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 97 insertions(+), 6 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 9c6afbf..26d6cfb 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -41,6 +41,9 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.CSharp" />
+ <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
+ </Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\鍔炲叕\K3Cloud\WebSite\bin\Newtonsoft.Json.dll</HintPath>
@@ -55,6 +58,24 @@
<Reference Include="System.Core" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Web.Extensions" />
+ <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
+ </Reference>
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Drawing" />
<Reference Include="System.Web" />
@@ -114,6 +135,7 @@
<Content Include="layuiadmin\myicon\绯荤粺璁剧疆.svg" />
<Content Include="layuiadmin\myicon\杞﹂棿绠＄悊.svg" />
<Content Include="layuiadmin\Scripts\echarts.min.js" />
+ <Content Include="layuiadmin\Scripts\webConfig2.js" />
<Content Include="layuiadmin\serial-reader.js" />
<Content Include="layuiadmin\soulTable.slim.js" />
<Content Include="layuiadmin\treeTable.js" />
@@ -248,6 +270,8 @@
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇鍏ュ簱\Kf_ProductInBillList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇姹囨姤\Sc_ICMOReportBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇姹囨姤\Sc_ICMOReportBillList_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\鐢熶骇琛ユ枡\Kf_MateReplenishOutBillList_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\鐢熶骇琛ユ枡\Kf_MateReplenishOutBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\Kf_MoveStockStepInBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\Kf_MoveStockStepOutBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\Kf_MoveStockStepInBillList_PDA.html" />
@@ -256,7 +280,9 @@
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\Kf_MoveStockBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇棰嗘枡\Kf_MateOutBackBillList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇棰嗘枡\Kf_MateOutBillList_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\鐢熶骇棰嗘枡\Kf_MateOutBackBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇棰嗘枡\Kf_MateOutBill_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\閲囪喘鍏ュ簱\Kf_POStockInBackBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\閲囪喘鍏ュ簱\Kf_POStockInBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\閲囪喘鍏ュ簱\Kf_POStockInBackBillList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\閲囪喘鍏ュ簱\Kf_POStockInBillList_PDA.html" />
@@ -296,9 +322,72 @@
<Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\Crm_CustomerAppealBill_KaiBei.html" />
<Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\Crm_CustomerAppealBill.html" />
<Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\Crm_CustomerAppealBillList.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_CheckNoteItem.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_MaintainLev.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_PreventErrMould.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_ColorClassList.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_CheckNoteItem.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MaintainLev.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_PreventErrMould.html" />
+ <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemMethodEdit.html" />
+ <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemClassEdit.html" />
+ <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemMethodList.html" />
+ <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemClassList.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯″叿鍏朵粬鍏ュ簱鍗昞Sc_MouldOtherInBillList_PDA.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯″叿鍏朵粬鍑哄簱鍗昞Sc_MouldOtherOutBillList_PDA.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯″叿鎶ュ簾鍑哄簱鍗昞Sc_MouldScrapOutBillList_PDA.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯″叿鎶ュ簾鍏ュ簱鍗昞Sc_MouldScrapInBillList_PDA.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯″叿鏀瑰埗鍏ュ簱鍗昞Sc_MouldRepairInBillList_PDA.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯″叿鏀瑰埗鍑哄簱鍗昞Sc_MouldRepairOutBillList_PDA.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯″叿鐢熶骇閫�搴撳崟\Sc_MouldProdBackBill_PDA.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯″叿鐢熶骇閫�搴撳崟\Sc_MouldProdBackBillList_PDA.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯″叿鐢熶骇棰嗙敤鍗昞Sc_MouldProdOutBillList_PDA.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯″叿鐢熶骇棰嗙敤鍗昞Sc_MouldProdOutBill_PDA.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯″叿璋冩嫧\Sc_MouldProdMoveBillList_PDA.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯″叿璋冩嫧\Sc_MouldProdMoveBill_PDA.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯″叿閲囪喘鍏ュ簱鍗昞Sc_MouldProdInBillList_PDA.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风偣妫�淇濆吇\Sc_MouldDotCheckBill_PDA.html" />
<Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞OA_ErrMsgBackSignBill_BrushCard.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫寮�宸Sc_SwipeCardStart.html" />
+ <Content Include="views\璁惧绠＄悊\璁惧鍋滄満鍗昞Sb_EquipStopBillList_PDA.html" />
+ <Content Include="views\璁惧绠＄悊\璁惧鍋滄満鍗昞Sb_EquipStopBill_PDA.html" />
+ <Content Include="views\璁惧绠＄悊\璁惧寮�鏈哄崟\Sb_EquipBeginBillList_PDA.html" />
+ <Content Include="views\璁惧绠＄悊\璁惧寮�鏈哄崟\Sb_EquipBeginBill_PDA.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\搴撳瓨妫�楠屽崟\QC_Add_Edit_StockCheckBill.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\搴撳瓨妫�楠屽崟\QC_StockCheckBillList.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\杞﹂棿鑷鍗昞QC_Add_Edit_WorkSelfCheckBill.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\杞﹂棿鑷鍗昞QC_WorkSelfCheckBillList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\浜х嚎\222.jpg" />
+ <Content Include="views\杞﹂棿绠＄悊\浜х嚎\Add_Edit_Gy_WorkDay.html" />
+ <Content Include="views\杞﹂棿绠＄悊\浜х嚎\Gy_WorkDay.html" />
+ <Content Include="views\杞﹂棿绠＄悊\浜х嚎\MES_AssemblyTraceability.html" />
+ <Content Include="views\杞﹂棿绠＄悊\浜х嚎\MES_AssemblyTraceabilityList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\浜х嚎\MES_ProductionLinePackaging.html" />
+ <Content Include="views\杞﹂棿绠＄悊\浜х嚎\MES_ProductionLinePackagingList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\浜х嚎\ProcessWIPReport.html" />
+ <Content Include="views\杞﹂棿绠＄悊\浜х嚎\RetrospectionCustomerReport.html" />
+ <Content Include="views\杞﹂棿绠＄悊\浜х嚎\Sc_GroupOrderBill.html" />
+ <Content Include="views\杞﹂棿绠＄悊\浜х嚎\Sc_GroupOrderBillCacheList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\浜х嚎\Sc_GroupOrderBillList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\浜х嚎\Sc_PackUnionBillCacheList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\浜х嚎\Sc_ProcessReportList_Last.html" />
+ <Content Include="views\杞﹂棿绠＄悊\浜х嚎\Sc_StationInBillList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\浜х嚎\test.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鍚姩妫�鏌ュ崟\Sc_WorkBeginDotCheckBill.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鍚姩妫�鏌ュ崟\Sc_WorkBeginDotCheckBillList.html" />
+ <Content Include="views\璁惧绠＄悊\璁惧鍋滄満鍗昞Sb_EquipStopBill.html" />
+ <Content Include="views\璁惧绠＄悊\璁惧鍋滄満鍗昞Sb_EquipStopBillList.html" />
+ <Content Include="views\璁惧绠＄悊\璁惧寮�鏈哄崟\Sb_EquipBeginBill.html" />
+ <Content Include="views\璁惧绠＄悊\璁惧寮�鏈哄崟\Sb_EquipBeginBillList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeArrangement_PG.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_PressurizedWaterNoOutReport.html" />
+ <Content Include="views\杞﹂棿绠＄悊\闃查敊楠岃瘉\Gy_MaterPreventErrMouldBill.html" />
+ <Content Include="views\杞﹂棿绠＄悊\闃查敊楠岃瘉\Gy_MaterPreventErrMouldBillList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\闃查敊楠岃瘉\Qc_PreventErrMouldCheckBill.html" />
+ <Content Include="views\杞﹂棿绠＄悊\闃查敊楠岃瘉\Qc_PreventErrMouldCheckBillList.html" />
<Content Include="views\椤圭洰绠＄悊\鍩虹寤烘ā\Add_Edit_Gy_TaskClass.html" />
<Content Include="views\椤圭洰绠＄悊\鍩虹寤烘ā\Add_Edit_Gy_ProjectClass.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_ColorClass.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_InspectBasis.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_PoStockStyle.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_CusType.html" />
@@ -316,8 +405,6 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_InspectMethod.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_InspectValue.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_TemporaryArea.html" />
- <Content Include="views\椤圭洰绠＄悊\鍩虹寤烘ā\Gy_TaskClass.html" />
- <Content Include="views\椤圭洰绠＄悊\鍩虹寤烘ā\Gy_ProjectClass.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_InspectBasis.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_AreaSet.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_CusType.html" />
@@ -1350,12 +1437,12 @@
<Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿鐐规瑙勭▼鍗昞Sc_MouldDotCheckRuleBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿缁翠慨娲惧伐鍗昞Sc_MouldRepairSendWorkBillEdit.html" />
<Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿缁翠慨娲惧伐鍗昞Sc_MouldRepairSendWorkBillList.html" />
- <Content Include="views\妯℃不鍏风鐞哱妯″叿澶勭悊鍑哄簱鍗昞Sc_MouldScrapOutBill_PDA.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯″叿鎶ュ簾鍑哄簱鍗昞Sc_MouldScrapOutBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿瀵垮懡璋冩暣鍗昞Sc_MouldLifeChangeBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿鏀瑰埗鍏ュ簱鍗昞Sc_MouldRepairInBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿鏀瑰埗鍑哄簱鍗昞Sc_MouldRepairOutBill_PDA.html" />
- <Content Include="views\妯℃不鍏风鐞哱妯″叿鐢熶骇閫�搴撳崟\Sc_MouldProdBackBill_PDA.html" />
- <Content Include="views\妯℃不鍏风鐞哱妯″叿鐢熶骇棰嗙敤鍗昞Sc_MouldProdOutBill_PDA.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯″叿鐢熶骇閫�搴撳崟\Sc_MouldProdBackBill_PDA_old.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯″叿鐢熶骇棰嗙敤鍗昞Sc_MouldProdOutBill_PDA_old.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿缁翠慨璁板綍鍗昞Sc_MouldRepairWorkBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿鍏朵粬鍑哄簱鍗昞Sc_MouldOtherOutBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿鍏朵粬鍏ュ簱鍗昞Sc_MouldOtherInBill_PDA.html" />
@@ -1395,7 +1482,7 @@
<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_MouldDotCheckBill_PDA_OLD.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风偣妫�淇濆吇\Sc_MouldMaintainBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱BatchGen_MouldFile.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_BarCodeBill_Out.html" />
@@ -1728,6 +1815,10 @@
<Content Include="views\椤圭洰绠＄悊\鍛ㄨ鍒抃PM_WorkReportWeekBillMainList.html" />
<Content Include="views\椤圭洰绠＄悊\鍛ㄨ鍒抃PM_WorkTaskWeekBillList.html" />
<Content Include="views\椤圭洰绠＄悊\鍛ㄨ鍒抃PM_WorkTaskWeekBill.html" />
+ <Content Include="views\椤圭洰绠＄悊\鍩虹寤烘ā\Gy_ProjectClass.html" />
+ <Content Include="views\椤圭洰绠＄悊\鍩虹寤烘ā\Gy_TaskClass.html" />
+ <Content Include="views\椤圭洰绠＄悊\宸ヤ綔浠诲姟\PM_WorkTaskMoneyBillList.html" />
+ <Content Include="views\椤圭洰绠＄悊\宸ヤ綔浠诲姟\PM_WorkTaskMoneyBill.html" />
<Content Include="views\椤圭洰绠＄悊\宸ヤ綔浠诲姟\PM_WorkTaskReportBillList.html" />
<Content Include="views\椤圭洰绠＄悊\宸ヤ綔浠诲姟\PM_WorkTaskReportBill.html" />
<Content Include="views\椤圭洰绠＄悊\宸ヤ綔浠诲姟\PM_WorkTaskBillList.html" />
--
Gitblit v1.9.1