查商品信息增加套保系数字段

docs/docs.go

@@ -13367,6 +13367,14 @@ var doc = `{
                     "description": "现货品种名称",
                     "type": "string"
                 },
+                "enumdicname": {
+                    "description": "单位名称",
+                    "type": "string"
+                },
+                "goodsunitid": {
+                    "description": "现货品种单位id",
+                    "type": "integer"
+                },
                 "increaseqty": {
                     "description": "增加数量=销售计划数量+采购已定价数量",
                     "type": "number"
@@ -14398,9 +14406,13 @@ var doc = `{
                 }
             }
         },
-        "models.Ermcp3MiddleGoodsDetail": {
+        "models.Ermcp3MiddleGoodsDetail2": {
             "type": "object",
             "properties": {
+                "convertratio": {
+                    "description": "套保系数(折算系数)",
+                    "type": "number"
+                },
                 "gplist": {
                     "description": "关联商品组列表",
                     "type": "array",
@@ -14422,7 +14434,7 @@ var doc = `{
                     "description": "关联的现货品种列表",
                     "type": "array",
                     "items": {
-                        "$ref": "#/definitions/models.ErmcpDeliveryGoodsDetail"
+                        "$ref": "#/definitions/models.ErmcpDeliveryGoodsDetail2"
                     }
                 },
                 "gplist": {
@@ -15912,9 +15924,13 @@ var doc = `{
                 }
             }
         },
-        "models.ErmcpDeliveryGoodsDetail": {
+        "models.ErmcpDeliveryGoodsDetail2": {
             "type": "object",
             "properties": {
+                "convertratio": {
+                    "description": "套保系数(折算系数)",
+                    "type": "number"
+                },
                 "data": {
                     "description": "现货商品基本信息(交割品种)",
                     "type": "object",
@@ -15962,7 +15978,7 @@ var doc = `{
                     "description": "套保列表",
                     "type": "array",
                     "items": {
-                        "$ref": "#/definitions/models.Ermcp3MiddleGoodsDetail"
+                        "$ref": "#/definitions/models.Ermcp3MiddleGoodsDetail2"
                     }
                 }
             }

docs/swagger.json

@@ -13351,6 +13351,14 @@
                     "description": "现货品种名称",
                     "type": "string"
                 },
+                "enumdicname": {
+                    "description": "单位名称",
+                    "type": "string"
+                },
+                "goodsunitid": {
+                    "description": "现货品种单位id",
+                    "type": "integer"
+                },
                 "increaseqty": {
                     "description": "增加数量=销售计划数量+采购已定价数量",
                     "type": "number"
@@ -14382,9 +14390,13 @@
                 }
             }
         },
-        "models.Ermcp3MiddleGoodsDetail": {
+        "models.Ermcp3MiddleGoodsDetail2": {
             "type": "object",
             "properties": {
+                "convertratio": {
+                    "description": "套保系数(折算系数)",
+                    "type": "number"
+                },
                 "gplist": {
                     "description": "关联商品组列表",
                     "type": "array",
@@ -14406,7 +14418,7 @@
                     "description": "关联的现货品种列表",
                     "type": "array",
                     "items": {
-                        "$ref": "#/definitions/models.ErmcpDeliveryGoodsDetail"
+                        "$ref": "#/definitions/models.ErmcpDeliveryGoodsDetail2"
                     }
                 },
                 "gplist": {
@@ -15896,9 +15908,13 @@
                 }
             }
         },
-        "models.ErmcpDeliveryGoodsDetail": {
+        "models.ErmcpDeliveryGoodsDetail2": {
             "type": "object",
             "properties": {
+                "convertratio": {
+                    "description": "套保系数(折算系数)",
+                    "type": "number"
+                },
                 "data": {
                     "description": "现货商品基本信息(交割品种)",
                     "type": "object",
@@ -15946,7 +15962,7 @@
                     "description": "套保列表",
                     "type": "array",
                     "items": {
-                        "$ref": "#/definitions/models.Ermcp3MiddleGoodsDetail"
+                        "$ref": "#/definitions/models.Ermcp3MiddleGoodsDetail2"
                     }
                 }
             }

docs/swagger.yaml

@@ -3089,6 +3089,12 @@ definitions:
       deliverygoodsname:
         description: 现货品种名称
         type: string
+      enumdicname:
+        description: 单位名称
+        type: string
+      goodsunitid:
+        description: 现货品种单位id
+        type: integer
       increaseqty:
         description: 增加数量=销售计划数量+采购已定价数量
         type: number
@@ -3852,8 +3858,11 @@ definitions:
         description: 更新时间
         type: string
     type: object
-  models.Ermcp3MiddleGoodsDetail:
+  models.Ermcp3MiddleGoodsDetail2:
     properties:
+      convertratio:
+        description: 套保系数(折算系数)
+        type: number
       gplist:
         description: 关联商品组列表
         items:
@@ -3869,7 +3878,7 @@ definitions:
       dglist:
         description: 关联的现货品种列表
         items:
-          $ref: '#/definitions/models.ErmcpDeliveryGoodsDetail'
+          $ref: '#/definitions/models.ErmcpDeliveryGoodsDetail2'
         type: array
       gplist:
         description: 关联商品组列表
@@ -4971,8 +4980,11 @@ definitions:
         description: 标准数量偏差范围 [标准品特有]
         type: integer
     type: object
-  models.ErmcpDeliveryGoodsDetail:
+  models.ErmcpDeliveryGoodsDetail2:
     properties:
+      convertratio:
+        description: 套保系数(折算系数)
+        type: number
       data:
         $ref: '#/definitions/models.ErmcpDeliveryGoods'
         description: 现货商品基本信息(交割品种)
@@ -5007,7 +5019,7 @@ definitions:
       mgList:
         description: 套保列表
         items:
-          $ref: '#/definitions/models.Ermcp3MiddleGoodsDetail'
+          $ref: '#/definitions/models.Ermcp3MiddleGoodsDetail2'
         type: array
     type: object
   models.ErmcpExposureDetailModel:

models/ermcp3.go

@@ -199,6 +199,12 @@ func (r *ErmcpRelatedGoods) GetData() ([]ErmcpRelatedGoods, error) {
 	return sData, err
 }
 
+// ErmcpDeliveryGoodsDetail2 现货商品详情(含转换系数)
+type ErmcpDeliveryGoodsDetail2 struct {
+	ErmcpDeliveryGoodsDetail
+	CONVERTRATIO float64 `json:"convertratio"  xorm:"'CONVERTRATIO'"` // 套保系数(折算系数)
+}
+
 // ErmcpDeliveryGoodsDetail 现货商品详情
 type ErmcpDeliveryGoodsDetail struct {
 	Data   ErmcpDeliveryGoods `json:"data"`   // 现货商品基本信息(交割品种)
@@ -262,7 +268,7 @@ func (r *ErmcpDeliveryGoodsDetail) GetDataEx() (interface{}, error) {
 // ErmcpDeliveryGoodsDetailEx 现货商品详情(含套保列表)
 type ErmcpDeliveryGoodsDetailEx struct {
 	ErmcpDeliveryGoodsDetail
-	MgList []Ermcp3MiddleGoodsDetail `json:"mgList"` // 套保列表
+	MgList []Ermcp3MiddleGoodsDetail2 `json:"mgList"` // 套保列表
 }
 
 // GetData 获取现货商品详情(含套保信息列表)
@@ -273,7 +279,7 @@ func (r *ErmcpDeliveryGoodsDetailEx) GetDataEx() (interface{}, error) {
 	if dgList, err := mDg.GetData(); err == nil {
 		for i := range dgList {
 			sData = append(sData, ErmcpDeliveryGoodsDetailEx{ErmcpDeliveryGoodsDetail: dgList[i],
-				MgList: make([]Ermcp3MiddleGoodsDetail, 0)})
+				MgList: make([]Ermcp3MiddleGoodsDetail2, 0)})
 		}
 	}
 	if len(sData) == 0 {
@@ -301,13 +307,20 @@ func (r *ErmcpDeliveryGoodsDetailEx) addMgList(lst []Ermcp3MiddleGoodsDetail, wc
 		if r.Data.DELIVERYGOODSID == wc[i].DELIVERYGOODSID {
 			for k := range lst {
 				if int64(lst[k].Mg.MIDDLEGOODSID) == wc[i].MIDDLEGOODSID {
-					r.MgList = append(r.MgList, lst[k])
+					val := Ermcp3MiddleGoodsDetail2{Ermcp3MiddleGoodsDetail: lst[k], CONVERTRATIO: wc[i].CONVERTRATIO}
+					r.MgList = append(r.MgList, val)
 				}
 			}
 		}
 	}
 }
 
+// Ermcp3MiddleGoodsDetail2 套保品种详情(含转换系数)
+type Ermcp3MiddleGoodsDetail2 struct {
+	Ermcp3MiddleGoodsDetail
+	CONVERTRATIO float64 `json:"convertratio"  xorm:"'CONVERTRATIO'"` // 套保系数(折算系数)
+}
+
 // Ermcp3MiddleGoodsDetail 套保品种详情
 type Ermcp3MiddleGoodsDetail struct {
 	Mg     ErmcpMiddleGoodsModel `json:"mg"`     // 套保商品信息
@@ -387,7 +400,7 @@ func (r *Ermcp3MiddleGoodsDetail) addGoods(gpLst []Ermcp3GoodsEx) {
 // Ermcp3MiddleGoodsDetailEx 套保品种详情(含现货列表)
 type Ermcp3MiddleGoodsDetailEx struct {
 	Ermcp3MiddleGoodsDetail
-	DgList []ErmcpDeliveryGoodsDetail `json:"dglist"` // 关联的现货品种列表
+	DgList []ErmcpDeliveryGoodsDetail2 `json:"dglist"` // 关联的现货品种列表
 }
 
 func (r *Ermcp3MiddleGoodsDetailEx) addDgList(dglst []ErmcpDeliveryGoodsDetail, wc []WRSConverTDetail) {
@@ -395,7 +408,8 @@ func (r *Ermcp3MiddleGoodsDetailEx) addDgList(dglst []ErmcpDeliveryGoodsDetail,
 		if wc[i].MIDDLEGOODSID == int64(r.Mg.MIDDLEGOODSID) {
 			for _, detail := range dglst {
 				if wc[i].DELIVERYGOODSID == detail.Data.DELIVERYGOODSID {
-					r.DgList = append(r.DgList, detail)
+					val := ErmcpDeliveryGoodsDetail2{ErmcpDeliveryGoodsDetail: detail, CONVERTRATIO: wc[i].CONVERTRATIO}
+					r.DgList = append(r.DgList, val)
 				}
 			}
 		}
@@ -410,7 +424,7 @@ func (r *Ermcp3MiddleGoodsDetailEx) GetDataEx() (interface{}, error) {
 	if mgLst, err := m.GetData(); err == nil {
 		for i := range mgLst {
 			sData = append(sData, Ermcp3MiddleGoodsDetailEx{Ermcp3MiddleGoodsDetail: mgLst[i],
-				DgList: make([]ErmcpDeliveryGoodsDetail, 0)})
+				DgList: make([]ErmcpDeliveryGoodsDetail2, 0)})
 		}
 	}
 	// 查转换关系
@@ -987,6 +1001,9 @@ type Ermcp3AreaSpot struct {
 	DELIVERYGOODSID   int32   `json:"deliverygoodsid"  xorm:"'DELIVERYGOODSID'"`     // 现货品种id
 	DELIVERYGOODSCODE string  `json:"deliverygoodscode"  xorm:"'DELIVERYGOODSCODE'"` // 现货品种代码
 	DELIVERYGOODSNAME string  `json:"deliverygoodsname"  xorm:"'DELIVERYGOODSNAME'"` // 现货品种名称
+	GOODSUNITID       int32   `json:"goodsunitid"  xorm:"'GOODSUNITID'"`             // 现货品种单位id
+
+	ENUMDICNAME string `json:"enumdicname"` // 单位名称
 }
 
 func (r *Ermcp3AreaSpot) calc() {
@@ -1003,6 +1020,7 @@ func (r *Ermcp3AreaSpot) calc() {
 	r.IncreaseQty = r.SELLPLANQTY - r.ORISELLPLANQTY + r.BUYPRICEDQTY - r.ORIBUYPRICEDQTY
 	r.DecreaseQty = (r.SELLPRICEDQTY - r.ORISELLPRICEDQTY + r.BUYPLANQTY - r.ORIBUYPLANQTY) * -1
 	r.OriToalSpotQty = (r.ORISELLPLANQTY - r.ORISELLPRICEDQTY) - (r.ORIBUYPLANQTY - r.ORIBUYPRICEDQTY)
+	r.ENUMDICNAME = mtpcache.GetEnumDicitemName(r.GOODSUNITID)
 }
 
 func (r *Ermcp3AreaSpot) buildSql() string {
@@ -1019,6 +1037,7 @@ func (r *Ermcp3AreaSpot) buildSql() string {
 		"       g.deliverygoodsid," +
 		"       g.deliverygoodscode," +
 		"       g.deliverygoodsname," +
+		"       g.goodsunitid," +
 		"       to_char(t.UPDATETIME, 'yyyy-mm-dd hh24:mi:ss') UPDATETIME" +
 		"  from ermcp_areaspot t" +
 		"  left join deliverygoods g" +