leo
/
LAPP_GAAS_GFrame_BACKEND
2
2
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

Merge pull request '扩展了供应商的字段' (#83) from feature_vendor into develop 

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/83
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
pull/85/head
weichenglei 3 years ago
parent
bbbb27aa60 c2372127b9
commit
8c85d5812b
3 changed files with 53 additions and 37 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +11
    -3
      meta/log/Vendor.meta.go
  2. +37
    -33
      models/log/Vendor.model.go
  3. +5
    -1
      services/log/implments/Vendor.service.impl.go

+ 11
- 3
meta/log/Vendor.meta.go View File

@ -13,7 +13,7 @@ import (
*
* @Author : 代码生成器创建
*
* @Date : 2021-03-22 10:49:35
* @Date : 2021-03-18 22:50:49
*
******************************************************************************/
var Vendor_VendorId = grmi.NewField("VendorId", "VendorId", "vendorid", grmi.TypeString)
@ -41,6 +41,10 @@ var Vendor_ContactAddress = grmi.NewField("ContactAddress", "ContactAddress", "c
var Vendor_Account = grmi.NewField("Account", "Account", "account", grmi.TypeInt)
var Vendor_TaxRate = grmi.NewField("TaxRate", "TaxRate", "taxrate", grmi.TypeString)
var Vendor_Status = grmi.NewField("Status", "Status", "status", grmi.TypeInt)
var Vendor_Province = grmi.NewField("Province", "Province", "province", grmi.TypeString)
var Vendor_ProvinceCode = grmi.NewField("ProvinceCode", "ProvinceCode", "provincecode", grmi.TypeString)
var Vendor_CityCode = grmi.NewField("CityCode", "CityCode", "citycode", grmi.TypeString)
var Vendor_DistrictCode = grmi.NewField("DistrictCode", "DistrictCode", "districtcode", grmi.TypeString)
var Vendor_LastModify = grmi.NewField("LastModify", "LastModify", "undefined", grmi.TypeDateTime)
var Vendor_LastUser = grmi.NewField("LastUser", "LastUser", "undefined", grmi.TypeString)
var Vendor_CreateTime = grmi.NewField("CreateTime", "CreateTime", "undefined", grmi.TypeDateTime)
@ -51,7 +55,7 @@ var Vendor_CreateTime = grmi.NewField("CreateTime", "CreateTime", "undefined", g
*
* @Author : 代码生成器创建
*
* @Date : 2021-03-22 10:49:35
* @Date : 2021-03-18 22:50:49
*
******************************************************************************/
var Vendor = grmi.NewEntity(
@ -83,9 +87,13 @@ var Vendor = grmi.NewEntity(
Vendor_Account.Name: Vendor_Account,
Vendor_TaxRate.Name: Vendor_TaxRate,
Vendor_Status.Name: Vendor_Status,
Vendor_Province.Name: Vendor_Province,
Vendor_ProvinceCode.Name: Vendor_ProvinceCode,
Vendor_CityCode.Name: Vendor_CityCode,
Vendor_DistrictCode.Name: Vendor_DistrictCode,
Vendor_LastModify.Name: Vendor_LastModify,
Vendor_LastUser.Name: Vendor_LastUser,
Vendor_CreateTime.Name: Vendor_CreateTime,
},
[]string{"PlantNr"},
[]string{Vendor_Descr.ColumnName, Vendor_Address.ColumnName, Vendor_VendorNr.ColumnName, Vendor_Name.ColumnName, Vendor_Name1.ColumnName, Vendor_Name2.ColumnName, Vendor_ValidStartDate.ColumnName, Vendor_Country.ColumnName, Vendor_City.ColumnName, Vendor_District.ColumnName, Vendor_Street.ColumnName, Vendor_Location.ColumnName, Vendor_PostCode.ColumnName, Vendor_Phone.ColumnName, Vendor_Mobile.ColumnName, Vendor_Fax.ColumnName, Vendor_Email1.ColumnName, Vendor_Email2.ColumnName, Vendor_ContactPerson.ColumnName, Vendor_PersonTitle.ColumnName, Vendor_ContactAddress.ColumnName, Vendor_Account.ColumnName, Vendor_TaxRate.ColumnName, Vendor_Status.ColumnName, Vendor_LastUser.ColumnName})
[]string{Vendor_Descr.ColumnName, Vendor_Address.ColumnName, Vendor_VendorNr.ColumnName, Vendor_Name.ColumnName, Vendor_Name1.ColumnName, Vendor_Name2.ColumnName, Vendor_ValidStartDate.ColumnName, Vendor_Country.ColumnName, Vendor_City.ColumnName, Vendor_District.ColumnName, Vendor_Street.ColumnName, Vendor_Location.ColumnName, Vendor_PostCode.ColumnName, Vendor_Phone.ColumnName, Vendor_Mobile.ColumnName, Vendor_Fax.ColumnName, Vendor_Email1.ColumnName, Vendor_Email2.ColumnName, Vendor_ContactPerson.ColumnName, Vendor_PersonTitle.ColumnName, Vendor_ContactAddress.ColumnName, Vendor_Account.ColumnName, Vendor_TaxRate.ColumnName, Vendor_Status.ColumnName, Vendor_Province.ColumnName, Vendor_ProvinceCode.ColumnName, Vendor_CityCode.ColumnName, Vendor_DistrictCode.ColumnName, Vendor_LastUser.ColumnName})

+ 37
- 33
models/log/Vendor.model.go View File

@ -16,41 +16,45 @@ import (
*
* @Author : 代码生成器创建
*
* @Date : 2021-03-23 17:06:57
* @Date : 2021-03-18 22:50:49
*
******************************************************************************/
type Vendor struct {
PlantNr int `xorm:"pk int 'PlantNr'" json:"LOG_Vendor-PlantNr"`
VendorId string `xorm:"pk nvarchar(40) 'VendorId'" json:"LOG_Vendor-VendorId"`
Descr string `xorm:"nvarchar(100) 'Descr' not null" json:"LOG_Vendor-Descr"`
Address string `xorm:"nvarchar(100) 'Address' not null" json:"LOG_Vendor-Address"`
VendorNr int `xorm:"int 'VendorNr' not null autoincr" json:"LOG_Vendor-VendorNr"`
Name string `xorm:"nvarchar(100) 'Name' not null" json:"LOG_Vendor-Name"`
Name1 string `xorm:"nvarchar(100) 'Name1' not null" json:"LOG_Vendor-Name1"`
Name2 string `xorm:"nvarchar(100) 'Name2' not null" json:"LOG_Vendor-Name2"`
ValidStartDate grmi.Date `xorm:"date 'ValidStartDate' not null" json:"LOG_Vendor-ValidStartDate"`
Country string `xorm:"nvarchar(100) 'Country' not null" json:"LOG_Vendor-Country"`
City string `xorm:"nvarchar(100) 'City' not null" json:"LOG_Vendor-City"`
District string `xorm:"nvarchar(100) 'District' not null" json:"LOG_Vendor-District"`
Street string `xorm:"nvarchar(100) 'Street' not null" json:"LOG_Vendor-Street"`
Location string `xorm:"nvarchar(100) 'Location' not null" json:"LOG_Vendor-Location"`
PostCode string `xorm:"nvarchar(20) 'PostCode' not null" json:"LOG_Vendor-PostCode"`
Phone string `xorm:"nvarchar(20) 'Phone' not null" json:"LOG_Vendor-Phone"`
Mobile string `xorm:"nvarchar(20) 'Mobile' not null" json:"LOG_Vendor-Mobile"`
Fax string `xorm:"nvarchar(20) 'Fax' not null" json:"LOG_Vendor-Fax"`
Email1 string `xorm:"nvarchar(40) 'Email1' not null" json:"LOG_Vendor-Email1"`
Email2 string `xorm:"nvarchar(40) 'Email2' not null" json:"LOG_Vendor-Email2"`
ContactPerson string `xorm:"nvarchar(40) 'ContactPerson' not null" json:"LOG_Vendor-ContactPerson"`
PersonTitle string `xorm:"nvarchar(40) 'PersonTitle' not null" json:"LOG_Vendor-PersonTitle"`
ContactAddress string `xorm:"nvarchar(100) 'ContactAddress' not null" json:"LOG_Vendor-ContactAddress"`
Account int `xorm:"int 'Account' not null" json:"LOG_Vendor-Account"`
TaxRate string `xorm:"nvarchar(20) 'TaxRate' not null" json:"LOG_Vendor-TaxRate"`
Status int `xorm:"int 'Status' not null" json:"LOG_Vendor-Status"`
LastModify grmi.DateTime `xorm:"datetime 'LastModify' not null updated" json:"LOG_Vendor-LastModify"`
LastUser string `xorm:"nvarchar(20) 'LastUser' not null" json:"LOG_Vendor-LastUser"`
CreateTime grmi.DateTime `xorm:"datetime 'CreateTime' not null created" json:"LOG_Vendor-CreateTime"`
UserList []VendorUserLst `xorm:"-" json:"UserList"`
ArtList []VendorArtLst `xorm:"-" json:"ArtList"`
PlantNr int `xorm:"pk int 'PlantNr'" json:"LOG_Vendor-PlantNr"`
VendorId string `xorm:"pk nvarchar(40) 'VendorId'" json:"LOG_Vendor-VendorId"`
Descr string `xorm:"nvarchar(100) 'Descr' not null" json:"LOG_Vendor-Descr"`
Address string `xorm:"nvarchar(100) 'Address' not null" json:"LOG_Vendor-Address"`
VendorNr int `xorm:"int 'VendorNr' not null autoincr" json:"LOG_Vendor-VendorNr"`
Name string `xorm:"nvarchar(100) 'Name' not null" json:"LOG_Vendor-Name"`
Name1 string `xorm:"nvarchar(100) 'Name1' not null" json:"LOG_Vendor-Name1"`
Name2 string `xorm:"nvarchar(100) 'Name2' not null" json:"LOG_Vendor-Name2"`
ValidStartDate grmi.Date `xorm:"date 'ValidStartDate' not null" json:"LOG_Vendor-ValidStartDate"`
Country string `xorm:"nvarchar(100) 'Country' not null" json:"LOG_Vendor-Country"`
City string `xorm:"nvarchar(100) 'City' not null" json:"LOG_Vendor-City"`
District string `xorm:"nvarchar(100) 'District' not null" json:"LOG_Vendor-District"`
Street string `xorm:"nvarchar(100) 'Street' not null" json:"LOG_Vendor-Street"`
Location string `xorm:"nvarchar(100) 'Location' not null" json:"LOG_Vendor-Location"`
PostCode string `xorm:"nvarchar(20) 'PostCode' not null" json:"LOG_Vendor-PostCode"`
Phone string `xorm:"nvarchar(20) 'Phone' not null" json:"LOG_Vendor-Phone"`
Mobile string `xorm:"nvarchar(20) 'Mobile' not null" json:"LOG_Vendor-Mobile"`
Fax string `xorm:"nvarchar(20) 'Fax' not null" json:"LOG_Vendor-Fax"`
Email1 string `xorm:"nvarchar(40) 'Email1' not null" json:"LOG_Vendor-Email1"`
Email2 string `xorm:"nvarchar(40) 'Email2' not null" json:"LOG_Vendor-Email2"`
ContactPerson string `xorm:"nvarchar(40) 'ContactPerson' not null" json:"LOG_Vendor-ContactPerson"`
PersonTitle string `xorm:"nvarchar(40) 'PersonTitle' not null" json:"LOG_Vendor-PersonTitle"`
ContactAddress string `xorm:"nvarchar(100) 'ContactAddress' not null" json:"LOG_Vendor-ContactAddress"`
Account int `xorm:"int 'Account' not null" json:"LOG_Vendor-Account"`
TaxRate string `xorm:"nvarchar(20) 'TaxRate' not null" json:"LOG_Vendor-TaxRate"`
Status int `xorm:"int 'Status' not null" json:"LOG_Vendor-Status"`
Province string `xorm:"nvarchar(100) 'Province'" json:"LOG_Vendor-Province"`
ProvinceCode string `xorm:"nvarchar(20) 'ProvinceCode'" json:"LOG_Vendor-ProvinceCode"`
CityCode string `xorm:"nvarchar(20) 'CityCode'" json:"LOG_Vendor-CityCode"`
DistrictCode string `xorm:"nvarchar(20) 'DistrictCode'" json:"LOG_Vendor-DistrictCode"`
LastModify grmi.DateTime `xorm:"datetime 'LastModify' not null updated" json:"LOG_Vendor-LastModify"`
LastUser string `xorm:"nvarchar(20) 'LastUser' not null" json:"LOG_Vendor-LastUser"`
CreateTime grmi.DateTime `xorm:"datetime 'CreateTime' not null created" json:"LOG_Vendor-CreateTime"`
UserList []VendorUserLst `xorm:"-" json:"UserList"`
ArtList []VendorArtLst `xorm:"-" json:"ArtList"`
}
/******************************************************************************
@ -64,7 +68,7 @@ type Vendor struct {
*
* @Author : 代码生成器创建
*
* @Date : 2021-03-23 17:06:57
* @Date : 2021-03-18 22:50:49
*
******************************************************************************/
func (self *Vendor) GetKey() core.PK {


+ 5
- 1
services/log/implments/Vendor.service.impl.go View File

@ -17,7 +17,7 @@ import (
*
* @Author : 代码生成器创建
*
* @Date : 2021-03-23 10:43:27
* @Date : 2021-03-18 22:50:49
*
******************************************************************************/
var DefaultConditionOfVendor = grmi.NewCondition(
@ -47,6 +47,10 @@ var DefaultConditionOfVendor = grmi.NewCondition(
meta.Vendor_Account.UrlParameterName: grmi.NewConditionItem(meta.Vendor_Account, grmi.Equal, false),
meta.Vendor_TaxRate.UrlParameterName: grmi.NewConditionItem(meta.Vendor_TaxRate, grmi.Equal, false),
meta.Vendor_Status.UrlParameterName: grmi.NewConditionItem(meta.Vendor_Status, grmi.Equal, false),
meta.Vendor_Province.UrlParameterName: grmi.NewConditionItem(meta.Vendor_Province, grmi.Equal, false),
meta.Vendor_ProvinceCode.UrlParameterName: grmi.NewConditionItem(meta.Vendor_ProvinceCode, grmi.Equal, false),
meta.Vendor_CityCode.UrlParameterName: grmi.NewConditionItem(meta.Vendor_CityCode, grmi.Equal, false),
meta.Vendor_DistrictCode.UrlParameterName: grmi.NewConditionItem(meta.Vendor_DistrictCode, grmi.Equal, false),
meta.Vendor_LastModify.UrlParameterName: grmi.NewConditionItem(meta.Vendor_LastModify, grmi.Approximate, false),
meta.Vendor_LastUser.UrlParameterName: grmi.NewConditionItem(meta.Vendor_LastUser, grmi.Equal, false),
meta.Vendor_CreateTime.UrlParameterName: grmi.NewConditionItem(meta.Vendor_CreateTime, grmi.Approximate, false),


Write Preview
Loading…
Cancel
Save