From 2b5c893619ddf0955feafcfb4993009723ac4a17 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期五, 29 三月 2024 15:34:18 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/SRM
---
service/purchase/purchase.go | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/service/purchase/purchase.go b/service/purchase/purchase.go
index 22dee18..05171f4 100644
--- a/service/purchase/purchase.go
+++ b/service/purchase/purchase.go
@@ -137,12 +137,13 @@
var ids []uint
var purchaseList = make([]*purchase.Purchase, 0)
if info.Keyword != "" {
+ kw := "%" + 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_supplier_material on srm_supplier_material.supplier_id = srm_purchase.id").
Joins("left join srm_supplier on srm_supplier.Id = srm_purchase.supplier_id").
- Where("srm_purchase.name like ?", "%"+info.Keyword+"%").
- Or("srm_supplier_material.name like ?", "%"+info.Keyword+"%").
- Or("srm_supplier.name like ?", "%"+info.Keyword+"%")
+ Where("srm_purchase.name like ? or srm_purchase.source_order like ? or srm_purchase.number like ?", kw, kw, kw).
+ Or("srm_supplier_material.name like ?", kw).
+ Or("srm_supplier.name like ?", kw)
err = db.Limit(limit).Offset(offset).Find(&ids).Error
if err != nil {
return purchaseList, total, err
--
Gitblit v1.8.0