料盒操作的元器件匹配增加描述显示

src/main/java/com/neotel/smfcore/core/barcode/rest/ComponentController.java

@@ -5,6 +5,7 @@ import com.neotel.smfcore.common.bean.PageData;
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.utils.QueryHelp;
 import com.neotel.smfcore.common.utils.QueryHelp;
 import com.neotel.smfcore.core.barcode.rest.bean.dto.ComponentDto;
 import com.neotel.smfcore.core.barcode.rest.bean.dto.ComponentDto;
+import com.neotel.smfcore.core.barcode.rest.bean.dto.ComponentMatchingDto;
 import com.neotel.smfcore.core.barcode.rest.bean.mapstruct.ComponentMapper;
 import com.neotel.smfcore.core.barcode.rest.bean.mapstruct.ComponentMapper;
 import com.neotel.smfcore.core.barcode.rest.bean.query.ComponentQueryCriteria;
 import com.neotel.smfcore.core.barcode.rest.bean.query.ComponentQueryCriteria;
 import com.neotel.smfcore.core.barcode.service.manager.IBarcodeManager;
 import com.neotel.smfcore.core.barcode.service.manager.IBarcodeManager;
@@ -115,14 +116,19 @@ public class ComponentController {
     @ApiOperation("搜索框匹配元器件")
     @ApiOperation("搜索框匹配元器件")
     @GetMapping(value = "/searchMatching")
     @GetMapping(value = "/searchMatching")
     @PreAuthorize("@el.check('component:list')")
     @PreAuthorize("@el.check('component:list')")
-    public List<String> searchMatching(ComponentQueryCriteria criteria) {
+    public List<ComponentMatchingDto> searchMatching(ComponentQueryCriteria criteria) {
         Query query = QueryHelp.getQuery(criteria);
         Query query = QueryHelp.getQuery(criteria);
         query.limit(20);
         query.limit(20);
         List<Component> list = componentManager.findByQuery(query);
         List<Component> list = componentManager.findByQuery(query);
-        List<String> array = new ArrayList<>();
+        List<ComponentMatchingDto> array = new ArrayList<>();
         for (Component com :
         for (Component com :
                 list) {
                 list) {
-            array.add(com.getPartNumber());
+            String des=com.getDescription();
+            if(ObjectUtil.isEmpty(des)){
+                des="";
+            }
+            ComponentMatchingDto dto = new ComponentMatchingDto(com.getPartNumber(), des);
+            array.add(dto);
         }
         }
         return array;
         return array;
     }
     }

src/main/java/com/neotel/smfcore/core/barcode/rest/bean/dto/ComponentMatchingDto.java

+package com.neotel.smfcore.core.barcode.rest.bean.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.io.Serializable;
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+public class ComponentMatchingDto implements Serializable {
+    @ApiModelProperty("料号")
+    private String partNumber;
+
+    @ApiModelProperty("物料描述")
+    private String description;
+}