修改BUG

models/ferroalloy.go

@@ -506,8 +506,10 @@ type THJWrstandardDetailRsp struct {
 func (r *THJWrstandardDetailReq) GetTHJWrstandardDetail() (rsp *THJWrstandardDetailRsp, err error) {
 	engine := db.GetEngine()
 
+	rsp = new(THJWrstandardDetailRsp)
+
 	// 采购商品信息
-	goodsInfo := new(THJWrstandardDetail_GoodsInfo)
+	var goodsInfo THJWrstandardDetail_GoodsInfo
 	sql := fmt.Sprintf(`
 		select
 			t.WRSTANDARDID,
@@ -519,10 +521,10 @@ func (r *THJWrstandardDetailReq) GetTHJWrstandardDetail() (rsp *THJWrstandardDet
 		left join ERMCP_SpotGoodsPrice p on t.WRSTANDARDID = p.WRSTANDARDID and p.spotgoodsbrandid=0 and p.currencyid = 1 
 		where t.WRSTANDARDID = %v
 	`, r.WRSTANDARDID)
-	if _, err = engine.SQL(sql).Get(goodsInfo); err != nil {
+	if _, err = engine.SQL(sql).Get(&goodsInfo); err != nil {
 		return
 	}
-	rsp.GoodsInfo = *goodsInfo
+	rsp.GoodsInfo = goodsInfo
 
 	// 交割方式
 	deliveryModes := make([]THJDeliveryMode, 0)
@@ -531,7 +533,7 @@ func (r *THJWrstandardDetailReq) GetTHJWrstandardDetail() (rsp *THJWrstandardDet
 			t.ENUMDICNAME,
 			t.ENUMITEMNAME
 		from enumdicitem t 
-		where t.enumdiccode = 'THJDeliveryMode';
+		where t.enumdiccode = 'THJDeliveryMode'
 	`
 	if err = engine.SQL(sql).Find(&deliveryModes); err != nil {
 		return
@@ -545,8 +547,8 @@ func (r *THJWrstandardDetailReq) GetTHJWrstandardDetail() (rsp *THJWrstandardDet
 			t.PRESALEAPPLYID,  
 			to_char(t.ENDDATE, 'yyyy-mm') ENDMONTH, 
 			to_char(t.ENDDATE, 'yyyy-mm-dd') ENDDATE, 
-			t.ORDERQTY,
-			t.TRADEQTY,
+			od.ORDERQTY,
+			od.TRADEQTY,
 			(od.orderqty - od.tradeqty) REMAINQTY
 		from WR_PresaleInfo t
 		inner join wrtrade_orderdetail od on t.sellwrtradeorderid = od.wrtradeorderid