查现货订单增加折算系数字段

docs/docs.go

@@ -22293,6 +22293,10 @@ var doc = `{
                     "description": "合同类型 1:采购 -1:销售",
                     "type": "integer"
                 },
+                "convertratio": {
+                    "description": "折算系数",
+                    "type": "number"
+                },
                 "customername": {
                     "description": "对手手名称",
                     "type": "string"

docs/swagger.json

@@ -22277,6 +22277,10 @@
                     "description": "合同类型 1:采购 -1:销售",
                     "type": "integer"
                 },
+                "convertratio": {
+                    "description": "折算系数",
+                    "type": "number"
+                },
                 "customername": {
                     "description": "对手手名称",
                     "type": "string"

docs/swagger.yaml

@@ -6132,6 +6132,9 @@ definitions:
       contracttype:
         description: 合同类型 1:采购 -1:销售
         type: integer
+      convertratio:
+        description: 折算系数
+        type: number
       customername:
         description: 对手手名称
         type: string

models/ermcp3.go

@@ -3057,6 +3057,7 @@ type Ermcp3SCMiddleGoods struct {
 	DELIVERYGOODSNAME     string  `json:"deliverygoodsname"  xorm:"'DELIVERYGOODSNAME'"`                 //	现货品种名称
 	ENUMDICNAME           string  `json:"enumdicname"  xorm:"'ENUMDICNAME'"`                             // 现货单位名称
 	BIZTYPE               int     `json:"biztype"  xorm:"'BIZTYPE'" form:"biztype"`                      // 业务类型 1:套保 2:套利
+	CONVERTRATIO          float64 `json:"convertratio"  xorm:"'CONVERTRATIO'"`                           // 折算系数
 
 	BUYORSELL    int32 `json:"-" form:"buyorsell"`    // 买卖方向, 用作筛选
 	GOODSGROUPID int32 `json:"-" form:"goodsgroupid"` // 期货商品组id, 用作筛选
@@ -3097,7 +3098,8 @@ select s.userid,
        dg.deliverygoodsid,
        dg.deliverygoodscode,
        dg.deliverygoodsname,
-       e.enumdicname
+       e.enumdicname,
+       tmp.convertratio
   from ermcp_scmiddlegoods t
  inner join ermcp_spotcontract s
     on t.spotcontractid = s.spotcontractid
@@ -3109,9 +3111,8 @@ select s.userid,
   left join useraccount u1
     on s.customeruserid = u1.userid
   left join enumdicitem e on w.unitid=e.enumitemname and e.enumdiccode='goodsunit'
+  inner join tmp on t.middlegoodsid=tmp.middlegoodsid and tmp.srcgoodsgroupid = %v
  where 1 = 1 and t.middlegoodspricedqty3 > t.relatedmiddlegoodsqty and s.contractstatus = 2
-   and t.middlegoodsid in
-       (select middlegoodsid from tmp where tmp.srcgoodsgroupid = %v)
 `
 	sqlId.FormatParam(r.GOODSGROUPID)
 	if r.BUYORSELL == 0 {