报废数量bug

jiangshuai

2023-11-16 a0125ef3d6ce35be7b6dc4919c4192dba4a7329a

 controllers/product_controller.go

@@ -15,7 +15,6 @@
   "wms/models"
   "wms/pkg/logx"
   "wms/request"
   "wms/utils"
)

type ProductController struct {
@@ -34,6 +33,10 @@
      util.ResponseFormat(c, code.RequestParamError, "参数解析失败，数据类型错误")
      return
   }
   if params.ID == "" {
      util.ResponseFormat(c, code.RequestParamError, "产品编码不能为空")
      return
   }
   if params.Name == "" {
      util.ResponseFormat(c, code.RequestParamError, "产品名称不能为空")
      return
@@ -46,7 +49,7 @@
      util.ResponseFormat(c, code.RequestParamError, "单位不能为空")
      return
   }
   params.ID = utils.GetUUID()
   //params.ID = utils.GetUUID()
   err := models.NewMaterialSearch().Create(&params)
   if err != nil {
      util.ResponseFormat(c, code.RequestParamError, "产品信息保存失败")
@@ -106,6 +109,55 @@
            product.CategoryName = category.Name
         }
      }
      var reorderAmount request.ProductStatisticsAmount
      if err := models.NewOperationSearch().Orm.
         Table("wms_operation_details").
         InnerJoins("INNER JOIN wms_operation on wms_operation_details.operation_id=wms_operation.id").
         Select("wms_operation_details.product_id,SUM(wms_operation_details.amount) as total_count").
         Where("wms_operation_details.product_id=? and wms_operation.`status`=? and wms_operation.base_operation_type in (?)", product.ID, constvar.OperationStatus_Ready, []constvar.BaseOperationType{constvar.BaseOperationTypeIncoming, constvar.BaseOperationTypeOutgoing, constvar.BaseOperationTypeDisuse}).
         Group("wms_operation_details.product_id").
         //Order("wms_operation_details.product_id").
         First(&reorderAmount).Error; err != nil {
         if !errors.Is(err, gorm.ErrRecordNotFound) {
            util.ResponseFormat(c, code.RequestParamError, "产品数据统计失败")
            return
         } else {
            reorderAmount.TotalAmount = decimal.NewFromInt(0)
         }
      }
      product.PredictionAmount = product.Amount.Add(reorderAmount.TotalAmount)

      var statisticsList []*request.ProductStatistics
      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}).
         Group("wms_operation.base_operation_type").
         Find(&statisticsList).Error; err != nil {
         util.ResponseFormat(c, code.RequestParamError, "产品数据统计失败")
         return
      }
      for _, v := range statisticsList {
         if v.BaseOperationType == constvar.BaseOperationTypeIncoming {
            product.InputAmount = v.TotalAmount
         }
         if v.BaseOperationType == constvar.BaseOperationTypeOutgoing {
            product.OutputAmount = product.OutputAmount.Add(v.TotalAmount)
         }
         if v.BaseOperationType == constvar.BaseOperationTypeAdjust {
            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))
}
@@ -523,7 +575,7 @@

            locAmount, res := models.NewLocationProductAmountSearch().
               SetProductId(v.ID).
               SetLocationId(operation.ToLocationID).
               SetLocationId(operation.FromLocationID).
               FirstRes()
            if res.Error != nil {
               return err
@@ -640,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
@@ -677,7 +729,7 @@
      return
   }
   operation.Status = constvar.OperationStatus_Cancel
   if err := models.NewOperationSearch().Save(operation); err != nil {
   if err := models.NewOperationSearch().SetID(operation.Id).Save(operation); err != nil {
      util.ResponseFormat(c, code.SaveFail, err.Error())
      return
   }