查交收明细增加交割单号(deliveryid)字段

docs/docs.go

@@ -30962,6 +30962,10 @@ var doc = `{
                     "description": "货款金额(X总货款+P总货款)",
                     "type": "number"
                 },
+                "deliveryid": {
+                    "description": "交割单号(121+Unix秒时间戳(10位)+xxxxxx)",
+                    "type": "string"
+                },
                 "deliveryorderid": {
                     "description": "申报单号",
                     "type": "string"
@@ -33008,7 +33012,7 @@ var doc = `{
                 },
                 "wrfactortypeid": {
                     "description": "仓单要素id",
-                    "type": "integer"
+                    "type": "string"
                 },
                 "wrstandardid": {
                     "description": "现货商品ID",

docs/swagger.json

@@ -30946,6 +30946,10 @@
                     "description": "货款金额(X总货款+P总货款)",
                     "type": "number"
                 },
+                "deliveryid": {
+                    "description": "交割单号(121+Unix秒时间戳(10位)+xxxxxx)",
+                    "type": "string"
+                },
                 "deliveryorderid": {
                     "description": "申报单号",
                     "type": "string"
@@ -32992,7 +32996,7 @@
                 },
                 "wrfactortypeid": {
                     "description": "仓单要素id",
-                    "type": "integer"
+                    "type": "string"
                 },
                 "wrstandardid": {
                     "description": "现货商品ID",

docs/swagger.yaml

@@ -13586,6 +13586,9 @@ definitions:
       deliveryamount:
         description: 货款金额(X总货款+P总货款)
         type: number
+      deliveryid:
+        description: 交割单号(121+Unix秒时间戳(10位)+xxxxxx)
+        type: string
       deliveryorderid:
         description: 申报单号
         type: string
@@ -15117,7 +15120,7 @@ definitions:
         type: string
       wrfactortypeid:
         description: 仓单要素id
-        type: integer
+        type: string
       wrstandardid:
         description: 现货商品ID
         type: integer

models/wrTrade2.go

@@ -2515,6 +2515,7 @@ func (r *WrOutInApply) GetDataEx() (interface{}, error) {
 
 // WrDeliveryDetail 交收
 type WrDeliveryDetail struct {
+	DELIVERYID          string  `json:"deliveryid"  xorm:"'DELIVERYID'"`                 //交割单号(121+Unix秒时间戳(10位)+xxxxxx)
 	DELIVERYQTY         float64 `json:"deliveryqty"  xorm:"DELIVERYQTY"`                 // 交收数量(点选数量)
 	XDELIVERYCLOSEQTY   float64 `json:"xdeliverycloseqty"  xorm:"'XDELIVERYCLOSEQTY'"`   // 合约数量
 	PDELIVERYCLOSEQTY   float64 `json:"pdeliverycloseqty"  xorm:"'PDELIVERYCLOSEQTY'"`   // p合约平仓数量
@@ -2565,6 +2566,7 @@ func (r *WrDeliveryDetail) buildSql() string {
 	var sqlId utils.SQLVal = `
 select t.xgoodsid,
        t.buyorsell,
+       to_char(t.deliveryid) deliveryid,
        t.deliveryqty,
        t.xdeliverycloseqty,
        t.pdeliverycloseqty,