controllers/operation.go

@@ -287,12 +287,11 @@

// GetOperationInfo
// @Tags      入库/出库
// @Summary   入库/出库列表
// @Summary   操作详情接口
// @Produce   application/json
//
//    @Param        id    path        string            true    "id"
//
// @Success   200 {object} util.Response    "成功"
// @Param      id path  string true "id"
// @Param     Authorization    header string true "token"
// @Success   200 {object} util.Response{data=models.Operation}    "成功"
// @Router    /api-wms/v1/operation/getOperationInfo/{id} [get]
func (slf OperationController) GetOperationInfo(c *gin.Context) {
    number := c.Param("id")
@@ -306,6 +305,26 @@
        util.ResponseFormat(c, code.RequestParamError, err.Error())
        return
    }

    if operation.BaseOperationType == constvar.BaseOperationTypeOutgoing || operation.BaseOperationType == constvar.BaseOperationTypeInternal { //查询实时在库库存
        productIds := make([]string, 0)
        locationIds := make([]int, 0)
        for _, v := range operation.Details {
            productIds = append(productIds, v.ProductId)
            locationIds = append(locationIds, v.FromLocationID)
        }
        locationAmountMap, err := service.GetLocationAmounts(productIds, locationIds)
        if err != nil {
            util.ResponseFormat(c, code.RequestParamError, "查询产品库存错误")
            return
        }
        for _, v := range operation.Details {
            if locationAmountMap[v.ProductId] != nil {
                v.StockAmount = locationAmountMap[v.ProductId][v.FromLocationID]
            }
        }
    }

    util.ResponseFormat(c, code.Success, operation)
}


 docs/docs.go

@@ -1,5 +1,4 @@
// Code generated by swaggo/swag. DO NOT EDIT.

// Package docs Code generated by swaggo/swag. DO NOT EDIT
package docs

import "github.com/swaggo/swag"
@@ -2032,7 +2031,7 @@
                "tags": [
                    "入库/出库"
                ],
                "summary": "入库/出库列表",
                "summary": "操作详情接口",
                "parameters": [
                    {
                        "type": "string",
@@ -2040,13 +2039,32 @@
                        "name": "id",
                        "in": "path",
                        "required": true
                    },
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    }
                ],
                "responses": {
                    "200": {
                        "description": "成功",
                        "schema": {
                            "$ref": "#/definitions/util.Response"
                            "allOf": [
                                {
                                    "$ref": "#/definitions/util.Response"
                                },
                                {
                                    "type": "object",
                                    "properties": {
                                        "data": {
                                            "$ref": "#/definitions/models.Operation"
                                        }
                                    }
                                }
                            ]
                        }
                    }
                }

 docs/swagger.json

@@ -2020,7 +2020,7 @@
                "tags": [
                    "入库/出库"
                ],
                "summary": "入库/出库列表",
                "summary": "操作详情接口",
                "parameters": [
                    {
                        "type": "string",
@@ -2028,13 +2028,32 @@
                        "name": "id",
                        "in": "path",
                        "required": true
                    },
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    }
                ],
                "responses": {
                    "200": {
                        "description": "成功",
                        "schema": {
                            "$ref": "#/definitions/util.Response"
                            "allOf": [
                                {
                                    "$ref": "#/definitions/util.Response"
                                },
                                {
                                    "type": "object",
                                    "properties": {
                                        "data": {
                                            "$ref": "#/definitions/models.Operation"
                                        }
                                    }
                                }
                            ]
                        }
                    }
                }

 docs/swagger.yaml

@@ -3669,14 +3669,24 @@
        name: id
        required: true
        type: string
      - description: token
        in: header
        name: Authorization
        required: true
        type: string
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            $ref: '#/definitions/util.Response'
      summary: 入库/出库列表
            allOf:
            - $ref: '#/definitions/util.Response'
            - properties:
                data:
                  $ref: '#/definitions/models.Operation'
              type: object
      summary: 操作详情接口
      tags:
      - 入库/出库
  /api-wms/v1/operation/getPersonnelList:

 models/location_product_amount.go

@@ -36,6 +36,7 @@
        ProductIds  []string
        Ids         []int
        Query       string
        Fields      string
    }

    LocationProductAmountWithOperation struct {
@@ -131,6 +132,11 @@
    return slf
}

func (slf *LocationProductAmountSearch) SetFields(fields string) *LocationProductAmountSearch {
    slf.Fields = fields
    return slf
}

func (slf *LocationProductAmountSearch) build() *gorm.DB {
    var db = slf.Orm.Model(&LocationProductAmount{})

@@ -181,6 +187,10 @@
        db = db.Where("warehouse_id = ?", slf.WarehouseId)
    }

    if slf.Fields != "" {
        db = db.Select(slf.Fields)
    }

    return db
}


 service/location_amount.go

New file
@@ -0,0 +1,24 @@
package service

import (
    "github.com/shopspring/decimal"
    "wms/models"
)

func GetLocationAmounts(productIds []string, locationIds []int) (locationAmountMap map[string]map[int]decimal.Decimal, err error) {
    locationAmounts, err := models.NewLocationProductAmountSearch().
        SetProductIds(productIds).SetLocationIds(locationIds).
        SetFields("product_id, location_id, amount").
        Find()
    if err != nil {
        return nil, err
    }
    locationAmountMap = make(map[string]map[int]decimal.Decimal)
    for _, locationAmount := range locationAmounts {
        if locationAmountMap[locationAmount.ProductId] == nil {
            locationAmountMap[locationAmount.ProductId] = make(map[int]decimal.Decimal)
        }
        locationAmountMap[locationAmount.ProductId][locationAmount.LocationId] = locationAmount.Amount
    }
    return
}

 service/operation.go

@@ -91,6 +91,7 @@
            LocationID:         output.LocationID,
            OperationSource:    constvar.OperationSourceSaleDelivery,
            SalesDetailsNumber: output.SaleDetailsNumber,
            WarehouseId:        output.WarehouseID,
        }
        operations = append(operations, operation)
        autoCode = models.GetAutoCode(maxAutoIncr, codeStandard)
@@ -219,6 +220,7 @@
            BaseOperationType: constvar.BaseOperationTypeInternal,
            Details:           details,
            CheckedBy:         userInfo.Username,
            WarehouseId:       operation.WarehouseId,
        }).Error; err != nil {
            return err
        }
@@ -332,14 +334,14 @@
    var inputDetails []*models.OperationDetails
    var outputDetails []*models.OperationDetails
    for _, v := range listDetails {
        if locAmount, aok := mapLocAmount[strconv.Itoa(v.ToLocationID)+v.ProductId]; aok {
            if locAmount.Amount.Equal(v.Amount) {
        if _, aok := mapLocAmount[strconv.Itoa(v.FromLocationID)+v.ProductId]; aok {
            if v.StockAmount.Equal(v.Amount) { //盘点数量和剩余数量一致
                continue
            }
            if v.Amount.GreaterThan(locAmount.Amount) {
            if v.Amount.GreaterThan(v.StockAmount) {
                inputDetails = append(inputDetails, &models.OperationDetails{
                    ProductId:        v.ProductId,
                    Amount:           v.Amount.Sub(locAmount.Amount),
                    Amount:           v.Amount.Sub(v.StockAmount),
                    FromLocationID:   v.FromLocationID,
                    ToLocationID:     v.ToLocationID,
                    TotalGrossWeight: v.TotalGrossWeight,
@@ -353,7 +355,7 @@
            } else {
                outputDetails = append(outputDetails, &models.OperationDetails{
                    ProductId:        v.ProductId,
                    Amount:           locAmount.Amount.Sub(v.Amount),
                    Amount:           v.StockAmount.Sub(v.Amount),
                    FromLocationID:   v.ToLocationID,
                    ToLocationID:     v.FromLocationID,
                    TotalGrossWeight: v.TotalGrossWeight,
@@ -390,6 +392,7 @@
            Details:           inputDetails,
            LocationID:        inputDetails[0].FromLocationID,
            OperationTypeName: "库存调整入库",
            WarehouseId:       originOperation.WarehouseId,
        }
        if err := models.NewOperationSearch().SetOrm(tx).Create(operation); err != nil {
            return err
@@ -410,6 +413,7 @@
            Details:           outputDetails,
            LocationID:        outputDetails[0].FromLocationID,
            OperationTypeName: "库存调整出库",
            WarehouseId:       originOperation.WarehouseId,
        }
        if err := models.NewOperationSearch().SetOrm(tx).Create(operation); err != nil {
            return err
@@ -420,11 +424,7 @@
}

func GetTargetOperationTypeIdByOperation(operation *models.Operation, baseOT constvar.BaseOperationType) (operationTypeId int, err error) {
    oT, err := models.NewOperationTypeSearch().SetID(uint(operation.OperationTypeId)).First()
    if err != nil {
        return 0, err
    }
    targetOT, err := models.NewOperationTypeSearch().SetBaseOperationType(baseOT).SetWarehouseId(oT.WarehouseId).First()
    targetOT, err := models.NewOperationTypeSearch().SetBaseOperationType(baseOT).SetWarehouseId(operation.WarehouseId).First()
    if err != nil {
        return 0, err
    }