merge conflicts

jiangshuai

2023-12-08 27be7a2c517404e4622470edf7b83b13129220ff

 controllers/report_forms_controller.go

@@ -260,11 +260,12 @@
      }
      if len(ids) == 0 {
         util.ResponseFormatList(c, code.Success, result, 0)
         return
      }
   }

   detailsSearch.Orm = detailsSearch.Orm.Model(&models.MoveHistory{}).
      Select("number, updated_at as date, product_name as product_name, from_location_id," +
      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")
   if len(ids) > 0 {
      detailsSearch.Orm = detailsSearch.Orm.Where("id in ?", ids)
@@ -272,6 +273,16 @@
   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 {
      util.ResponseFormat(c, code.RequestParamError, fmt.Errorf("查询操作明细失败: %v", err))