1.二期一部分代码

jiangshuai

2023-09-27 1444c7c800fc042cd99213e901d6ad3722d0f03f

 controllers/location_product_amount.go

@@ -23,14 +23,14 @@
// @Produce   application/json
// @Param       object  body  request.PageInfo true  "查询参数"
// @Success   200 {object} util.Response   "成功"
// @Router    /api-wms/v1/locationProductamount/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
   }
@@ -38,10 +38,26 @@
   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`).
      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
   )

@@ -49,7 +65,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)
   }
@@ -57,7 +73,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)
}

@@ -67,7 +85,7 @@
// @Produce   application/json
// @Param     object  body  request.AddLocationProductAmount true  "入库/出库信息"
// @Success   200 {object} util.Response "成功"
// @Router    /api-wms/v1/locationProductamount/add [post]
// @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 {
@@ -84,7 +102,7 @@
   }

   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_operaton.status=?", reqParams.LocationId, reqParams.ProductId, constvar.BaseOperationTypeAdjust, constvar.OperationStatus_Ready).Count(&existCount).Error; err != nil {
   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
   }