Ver Fonte

成本报表 费用支出单 项目名

liuchaohui há 1 ano atrás
pai
commit
72d6d00f28

+ 6 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/cost/mapper/xml/SyCostAllocationCostpayMapper.xml

@@ -21,13 +21,14 @@
 		sp.cSPVCode as disbursementSlipNo,
 		sp.cDefine10 as invoicenum,
 		sp.cMaker as preparedBy,
-		sps.cExpCode as expenseItem,
+		ex.cExpName as expenseItem,
 		sps.INatMoney as disbursedLocalmoney,
 		v.cVenName as processUnit,
 		sps.iMoney as disbursedOriginalmoney
 		FROM
 		UFDATA_101_2021.dbo.SalePayVouch sp
 		INNER JOIN UFDATA_101_2021.dbo.SalePayVouchs sps ON sp.id = sps.id
+		INNER JOIN UFDATA_101_2021.dbo.ExpenseItem ex on sps.cExpCode=ex.cExpCode
 		LEFT JOIN UFDATA_101_2021.dbo.Vendor v ON sp.cvencode= v.cVenCode
 		where sp.cSOCode
 		in (
@@ -44,13 +45,14 @@
 				 sp.cSPVCode as disbursementSlipNo,
 				 sp.cDefine10 as invoicenum,
 				 sp.cMaker as preparedBy,
-				 sps.cExpCode as expenseItem,
+				 ex.cExpName as expenseItem,
 				 sps.INatMoney as disbursedLocalmoney,
 				 v.cVenName as processUnit,
 				 sps.iMoney as disbursedOriginalmoney
 			 FROM
 				 UFDATA_102_2021.dbo.SalePayVouch sp
 				 INNER JOIN UFDATA_102_2021.dbo.SalePayVouchs sps ON sp.id = sps.id
+				 INNER JOIN UFDATA_102_2021.dbo.ExpenseItem ex on sps.cExpCode=ex.cExpCode
 				 LEFT JOIN UFDATA_102_2021.dbo.Vendor v ON sp.cvencode= v.cVenCode
 				 where sp.cSOCode
 			 in (
@@ -67,13 +69,14 @@
 				 sp.cSPVCode as disbursementSlipNo,
 				 sp.cDefine10 as invoicenum,
 				 sp.cMaker as preparedBy,
-				 sps.cExpCode as expenseItem,
+				 ex.cExpName as expenseItem,
 				 sps.INatMoney as disbursedLocalmoney,
 				 v.cVenName as processUnit,
 				 sps.iMoney as disbursedOriginalmoney
 			 FROM
 				 UFDATA_103_2021.dbo.SalePayVouch sp
 				 INNER JOIN UFDATA_103_2021.dbo.SalePayVouchs sps ON sp.id = sps.id
+				 INNER JOIN UFDATA_103_2021.dbo.ExpenseItem ex on sps.cExpCode=ex.cExpCode
 				 LEFT JOIN UFDATA_103_2021.dbo.Vendor v ON sp.cvencode= v.cVenCode
 				 where sp.cSOCode
 			 in (