|
|
@@ -47,6 +47,7 @@ type WrOrderQuote struct {
|
|
|
ENUMDICNAME string `json:"enumdicname" xorm:"'enumdicname'"` // 单位名称
|
|
|
MINIVALUE int32 `json:"minivalue" xorm:"'MINIVALUE'"` // 现货商品最小变动值
|
|
|
PageEx `xorm:"extends"` // 页码信息
|
|
|
+ SPOTGOODSPRICE float64 `json:"spotgoodsprice" xorm:"'SPOTGOODSPRICE'"` // 参考价(THJ)
|
|
|
|
|
|
HasWr int32 `json:"-" form:"haswr"` // 是否有仓单 0-没有 1-有
|
|
|
WrPriceType int32 `json:"-" form:"wrpricetype"` // 价格方式 - 1:固定价 2-浮动价 - [挂牌]
|
|
|
@@ -131,7 +132,8 @@ func (r *WrOrderQuote) buildSqlFixedPrice() string {
|
|
|
" wg.bannerpicurl," +
|
|
|
" wg.pictureurls," +
|
|
|
" wg.thumurls," +
|
|
|
- " e.enumdicname" +
|
|
|
+ " e.enumdicname," +
|
|
|
+ " sgp.spotgoodsprice" +
|
|
|
" from wrQuote k" +
|
|
|
" left join WRFactorType w" +
|
|
|
" on k.wrfactortypeid = w.wrfactortypeid" +
|
|
|
@@ -144,6 +146,11 @@ func (r *WrOrderQuote) buildSqlFixedPrice() string {
|
|
|
" left join enumdicitem e" +
|
|
|
" on e.enumitemname = wg.unitid" +
|
|
|
" and e.enumdiccode = 'goodsunit'" +
|
|
|
+ " left join ermcp_spotgoodsprice sgp" +
|
|
|
+ " on sgp.deliverygoodsid = dg.deliverygoodsid" +
|
|
|
+ " and sgp.wrstandardid = w.warehouseid" +
|
|
|
+ " and sgp.spotgoodsbrandid = 0" +
|
|
|
+ " and sgp.CURRENCYID = 1" +
|
|
|
" where 1=1 %v " +
|
|
|
"order by deliverygoodsname"
|
|
|
var param, param2 utils.SQLVal
|
