联调问题修改

docs/docs.go

@@ -31044,7 +31044,7 @@ var doc = `{
                 },
                 "wrfactortypeid": {
                     "description": "仓单要素类型ID",
-                    "type": "integer"
+                    "type": "string"
                 },
                 "wrtypename": {
                     "description": "商品",
@@ -33006,6 +33006,10 @@ var doc = `{
                     "description": "仓库名称",
                     "type": "string"
                 },
+                "wrfactortypeid": {
+                    "description": "仓单要素id",
+                    "type": "integer"
+                },
                 "wrstandardid": {
                     "description": "现货商品ID",
                     "type": "integer"

docs/swagger.json

@@ -31028,7 +31028,7 @@
                 },
                 "wrfactortypeid": {
                     "description": "仓单要素类型ID",
-                    "type": "integer"
+                    "type": "string"
                 },
                 "wrtypename": {
                     "description": "商品",
@@ -32990,6 +32990,10 @@
                     "description": "仓库名称",
                     "type": "string"
                 },
+                "wrfactortypeid": {
+                    "description": "仓单要素id",
+                    "type": "integer"
+                },
                 "wrstandardid": {
                     "description": "现货商品ID",
                     "type": "integer"

docs/swagger.yaml

@@ -13648,7 +13648,7 @@ definitions:
         type: string
       wrfactortypeid:
         description: 仓单要素类型ID
-        type: integer
+        type: string
       wrtypename:
         description: 商品
         type: string
@@ -15115,6 +15115,9 @@ definitions:
       warehousename:
         description: 仓库名称
         type: string
+      wrfactortypeid:
+        description: 仓单要素id
+        type: integer
       wrstandardid:
         description: 现货商品ID
         type: integer

models/wrTrade2.go

@@ -2812,14 +2812,14 @@ type WrQuoteOrderMyq struct {
 	WRTYPENAME            string  `json:"wrtypename" xorm:"'WRTYPENAME'"`                                 // 商品
 	WRSTANDARDID          int64   `json:"wrstandardid"  xorm:"WRSTANDARDID" form:"wrstandardid"`          // 现货商品ID
 	DELIVERYGOODSID       int32   `json:"deliverygoodsid"  xorm:"DELIVERYGOODSID" form:"deliverygoodsid"` // 品种ID
+	WRFACTORTYPEID        string  `json:"wrfactortypeid"  xorm:"'WRFACTORTYPEID'"`                        // 仓单要素id
 	PageEx                `xorm:"extends"`
 
-	WRFACTORTYPEID int64  `json:"-" form:"wrfactortypeid"` // 仓单要素id
-	HasWr          int32  `json:"-" form:"haswr"`          // 是否有仓单 0-没有 1-有
-	WrPriceType    int32  `json:"-" form:"wrpricetype"`    // 价格方式 - 1:固定价 2-浮动价 - [挂牌]
-	MarketId       int32  `json:"-" form:"marketid"`       // 市场id
-	GOODSID        int32  `json:"-" form:"goodsid"`        // 商品id
-	DGITEMNAME     string `json:"-" form:"dgitemname"`     // 筛选项
+	HasWr       int32  `json:"-" form:"haswr"`       // 是否有仓单 0-没有 1-有
+	WrPriceType int32  `json:"-" form:"wrpricetype"` // 价格方式 - 1:固定价 2-浮动价 - [挂牌]
+	MarketId    int32  `json:"-" form:"marketid"`    // 市场id
+	GOODSID     int32  `json:"-" form:"goodsid"`     // 商品id
+	DGITEMNAME  string `json:"-" form:"dgitemname"`  // 筛选项
 }
 
 func (r *WrQuoteOrderMyq) calc() {
@@ -2877,7 +2877,7 @@ func (r *WrQuoteOrderMyq) buildSql() string {
 	sqlId.And("t.haswr", r.HasWr)
 	r.WrPriceType = 1 // 查固定价
 	sqlId.And("t.wrpricetype", r.WrPriceType)
-	sqlId.AndEx("t.wrfactortypeid", r.WRFACTORTYPEID, r.WRFACTORTYPEID > 0)
+	sqlId.AndEx("t.wrfactortypeid", r.WRFACTORTYPEID, r.WRFACTORTYPEID != "")
 	sqlId.AndEx("c.goodsid", r.GOODSID, r.GOODSID > 0)
 	sqlId.And("t.buyorsell", r.BUYORSELL)
 	sqlId.AndEx("t.marketid", r.MarketId, r.MarketId > 0)