|
|
@@ -265,6 +265,7 @@ type ErmcpAreaSpotDetailModel struct {
|
|
|
Strtime string `json:"strtime" xorm:"'strtime'"` // 时间
|
|
|
Enumdicname string `json:"enumdicname"` // 现货商品单位名称
|
|
|
Recordname string `json:"recordname"` // 类型名称
|
|
|
+ CREATETIME string `json:"createtime" xorm:"'CREATETIME'"` // 创建时间
|
|
|
Unitid int32 `json:"-" xorm:"'UNITID'"` // 单位ID
|
|
|
UserId int `json:"-"` // 所属用户ID
|
|
|
WrstandardId int32 `json:"-"` // 现货商品ID
|
|
|
@@ -280,7 +281,7 @@ func (r *ErmcpAreaSpotDetailModel) buildSql() string {
|
|
|
" w.wrstandardcode," +
|
|
|
" t.planqty qty," +
|
|
|
" w.unitid," +
|
|
|
- " to_char(t.createtime, 'yyyy-mm-dd hh:mi:ss') strtime" +
|
|
|
+ " to_char(t.createtime, 'yyyy-mm-dd hh:mi:ss') createtime" +
|
|
|
" from ermcp_hedgeplan t" +
|
|
|
" left join wrstandard w" +
|
|
|
" on t.wrstandardid = w.wrstandardid" +
|
|
|
@@ -295,7 +296,7 @@ func (r *ErmcpAreaSpotDetailModel) buildSql() string {
|
|
|
" w.wrstandardcode," +
|
|
|
" t.qty," +
|
|
|
" w.unitid," +
|
|
|
- " to_char(t.createtime, 'yyyy-mm-dd hh:mi:ss') strtime" +
|
|
|
+ " to_char(t.createtime, 'yyyy-mm-dd hh:mi:ss') createtime" +
|
|
|
" from ermcp_spotcontract t" +
|
|
|
" left join wrstandard w" +
|
|
|
" on t.wrstandardid = w.wrstandardid" +
|
|
|
@@ -318,7 +319,7 @@ func (r *ErmcpAreaSpotDetailModel) Calc() {
|
|
|
contractTypeName = "采购"
|
|
|
} else {
|
|
|
contractTypeName = "销售"
|
|
|
- if r.Qty > 0{
|
|
|
+ if r.Qty > 0 {
|
|
|
// 销售的数量转为负数
|
|
|
r.Qty = r.Qty * -1
|
|
|
}
|
|
|
@@ -645,7 +646,7 @@ type ErmcpHedgePositionDetail struct {
|
|
|
}
|
|
|
|
|
|
func (r *ErmcpHedgePositionDetail) Calc() {
|
|
|
- if r.BUYORSELL == 1 && r.TRADEQTY > 0{
|
|
|
+ if r.BUYORSELL == 1 && r.TRADEQTY > 0 {
|
|
|
r.TRADEQTY = r.TRADEQTY * -1
|
|
|
}
|
|
|
}
|
|
|
@@ -695,4 +696,4 @@ func (r *ErmcpHedgePositionDetail) GetDataEx() (interface{}, error) {
|
|
|
sData[i].Calc()
|
|
|
}
|
|
|
return sData, err
|
|
|
-}
|
|
|
+}
|