bug修改

jiangshuai

2023-10-26 be19d957b591ad27a47057929c4a8694f0776a1a

 controllers/location_product_amount.go

@@ -44,11 +44,9 @@
   search.Orm = search.Orm.
      Table("wms_location_product_amount").
      Select(`wms_location_product_amount.id as location_product_amount_id,wms_location.id as location_id,wms_location.name as location_name,material.id as product_id,material.name as product_name,wms_location_product_amount.amount,material.unit,wms_location_product_amount.create_date`).
      InnerJoins("inner join wms_location_product on wms_location_product.id=wms_location_product_amount.location_product_id").
      InnerJoins("inner join material on material.id=wms_location_product.product_id").
      InnerJoins("inner join wms_location on wms_location.id=wms_location_product.location_id")
   //Joins("inner join wms_operation_details on wms_operation_details.product_id=wms_location_product.product_id").
   //Joins("inner join wms_operation on wms_operation.id=wms_operation_details.operation_id and wms_operation.base_operation_type=? and wms_operation.status=?", constvar.BaseOperationTypeAdjust, constvar.OperationStatus_Ready)
      InnerJoins("inner join material on material.id=wms_location_product_amount.product_id").
      InnerJoins("inner join wms_location on wms_location.id=wms_location_product_amount.location_id")

   var (
      records = make([]*models.LocationProductAmountWithOperation, 0)
      total   int64
@@ -62,7 +60,7 @@
   if params.Page*params.PageSize > 0 {
      search.Orm = search.Orm.Offset((params.Page - 1) * params.PageSize).Limit(params.PageSize)
   }
   if err := search.Orm.Order("wms_location_product_amount.updated_at desc").Find(&records).Error; err != nil {
   if err := search.Orm.Order("wms_location_product_amount.updated_at desc").Find(&records).Error; err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
      util.ResponseFormat(c, code.RequestError, fmt.Errorf("find count err: %v", err))
      return
   }
@@ -127,25 +125,22 @@
      return errors.New("该商品在已选中的位置存在未验证的库存盘点信息，无法继续添加相关信息")
   }

   locProduct, err := models.NewLocationProductSearch().SetLocationId(reqParams.LocationId).SetProductId(reqParams.ProductId).First()
   if err != nil {
      return errors.New("参数异常，未找到该上架规则")
   }

   existAmount, err := models.NewLocationProductAmountSearch().SetLocationProductId(locProduct.Id).First()
   if err != nil {
      return err
   existAmount, res := models.NewLocationProductAmountSearch().SetLocationId(reqParams.LocationId).SetProductId(reqParams.ProductId).FirstRes()
   if res.Error != nil && !errors.Is(res.Error, gorm.ErrRecordNotFound) {
      return res.Error
   }
   location, err := models.NewLocationSearch().SetType(int(constvar.LocationTypeAdjust)).First()
   if err != nil {
      return err
   }
   //reqParams.AdjustAmount = reqParams.Amount.Sub(reqParams.DifferenceAmount)
   reqParams.AdjustAmount = reqParams.DifferenceAmount.Sub(reqParams.Amount)
   var locAmount models.LocationProductAmount
   if existAmount.Id == 0 {
   if res.Error != nil && errors.Is(res.Error, gorm.ErrRecordNotFound) {
      locAmount = models.LocationProductAmount{
         LocationProductId: locProduct.Id,
         LocationId: reqParams.LocationId,
         //TODO:此处新增了ProductCategoryId入参，目前不清楚这个值的来源
         ProductCategoryID: reqParams.ProductCategoryId,
         ProductId:         reqParams.ProductId,
         Amount:            decimal.NewFromInt(0),
         CreateDate:        time.Now().Format("2006-01-02 15:04:05"),
      }