diff --git a/wms-admin/src/main/java/com/ruoyi/web/controller/business/EbsConfirmController.java b/wms-admin/src/main/java/com/ruoyi/web/controller/business/EbsConfirmController.java index d75bb2d..d591f1e 100644 --- a/wms-admin/src/main/java/com/ruoyi/web/controller/business/EbsConfirmController.java +++ b/wms-admin/src/main/java/com/ruoyi/web/controller/business/EbsConfirmController.java @@ -106,8 +106,9 @@ public class EbsConfirmController extends BaseController { // 获取token JSONObject token = JSON.parseObject(HttpUtils.httpPostJson(configService.selectConfigByKey("token_ip"), "", "")); // 一起查询 - String params = JSON.toJSONString(createJsonList(stockList, ebsStock.getSubInventory(), null)); + String params = JSON.toJSONString(createJsonList(stockList, ebsStock.getSubInventory(), EbsUtils.LOCATOR_AREA_MAP.get(ebsStock.getSubInventory()))); String result = HttpUtils.httpPostJson(configService.selectConfigByKey("ebs_ip"), params, token.get("access_token").toString()); + logger.info("现有量查询参数:{},结果:{}", params, result); JSONObject resultJson = (JSONObject) JSON.parseObject(result).get("obj"); List datas = JSON.parseArray(resultJson.getString("rows"), ExistingStock.class); // 生成现有量数据 @@ -238,11 +239,26 @@ public class EbsConfirmController extends BaseController { } // 获取token JSONObject token = JSON.parseObject(HttpUtils.httpPostJson(configService.selectConfigByKey("token_ip"), "", "")); - // 一起查询 - String params = JSON.toJSONString(createJsonList(stockList, ebsStock.getSubInventory(), null)); - String result = HttpUtils.httpPostJson(configService.selectConfigByKey("ebs_ip"), params, token.get("access_token").toString()); - JSONObject resultJson = (JSONObject) JSON.parseObject(result).get("obj"); - List datas = JSON.parseArray(resultJson.getString("rows"), ExistingStock.class); + + // TODO 分批查询 + List datas = new ArrayList<>(); + int batchNum = stockList.size()/200; + for (int i=0; i<=batchNum; i++) { + List tempStockList; + if (i == batchNum) { + tempStockList = stockList.subList(i*200, stockList.size()); + } else { + tempStockList = stockList.subList(i*200, (i+1)*200); + } + // 一起查询 + String params = JSON.toJSONString(createJsonList(tempStockList, ebsStock.getSubInventory(), EbsUtils.LOCATOR_AREA_MAP.get(ebsStock.getSubInventory()))); + String result = HttpUtils.httpPostJson(configService.selectConfigByKey("ebs_ip"), params, token.get("access_token").toString()); + logger.info("现有量(按批次)查询参数:{},结果:{}", params, result); + JSONObject resultJson = (JSONObject) JSON.parseObject(result).get("obj"); + // 添加数据 + datas.addAll(JSON.parseArray(resultJson.getString("rows"), ExistingStock.class)); + } + // 生成现有量数据 for (TMiStock stock : stockList) { // 插入的EBS现有量数据 diff --git a/wms-admin/src/main/resources/templates/business/outreport/outreportmain.html b/wms-admin/src/main/resources/templates/business/outreport/outreportmain.html index dc5f45f..d54194a 100644 --- a/wms-admin/src/main/resources/templates/business/outreport/outreportmain.html +++ b/wms-admin/src/main/resources/templates/business/outreport/outreportmain.html @@ -15,7 +15,7 @@
导出出库记录报表 + shiro:hasPermission="business:outreport:export">导出出库记录报表