发货支持仓库传参

zhangqian

2024-04-07 a8914a16b23e93f6bfd12bcfd5cbe8b24cf7eb84

 controllers/report_forms_controller.go

@@ -97,8 +97,8 @@
      Where("wms_operation.base_operation_type in (?)", []constvar.BaseOperationType{constvar.BaseOperationTypeOutgoing, constvar.BaseOperationTypeInternal, constvar.BaseOperationTypeDisuse}).
      Where("wms_operation.status in (?)", []constvar.OperationStatus{constvar.OperationStatus_Ready, constvar.OperationStatus_Finish})
   if len(locationIds) > 0 {
      dbIn.Where("wms_operation.to_location_id in (?)", locationIds)
      dbOut.Where("wms_operation.from_location_id in (?)", locationIds)
      dbIn.Where("wms_operation_details.to_location_id in (?)", locationIds)
      dbOut.Where("wms_operation_details.from_location_id in (?)", locationIds)
   }
   if len(productIds) > 0 {
      dbIn.Where("wms_operation_details.product_id in (?)", productIds)
@@ -265,8 +265,8 @@
   }

   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)
   }
@@ -339,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