From 095c64b1766f5ecfbc94d36525fc2a957f092fad Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 12 三月 2024 16:54:31 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index d727ed4..5e985fb 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -267,6 +267,7 @@
<Content Include="views\WMS鎵爜妯″潡\閿�鍞嚭搴揬Kf_SellOutBill_QiaoYi_PDA.html" />
<Content Include="views\浜轰簨绠＄悊\寮傚父鍙嶉鍗昞OA_ErrMsgBackBillList_PDA.html" />
<Content Include="views\浜轰簨绠＄悊\寮傚父鍙嶉鍗昞OA_ErrMsgBackBill_PDA.html" />
+ <Content Include="views\浠撳瓨绠＄悊\鍒嗘寮忚皟鍏ュ崟\Fb_StepFoldinBillEdit.html" />
<Content Include="views\浠撳瓨绠＄悊\鏉＄爜搴撳瓨\KF_PonderationBillMain_Temp.html" />
<Content Include="views\浠撳瓨绠＄悊\鏉＄爜鎶ヨ〃\Kf_MaterOutInReport.html" />
<Content Include="views\浠撳瓨绠＄悊\鏉＄爜鎶ヨ〃\Kf_ICInventory_Mater.html" />
@@ -326,6 +327,7 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\HBarPlanPrint_GXPG.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Pay_WorkTimesBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_MyTicke.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLYS_ReceiveOtherBillMainList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlPM_WorkTaskBillMyList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlPM_ProjectBillMainMy.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_SellOutBillList.aspx" />
@@ -717,6 +719,7 @@
<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>
@@ -1598,7 +1601,7 @@
<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_ReceiveOtherBillMainList.html" />
<Content Include="views\閿�鍞鐞哱鍏朵粬搴旀敹鍗昞YS_ReceiveOtherBillMain.html" />
<Content Include="views\閿�鍞鐞哱鍙戣揣閫氱煡鍗昞Add_Edit_Xs_SeOutStockBillList.html" />
<Content Include="views\閲囪喘绠＄悊\搴斾粯閫�娆惧崟\YF_PayMentBackBill.html" />
@@ -1836,6 +1839,13 @@
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_MyTicke.aspx.designer.cs">
<DependentUpon>xmlLBM_Sc_MyTicke.aspx</DependentUpon>
</Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLYS_ReceiveOtherBillMainList.aspx.cs">
+ <DependentUpon>xmlLYS_ReceiveOtherBillMainList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLYS_ReceiveOtherBillMainList.aspx.designer.cs">
+ <DependentUpon>xmlLYS_ReceiveOtherBillMainList.aspx</DependentUpon>
+ </Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlPM_WorkTaskBillMyList.aspx.cs">
<DependentUpon>xmlPM_WorkTaskBillMyList.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
--
Gitblit v1.9.1