|
|
@@ -3103,6 +3103,9 @@ type WrDeliveryDetail struct {
|
|
|
WRTYPENAME string `json:"wrtypename" xorm:"'WRTYPENAME'"` // 商品
|
|
|
WAREHOUSENAME string `json:"warehousename" xorm:"'WAREHOUSENAME'"` // 仓库名称
|
|
|
ENUMDICNAME string `json:"enumdicname" xorm:"'ENUMDICNAME'"` // 单位名称
|
|
|
+ XDELIVERYPRICE float64 `json:"xdeliveryprice" xorm:"XDELIVERYPRICE"` // 交易合约交割价
|
|
|
+ XGOODSREMAINAMOUNT float64 `json:"xgoodsremainamount" xorm:"XGOODSREMAINAMOUNT"` // X剩余总货款
|
|
|
+ REMAINTOTALAMOUNT float64 `json:"remaintotalamount" xorm:"REMAINTOTALAMOUNT"` // 实际剩余总货款 = (X、P剩余总货款 + 升贴水总额) * (实际成交数量/交割数量)
|
|
|
|
|
|
XGOODSAMOUNT SFLOAT64 `json:"xgoodsamount"` // 合约金额 = 货款金额(DELIVERYAMOUNT) - 点价货款(P1GOODSREMAINAMOUNT)
|
|
|
AVERAGEPRICE SFLOAT64 `json:"averageprice"` // 交割均价 = 交割金额 / 交割数量
|
|
|
@@ -3154,7 +3157,10 @@ select t.xgoodsid,
|
|
|
u2.accountname matchusername,
|
|
|
wd.wrstandardname || w.wrfactortypename2 as WRTYPENAME,
|
|
|
h.warehousename,
|
|
|
- e.enumdicname
|
|
|
+ e.enumdicnamee,
|
|
|
+ t.xdeliveryprice,
|
|
|
+ t.xgoodsremainamount,
|
|
|
+ t.remaintotalamount
|
|
|
from deliverydetail t
|
|
|
left join goods g
|
|
|
on t.xgoodsid = g.goodsid
|
