From 10a7fbecf32e40e975754ab2ecbf9545f59d288f Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 06 三月 2024 08:35:29 +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 c9eff34..738fbf0 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -324,6 +324,7 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MaterTypeEdit.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_TemporaryArea.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\HBarPlanPrint_GXPG.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Pay_WorkTimesBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_MyTicke.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlPM_WorkTaskBillMyList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlPM_ProjectBillMainMy.aspx" />
@@ -388,6 +389,8 @@
<Content Include="views\宸ヨ祫绠＄悊\鑰冨嫟姹囨姤鍗昞Pay_WorkTimesSumQueryBillList.html" />
<Content Include="views\宸ヨ祫绠＄悊\璇峰亣鐢宠\Pay_OutApplyBill.html" />
<Content Include="views\宸ヨ祫绠＄悊\璇峰亣鐢宠\Pay_OutApplyBillList.html" />
+ <Content Include="views\搴旀敹绠＄悊\鎶ヨ〃鍒嗘瀽\Xs_CusBalanceReport.html" />
+ <Content Include="views\搴旀敹绠＄悊\鎶ヨ〃鍒嗘瀽\Xs_CusBalanceReport_HIsUsingBalanceEntry.html" />
<Content Include="views\搴旀敹绠＄悊\鎶ヨ〃鍒嗘瀽\YS_ContactBalReport_ImportByExcel.html" />
<Content Include="views\搴旀敹绠＄悊\鎶ヨ〃鍒嗘瀽\YS_ContactBalReport.html" />
<Content Include="views\搴旀敹绠＄悊\鎶ヨ〃鍒嗘瀽\YS_CusShouldIncomeEntryReport.html" />
@@ -399,6 +402,7 @@
<Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿鎶ヨ〃\Sc_MouldMaintainBillMainReport.html" />
<Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿鎶ヨ〃\Sc_MouldRepairWorkBillReport.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_SplitBarCode.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_MaterialMouldBillMainList.html" />
<Content Include="views\鐢熶骇绠＄悊\浣滀笟鎸囧涔Gy_SOPBill_Video.html" />
<Content Include="views\鐢熶骇绠＄悊\宸ュ崟\Sc_MyTicketList.html" />
<Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞Sc_Reply_MESExecptFeedBackBill.html" />
@@ -443,6 +447,9 @@
<Content Include="views\璁″垝绠＄悊\浜х嚎璐ㄦ骞冲彴\Sc_ICMOBillQualityStatus_Tmp.html" />
<Content Include="views\璁″垝绠＄悊\浜х嚎杩斾慨骞冲彴\Sc_SourceLineRepairBill.html" />
<Content Include="views\璁″垝绠＄悊\浜х嚎杩斾慨骞冲彴\Sc_SourceLineRepairBill_ChangeMater.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_MaterialMouldBillMain.html" />
+ <Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_MaterialTechParamBillMainList.html" />
+ <Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_MaterialTechParamBillMain.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBillListQuery.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBillList_His.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBillSubList.html" />
@@ -1580,6 +1587,10 @@
<Content Include="views\閲囪喘绠＄悊\閲囪喘閫�鏂欏崟\Cg_PurchaseReturn_Add_Up.html" />
<Content Include="views\閿�鍞鐞哱淇＄敤棰濆害鐢宠鍗昞Xs_CusRatingChangeBill.html" />
<Content Include="views\閿�鍞鐞哱淇＄敤棰濆害鐢宠鍗昞Xs_CusRatingChangeBillList.html" />
+ <Content Include="views\閿�鍞鐞哱鍏朵粬搴斾粯鍗昞YF_PayMentOtherBillMain.html" />
+ <Content Include="views\閿�鍞鐞哱鍏朵粬搴斾粯鍗昞YF_PayMentOtherBillMainList.html" />
+ <Content Include="views\閿�鍞鐞哱鍏朵粬搴旀敹鍗昞YS_ReceiveOtherBillMain.htmlList.html" />
+ <Content Include="views\閿�鍞鐞哱鍏朵粬搴旀敹鍗昞YS_ReceiveOtherBillMain.html" />
<Content Include="views\閿�鍞鐞哱鍙戣揣閫氱煡鍗昞Add_Edit_Xs_SeOutStockBillList.html" />
<Content Include="views\閲囪喘绠＄悊\搴斾粯閫�娆惧崟\YF_PayMentBackBill.html" />
<Content Include="views\閲囪喘绠＄悊\搴斾粯閫�娆惧崟\YF_PayMentBackBillList.html" />
@@ -1800,6 +1811,13 @@
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_EquipTypeBill.aspx.designer.cs">
<DependentUpon>xmlLBM_EquipTypeBill.aspx</DependentUpon>
</Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Pay_WorkTimesBillList.aspx.cs">
+ <DependentUpon>xmlLBM_Pay_WorkTimesBillList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Pay_WorkTimesBillList.aspx.designer.cs">
+ <DependentUpon>xmlLBM_Pay_WorkTimesBillList.aspx</DependentUpon>
+ </Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_MyTicke.aspx.cs">
<DependentUpon>xmlLBM_Sc_MyTicke.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
--
Gitblit v1.9.1