查合同增加应交收量

docs/docs.go

@@ -22843,6 +22843,10 @@ var doc = `{
                     "description": "账户昵称",
                     "type": "string"
                 },
+                "orireckonrealqty": {
+                    "description": "应交收量",
+                    "type": "number"
+                },
                 "payamount": {
                     "description": "已收付额(收款或付款)",
                     "type": "number"
@@ -22900,7 +22904,7 @@ var doc = `{
                     "type": "number"
                 },
                 "reckonrealqty": {
-                    "description": "已确定量",
+                    "description": "已交收量",
                     "type": "number"
                 },
                 "remark": {

docs/swagger.json

@@ -22827,6 +22827,10 @@
                     "description": "账户昵称",
                     "type": "string"
                 },
+                "orireckonrealqty": {
+                    "description": "应交收量",
+                    "type": "number"
+                },
                 "payamount": {
                     "description": "已收付额(收款或付款)",
                     "type": "number"
@@ -22884,7 +22888,7 @@
                     "type": "number"
                 },
                 "reckonrealqty": {
-                    "description": "已确定量",
+                    "description": "已交收量",
                     "type": "number"
                 },
                 "remark": {

docs/swagger.yaml

@@ -6432,6 +6432,9 @@ definitions:
       nickname:
         description: 账户昵称
         type: string
+      orireckonrealqty:
+        description: 应交收量
+        type: number
       payamount:
         description: 已收付额(收款或付款)
         type: number
@@ -6475,7 +6478,7 @@ definitions:
         description: 其它费用
         type: number
       reckonrealqty:
-        description: 已确定量
+        description: 已交收量
         type: number
       remark:
         description: 备注

models/ermcp3.go

@@ -851,7 +851,8 @@ type Ermcp3SellBuyContract struct {
 	CONTRACTMARGIN     float64 `json:"contractmargin"  xorm:"'CONTRACTMARGIN'"`         // 合同保证金
 	Remark             string  `json:"remark"  xorm:"'Remark'"`                         // 备注
 	ATTACHMENT         string  `json:"attachment"  xorm:"'ATTACHMENT'"`                 // 附件
-	ReckonRealQty      float64 `json:"reckonrealqty"  xorm:"'ReckonRealQty'"`           // 已确定量
+	ReckonRealQty      float64 `json:"reckonrealqty"  xorm:"'ReckonRealQty'"`           // 已交收量
+	OriReckonRealQty   float64 `json:"orireckonrealqty"  xorm:"'OriReckonRealQty'"`     // 应交收量
 	ReckonOtherAmount  float64 `json:"reckonotheramount"  xorm:"'ReckonOtherAmount'"`   // 其它费用
 	ReckonAdjustAmount float64 `json:"reckonadjustamount"  xorm:"'ReckonAdjustAmount'"` // 调整金额
 	Price              float64 `json:"price"  xorm:"'Price'"`                           // 价格
@@ -992,6 +993,7 @@ select t.contractno,
           0
        end pricedAvg,
        t.ReckonRealQty,
+       t.OriReckonRealQty,
        t.ReckonOtherAmount,
        t.ReckonAdjustAmount,
        t.Price,