From c6fae49294b74658ce258d7dbb8442124e54fef5 Mon Sep 17 00:00:00 2001 From: lty <876263681@qq.com> Date: 星期日, 11 五月 2025 12:11:36 +0800 Subject: [PATCH] #调试 --- src/main/java/com/zy/asrs/service/LocDetlService.java | 2 +- src/main/java/com/zy/asrs/controller/LocDetlController.java | 2 +- src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java | 2 +- src/main/java/com/zy/asrs/utils/Utils.java | 23 +++++++++++++---------- src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java | 3 ++- src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 13 ++++++++++--- src/main/java/com/zy/common/service/CommonService.java | 4 ++-- 7 files changed, 30 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java index a69fc16..f6a802f 100644 --- a/src/main/java/com/zy/asrs/controller/LocDetlController.java +++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java @@ -241,7 +241,7 @@ public R statis(@RequestParam(defaultValue = "1")Integer curr, @RequestParam(defaultValue = "10")Integer limit, @RequestParam Map<String, Object> param) { - Page<StockStatisDTO> stockStatis = locDetlService.getStockStatis(toPage(curr, limit, param, StockStatisDTO.class)); + Page<LocDetl> stockStatis = locDetlService.getStockStatis(toPage(curr, limit, param, LocDetl.class)); return R.ok().add(stockStatis); } diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java index d04a603..756610e 100644 --- a/src/main/java/com/zy/asrs/service/LocDetlService.java +++ b/src/main/java/com/zy/asrs/service/LocDetlService.java @@ -54,7 +54,7 @@ */ List<String> getSameDetlToday(String matnr, String batch, Integer start, Integer end); - Page<StockStatisDTO> getStockStatis(Page<StockStatisDTO> page); + Page<LocDetl> getStockStatis(Page<LocDetl> page); Double getSumAnfme(String matnr); diff --git a/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java index d1a6e17..e2edeed 100644 --- a/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java @@ -49,7 +49,7 @@ return false; } if (crnp.getCrnErr() != null) { - if (crnp.getCrnErr() != 0) { + if (crnp.getCrnErr() != 0 && crnp.getCrnErr() != 10) { log.error("{}鍙峰爢鍨涙満寮傚父锛屽紓甯哥爜{}", crnNo, crnp.getCrnErr()); return false; } diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java index c22d465..71fae50 100644 --- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java @@ -86,10 +86,17 @@ } +// @Override +// public Page<StockStatisDTO> getStockStatis1(Page<StockStatisDTO> page) { +// page.setRecords(baseMapper.asrsAndErpList(page.getCondition())); +// page.setTotal(baseMapper.asrsAndErpCount(page.getCondition())); +// return page; +// } + @Override - public Page<StockStatisDTO> getStockStatis(Page<StockStatisDTO> page) { - page.setRecords(baseMapper.asrsAndErpList(page.getCondition())); - page.setTotal(baseMapper.asrsAndErpCount(page.getCondition())); + public Page<LocDetl> getStockStatis(Page<LocDetl> page) { + page.setRecords(baseMapper.getStockStatis(page.getCondition())); + page.setTotal(baseMapper.getStockStatisCount(page.getCondition())); return page; } diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java index 1b71caa..d941627 100644 --- a/src/main/java/com/zy/asrs/utils/Utils.java +++ b/src/main/java/com/zy/asrs/utils/Utils.java @@ -122,7 +122,8 @@ public static String getShallowLoc(SlaveProperties slaveProperties, String deepLoc) { int row = getRow(deepLoc); int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount()); - int shallowRow = remainder == 1 ? (row + 1) : (row - 1); +// int shallowRow = remainder == 1 ? (row + 1) : (row - 1); + int shallowRow = row; return zerofill(String.valueOf(shallowRow), 2) + deepLoc.substring(2); } @@ -141,13 +142,14 @@ int row = getRow(shallowLoc); int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount()); int targetRow; - if (remainder == 2) { - targetRow = row - 1; - } else if (remainder == 3) { - targetRow = row + 1; - } else { - throw new RuntimeException(shallowLoc + "涓嶆槸娴呭簱浣嶏紝绯荤粺绻佸繖"); - } +// if (remainder == 2) { +// targetRow = row - 1; +// } else if (remainder == 3) { +// targetRow = row + 1; +// } else { +// throw new RuntimeException(shallowLoc + "涓嶆槸娴呭簱浣嶏紝绯荤粺绻佸繖"); +// } + targetRow = row; return zerofill(String.valueOf(targetRow), 2) + shallowLoc.substring(2); } @@ -279,7 +281,7 @@ //搴撲綅鎺掑彿鍒嗛厤 public static int[] LocNecessaryParameters(Integer whsType, Integer curRow, Integer crnNumber) { - switch (whsType){ + switch (2){ case 1://缁忓吀鍙屼几搴撲綅 return LocNecessaryParametersDoubleExtension(whsType, curRow, crnNumber); //宸插畬鍠� case 2://缁忓吀鍗曚几搴撲綅锛�2鎺掕揣鏋讹級 @@ -395,6 +397,7 @@ RowLastnoService rowLastnoService = SpringUtils.getBean(RowLastnoService.class); RowLastno rowLastno = rowLastnoService.selectById(whsType); Integer sRow = rowLastno.getsRow(); + Integer eRow = rowLastno.geteRow(); Integer sCrnNo = rowLastno.getsCrnNo(); // 鍒ゆ柇浠撳簱绫诲瀷鏄惁婊¤冻瑕佹眰 @@ -403,7 +406,7 @@ // 璁$畻鏈�娣卞簱浣嶆帓鍜屾渶娴呭簱浣嶆帓 int minRow = sRow; // 璧峰鎺掑彿 - int maxRow = sRow + 7; // 缁堟鎺掑彿 (8鎺�) + int maxRow = eRow; // // 妫�鏌ユ帓鍙疯寖鍥存槸鍚﹀悎娉� if (curRow < minRow || curRow > maxRow) { diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java index 935695d..0297a3e 100644 --- a/src/main/java/com/zy/common/service/CommonService.java +++ b/src/main/java/com/zy/common/service/CommonService.java @@ -338,9 +338,9 @@ continue; } if (Utils.BooleanWhsTypeStaIoType(whsType)){ - String shallowLoc = Utils.getDeepLoc(slaveProperties, locMast1.getLocNo()); +// String shallowLoc = Utils.getDeepLoc(slaveProperties, locMast1.getLocNo()); LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>() - .eq("loc_no", shallowLoc).eq("loc_sts", "O")); + .eq("loc_sts", "O")); if (!Cools.isEmpty(locMast2)) { locMast = locMast2; break; diff --git a/src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java b/src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java index b065e50..af4ce97 100644 --- a/src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java +++ b/src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java @@ -37,7 +37,8 @@ //@Transactional(rollbackFor = Throwable.class) @Scheduled(cron = "${erp.refreshtime}") public void InHedTBScheduler() { - //log.info("InHedTBScheduler寮�濮嬩簡"); + //log.info("InHedTBScheduler寮�濮嬩簡" + // 7); if (!erpEnabled) return; String sqlInHed = "select * from erp_InHedTB where LKName='涓壃浜屾湡'"; List<InHedTB> inHeds = erpSqlServer.select(sqlInHed, InHedTB.class); -- Gitblit v1.9.1