Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
杨树贤
/
bom_server
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
55bb4bca
authored
Mar 12, 2021
by
mushishixian
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
修复
parent
d06eb99e
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
internal/logic/attr.go
internal/logic/search.go
internal/logic/attr.go
View file @
55bb4bca
...
...
@@ -26,7 +26,7 @@ func GetStandardAttrs(bomItems []model.BomItem) []model.BomItem {
}
params
:=
req
.
BodyJSON
(
attrParams
)
resp
,
err
:=
req
.
Post
(
configs
.
ApiSetting
.
Attrs
,
params
)
//
fmt.Println(resp)
fmt
.
Println
(
resp
)
if
err
!=
nil
{
fmt
.
Println
(
err
)
}
...
...
internal/logic/search.go
View file @
55bb4bca
...
...
@@ -6,6 +6,7 @@ import (
"bom_server/internal/model"
"context"
"encoding/json"
"fmt"
es
"gopkg.in/olivere/elastic.v5"
"regexp"
"strings"
...
...
@@ -100,7 +101,7 @@ func getSearchParams(index string, bomItem model.BomItem, sort int, flag bool) (
}
source
=
source
.
From
(
0
)
.
Size
(
1
)
searchRequest
=
es
.
NewSearchRequest
()
.
Source
(
source
)
//
fmt.Println(searchRequest.Body())
fmt
.
Println
(
searchRequest
.
Body
())
return
searchRequest
}
...
...
@@ -121,7 +122,7 @@ func getTermQuery(bomItem model.BomItem, sort int, flag bool) (query *es.BoolQue
if
strings
.
Contains
(
attr
,
"ZLNZ€"
)
||
strings
.
Contains
(
attr
,
"OM€"
)
{
query
.
Should
(
es
.
NewTermQuery
(
"attr_bom"
,
attr
))
}
else
{
query
.
Must
(
es
.
NewTermQuery
(
"attr_bom"
,
attr
))
query
.
Should
(
es
.
NewTermQuery
(
"attr_bom"
,
attr
))
}
}
}
else
{
...
...
@@ -137,7 +138,7 @@ func getTermQuery(bomItem model.BomItem, sort int, flag bool) (query *es.BoolQue
}
//判断封装是否有,有的话,直接去搜索封装
if
bomItem
.
Encap
!=
""
{
query
=
query
.
Must
(
es
.
NewTermQuery
(
"
encap"
,
bomItem
.
Encap
))
query
=
query
.
Must
(
es
.
NewTermQuery
(
"
attr_bom"
,
"FZ€"
+
bomItem
.
Encap
))
}
//搜索库存
//fmt.Println("总数量:", bomItem.Number, bomItem.Amount)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment