From 715e5ed515561d5b1a2391fb4a16e59567348dde Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期五, 17 五月 2024 17:05:51 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index f61cd46..b56dcb0 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -135,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" />
@@ -337,10 +338,27 @@
<Content Include="views\妯℃不鍏风鐞哱妯″叿璋冩嫧\Sc_MouldProdMoveBill_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\杞﹂棿绠＄悊\浜х嚎\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" />
--
Gitblit v1.9.1