修复

internal/logic/attr.go

@@ -26,7 +26,7 @@ func GetStandardAttrs(bomItems []model.BomItem) []model.BomItem {
 		}
 		}
 		params := req.BodyJSON(attrParams)
 		params := req.BodyJSON(attrParams)
 		resp, err := req.Post(configs.ApiSetting.Attrs, params)
 		resp, err := req.Post(configs.ApiSetting.Attrs, params)
-		//fmt.Println(resp)
+		fmt.Println(resp)
 		if err != nil {
 		if err != nil {
 			fmt.Println(err)
 			fmt.Println(err)
 		}
 		}

internal/logic/search.go

@@ -6,6 +6,7 @@ import (
 	"bom_server/internal/model"
 	"bom_server/internal/model"
 	"context"
 	"context"
 	"encoding/json"
 	"encoding/json"
+	"fmt"
 	es "gopkg.in/olivere/elastic.v5"
 	es "gopkg.in/olivere/elastic.v5"
 	"regexp"
 	"regexp"
 	"strings"
 	"strings"
@@ -100,7 +101,7 @@ func getSearchParams(index string, bomItem model.BomItem, sort int, flag bool) (
 	}
 	}
 	source = source.From(0).Size(1)
 	source = source.From(0).Size(1)
 	searchRequest = es.NewSearchRequest().Source(source)
 	searchRequest = es.NewSearchRequest().Source(source)
-	//fmt.Println(searchRequest.Body())
+	fmt.Println(searchRequest.Body())
 	return searchRequest
 	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€") {
 					if strings.Contains(attr, "ZLNZ€") || strings.Contains(attr, "OM€") {
 						query.Should(es.NewTermQuery("attr_bom", attr))
 						query.Should(es.NewTermQuery("attr_bom", attr))
 					} else {
 					} else {
-						query.Must(es.NewTermQuery("attr_bom", attr))
+						query.Should(es.NewTermQuery("attr_bom", attr))
 					}
 					}
 				}
 				}
 			} else {
 			} else {
@@ -137,7 +138,7 @@ func getTermQuery(bomItem model.BomItem, sort int, flag bool) (query *es.BoolQue
 		}
 		}
 		//判断封装是否有,有的话,直接去搜索封装
 		//判断封装是否有,有的话,直接去搜索封装
 		if bomItem.Encap != "" {
 		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)
 		//fmt.Println("总数量:", bomItem.Number, bomItem.Amount)