ziwen 2 years ago
parent
commit
14bb6b2dd1
1 changed files with 3 additions and 1 deletions
  1. 3 1
      models/fms/contract_pre_register.go

+ 3 - 1
models/fms/contract_pre_register.go

@@ -53,7 +53,8 @@ type ContractPreRegisterItem struct {
 	ArriveCurrencyUnit string  `gorm:"column:arrive_currency_unit" json:"arrive_currency_unit" description:"到款货币国际代码"`
 	UnitName           string  `json:"unit_name" description:"货币单位名称"`
 	InvoiceType        int     `gorm:"column:invoice_type" json:"invoice_type" description:"类型: 1-开票登记; 2-到款登记;3-开票预登记;4-到款预登记"`
-	InvoiceDate        string  `gorm:"column:invoice_time" json:"invoice_time" description:"开票日期/到款月"`
+	InvoiceDate        string `gorm:"column:invoice_time" json:"invoice_time" description:"开票日"`
+	ArriveDate         string `gorm:"column:arrive_time" json:"arrive_time" description:"到款日"`
 	SellerId           int     `gorm:"column:seller_id" json:"seller_id" description:"销售ID"`
 	SellerName         string  `gorm:"column:seller_name" json:"seller_name" description:"销售名称"`
 	PayType            int     `gorm:"column:pay_type" json:"pay_type" description:"付款方式:0-无;1-年付;2-半年付;3-季付;4-次付;5-异常"`
@@ -79,6 +80,7 @@ func formatContractPreRegister2Item(item *ContractPreRegister) (formatItem *Cont
 	formatItem.ArriveCurrencyUnit = item.ArriveCurrencyUnit
 	formatItem.InvoiceType = item.InvoiceType
 	formatItem.InvoiceDate = utils.TimeTransferString(utils.FormatDate, item.InvoiceDate)
+	formatItem.ArriveDate = utils.TimeTransferString(utils.FormatDate, item.ArriveDate)
 	formatItem.SellerId = item.SellerId
 	formatItem.SellerName = item.SellerName
 	formatItem.Remark = item.Remark