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"
@@ -12,6 +13,7 @@
   "wms/extend/util"
   "wms/models"
   "wms/request"
   "wms/response"
)

type LocationProductAmountController struct {
@@ -36,26 +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.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`).
      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 wms_location on wms_location.id=wms_location_product.location_id").
      InnerJoins("inner join wms_operation_details on wms_operation_details.product_id=wms_location_product.product_id").
      InnerJoins("inner join material on material.id=wms_operation_details.product_id").
      InnerJoins("inner join wms_operation on wms_operation.id=wms_operation_details.operation_id").
      Where("wms_operation.base_operation_type=?", constvar.BaseOperationTypeAdjust)

      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)
   var (
      records = make([]*models.LocationProductAmountWithOperation, 0)
      total   int64
@@ -69,12 +62,26 @@
   if params.Page*params.PageSize > 0 {
      search.Orm = search.Orm.Offset((params.Page - 1) * params.PageSize).Limit(params.PageSize)
   }
   if err := search.Orm.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 {
      records[k].DifferenceAmount = v.Amount.Sub(v.AdjustAmount)
      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)
      }
   }
   util.ResponseFormatListWithPage(c, code.Success, records, int(total), params.Page, params.PageSize)
}
@@ -83,54 +90,63 @@
// @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 {
      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)
   locAmount := models.LocationProductAmount{
      LocationProductId: locProduct.Id,
      Amount:            decimal.NewFromInt(0),
   //reqParams.AdjustAmount = reqParams.Amount.Sub(reqParams.DifferenceAmount)
   reqParams.AdjustAmount = reqParams.DifferenceAmount.Sub(reqParams.Amount)
   var locAmount models.LocationProductAmount
   if existAmount.Id == 0 {
      locAmount = models.LocationProductAmount{
         LocationProductId: locProduct.Id,
         Amount:            decimal.NewFromInt(0),
         CreateDate:        time.Now().Format("2006-01-02 15:04:05"),
      }
   }

   detail := &models.OperationDetails{
      ProductId: reqParams.ProductId,
      Amount:    reqParams.AdjustAmount,
@@ -142,23 +158,143 @@
      Comment:           "库存盘点",
      BaseOperationType: constvar.BaseOperationTypeAdjust,
      Details:           []*models.OperationDetails{detail},
      FromLocationID:    reqParams.LocationId,
      ToLocationID:      location.Id,
      FromLocationID:    location.Id,
      ToLocationID:      reqParams.LocationId,
   }

   //if reqParams.AdjustAmount.GreaterThanOrEqual(decimal.NewFromInt(0)) {
   //   operation.FromLocationID = Location.Id
   //   operation.ToLocationID = reqParams.LocationId
   //} else {
   //   operation.FromLocationID = reqParams.LocationId
   //   operation.ToLocationID = Location.Id
   //}

   if err := models.WithTransaction(func(tx *gorm.DB) error {
      if err := models.NewOperationSearch().SetOrm(tx).Create(&operation); err != nil {
         return err
      }
      if err := models.NewLocationProductAmountSearch().SetOrm(tx).Create(&locAmount); err != nil {
      if existAmount.Id == 0 {
         if err := models.NewLocationProductAmountSearch().SetOrm(tx).Create(&locAmount); err != nil {
            return err
         }
      }
      return nil
   }); err != nil {
      return err
   }
   return nil
}

// GetRuleList
// @Tags      库存盘点
// @Summary   获取上架规则
// @Produce   application/json
// @Param     object  body  request.GetRuleList true  "查询信息"
// @Success   200 {object} util.ResponseList{data=[]response.RuleList}   "成功"
// @Router    /api-wms/v1/locationProductAmount/getRuleList [post]
func (slf LocationProductAmountController) GetRuleList(c *gin.Context) {
   var params request.GetRuleList
   if err := c.BindJSON(&params); err != nil {
      util.ResponseFormat(c, code.RequestParamError, "参数解析失败，数据类型错误")
      return
   }
   list, err := models.NewLocationProductSearch().SetProductId(params.ProductId).SetLocationId(params.LocationId).Find()
   if err != nil {
      util.ResponseFormat(c, code.RequestParamError, err.Error())
      return
   }
   var ruleList response.RuleList
   for _, l := range list {
      ruleList.LocationList = append(ruleList.LocationList, l.Location)
      ruleList.ProductList = append(ruleList.ProductList, l.Product)
   }
   util.ResponseFormat(c, code.Success, ruleList)
}

// Update
// @Tags      库存盘点
// @Summary   修改库存盘点信息
// @Produce   application/json
// @Param     object  body  request.UpdateLocationProductAmount true  "入库/出库信息"
// @Success   200 {object} util.Response "成功"
// @Router    /api-wms/v1/locationProductAmount/update [post]
func (slf LocationProductAmountController) Update(c *gin.Context) {
   var reqParams request.UpdateLocationProductAmount
   if err := c.BindJSON(&reqParams); err != nil {
      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 {
      util.ResponseFormat(c, code.RequestParamError, "未找到相关数据")
      return
   }
   if operation.Status != constvar.OperationStatus_Ready {
      util.ResponseFormat(c, code.RequestParamError, "该记录已验证通过，无法进行修改")
      return
   }

   if err := models.NewOperationDetailsSearch().SetOperationId(reqParams.OperationId).SetProductId(reqParams.ProductId).Update(&models.OperationDetails{Amount: reqParams.AdjustAmount}); err != nil {
      util.ResponseFormat(c, code.RequestError, "修改失败："+err.Error())
      return
   }

   util.ResponseFormat(c, code.Success, "修改成功")
}

// finish
//
//   @Tags      库存盘点
//   @Summary   应用、验证
//   @Produce   application/json
//   @Param      object  body  request.FinishLocationProductAmount true  "入参"
//   @Success   200   {object}   util.Response   "成功"
//   @Router      /api-wms/v1/locationProductAmount/finish [post]
func (slf LocationProductAmountController) Finish(c *gin.Context) {
   var reqParams request.FinishLocationProductAmount
   if err := c.BindJSON(&reqParams); err != nil {
      util.ResponseFormat(c, code.RequestParamError, "参数解析失败，数据类型错误")
      return
   }
   if reqParams.LocationProductAmountId == 0 {
      util.ResponseFormat(c, code.RequestParamError, "locationProductAmountId为0")
      return
   }
   if reqParams.OperationId == 0 {
      util.ResponseFormat(c, code.RequestParamError, "operationId为0")
      return
   }
   operationSearch := models.NewOperationSearch().SetPreload(true)
   operationSearch.SetOrm(operationSearch.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.id=?", reqParams.ProductId, reqParams.OperationId))
   operation, err := operationSearch.First()
   if err != nil {
      util.ResponseFormat(c, code.RequestParamError, "未找到相关信息:"+err.Error())
      return
   }
   if operation.Status != constvar.OperationStatus_Ready {
      util.ResponseFormat(c, code.RequestError, "该验证无法完成")
      return
   }
   material, err := models.NewMaterialSearch().SetID(reqParams.ProductId).First()
   if err != nil {
      util.ResponseFormat(c, code.RequestError, err.Error())
      return
   }
   locProdtAmount, err := models.NewLocationProductAmountSearch().SetID(reqParams.LocationProductAmountId).First()
   if err != nil {
      util.ResponseFormat(c, code.RequestError, err.Error())
      return
   }
   if err := models.WithTransaction(func(tx *gorm.DB) error {
      if err := models.NewOperationSearch().SetOrm(tx).SetID(reqParams.OperationId).Update(&models.Operation{Status: constvar.OperationStatus_Finish}); err != nil {
         return err
      }
      if err := models.NewMaterialSearch().SetOrm(tx).SetID(reqParams.ProductId).Update(&models.Material{Amount: material.Amount.Add(operation.Details[0].Amount)}); err != nil {
         return err
      }
      if err := models.NewLocationProductAmountSearch().SetOrm(tx).SetID(reqParams.LocationProductAmountId).Update(&models.LocationProductAmount{Amount: locProdtAmount.Amount.Add(operation.Details[0].Amount)}); err != nil {
         return err
      }
      return nil
@@ -166,6 +302,5 @@
      util.ResponseFormat(c, code.RequestError, err.Error())
      return
   }

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