liujiandao
2024-03-29 c7b298c3d2bd922df7514f8a5ca37a0c7f6e5686
收货数量修改
2个文件已修改
26 ■■■■ 已修改文件
api/v1/purchase/purchase.go 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
model/purchase/response/purchase.go 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
api/v1/purchase/purchase.go
@@ -367,13 +367,20 @@
        response.FailWithMessage("参数缺失", c)
        return
    }
    data, err := service.NewPurchaseService().GetPurchase(uint(id))
    server := service.NewPurchaseService()
    data, err := server.GetPurchase(uint(id))
    if err != nil {
        global.GVA_LOG.Error("获取失败!", zap.Error(err))
        response.FailWithMessage("获取失败", c)
        return
    }
    productList, err := service.NewPurchaseService().GetPurchaseProductList(uint(id))
    productList, err := server.GetPurchaseProductList(uint(id))
    if err != nil {
        global.GVA_LOG.Error("获取失败!", zap.Error(err))
        response.FailWithMessage("获取失败", c)
        return
    }
    confirmInfo, err := server.GetPurchaseProductConfirmInfo(data.Number)
    if err != nil {
        global.GVA_LOG.Error("获取失败!", zap.Error(err))
        response.FailWithMessage("获取失败", c)
@@ -397,7 +404,6 @@
            oi.Status = operation.Status
            oi.Principal = data.Principal
            oi.WarehouseName = data.Warehouse
            oi.SendAmount = operation.Amount
            if operation.OverTime != "" {
                oi.OverTime = operation.OverTime
                oi.OverAmount = operation.Amount
@@ -410,6 +416,12 @@
                    oi.Unit = products.Product.Unit
                    oi.Specifications = products.Product.Specifications
                    oi.ModelNumber = products.Product.ModelNumber
                    break
                }
            }
            for _, confirm := range confirmInfo {
                if operation.ProductId == confirm.ProductId {
                    oi.SendAmount = confirm.OverReceiveAmount.IntPart()
                    break
                }
            }
@@ -426,6 +438,12 @@
            oi.Unit = products.Product.Unit
            oi.Specifications = products.Product.Specifications
            oi.ModelNumber = products.Product.ModelNumber
            for _, confirm := range confirmInfo {
                if products.Product.Number == confirm.ProductId {
                    oi.SendAmount = confirm.OverReceiveAmount.IntPart()
                    break
                }
            }
            operationInfos = append(operationInfos, oi)
        }
    }
model/purchase/response/purchase.go
@@ -56,7 +56,7 @@
    Specifications  string          `json:"specifications"`  //规格
    ModelNumber     string          `json:"modelNumber"`     //型号
    Amount          decimal.Decimal `json:"amount"`          //采购数
    SendAmount      int64           `json:"sendAmount"`      //发货数
    SendAmount      int64           `json:"sendAmount"`      //收货数
    OverAmount      int64           `json:"overAmount"`      //入库数
    Unit            string          `json:"unit"`            //单位
    PurchasePrice   decimal.Decimal `json:"purchasePrice"`   //单价