From 5ebd6758ee61497b0d485c2145c2d49b33951ed3 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期四, 18 一月 2024 10:17:01 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj | 40 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 39 insertions(+), 1 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index f9e14dd..3bbfe47 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -93,6 +93,8 @@
<Content Include="layuiadmin\layui\images\erro.png" />
<Content Include="layuiadmin\layui\layui.js" />
<Content Include="layuiadmin\layui\layui1.js" />
+ <Content Include="layuiadmin\layui\lay\modules\table-鍓湰.js" />
+ <Content Include="layuiadmin\layui\lay\modules\table.js" />
<Content Include="layuiadmin\layui\zgqlayui.js" />
<Content Include="layuiadmin\lib\extend\echarts.min.js" />
<Content Include="layuiadmin\lineBreakTransformer.js" />
@@ -272,6 +274,12 @@
<Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\Crm_CustomerAppealBill.html" />
<Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\Crm_CustomerAppealBillList.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" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_StockCheckItem.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_SupType.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_SellStyle.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_AreaSet.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_InspectInstruMent.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_StockOutStyle.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_StockInStyle.html" />
@@ -281,6 +289,12 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_InspectValue.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_TemporaryArea.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_InspectBasis.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_AreaSet.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_CusType.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_StockCheckItem.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_SupType.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_SellStyle.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_PoStockStyle.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_InspectInstruMent.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_StockOutStyle.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_StockInStyle.html" />
@@ -295,6 +309,7 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\HBarPlanPrint_GXPG.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_SellOutBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_SellOutBillList_BarCodeNote.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HPOInStockBackBill.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ICMOChangeBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcessExchangeArrangement.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_MateOutBillList.aspx" />
@@ -317,10 +332,14 @@
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Add_Edit_Gy_PostSkillList.html" />
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Add_Edit_Gy_BadResult.html" />
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Add_Edit_Gy_BadType.html" />
+ <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Add_Edit_Gy_DisposeWay.html" />
+ <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Add_Edit_Gy_ScrapReason.html" />
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_Post.html" />
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_PostSkillList.html" />
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_BadResult.html" />
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_BadType.html" />
+ <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_DisposeWayList.html" />
+ <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_ScrapReasonList.html" />
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_Souce_Excel.html" />
<Content Include="views\宸ヨ祫绠＄悊\鍔犵彮鐢宠\Pay_OverApplyBill.html" />
<Content Include="views\宸ヨ祫绠＄悊\鍔犵彮鐢宠\Pay_OverApplyBillList.html" />
@@ -347,6 +366,9 @@
<Content Include="views\鏉＄爜鏄庣粏\Kf_BarCodeDetailQuery.html" />
<Content Include="views\妗堜緥浠ｇ爜\鏅�氬熀纭�璧勬枡\Gy_DepartmentEdit.html" />
<Content Include="views\妗堜緥浠ｇ爜\鏅�氬熀纭�璧勬枡\Gy_DepartmentList.html" />
+ <Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿鎶ヨ〃\Sc_MouldConkBookBillMainReport.html" />
+ <Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿鎶ヨ〃\Sc_MouldMaintainBillMainReport.html" />
+ <Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿鎶ヨ〃\Sc_MouldRepairWorkBillReport.html" />
<Content Include="views\鐢熶骇绠＄悊\浣滀笟鎸囧涔Gy_SOPBill_Video.html" />
<Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞Sc_Reply_MESExecptFeedBackBill.html" />
<Content Include="views\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫浜ч噺姹囨姤\Sc_ICMOBillQualityStatus_TmpList.html" />
@@ -367,14 +389,20 @@
<Content Include="views\绯荤粺绠＄悊\蹇嵎鏂瑰紡鑷畾涔塡Xt_UserFastMenu.html" />
<Content Include="views\绯荤粺绠＄悊\蹇嵎鏂瑰紡鑷畾涔塡Xt_UserFastMenu_IconSet.html" />
<Content Include="views\绯荤粺绠＄悊\鎸夐挳璁剧疆\Xt_ModuleButtonSet.html" />
+ <Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserByUserList.html" />
+ <Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserByWorkStationList.html" />
<Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserCustomerList.html" />
<Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserCustomerList_Edit.html" />
+ <Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserMaterList.html" />
+ <Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserStockRelation.html" />
<Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserProcessList.html" />
<Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserCustomer_ImportByExcel.html" />
<Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserEmployee_Excel.html" />
<Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserProcess_Excel.html" />
<Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Xt_UserSuplies_Excel.html" />
<Content Include="views\绯荤粺绠＄悊\鑿滃崟鑷畾涔塡Xt_DefineMenuDisplay.html" />
+ <Content Include="views\绯荤粺绠＄悊\杩囨护鏂规璁剧疆\Xt_FastICScheme.html" />
+ <Content Include="views\绯荤粺绠＄悊\杩囨护鏂规璁剧疆\Xt_FastICSchemeList.html" />
<Content Include="views\璁″垝绠＄悊\浜х嚎璐ㄦ骞冲彴\Sc_ICMOBillQualityStatus_Tmp.html" />
<Content Include="views\璁″垝绠＄悊\浜х嚎杩斾慨骞冲彴\Sc_SourceLineRepairBill.html" />
<Content Include="views\璁″垝绠＄悊\浜х嚎杩斾慨骞冲彴\Sc_SourceLineRepairBill_ChangeMater.html" />
@@ -421,6 +449,7 @@
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆\MES_Sc_ProcessExchangeBillMain_Note_PDA.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆\MES_StationInBillList_PDA_QiaoYi.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆\MES_StationOutBillList_PDA_QiaoYi.html" />
+ <Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Gy_ProcessBatchReport.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBillList_LookDown.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭杩涚珯鎺ユ敹鍗昞Cj_StationInBillList_QiaoYi.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_BadReasonReport.html" />
@@ -465,6 +494,7 @@
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\sc_ICOMReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\sc_ICOMRKBanReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\sc_ICOMRKReport.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_ProcExchangeNoInReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_WorkShopProcessWIPSumReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_WorkShopProcessWIPReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_EmployeePieceWorkReport.html" />
@@ -625,6 +655,8 @@
<Content Include="views\grf\閿�鍞鍗曞彉鏇村崟2.grf" />
<Content Include="views\grf\涓嶈壇绫诲瀷.grf" />
<Content Include="views\grf\寮傚父绫诲瀷.grf" />
+ <Content Include="views\grf\鐢熶骇璁㈠崟棰嗘枡鐘舵�佹姤琛�.grf" />
+ <Content Include="views\grf\閫�鏂欓�氱煡鍗�.grf" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
@@ -791,7 +823,6 @@
<Content Include="layuiadmin\layui\lay\modules\mobile\zepto.js" />
<Content Include="layuiadmin\layui\lay\modules\rate.js" />
<Content Include="layuiadmin\layui\lay\modules\slider.js" />
- <Content Include="layuiadmin\layui\lay\modules\table.js" />
<Content Include="layuiadmin\layui\lay\modules\tree.js" />
<Content Include="layuiadmin\layui\lay\modules\upload.js" />
<Content Include="layuiadmin\layui\lay\modules\util.js" />
@@ -1722,6 +1753,13 @@
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_SellOutBillList_BarCodeNote.aspx.designer.cs">
<DependentUpon>xmlLBM_Kf_SellOutBillList_BarCodeNote.aspx</DependentUpon>
</Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HPOInStockBackBill.aspx.cs">
+ <DependentUpon>xmlLBM_HPOInStockBackBill.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HPOInStockBackBill.aspx.designer.cs">
+ <DependentUpon>xmlLBM_HPOInStockBackBill.aspx</DependentUpon>
+ </Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ICMOChangeBillList.aspx.cs">
<DependentUpon>xmlLBM_Sc_ICMOChangeBillList.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
--
Gitblit v1.9.1