From 390e5351ed3b63e2dbcd7f6e59d1ce52592a45e8 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 07 九月 2022 19:43:25 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/WebTM.csproj | 47 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 47 insertions(+), 0 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 737b46a..f0d1e69 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -80,6 +80,11 @@
<Content Include="layuiadmin\layui\images\erro.png" />
<Content Include="layuiadmin\layui\layui.js" />
<Content Include="layuiadmin\layui\zgqlayui.js" />
+ <Content Include="layuiadmin\modules\excel.js" />
+ <Content Include="layuiadmin\modules\soulTable.js" />
+ <Content Include="layuiadmin\modules\tableChild.js" />
+ <Content Include="layuiadmin\modules\tableFilter.js" />
+ <Content Include="layuiadmin\modules\tableMerge.js" />
<Content Include="layuiadmin\modules\transfer.js" />
<Content Include="layuiadmin\myicon\win.svg" />
<Content Include="layuiadmin\myicon\yidongduan.svg" />
@@ -88,6 +93,7 @@
<Content Include="layuiadmin\myicon\鎴戠殑璁剧疆.svg" />
<Content Include="layuiadmin\myicon\绯荤粺璁剧疆.svg" />
<Content Include="layuiadmin\myicon\杞﹂棿绠＄悊.svg" />
+ <Content Include="layuiadmin\soulTable.slim.js" />
<Content Include="layuiadmin\treeTable.js" />
<Content Include="layuiadmin\PubCustom.js" />
<Content Include="layuiadmin\PubJs\PubCheck.js" />
@@ -162,6 +168,7 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Pay_PeriodInfoSet.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_WorkCenterDyCol.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_WorkPayType.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_WorkStationList.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_WorkType.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Pay_PeriodInfoSet.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_OrderBackInfo.html" />
@@ -214,6 +221,9 @@
<Content Include="views\grf\鍖呰鏂瑰紡鏉＄爜.grf" />
<Content Include="views\grf\鑺卞瀷鏉＄爜.grf" />
<Content Include="views\grf\宸ュ簭娴佽浆.grf" />
+ <Content Include="views\grf\cabinet-CG.grf" />
+ <Content Include="views\grf\鐟炰笌绁烘睙鑻忔墦鍗版ā鏉�.grf" />
+ <Content Include="views\grf\cabinet-SB.grf" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
@@ -623,6 +633,7 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_EquipMaintainBill.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_EquipMaintainPlanBill.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_EquipTypeBill.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_HEquipResumeBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_Material.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_DepartmentList.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_BarCodeBill.aspx" />
@@ -653,6 +664,7 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldTypeBill.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_QK_PackingBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_QK_SPackingBillList.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_HPPickingBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ICMOBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcessExchangeBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_ConkReasonEdit.html" />
@@ -713,6 +725,8 @@
<Content Include="views\宸ヨ祫绠＄悊\Gy_WorkPayTypeBillList.html" />
<Content Include="views\宸ヨ祫绠＄悊\Gy_WorkTypeBillEdit.html" />
<Content Include="views\宸ヨ祫绠＄悊\Gy_WorkTypeBillList.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫鎶ヨ〃\ReportList2.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫鎶ヨ〃\ReportList.html" />
<Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫缁撶畻鍗�%28涓汉%29\Pay_SingleBalBillEdit.html" />
<Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫缁撶畻鍗�%28涓汉%29\Pay_SingleBalBillList.html" />
<Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫缁撶畻鍗�%28鍏朵粬%29\Pay_OtherBalBillEdit.html" />
@@ -727,11 +741,14 @@
<Content Include="views\宸ヨ祫绠＄悊\鏍哥畻鏂瑰紡\Gy_ClassTimePrjSubBillList.html" />
<Content Include="views\宸ヨ祫绠＄悊\鐝粍鑱屽憳娓呭崟\Gy_GroupEmpBillEdit.html" />
<Content Include="views\宸ヨ祫绠＄悊\鐝粍鑱屽憳娓呭崟\Gy_GroupEmpBillList.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\鑰冨嫟姹囨姤鍗昞Pay_WorkTimesBillEdit_yqn.html" />
<Content Include="views\宸ヨ祫绠＄悊\鑰冨嫟姹囨姤鍗昞Pay_WorkTimesBillEdit.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\鑰冨嫟姹囨姤鍗昞Pay_WorkTimesBillList_yqn.html" />
<Content Include="views\宸ヨ祫绠＄悊\鑰冨嫟姹囨姤鍗昞Pay_WorkTimesBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿鎶ヨ〃\ReportInventoryAccount.html" />
<Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿鎶ヨ〃\ReportMaterialReceipt.html" />
<Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿鎶ヨ〃\ReportMouldStock.html" />
+ <Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿鎶ヨ〃\Sc_MouldAvailableList.html" />
<Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿缁翠慨娲惧伐鍗昞Sc_MouldRepairSendWorkBillEdit.html" />
<Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿缁翠慨娲惧伐鍗昞Sc_MouldRepairSendWorkBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿澶勭悊鍑哄簱鍗昞Sc_MouldScrapOutBill_PDA.html" />
@@ -747,6 +764,7 @@
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldMoveStockStepOutBill.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldMoveStockStepInBill.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldMoveStockStepInBillList.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldMoveStockStepOutButNotStepInList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldProdMoveBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldMoveStockStepOutBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldProdInBillEdit.html" />
@@ -778,6 +796,7 @@
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_CheckToolsFileMainList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_MouldFileList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_MouldFile.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_MouldFileResume.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sb_Add_MouldRepairWorkBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_Add_MouldConkBookBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_Add_MouldDotCheckBillList.html" />
@@ -845,6 +864,7 @@
<Content Include="views\鐢熶骇绠＄悊\鏃ヨ鍒掑熀纭�璧勬枡\Gy_WorkWarehouseBill_Add.html" />
<Content Include="views\鐢熶骇绠＄悊\鏃ヨ鍒掑熀纭�璧勬枡\JIT_NeedMaterPlanConfigBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鏃ヨ鍒掑熀纭�璧勬枡\JIT_NeedMaterPlanConfigBill_Add.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鏃ヨ鍒掓姤琛╘ReportMOMaterReadysBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鏃ヨ鍒掓姤琛╘ReportPODemandPlanBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鏃ヨ鍒掓姤琛╘ReportPODemandPlanBillList_S.html" />
<Content Include="views\鐢熶骇绠＄悊\鏃ヨ鍒掓姤琛╘ReportWorkDemandPlanBillList.html" />
@@ -863,6 +883,7 @@
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇寮�宸ュ崟\Sc_Add_MESBeginWorkBillList - 澶嶅埗.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇寮�宸ュ崟\Sc_Add_MESBeginWorkBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇寮�宸ュ崟\Sc_MESBeginWorkBillList.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鐢熶骇鎶曟枡鍗昞Sc_PPickingBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇鎷嗙鍗昞Sc_PackSplitBill_Fast.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇鏃ヨ鍒掑伐鍗昞JIT_DayPlanBillEdit.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇鏃ヨ鍒掑伐鍗昞JIT_DayPlanBillList.html" />
@@ -876,6 +897,7 @@
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇瑁呯鍗昞Sc_PackUnionBill_Fast.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇璁″垝骞冲彴\JIT_DayPlanPlatForm.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇璁″垝骞冲彴\JIT_DayPlanPlatFormImport.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鐢熶骇璁″垝骞冲彴\Sc_ICMOSortBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇閫�搴撳崟\Sc_ProductionReturnList.html" />
<Content Include="views\鐢熶骇绠＄悊\缁勬墭鍗曠紪杈慭Sc_GroupOrderBillEdit_Fast.html" />
<Content Include="views\鐢熶骇绠＄悊\缁勮鍗昞Sc_GroupOrderBillList.html" />
@@ -895,12 +917,18 @@
<Content Include="views\绯荤粺绠＄悊\鏃ュ織绠＄悊\Xt_SystemLogList.html" />
<Content Include="views\绯荤粺绠＄悊\妯″潡绠＄悊\Xt_Xtgnb_Edit.html" />
<Content Include="views\绯荤粺绠＄悊\妯″潡绠＄悊\Xt_XtgnbList.html" />
+ <Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserByOrg.html" />
+ <Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserByWorkStation.html" />
+ <Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserDept.html" />
+ <Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserGroup.html" />
+ <Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserStock.html" />
<Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Xt_UserGroupList.html" />
<Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Xt_UserList.html" />
<Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Xt_UserListEdit.html" />
<Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Xt_UserSuplies.html" />
<Content Include="views\绯荤粺绠＄悊\绯荤粺鍙傛暟绠＄悊\Xt_SystemParameter_Edit.html" />
<Content Include="views\绯荤粺绠＄悊\绯荤粺鍙傛暟绠＄悊\Xt_SystemParameterList.html" />
+ <Content Include="views\缁勮鍗昞Sc_PCruxBindingPDA.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBill.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBillimport.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎澶х被\Gy_RoutingGroupList.html" />
@@ -925,6 +953,7 @@
<Content Include="views\璁惧绠＄悊\Sb_EquipMaintainPlanBillEdit.html" />
<Content Include="views\璁惧绠＄悊\Sb_EquipMaintainPlanBillList.html" />
<Content Include="views\璁惧绠＄悊\Sc_Add_MouldDotCheckBillList.html" />
+ <Content Include="views\璁惧绠＄悊\璁惧妗ｆ\Gy_EquipFileBillResume.html" />
<Content Include="views\璁惧绠＄悊\璁惧妗ｆ\Gy_EquipFileMainEdit.html" />
<Content Include="views\璁惧绠＄悊\璁惧妗ｆ\Gy_EquipFileMainList.html" />
<Content Include="views\璁惧绠＄悊\璁惧缁翠慨娲惧伐鍗昞Sb_EquipRepairSendWorkBillEdit.html" />
@@ -962,16 +991,20 @@
<Content Include="views\杞﹂棿绠＄悊\濮斿宸ュ簭鎺ユ敹鍗昞Cj_StationEntrustOutBill_PDA.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭鍑虹珯姹囨姤鍗昞Cj_StationOutBill.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭鍑虹珯姹囨姤鍗昞MES_StationOutBill_PDA.html" />
+ <Content Include="views\杞﹂棿绠＄悊\宸ュ簭鍑虹珯姹囨姤鍗昞Sc_StationOutBill_Mul_RYQ.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭鍑虹珯姹囨姤鍗昞Sc_StationOutBill_Mul_PDA.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭鍑虹珯姹囨姤鍗昞Sc_StationOutBill_Mul.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭鍑虹珯姹囨姤鍗昞Cj_StationOutBillList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeIssue.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBill.html" />
+ <Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeIssueBillList.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭杩涚珯鎺ユ敹鍗昞Cj_StationInBill.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭杩涚珯鎺ユ敹鍗昞Cj_StationInBillList.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭杩涚珯鎺ユ敹鍗昞Cj_StationQty.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭杩涚珯鎺ユ敹鍗昞MES_StationInBill_PDA.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭杩涚珯鎺ユ敹鍗昞Sc_StationInBill_Mul_PDA.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭杩涚珯鎺ユ敹鍗昞Sc_StationInBill_Mul.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\ProductionPlanReportList.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_StationInBillList.html" />
<Content Include="views\杞﹂棿绠＄悊\杞﹂棿鏀舵枡\JIT_SendGoodsBillList.html" />
<Content Include="views\閲囪喘绠＄悊\鏀舵枡閫氱煡鍗昞Add_Edit_Cg_POInStockBillList.html" />
@@ -1129,6 +1162,13 @@
</Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_EquipTypeBill.aspx.designer.cs">
<DependentUpon>xmlLBM_EquipTypeBill.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_HEquipResumeBillList.aspx.cs">
+ <DependentUpon>xmlLBM_Gy_HEquipResumeBillList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_HEquipResumeBillList.aspx.designer.cs">
+ <DependentUpon>xmlLBM_Gy_HEquipResumeBillList.aspx</DependentUpon>
</Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_Material.aspx.cs">
<DependentUpon>xmlLBM_Gy_Material.aspx</DependentUpon>
@@ -1340,6 +1380,13 @@
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_QK_SPackingBillList.aspx.designer.cs">
<DependentUpon>xmlLBM_QK_SPackingBillList.aspx</DependentUpon>
</Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_HPPickingBillList.aspx.cs">
+ <DependentUpon>xmlLBM_Sc_HPPickingBillList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_HPPickingBillList.aspx.designer.cs">
+ <DependentUpon>xmlLBM_Sc_HPPickingBillList.aspx</DependentUpon>
+ </Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ICMOBillList.aspx.cs">
<DependentUpon>xmlLBM_Sc_ICMOBillList.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
--
Gitblit v1.9.1