Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS

liujiandao

2023-09-27 5c1dfdd9f0d51821ac47a46cba74ef94bfe0141e

 controllers/location_product_amount.go

@@ -3,6 +3,10 @@
import (
   "fmt"
   "github.com/gin-gonic/gin"
   "github.com/shopspring/decimal"
   "gorm.io/gorm"
   "strconv"
   "time"
   "wms/constvar"
   "wms/extend/code"
   "wms/extend/util"
@@ -19,14 +23,14 @@
// @Produce   application/json
// @Param       object  body  request.PageInfo true  "查询参数"
// @Success   200 {object} util.Response   "成功"
// @Router    /api-wms/v1/locationProduct/list [post]
// @Router    /api-wms/v1/locationProductAmount/list [post]
func (slf LocationProductAmountController) List(c *gin.Context) {
   var params request.PageInfo
   if err := c.BindJSON(&params); err != nil {
      util.ResponseFormat(c, code.RequestParamError, "参数解析失败，数据类型错误:"+err.Error())
      return
   }
   if params.Check() {
   if !params.Check() {
      util.ResponseFormat(c, code.RequestParamError, "参数异常")
      return
   }
@@ -34,10 +38,27 @@
   search := models.NewLocationProductAmountSearch()
   search.SetPage(params.Page, params.PageSize)

   search.Orm = search.Orm.Model(&models.LocationProductAmountWithOperation{}).Table("wms_location_product_amount").Select("wms_location_product_amount.*,wms_operation.amount as adjust_amount").InnerJoins("inner join wms_location_product on wms_location_product.id=wms_location_product_amount.location_product_id").InnerJoins("inner join wms_operation_details on wms_operation_details.product_id=wms_location_product.product_id").InnerJoins("inner join wms_operation on wms_operation.id=wms_operation_details.operation_id").Where("wms_operation.base_operation_type=?", constvar.BaseOperationTypeAdjust)
   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,
               wms_operation.id as operation_id`).
      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)

   var (
      records = make([]*models.ResponseDisuseList, 0)
      records = make([]*models.LocationProductAmountWithOperation, 0)
      total   int64
   )

@@ -45,7 +66,7 @@
      util.ResponseFormat(c, code.RequestError, fmt.Errorf("find count err: %v", err))
      return
   }
   search.Orm = search.Orm.Preload("LocationProduct").Preload("LocationProduct.Location").Preload("LocationProduct.Product")
   //search.Orm = search.Orm.Preload("LocationProduct").Preload("LocationProduct.Location").Preload("LocationProduct.Product")
   if params.Page*params.PageSize > 0 {
      search.Orm = search.Orm.Offset((params.Page - 1) * params.PageSize).Limit(params.PageSize)
   }
@@ -53,7 +74,9 @@
      util.ResponseFormat(c, code.RequestError, fmt.Errorf("find count err: %v", err))
      return
   }

   for k, v := range records {
      records[k].DifferenceAmount = v.Amount.Sub(v.AdjustAmount)
   }
   util.ResponseFormatListWithPage(c, code.Success, records, int(total), params.Page, params.PageSize)
}

@@ -63,40 +86,172 @@
// @Produce   application/json
// @Param     object  body  request.AddLocationProductAmount true  "入库/出库信息"
// @Success   200 {object} util.Response "成功"
// @Router    /api-wms/v1/operation/operation [post]
//func (slf LocationProductAmountController) Add(c *gin.Context) {
//   var reqParams request.AddLocationProductAmount
// @Router    /api-wms/v1/locationProductAmount/add [post]
func (slf LocationProductAmountController) Add(c *gin.Context) {
   var reqParams request.AddLocationProductAmount
   if err := c.BindJSON(&reqParams); err != nil {
      util.ResponseFormat(c, code.RequestParamError, "参数解析失败，数据类型错误")
      return
   }
   if reqParams.LocationId == 0 {
      util.ResponseFormat(c, code.RequestParamError, "参数异常，请选择位置")
      return
   }
   if reqParams.ProductId == "" {
      util.ResponseFormat(c, code.RequestParamError, "参数异常，请选择产品")
      return
   }

   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
   }
   if existCount > 0 {
      util.ResponseFormat(c, code.RequestError, "该商品在已选中的位置存在未验证的库存盘点信息，无法继续添加相关信息")
      return
   }

   locProduct, err := models.NewLocationProductSearch().SetLocationId(reqParams.LocationId).SetProductId(reqParams.ProductId).First()
   if err != nil {
      util.ResponseFormat(c, code.RequestParamError, "参数异常，未找到该上架规则")
      return
   }
   if locProduct.Id == 0 {
      util.ResponseFormat(c, code.RequestError, "不存在该上架规则，无法进行库存盘点")
      return
   }
   location, err := models.NewLocationSearch().SetType(int(constvar.LocationTypeAdjust)).First()
   if err != nil {
      util.ResponseFormat(c, code.RequestParamError, err.Error())
      return
   }
   //reqParams.AdjustAmount = reqParams.Amount.Sub(reqParams.DifferenceAmount)
   reqParams.AdjustAmount = reqParams.DifferenceAmount.Sub(reqParams.Amount)
   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,
   }
   operation := models.Operation{
      Number:            strconv.FormatInt(time.Now().Unix(), 10),
      Status:            constvar.OperationStatus_Ready,
      OperationDate:     time.Now().Format("2006-01-02 15:04:05"),
      Comment:           "库存盘点",
      BaseOperationType: constvar.BaseOperationTypeAdjust,
      Details:           []*models.OperationDetails{detail},
      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 {
         return err
      }
      return nil
   }); err != nil {
      util.ResponseFormat(c, code.RequestError, err.Error())
      return
   }

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

// Add
// @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.LocationProductAmountId==0 {
//      util.ResponseFormat(c, code.RequestParamError, "参数异常，locationProductAmountId为0")
//
//   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
//   }
//   locAmount:=models.LocationProductAmount{
//      LocationProductId: reqParams.LocationProductAmountId
//   if existCount > 0 {
//      util.ResponseFormat(c, code.RequestError, "该商品在已选中的位置存在未验证的库存盘点信息，无法继续添加相关信息")
//      return
//   }
//   operationType, err := models.NewOperationTypeSearch().SetID(uint(params.OperationTypeId)).First()
//
//   locProduct, err := models.NewLocationProductSearch().SetLocationId(reqParams.LocationId).SetProductId(reqParams.ProductId).First()
//   if err != nil {
//      util.ResponseFormat(c, code.RequestParamError, "参数异常，未找到该上架规则")
//      return
//   }
//   if locProduct.Id == 0 {
//      util.ResponseFormat(c, code.RequestError, "不存在该上架规则，无法进行库存盘点")
//      return
//   }
//   location, err := models.NewLocationSearch().SetType(int(constvar.LocationTypeAdjust)).First()
//   if err != nil {
//      util.ResponseFormat(c, code.RequestParamError, err.Error())
//      return
//   }
//   //////
//   if location, err := models.NewLocationSearch().SetType(int(constvar.LocationTypeCustomer)).First(); err != nil {
//      return err
//   } else {
//      params.ToLocationID = location.Id
//   //reqParams.AdjustAmount = reqParams.Amount.Sub(reqParams.DifferenceAmount)
//   reqParams.AdjustAmount = reqParams.DifferenceAmount.Sub(reqParams.Amount)
//   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,
//   }
//   operation := models.Operation{
//      Number:            strconv.FormatInt(time.Now().Unix(), 10),
//      Status:            constvar.OperationStatus_Ready,
//      OperationDate:     time.Now().Format("2006-01-02 15:04:05"),
//      Comment:           "库存盘点",
//      BaseOperationType: constvar.BaseOperationTypeAdjust,
//      Details:           []*models.OperationDetails{detail},
//      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
//   //}
//
//   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())
//   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 {
//         return err
//      }
//      return nil
//   }); err != nil {
//      util.ResponseFormat(c, code.RequestError, err.Error())
//      return
//   }
//
//   util.ResponseFormat(c, code.Success, "添加成功")
//}