zhangqian
2023-12-18 ed3d45b189f102249eabd0cb5a0299bc66b0dea6
controllers/report_forms_controller.go
@@ -265,13 +265,23 @@
   }
   detailsSearch.Orm = detailsSearch.Orm.Model(&models.MoveHistory{}).
      Select("number, updated_at as date, product_name as product_name, from_location_id, operation_id," +
         "to_location_id, amount, unit, operator as contacted_name, base_operation_type, weight, product_id, from_location, to_location").Order("id desc")
      Select("number, updated_at as date, product_name as product_name, from_location_id, operation_id,to_location_id, amount, " +
         "unit, operator as contacted_name, base_operation_type, weight, product_id, from_location, to_location, operation_type_name").Order("id desc")
   if len(ids) > 0 {
      detailsSearch.Orm = detailsSearch.Orm.Where("id in ?", ids)
   }
   if params.BaseOperationType != 0 {
      detailsSearch.Orm = detailsSearch.Orm.Where("base_operation_type = ?", params.BaseOperationType)
   }
   var t int64
   err = detailsSearch.Orm.Count(&t).Error
   if err != nil {
      util.ResponseFormat(c, code.RequestParamError, fmt.Errorf("查询总条数失败: %v", err))
      return
   }
   total = uint64(t)
   if params.Page*params.PageSize > 0 {
      detailsSearch.Orm = detailsSearch.Orm.Offset((params.Page - 1) * params.PageSize).Limit(params.PageSize)
   }
   err = detailsSearch.Orm.Find(&result).Error
   if err != nil {
@@ -329,6 +339,7 @@
   for _, amount := range amounts {
      var resp response.LocationForms
      resp.Amount = amount.Amount
      resp.LocationId = amount.LocationId
      resp.LocationName = amount.Location.Name
      resp.ProduceId = amount.Product.ID
      resp.ProductName = amount.Product.Name