修改

liujiandao

2024-03-30 aeed976c2999e2cea097cdee38d8baeefe323f3d

 models/operation_type.go

@@ -36,16 +36,18 @@
      ReturnOperationType           string                     `json:"returnOperationType" gorm:"-"`                                   //退货类型名称
      ReadyCount                    int                        `json:"readyCount" gorm:"-"`                                            //就绪数量
      FinishCount                   int                        `json:"finishCount" gorm:"-"`                                           //完成数量
      CancelCount                   int                        `json:"cancelCount" gorm:"-"`                                           //取消数量
   }

   OperationTypeSearch struct {
      OperationType
      Order    string
      PageNum  int
      PageSize int
      Keyword  string
      Orm      *gorm.DB
      Preload  bool
      Order        string
      PageNum      int
      PageSize     int
      Keyword      string
      Orm          *gorm.DB
      Preload      bool
      WarehouseIds []int
   }

   OperationTypeByStatus struct {
@@ -103,6 +105,16 @@
   return slf
}

func (slf *OperationTypeSearch) SetWarehouseId(warehouseId int) *OperationTypeSearch {
   slf.WarehouseId = warehouseId
   return slf
}

func (slf *OperationTypeSearch) SetWarehouseIds(warehouseIds []int) *OperationTypeSearch {
   slf.WarehouseIds = warehouseIds
   return slf
}

func (slf *OperationTypeSearch) build() *gorm.DB {
   var db = slf.Orm.Model(&OperationType{})

@@ -124,6 +136,18 @@

   if slf.Preload {
      db = db.Preload("Company").Preload("Warehouse").Preload("DefaultLocationSrc").Preload("DefaultLocationDest")
   }

   if slf.WarehouseId > 0 {
      db = db.Where("warehouse_id = ?", slf.WarehouseId)
   }

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

   if int(slf.BaseOperationType) != 0 {
      db = db.Where("base_operation_type = ?", slf.BaseOperationType)
   }

   return db
@@ -282,7 +306,8 @@
      records = make([]*OperationTypeByStatus, 0)
      db      = slf.Orm
   )
   db = db.Table("wms_job_type").Select("wms_job_type.id,wms_operation.status,count(wms_operation.id) as count").InnerJoins("inner join wms_operation on wms_operation.operation_type_id=wms_job_type.id").Group("wms_job_type.id,wms_operation.status")
   db = db.Table("wms_job_type").Select("wms_job_type.id,wms_operation.status,count(wms_operation.id) as count").InnerJoins("inner join wms_operation on wms_operation.operation_type_id=wms_job_type.id").Where("wms_operation.deleted_at is null").
      Group("wms_job_type.id,wms_operation.status")
   if len(idList) > 0 {
      db = db.Where("wms_job_type.id IN ?", idList)
   }