From 89df7add774087ddcf771dcbff341d74044721ac Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期四, 16 十一月 2023 09:58:57 +0800
Subject: [PATCH] 代码合并
---
proto/purchase_wms/server.go | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/proto/purchase_wms/server.go b/proto/purchase_wms/server.go
index 579d914..1e1e099 100644
--- a/proto/purchase_wms/server.go
+++ b/proto/purchase_wms/server.go
@@ -29,8 +29,8 @@
if req.ProductId == "" {
return nil, errors.New("浜у搧缂栧彿涓嶈兘涓虹┖")
}
- var products []test.Product
- err := global.GVA_DB.Model(&test.Product{}).Where("number = ?", req.ProductId).Preload("Supplier").Find(&products).Error
+ var products []test.SupplierMaterial
+ err := global.GVA_DB.Model(&test.SupplierMaterial{}).Where("number = ?", req.ProductId).Preload("Supplier").Find(&products).Error
if err != nil {
return nil, err
}
@@ -59,8 +59,8 @@
if err != nil {
return nil, err
}
- var product test.Product
- err = global.GVA_DB.Model(&test.Product{}).Where("number = ? and supplier_id = ?", req.ProductId, req.SupplierId).First(&product).Error
+ var product test.SupplierMaterial
+ err = global.GVA_DB.Model(&test.SupplierMaterial{}).Where("number = ? and supplier_id = ?", req.ProductId, req.SupplierId).First(&product).Error
if err != nil {
return nil, err
}
--
Gitblit v1.8.0