|
|
@@ -1655,7 +1655,7 @@ func (r *Ermcp2AreaExposure) GetDataEx(userID int) (interface{}, error) {
|
|
|
|
|
|
// Ermcp2stockspotchangelog 现货操作流水表
|
|
|
type Ermcp2stockspotchangelog struct {
|
|
|
- LOGID int64 `json:"logid" xorm:"LOGID"` // 流水ID(604+Unix秒时间戳(10位)+xxxxxx)
|
|
|
+ LOGID string `json:"logid" xorm:"LOGID"` // 流水ID(604+Unix秒时间戳(10位)+xxxxxx)
|
|
|
OPERATELOGTYPE int32 `json:"operatelogtype" xorm:"OPERATELOGTYPE"` // 操作流水类型 - 2:点价数量 21:正常完结(合同) 22:异常终止(合同) 24:采购入库 25:销售出库 26:生产入库 27:生产出库
|
|
|
DELIVERYGOODSID int64 `json:"deliverygoodsid" xorm:"DELIVERYGOODSID"` // 现货品种ID
|
|
|
WRSTANDARDID int64 `json:"wrstandardid" xorm:"WRSTANDARDID"` // 现货商品ID
|
|
|
@@ -1708,7 +1708,7 @@ func (r *Ermcp2stockspotchangelog) buildSql() string {
|
|
|
LEFT JOIN WRStandard ws ON ws.WRStandardID = t.WRStandardID
|
|
|
LEFT JOIN ERMCP_SPOTCONTRACT s ON s.SPOTCONTRACTID = t.RELATEDID
|
|
|
LEFT JOIN useraccount u ON u.userid = s.CUSTOMERUSERID
|
|
|
- LEFT JOIN useraccount u1 ON u.userid = s.RELATEDUSERID
|
|
|
+ LEFT JOIN useraccount u1 ON u.userid = s.TRADEUSERID
|
|
|
WHERE t.userid = %v AND mg.MiddleGoodsID = %v
|
|
|
`
|
|
|
// var sqlId utils.SQLVal = `
|
|
|
@@ -1915,7 +1915,7 @@ func (r *Patradelinkdetail) GetDataEx() (interface{}, error) {
|
|
|
|
|
|
// Unlinkermcphedgeplan 未关联购销计划
|
|
|
type Unlinkermcphedgeplan struct {
|
|
|
- HEDGEPLANID int64 `json:"hedgeplanid" xorm:"HEDGEPLANID"` // 套保计划ID(601+Unix秒时间戳(10位)+xxxxxx)
|
|
|
+ HEDGEPLANID string `json:"hedgeplanid" xorm:"HEDGEPLANID"` // 套保计划ID(601+Unix秒时间戳(10位)+xxxxxx)
|
|
|
HEDGEPLANNO string `json:"hedgeplanno" xorm:"HEDGEPLANNO" form:"hedgeplanno"` // [计划编号]套保计划编号，模糊查询
|
|
|
CONTRACTTYPE int32 `json:"contracttype" xorm:"CONTRACTTYPE" form:"contracttype"` // 计划类型 - 1:采购 -1:销售
|
|
|
AREAUSERID int64 `json:"areauserid" xorm:"AREAUSERID" form:"areauserid" binding:"required"` // [企业ID]机构ID
|
|
|
@@ -1957,7 +1957,7 @@ func (r *Unlinkermcphedgeplan) calc() {
|
|
|
func (r *Unlinkermcphedgeplan) buildSql() string {
|
|
|
var sqlId utils.SQLVal = `
|
|
|
SELECT
|
|
|
- t.HEDGEPLANID,
|
|
|
+ to_char(t.HEDGEPLANID) HEDGEPLANID,
|
|
|
t.HEDGEPLANNO,
|
|
|
u.ACCOUNTNAME,
|
|
|
t.CONTRACTTYPE,
|
gitmuchinfo