|
|
@@ -1102,7 +1102,6 @@ func (r *Ermcp8HedgeditemReport) buildReportSql() string {
|
|
|
u.ACCOUNTNAME
|
|
|
FROM REPORT_ERMCP2_HEDGEDITEM t
|
|
|
LEFT JOIN WRStandard wr ON wr.WRStandardID = t.WRStandardID
|
|
|
- LEFT JOIN WRStandard wr ON wr.wrstandardid = t.wrstandardid
|
|
|
LEFT JOIN enumdicitem e on wr.unitid=e.enumitemname and e.enumdiccode='goodsunit'
|
|
|
LEFT JOIN useraccount u ON u.userid = t.tradeuserid
|
|
|
WHERE (t.TRADEUSERID = %v OR t.AREAUSERID = %v)
|
|
|
@@ -1333,8 +1332,9 @@ type Ermcp8EnableHedgeditem struct {
|
|
|
|
|
|
ACCOUNTNAME string `json:"accountname" xorm:"ACCOUNTNAME"` // 套期主体
|
|
|
|
|
|
- USERID int64 `json:"-" form:"userid" binding:"required"` // 用户ID
|
|
|
- WRSTANDARDID int64 `form:"wrstandardid"` // 现货商品ID
|
|
|
+ USERID int64 `json:"-" form:"userid" binding:"required"` // 用户ID
|
|
|
+ WRSTANDARDID int64 `json:"wrstandardid" form:"wrstandardid"` // 现货商品ID
|
|
|
+ WRSTANDARDNAME string `json:"wrstandardname" xorm:"WRSTANDARDNAME"` // 现货商品
|
|
|
}
|
|
|
|
|
|
func (r *Ermcp8EnableHedgeditem) calc() {
|
