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

jiangshuai

2023-11-15 b13834f8c0b4a0fe9928cb07a721e6ec7df86ae1

 models/operation_type.go

@@ -135,6 +135,10 @@
      db = db.Where("warehouse_id = ?", slf.WarehouseId)
   }

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

   return db
}

@@ -291,7 +295,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)
   }