库存盘点列表bug

jiangshuai

2023-12-15 fda60dd56911c03330eb7330ebabd5d46e9d7622

 controllers/product_controller.go

@@ -14,6 +14,7 @@
   "wms/extend/util"
   "wms/models"
   "wms/pkg/logx"
   "wms/pkg/mysqlx"
   "wms/request"
)

@@ -109,6 +110,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))
}
@@ -163,6 +213,22 @@
   if err != nil {
      util.ResponseFormat(c, code.RequestParamError, "产品信息更新失败")
      return
   }

   //更新在库的产品类型
   if params.CategoryId > 0 {
      find, _ := models.NewLocationProductAmountSearch().SetProductId(params.ID).Find()
      if len(find) > 0 {
         var ids []int
         for _, f := range find {
            if f.ProductCategoryID != params.CategoryId {
               ids = append(ids, f.Id)
            }
         }
         m := make(map[string]interface{})
         m["productCategoryId"] = params.CategoryId
         _ = models.NewLocationProductAmountSearch().SetIds(ids).UpdateByMap(m)
      }
   }

   materialAttachmentList := []*models.MaterialAttachment{}
@@ -269,7 +335,7 @@
      return
   }

   first, err := models.NewProductCategorySearch().SetID(cast.ToUint(id)).First()
   first, err := models.NewProductCategorySearch().SetID(cast.ToInt(id)).First()
   if err != nil {
      util.ResponseFormat(c, code.RequestParamError, "查找失败")
      return
@@ -294,7 +360,7 @@
      util.ResponseFormat(c, code.RequestParamError, "产品类型名称不能为空")
      return
   }
   err := models.NewProductCategorySearch().SetID(params.ID).Save(&params)
   err := models.NewProductCategorySearch().SetID(params.Id).Save(&params)
   if err != nil {
      util.ResponseFormat(c, code.RequestParamError, "产品类型信息更新失败")
      return
@@ -315,7 +381,7 @@
      util.ResponseFormat(c, code.RequestParamError, "无效id")
      return
   }
   err := models.NewProductCategorySearch().SetID(cast.ToUint(id)).Delete()
   err := models.NewProductCategorySearch().SetID(cast.ToInt(id)).Delete()
   if err != nil {
      util.ResponseFormat(c, code.RequestParamError, "删除失败")
      return
@@ -382,12 +448,28 @@
      util.ResponseFormat(c, code.RequestParamError, "请输入源单据")
      return
   }
   if params.Number == "" {
      util.ResponseFormat(c, code.RequestParamError, "请输入单号")
      return
   }

   var numberNum int64
   if err := mysqlx.GetDB().Model(&models.Operation{}).Where("number=?", params.Number).Count(&numberNum).Error; err != nil {
      util.ResponseFormat(c, code.RequestParamError, err.Error())
      return
   }
   if numberNum > 0 {
      util.ResponseFormat(c, code.RequestParamError, "单号已存在")
      return
   }

   detail := &models.OperationDetails{
      ProductId: params.ProductId,
      Amount:    params.Amount,
   }
   operation := models.Operation{
      Number:            strconv.FormatInt(time.Now().Unix(), 10),
      //Number:            strconv.FormatInt(time.Now().Unix(), 10),
      Number:            params.Number,
      SourceNumber:      params.SourceNumber,
      OperationTypeId:   0,
      Status:            constvar.OperationStatus_Ready,
@@ -423,7 +505,7 @@
      return
   }

   db := models.NewOperationSearch().Orm.Table("wms_operation").Select("wms_operation.id,wms_operation.number,wms_operation.source_number,wms_operation.status,wms_operation.from_location_id,wms_operation.to_location_id,wms_operation.operation_date,wms_operation.contacter_id,wms_operation.contacter_name,wms_operation.company_id,wms_operation.company_name,wms_operation.comment,wms_operation_details.product_id,material.name as product_name,material.unit,wms_operation_details.amount").InnerJoins("inner join wms_operation_details on wms_operation_details.operation_id=wms_operation.id").InnerJoins("inner join material on material.id=wms_operation_details.product_id").Where("wms_operation.base_operation_type=?", constvar.BaseOperationTypeDisuse)
   db := models.NewOperationSearch().Orm.Table("wms_operation").Select("wms_operation.id,wms_operation.number,wms_operation.source_number,wms_operation.status,wms_operation.from_location_id,wms_operation.to_location_id,wms_operation.operation_date,wms_operation.contacter_id,wms_operation.contacter_name,wms_operation.company_id,wms_operation.company_name,wms_operation.comment,wms_operation_details.product_id,material.name as product_name,material.unit,wms_operation_details.amount,wms_operation.base_operation_type").InnerJoins("inner join wms_operation_details on wms_operation_details.operation_id=wms_operation.id").InnerJoins("inner join material on material.id=wms_operation_details.product_id").Where("wms_operation.base_operation_type=?", constvar.BaseOperationTypeDisuse)

   if params.Number != "" {
      db = db.Where("wms_operation.number like ? or wms_operation.source_number like ? or material.name like ?", fmt.Sprintf("%%%v%%", params.Number), fmt.Sprintf("%%%v%%", params.Number), fmt.Sprintf("%%%v%%", params.Number))
@@ -479,7 +561,7 @@
      return
   }
   if err := models.WithTransaction(func(tx *gorm.DB) error {
      if err := models.NewOperationSearch().SetOrm(tx).SetID(id).Update(&models.Operation{Status: constvar.OperationStatus_Finish}); err != nil {
      if err := models.NewOperationSearch().SetOrm(tx).SetID(id).Update(&models.Operation{Status: constvar.OperationStatus_Finish, AuditDate: time.Now().Format("2006-01-02 15:04:05")}); err != nil {
         return err
      }
      var listProdtId []string
@@ -526,7 +608,7 @@

            locAmount, res := models.NewLocationProductAmountSearch().
               SetProductId(v.ID).
               SetLocationId(operation.ToLocationID).
               SetLocationId(operation.FromLocationID).
               FirstRes()
            if res.Error != nil {
               return err
@@ -643,7 +725,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
@@ -680,6 +762,7 @@
      return
   }
   operation.Status = constvar.OperationStatus_Cancel
   operation.AuditDate = time.Now().Format("2006-01-02 15:04:05")
   if err := models.NewOperationSearch().SetID(operation.Id).Save(operation); err != nil {
      util.ResponseFormat(c, code.SaveFail, err.Error())
      return