1.查仓单持有记录增加筛选条件

controllers/wrTrade2/qryWrTrade.go

@@ -180,6 +180,9 @@ func QueryPerformancePlan(c *gin.Context) {
 // @Produce json
 // @Security ApiKeyAuth
 // @Param accountid query int true "资金账号"
+// @Param warehouseid query int false "仓库id"
+// @Param deliverygoodsid query int false "品种id"
+// @Param wrstandardid query int false "品类id"
 // @Success 200 {array} models.WrHoldLB
 // @Failure 500 {object} app.Response
 // @Router /WrTrade2/QueryHoldLB [get]

docs/docs.go

@@ -11040,6 +11040,24 @@ var doc = `{
                         "name": "accountid",
                         "in": "query",
                         "required": true
+                    },
+                    {
+                        "type": "integer",
+                        "description": "仓库id",
+                        "name": "warehouseid",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "品种id",
+                        "name": "deliverygoodsid",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "品类id",
+                        "name": "wrstandardid",
+                        "in": "query"
                     }
                 ],
                 "responses": {

docs/swagger.json

@@ -11024,6 +11024,24 @@
                         "name": "accountid",
                         "in": "query",
                         "required": true
+                    },
+                    {
+                        "type": "integer",
+                        "description": "仓库id",
+                        "name": "warehouseid",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "品种id",
+                        "name": "deliverygoodsid",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "品类id",
+                        "name": "wrstandardid",
+                        "in": "query"
                     }
                 ],
                 "responses": {

docs/swagger.yaml

@@ -23094,6 +23094,18 @@ paths:
         name: accountid
         required: true
         type: integer
+      - description: 仓库id
+        in: query
+        name: warehouseid
+        type: integer
+      - description: 品种id
+        in: query
+        name: deliverygoodsid
+        type: integer
+      - description: 品类id
+        in: query
+        name: wrstandardid
+        type: integer
       produces:
       - application/json
       responses:

models/wrTrade2.go

@@ -1191,6 +1191,7 @@ func (r *WrHoldLB) buildSql() string {
 		"         t.wrfactortypename," +
 		"         t.wrstandardid," +
 		"         t.deliverygoodsid," +
+		"         t.warehouseid," +
 		"         g.deliverygoodscode," +
 		"         g.deliverygoodsname," +
 		"         w.wrstandardcode," +
@@ -1227,6 +1228,9 @@ func (r *WrHoldLB) buildSql() string {
 		" LEFT JOIN tmp on t.wrfactortypeid= tmp.wrfactortypeid" +
 		" WHERE 1 = 1"
 	sqlId.And("t.ACCOUNTID", r.ACCOUNTID)
+	sqlId.AndEx("tmp.DELIVERYGOODSID", r.DELIVERYGOODSID, r.DELIVERYGOODSID > 0)
+	sqlId.AndEx("tmp.WRSTANDARDID", r.WRSTANDARDID, r.WRSTANDARDID > 0)
+	sqlId.AndEx("tmp.WAREHOUSEID", r.WAREHOUSEID, r.WAREHOUSEID > 0)
 	return sqlId.String()
 }