Merge branch 'master' of 192.168.30.132:MTP2.0/MTP20_IF

docs/docs.go

@@ -29759,6 +29759,10 @@ var doc = `{
                     "description": "提单ID(208+Unix秒时间戳(10位)+xxxxxx)",
                     "type": "string"
                 },
+                "minivalue": {
+                    "description": "现货商品最小变动值",
+                    "type": "integer"
+                },
                 "optioncompare": {
                     "description": "选择项比较串【{选择项ID}＋{冒号}+选择项值 } ，逗号分隔，头尾加逗号】-- 所有选择项拼接，用于比较",
                     "type": "string"
@@ -29888,6 +29892,10 @@ var doc = `{
                     "description": "市场ID",
                     "type": "integer"
                 },
+                "minivalue": {
+                    "description": "现货商品最小变动值",
+                    "type": "integer"
+                },
                 "optioncompare": {
                     "description": "选择项比较串【{选择项ID}＋{冒号}+选择项值 } ，逗号分隔，头尾加逗号】-- 所有选择项拼接，用于比较",
                     "type": "string"
@@ -30013,6 +30021,10 @@ var doc = `{
                     "description": "商品id(浮动价列表才有)",
                     "type": "integer"
                 },
+                "minivalue": {
+                    "description": "现货商品最小变动值",
+                    "type": "integer"
+                },
                 "sellprice": {
                     "description": "卖价",
                     "type": "number"
@@ -30078,6 +30090,10 @@ var doc = `{
                     "description": "买(卖)价",
                     "type": "number"
                 },
+                "minivalue": {
+                    "description": "现货商品最小变动值",
+                    "type": "integer"
+                },
                 "orderqty": {
                     "description": "买(卖)量(=委托量-成交量)",
                     "type": "number"
@@ -30202,6 +30218,10 @@ var doc = `{
                     "description": "中间商用户ID",
                     "type": "integer"
                 },
+                "minivalue": {
+                    "description": "现货商品最小变动值",
+                    "type": "integer"
+                },
                 "optioncompare": {
                     "description": "选择项比较串【{选择项ID}＋{冒号}+选择项值 } ，逗号分隔，头尾加逗号】-- 所有选择项拼接，用于比较",
                     "type": "string"
@@ -30367,6 +30387,10 @@ var doc = `{
                     "description": "是否有仓单-卖方 - 0:无仓单 1:有仓单",
                     "type": "integer"
                 },
+                "minivalue": {
+                    "description": "现货商品最小变动值",
+                    "type": "integer"
+                },
                 "modifytime": {
                     "description": "修改时间(过户时间)",
                     "type": "string"
@@ -30488,6 +30512,10 @@ var doc = `{
                     "description": "指定方",
                     "type": "string"
                 },
+                "minivalue": {
+                    "description": "现货商品最小变动值",
+                    "type": "integer"
+                },
                 "optioncompare": {
                     "description": "选择项比较串【{选择项ID}＋{冒号}+选择项值 } ，逗号分隔，头尾加逗号】-- 所有选择项拼接，用于比较",
                     "type": "string"
@@ -30621,6 +30649,10 @@ var doc = `{
                     "description": "对手方",
                     "type": "string"
                 },
+                "minivalue": {
+                    "description": "现货商品最小变动值",
+                    "type": "integer"
+                },
                 "optioncompare": {
                     "description": "选择项比较串【{选择项ID}＋{冒号}+选择项值 } ，逗号分隔，头尾加逗号】-- 所有选择项拼接，用于比较",
                     "type": "string"

docs/swagger.json

@@ -29743,6 +29743,10 @@
                     "description": "提单ID(208+Unix秒时间戳(10位)+xxxxxx)",
                     "type": "string"
                 },
+                "minivalue": {
+                    "description": "现货商品最小变动值",
+                    "type": "integer"
+                },
                 "optioncompare": {
                     "description": "选择项比较串【{选择项ID}＋{冒号}+选择项值 } ，逗号分隔，头尾加逗号】-- 所有选择项拼接，用于比较",
                     "type": "string"
@@ -29872,6 +29876,10 @@
                     "description": "市场ID",
                     "type": "integer"
                 },
+                "minivalue": {
+                    "description": "现货商品最小变动值",
+                    "type": "integer"
+                },
                 "optioncompare": {
                     "description": "选择项比较串【{选择项ID}＋{冒号}+选择项值 } ，逗号分隔，头尾加逗号】-- 所有选择项拼接，用于比较",
                     "type": "string"
@@ -29997,6 +30005,10 @@
                     "description": "商品id(浮动价列表才有)",
                     "type": "integer"
                 },
+                "minivalue": {
+                    "description": "现货商品最小变动值",
+                    "type": "integer"
+                },
                 "sellprice": {
                     "description": "卖价",
                     "type": "number"
@@ -30062,6 +30074,10 @@
                     "description": "买(卖)价",
                     "type": "number"
                 },
+                "minivalue": {
+                    "description": "现货商品最小变动值",
+                    "type": "integer"
+                },
                 "orderqty": {
                     "description": "买(卖)量(=委托量-成交量)",
                     "type": "number"
@@ -30186,6 +30202,10 @@
                     "description": "中间商用户ID",
                     "type": "integer"
                 },
+                "minivalue": {
+                    "description": "现货商品最小变动值",
+                    "type": "integer"
+                },
                 "optioncompare": {
                     "description": "选择项比较串【{选择项ID}＋{冒号}+选择项值 } ，逗号分隔，头尾加逗号】-- 所有选择项拼接，用于比较",
                     "type": "string"
@@ -30351,6 +30371,10 @@
                     "description": "是否有仓单-卖方 - 0:无仓单 1:有仓单",
                     "type": "integer"
                 },
+                "minivalue": {
+                    "description": "现货商品最小变动值",
+                    "type": "integer"
+                },
                 "modifytime": {
                     "description": "修改时间(过户时间)",
                     "type": "string"
@@ -30472,6 +30496,10 @@
                     "description": "指定方",
                     "type": "string"
                 },
+                "minivalue": {
+                    "description": "现货商品最小变动值",
+                    "type": "integer"
+                },
                 "optioncompare": {
                     "description": "选择项比较串【{选择项ID}＋{冒号}+选择项值 } ，逗号分隔，头尾加逗号】-- 所有选择项拼接，用于比较",
                     "type": "string"
@@ -30605,6 +30633,10 @@
                     "description": "对手方",
                     "type": "string"
                 },
+                "minivalue": {
+                    "description": "现货商品最小变动值",
+                    "type": "integer"
+                },
                 "optioncompare": {
                     "description": "选择项比较串【{选择项ID}＋{冒号}+选择项值 } ，逗号分隔，头尾加逗号】-- 所有选择项拼接，用于比较",
                     "type": "string"

docs/swagger.yaml

@@ -13485,6 +13485,9 @@ definitions:
       ladingbillid:
         description: 提单ID(208+Unix秒时间戳(10位)+xxxxxx)
         type: string
+      minivalue:
+        description: 现货商品最小变动值
+        type: integer
       optioncompare:
         description: 选择项比较串【{选择项ID}＋{冒号}+选择项值 } ，逗号分隔，头尾加逗号】-- 所有选择项拼接，用于比较
         type: string
@@ -13581,6 +13584,9 @@ definitions:
       marketid:
         description: 市场ID
         type: integer
+      minivalue:
+        description: 现货商品最小变动值
+        type: integer
       optioncompare:
         description: 选择项比较串【{选择项ID}＋{冒号}+选择项值 } ，逗号分隔，头尾加逗号】-- 所有选择项拼接，用于比较
         type: string
@@ -13676,6 +13682,9 @@ definitions:
       goodsid:
         description: 商品id(浮动价列表才有)
         type: integer
+      minivalue:
+        description: 现货商品最小变动值
+        type: integer
       sellprice:
         description: 卖价
         type: number
@@ -13724,6 +13733,9 @@ definitions:
       fixedprice:
         description: 买(卖)价
         type: number
+      minivalue:
+        description: 现货商品最小变动值
+        type: integer
       orderqty:
         description: 买(卖)量(=委托量-成交量)
         type: number
@@ -13814,6 +13826,9 @@ definitions:
       middleuserid:
         description: 中间商用户ID
         type: integer
+      minivalue:
+        description: 现货商品最小变动值
+        type: integer
       optioncompare:
         description: 选择项比较串【{选择项ID}＋{冒号}+选择项值 } ，逗号分隔，头尾加逗号】-- 所有选择项拼接，用于比较
         type: string
@@ -13941,6 +13956,9 @@ definitions:
       haswr:
         description: 是否有仓单-卖方 - 0:无仓单 1:有仓单
         type: integer
+      minivalue:
+        description: 现货商品最小变动值
+        type: integer
       modifytime:
         description: 修改时间(过户时间)
         type: string
@@ -14031,6 +14049,9 @@ definitions:
       matchusername:
         description: 指定方
         type: string
+      minivalue:
+        description: 现货商品最小变动值
+        type: integer
       optioncompare:
         description: 选择项比较串【{选择项ID}＋{冒号}+选择项值 } ，逗号分隔，头尾加逗号】-- 所有选择项拼接，用于比较
         type: string
@@ -14131,6 +14152,9 @@ definitions:
       matchusername:
         description: 对手方
         type: string
+      minivalue:
+        description: 现货商品最小变动值
+        type: integer
       optioncompare:
         description: 选择项比较串【{选择项ID}＋{冒号}+选择项值 } ，逗号分隔，头尾加逗号】-- 所有选择项拼接，用于比较
         type: string

models/wrTrade2.go

@@ -37,6 +37,7 @@ type WrOrderQuote struct {
 	GOODSCODE         string           `json:"goodscode"  xorm:"'GOODSCODE'"`                                 // 商品合约(浮动价列表才有)
 	DELIVERYMONTH     string           `json:"deliverymonth"  xorm:"'DELIVERYMONTH'"`                         // 交收月
 	ENUMDICNAME       string           `json:"enumdicname" xorm:"'enumdicname'"`                              // 单位名称
+	MINIVALUE         int32            `json:"minivalue"  xorm:"'MINIVALUE'"`                                 // 现货商品最小变动值
 	PageEx            `xorm:"extends"` // 页码信息
 
 	HasWr       int32  `json:"-" form:"haswr"`       // 是否有仓单 0-没有 1-有
@@ -100,6 +101,7 @@ func (r *WrOrderQuote) buildSqlFixedPrice() string {
 		"       h.warehousecode," +
 		"       wg.wrstandardname," +
 		"       wg.wrstandardcode," +
+		"       wg.minivalue," +
 		"       wg.wrstandardname || w.wrfactortypename2 as wrgoodsname," +
 		"       e.enumdicname" +
 		"  from wrQuote k" +
@@ -203,6 +205,7 @@ func (r *WrOrderQuote) buildSqlPriceMove() string {
 		"       h.warehousecode," +
 		"       wg.wrstandardname," +
 		"       wg.wrstandardcode," +
+		"       wg.minivalue," +
 		"       wg.wrstandardname || w.wrfactortypename2 as wrgoodsname," +
 		"       e.enumdicname" +
 		"  from wrQuote k" +
@@ -263,6 +266,7 @@ type WrOrderQuoteDetail struct {
 	PRICEMOVE      float64 `json:"pricemove"  xorm:"PRICEMOVE"`                  // 买(卖)升贴水- 基差
 	USERNAME       string  `json:"username"  xorm:"'USERNAME'"`                  // 购买方(销售方)
 	ENUMDICNAME    string  `json:"enumdicname" xorm:"'enumdicname'"`             // 单位名称
+	MINIVALUE      int32   `json:"minivalue"  xorm:"'MINIVALUE'"`                // 现货商品最小变动值
 	PageEx         `xorm:"extends"`
 
 	WRFACTORTYPEID int64 `json:"-" form:"wrfactortypeid"` // 仓单要素id
@@ -288,6 +292,7 @@ func (r *WrOrderQuoteDetail) buildSql() string {
 		"       u.accountname as username," +
 		"       c.goodsid," +
 		"       c.goodscode," +
+		"       wd.minivalue," +
 		"       e.enumdicname" +
 		"  from WRTRADE_ORDERDETAIL t" +
 		"  left join WRTRADE_GOODSCONFIG c" +
@@ -351,6 +356,7 @@ type Wr2FactorType struct {
 	DELIVERYGOODSNAME string `json:"deliverygoodsname"  xorm:"'DELIVERYGOODSNAME'"` // 品种名称
 	ENUMDICNAME       string `json:"enumdicname" xorm:"'enumdicname'"`              // 单位名称
 	WAREHOUSENAME     string `json:"warehousename"  xorm:"'WAREHOUSENAME'"`         // 仓库名称
+	MINIVALUE         int32  `json:"minivalue"  xorm:"'MINIVALUE'"`                 // 现货商品最小变动值
 
 	WRTYPENAME string `json:"wrtypename" xorm:"'WRTYPENAME'"` // 商品
 }
@@ -462,7 +468,7 @@ func (r *WrPosition) buildSql1() string {
 		"    from tmp k" +
 		"   where 1 = 1" +
 		"   group by k.deliverygoodsid, k.wrstandardname, k.wrtypename, k.wrstandardid)" +
-		"select h.*, g.deliverygoodsname, g.deliverygoodscode, e.enumdicname" +
+		"select h.*, g.deliverygoodsname, g.deliverygoodscode, e.enumdicname, wd.minivalue" +
 		"  from hld h" +
 		"  left join deliverygoods g" +
 		"    on h.deliverygoodsid = g.deliverygoodsid" +
@@ -513,6 +519,7 @@ func (r *WrPosition) buildSql3() string {
 		"       dg.deliverygoodsname," +
 		"       wd.wrstandardcode," +
 		"       wd.wrstandardname," +
+		"       wd.minivalue," +
 		"       h.warehousecode," +
 		"       h.warehousename," +
 		"       e.enumdicname" +
@@ -1227,6 +1234,7 @@ func (r *WrHoldLB) buildSql() string {
 		"         g.deliverygoodsname," +
 		"         w.wrstandardcode," +
 		"         w.wrstandardname," +
+		"         w.minivalue," +
 		"         h.warehousecode," +
 		"         h.warehousename," +
 		"         e.enumdicname," +