1.库存盘点bug修改

jiangshuai

2023-10-20 96844c22ef3fba86a55e0af1b51bc1009d6fa950

 controllers/product_controller.go

@@ -360,19 +360,18 @@
   }
   detail := &models.OperationDetails{
      ProductId: params.ProductId,
      //ProductName: params.ProductName,
      Amount: params.Amount,
      //Unit:        params.Unit,
      Amount:    params.Amount,
   }
   operation := models.Operation{
      Number:          strconv.FormatInt(time.Now().Unix(), 10),
      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},
      Number:            strconv.FormatInt(time.Now().Unix(), 10),
      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,
   }
   if err := models.NewOperationSearch().Create(&operation); err != nil {
      logx.Errorf("Operation create err: %v", err)
@@ -404,11 +403,8 @@

   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").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")

   if params.SourceNumber != "" {
      db = db.Where("wms_operation.source_number like ?", fmt.Sprintf("%%%v%%", params.SourceNumber))
   }
   if params.Number != "" {
      db = db.Where("wms_operation.number like ?", fmt.Sprintf("%%%v%%", 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))
   }
   db = db.Where("wms_operation.operation_type_id=?", 0)
   var (
@@ -426,7 +422,7 @@
   if params.Page*params.PageSize > 0 {
      db = db.Offset((params.Page - 1) * params.PageSize).Limit(params.PageSize)
   }
   if err := db.Find(&records).Error; err != nil {
   if err := db.Order("wms_operation.created_at desc").Find(&records).Error; err != nil {
      util.ResponseFormat(c, code.RequestError, fmt.Errorf("find count err: %v", err))
      return
   }
@@ -487,6 +483,21 @@
            }
            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
            }
         }
@@ -567,3 +578,33 @@
   }
   util.ResponseFormat(c, code.Success, "添加成功")
}

// ListHistory
// @Tags      产品
// @Summary   产品位置历史信息
// @Produce   application/json
// @Param       object  body  request.QueryOperationHistory true  "查询参数"
// @Success   200 {object} util.ResponseList{data=[]models.Operation}   "成功"
// @Router    /api-wms/v1/product/listHistory [post]
func (slf ProductController) ListHistory(c *gin.Context) {
   var params request.QueryOperationHistory
   if err := c.BindJSON(&params); err != nil {
      util.ResponseFormat(c, code.RequestParamError, "参数解析失败，数据类型错误:"+err.Error())
      return
   }
   if !params.PageInfo.Check() {
      util.ResponseFormat(c, code.RequestParamError, "页码信息错误")
      return
   }

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

   list, total, err := search.Find()
   if err != nil {
      util.ResponseFormat(c, code.RequestError, "查找失败:"+err.Error())
      return
   }

   util.ResponseFormatListWithPage(c, code.Success, list, int(total), params.Page, params.PageSize)
}