dkad

src/main/java/com/steerinfo/dil/controller/WmsInboundScanResultController.java

@@ -72,7 +72,7 @@ public class WmsInboundScanResultController extends BaseRESTfulController {
         //通过用户ID查询、当前扫描没有下发的物质、最终展示的集合
         List<Map<String,Object>>mapList= wmsInboundScanResultService.noIssueScanResultList(map.get("userName").toString());
         if (isExist>0){
-            //如果已经被少扫过了返回扫码实绩集合
+            //如果已经被扫过了返回扫码实绩集合
             //返回结果显示
            return failed(mapList);
         }else {

src/main/java/com/steerinfo/dil/controller/WmsReboundResultController.java

@@ -55,34 +55,10 @@ public class WmsReboundResultController extends BaseRESTfulController {
                                              Integer pageNum,
                                              Integer pageSize,
                                              String con) {
-        if(con != null){
-            if(!"undefined".equals(con)){
-                String index = "get_wms_reboundResult";
-                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));
-            }
-        }
-        List<Map<String,Object>>reboundResultList = null;
-        if(mapValue.size() == 0){
-            //将查询结果存入索引中
-            reboundResultList = wmsInboundResultService.getReboundResult(mapValue);
-            Map<String, Object> inboundResultMap = new HashMap<>();
-            //添加索引
-            inboundResultMap.put("index","get_wms_reboundResult");
-            //添加ID
-            inboundResultMap.put("indexId","reboundResultId");
-            reboundResultList.add(inboundResultMap);
-            //新建索引
-            esFeign.insertIndex(reboundResultList);
-            //删除
-            reboundResultList.remove(reboundResultList.size() -1);
-        }
-        if(reboundResultList == null) {
-            reboundResultList = wmsInboundResultService.getReboundResult(mapValue);
-        }
         /*分页*/
         PageHelper.startPage(pageNum, pageSize);
         List<Map<String,Object>> columnList = wmsInboundResultService.getReboundResult(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId,reboundResultList,columnList);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId,null,columnList);
         return success(pageList);
     }
 

src/main/java/com/steerinfo/dil/util/ColumnDataUtil.java

@@ -29,7 +29,7 @@ public class ColumnDataUtil {
         List<Map<String, Object>> columnDataList = columnDataFeign.getColumnData(apiId);
         for (Map<String, Object> columnData : columnDataList) {
             //每个表头字段的过滤条件
-            columnData.put("filters", setListMap(list, columnData.get("prop").toString()));
+            columnData.put("filters", setListMap(data, columnData.get("prop").toString()));
         }
         PageListAdd pageList = new PageListAdd(data);
         pageList.setColumnData(columnDataList);

src/main/resources/application-prod.yml

@@ -10,7 +10,7 @@ spring:
 #feign设置
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
   Im:
     url: ${IMFEIGN_URL:172.16.33.166:8055}
   TmsTruckFeign: