From 18ddec2d24989f9a245f929ac3c7f3d343548e54 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期四, 16 十一月 2023 15:39:25 +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 b8654f4..4809c9b 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 material on material.id = srm_purchase_products.product_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("material.name like ?", "%"+info.Keyword+"%").
+ Or("srm_supplier_material.name like ?", "%"+info.Keyword+"%").
Or("srm_supplier.name like ?", "%"+info.Keyword+"%")
err = db.Limit(limit).Offset(offset).Find(&ids).Error
if err != nil {
@@ -148,9 +148,9 @@
}
if len(ids) != 0 {
db = global.GVA_DB.Model(&purchase.Purchase{})
- err = db.Where("id in (?)", ids).Find(&purchaseList).Error
+ err = db.Where("id in (?)", ids).Preload("Supplier").Order("updated_at desc").Find(&purchaseList).Error
} else {
- err = db.Limit(limit).Offset(offset).Find(&purchaseList).Error
+ err = db.Limit(limit).Offset(offset).Preload("Supplier").Order("updated_at desc").Find(&purchaseList).Error
}
return purchaseList, total, err
--
Gitblit v1.8.0