Commit 55bb4bca by mushishixian

修复

parent d06eb99e
......@@ -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)
}
......
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment