From 3afa1df4c523ebd8cf49384fbb1ad820979aa228 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 29 三月 2024 14:29:43 +0800
Subject: [PATCH] 采购单列表增加销售明细编号,采购单号搜索支持

---
 model/purchase/purchase.go   |    2 +-
 service/purchase/purchase.go |    7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/model/purchase/purchase.go b/model/purchase/purchase.go
index 634202a..2d47490 100644
--- a/model/purchase/purchase.go
+++ b/model/purchase/purchase.go
@@ -27,7 +27,7 @@
 	Warehouse           string              `json:"warehouse" form:"warehouse" gorm:"type:varchar(255);not null;default '';comment:鏀惰揣浠撳簱"`                   //鏀惰揣浠撳簱
 	WarehouseAddress    string              `json:"warehouseAddress" form:"warehouseAddress" gorm:"type:varchar(512);default '';comment:鏀惰揣浠撳簱鍦板潃"`            //鏀惰揣浠撳簱鍦板潃
 	Principal           string              `json:"principal" form:"principal" gorm:"type:varchar(255);not null;default '';comment:浠撳簱璐熻矗浜�"`                  //浠撳簱璐熻矗浜�
-	SourceOrder         string              `json:"sourceOrder" gorm:"type:varchar(255);comment:鏉ユ簮鍗曟嵁"`                                                      //鏉ユ簮鍗曟嵁
+	SourceOrder         string              `json:"sourceOrder" gorm:"type:varchar(255);comment:鏉ユ簮鍗曟嵁"`                                                      //鏉ユ簮鍗曟嵁 ,閿�鍞槑缁嗙紪鐮�
 	Quantity            decimal.Decimal     `json:"quantity" form:"quantity" gorm:"type:decimal(12,4);not null;comment:閲囪喘鏁伴噺"`                               // 閲囪喘鏁伴噺
 	TotalPrice          decimal.Decimal     `json:"totalPrice" form:"totalPrice" gorm:"type:decimal(12,2);not null;default '';comment:浠风◣鍚堣"`                //浠风◣鍚堣
 	WholeDiscountType   WholeDiscountType   `json:"wholeDiscountType" form:"wholeDiscountType" gorm:"type:tinyint(1);not null;default '';comment:鏁村崟鎶樻墸"`     //鏁村崟鎶樻墸绫诲瀷
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