Browse Source

事故单 人民币金额

liuchaohui 2 years ago
parent
commit
3c54c2acaf

+ 6 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/cost/entity/SyCostAllocationAccident.java

@@ -71,6 +71,12 @@ public class SyCostAllocationAccident implements Serializable {
     @Excel(name = "金额", width = 15)
     @ApiModelProperty(value = "金额")
     private java.math.BigDecimal amount;
+
+    /**人民币金额*/
+    @Excel(name = "人民币金额", width = 15)
+    @ApiModelProperty(value = "人民币金额")
+    private java.math.BigDecimal rmbamount;
+
     /**加工单位*/
     @Excel(name = "加工单位", width = 15)
     @ApiModelProperty(value = "加工单位")

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

@@ -17,7 +17,7 @@
 	</select>
 
 	<select id="queryByCostAccident" resultType="org.jeecg.modules.cost.entity.SyCostAllocationAccident">
-		SELECT ah.cPBVCode as accidentNum,ven.cVenAbbName as accidentUndertaker,sum(A.iOriSum) as amount
+		SELECT ah.cPBVCode as accidentNum,ven.cVenAbbName as accidentUndertaker,sum(A.iOriSum) as amount,sum(a.iSum) as rmbamount
 					from UFDATA_901_2021.dbo.PurBillVouchs a
 					left join UFDATA_901_2021.dbo.PurBillVouch ah on ah.pbvid=a.pbvid
 					left join UFDATA_901_2021.dbo.Inventory inv on inv.cInvCode=a.cInvCode
@@ -28,7 +28,7 @@
 
 		union all
 
-		SELECT ah.cPBVCode as accidentNum,ven.cVenAbbName as accidentUndertaker,sum(A.iOriSum) as amount
+		SELECT ah.cPBVCode as accidentNum,ven.cVenAbbName as accidentUndertaker,sum(A.iOriSum) as amount,sum(a.iSum) as rmbamount
 					from UFDATA_902_2021.dbo.PurBillVouchs a
 					left join UFDATA_902_2021.dbo.PurBillVouch ah on ah.pbvid=a.pbvid
 					left join UFDATA_902_2021.dbo.Inventory inv on inv.cInvCode=a.cInvCode
@@ -39,7 +39,7 @@
 
 		union all
 
-		SELECT ah.cPBVCode as accidentNum,ven.cVenAbbName as accidentUndertaker,sum(A.iOriSum) as amount
+		SELECT ah.cPBVCode as accidentNum,ven.cVenAbbName as accidentUndertaker,sum(A.iOriSum) as amount,sum(a.iSum) as rmbamount
 					from UFDATA_903_2021.dbo.PurBillVouchs a
 					left join UFDATA_903_2021.dbo.PurBillVouch ah on ah.pbvid=a.pbvid
 					left join UFDATA_903_2021.dbo.Inventory inv on inv.cInvCode=a.cInvCode