现货合同增加品牌和型号字段

docs/docs.go

@@ -9641,10 +9641,18 @@ var doc = `{
                     "description": "现货合同ID(602+Unix秒时间戳(10位)+xxxxxx)",
                     "type": "string"
                 },
+                "spotgoodsbrandid": {
+                    "description": "现货品牌ID",
+                    "type": "integer"
+                },
                 "spotgoodsdesc": {
                     "description": "商品型号",
                     "type": "string"
                 },
+                "spotgoodsmodelid": {
+                    "description": "现货型号ID",
+                    "type": "integer"
+                },
                 "startdate": {
                     "description": "点价开始日期 [2:点价 3:暂定价]",
                     "type": "string"

docs/swagger.json

@@ -9625,10 +9625,18 @@
                     "description": "现货合同ID(602+Unix秒时间戳(10位)+xxxxxx)",
                     "type": "string"
                 },
+                "spotgoodsbrandid": {
+                    "description": "现货品牌ID",
+                    "type": "integer"
+                },
                 "spotgoodsdesc": {
                     "description": "商品型号",
                     "type": "string"
                 },
+                "spotgoodsmodelid": {
+                    "description": "现货型号ID",
+                    "type": "integer"
+                },
                 "startdate": {
                     "description": "点价开始日期 [2:点价 3:暂定价]",
                     "type": "string"

docs/swagger.yaml

@@ -3278,9 +3278,15 @@ definitions:
       spotcontractid:
         description: 现货合同ID(602+Unix秒时间戳(10位)+xxxxxx)
         type: string
+      spotgoodsbrandid:
+        description: 现货品牌ID
+        type: integer
       spotgoodsdesc:
         description: 商品型号
         type: string
+      spotgoodsmodelid:
+        description: 现货型号ID
+        type: integer
       startdate:
         description: 点价开始日期 [2:点价 3:暂定价]
         type: string

models/ermcp.go

@@ -47,6 +47,8 @@ type ErmcpSpotContractModel struct {
 	CONTRACCTSTATUS   int32   `json:"contracctstatus"  xorm:"'CONTRACTSTATUS'"`      //合同状态 - 0:未提交 1:待审核 2:执行中 3:正常完结 4:审核拒绝 5:异常完结 6:已撤回
 	Remark            string  `json:"remark"  xorm:"'Remark'"`                       //备注
 	AUDITTIME         string  `json:"audittime"  xorm:"'AUDITTIME'"`                 //审核时间
+	SPOTGOODSMODELID  int32   `json:"spotgoodsmodelid"  xorm:"'SPOTGOODSMODELID'"`   // 现货型号ID
+	SPOTGOODSBRANDID  int32   `json:"spotgoodsbrandid"  xorm:"'SPOTGOODSBRANDID'"`   // 现货品牌ID
 }
 
 func (r *ErmcpSpotContractModel) buildSql(nQueryType int32) string {
@@ -74,6 +76,8 @@ func (r *ErmcpSpotContractModel) buildSql(nQueryType int32) string {
 		"       t.contractmargin," +
 		"       t.remark," +
 		"       t.contractstatus," +
+		"       t.SPOTGOODSMODELID," +
+		"       t.SPOTGOODSBRANDID," +
 		"       to_char(t.audittime,'yyyy-mm-dd hh24:mi:ss') audittime," +
 		"       u1.accountname      BuyUserName," +
 		"       u2.accountname      SellUserName," +