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

zhangqian

2024-01-12 a10d59528a36dc5a1fbe4d9caa6b4abf25ab828c

 controllers/product_controller.go

@@ -12,6 +12,7 @@
   "wms/constvar"
   "wms/extend/code"
   "wms/extend/util"
   "wms/middleware"
   "wms/models"
   "wms/pkg/logx"
   "wms/pkg/mysqlx"
@@ -464,8 +465,10 @@
   }

   detail := &models.OperationDetails{
      ProductId: params.ProductId,
      Amount:    params.Amount,
      ProductId:      params.ProductId,
      Amount:         params.Amount,
      FromLocationID: params.FromLocationId,
      ToLocationID:   params.ToLocationId,
   }
   operation := models.Operation{
      //Number:            strconv.FormatInt(time.Now().Unix(), 10),
@@ -473,8 +476,6 @@
      SourceNumber:      params.SourceNumber,
      OperationTypeId:   0,
      Status:            constvar.OperationStatus_Ready,
      FromLocationID:    params.FromLocationId,
      ToLocationID:      params.ToLocationId,
      OperationDate:     time.Now().Format("2006-01-02 15:04:05"),
      Details:           []*models.OperationDetails{detail},
      BaseOperationType: constvar.BaseOperationTypeDisuse,
@@ -505,7 +506,12 @@
      return
   }

   db := models.NewOperationSearch().Orm.Table("wms_operation").Select("wms_operation.id,wms_operation.number,wms_operation.source_number,wms_operation.status,wms_operation.from_location_id,wms_operation.to_location_id,wms_operation.operation_date,wms_operation.contacter_id,wms_operation.contacter_name,wms_operation.company_id,wms_operation.company_name,wms_operation.comment,wms_operation_details.product_id,material.name as product_name,material.unit,wms_operation_details.amount,wms_operation.base_operation_type").InnerJoins("inner join wms_operation_details on wms_operation_details.operation_id=wms_operation.id").InnerJoins("inner join material on material.id=wms_operation_details.product_id").Where("wms_operation.base_operation_type=?", constvar.BaseOperationTypeDisuse)
   db := models.NewOperationSearch().Orm.
      Table("wms_operation").
      Select("wms_operation.id,wms_operation.number,wms_operation.source_number,wms_operation.status,wms_operation_details.from_location_id,wms_operation_details.to_location_id,wms_operation.operation_date,wms_operation.contacter_id,wms_operation.contacter_name,wms_operation.company_id,wms_operation.company_name,wms_operation.comment,wms_operation_details.product_id,material.name as product_name,material.unit,wms_operation_details.amount,wms_operation.base_operation_type").
      InnerJoins("inner join wms_operation_details on wms_operation_details.operation_id=wms_operation.id").
      InnerJoins("inner join material on material.id=wms_operation_details.product_id").
      Where("wms_operation.base_operation_type=?", constvar.BaseOperationTypeDisuse)

   if params.Number != "" {
      db = db.Where("wms_operation.number like ? or wms_operation.source_number like ? or material.name like ?", fmt.Sprintf("%%%v%%", params.Number), fmt.Sprintf("%%%v%%", params.Number), fmt.Sprintf("%%%v%%", params.Number))
@@ -564,62 +570,34 @@
      if err := models.NewOperationSearch().SetOrm(tx).SetID(id).Update(&models.Operation{Status: constvar.OperationStatus_Finish, AuditDate: time.Now().Format("2006-01-02 15:04:05")}); err != nil {
         return err
      }
      var listProdtId []string
      var listProdt []*models.Material
      mapProdt := make(map[string]decimal.Decimal)
      listDetails, err := models.NewOperationDetailsSearch().SetOperationId(operation.Id).FindAll()

      listDetails, err := models.NewOperationDetailsSearch().SetOperationId(operation.Id).SetPreload(true).FindAll()
      if err != nil {
         return err
      }
      for _, v := range listDetails {
         listProdtId = append(listProdtId, v.ProductId)
         mapProdt[v.ProductId] = v.Amount
      }
      if err := models.NewMaterialSearch().Orm.Where("id IN ?", listProdtId).Find(&listProdt).Error; err != nil {
         return err
      }
      for k, v := range listProdt {
         if value, ok := mapProdt[v.ID]; !ok {
            return errors.New("产品种类异常")
         } else {
            if v.Amount.LessThan(value) {
               return errors.New(fmt.Sprintf("产品：%v,库存：%v,报废：%v,数量不够，无法完成报废操作", v.Name, v.Amount.String(), value.String()))
            }
            listProdt[k].Amount = listProdt[k].Amount.Sub(value)
            if err := tx.Save(listProdt[k]).Error; err != nil {
               return err
            }

            //var locAmount models.LocationProductAmount
            //if err := models.NewLocationProductAmountSearch().Orm.
            //   Table("wms_location_product_amount").
            //   Joins("inner join wms_location_product on wms_location_product.id=wms_location_product_amount.location_product_id").
            //   Where("wms_location_product.product_id=? and wms_location_product.location_id=?", v.ID, operation.FromLocationID).
            //   First(&locAmount).Error; err != nil {
            //   return err
            //}
            //if locAmount.Amount.LessThan(value) {
            //   return errors.New(fmt.Sprintf("产品：%v,库存：%v,出库：%v,数量不够，无法完成出库操作", v.Name, v.Amount.String(), value.String()))
            //}
            //locAmount.Amount = locAmount.Amount.Sub(value)
            //if err := models.NewLocationProductAmountSearch().SetID(locAmount.Id).Update(&locAmount); err != nil {
            //   return err
            //}
      for k, v := range listDetails {
         if v.Product.Amount.LessThan(v.Amount) {
            return errors.New(fmt.Sprintf("产品：%v,库存：%v,报废：%v,数量不够，无法完成报废操作", v.Product.Name, v.Product.Amount.String(), v.Amount.String()))
         }
         listDetails[k].Product.Amount = listDetails[k].Product.Amount.Sub(v.Amount)
         if err := tx.Save(&listDetails[k].Product).Error; err != nil {
            return err
         }

            locAmount, res := models.NewLocationProductAmountSearch().
               SetProductId(v.ID).
               SetLocationId(operation.FromLocationID).
               FirstRes()
            if res.Error != nil {
               return err
            }
            if locAmount.Amount.LessThan(value) {
               return errors.New(fmt.Sprintf("产品：%v,库存：%v,报废：%v,数量不够，无法完成报废操作", v.Name, v.Amount.String(), value.String()))
            }
            locAmount.Amount = locAmount.Amount.Sub(value)
            if err := models.NewLocationProductAmountSearch().SetID(locAmount.Id).Update(locAmount); err != nil {
               return err
            }
         locAmount, res := models.NewLocationProductAmountSearch().
            SetProductId(v.ProductId).
            SetLocationId(v.FromLocationID).
            FirstRes()
         if res.Error != nil {
            return err
         }
         if locAmount.Amount.LessThan(v.Amount) {
            return errors.New(fmt.Sprintf("产品：%v,库存：%v,报废：%v,数量不够，无法完成报废操作", v.Product.Name, locAmount.Amount.String(), v.Amount.String()))
         }
         locAmount.Amount = locAmount.Amount.Sub(v.Amount)
         if err := models.NewLocationProductAmountSearch().SetID(locAmount.Id).Update(locAmount); err != nil {
            return err
         }
      }
      return nil
@@ -672,6 +650,8 @@
      //ProductName: params.ProductName,
      Amount: params.Amount,
      //Unit:        params.Unit,
      FromLocationID: params.FromLocationId,
      ToLocationID:   params.ToLocationId,
   }
   operation := models.Operation{
      Id:                params.Id,
@@ -679,8 +659,6 @@
      SourceNumber:      params.SourceNumber,
      OperationTypeId:   0,
      Status:            params.Status,
      FromLocationID:    params.FromLocationId,
      ToLocationID:      params.ToLocationId,
      OperationDate:     params.OperationDate,
      Details:           []*models.OperationDetails{detail},
      BaseOperationType: params.BaseOperationType,
@@ -723,7 +701,7 @@
   }

   search := models.NewOperationSearch().SetPage(params.Page, params.PageSize).SetPreload(true).SetOrder("created_at desc")
   search.SetOrm(search.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.from_location_id=? or wms_operation.to_location_id=?)", params.ProductId, params.LocationId, params.LocationId))
   search.SetOrm(search.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_details.from_location_id=? or wms_operation_details.to_location_id=?)", params.ProductId, params.LocationId, params.LocationId))

   list, total, err := search.SetBaseOperationType(constvar.BaseOperationTypeAdjust).Find()
   if err != nil {
@@ -769,3 +747,17 @@
   }
   util.ResponseFormat(c, code.Success, "操作成功")
}

// GetUserInfo
//
//   @Tags      产品
//   @Summary   获取登录用户信息
//   @Produce   application/json
//   @Success   200   {object}   util.ResponseList{data=map[string]interface{}}   "成功"
//   @Router      /api-wms/v1/product/getUserInfo [get]
func (slf ProductController) GetUserInfo(c *gin.Context) {
   userInfo := middleware.GetUserInfo(c)
   m := make(map[string]interface{})
   m["userName"] = userInfo.Username
   util.ResponseFormat(c, code.Success, m)
}