From 07775fd7b3bf7906324cc559e8bc96b911981ad1 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期一, 29 四月 2024 10:44:59 +0800
Subject: [PATCH] fix
---
service/purchase/purchase.go | 41 ++++++++++++++++++++++++++---------------
1 files changed, 26 insertions(+), 15 deletions(-)
diff --git a/service/purchase/purchase.go b/service/purchase/purchase.go
index 22dee18..3660a0c 100644
--- a/service/purchase/purchase.go
+++ b/service/purchase/purchase.go
@@ -137,28 +137,32 @@
var ids []uint
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").
+ kw := "%" + info.Keyword + "%"
+ db = db.Select("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+"%")
- err = db.Limit(limit).Offset(offset).Find(&ids).Error
+ 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.Find(&ids).Error
if err != nil {
return purchaseList, total, err
}
} else if info.SupplierId != 0 {
db = db.Where("supplier_id = ?", info.SupplierId)
}
- err = db.Count(&total).Error
- if err != nil || total == 0 {
- return purchaseList, total, err
- }
if len(ids) != 0 {
- db = global.GVA_DB.Model(&purchase.Purchase{})
- err = db.Where("id in (?)", ids).Preload("Supplier").Order("updated_at desc").Find(&purchaseList).Error
+ db = global.GVA_DB.Model(&purchase.Purchase{}).Where("id in (?)", ids)
+ err = db.Count(&total).Error
+ if err != nil {
+ return purchaseList, total, err
+ }
+ err = db.Preload("Supplier").Order("updated_at desc").Limit(limit).Offset(offset).Find(&purchaseList).Error
} else {
- //db = global.GVA_DB.Model(&purchase.Purchase{})
+ err = db.Count(&total).Error
+ if err != nil {
+ return purchaseList, total, err
+ }
err = db.Limit(limit).Offset(offset).Preload("Supplier").Order("updated_at desc").Find(&purchaseList).Error
}
@@ -409,15 +413,22 @@
func (slf *PurchaseService) UpdatePurchaseStatus(number string, status int) error {
var total int64
- err := global.GVA_DB.Model(&purchase.PurchaseQualityInspection{}).Where("purchase_number = ?", number).Where("status = ?", status).Count(&total).Error
+ err := global.GVA_DB.Model(&purchase.Purchase{}).Where("number = ?", number).Where("status = ?", purchase.OrderStatusWaitQuality).Count(&total).Error
if err != nil {
return err
}
- if total == 0 {
- err = global.GVA_DB.Model(&purchase.Purchase{}).Where("number = ?", number).Updates(map[string]interface{}{"status": purchase.OrderStatusReceived}).Error
+ if total > 0 {
+ err = global.GVA_DB.Model(&purchase.PurchaseQualityInspection{}).Where("purchase_number = ?", number).Where("status = ?", status).Count(&total).Error
if err != nil {
return err
}
+
+ if total == 0 {
+ err = global.GVA_DB.Model(&purchase.Purchase{}).Where("number = ?", number).Updates(map[string]interface{}{"status": purchase.OrderStatusReceived}).Error
+ if err != nil {
+ return err
+ }
+ }
}
return nil
}
--
Gitblit v1.8.0