1.库存盘点bug修改

jiangshuai

2023-10-20 96844c22ef3fba86a55e0af1b51bc1009d6fa950

 controllers/operation.go

@@ -6,6 +6,7 @@
   "github.com/gin-gonic/gin"
   "github.com/shopspring/decimal"
   "gorm.io/gorm"
   "sort"
   "strconv"
   "time"
   "wms/constvar"
@@ -47,14 +48,43 @@
      return
   }

   if CheckDetailsRepeat(params.Details) {
      util.ResponseFormat(c, code.RequestParamError, "明细中不能存在重复的产品")
      return
   }

   operationType, err := models.NewOperationTypeSearch().SetID(uint(params.OperationTypeId)).First()
   if err != nil {
      util.ResponseFormat(c, code.RequestParamError, err.Error())
      return
   }

   params.Status = constvar.OperationStatus_Ready
   params.Number = strconv.FormatInt(time.Now().Unix(), 10)
   params.BaseOperationType = operationType.BaseOperationType
   if err := models.NewOperationSearch().Create(&params); err != nil {
      logx.Errorf("Operation create err: %v", err)
      util.ResponseFormat(c, code.SaveFail, "添加失败："+err.Error())
      return
   }
   util.ResponseFormat(c, code.Success, "添加成功")
}

func CheckDetailsRepeat(details []*models.OperationDetails) bool {
   detailIDs := []string{}
   var tempID string
   for _, v := range details {
      detailIDs = append(detailIDs, v.ProductId)
   }
   sort.Strings(detailIDs)
   for _, v := range detailIDs {
      if v != tempID {
         tempID = v
      } else {
         return true
      }
   }
   return false
}

func (slf OperationController) FormatLocation(params *models.Operation) error {
@@ -146,10 +176,7 @@
   search := models.NewOperationSearch()
   search.SetPage(params.Page, params.PageSize)
   if params.Number != "" {
      search.SetNumber(params.Number)
   }
   if params.SourceNumber != "" {
      search.SetSourceNumber(params.SourceNumber)
      search.SetKeyword(params.Number)
   }
   list, total, err := search.SetOperationTypeId(params.OperationTypeId).SetPreload(true).SetOrder("created_at desc").Find()
   if err != nil {
@@ -194,6 +221,10 @@
   }
   if err := slf.CheckParams(params); err != nil {
      util.ResponseFormat(c, code.RequestParamError, err.Error())
      return
   }
   if CheckDetailsRepeat(params.Details) {
      util.ResponseFormat(c, code.RequestParamError, "明细中不能存在重复的产品")
      return
   }
   if err := slf.FormatLocation(&params); err != nil {
@@ -299,50 +330,108 @@
      if err := models.NewOperationSearch().SetOrm(tx).SetID(id).Update(&models.Operation{Status: constvar.OperationStatus_Finish}); err != nil {
         return err
      }
      if operationType.BaseOperationType != constvar.BaseOperationTypeInternal {
         var listProdtId []string
         var listProdt []*models.Material
         mapProdt := make(map[string]decimal.Decimal)
         listDetails, err := models.NewOperationDetailsSearch().SetOperationId(operation.Id).FindAll()
         if err != nil {
            return err
         }
         for _, v := range listDetails {
            listProdtId = append(listProdtId, v.ProductId)
            mapProdt[v.ProductId] = v.Amount
         }
         if err := models.NewMaterialSearch().Orm.Where("id IN ?", listProdtId).Find(&listProdt).Error; err != nil {
            return err
         }
         if operationType.BaseOperationType == constvar.BaseOperationTypeIncoming {
            for k, v := range listProdt {
               if value, ok := mapProdt[v.ID]; !ok {
                  return errors.New("产品种类异常")
               } else {
                  listProdt[k].Amount = listProdt[k].Amount.Add(value)
                  if err := tx.Save(listProdt[k]).Error; err != nil {
                     return err
                  }
      //if operationType.BaseOperationType != constvar.BaseOperationTypeInternal {
      var listProdtId []string
      var listProdt []*models.Material
      mapProdt := make(map[string]decimal.Decimal)
      listDetails, err := models.NewOperationDetailsSearch().SetOperationId(operation.Id).FindAll()
      if err != nil {
         return err
      }
      for _, v := range listDetails {
         listProdtId = append(listProdtId, v.ProductId)
         mapProdt[v.ProductId] = v.Amount
      }
      if err := models.NewMaterialSearch().Orm.Where("id IN ?", listProdtId).Find(&listProdt).Error; err != nil {
         return err
      }
      if operationType.BaseOperationType == constvar.BaseOperationTypeIncoming {
         for k, v := range listProdt {
            if value, ok := mapProdt[v.ID]; !ok {
               return errors.New("产品种类异常")
            } else {
               listProdt[k].Amount = listProdt[k].Amount.Add(value)
               if err := tx.Save(listProdt[k]).Error; err != nil {
                  return err
               }
            }
         }
         if operationType.BaseOperationType == constvar.BaseOperationTypeOutgoing {
            for k, v := range listProdt {
               if value, ok := mapProdt[v.ID]; !ok {
                  return errors.New("产品种类异常")
               } else {
                  if v.Amount.LessThan(value) {
                     return errors.New(fmt.Sprintf("产品：%v,库存：%v,出库：%v,数量不够，无法完成出库操作", v.Name, v.Amount.String(), value.String()))
                  }
                  listProdt[k].Amount = listProdt[k].Amount.Sub(value)
                  if err := tx.Save(listProdt[k]).Error; err != nil {
                     return err
                  }
               //TODO:出入库的finish和报废的finish都要增加对location_product_amount表数量的更新,因为此表有ProductCategory字段，所以operation_details表中要增加ProductCategoryId字段
               var locAmount models.LocationProductAmount
               if err := models.NewLocationProductAmountSearch().Orm.
                  Table("wms_location_product_amount").
                  Joins("inner join wms_location_product on wms_location_product.id=wms_location_product_amount.location_product_id").
                  Where("wms_location_product.product_id=? and wms_location_product.location_id=?", v.ID, operation.ToLocationID).
                  First(&locAmount).Error; err != nil {
                  return err
               }
               locAmount.Amount = locAmount.Amount.Add(value)
               if err := models.NewLocationProductAmountSearch().SetID(locAmount.Id).Update(&locAmount); err != nil {
                  return err
               }
            }
         }

      }
      if operationType.BaseOperationType == constvar.BaseOperationTypeOutgoing {
         for k, v := range listProdt {
            if value, ok := mapProdt[v.ID]; !ok {
               return errors.New("产品种类异常")
            } else {
               if v.Amount.LessThan(value) {
                  return errors.New(fmt.Sprintf("产品：%v,库存：%v,出库：%v,数量不够，无法完成出库操作", v.Name, v.Amount.String(), value.String()))
               }
               listProdt[k].Amount = listProdt[k].Amount.Sub(value)
               if err := tx.Save(listProdt[k]).Error; err != nil {
                  return err
               }
               var locAmount models.LocationProductAmount
               if err := models.NewLocationProductAmountSearch().Orm.Table("wms_location_product_amount").Joins("inner join wms_location_product on wms_location_product.id=wms_location_product_amount.location_product_id").Where("wms_location_product.product_id=? and wms_location_product.location_id=?", v.ID, operation.FromLocationID).First(&locAmount).Error; err != nil {
                  return err
               }
               if locAmount.Amount.LessThan(value) {
                  return errors.New(fmt.Sprintf("产品：%v,库存：%v,出库：%v,数量不够，无法完成出库操作", v.Name, v.Amount.String(), value.String()))
               }
               locAmount.Amount = locAmount.Amount.Sub(value)
               if err := models.NewLocationProductAmountSearch().SetID(locAmount.Id).Update(&locAmount); err != nil {
                  return err
               }
            }
         }
      }
      if operationType.BaseOperationType == constvar.BaseOperationTypeInternal {
         for k, v := range listProdt {
            if value, ok := mapProdt[v.ID]; !ok {
               return errors.New("产品种类异常")
            } else {
               listProdt[k].Amount = listProdt[k].Amount.Add(value)
               if err := tx.Save(listProdt[k]).Error; err != nil {
                  return err
               }
               //TODO:出入库的finish和报废的finish都要增加对location_product_amount表数量的更新,因为此表有ProductCategory字段，所以operation_details表中要增加ProductCategoryId字段
               var fromAmount, toAmount models.LocationProductAmount
               if err := models.NewLocationProductAmountSearch().Orm.Table("wms_location_product_amount").Joins("inner join wms_location_product on wms_location_product.id=wms_location_product_amount.location_product_id").Where("wms_location_product.product_id=? and wms_location_product.location_id=?", v.ID, operation.FromLocationID).Find(&fromAmount).Error; err != nil {
                  return err
               }
               if fromAmount.Amount.LessThan(value) {
                  return errors.New(fmt.Sprintf("产品：%v,库存：%v,调拨：%v,数量不够，无法完成调拨操作", v.Name, v.Amount.String(), value.String()))
               }
               fromAmount.Amount = fromAmount.Amount.Sub(value)
               if err := models.NewLocationProductAmountSearch().SetID(fromAmount.Id).Update(&fromAmount); err != nil {
                  return err
               }

               if err := models.NewLocationProductAmountSearch().Orm.Table("wms_location_product_amount").Joins("inner join wms_location_product on wms_location_product.id=wms_location_product_amount.location_product_id").Where("wms_location_product.product_id=? and wms_location_product.location_id=?", v.ID, operation.ToLocationID).Find(&toAmount).Error; err != nil {
                  return err
               }
               toAmount.Amount = toAmount.Amount.Add(value)
               if err := models.NewLocationProductAmountSearch().SetID(toAmount.Id).Update(&toAmount); err != nil {
                  return err
               }
            }
         }

      }

      //}
      return nil
   }); err != nil {
      util.ResponseFormat(c, code.RequestError, err.Error())
@@ -372,10 +461,7 @@
   search.SetPage(params.Page, params.PageSize)
   search.SetPage(params.Page, params.PageSize)
   if params.Number != "" {
      search.SetNumber(params.Number)
   }
   if params.SourceNumber != "" {
      search.SetSourceNumber(params.SourceNumber)
      search.SetKeyword(params.Number)
   }
   list, total, err := search.SetPreload(true).SetOrder("created_at desc").Find()
   if err != nil {