产品列表添加类型名称

liujiandao

2023-09-23 ea02a2a9a8219d44b103f0a31cf9fc81ff8495e1

 models/operation.go

@@ -4,7 +4,6 @@
   "fmt"
   "gorm.io/gorm"
   "wms/constvar"
   "wms/extend/util"
   "wms/pkg/mysqlx"
)

@@ -12,26 +11,30 @@
   // Operation 操作表
   Operation struct {
      WmsModel
      Id              int                      `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
      Number          string                   `json:"number" gorm:"column:number;type:varchar(255)"`           //单号
      SourceNumber    string                   `json:"sourceNumber" gorm:"type:varchar(255)"`                   //源单号
      OperationTypeId int                      `json:"operationTypeId" gorm:"type:int;not null;comment:作业类型id"` //作业类型id
      Status          constvar.OperationStatus `json:"status" gorm:"type:int(11);not null;comment:状态"`          //状态
      FromLocationId  int                      `json:"fromLocationId"   gorm:"type:int;not null;comment:源位置id"` //源位置id
      FromLocation    Location                 `json:"fromLocation"     gorm:"foreignKey:FromLocationId"`       //源位置
      ToLocationId    int                      `json:"toLocationId"    gorm:"type:int;not null;comment:目标位置id"` //目标位置id
      ToLocation      Location                 `json:"toLocation"      gorm:"foreignKey:ToLocationId"`          //目标位置
      OperationDate   util.JSONTime            `json:"operationDate" gorm:"comment:安排日期"`
      CarrierID       int                      `json:"carrierID" gorm:"type:int;comment:承运商ID"`
      CarrierName     string                   `json:"carrierName" gorm:"type:varchar(63);comment:承运商名称"`
      Tracking        string                   `json:"tracking" gorm:"type:varchar(127);comment:追踪参考"`
      ContacterID     int                      `json:"contacterID" gorm:"type:int;comment:联系人ID"`
      ContacterName   string                   `json:"contacterName" gorm:"type:varchar(63);comment:联系人姓名"`
      Weight          float64                  `json:"weight" gorm:"type:decimal;comment:重量(kg)"`
      TransferWeight  float64                  `json:"transferWeight" gorm:"type:decimal;comment:物流重量(kg)"`
      CompanyID       int                      `json:"companyID" gorm:"type:int;comment:公司ID"`
      CompanyName     string                   `json:"companyName" gorm:"type:varchar(127);comment:公司名称(kg)"`
      Details         []*OperationDetails      `json:"details"`
      Id                int                      `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
      Number            string                   `json:"number" gorm:"type:varchar(255)"`                                 //单号
      SourceNumber      string                   `json:"sourceNumber" gorm:"type:varchar(255)"`                           //源单号
      OperationTypeId   int                      `json:"operationTypeId" gorm:"type:int;not null;comment:作业类型id"`         //作业类型id
      OperationTypeName string                   `json:"operationTypeName" gorm:"type:varchar(127);comment:作业类型名称"`       //作业类型名称
      Status            constvar.OperationStatus `json:"status" gorm:"type:int(11);not null;comment:状态"`                  //状态
      FromLocationID    int                      `json:"fromLocationId"   gorm:"type:int;not null;comment:源位置id"`         //源位置id
      FromLocation      Location                 `json:"fromLocation"     gorm:"foreignKey:FromLocationID;references:Id"` //源位置
      ToLocationID      int                      `json:"toLocationId"    gorm:"type:int;not null;comment:目标位置id"`         //目标位置id
      ToLocation        Location                 `json:"toLocation"      gorm:"foreignKey:ToLocationID;references:Id"`    //目标位置
      OperationDate     string                   `json:"operationDate" gorm:"type:varchar(31);comment:安排日期"`
      ContacterID       int                      `json:"contacterID" gorm:"type:int;comment:联系人ID"`
      ContacterName     string                   `json:"contacterName" gorm:"type:varchar(63);comment:联系人姓名"`
      CompanyID         int                      `json:"companyID" gorm:"type:int;comment:公司ID-客户"`
      CompanyName       string                   `json:"companyName" gorm:"type:varchar(127);comment:公司名称-客户"`
      Comment           string                   `json:"comment" gorm:"type:text;comment:备注"`

      Details []*OperationDetails `json:"details" gorm:"foreignKey:OperationID;references:Id"`

      //Weight          decimal.Decimal          `json:"weight" gorm:"type:decimal(20,2);comment:重量(kg)"`
      //TransferWeight  decimal.Decimal          `json:"transferWeight" gorm:"type:decimal(20,2);comment:物流重量(kg)"`
      //CarrierID       int                      `json:"carrierID" gorm:"type:int;comment:承运商ID"`
      //CarrierName     string                   `json:"carrierName" gorm:"type:varchar(63);comment:承运商名称"`
      //Tracking        string                   `json:"tracking" gorm:"type:varchar(127);comment:追踪参考"`
   }

   OperationSearch struct {
@@ -46,7 +49,7 @@
)

func (slf *Operation) TableName() string {
   return "operation"
   return "wms_operation"
}

func NewOperationSearch() *OperationSearch {
@@ -68,13 +71,18 @@
   return slf
}

func (slf *OperationSearch) SetID(id uint) *OperationSearch {
   slf.ID = id
func (slf *OperationSearch) SetID(ID int) *OperationSearch {
   slf.Id = ID
   return slf
}

func (slf *OperationSearch) SetKeyword(keyword string) *OperationSearch {
   slf.Keyword = keyword
   return slf
}

func (slf *OperationSearch) SetOperationTypeId(operationTypeId int) *OperationSearch {
   slf.OperationTypeId = operationTypeId
   return slf
}

@@ -86,16 +94,23 @@
func (slf *OperationSearch) build() *gorm.DB {
   var db = slf.Orm.Model(&Operation{})

   if slf.ID != 0 {
      db = db.Where("id = ?", slf.ID)
   if slf.Id != 0 {
      db = db.Where("id = ?", slf.Id)
   }

   if slf.Order != "" {
      db = db.Order(slf.Order)
   }

   if slf.Keyword != "" {
      db = db.Where("product_name like ?", fmt.Sprintf("%%%v%%", slf.Keyword))
   //if slf.Keyword != "" {
   //   db = db.Where("product_name like ?", fmt.Sprintf("%%%v%%", slf.Keyword))
   //}

   if slf.OperationTypeId != 0 {
      db.Where("operation_type_id = ?", slf.OperationTypeId)
   }

   if slf.Preload {
      db = db.Model(&Operation{}).Preload("Details").Preload("FromLocation").Preload("ToLocation")
   }

   return db
@@ -123,6 +138,16 @@
   return nil
}

func (slf *OperationSearch) Save(record *Operation) error {
   var db = slf.build()

   if err := db.Omit("CreatedAt").Save(record).Error; err != nil {
      return fmt.Errorf("save err: %v, record: %+v", err, record)
   }

   return nil
}

func (slf *OperationSearch) Update(record *Operation) error {
   var db = slf.build()