WrOutInApply 出入库申请(提货)

APPOINTMENTMODEL        int32  `json:"appointmentmodel"  xorm:"'APPOINTMENTMODEL'"`               // 预约方式 - 1:物流 2:自送 3:自提
APPOINTMENTMODELDISPLAY string `json:"appointmentmodeldisplay"  xorm:"'APPOINTMENTMODELDISPLAY'"` // 预约方式(显示枚举)
CONTACTNAME             string `json:"contactname"  xorm:"'CONTACTNAME'"`                         // 联系人
CONTACTNUM              string `json:"contactnum"  xorm:"'CONTACTNUM'"`                           // 联系方式
ADDRESS                 string `json:"address"  xorm:"ADDRESS"`                                   // 详细地址
APPOINTMENTREMARK       string `json:"appointmentremark"  xorm:"'APPOINTMENTREMARK'"`             // 申请备注

docs/docs.go

@@ -48463,6 +48463,10 @@ const docTemplate = `{
         "models.WrOutInApply": {
             "type": "object",
             "properties": {
+                "address": {
+                    "description": "详细地址",
+                    "type": "string"
+                },
                 "applyid": {
                     "description": "申请单id",
                     "type": "string"
@@ -48479,6 +48483,18 @@ const docTemplate = `{
                     "description": "申请类型 - 1:预约入库 2:预约出库 3:入库注册 4:出库注销",
                     "type": "integer"
                 },
+                "appointmentmodel": {
+                    "description": "预约方式 - 1:物流 2:自送 3:自提",
+                    "type": "integer"
+                },
+                "appointmentmodeldisplay": {
+                    "description": "预约方式(显示枚举)",
+                    "type": "string"
+                },
+                "appointmentremark": {
+                    "description": "申请备注",
+                    "type": "string"
+                },
                 "bannerpicurl": {
                     "description": "Banner图",
                     "type": "string"
@@ -48487,6 +48503,14 @@ const docTemplate = `{
                     "description": "开始交易日(yyyymmdd)",
                     "type": "string"
                 },
+                "contactname": {
+                    "description": "联系人",
+                    "type": "string"
+                },
+                "contactnum": {
+                    "description": "联系方式",
+                    "type": "string"
+                },
                 "deliverygoodscode": {
                     "description": "品种代码",
                     "type": "string"

docs/swagger.json

@@ -48454,6 +48454,10 @@
         "models.WrOutInApply": {
             "type": "object",
             "properties": {
+                "address": {
+                    "description": "详细地址",
+                    "type": "string"
+                },
                 "applyid": {
                     "description": "申请单id",
                     "type": "string"
@@ -48470,6 +48474,18 @@
                     "description": "申请类型 - 1:预约入库 2:预约出库 3:入库注册 4:出库注销",
                     "type": "integer"
                 },
+                "appointmentmodel": {
+                    "description": "预约方式 - 1:物流 2:自送 3:自提",
+                    "type": "integer"
+                },
+                "appointmentmodeldisplay": {
+                    "description": "预约方式(显示枚举)",
+                    "type": "string"
+                },
+                "appointmentremark": {
+                    "description": "申请备注",
+                    "type": "string"
+                },
                 "bannerpicurl": {
                     "description": "Banner图",
                     "type": "string"
@@ -48478,6 +48494,14 @@
                     "description": "开始交易日(yyyymmdd)",
                     "type": "string"
                 },
+                "contactname": {
+                    "description": "联系人",
+                    "type": "string"
+                },
+                "contactnum": {
+                    "description": "联系方式",
+                    "type": "string"
+                },
                 "deliverygoodscode": {
                     "description": "品种代码",
                     "type": "string"

docs/swagger.yaml

@@ -21925,6 +21925,9 @@ definitions:
     type: object
   models.WrOutInApply:
     properties:
+      address:
+        description: 详细地址
+        type: string
       applyid:
         description: 申请单id
         type: string
@@ -21938,12 +21941,27 @@ definitions:
       applytype:
         description: 申请类型 - 1:预约入库 2:预约出库 3:入库注册 4:出库注销
         type: integer
+      appointmentmodel:
+        description: 预约方式 - 1:物流 2:自送 3:自提
+        type: integer
+      appointmentmodeldisplay:
+        description: 预约方式(显示枚举)
+        type: string
+      appointmentremark:
+        description: 申请备注
+        type: string
       bannerpicurl:
         description: Banner图
         type: string
       begindate:
         description: 开始交易日(yyyymmdd)
         type: string
+      contactname:
+        description: 联系人
+        type: string
+      contactnum:
+        description: 联系方式
+        type: string
       deliverygoodscode:
         description: 品种代码
         type: string

models/wrTrade2.go

@@ -1327,7 +1327,7 @@ func (r *WrFactorTypeInfo) buildItemList(lst []WrFactorTypeInfo) []WrTypeItem {
 	return lstItem
 }
 
-//WrFactorTypeInfoEx 类型id
+// WrFactorTypeInfoEx 类型id
 type WrFactorTypeInfoEx struct {
 	WRFACTORTYPEID string `json:"wrfactortypeid"  xorm:"'WRFACTORTYPEID'" form:"wrfactortypeid"`
 }
@@ -2930,6 +2930,13 @@ type WrOutInApply struct {
 	BEGINDATE string `json:"begindate" form:"begindate"` // 开始交易日(yyyymmdd)
 	ENDDATE   string `json:"enddate" form:"enddate"`     // 结束交易日(yyyymmdd)
 
+	APPOINTMENTMODEL        int32  `json:"appointmentmodel"  xorm:"'APPOINTMENTMODEL'"`               // 预约方式 - 1:物流 2:自送 3:自提
+	APPOINTMENTMODELDISPLAY string `json:"appointmentmodeldisplay"  xorm:"'APPOINTMENTMODELDISPLAY'"` // 预约方式(显示枚举)
+	CONTACTNAME             string `json:"contactname"  xorm:"'CONTACTNAME'"`                         // 联系人
+	CONTACTNUM              string `json:"contactnum"  xorm:"'CONTACTNUM'"`                           // 联系方式
+	ADDRESS                 string `json:"address"  xorm:"ADDRESS"`                                   // 详细地址
+	APPOINTMENTREMARK       string `json:"appointmentremark"  xorm:"'APPOINTMENTREMARK'"`             // 申请备注
+
 	PageEx `xorm:"extends"` // 页码信息
 }
 
@@ -2971,6 +2978,12 @@ func (r *WrOutInApply) buildSql() string {
 		"       decode(t.applytype, 2, t.inqty, 4, t.inrealqty) qty," +
 		"       e.expressnum," +
 		"       e.expresscompany," +
+		"		t.appointmentmodel," +
+		"		en1.enumdicname appointmentmodeldisplay," +
+		"		t.contactname," +
+		"		t.contactnum," +
+		"		t.address," +
+		"		t.appointmentremark," +
 		"       k.*" +
 		"  from WROutInApply t" +
 		"  left join wroutindetail d" +