From 6aceac83950d3f17a1137d984df4b1086bfbd016 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 15 十一月 2023 16:25:29 +0800
Subject: [PATCH] 重构产品
---
service/purchase/purchase.go | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/service/purchase/purchase.go b/service/purchase/purchase.go
index 87c542e..2a3a9cb 100644
--- a/service/purchase/purchase.go
+++ b/service/purchase/purchase.go
@@ -131,10 +131,10 @@
var purchaseList = make([]*purchase.Purchase, 0)
if info.Keyword != "" {
db.Distinct("srm_purchase.id").Joins("left join srm_purchase_products on srm_purchase_products.purchase_id = srm_purchase.id").
- Joins("left join srm_product on srm_product.Id = srm_purchase_products.product_id").
+ Joins("left join material on material.id = srm_purchase_products.product_id").
Joins("left join srm_supplier on srm_supplier.Id = srm_purchase.supplier_id").
Where("srm_purchase.name like ?", "%"+info.Keyword+"%").
- Or("srm_product.name like ?", "%"+info.Keyword+"%").
+ Or("material.name like ?", "%"+info.Keyword+"%").
Or("srm_supplier.name like ?", "%"+info.Keyword+"%")
err = db.Limit(limit).Offset(offset).Find(&ids).Error
if err != nil {
@@ -212,7 +212,7 @@
}
productIds := make([]uint, 0, len(productList))
for _, product := range productList {
- productIds = append(productIds, uint(product.ProductId))
+ productIds = append(productIds, product.ID)
}
productService := &test.ProductService{}
_, productMap, err := productService.GetProducts(productIds)
@@ -221,7 +221,7 @@
}
inspectOrders := make([]*qualityinspect.QualityInspect, 0, len(productList))
for _, productItem := range productList {
- product := productMap[uint(productItem.ProductId)]
+ product := productMap[productItem.ID]
if product == nil {
continue
}
--
Gitblit v1.8.0