From 699fd01d1c2b697ebaf3c814270712b7ac2a2477 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 25 一月 2024 10:20:21 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 694df97..aa86f6d 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -121,7 +121,6 @@
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_BadCountDevelopWHList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_BadWHList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_BankList.html" />
- <Content Include="views\Baseset\鍩虹璧勬枡\Gy_ClassTimePrjGroupEdit.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_ClassTimePrjList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_ConveyCompList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_ConveyTypeList.html" />
@@ -307,6 +306,7 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MaterTypeEdit.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_TemporaryArea.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\HBarPlanPrint_GXPG.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlPM_ProjectBillMainMy.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_SellOutBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_SellOutBillList_BarCodeNote.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HPOInStockBackBill.aspx" />
@@ -324,8 +324,12 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Xs_SeOrderBill.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Xs_SeOrderChangeBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairCheckList_PDA.html" />
+ <Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_WorkTypeEdit.html" />
+ <Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_WorkPayTypeEdit.html" />
<Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ClassTimePrjGroupEdit.html" />
<Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ClassTimePrjEdit.html" />
+ <Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_WorkTypeList.html" />
+ <Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_WorkPayTypeList.html" />
<Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ClassTimePrjGroupList.html" />
<Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcCommPrice.html" />
<Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcCommPriceList.html" />
@@ -664,6 +668,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>
@@ -1171,10 +1176,6 @@
<Content Include="views\鍩虹璧勬枡\闅愯棌鍒楄缃甛Gy_GridView_Hide.html" />
<Content Include="views\宸ヨ祫绠＄悊\Gy_DuSubsidyItemBillEdit.html" />
<Content Include="views\宸ヨ祫绠＄悊\Gy_DuSubsidyItemBillList.html" />
- <Content Include="views\宸ヨ祫绠＄悊\Gy_WorkPayTypeBillEdit.html" />
- <Content Include="views\宸ヨ祫绠＄悊\Gy_WorkPayTypeBillList.html" />
- <Content Include="views\宸ヨ祫绠＄悊\Gy_WorkTypeBillEdit.html" />
- <Content Include="views\宸ヨ祫绠＄悊\Gy_WorkTypeBillList.html" />
<Content Include="views\宸ヨ祫绠＄悊\澶栬喘澧欏竷宸ヨ祫\Pay_PurchaseWallclothBillEdit.html" />
<Content Include="views\宸ヨ祫绠＄悊\澶栬喘澧欏竷宸ヨ祫\Pay_PurchaseWallclothBillList.html" />
<Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫鎶ヨ〃\Pay_EmpPayMentSumReport.html" />
@@ -1193,10 +1194,7 @@
<Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫缁撶畻鍗�%28鍏朵粬%29\Pay_OtherBalBillEdit.html" />
<Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫缁撶畻鍗�%28鍏朵粬%29\Pay_OtherBalBillList.html" />
<Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫杩愮畻\Pay_SingleBalBillOperation.html" />
- <Content Include="views\宸ヨ祫绠＄悊\鏍哥畻鏂瑰紡\Gy_ClassTimePrjGroupBillList.html" />
<Content Include="views\宸ヨ祫绠＄悊\鏍哥畻鏂瑰紡\Gy_ClassTimePrjSubBillEdit.html" />
- <Content Include="views\宸ヨ祫绠＄悊\鏍哥畻鏂瑰紡\Gy_ClassTimePrjBillEdit.html" />
- <Content Include="views\宸ヨ祫绠＄悊\鏍哥畻鏂瑰紡\Gy_ClassTimePrjBillList.html" />
<Content Include="views\宸ヨ祫绠＄悊\鏍哥畻鏂瑰紡\Gy_ClassTimePrjSubBillList.html" />
<Content Include="views\宸ヨ祫绠＄悊\鐝粍鑱屽憳娓呭崟\Gy_GroupEmpBillEdit.html" />
<Content Include="views\宸ヨ祫绠＄悊\鐝粍鑱屽憳娓呭崟\Gy_GroupEmpBillList.html" />
@@ -1747,6 +1745,13 @@
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_EquipTypeBill.aspx.designer.cs">
<DependentUpon>xmlLBM_EquipTypeBill.aspx</DependentUpon>
</Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlPM_ProjectBillMainMy.aspx.cs">
+ <DependentUpon>xmlPM_ProjectBillMainMy.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlPM_ProjectBillMainMy.aspx.designer.cs">
+ <DependentUpon>xmlPM_ProjectBillMainMy.aspx</DependentUpon>
+ </Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_SellOutBillList.aspx.cs">
<DependentUpon>xmlLBM_Kf_SellOutBillList.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
--
Gitblit v1.9.1