jiangshuai
2023-11-16 a0125ef3d6ce35be7b6dc4919c4192dba4a7329a
controllers/product_controller.go
@@ -128,8 +128,7 @@
      product.PredictionAmount = product.Amount.Add(reorderAmount.TotalAmount)
      var statisticsList []*request.ProductStatistics
      if err := models.NewOperationSearch().Orm.
         Table("wms_operation").
      if err := models.NewOperationSearch().Orm.Table("wms_operation").
         InnerJoins("INNER JOIN wms_operation_details on wms_operation_details.operation_id=wms_operation.id").
         Select("SUM(wms_operation_details.amount) as total_amount,wms_operation.base_operation_type").
         Where("wms_operation_details.product_id=? and wms_operation.`status`=? and wms_operation.base_operation_type in (?)", product.ID, constvar.OperationStatus_Finish, []constvar.BaseOperationType{constvar.BaseOperationTypeIncoming, constvar.BaseOperationTypeOutgoing, constvar.BaseOperationTypeDisuse}).
@@ -149,6 +148,16 @@
            product.OutputAmount = product.OutputAmount.Add(v.TotalAmount)
         }
      }
      reorderRules, rulesTotal, err := models.NewReorderRuleSearch().SetProductId(product.ID).Find()
      if err != nil {
         util.ResponseFormat(c, code.RequestParamError, "重订货规则统计失败")
         return
      }
      if rulesTotal == 1 {
         product.MinInventoryRule = reorderRules[0].MinInventory
         product.MaxInventoryRule = reorderRules[0].MaxInventory
      }
      product.ReorderRuleNum = rulesTotal
   }
   util.ResponseFormatList(c, code.Success, products, int(total))
}
@@ -566,7 +575,7 @@
            locAmount, res := models.NewLocationProductAmountSearch().
               SetProductId(v.ID).
               SetLocationId(operation.ToLocationID).
               SetLocationId(operation.FromLocationID).
               FirstRes()
            if res.Error != nil {
               return err
@@ -683,7 +692,7 @@
   search := models.NewOperationSearch().SetPage(params.Page, params.PageSize).SetPreload(true).SetOrder("created_at desc")
   search.SetOrm(search.Orm.InnerJoins("inner join wms_operation_details on wms_operation_details.operation_id=wms_operation.id").Where("wms_operation_details.product_id=? and (wms_operation.from_location_id=? or wms_operation.to_location_id=?)", params.ProductId, params.LocationId, params.LocationId))
   list, total, err := search.Find()
   list, total, err := search.SetBaseOperationType(constvar.BaseOperationTypeAdjust).Find()
   if err != nil {
      util.ResponseFormat(c, code.RequestError, "查找失败:"+err.Error())
      return