Thjpurchasetransfer\WrOrderDetail\WrTradeDetail: 添加返回字段 UNITID

docs/docs.go

@@ -44534,6 +44534,10 @@ const docTemplate = `{
                     "description": "转让交易日",
                     "type": "string"
                 },
+                "unitid": {
+                    "description": "现货商品单位ID",
+                    "type": "integer"
+                },
                 "warehouseid": {
                     "description": "仓库ID",
                     "type": "integer"
@@ -48240,6 +48244,10 @@ const docTemplate = `{
                     "description": "成交数量",
                     "type": "number"
                 },
+                "unitid": {
+                    "description": "现货商品单位ID",
+                    "type": "integer"
+                },
                 "userid": {
                     "description": "用户ID",
                     "type": "integer"
@@ -50171,6 +50179,10 @@ const docTemplate = `{
                     "description": "成交时间",
                     "type": "string"
                 },
+                "unitid": {
+                    "description": "现货商品单位ID",
+                    "type": "integer"
+                },
                 "userid": {
                     "description": "用户ID",
                     "type": "integer"

docs/swagger.json

@@ -44525,6 +44525,10 @@
                     "description": "转让交易日",
                     "type": "string"
                 },
+                "unitid": {
+                    "description": "现货商品单位ID",
+                    "type": "integer"
+                },
                 "warehouseid": {
                     "description": "仓库ID",
                     "type": "integer"
@@ -48231,6 +48235,10 @@
                     "description": "成交数量",
                     "type": "number"
                 },
+                "unitid": {
+                    "description": "现货商品单位ID",
+                    "type": "integer"
+                },
                 "userid": {
                     "description": "用户ID",
                     "type": "integer"
@@ -50162,6 +50170,10 @@
                     "description": "成交时间",
                     "type": "string"
                 },
+                "unitid": {
+                    "description": "现货商品单位ID",
+                    "type": "integer"
+                },
                 "userid": {
                     "description": "用户ID",
                     "type": "integer"

docs/swagger.yaml

@@ -18997,6 +18997,9 @@ definitions:
       transfertradedate:
         description: 转让交易日
         type: string
+      unitid:
+        description: 现货商品单位ID
+        type: integer
       warehouseid:
         description: 仓库ID
         type: integer
@@ -21760,6 +21763,9 @@ definitions:
       tradeqty:
         description: 成交数量
         type: number
+      unitid:
+        description: 现货商品单位ID
+        type: integer
       userid:
         description: 用户ID
         type: integer
@@ -23201,6 +23207,9 @@ definitions:
       tradetime:
         description: 成交时间
         type: string
+      unitid:
+        description: 现货商品单位ID
+        type: integer
       userid:
         description: 用户ID
         type: integer

models/ferroalloy.go

@@ -1258,6 +1258,8 @@ type Thjpurchasetransfer struct {
 	USERID    int64 `json:"-" xorm:"-" form:"userid" binding:"required"`                    // 用户ID
 	ORDERTYPE int   `json:"ordertype" xorm:"ORDERTYPE" form:"ordertype" binding:"required"` // 类型 - 1:转让委托 - 挂牌中(卖方) 2:转让成交(卖方) 3:转让委托 - 已完成(卖方)
 
+	UNITID int32 `json:"unitid" xorm:"UNITID"` // 现货商品单位ID
+
 	PageEx `xorm:"extends"` // 页码信息
 }
 
@@ -1295,6 +1297,7 @@ func (r *Thjpurchasetransfer) buildSql() string {
 		t.TRANSFERTRADEDATE,
 		t.TRANSFERSTATUS,
 		t.HANDLESTATUS,
+		wr.UNITID,
 		%v ORDERTYPE
 	from THJ_PurchaseTransfer t
 	inner join THJ_PurchaseTradeDetail p on t.wrtradedetailid = p.wrtradedetailid

models/wrTrade2.go

@@ -703,6 +703,7 @@ type WrOrderDetail struct {
 	SUBNUM                int32    `json:"-"  xorm:"SUBNUM" form:"subnum"`                        // 提单子单号
 	BANNERPICURL          string   `json:"bannerpicurl"  xorm:"BANNERPICURL"`                     // Banner图
 	THUMURLS              string   `json:"thumurls"  xorm:"thumurls"`                             // 缩略图
+	UNITID                int32    `json:"unitid" xorm:"UNITID"`                                  // 现货商品单位ID
 
 	Wr2FactorType `xorm:"extends"`
 	PageEx        `xorm:"extends"`
@@ -765,7 +766,8 @@ with tmp as
          h.warehousecode,
          h.warehousename,
          e.enumdicname,
-         w.wrstandardname || t.wrfactortypename2 as wrtypename
+         w.wrstandardname || t.wrfactortypename2 as wrtypename,
+		 w.unitid
     from wrfactortype t
     left join deliverygoods g
       on t.deliverygoodsid = g.deliverygoodsid
@@ -988,6 +990,7 @@ type WrTradeDetail struct {
 
 	BEGINDATE string `json:"begindate" form:"begindate"` // 开始交易日(yyyymmdd)
 	ENDDATE   string `json:"enddate" form:"enddate"`     // 结束交易日(yyyymmdd)
+	UNITID    int32  `json:"unitid" xorm:"UNITID"`       // 现货商品单位ID
 }
 
 func (r *WrTradeDetail) calc() {
@@ -1010,7 +1013,8 @@ func (r *WrTradeDetail) buildSql() string {
 		"         h.warehousecode," +
 		"         h.warehousename," +
 		"         e.enumdicname," +
-		"         w.wrstandardname || t.wrfactortypename2 as wrtypename" +
+		"         w.wrstandardname || t.wrfactortypename2 as wrtypename," +
+		"         w.unitid" +
 		"    from wrfactortype t" +
 		"    left join deliverygoods g" +
 		"      on t.deliverygoodsid = g.deliverygoodsid" +
@@ -1061,7 +1065,8 @@ func (r *WrTradeDetail) buildSqlHis() string {
 		"         h.warehousecode," +
 		"         h.warehousename," +
 		"         e.enumdicname," +
-		"         w.wrstandardname || t.wrfactortypename2 as wrtypename" +
+		"         w.wrstandardname || t.wrfactortypename2 as wrtypename," +
+		"         w.unitid" +
 		"    from wrfactortype t" +
 		"    left join deliverygoods g" +
 		"      on t.deliverygoodsid = g.deliverygoodsid" +