Merge branch 'master' of https://git.steerinfo.com/luobang/DIL-DAZHOU-WMS2

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

@@ -96,31 +96,9 @@ public RESTfulResult getWmsOffsiteLibaryOutboundList(@RequestBody(required = fal
                                                      Integer apiId,
                                                      String con
 ){
-    if (con != null) {
-        if(!"undefined".equals(con)){
-            String index="get_wms_libaryoutbound";//设置要查询的索引名称
-            return success(esFeign.getConResult(map,index,apiId,pageNum,pageSize,con));//获取查询结果
-        }
-    }
-
-    List<Map<String, Object>> libaryOutBoundList = null;
-    if (map.size() == 0) {
-        //将查询结果存入索引中
-        libaryOutBoundList =   wmsOffSiteLibaryOutboundService.selectOffsiteLibaryOutbound(map);
-        Map<String, Object> map1 = new HashMap<>();
-        //添加索引
-        map1.put("index","get_wms_libaryoutbound");
-        //添加id
-        map1.put("indexId","libaryOutBoundId");
-        libaryOutBoundList.add(map1);
-        //新建索引
-        esFeign.insertIndex(libaryOutBoundList);
-        //删除
-        libaryOutBoundList.remove(libaryOutBoundList.size()-1);
-    }
-    if (libaryOutBoundList == null) {
-        libaryOutBoundList =  wmsOffSiteLibaryOutboundService.selectOffsiteLibaryOutbound(map);
-    }
+    if (con != null)
+        map.put("con",con);
+    List<Map<String, Object>> libaryOutBoundList =   wmsOffSiteLibaryOutboundService.selectOffsiteLibaryOutbound(map);
     PageHelper.startPage(pageNum,pageSize);
     List<Map<String, Object>> columnList =  wmsOffSiteLibaryOutboundService.selectOffsiteLibaryOutbound(map);
     PageListAdd pageList = columnDataUtil.tableColumnData(apiId, libaryOutBoundList,columnList);

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

@@ -103,31 +103,9 @@ public class WmsOffSiteLibraryInboundController extends BaseRESTfulController {
                                                         Integer apiId,
                                                         String con
     ) {
-           if (con != null) {
-                if (!"undefined".equals(con)) {
-                    String index = "get_wms_libaryinbound";//设置要查询的索引名称
-                    return success(esFeign.getConResult(map, index, apiId, pageNum, pageSize, con));//获取查询结果
-                }
-            }
-
-            List<Map<String, Object>> libaryInBoundList = null;
-            if (map.size() == 0) {
-                //将查询结果存入索引中
-                libaryInBoundList = wmsOffSiteLibraryInboundService.selectInboundList(map);
-                Map<String, Object> map1 = new HashMap<>();
-                //添加索引
-                map1.put("index", "get_wms_libaryinbound");
-                //添加id
-                map1.put("indexId", "libaryInBoundId");
-                libaryInBoundList.add(map1);
-                //新建索引
-                esFeign.insertIndex(libaryInBoundList);
-                //删除
-                libaryInBoundList.remove(libaryInBoundList.size() - 1);
-            }
-            if (libaryInBoundList == null) {
-                libaryInBoundList = wmsOffSiteLibraryInboundService.selectInboundList(map);
-            }
+            if(con!=null)
+                map.put("con",con);
+            List<Map<String, Object>> libaryInBoundList =  wmsOffSiteLibraryInboundService.selectInboundList(map);
             PageHelper.startPage(pageNum, pageSize);
             List<Map<String, Object>> columnList = wmsOffSiteLibraryInboundService.selectInboundList(map);
             PageListAdd pageList = columnDataUtil.tableColumnData(apiId, libaryInBoundList, columnList);