From ac5962f71fe0f4fd4e7e44fb74a02bba7ff816b4 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 18 六月 2024 12:14:16 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 7ad8bec..a7cc807 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -206,6 +206,8 @@
<Content Include="views\home\console_pb.html" />
<Content Include="views\home\console_QiaoYi.html" />
<Content Include="views\home\console_Mobile_QiaoYi.html" />
+ <Content Include="views\indexMenu_PDA.html" />
+ <Content Include="views\indexMenu_PingBan.html" />
<Content Include="views\index_KaiBeiNaiTe.html" />
<Content Include="views\index_Mobile_KaiBeiNaiTe.html" />
<Content Include="views\index_Mobile_QiaoYi.html" />
@@ -326,11 +328,15 @@
<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\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Xs_SeOrderBill_StockInCodeNote.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlSRM_Web_BarCodeBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemMethodEdit.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemClassEdit.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemMethodList.html" />
@@ -359,6 +365,7 @@
<Content Include="views\妯℃不鍏风鐞哱妯″叿閲囪喘鍏ュ簱鍗昞Sc_MouldProdInBillList_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿閲囪喘鍏ュ簱鍗昞Sc_MouldProdInBill_PDA_old.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风偣妫�淇濆吇\Sc_MouldDotCheckBill_PDA.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风偣妫�淇濆吇\Sc_MouldDotCheckBill_PDA_OLD.html" />
<Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞OA_ErrMsgBackSignBill_BrushCard.html" />
<Content Include="views\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫寮�宸Sc_SwipeCardStart.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇璁″垝骞冲彴\JIT_DayPlanPlatForm_BCP.html" />
@@ -375,6 +382,7 @@
<Content Include="views\璐ㄩ噺绠＄悊\宸℃璁板綍鍗昞QC_PatrolProcCheckOtherBillList.html" />
<Content Include="views\璐ㄩ噺绠＄悊\搴撳瓨妫�楠屽崟\QC_Add_Edit_StockCheckBill.html" />
<Content Include="views\璐ㄩ噺绠＄悊\搴撳瓨妫�楠屽崟\QC_StockCheckBillList.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_InspectionFormReport.html" />
<Content Include="views\璐ㄩ噺绠＄悊\杞﹂棿鑷鍗昞QC_Add_Edit_WorkSelfCheckBill.html" />
<Content Include="views\璐ㄩ噺绠＄悊\杞﹂棿鑷鍗昞QC_WorkSelfCheckBillList.html" />
<Content Include="views\杞﹂棿绠＄悊\浜х嚎\222.jpg" />
@@ -400,6 +408,7 @@
<Content Include="views\璁惧绠＄悊\璁惧寮�鏈哄崟\Sb_EquipBeginBill.html" />
<Content Include="views\璁惧绠＄悊\璁惧寮�鏈哄崟\Sb_EquipBeginBillList.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeArrangement_PG.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Cj_SPCOscillationCurve.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_PressurizedWaterNoOutReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鍚姩鐐规鍗昞Gy_WorkBeginDotCheckListBill.html" />
<Content Include="views\杞﹂棿绠＄悊\鍚姩鐐规鍗昞Gy_WorkBeginDotCheckListBillList.html" />
@@ -1513,7 +1522,6 @@
<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_MouldMaintainBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱BatchGen_MouldFile.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_BarCodeBill_Out.html" />
@@ -2133,6 +2141,13 @@
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLYS_ReceiveOtherBillMainList.aspx.designer.cs">
<DependentUpon>xmlLYS_ReceiveOtherBillMainList.aspx</DependentUpon>
</Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlSRM_Web_BarCodeBillList.aspx.cs">
+ <DependentUpon>xmlSRM_Web_BarCodeBillList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlSRM_Web_BarCodeBillList.aspx.designer.cs">
+ <DependentUpon>xmlSRM_Web_BarCodeBillList.aspx</DependentUpon>
+ </Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlPM_WorkTaskBillMyList.aspx.cs">
<DependentUpon>xmlPM_WorkTaskBillMyList.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
--
Gitblit v1.9.1