Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS

liujiandao

2023-09-23 79eca4ef507f418b88a0817f43a9ea25750a818a

 models/operation.go

@@ -11,21 +11,22 @@
   // Operation 操作表
   Operation struct {
      WmsModel
      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
      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:备注"`
      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"`

@@ -44,6 +45,7 @@
      Keyword  string
      Orm      *gorm.DB
      Preload  bool
      Disuse   bool
   }
)

@@ -90,19 +92,42 @@
   return slf
}

func (slf *OperationSearch) SetNumber(number string) *OperationSearch {
   slf.Number = number
   return slf
}

func (slf *OperationSearch) SetSourceNumber(sourceNumber string) *OperationSearch {
   slf.SourceNumber = sourceNumber
   return slf
}

func (slf *OperationSearch) SetDisuse(disuse bool) *OperationSearch {
   slf.Disuse = disuse
   return slf
}

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.SourceNumber != "" {
      db = db.Where("source_number like ?", fmt.Sprintf("%%%v%%", slf.SourceNumber))
   }

   if slf.Number != "" {
      db = db.Where("number like ?", fmt.Sprintf("%%%v%%", slf.Number))
   }

   if slf.OperationTypeId != 0 {
      db.Where("operation_type_id = ?", slf.OperationTypeId)
@@ -112,6 +137,10 @@
      db = db.Model(&Operation{}).Preload("Details").Preload("FromLocation").Preload("ToLocation")
   }

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

   return db
}