1.库存盘点bug修改

jiangshuai

2023-10-20 96844c22ef3fba86a55e0af1b51bc1009d6fa950

 controllers/location_product_amount.go

@@ -1,6 +1,7 @@
package controllers

import (
   "errors"
   "fmt"
   "github.com/gin-gonic/gin"
   "github.com/shopspring/decimal"
@@ -37,27 +38,17 @@
   }

   search := models.NewLocationProductAmountSearch()
   search.SetPage(params.Page, params.PageSize)
   //search.SetPage(params.Page, params.PageSize)

   //wms_operation_details.amount as adjust_amount,wms_operation.id as operation_id,wms_operation.status
   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,
               wms_operation_details.amount as adjust_amount,
               wms_operation.id as operation_id,
               wms_operation.status`).
      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("left join wms_operation_details on wms_operation_details.product_id=wms_location_product.product_id").
      Joins("left 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 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)
   var (
      records = make([]*models.LocationProductAmountWithOperation, 0)
      total   int64
@@ -71,12 +62,24 @@
   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_operation.created_at desc").Find(&records).Error; err != nil {
   if err := search.Orm.Order("wms_location_product_amount.updated_at desc").Find(&records).Error; err != nil {
      util.ResponseFormat(c, code.RequestError, fmt.Errorf("find count err: %v", err))
      return
   }
   var operation models.Operation
   for k, v := range records {
      if v.OperationId != 0 {
      if res := models.NewOperationSearch().Orm.Preload("Details", "product_id=?", v.ProductId).Where("wms_operation.base_operation_type=? and wms_operation.status=? and wms_operation.to_location_id=?", constvar.BaseOperationTypeAdjust, constvar.OperationStatus_Ready, v.LocationId).First(&operation); res.Error != nil {
         if errors.Is(res.Error, gorm.ErrRecordNotFound) {
            records[k].Status = constvar.OperationStatus_Finish
            continue
         } else {
            util.ResponseFormat(c, code.RequestError, fmt.Errorf("find operation err: %v", res.Error.Error()))
            return
         }
      } else {
         records[k].AdjustAmount = operation.Details[0].Amount
         records[k].OperationId = operation.Id
         records[k].Status = operation.Status
         records[k].DifferenceAmount = v.Amount.Add(v.AdjustAmount)
      }
   }
@@ -87,52 +90,51 @@
// @Tags      库存盘点
// @Summary   添加库存盘点信息
// @Produce   application/json
// @Param     object  body  request.AddLocationProductAmount true  "入库/出库信息"
// @Param     object  body  request.UpdateLocationProductAmount true  "入库/出库信息"
// @Success   200 {object} util.Response "成功"
// @Router    /api-wms/v1/locationProductAmount/add [post]
func (slf LocationProductAmountController) Add(c *gin.Context) {
   var reqParams request.AddLocationProductAmount
   var reqParams request.UpdateLocationProductAmount
   if err := c.BindJSON(&reqParams); err != nil {
      util.ResponseFormat(c, code.RequestParamError, "参数解析失败，数据类型错误")
      return
   }

   if err := AddLocationProductAmount(reqParams); err != nil {
      util.ResponseFormat(c, code.RequestError, err)
   }

   util.ResponseFormat(c, code.Success, "添加成功")
}

func AddLocationProductAmount(reqParams request.UpdateLocationProductAmount) error {
   if reqParams.LocationId == 0 {
      util.ResponseFormat(c, code.RequestParamError, "参数异常，请选择位置")
      return
      return errors.New("参数异常，位置id信息不存在")
   }
   if reqParams.ProductId == "" {
      util.ResponseFormat(c, code.RequestParamError, "参数异常，请选择产品")
      return
      return errors.New("参数异常，产品id信息不存在")
   }

   var existCount int64
   if err := models.NewOperationSearch().Orm.Table("wms_operation").InnerJoins("inner join wms_operation_details on wms_operation_details.operation_id=wms_operation.id").Where("wms_operation.from_location_id=? and wms_operation_details.product_id=? and wms_operation.base_operation_type=? and wms_operation.status=?", reqParams.LocationId, reqParams.ProductId, constvar.BaseOperationTypeAdjust, constvar.OperationStatus_Ready).Count(&existCount).Error; err != nil {
      util.ResponseFormat(c, code.RequestParamError, err.Error())
      return
      return err
   }
   if existCount > 0 {
      util.ResponseFormat(c, code.RequestError, "该商品在已选中的位置存在未验证的库存盘点信息，无法继续添加相关信息")
      return
      return errors.New("该商品在已选中的位置存在未验证的库存盘点信息，无法继续添加相关信息")
   }

   locProduct, err := models.NewLocationProductSearch().SetLocationId(reqParams.LocationId).SetProductId(reqParams.ProductId).First()
   if err != nil {
      util.ResponseFormat(c, code.RequestParamError, "参数异常，未找到该上架规则")
      return
      return errors.New("参数异常，未找到该上架规则")
   }
   if locProduct.Id == 0 {
      util.ResponseFormat(c, code.RequestError, "不存在该上架规则，无法进行库存盘点")
      return
   }

   existAmount, err := models.NewLocationProductAmountSearch().SetLocationProductId(locProduct.Id).First()
   if err != nil {
      util.ResponseFormat(c, code.RequestError, err.Error())
      return
      return err
   }
   location, err := models.NewLocationSearch().SetType(int(constvar.LocationTypeAdjust)).First()
   if err != nil {
      util.ResponseFormat(c, code.RequestParamError, err.Error())
      return
      return err
   }
   //reqParams.AdjustAmount = reqParams.Amount.Sub(reqParams.DifferenceAmount)
   reqParams.AdjustAmount = reqParams.DifferenceAmount.Sub(reqParams.Amount)
@@ -171,11 +173,9 @@
      }
      return nil
   }); err != nil {
      util.ResponseFormat(c, code.RequestError, err.Error())
      return
      return err
   }

   util.ResponseFormat(c, code.Success, "添加成功")
   return nil
}

// GetRuleList
@@ -217,6 +217,14 @@
      util.ResponseFormat(c, code.RequestParamError, "参数解析失败，数据类型错误")
      return
   }
   if reqParams.OperationId == 0 {
      if err := AddLocationProductAmount(reqParams); err != nil {
         util.ResponseFormat(c, code.RequestError, err.Error())
         return
      }
      util.ResponseFormat(c, code.Success, "添加成功")
      return
   }
   reqParams.AdjustAmount = reqParams.DifferenceAmount.Sub(reqParams.Amount)
   operation, err := models.NewOperationSearch().SetID(reqParams.OperationId).First()
   if err != nil {