From 6cc377411a24d8670df93fec5d0ade664e7c5e2f Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期三, 13 三月 2024 10:36:19 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index b1d6161..3e5d980 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -268,6 +268,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" />
@@ -327,6 +328,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" />
@@ -369,6 +371,14 @@
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_DisposeWayList.html" />
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_ScrapReasonList.html" />
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_Souce_Excel.html" />
+ <Content Include="views\鍩虹璧勬枡\璁惧鍩虹璧勬枡\Gy_CardAddress.html" />
+ <Content Include="views\鍩虹璧勬枡\璁惧鍩虹璧勬枡\Gy_CardChangeType.html" />
+ <Content Include="views\鍩虹璧勬枡\璁惧鍩虹璧勬枡\Gy_CardStatus.html" />
+ <Content Include="views\鍩虹璧勬枡\璁惧鍩虹璧勬枡\Gy_CardChangeTypeList.html" />
+ <Content Include="views\鍩虹璧勬枡\璁惧鍩虹璧勬枡\Gy_CardType.html" />
+ <Content Include="views\鍩虹璧勬枡\璁惧鍩虹璧勬枡\Gy_CardAddressList.html" />
+ <Content Include="views\鍩虹璧勬枡\璁惧鍩虹璧勬枡\Gy_CardStatusList.html" />
+ <Content Include="views\鍩虹璧勬枡\璁惧鍩虹璧勬枡\Gy_CardTypeList.html" />
<Content Include="views\鍩虹璧勬枡\闅愯棌鍒楄缃甛Gy_QueryCondition.html" />
<Content Include="views\宸ヨ祫绠＄悊\鍔犵彮鐢宠\Pay_OverApplyBill.html" />
<Content Include="views\宸ヨ祫绠＄悊\鍔犵彮鐢宠\Pay_OverApplyBillList.html" />
@@ -391,6 +401,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" />
@@ -404,6 +416,7 @@
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_SplitBarCode.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_MaterialMouldBillMainList.html" />
<Content Include="views\鐢熶骇绠＄悊\浣滀笟鎸囧涔Gy_SOPBill_Video.html" />
+ <Content Include="views\鐢熶骇绠＄悊\宸ュ崟\Sc_CurrentTicket.html" />
<Content Include="views\鐢熶骇绠＄悊\宸ュ崟\Sc_MyTicketList.html" />
<Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞Sc_Reply_MESExecptFeedBackBill.html" />
<Content Include="views\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫浜ч噺姹囨姤\Sc_ICMOBillQualityStatus_TmpList.html" />
@@ -479,6 +492,7 @@
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_ProductQtyWarningReport.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_QualityTraceabilityReport.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_ProdBadReasonStatistics_Sum.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\棣栦欢妫�楠屽崟\MES_ColorRecordBillList_PDA.html" />
<Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯\BadQueryReport.html" />
<Content Include="views\璐ㄩ噺绠＄悊\棣栦欢妫�楠屽崟\QC_Add_Edit_FirstPieceCheckBill - 澶嶅埗.html" />
<Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯\Cj_CollectionOfSingleProductDefects.html" />
@@ -707,6 +721,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>
@@ -1586,7 +1601,9 @@
<Content Include="views\閲囪喘绠＄悊\閲囪喘閫�鏂欏崟\Cg_PurchaseReturn_Add_Up.html" />
<Content Include="views\閿�鍞鐞哱淇＄敤棰濆害鐢宠鍗昞Xs_CusRatingChangeBill.html" />
<Content Include="views\閿�鍞鐞哱淇＄敤棰濆害鐢宠鍗昞Xs_CusRatingChangeBillList.html" />
- <Content Include="views\閿�鍞鐞哱鍏朵粬搴旀敹鍗昞YS_ReceiveOtherBillMain.htmlList.html" />
+ <Content Include="views\閿�鍞鐞哱鍏朵粬搴斾粯鍗昞YF_PayMentOtherBillMain.html" />
+ <Content Include="views\閿�鍞鐞哱鍏朵粬搴斾粯鍗昞YF_PayMentOtherBillMainList.html" />
+ <Content Include="views\閿�鍞鐞哱鍏朵粬搴旀敹鍗昞YS_ReceiveOtherBillMainList.html" />
<Content Include="views\閿�鍞鐞哱鍏朵粬搴旀敹鍗昞YS_ReceiveOtherBillMain.html" />
<Content Include="views\閿�鍞鐞哱鍑洪棬纭鍗昞Xs_OutDoorCheckBillList.html" />
<Content Include="views\閿�鍞鐞哱鍙戣揣閫氱煡鍗昞Add_Edit_Xs_SeOutStockBillList.html" />
@@ -1607,6 +1624,8 @@
<Content Include="views\閿�鍞鐞哱閿�鍞鍗昞Xs_SeOrderBillDyColList.html" />
<Content Include="views\閿�鍞鐞哱閿�鍞鍗曞彉鏇村崟\Xs_SeOrderChangeBill.html" />
<Content Include="views\閿�鍞鐞哱閿�鍞鍗曞彉鏇村崟\Xs_SeOrderChangeBillList.html" />
+ <Content Include="views\閿�鍞鐞哱閿�鍞皟浠峰崟\Xs_SellOutChangeBill.html" />
+ <Content Include="views\閿�鍞鐞哱閿�鍞皟浠峰崟\Xs_SellOutChangeBillList.html" />
<Content Include="views\閿�鍞鐞哱閿�鍞��璐у崟\Add_Edit_Kf_ICStockBillMainList.html" />
<Content Include="views\閿�鍞鐞哱閿�鍞��璐у崟\Kf_ICStockBackBill.html" />
<Content Include="views\閿�鍞鐞哱閿�鍞��璐у崟\Kf_ICStockBackBillList.html" />
@@ -1823,6 +1842,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