UID出库条码搜索时增加条码解析

src/main/java/com/neotel/smfcore/core/storage/rest/StoragePosController.java

@@ -278,6 +278,12 @@ public class StoragePosController {
         if (ObjectUtil.isNotEmpty(criteria.getStorageId()) && criteria.getStorageId().equals("0")) {
         if (ObjectUtil.isNotEmpty(criteria.getStorageId()) && criteria.getStorageId().equals("0")) {
             criteria.setStorageId(null);
             criteria.setStorageId(null);
         }
         }
+        String barcode = criteria.getBarcode();
+        if(org.apache.logging.log4j.util.Strings.isNotBlank(barcode)){
+            CodeBean codebean = codeResolve.resolveSingleCode(criteria.getBarcode());
+            String reelId = codebean.getCodeStr();
+            criteria.setBarcode(reelId);
+        }
         Query query = QueryHelp.getQuery(criteria);
         Query query = QueryHelp.getQuery(criteria);
         Criteria baseCriteria = Criteria.where("used").is(true);
         Criteria baseCriteria = Criteria.where("used").is(true);
 
 

src/main/java/com/neotel/smfcore/core/system/rest/TaskController.java

@@ -112,7 +112,6 @@ public class TaskController {
     @PreAuthorize("@el.check('taskLog')")
     @PreAuthorize("@el.check('taskLog')")
     public PageData<TaskDto> query(TaskQueryCondition criteria, Pageable pageable) {
     public PageData<TaskDto> query(TaskQueryCondition criteria, Pageable pageable) {
         Query query = getQuery(criteria);
         Query query = getQuery(criteria);
-//        query.with(Sort.by(Sort.Direction.DESC,"updateDate","createDate"));
         PageData<DataLog> taskList = dataLogManager.findByPage(query, pageable);
         PageData<DataLog> taskList = dataLogManager.findByPage(query, pageable);
         PageData<TaskDto> result= taskMapper.toDto(taskList);
         PageData<TaskDto> result= taskMapper.toDto(taskList);
         return  result;
         return  result;