From 7c9d469d32688f136caeb631d0412ed2e07a4650 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期二, 12 三月 2024 16:56:11 +0800
Subject: [PATCH] 字段调整
---
service/test/product.go | 4 +++-
api/v1/test/product.go | 44 ++++++++++++++++++++++----------------------
2 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/api/v1/test/product.go b/api/v1/test/product.go
index 20bd865..a962d3f 100644
--- a/api/v1/test/product.go
+++ b/api/v1/test/product.go
@@ -175,27 +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,
- CategoryName: item.CategoryName,
- })
- }
+ //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,
@@ -256,7 +256,7 @@
Number: item.ID,
Unit: item.Unit,
Specifications: item.Specs,
- ModelNumber: string(item.Model),
+ ModelNumber: item.Type,
MinimumStock: item.MinInventory.IntPart(),
MaximumStock: item.MaxInventory.IntPart(),
Remark: "",
diff --git a/service/test/product.go b/service/test/product.go
index 6375fca..57ad6d9 100644
--- a/service/test/product.go
+++ b/service/test/product.go
@@ -27,6 +27,7 @@
ShippingDuration: p.ShippingDuration,
Specifications: p.Specifications,
CategoryName: p.CategoryName,
+ ModelNumber: p.ModelNumber,
})
}
@@ -118,7 +119,8 @@
db = db.Where("name LIKE ? or id LIKE ?", "%"+info.Keyword+"%", "%"+info.Keyword+"%")
}
- db = db.Where("purchase_type = ?", test.PurchaseTypeOutSource)
+ //绫诲瀷涓洪噰璐�
+ db = db.Where("purchase_types LIKE ?", "%1%")
db = db.Where("is_storage = ?", 1)
--
Gitblit v1.8.0