1. #95271 套保品关联的停用现货品不显示

2.财务报表、汇总损益表加账号名称字段

docs/docs.go

@@ -6800,7 +6800,7 @@ var doc = `{
                 "tags": [
                     "大连千海金"
                 ],
-                "summary": "查询融资明细流水(融资明细详情)",
+                "summary": "查询融资明细流水(融资明细详情页中的流水)",
                 "parameters": [
                     {
                         "type": "integer",
@@ -13093,6 +13093,10 @@ var doc = `{
         "models.Ermcp3ArealSumPL": {
             "type": "object",
             "properties": {
+                "accountname": {
+                    "description": "机构名称",
+                    "type": "string"
+                },
                 "areauserid": {
                     "description": "所属机构\\交易用户ID",
                     "type": "integer"
@@ -13964,6 +13968,10 @@ var doc = `{
         "models.Ermcp3FinanceReport": {
             "type": "object",
             "properties": {
+                "accountname": {
+                    "description": "机构名称",
+                    "type": "string"
+                },
                 "areauserid": {
                     "description": "所属机构\\交易用户ID",
                     "type": "integer"

docs/swagger.json

@@ -6784,7 +6784,7 @@
                 "tags": [
                     "大连千海金"
                 ],
-                "summary": "查询融资明细流水(融资明细详情)",
+                "summary": "查询融资明细流水(融资明细详情页中的流水)",
                 "parameters": [
                     {
                         "type": "integer",
@@ -13077,6 +13077,10 @@
         "models.Ermcp3ArealSumPL": {
             "type": "object",
             "properties": {
+                "accountname": {
+                    "description": "机构名称",
+                    "type": "string"
+                },
                 "areauserid": {
                     "description": "所属机构\\交易用户ID",
                     "type": "integer"
@@ -13948,6 +13952,10 @@
         "models.Ermcp3FinanceReport": {
             "type": "object",
             "properties": {
+                "accountname": {
+                    "description": "机构名称",
+                    "type": "string"
+                },
                 "areauserid": {
                     "description": "所属机构\\交易用户ID",
                     "type": "integer"

docs/swagger.yaml

@@ -3669,6 +3669,9 @@ definitions:
     type: object
   models.Ermcp3ArealSumPL:
     properties:
+      accountname:
+        description: 机构名称
+        type: string
       areauserid:
         description: 所属机构\交易用户ID
         type: integer
@@ -4317,6 +4320,9 @@ definitions:
     type: object
   models.Ermcp3FinanceReport:
     properties:
+      accountname:
+        description: 机构名称
+        type: string
       areauserid:
         description: 所属机构\交易用户ID
         type: integer
@@ -15955,7 +15961,7 @@ paths:
             $ref: '#/definitions/app.Response'
       security:
       - ApiKeyAuth: []
-      summary: 查询融资明细流水(融资明细详情)
+      summary: 查询融资明细流水(融资明细详情页中的流水)
       tags:
       - 大连千海金
   /Quote/QueryHistoryDatas:

models/ermcp3.go

@@ -420,7 +420,7 @@ func (r *Ermcp3MiddleGoodsDetailEx) addDgList(dglst []ErmcpDeliveryGoodsDetail,
 	for i := range wc {
 		if wc[i].MIDDLEGOODSID == int64(r.Mg.MIDDLEGOODSID) {
 			for _, detail := range dglst {
-				if wc[i].DELIVERYGOODSID == detail.Data.DELIVERYGOODSID {
+				if wc[i].DELIVERYGOODSID == detail.Data.DELIVERYGOODSID && detail.Data.ISVALID == 1 {
 					val := ErmcpDeliveryGoodsDetail2{ErmcpDeliveryGoodsDetail: detail, CONVERTRATIO: wc[i].CONVERTRATIO}
 					r.DgList = append(r.DgList, val)
 				}

models/ermcp3Report.go

@@ -618,7 +618,7 @@ func (r *Ermcp3ExpourseReport) buildSqlCycle() string {
 		"       g.middlegoodsname," +
 		"       g.middlegoodscode," +
 		"       g.goodsunitid unitid," +
-		"       g.needhedgeratio," +
+		"       g.needhedgeratio MGNEEDHEDGERATIO," +
 		"       g.needarbitrageratio" +
 		"  FROM REPORT_ERMCP_AREAEXPOSURE t" +
 		"  LEFT JOIN ERMS_MIDDLEGOODS g" +
@@ -1154,6 +1154,7 @@ type Ermcp3FinanceReport struct {
 	WRSTANDARDNAME         string  `json:"wrstandardname"  xorm:"'WRSTANDARDNAME'"`               // 品类名称
 	BRANDNAME              string  `json:"brandname"  xorm:"'BRANDNAME'"`                         // 品牌名称
 
+	ACCOUNTNAME  string `json:"accountname"`  // 机构名称
 	CURRENCYNAME string `json:"currencyname"` // 币种名称
 	QueryType    int32  `json:"-"`            // 查询类型 1-报表 2-报表明细
 	BeginDate    string `json:"begindate"`    // 开始交易日
@@ -1162,6 +1163,7 @@ type Ermcp3FinanceReport struct {
 
 func (r *Ermcp3FinanceReport) calc() {
 	r.CURRENCYNAME = mtpcache.GetCurrencyName(r.CURRENCYID)
+	r.ACCOUNTNAME = mtpcache.GetUserNameByUserId(r.AREAUSERID)
 }
 
 func (r *Ermcp3FinanceReport) buildSql() string {
@@ -1689,6 +1691,7 @@ type Ermcp3ArealSumPL struct {
 	MIDDLEGOODSCODE string  `json:"middlegoodscode"  xorm:"'MIDDLEGOODSCODE'"` // 套保品种代码
 	GOODSUNITID     int32   `json:"goodsunitid"  xorm:"'GOODSUNITID'"`         // 套保品种单位id
 
+	ACCOUNTNAME  string `json:"accountname"`  // 机构名称
 	ENUMDICNAME  string `json:"enumdicname"`  // 单位名称(套保品种)
 	CURRENCYNAME string `json:"currencyname"` // 币种名称
 	QueryType    int32  `json:"-"`            // 查询类型 1-报表 2-报表明细
@@ -1699,6 +1702,7 @@ type Ermcp3ArealSumPL struct {
 func (r *Ermcp3ArealSumPL) calc() {
 	r.CURRENCYNAME = mtpcache.GetCurrencyName(r.CURRENCYID)
 	r.ENUMDICNAME = mtpcache.GetEnumDicitemName(r.GOODSUNITID)
+	r.ACCOUNTNAME = mtpcache.GetUserNameByUserId(r.AREAUSERID)
 }
 
 func (r *Ermcp3ArealSumPL) buildSql() string {