From e4f24e81dc1f484cd91b965ed3eada9865b0bf85 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 17 三月 2025 17:03:46 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 7b5058a..16e1331 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -106,6 +106,7 @@
<Content Include="layuiadmin\ext\tableMerge.js" />
<Content Include="layuiadmin\grwebapp.js" />
<Content Include="layuiadmin\layui\layui.js" />
+ <Content Include="layuiadmin\layui\layui2.10.0.js" />
<Content Include="layuiadmin\modules\treeTable.js" />
<Content Include="layuiadmin\resize\ResizeLeftRight.css" />
<Content Include="layuiadmin\resize\ResizeLeftRight.js" />
@@ -464,7 +465,13 @@
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemClass_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MatePriceCus.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MatePriceCusEdit.html" />
+ <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairCheckClass.html" />
+ <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MaintainClass.html" />
+ <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MaintainClassEdit.html" />
+ <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairClassEdit.html" />
+ <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairCheckClassEdit.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairCheck_Excel.html" />
+ <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairClass.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_Repair_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_Maintain_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheck_Excel.html" />
@@ -562,6 +569,9 @@
<Content Include="views\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫寰憰鍝佽褰曞崟\Sc_SubtleFlawBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鎶ュ伐骞冲彴鍔熻兘椤礬Gy_ButtonList.html" />
<Content Include="views\鐢熶骇绠＄悊\鎶ュ伐骞冲彴鍔熻兘椤礬LineBind_Button.html" />
+ <Content Include="views\鐢熶骇绠＄悊\娆犳枡杩愮畻\JIT_MaterialLevelShorAnalysis.html" />
+ <Content Include="views\鐢熶骇绠＄悊\娆犳枡杩愮畻\JIT_MaterialLevelShorAnalysisDetailReport.html" />
+ <Content Include="views\鐢熶骇绠＄悊\娆犳枡杩愮畻\JIT_MaterialLevelShorAnalysisReport.html" />
<Content Include="views\鐢熶骇绠＄悊\鐝寮�鐝崟\Sc_ShiftsBeginInfoBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鐝寮�鐝崟\Sc_ShiftsBeginInfoBill_Add_Edit.html" />
<Content Include="views\鐢熶骇绠＄悊\鎻愭枡璁″垝\JIT_PickUpCalculate.html" />
@@ -597,6 +607,7 @@
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBillWorkQty.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Pay_ProcPriceTypeChangeReport.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_MaterialTechParamBill_Excel.html" />
+ <Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎澶х被\Gy_RoutingGroupEdit.html" />
<Content Include="views\璁惧绠＄悊\Sb_Add_EquipRepairSignBillList.html" />
<Content Include="views\璁惧绠＄悊\Sb_EquipRepairSignBillList_PDA.html" />
<Content Include="views\璁惧绠＄悊\Sb_EquipRepairSignBill_PDA.html" />
--
Gitblit v1.9.1