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

docs/docs.go

@@ -30416,10 +30416,18 @@ var doc = `{
                 "goodsid"
             ],
             "properties": {
+                "agreeunit": {
+                    "description": "合约乘数",
+                    "type": "number"
+                },
                 "areauserid": {
                     "description": "企业ID",
                     "type": "integer"
                 },
+                "convertratio": {
+                    "description": "品种系数",
+                    "type": "number"
+                },
                 "deliverygoodscode": {
                     "description": "现货品种代码",
                     "type": "string"
@@ -30440,6 +30448,10 @@ var doc = `{
                     "description": "期货合约ID",
                     "type": "integer"
                 },
+                "hedgeditemid": {
+                    "description": "被套期项目ID",
+                    "type": "string"
+                },
                 "hedgeditemnum": {
                     "description": "项目编号",
                     "type": "string"

docs/swagger.json

@@ -30400,10 +30400,18 @@
                 "goodsid"
             ],
             "properties": {
+                "agreeunit": {
+                    "description": "合约乘数",
+                    "type": "number"
+                },
                 "areauserid": {
                     "description": "企业ID",
                     "type": "integer"
                 },
+                "convertratio": {
+                    "description": "品种系数",
+                    "type": "number"
+                },
                 "deliverygoodscode": {
                     "description": "现货品种代码",
                     "type": "string"
@@ -30424,6 +30432,10 @@
                     "description": "期货合约ID",
                     "type": "integer"
                 },
+                "hedgeditemid": {
+                    "description": "被套期项目ID",
+                    "type": "string"
+                },
                 "hedgeditemnum": {
                     "description": "项目编号",
                     "type": "string"

docs/swagger.yaml

@@ -11020,9 +11020,15 @@ definitions:
     type: object
   models.InternalEnableTradeDetail:
     properties:
+      agreeunit:
+        description: 合约乘数
+        type: number
       areauserid:
         description: 企业ID
         type: integer
+      convertratio:
+        description: 品种系数
+        type: number   
       deliverygoodscode:
         description: 现货品种代码
         type: string
@@ -11038,6 +11044,9 @@ definitions:
       goodsid:
         description: 期货合约ID
         type: integer
+      hedgeditemid:
+        description: 被套期项目ID
+        type: string      
       hedgeditemnum:
         description: 项目编号
         type: string
@@ -11055,7 +11064,7 @@ definitions:
         type: integer
       wrstandardname:
         description: 现货品类名称
-        type: string
+        type: string             
     required:
     - areauserid
     - goodsid

models/ermcp8.go

@@ -513,7 +513,7 @@ func (r *Ermcpjrlinkpos) calc() {
 
 func (r *Ermcpjrlinkpos) buildSql() string {
 	var sqlId utils.SQLVal = `
-		SELECT 
+		SELECT DISTINCT
 			to_char(t.SPOTCONTRACTID) SPOTCONTRACTID,
 			t.ORDERTYPE,
 			t.OPTIONCODE,
@@ -897,8 +897,11 @@ type InternalEnableTradeDetail struct {
 	UNEXESPOTQTY      float64 `json:"unexespotqty"  xorm:"UNEXESPOTQTY"`                                  // 未执行现货量
 	UNEXEHEDGEQTY     float64 `json:"unexehedgeqty"  xorm:"UNEXEHEDGEQTY"`                                // 未执行套期量 = 未执行现货量*折算系数* (1/(1+增值税)) * 套期比例(项目上)
 	FUTUREHEDGEQTY    float64 `json:"futurehedgeqty"  xorm:"FUTUREHEDGEQTY"`                              // [已关联数量]期货持仓套期量
-	AREAUSERID        int64   `json:"areauserid"  xorm:"AREAUSERID" form:"areauserid" binding:"required"` // 企业ID
+	HEDGEDITEMID      string  `json:"hedgeditemid"  xorm:"HEDGEDITEMID"`                              	  // 被套期项目ID
+	AGREEUNIT    	  float64 `json:"agreeunit"  xorm:"AGREEUNIT"`                              		  // 合约乘数
+	CONVERTRATIO   	  float64 `json:"convertratio"  xorm:"CONVERTRATIO"`                              	  // 品种系数
 
+	AREAUSERID        int64   `json:"areauserid"  xorm:"AREAUSERID" form:"areauserid" binding:"required"` // 企业ID
 	GOODSID int64 `form:"goodsid" binding:"required"` // 期货合约ID
 }
 
@@ -908,7 +911,7 @@ func (r *InternalEnableTradeDetail) calc() {
 
 func (r *InternalEnableTradeDetail) buildSql() string {
 	var sqlId utils.SQLVal = `
-	SELECT 
+	SELECT DISTINCT
 		hi.HEDGEDITEMNUM,
 		dg.DELIVERYGOODSID,
 		dg.DELIVERYGOODSCODE,
@@ -918,7 +921,10 @@ func (r *InternalEnableTradeDetail) buildSql() string {
 		wr.WRSTANDARDNAME,
 		t.UNEXESPOTQTY,
 		t.UNEXEHEDGEQTY,
-		t.FUTUREHEDGEQTY
+		t.FUTUREHEDGEQTY,
+		to_char(T.HEDGEDITEMID,
+		G.AGREEUNIT,
+		GC.CONVERTRATIO
 	FROM ERMCP2_HIMiddleGoods t
 	LEFT JOIN ERMCP2_HedgedItem hi ON hi.HEDGEDITEMID = t.HEDGEDITEMID
 	LEFT JOIN DeliveryGoods dg ON dg.DELIVERYGOODSID = t.DELIVERYGOODSID
@@ -1294,7 +1300,7 @@ func (r *ErmcpSpotContractModelEx) GetData(req QrySpotContractExReq) ([]ErmcpSpo
 
 // Ermcp8EnableHedgeditem 可关联项目
 type Ermcp8EnableHedgeditem struct {
-	HEDGEDITEMID   int64  `json:"hedgeditemid"  xorm:"HEDGEDITEMID"`     // 被套期项目ID(624+Unix秒时间戳(10位)+xxxxxx)
+	HEDGEDITEMID   string  `json:"hedgeditemid"  xorm:"HEDGEDITEMID"`     // 被套期项目ID(624+Unix秒时间戳(10位)+xxxxxx)
 	HEDGEDITEMNUM  string `json:"hedgeditemnum"  xorm:"HEDGEDITEMNUM"`   // 项目编号
 	HEDGEDITEMNAME string `json:"hedgeditemname"  xorm:"HEDGEDITEMNAME"` // 项目名称
 	HEDGEDTYPE     int32  `json:"hedgedtype"  xorm:"HEDGEDTYPE"`         // 套期类型 - 1:采购计划项目 2:销售计划项目 3:现货贸易项目 4:库存存货项目 5:定价采购合同项目
@@ -1314,7 +1320,7 @@ func (r *Ermcp8EnableHedgeditem) calc() {
 func (r *Ermcp8EnableHedgeditem) buildSql() string {
 	var sqlId utils.SQLVal = `
 	SELECT 
-		t.HEDGEDITEMID,
+	to_char(t.HEDGEDITEMID) HEDGEDITEMID,
 		t.HEDGEDITEMNUM,
 		t.HEDGEDITEMNAME,
 		t.HEDGEDTYPE,