|
|
@@ -37,6 +37,7 @@ type WrOrderQuote struct {
|
|
|
GOODSCODE string `json:"goodscode" xorm:"'GOODSCODE'"` // 商品合约(浮动价列表才有)
|
|
|
DELIVERYMONTH string `json:"deliverymonth" xorm:"'DELIVERYMONTH'"` // 交收月
|
|
|
ENUMDICNAME string `json:"enumdicname" xorm:"'enumdicname'"` // 单位名称
|
|
|
+ MINIVALUE int32 `json:"minivalue" xorm:"'MINIVALUE'"` // 现货商品最小变动值
|
|
|
PageEx `xorm:"extends"` // 页码信息
|
|
|
|
|
|
HasWr int32 `json:"-" form:"haswr"` // 是否有仓单 0-没有 1-有
|
|
|
@@ -100,6 +101,7 @@ func (r *WrOrderQuote) buildSqlFixedPrice() string {
|
|
|
" h.warehousecode," +
|
|
|
" wg.wrstandardname," +
|
|
|
" wg.wrstandardcode," +
|
|
|
+ " wg.minivalue," +
|
|
|
" wg.wrstandardname || w.wrfactortypename2 as wrgoodsname," +
|
|
|
" e.enumdicname" +
|
|
|
" from wrQuote k" +
|
|
|
@@ -203,6 +205,7 @@ func (r *WrOrderQuote) buildSqlPriceMove() string {
|
|
|
" h.warehousecode," +
|
|
|
" wg.wrstandardname," +
|
|
|
" wg.wrstandardcode," +
|
|
|
+ " wg.minivalue," +
|
|
|
" wg.wrstandardname || w.wrfactortypename2 as wrgoodsname," +
|
|
|
" e.enumdicname" +
|
|
|
" from wrQuote k" +
|
|
|
@@ -263,6 +266,7 @@ type WrOrderQuoteDetail struct {
|
|
|
PRICEMOVE float64 `json:"pricemove" xorm:"PRICEMOVE"` // 买(卖)升贴水- 基差
|
|
|
USERNAME string `json:"username" xorm:"'USERNAME'"` // 购买方(销售方)
|
|
|
ENUMDICNAME string `json:"enumdicname" xorm:"'enumdicname'"` // 单位名称
|
|
|
+ MINIVALUE int32 `json:"minivalue" xorm:"'MINIVALUE'"` // 现货商品最小变动值
|
|
|
PageEx `xorm:"extends"`
|
|
|
|
|
|
WRFACTORTYPEID int64 `json:"-" form:"wrfactortypeid"` // 仓单要素id
|
|
|
@@ -288,6 +292,7 @@ func (r *WrOrderQuoteDetail) buildSql() string {
|
|
|
" u.accountname as username," +
|
|
|
" c.goodsid," +
|
|
|
" c.goodscode," +
|
|
|
+ " wd.minivalue," +
|
|
|
" e.enumdicname" +
|
|
|
" from WRTRADE_ORDERDETAIL t" +
|
|
|
" left join WRTRADE_GOODSCONFIG c" +
|