From 4630cbf64d1d4f33376efaaec7b4fcb90b01bf05 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期日, 07 四月 2024 11:55:17 +0800
Subject: [PATCH] 采购单修改2
---
service/test/product.go | 4 +++-
api/v1/test/product.go | 22 ----------------------
2 files changed, 3 insertions(+), 23 deletions(-)
diff --git a/api/v1/test/product.go b/api/v1/test/product.go
index cca3717..64b99e5 100644
--- a/api/v1/test/product.go
+++ b/api/v1/test/product.go
@@ -176,28 +176,6 @@
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,
- // })
- //}
-
response.OkWithDetailed(response.PageResult{
List: list,
Total: total,
diff --git a/service/test/product.go b/service/test/product.go
index 58fb488..f33fa33 100644
--- a/service/test/product.go
+++ b/service/test/product.go
@@ -88,9 +88,11 @@
db = db.Where("number LIKE ?", "%"+info.Number+"%")
}
+ supplierIds := []uint{0}
if info.SupplierId != 0 {
- db = db.Where("supplier_id = ?", info.SupplierId)
+ supplierIds = append(supplierIds, info.SupplierId)
}
+ db = db.Where("supplier_id in (?)", supplierIds)
err = db.Count(&total).Error
if err != nil {
--
Gitblit v1.8.0