Merge branch 'master' of 192.168.30.132:MTP2.0/MTP20_IF

docs/docs.go

@@ -22173,6 +22173,10 @@ var doc = `{
                     "description": "套保计划量 = TodayPricedQty * 折算系数 * (1/(1+增值税率)) * 套保比例",
                     "type": "number"
                 },
+                "matchnickname": {
+                    "description": "交易对手方简称",
+                    "type": "string"
+                },
                 "mathname": {
                     "description": "交易对手方",
                     "type": "string"

docs/swagger.json

@@ -22157,6 +22157,10 @@
                     "description": "套保计划量 = TodayPricedQty * 折算系数 * (1/(1+增值税率)) * 套保比例",
                     "type": "number"
                 },
+                "matchnickname": {
+                    "description": "交易对手方简称",
+                    "type": "string"
+                },
                 "mathname": {
                     "description": "交易对手方",
                     "type": "string"

docs/swagger.yaml

@@ -6189,6 +6189,9 @@ definitions:
       hedgeplanqty:
         description: 套保计划量 = TodayPricedQty * 折算系数 * (1/(1+增值税率)) * 套保比例
         type: number
+      matchnickname:
+        description: 交易对手方简称
+        type: string
       mathname:
         description: 交易对手方
         type: string

models/ermcp3Report.go

@@ -2892,6 +2892,7 @@ type Ermcp3SCMiddleGoodsReport struct {
 	CONTRACTNO        string   `json:"contractno"  xorm:"'CONTRACTNO'"`               // 合同编号
 	CONTRACTTYPE      int32    `json:"contracttype"  xorm:"'CONTRACTTYPE'"`           // 合同类型 1：采购 -1：销售
 	MATHNAME          string   `json:"mathname"  xorm:"'MATHNAME'"`                   // 交易对手方
+	MATCHNICKNAME     string   `json:"matchnickname"  xorm:"'MATCHNICKNAME'"`         // 交易对手方简称
 	DELIVERYGOODSCODE string   `json:"deliverygoodscode"  xorm:"'DELIVERYGOODSCODE'"` // 品种代码
 	DELIVERYGOODSNAME string   `json:"deliverygoodsname"  xorm:"'DELIVERYGOODSNAME'"` // 品种名称
 	WRSTANDARDCODE    string   `json:"wrstandardcode"  xorm:"'WRSTANDARDCODE'"`       // 商品(品类) 代码
@@ -2969,6 +2970,7 @@ select t.reckondate,
        s.contractno,
        s.contracttype,
        u.accountname mathname,
+       ui.nickname matchnickname,
        g.deliverygoodscode,
        g.deliverygoodsname,
        w.wrstandardcode,
@@ -2983,6 +2985,7 @@ select t.reckondate,
     on t.spotcontractid = s.spotcontractid
   left join useraccount u
     on u.userid = (decode(s.contracttype, 1, s.selluserid, s.buyuserid))
+  left join userinfo ui on u.userid=ui.userid
   left join deliverygoods g
     on t.deliverygoodsid = g.deliverygoodsid
   left join wrstandard w

models/ermcpExposure.go

@@ -951,7 +951,7 @@ func (r *ErmcpMiddlegoodsRelateGoods) buildSql() string {
 		"    on t.goodsgroupid = c.destgoodsgroupid" +
 		" inner join goods g" +
 		"    on g.goodsgroupid = c.srcgoodsgroupid" +
-		" where 1 = 1 and g.goodsid in (select goodsid from tmp)"
+		" where 1 = 1 and g.goodsstatus = 3 and g.goodsid in (select goodsid from tmp)"
 	sqlId.And("t.MIDDLEGOODSID", r.MIDDLEGOODSID)
 	return sqlId.String()
 }