1.查行情/买卖大厅增加现货合约单位字段

docs/docs.go

@@ -29994,6 +29994,10 @@ var doc = `{
                     "description": "交收月",
                     "type": "string"
                 },
+                "enumdicname": {
+                    "description": "单位名称",
+                    "type": "string"
+                },
                 "goodscode": {
                     "description": "商品合约(浮动价列表才有)",
                     "type": "string"
@@ -30059,6 +30063,10 @@ var doc = `{
                     "description": "买卖 - 0:买 1:卖",
                     "type": "integer"
                 },
+                "enumdicname": {
+                    "description": "单位名称",
+                    "type": "string"
+                },
                 "fixedprice": {
                     "description": "买(卖)价",
                     "type": "number"

docs/swagger.json

@@ -29978,6 +29978,10 @@
                     "description": "交收月",
                     "type": "string"
                 },
+                "enumdicname": {
+                    "description": "单位名称",
+                    "type": "string"
+                },
                 "goodscode": {
                     "description": "商品合约(浮动价列表才有)",
                     "type": "string"
@@ -30043,6 +30047,10 @@
                     "description": "买卖 - 0:买 1:卖",
                     "type": "integer"
                 },
+                "enumdicname": {
+                    "description": "单位名称",
+                    "type": "string"
+                },
                 "fixedprice": {
                     "description": "买(卖)价",
                     "type": "number"

docs/swagger.yaml

@@ -13667,6 +13667,9 @@ definitions:
       deliverymonth:
         description: 交收月
         type: string
+      enumdicname:
+        description: 单位名称
+        type: string
       goodscode:
         description: 商品合约(浮动价列表才有)
         type: string
@@ -13715,6 +13718,9 @@ definitions:
       buyorsell:
         description: 买卖 - 0:买 1:卖
         type: integer
+      enumdicname:
+        description: 单位名称
+        type: string
       fixedprice:
         description: 买(卖)价
         type: number

models/wrTrade2.go

@@ -36,6 +36,7 @@ type WrOrderQuote struct {
 	GOODSID           int32            `json:"goodsid"  xorm:"'GOODSID'"`                                     // 商品id(浮动价列表才有)
 	GOODSCODE         string           `json:"goodscode"  xorm:"'GOODSCODE'"`                                 // 商品合约(浮动价列表才有)
 	DELIVERYMONTH     string           `json:"deliverymonth"  xorm:"'DELIVERYMONTH'"`                         // 交收月
+	ENUMDICNAME       string           `json:"enumdicname" xorm:"'enumdicname'"`                              // 单位名称
 	PageEx            `xorm:"extends"` // 页码信息
 
 	HasWr       int32  `json:"-" form:"haswr"`       // 是否有仓单 0-没有 1-有
@@ -99,7 +100,8 @@ func (r *WrOrderQuote) buildSqlFixedPrice() string {
 		"       h.warehousecode," +
 		"       wg.wrstandardname," +
 		"       wg.wrstandardcode," +
-		"       wg.wrstandardname || w.wrfactortypename2 as wrgoodsname" +
+		"       wg.wrstandardname || w.wrfactortypename2 as wrgoodsname," +
+		"       e.enumdicname" +
 		"  from wrQuote k" +
 		"  left join WRFactorType w" +
 		"    on k.wrfactortypeid = w.wrfactortypeid" +
@@ -109,6 +111,9 @@ func (r *WrOrderQuote) buildSqlFixedPrice() string {
 		"    on w.wrstandardid = wg.wrstandardid" +
 		"  left join warehouseinfo h" +
 		"    on w.warehouseid = h.autoid" +
+		"  left join enumdicitem e" +
+		"    on e.enumitemname = wg.unitid" +
+		"   and e.enumdiccode = 'goodsunit'" +
 		"  where 1=1 %v " +
 		"order by deliverygoodsname"
 	var param, param2 utils.SQLVal
@@ -198,7 +203,8 @@ func (r *WrOrderQuote) buildSqlPriceMove() string {
 		"       h.warehousecode," +
 		"       wg.wrstandardname," +
 		"       wg.wrstandardcode," +
-		"       wg.wrstandardname || w.wrfactortypename2 as wrgoodsname" +
+		"       wg.wrstandardname || w.wrfactortypename2 as wrgoodsname," +
+		"       e.enumdicname" +
 		"  from wrQuote k" +
 		"  left join WRFactorType w" +
 		"    on k.wrfactortypeid = w.wrfactortypeid" +
@@ -208,6 +214,9 @@ func (r *WrOrderQuote) buildSqlPriceMove() string {
 		"    on w.wrstandardid = wg.wrstandardid" +
 		"  left join warehouseinfo h" +
 		"    on w.warehouseid = h.autoid" +
+		"  left join enumdicitem e" +
+		"    on e.enumitemname = wg.unitid" +
+		"   and e.enumdiccode = 'goodsunit'" +
 		" where 1 = 1 %v" +
 		" order by deliverygoodsname"
 	var param, param2 utils.SQLVal
@@ -253,6 +262,7 @@ type WrOrderQuoteDetail struct {
 	PRICE          float64 `json:"fixedprice"  xorm:"price"`                     // 买(卖)价
 	PRICEMOVE      float64 `json:"pricemove"  xorm:"PRICEMOVE"`                  // 买(卖)升贴水- 基差
 	USERNAME       string  `json:"username"  xorm:"'USERNAME'"`                  // 购买方(销售方)
+	ENUMDICNAME    string  `json:"enumdicname" xorm:"'enumdicname'"`             // 单位名称
 	PageEx         `xorm:"extends"`
 
 	WRFACTORTYPEID int64 `json:"-" form:"wrfactortypeid"` // 仓单要素id
@@ -277,12 +287,16 @@ func (r *WrOrderQuoteDetail) buildSql() string {
 		"       t.buyorsell," +
 		"       u.accountname as username," +
 		"       c.goodsid," +
-		"       c.goodscode" +
+		"       c.goodscode," +
+		"       e.enumdicname" +
 		"  from WRTRADE_ORDERDETAIL t" +
 		"  left join WRTRADE_GOODSCONFIG c" +
 		"    on t.wrtradeorderid = c.wrtradeorderid" +
 		"  left join Useraccount u" +
 		"    on t.userid = u.userid" +
+		"  left join wrfactortype w on t.wrfactortypeid=w.wrfactortypeid" +
+		"  left join wrstandard wd on w.wrstandardid=wd.wrstandardid" +
+		"  left join enumdicitem e on wd.unitid=e.enumitemname and e.enumdiccode='goodsunit'" +
 		" where 1 = 1" +
 		"   and t.wrtradetype = 1" +
 		"   and t.wrtradeorderstatus in (3, 10)"