1.合并代码

jiangshuai

2023-09-28 6856a595e0523216c16c03c58110f4ce80fa88b5

 controllers/location_product_amount.go

@@ -12,6 +12,7 @@
   "wms/extend/util"
   "wms/models"
   "wms/request"
   "wms/response"
)

type LocationProductAmountController struct {
@@ -48,7 +49,8 @@
               wms_location_product_amount.amount,
               material.unit,
               wms_location_product_amount.create_date,
               wms_operation_details.amount as adjust_amount`).
               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").
@@ -125,11 +127,12 @@
      util.ResponseFormat(c, code.RequestParamError, err.Error())
      return
   }
   reqParams.AdjustAmount = reqParams.Amount.Sub(reqParams.DifferenceAmount)
   //reqParams.AdjustAmount = reqParams.DifferenceAmount.Sub(reqParams.Amount)
   //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,
@@ -142,8 +145,8 @@
      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)) {
@@ -169,3 +172,122 @@

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

// 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)
}

// 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
   }
   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
   }); err != nil {
      util.ResponseFormat(c, code.RequestError, err.Error())
      return
   }
   util.ResponseFormat(c, code.Success, "操作成功")
}