zhou.xiaoning 3 gadi atpakaļ
vecāks
revīzija
4d910e9dc1
5 mainītis faili ar 760 papildinājumiem un 16 dzēšanām
  1. 1 1
      controllers/guangzuan/wrposition.go
  2. 278 5
      docs/docs.go
  3. 278 5
      docs/swagger.json
  4. 202 4
      docs/swagger.yaml
  5. 1 1
      models/ermcpCommon.go

+ 1 - 1
controllers/guangzuan/wrposition.go

@@ -19,7 +19,7 @@ import (
 // @Param    zsallproperties query    string false "商品(查询字段-模糊查询)"
 // @Param    zscategory      query    int    false "钻石分类枚举ID"
 // @Param    warehouseid     query    int    false "仓库ID"
-// @Success  200             {array}  models.GZWarehouseinfo
+// @Success  200             {array}  models.MyWRPosition
 // @Failure  500             {object} app.Response
 // @Router   /Guangzuan/QueryMyWRPosition [get]
 // @Tags     广钻

+ 278 - 5
docs/docs.go

@@ -7676,7 +7676,7 @@ const docTemplate = `{
                         "schema": {
                             "type": "array",
                             "items": {
-                                "$ref": "#/definitions/models.GZWarehouseinfo"
+                                "$ref": "#/definitions/models.MyWRPosition"
                             }
                         }
                     },
@@ -32457,6 +32457,279 @@ const docTemplate = `{
                 }
             }
         },
+        "models.MyWRPosition": {
+            "type": "object",
+            "required": [
+                "wruserid"
+            ],
+            "properties": {
+                "cerno": {
+                    "description": "证书编号 - 类型:2,4,5",
+                    "type": "string"
+                },
+                "cpcertno": {
+                    "description": "金伯利证书编号 - 类型:3",
+                    "type": "string"
+                },
+                "ffreezeqty": {
+                    "description": "期初均价",
+                    "type": "number"
+                },
+                "ftotalqty": {
+                    "description": "期初均价",
+                    "type": "number"
+                },
+                "goodsno": {
+                    "description": "商品编号",
+                    "type": "string"
+                },
+                "imagepath": {
+                    "description": "商品照片(相对地址)",
+                    "type": "string"
+                },
+                "isvalid": {
+                    "description": "是否有效 - 0:无效 1:有效",
+                    "type": "integer"
+                },
+                "kppath": {
+                    "description": "金伯利证书图片(相对地址) - 类型:3",
+                    "type": "string"
+                },
+                "kpweight": {
+                    "description": "金伯利证书重量 - 类型:3",
+                    "type": "string"
+                },
+                "marketprice": {
+                    "description": "市场价",
+                    "type": "string"
+                },
+                "origin": {
+                    "description": "原产地 - 类型:3",
+                    "type": "string"
+                },
+                "price": {
+                    "description": "总价(价格) - 类型:1,2,3,4,5",
+                    "type": "number"
+                },
+                "priceper": {
+                    "description": "克拉单价 - 类型:1,2,3,5",
+                    "type": "string"
+                },
+                "remark": {
+                    "description": "备注",
+                    "type": "string"
+                },
+                "sellmobile": {
+                    "description": "手机号码(加密存储)",
+                    "type": "string"
+                },
+                "sellusername": {
+                    "description": "账户名称(机构名称)",
+                    "type": "string"
+                },
+                "settingmaterial": {
+                    "description": "镶嵌材料 - 类型:4",
+                    "type": "string"
+                },
+                "size1": {
+                    "description": "尺寸1 - 类型:2,4,5",
+                    "type": "string"
+                },
+                "size2": {
+                    "description": "尺寸2 - 类型:2,4,5",
+                    "type": "string"
+                },
+                "size3": {
+                    "description": "尺寸3 - 类型:2,4,5",
+                    "type": "string"
+                },
+                "stonedesc": {
+                    "description": "配石描述 - 类型:4",
+                    "type": "string"
+                },
+                "userid": {
+                    "description": "用户ID",
+                    "type": "integer"
+                },
+                "warehouseid": {
+                    "description": "仓库ID",
+                    "type": "integer"
+                },
+                "warehousenamedisplay": {
+                    "type": "string"
+                },
+                "weight": {
+                    "description": "总重量(克拉重量) - 类型:1,2,3,4,5",
+                    "type": "number"
+                },
+                "weightavg": {
+                    "description": "平均单颗重量 - 类型:1,3",
+                    "type": "number"
+                },
+                "wrpath": {
+                    "description": "仓单扫描件(相对地址)",
+                    "type": "string"
+                },
+                "wrstandardid": {
+                    "description": "现货商品ID",
+                    "type": "integer"
+                },
+                "wruserid": {
+                    "description": "登录用户ID",
+                    "type": "integer"
+                },
+                "zscategory": {
+                    "description": "钻石分类 - 枚举”ZSCategory“",
+                    "type": "integer"
+                },
+                "zscategorydisplay": {
+                    "type": "string"
+                },
+                "zscerttype": {
+                    "description": "证书类型 - 枚举”ZSCertType“ - 类型:2,4,5",
+                    "type": "integer"
+                },
+                "zscerttypedisplay": {
+                    "type": "string"
+                },
+                "zsclaritytype1": {
+                    "description": "净度1 - 枚举”ZSClarityType“ - 类型:1,2,3,4,5",
+                    "type": "integer"
+                },
+                "zsclaritytype1display": {
+                    "type": "string"
+                },
+                "zsclaritytype2": {
+                    "description": "净度2 - 枚举”ZSClarityType“ - 类型:1,3",
+                    "type": "integer"
+                },
+                "zsclaritytype2display": {
+                    "type": "string"
+                },
+                "zscolortype1": {
+                    "description": "颜色1 - 枚举”ZSColorType“ - 类型:1,2,3,4",
+                    "type": "integer"
+                },
+                "zscolortype1display": {
+                    "type": "string"
+                },
+                "zscolortype2": {
+                    "description": "颜色2 - 枚举”ZSColorType“ -  类型:1,3",
+                    "type": "integer"
+                },
+                "zscolortype2display": {
+                    "type": "string"
+                },
+                "zscrystaltype": {
+                    "description": "晶型范围 - 枚举“ZSCrystalType“ - 类型:3, 多个,逗号分隔",
+                    "type": "string"
+                },
+                "zscrystaltypedisplay": {
+                    "type": "string"
+                },
+                "zscurrencytype": {
+                    "description": "货币类型 - 枚举“ZSCurrencyType”",
+                    "type": "integer"
+                },
+                "zscurrencytypedisplay": {
+                    "type": "string"
+                },
+                "zscurrencytypedisplayunit": {
+                    "type": "string"
+                },
+                "zscuttype1": {
+                    "description": "切工1 - 枚举”ZSCutType“ - 类型:1,2,4,5",
+                    "type": "integer"
+                },
+                "zscuttype1display": {
+                    "type": "string"
+                },
+                "zscuttype2": {
+                    "description": "切工2 - 枚举”ZSCutType“ - 类型:1",
+                    "type": "integer"
+                },
+                "zscuttype2display": {
+                    "type": "string"
+                },
+                "zsczcolor1type": {
+                    "description": "彩钻颜色1 - 枚举”ZSCZColor1Type“ - 类型:5",
+                    "type": "integer"
+                },
+                "zsczcolor1typedisplay": {
+                    "type": "string"
+                },
+                "zsczcolor2type": {
+                    "description": "彩钻颜色2 - 枚举”ZSCZColor2Type“ - 类型:5",
+                    "type": "integer"
+                },
+                "zsczcolor2typedisplay": {
+                    "type": "string"
+                },
+                "zsczcolor3type": {
+                    "description": "彩钻颜色3 - 枚举”ZSCZColor3Type“ - 类型:5",
+                    "type": "integer"
+                },
+                "zsczcolor3typedisplay": {
+                    "type": "string"
+                },
+                "zsfluorescencetype1": {
+                    "description": "荧光1 - 枚举”ZSFluorescenceType“ - 类型:1,2,3,4,5",
+                    "type": "integer"
+                },
+                "zsfluorescencetype1display": {
+                    "type": "string"
+                },
+                "zsfluorescencetype2": {
+                    "description": "荧光2 - 枚举”ZSFluorescenceType” - 类型:1,3",
+                    "type": "integer"
+                },
+                "zsfluorescencetype2display": {
+                    "type": "string"
+                },
+                "zspolishtype1": {
+                    "description": "抛光度1 - 枚举”ZSPolishType“ - 类型:1,2,4,5",
+                    "type": "integer"
+                },
+                "zspolishtype1display": {
+                    "type": "string"
+                },
+                "zspolishtype2": {
+                    "description": "抛光度2 - 枚举”ZSPolishType“ - 类型:1",
+                    "type": "integer"
+                },
+                "zspolishtype2display": {
+                    "type": "string"
+                },
+                "zsshapetype": {
+                    "description": "形状 - 枚举”ZSShapeType“ - 类型:1,2,4,5 ;(1为多个,逗号分隔)",
+                    "type": "string"
+                },
+                "zsshapetypedisplay": {
+                    "type": "string"
+                },
+                "zsstyletype": {
+                    "description": "款式 - 类型:4",
+                    "type": "integer"
+                },
+                "zsstyletypedisplay": {
+                    "type": "string"
+                },
+                "zssymmetrytype1": {
+                    "description": "对称度1 - 枚举”ZSSymmetryType“ - 类型:1,2,4,5",
+                    "type": "integer"
+                },
+                "zssymmetrytype1display": {
+                    "type": "string"
+                },
+                "zssymmetrytype2": {
+                    "description": "对称度2 - 枚举”ZSSymmetryType“ - 类型:1",
+                    "type": "integer"
+                },
+                "zssymmetrytype2display": {
+                    "type": "string"
+                }
+            }
+        },
         "models.NewFuncmenulist": {
             "type": "object",
             "required": [
@@ -37066,10 +37339,6 @@ const docTemplate = `{
                 "zscategory"
             ],
             "properties": {
-                "TOTAL": {
-                    "description": "总条数",
-                    "type": "integer"
-                },
                 "origin": {
                     "description": "原产地",
                     "type": "string"
@@ -37082,6 +37351,10 @@ const docTemplate = `{
                     "description": "每页大小",
                     "type": "integer"
                 },
+                "total": {
+                    "description": "总条数",
+                    "type": "integer"
+                },
                 "warehouseid": {
                     "description": "仓库ID",
                     "type": "integer"

+ 278 - 5
docs/swagger.json

@@ -7667,7 +7667,7 @@
                         "schema": {
                             "type": "array",
                             "items": {
-                                "$ref": "#/definitions/models.GZWarehouseinfo"
+                                "$ref": "#/definitions/models.MyWRPosition"
                             }
                         }
                     },
@@ -32448,6 +32448,279 @@
                 }
             }
         },
+        "models.MyWRPosition": {
+            "type": "object",
+            "required": [
+                "wruserid"
+            ],
+            "properties": {
+                "cerno": {
+                    "description": "证书编号 - 类型:2,4,5",
+                    "type": "string"
+                },
+                "cpcertno": {
+                    "description": "金伯利证书编号 - 类型:3",
+                    "type": "string"
+                },
+                "ffreezeqty": {
+                    "description": "期初均价",
+                    "type": "number"
+                },
+                "ftotalqty": {
+                    "description": "期初均价",
+                    "type": "number"
+                },
+                "goodsno": {
+                    "description": "商品编号",
+                    "type": "string"
+                },
+                "imagepath": {
+                    "description": "商品照片(相对地址)",
+                    "type": "string"
+                },
+                "isvalid": {
+                    "description": "是否有效 - 0:无效 1:有效",
+                    "type": "integer"
+                },
+                "kppath": {
+                    "description": "金伯利证书图片(相对地址) - 类型:3",
+                    "type": "string"
+                },
+                "kpweight": {
+                    "description": "金伯利证书重量 - 类型:3",
+                    "type": "string"
+                },
+                "marketprice": {
+                    "description": "市场价",
+                    "type": "string"
+                },
+                "origin": {
+                    "description": "原产地 - 类型:3",
+                    "type": "string"
+                },
+                "price": {
+                    "description": "总价(价格) - 类型:1,2,3,4,5",
+                    "type": "number"
+                },
+                "priceper": {
+                    "description": "克拉单价 - 类型:1,2,3,5",
+                    "type": "string"
+                },
+                "remark": {
+                    "description": "备注",
+                    "type": "string"
+                },
+                "sellmobile": {
+                    "description": "手机号码(加密存储)",
+                    "type": "string"
+                },
+                "sellusername": {
+                    "description": "账户名称(机构名称)",
+                    "type": "string"
+                },
+                "settingmaterial": {
+                    "description": "镶嵌材料 - 类型:4",
+                    "type": "string"
+                },
+                "size1": {
+                    "description": "尺寸1 - 类型:2,4,5",
+                    "type": "string"
+                },
+                "size2": {
+                    "description": "尺寸2 - 类型:2,4,5",
+                    "type": "string"
+                },
+                "size3": {
+                    "description": "尺寸3 - 类型:2,4,5",
+                    "type": "string"
+                },
+                "stonedesc": {
+                    "description": "配石描述 - 类型:4",
+                    "type": "string"
+                },
+                "userid": {
+                    "description": "用户ID",
+                    "type": "integer"
+                },
+                "warehouseid": {
+                    "description": "仓库ID",
+                    "type": "integer"
+                },
+                "warehousenamedisplay": {
+                    "type": "string"
+                },
+                "weight": {
+                    "description": "总重量(克拉重量) - 类型:1,2,3,4,5",
+                    "type": "number"
+                },
+                "weightavg": {
+                    "description": "平均单颗重量 - 类型:1,3",
+                    "type": "number"
+                },
+                "wrpath": {
+                    "description": "仓单扫描件(相对地址)",
+                    "type": "string"
+                },
+                "wrstandardid": {
+                    "description": "现货商品ID",
+                    "type": "integer"
+                },
+                "wruserid": {
+                    "description": "登录用户ID",
+                    "type": "integer"
+                },
+                "zscategory": {
+                    "description": "钻石分类 - 枚举”ZSCategory“",
+                    "type": "integer"
+                },
+                "zscategorydisplay": {
+                    "type": "string"
+                },
+                "zscerttype": {
+                    "description": "证书类型 - 枚举”ZSCertType“ - 类型:2,4,5",
+                    "type": "integer"
+                },
+                "zscerttypedisplay": {
+                    "type": "string"
+                },
+                "zsclaritytype1": {
+                    "description": "净度1 - 枚举”ZSClarityType“ - 类型:1,2,3,4,5",
+                    "type": "integer"
+                },
+                "zsclaritytype1display": {
+                    "type": "string"
+                },
+                "zsclaritytype2": {
+                    "description": "净度2 - 枚举”ZSClarityType“ - 类型:1,3",
+                    "type": "integer"
+                },
+                "zsclaritytype2display": {
+                    "type": "string"
+                },
+                "zscolortype1": {
+                    "description": "颜色1 - 枚举”ZSColorType“ - 类型:1,2,3,4",
+                    "type": "integer"
+                },
+                "zscolortype1display": {
+                    "type": "string"
+                },
+                "zscolortype2": {
+                    "description": "颜色2 - 枚举”ZSColorType“ -  类型:1,3",
+                    "type": "integer"
+                },
+                "zscolortype2display": {
+                    "type": "string"
+                },
+                "zscrystaltype": {
+                    "description": "晶型范围 - 枚举“ZSCrystalType“ - 类型:3, 多个,逗号分隔",
+                    "type": "string"
+                },
+                "zscrystaltypedisplay": {
+                    "type": "string"
+                },
+                "zscurrencytype": {
+                    "description": "货币类型 - 枚举“ZSCurrencyType”",
+                    "type": "integer"
+                },
+                "zscurrencytypedisplay": {
+                    "type": "string"
+                },
+                "zscurrencytypedisplayunit": {
+                    "type": "string"
+                },
+                "zscuttype1": {
+                    "description": "切工1 - 枚举”ZSCutType“ - 类型:1,2,4,5",
+                    "type": "integer"
+                },
+                "zscuttype1display": {
+                    "type": "string"
+                },
+                "zscuttype2": {
+                    "description": "切工2 - 枚举”ZSCutType“ - 类型:1",
+                    "type": "integer"
+                },
+                "zscuttype2display": {
+                    "type": "string"
+                },
+                "zsczcolor1type": {
+                    "description": "彩钻颜色1 - 枚举”ZSCZColor1Type“ - 类型:5",
+                    "type": "integer"
+                },
+                "zsczcolor1typedisplay": {
+                    "type": "string"
+                },
+                "zsczcolor2type": {
+                    "description": "彩钻颜色2 - 枚举”ZSCZColor2Type“ - 类型:5",
+                    "type": "integer"
+                },
+                "zsczcolor2typedisplay": {
+                    "type": "string"
+                },
+                "zsczcolor3type": {
+                    "description": "彩钻颜色3 - 枚举”ZSCZColor3Type“ - 类型:5",
+                    "type": "integer"
+                },
+                "zsczcolor3typedisplay": {
+                    "type": "string"
+                },
+                "zsfluorescencetype1": {
+                    "description": "荧光1 - 枚举”ZSFluorescenceType“ - 类型:1,2,3,4,5",
+                    "type": "integer"
+                },
+                "zsfluorescencetype1display": {
+                    "type": "string"
+                },
+                "zsfluorescencetype2": {
+                    "description": "荧光2 - 枚举”ZSFluorescenceType” - 类型:1,3",
+                    "type": "integer"
+                },
+                "zsfluorescencetype2display": {
+                    "type": "string"
+                },
+                "zspolishtype1": {
+                    "description": "抛光度1 - 枚举”ZSPolishType“ - 类型:1,2,4,5",
+                    "type": "integer"
+                },
+                "zspolishtype1display": {
+                    "type": "string"
+                },
+                "zspolishtype2": {
+                    "description": "抛光度2 - 枚举”ZSPolishType“ - 类型:1",
+                    "type": "integer"
+                },
+                "zspolishtype2display": {
+                    "type": "string"
+                },
+                "zsshapetype": {
+                    "description": "形状 - 枚举”ZSShapeType“ - 类型:1,2,4,5 ;(1为多个,逗号分隔)",
+                    "type": "string"
+                },
+                "zsshapetypedisplay": {
+                    "type": "string"
+                },
+                "zsstyletype": {
+                    "description": "款式 - 类型:4",
+                    "type": "integer"
+                },
+                "zsstyletypedisplay": {
+                    "type": "string"
+                },
+                "zssymmetrytype1": {
+                    "description": "对称度1 - 枚举”ZSSymmetryType“ - 类型:1,2,4,5",
+                    "type": "integer"
+                },
+                "zssymmetrytype1display": {
+                    "type": "string"
+                },
+                "zssymmetrytype2": {
+                    "description": "对称度2 - 枚举”ZSSymmetryType“ - 类型:1",
+                    "type": "integer"
+                },
+                "zssymmetrytype2display": {
+                    "type": "string"
+                }
+            }
+        },
         "models.NewFuncmenulist": {
             "type": "object",
             "required": [
@@ -37057,10 +37330,6 @@
                 "zscategory"
             ],
             "properties": {
-                "TOTAL": {
-                    "description": "总条数",
-                    "type": "integer"
-                },
                 "origin": {
                     "description": "原产地",
                     "type": "string"
@@ -37073,6 +37342,10 @@
                     "description": "每页大小",
                     "type": "integer"
                 },
+                "total": {
+                    "description": "总条数",
+                    "type": "integer"
+                },
                 "warehouseid": {
                     "description": "仓库ID",
                     "type": "integer"

+ 202 - 4
docs/swagger.yaml

@@ -11971,6 +11971,204 @@ definitions:
     - coupontypeid
     - orderid
     type: object
+  models.MyWRPosition:
+    properties:
+      cerno:
+        description: 证书编号 - 类型:2,4,5
+        type: string
+      cpcertno:
+        description: 金伯利证书编号 - 类型:3
+        type: string
+      ffreezeqty:
+        description: 期初均价
+        type: number
+      ftotalqty:
+        description: 期初均价
+        type: number
+      goodsno:
+        description: 商品编号
+        type: string
+      imagepath:
+        description: 商品照片(相对地址)
+        type: string
+      isvalid:
+        description: 是否有效 - 0:无效 1:有效
+        type: integer
+      kppath:
+        description: 金伯利证书图片(相对地址) - 类型:3
+        type: string
+      kpweight:
+        description: 金伯利证书重量 - 类型:3
+        type: string
+      marketprice:
+        description: 市场价
+        type: string
+      origin:
+        description: 原产地 - 类型:3
+        type: string
+      price:
+        description: 总价(价格) - 类型:1,2,3,4,5
+        type: number
+      priceper:
+        description: 克拉单价 - 类型:1,2,3,5
+        type: string
+      remark:
+        description: 备注
+        type: string
+      sellmobile:
+        description: 手机号码(加密存储)
+        type: string
+      sellusername:
+        description: 账户名称(机构名称)
+        type: string
+      settingmaterial:
+        description: 镶嵌材料 - 类型:4
+        type: string
+      size1:
+        description: 尺寸1 - 类型:2,4,5
+        type: string
+      size2:
+        description: 尺寸2 - 类型:2,4,5
+        type: string
+      size3:
+        description: 尺寸3 - 类型:2,4,5
+        type: string
+      stonedesc:
+        description: 配石描述 - 类型:4
+        type: string
+      userid:
+        description: 用户ID
+        type: integer
+      warehouseid:
+        description: 仓库ID
+        type: integer
+      warehousenamedisplay:
+        type: string
+      weight:
+        description: 总重量(克拉重量) - 类型:1,2,3,4,5
+        type: number
+      weightavg:
+        description: 平均单颗重量 - 类型:1,3
+        type: number
+      wrpath:
+        description: 仓单扫描件(相对地址)
+        type: string
+      wrstandardid:
+        description: 现货商品ID
+        type: integer
+      wruserid:
+        description: 登录用户ID
+        type: integer
+      zscategory:
+        description: 钻石分类 - 枚举”ZSCategory“
+        type: integer
+      zscategorydisplay:
+        type: string
+      zscerttype:
+        description: 证书类型 - 枚举”ZSCertType“ - 类型:2,4,5
+        type: integer
+      zscerttypedisplay:
+        type: string
+      zsclaritytype1:
+        description: 净度1 - 枚举”ZSClarityType“ - 类型:1,2,3,4,5
+        type: integer
+      zsclaritytype1display:
+        type: string
+      zsclaritytype2:
+        description: 净度2 - 枚举”ZSClarityType“ - 类型:1,3
+        type: integer
+      zsclaritytype2display:
+        type: string
+      zscolortype1:
+        description: 颜色1 - 枚举”ZSColorType“ - 类型:1,2,3,4
+        type: integer
+      zscolortype1display:
+        type: string
+      zscolortype2:
+        description: 颜色2 - 枚举”ZSColorType“ -  类型:1,3
+        type: integer
+      zscolortype2display:
+        type: string
+      zscrystaltype:
+        description: 晶型范围 - 枚举“ZSCrystalType“ - 类型:3, 多个,逗号分隔
+        type: string
+      zscrystaltypedisplay:
+        type: string
+      zscurrencytype:
+        description: 货币类型 - 枚举“ZSCurrencyType”
+        type: integer
+      zscurrencytypedisplay:
+        type: string
+      zscurrencytypedisplayunit:
+        type: string
+      zscuttype1:
+        description: 切工1 - 枚举”ZSCutType“ - 类型:1,2,4,5
+        type: integer
+      zscuttype1display:
+        type: string
+      zscuttype2:
+        description: 切工2 - 枚举”ZSCutType“ - 类型:1
+        type: integer
+      zscuttype2display:
+        type: string
+      zsczcolor1type:
+        description: 彩钻颜色1 - 枚举”ZSCZColor1Type“ - 类型:5
+        type: integer
+      zsczcolor1typedisplay:
+        type: string
+      zsczcolor2type:
+        description: 彩钻颜色2 - 枚举”ZSCZColor2Type“ - 类型:5
+        type: integer
+      zsczcolor2typedisplay:
+        type: string
+      zsczcolor3type:
+        description: 彩钻颜色3 - 枚举”ZSCZColor3Type“ - 类型:5
+        type: integer
+      zsczcolor3typedisplay:
+        type: string
+      zsfluorescencetype1:
+        description: 荧光1 - 枚举”ZSFluorescenceType“ - 类型:1,2,3,4,5
+        type: integer
+      zsfluorescencetype1display:
+        type: string
+      zsfluorescencetype2:
+        description: 荧光2 - 枚举”ZSFluorescenceType” - 类型:1,3
+        type: integer
+      zsfluorescencetype2display:
+        type: string
+      zspolishtype1:
+        description: 抛光度1 - 枚举”ZSPolishType“ - 类型:1,2,4,5
+        type: integer
+      zspolishtype1display:
+        type: string
+      zspolishtype2:
+        description: 抛光度2 - 枚举”ZSPolishType“ - 类型:1
+        type: integer
+      zspolishtype2display:
+        type: string
+      zsshapetype:
+        description: 形状 - 枚举”ZSShapeType“ - 类型:1,2,4,5 ;(1为多个,逗号分隔)
+        type: string
+      zsshapetypedisplay:
+        type: string
+      zsstyletype:
+        description: 款式 - 类型:4
+        type: integer
+      zsstyletypedisplay:
+        type: string
+      zssymmetrytype1:
+        description: 对称度1 - 枚举”ZSSymmetryType“ - 类型:1,2,4,5
+        type: integer
+      zssymmetrytype1display:
+        type: string
+      zssymmetrytype2:
+        description: 对称度2 - 枚举”ZSSymmetryType“ - 类型:1
+        type: integer
+      zssymmetrytype2display:
+        type: string
+    required:
+    - wruserid
+    type: object
   models.NewFuncmenulist:
     properties:
       authtype:
@@ -15402,9 +15600,6 @@ definitions:
     type: object
   models.SellOrderQueryReq:
     properties:
-      TOTAL:
-        description: 总条数
-        type: integer
       origin:
         description: 原产地
         type: string
@@ -15414,6 +15609,9 @@ definitions:
       pagesize:
         description: 每页大小
         type: integer
+      total:
+        description: 总条数
+        type: integer
       warehouseid:
         description: 仓库ID
         type: integer
@@ -27128,7 +27326,7 @@ paths:
           description: OK
           schema:
             items:
-              $ref: '#/definitions/models.GZWarehouseinfo'
+              $ref: '#/definitions/models.MyWRPosition'
             type: array
         "500":
           description: Internal Server Error

+ 1 - 1
models/ermcpCommon.go

@@ -37,7 +37,7 @@ type PageEx struct {
 type PageJosn struct {
 	Page     int `json:"page"`     // 页码
 	PageSize int `json:"pagesize"` // 每页大小
-	Total    int `json:"TOTAL"`    // 总条数
+	Total    int `json:"total"`    // 总条数
 }
 
 // DecryptField 解密字段