From 95dde39e2637a71f30c54d3db6c00623191bbd9e Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期四, 30 九月 2021 12:31:10 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/WebTM.csproj | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 723b596..0024f8f 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -523,6 +523,7 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Currency.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_Material.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_DepartmentList.html" />
+ <Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcPriceList.html" />
<Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_Group_Add_Edit.html" />
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Add_Edit_Gy_Process.html" />
<Content Include="views\鍩虹璧勬枡\閲囪喘鍩虹璧勬枡\Gy_Supplier_Edit.html" />
@@ -552,9 +553,14 @@
<Content Include="views\鍩虹璧勬枡\杈呭姪鍩虹璧勬枡\Sb_Add_MaintenanceMode.html" />
<Content Include="views\鍩虹璧勬枡\閲囪喘鍩虹璧勬枡\Gy_Supplier.html" />
<Content Include="views\鍩虹璧勬枡\閿�鍞熀纭�璧勬枡\Gy_Customer.html" />
- <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫缁撶畻鍗�%28涓汉%29\Kf_BarCodeEditDlg.html" />
- <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫缁撶畻鍗�%28鍏朵粬%29\Kf_BarCodeEditDlg.html" />
- <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫缁撶畻鍗�%28闆嗕綋%29\Kf_BarCodeEditDlg.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\宸ヨ祫绠＄悊\宸ヨ祫缁撶畻鍗�%28涓汉%29\Pay_SingleBalBill.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫缁撶畻鍗�%28涓汉%29\Pay_SingleBalBillList.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫缁撶畻鍗�%28涓汉%29\Pay_SingleBalBill.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫缁撶畻鍗�%28鍏朵粬%29\Pay_OtherBalBill.html" />
<Content Include="views\宸ヨ祫绠＄悊\鑰冨嫟姹囨姤鍗昞Kf_BarCodeEditDlg.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿澶勭悊鍑哄簱鍗昞Sc_MouldScrapOutBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿瀵垮懡璋冩暣鍗昞Sc_MouldLifeChangeBill_PDA.html" />
@@ -572,7 +578,10 @@
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldProdInBillEdit.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldProdInBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldProdMoveBill.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldRepairChangeBillEdit.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldRepairChangeBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldRepairInBillEdit.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldRepairOutBillEdit.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldRepairOutBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldRepairInBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldScrapInBill_PDA.html" />
@@ -818,6 +827,7 @@
<ItemGroup>
<Folder Include="views\浠撳瓨绠＄悊\璋冩嫧鍗曟牳瀵筡" />
<Folder Include="views\浠撳瓨绠＄悊\璋冩嫧鍗曠ń鏍竆" />
+ <Folder Include="views\宸ヨ祫绠＄悊\宸ヨ祫缁撶畻鍗�%28闆嗕綋%29\" />
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
--
Gitblit v1.9.1