From c7e82fd1d76b9fb25497d5aba4372bbfe13a8468 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 28 三月 2024 20:00:21 +0800
Subject: [PATCH] 采购入库增加来源
---
api/v1/test/product.go | 105 ++++++++++++++++++++++++++--------------------------
1 files changed, 52 insertions(+), 53 deletions(-)
diff --git a/api/v1/test/product.go b/api/v1/test/product.go
index bcd2eea..a962d3f 100644
--- a/api/v1/test/product.go
+++ b/api/v1/test/product.go
@@ -2,7 +2,6 @@
import (
"github.com/gin-gonic/gin"
- "github.com/spf13/cast"
"go.uber.org/zap"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
@@ -12,7 +11,6 @@
"srm/model/test"
testReq "srm/model/test/request"
testResp "srm/model/test/response"
- "srm/proto/product"
"srm/service"
)
@@ -177,26 +175,27 @@
return
}
- productList := make([]testResp.Product, 0, len(list))
-
- for _, item := range list {
- productList = append(productList, testResp.Product{
- Name: item.Name,
- Number: item.Number,
- SupplierId: item.SupplierId,
- Unit: item.Unit,
- PurchasePrice: item.PurchasePrice,
- DeliveryTime: item.DeliveryTime,
- ShippingDuration: item.ShippingDuration,
- Specifications: item.Specifications,
- ModelNumber: item.ModelNumber,
- ProductType: "",
- MinimumStock: item.MinimumStock,
- MaximumStock: item.MaximumStock,
- Remark: "",
- SupplierName: item.Supplier.Name,
- })
- }
+ //productList := make([]testResp.Product, 0, len(list))
+ //
+ //for _, item := range list {
+ // productList = append(productList, testResp.Product{
+ // Name: item.Name,
+ // Number: item.Number,
+ // SupplierId: item.SupplierId,
+ // Unit: item.Unit,
+ // PurchasePrice: item.PurchasePrice,
+ // DeliveryTime: item.DeliveryTime,
+ // ShippingDuration: item.ShippingDuration,
+ // Specifications: item.Specifications,
+ // ModelNumber: item.ModelNumber,
+ // ProductType: "",
+ // MinimumStock: item.MinimumStock,
+ // MaximumStock: item.MaximumStock,
+ // Remark: "",
+ // SupplierName: item.Supplier.Name,
+ // CategoryName: item.CategoryName,
+ // })
+ //}
response.OkWithDetailed(response.PageResult{
List: list,
@@ -242,39 +241,39 @@
return
}
- cli := product.NewProductServiceClient(productServiceConn)
- getProductListResponse, err := cli.GetProductList(c, &product.GetProductListRequest{
- Page: cast.ToInt32(pageInfo.Page),
- PageSize: cast.ToInt32(pageInfo.PageSize),
- ProductNumber: pageInfo.Number,
- ProductName: pageInfo.Name,
- })
- rawProductList := getProductListResponse.List
- productList := make([]testResp.Product, len(rawProductList))
-
- for k, v := range rawProductList {
- productList[k].Number = v.Number
- productList[k].Name = v.Name
- productList[k].Unit = v.Unit
- productList[k].PurchasePrice = v.SalePrice
- min := int64(v.MinInventory)
- productList[k].MinimumStock = min
- max := int64(v.MaxInventory)
- productList[k].MaximumStock = max
- productList[k].Remark = v.Node
- productList[k].ProductType = v.MaterialMode
- }
-
- if err != nil || getProductListResponse.Code != 0 {
+ list, total, err := pService.GetMaterials(pageInfo)
+ if err != nil {
global.GVA_LOG.Error("鑾峰彇澶辫触!", zap.Error(err))
response.FailWithMessage("鑾峰彇澶辫触", c)
- } else {
- response.OkWithDetailed(response.PageResult{
- List: productList,
- Total: int64(len(productList)),
- Page: pageInfo.Page,
- PageSize: pageInfo.PageSize,
- }, "鑾峰彇鎴愬姛", c)
+ return
}
+ productList := make([]testResp.Material, 0)
+
+ for _, item := range list {
+ productList = append(productList, testResp.Material{
+ Name: item.Name,
+ Number: item.ID,
+ Unit: item.Unit,
+ Specifications: item.Specs,
+ ModelNumber: item.Type,
+ MinimumStock: item.MinInventory.IntPart(),
+ MaximumStock: item.MaxInventory.IntPart(),
+ Remark: "",
+ CategoryName: item.CategoryName,
+ })
+ }
+
+ if err != nil {
+ global.GVA_LOG.Error("鑾峰彇澶辫触!", zap.Error(err))
+ response.FailWithMessage("鑾峰彇澶辫触", c)
+ }
+
+ response.OkWithDetailed(response.PageResult{
+ List: productList,
+ Total: total,
+ Page: pageInfo.Page,
+ PageSize: pageInfo.PageSize,
+ }, "鑾峰彇鎴愬姛", c)
+
}
--
Gitblit v1.8.0