出入库报表支持全文搜索

zhangqian

2023-11-18 7a27dac6851c9eef5a640e591a0e1c6d550cdccb

 controllers/report_forms_controller.go

@@ -157,64 +157,125 @@
// @Success   200 {object} util.ResponseList{data=[]response.InventoryHistory}   "成功"
// @Router    /api-wms/v1/forms/getHistory [post]
func (slf ReportFormsController) GetHistory(c *gin.Context) {
   slf.GetHistoryNew(c)
   return
   //var params request.GetInventoryHistory
   //if err := c.BindJSON(&params); err != nil {
   //   util.ResponseFormat(c, code.RequestParamError, "参数解析失败，数据类型错误")
   //   return
   //}
   ////获取操作详情
   //detailsSearch := models.NewOperationDetailsSearch()
   //var (
   //   result []*response.InventoryHistory
   //   total  int64
   //   ids    []int
   //   err    error
   //)
   //if params.KeyWord != "" {
   //   ids, err = service.SearchHistoryReport(params.KeyWord, params.BaseOperationType)
   //
   //   if err != nil {
   //      util.ResponseFormat(c, code.InternalError, err.Error())
   //      return
   //   }
   //   if len(ids) == 0 {
   //      util.ResponseFormatList(c, code.Success, result, 0)
   //   }
   //}
   //
   //detailsSearch.Orm = detailsSearch.Orm.Model(&models.OperationDetails{}).
   //   Select("wms_operation.number, wms_operation.updated_at as date, material.name as product_name, wms_operation.from_location_id,"+
   //      "wms_operation.to_location_id, wms_operation_details.amount, material.unit, wms_operation.contacter_name as contacted_name,"+
   //      "wms_operation.base_operation_type, material.weight, wms_operation_details.product_id").
   //   Joins("left join wms_operation on wms_operation_details.operation_id = wms_operation.id").
   //   Joins("left join material on wms_operation_details.product_id = material.id").
   //   Where("wms_operation.status = ?", constvar.OperationStatus_Finish).Order("wms_operation.created_at desc")
   //if len(ids) > 0 {
   //   detailsSearch.Orm = detailsSearch.Orm.Where("wms_operation_details.id in ?", ids)
   //}
   //if params.ProduceId != "" {
   //   detailsSearch.Orm = detailsSearch.Orm.Where("wms_operation_details.product_id = ?", params.ProduceId)
   //}
   //if params.BaseOperationType != 0 {
   //   detailsSearch.Orm = detailsSearch.Orm.Where("wms_operation.base_operation_type = ?", params.BaseOperationType)
   //}
   //
   //err = detailsSearch.Orm.Count(&total).Error
   //if err != nil {
   //   util.ResponseFormat(c, code.RequestParamError, "查询total失败")
   //   return
   //}
   //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))
   //   return
   //}
   //var locationIds []int
   //for _, history := range result {
   //   locationIds = append(locationIds, history.FromLocationId, history.ToLocationId)
   //}
   //locations, err := models.NewLocationSearch().SetIds(locationIds).FindNotTotal()
   //if err != nil {
   //   util.ResponseFormat(c, code.RequestParamError, fmt.Errorf("查询位置失败: %v", err))
   //   return
   //}
   //for _, history := range result {
   //   history.Status = "完成"
   //   for _, location := range locations {
   //      if history.ToLocationId == location.Id {
   //         history.ToLocation = location.Name
   //      }
   //      if history.FromLocationId == location.Id {
   //         history.FromLocation = location.Name
   //      }
   //   }
   //}
   //util.ResponseFormatList(c, code.Success, result, int(total))
}

func (slf ReportFormsController) GetHistoryNew(c *gin.Context) {
   var params request.GetInventoryHistory
   if err := c.BindJSON(&params); err != nil {
      util.ResponseFormat(c, code.RequestParamError, "参数解析失败，数据类型错误")
      return
   }
   //获取操作详情
   detailsSearch := models.NewOperationDetailsSearch()
   detailsSearch := models.NewMoveHistorySearch()
   var (
      result []*response.InventoryHistory
      total  int64
      total  uint64
      ids    []int
      err    error
   )
   detailsSearch.Orm = detailsSearch.Orm.Model(&models.OperationDetails{}).
      Select("wms_operation.number, wms_operation.updated_at as date, material.name as product_name, wms_operation.from_location_id,"+
         "wms_operation.to_location_id, wms_operation_details.amount, material.unit, wms_operation.contacter_name as contacted_name,"+
         "wms_operation.base_operation_type, material.weight, wms_operation_details.product_id").
      Joins("left join wms_operation on wms_operation_details.operation_id = wms_operation.id").
      Joins("left join material on wms_operation_details.product_id = material.id").
      Where("wms_operation.status = ?", constvar.OperationStatus_Finish).Order("wms_operation.created_at desc")
   if params.ProduceId != "" {
      detailsSearch.Orm = detailsSearch.Orm.Where("wms_operation_details.product_id = ?", params.ProduceId)
   if params.KeyWord != "" {
      ids, total, err = service.SearchHistoryReport(params.KeyWord, params.BaseOperationType, params.Page, params.PageSize)
      if err != nil {
         util.ResponseFormat(c, code.InternalError, err.Error())
         return
      }
      if len(ids) == 0 {
         util.ResponseFormatList(c, code.Success, result, 0)
      }
   }

   detailsSearch.Orm = detailsSearch.Orm.Model(&models.MoveHistory{}).
      Select("number, updated_at as date, product_name as product_name, from_location_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)
   }
   if params.BaseOperationType != 0 {
      detailsSearch.Orm = detailsSearch.Orm.Where("wms_operation.base_operation_type = ?", params.BaseOperationType)
      detailsSearch.Orm = detailsSearch.Orm.Where("base_operation_type = ?", params.BaseOperationType)
   }

   err := detailsSearch.Orm.Count(&total).Error
   if err != nil {
      util.ResponseFormat(c, code.RequestParamError, "查询total失败")
      return
   }
   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))
      return
   }
   var locationIds []int
   for _, history := range result {
      locationIds = append(locationIds, history.FromLocationId, history.ToLocationId)
   }
   locations, err := models.NewLocationSearch().SetIds(locationIds).FindNotTotal()
   if err != nil {
      util.ResponseFormat(c, code.RequestParamError, fmt.Errorf("查询位置失败: %v", err))
      return
   }
   for _, history := range result {
      history.Status = "完成"
      for _, location := range locations {
         if history.ToLocationId == location.Id {
            history.ToLocation = location.Name
         }
         if history.FromLocationId == location.Id {
            history.FromLocation = location.Name
         }
      }
   }
   util.ResponseFormatList(c, code.Success, result, int(total))
}
@@ -247,18 +308,20 @@
      }
   }
   var (
      amounts []*models.LocationProductAmount
      total   int64
      err     error
      amounts    []*models.LocationProductAmount
      total      uint64
      totalInt64 int64
      err        error
   )
   if params.KeyWord != "" {
      amounts, total, err = service.SearchLocationReport(params.KeyWord, params.Page, params.PageSize)
   } else {
      amounts, total, err = models.NewLocationProductAmountSearch().SetPage(params.Page, params.PageSize).SetPreload(true).SetKeyword(params.KeyWord).SetProductId(params.ProductId).SetLocationIds(ids).FindByPage()
      amounts, totalInt64, err = models.NewLocationProductAmountSearch().SetPage(params.Page, params.PageSize).SetPreload(true).SetKeyword(params.KeyWord).SetProductId(params.ProductId).SetLocationIds(ids).FindByPage()
      if err != nil {
         util.ResponseFormat(c, code.RequestParamError, "查询数量失败")
         return
      }
      total = uint64(totalInt64)
   }

   var result []response.LocationForms