~cuijin/WMS.git

			@@ -11,19 +11,25 @@
			// 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)"` //源单号
			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"`
			BaseOperationType constvar.BaseOperationType `json:"baseOperationType" gorm:"type:tinyint;not null;comment:基础作业类型"` //基础作业类型
			OperationTypeId int `json:"operationTypeId" gorm:"type:int;not null;comment:作业类型id"` //作业类型id
			Status int `json:"status" gorm:"type:tinyint;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"` //目标位置

			}

			OperationSearch struct {
			@@ -34,11 +40,13 @@
			Keyword string
			Orm *gorm.DB
			Preload bool
			Disuse bool
			Ids []int
			}
			)

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

			func NewOperationSearch() *OperationSearch {
			@@ -60,8 +68,8 @@
			return slf
			}

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

			@@ -70,24 +78,80 @@
			return slf
			}

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

			func (slf OperationSearch) SetPreload(preload bool) OperationSearch {
			slf.Preload = preload
			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) SetIds(ids []int) OperationSearch {
			slf.Ids = ids
			return slf
			}
			func (slf OperationSearch) SetStatus(status constvar.OperationStatus) OperationSearch {
			slf.Status = status
			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))
			db = db.Where("number like ? or source_number like ?", fmt.Sprintf("%%%v%%", slf.Keyword), 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)
			}

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

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

			if len(slf.Ids) > 0 {
			db = db.Where("id in (?)", slf.Ids)
			}

			if slf.Status > 0 {
			db = db.Where("status = ?", slf.Status)
			}

			return db
			@@ -110,6 +174,16 @@

			if err := db.Create(&records).Error; err != nil {
			return fmt.Errorf("create batch err: %v, records: %+v", err, records)
			}

			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
			@@ -180,7 +254,7 @@
			if slf.PageNum*slf.PageSize > 0 {
			db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
			}
			if err := db.Find(&records).Error; err != nil {
			if err := db.Preload("FromLocation").Preload("ToLocation").Find(&records).Error; err != nil {
			return records, total, fmt.Errorf("find records err: %v", err)
			}

			@@ -196,7 +270,7 @@
			if slf.PageNum*slf.PageSize > 0 {
			db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
			}
			if err := db.Find(&records).Error; err != nil {
			if err := db.Preload("FromLocation").Preload("ToLocation").Find(&records).Error; err != nil {
			return records, fmt.Errorf("find records err: %v", err)
			}