From b784b08a26808e9faccb7ea397de946501a939eb Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期三, 27 九月 2023 20:08:43 +0800
Subject: [PATCH] 1.二期一部分代码
---
controllers/product_controller.go | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/controllers/product_controller.go b/controllers/product_controller.go
index 333d2b0..2750ff6 100644
--- a/controllers/product_controller.go
+++ b/controllers/product_controller.go
@@ -403,11 +403,8 @@
db := models.NewOperationSearch().Orm.Table("wms_operation").Select("wms_operation.id,wms_operation.number,wms_operation.source_number,wms_operation.status,wms_operation.from_location_id,wms_operation.to_location_id,wms_operation.operation_date,wms_operation.contacter_id,wms_operation.contacter_name,wms_operation.company_id,wms_operation.company_name,wms_operation.comment,wms_operation_details.product_id,material.name as product_name,material.unit,wms_operation_details.amount").InnerJoins("inner join wms_operation_details on wms_operation_details.operation_id=wms_operation.id").InnerJoins("inner join material on material.id=wms_operation_details.product_id")
- if params.SourceNumber != "" {
- db = db.Where("wms_operation.source_number like ?", fmt.Sprintf("%%%v%%", params.SourceNumber))
- }
if params.Number != "" {
- db = db.Where("wms_operation.number like ?", fmt.Sprintf("%%%v%%", params.Number))
+ db = db.Where("wms_operation.number like ? or wms_operation.source_number like ?", fmt.Sprintf("%%%v%%", params.Number), fmt.Sprintf("%%%v%%", params.Number))
}
db = db.Where("wms_operation.operation_type_id=?", 0)
var (
--
Gitblit v1.8.0