增加出参

controllers/ferroalloy/trade.go

@@ -35,7 +35,7 @@ func QueryTHJPurchaseTradeDetail(c *gin.Context) {
 // @Param    page     query    int    false "页码"
 // @Param    pagesize query    int    false "每页条数"
 // @Success  200      {array}  models.THJTradeData
-// @Failure  500          {object} app.Response
+// @Failure  500         {object} app.Response
 // @Router   /Ferroalloy/QueryTHJTradeData [get]
 // @Tags     铁合金
 func QueryTHJTradeData(c *gin.Context) {
@@ -89,7 +89,7 @@ func QueryTHJPurchaseTransferOrderDetail(c *gin.Context) {
 // @Param    page     query    int false "页码"
 // @Param    pagesize query    int false "每页条数"
 // @Success  200          {array}  models.PromotionIncome
-// @Failure  500         {object} app.Response
+// @Failure  500          {object} app.Response
 // @Router   /Ferroalloy/QueryTHJPromotionIncome [get]
 // @Tags     铁合金
 func QueryTHJPromotionIncome(c *gin.Context) {

controllers/guangzuan/tradeService.go

@@ -18,8 +18,8 @@ import (
 // @Security Group
 // @Param    userid   query    int    true  "用户ID"
 // @Param    executestatus query    int false "执行状态 - 1:未生效 2:进行中 3:已结束"
-// @Param    page     query    int    false "页码"
-// @Param    pagesize query    int    false "每页条数"
+// @Param    page          query    int false "页码"
+// @Param    pagesize      query    int false "每页条数"
 // @Success  200           {array}  models.GzcjjcorderM
 // @Failure  500     {object} app.Response
 // @Router   /Guangzuan/QueryGZCJJCOrder [get]
@@ -39,8 +39,8 @@ func QueryGZCJJCOrder(c *gin.Context) {
 // @Security Group
 // @Param    userid        query    int true  "用户ID"
 // @Param    orderid  query    string false "单据ID"
-// @Param    page          query    int false "页码"
-// @Param    pagesize      query    int false "每页条数"
+// @Param    page     query    int    false "页码"
+// @Param    pagesize query    int    false "每页条数"
 // @Success  200      {array}  models.GzcjjcorderdetailM
 // @Failure  500           {object} app.Response
 // @Router   /Guangzuan/QueryGZCJJCOrderDetail [get]

docs/docs.go

@@ -37937,6 +37937,10 @@ const docTemplate = `{
                 "warehousenamedisplay": {
                     "type": "string"
                 },
+                "weight": {
+                    "description": "总重量(克拉重量) - 类型：1，2，3，4，5",
+                    "type": "number"
+                },
                 "zscategorydisplay": {
                     "type": "string"
                 },

docs/swagger.json

@@ -37928,6 +37928,10 @@
                 "warehousenamedisplay": {
                     "type": "string"
                 },
+                "weight": {
+                    "description": "总重量(克拉重量) - 类型：1，2，3，4，5",
+                    "type": "number"
+                },
                 "zscategorydisplay": {
                     "type": "string"
                 },

docs/swagger.yaml

@@ -13643,6 +13643,9 @@ definitions:
         type: integer
       warehousenamedisplay:
         type: string
+      weight:
+        description: 总重量(克拉重量) - 类型：1，2，3，4，5
+        type: number
       zscategorydisplay:
         type: string
       zscerttypedisplay:

models/guangzuan.go

@@ -2070,6 +2070,8 @@ type MyPerformanc struct {
 	SIZEDISPLAY                string  `json:"sizedisplay" xorm:"SIZEDISPLAY"`                               // 尺寸
 	GOODSNO                    string  `json:"goodsno" xorm:"GOODSNO"`                                       // 商品编号
 
+	WEIGHT float64 `json:"weight" xorm:"WEIGHT"` // 总重量(克拉重量) - 类型：1，2，3，4，5
+
 	USERID    int64  `json:"-" form:"userid" binding:"required"` // 用户ID
 	BuyOrSell int64  `json:"buyorsell" form:"buyorsell"`         // 方向 - 0:买 1:卖
 	IsHis     bool   `json:"-" form:"ishis"`                     // 是否历史查询
@@ -2137,7 +2139,8 @@ func (r *MyPerformanc) buildSql() string {
 			wr.SIZE1 IS NOT NULL AND wr.SIZE2 IS NOT NULL AND wr.SIZE2 IS NOT NULL THEN wr.SIZE1 || '*' || wr.SIZE2 || '*' || wr.SIZE3
 			ELSE wr.SIZE1
 		END AS SIZEDISPLAY,
-		ps.REMAINDAYS
+		ps.REMAINDAYS,
+		wr.WEIGHT
 	FROM PerformancePlan pp
 	inner join PerformanceStep ps on pp.curstepid = ps.performancestepid
 	inner join wrtrade_tradedetail td on pp.relatedorderid = td.wrtradedetailid