From 57448954d59595b87cbb7efad52f59e61fd14d61 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@63.com> Date: 星期三, 01 二月 2023 09:19:05 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/LocRuleServiceImpl.java | 10 +++++----- src/main/java/com/zy/asrs/controller/LocRuleController.java | 12 ++++++------ src/main/java/com/zy/asrs/service/LocRuleService.java | 2 +- src/main/java/com/zy/common/service/CommonService.java | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/LocRuleController.java b/src/main/java/com/zy/asrs/controller/LocRuleController.java index 89c28d6..e06e445 100644 --- a/src/main/java/com/zy/asrs/controller/LocRuleController.java +++ b/src/main/java/com/zy/asrs/controller/LocRuleController.java @@ -61,13 +61,13 @@ @RequestMapping(value = "/locRule/add/auth") @ManagerAuth public R add(LocRule locRule) { - if ((locRule.getRowBeg() < locRule.getRowEnd()) || locRule.getRowBeg() <= 0 || locRule.getRowEnd() <= 0) { + if ((locRule.getRowEnd() < locRule.getRowBeg()) || locRule.getRowBeg() <= 0 || locRule.getRowEnd() <= 0) { return R.error("鎺掑尯闂撮敊璇�"); } - if ((locRule.getBayBeg() < locRule.getBayEnd()) || locRule.getBayBeg() <= 0 || locRule.getBayEnd() <= 0) { + if ((locRule.getBayEnd() < locRule.getBayBeg()) || locRule.getBayBeg() <= 0 || locRule.getBayEnd() <= 0) { return R.error("鍒楀尯闂撮敊璇�"); } - if ((locRule.getLevBeg() < locRule.getLevEnd()) || locRule.getLevBeg() <= 0 || locRule.getLevEnd() <= 0) { + if ((locRule.getLevEnd() < locRule.getLevBeg()) || locRule.getLevBeg() <= 0 || locRule.getLevEnd() <= 0) { return R.error("灞傚尯闂撮敊璇�"); } Date now = new Date(); @@ -86,13 +86,13 @@ if (Cools.isEmpty(locRule) || null==locRule.getId()){ return R.error(); } - if ((locRule.getRowBeg() < locRule.getRowEnd()) || locRule.getRowBeg() <= 0 || locRule.getRowEnd() <= 0) { + if ((locRule.getRowEnd() < locRule.getRowBeg()) || locRule.getRowBeg() <= 0 || locRule.getRowEnd() <= 0) { return R.error("鎺掑尯闂撮敊璇�"); } - if ((locRule.getBayBeg() < locRule.getBayEnd()) || locRule.getBayBeg() <= 0 || locRule.getBayEnd() <= 0) { + if ((locRule.getBayEnd() < locRule.getBayBeg()) || locRule.getBayBeg() <= 0 || locRule.getBayEnd() <= 0) { return R.error("鍒楀尯闂撮敊璇�"); } - if ((locRule.getLevBeg() < locRule.getLevEnd()) || locRule.getLevBeg() <= 0 || locRule.getLevEnd() <= 0) { + if ((locRule.getLevEnd() < locRule.getLevBeg()) || locRule.getLevBeg() <= 0 || locRule.getLevEnd() <= 0) { return R.error("灞傚尯闂撮敊璇�"); } locRule.setUpdateBy(getUserId()); diff --git a/src/main/java/com/zy/asrs/service/LocRuleService.java b/src/main/java/com/zy/asrs/service/LocRuleService.java index 3b669e8..24c3490 100644 --- a/src/main/java/com/zy/asrs/service/LocRuleService.java +++ b/src/main/java/com/zy/asrs/service/LocRuleService.java @@ -5,6 +5,6 @@ public interface LocRuleService extends IService<LocRule> { - LocRule find(String matnr, String batch); + LocRule find(String matnr, String batch, int startRow, int endRow); } diff --git a/src/main/java/com/zy/asrs/service/impl/LocRuleServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocRuleServiceImpl.java index 0c3f3ef..4e01f89 100644 --- a/src/main/java/com/zy/asrs/service/impl/LocRuleServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/LocRuleServiceImpl.java @@ -18,7 +18,7 @@ private MatService matService; @Override - public LocRule find(String matnr, String batch) { + public LocRule find(String matnr, String batch, int startRow, int endRow) { if (Cools.isEmpty(matnr)) { return null; } @@ -28,19 +28,19 @@ } LocRule locRule = null; do { - locRule = this.selectOne(new EntityWrapper<LocRule>().eq("matnr", matnr).eq("status", 1)); + locRule = this.selectOne(new EntityWrapper<LocRule>().eq("matnr", matnr).ge("row_beg", startRow).le("row_end", endRow).eq("status", 1)); if (null != locRule) { break; } - locRule = this.selectOne(new EntityWrapper<LocRule>().eq("specs", mat.getSpecs()).eq("status", 1)); + locRule = this.selectOne(new EntityWrapper<LocRule>().eq("specs", mat.getSpecs()).ge("row_beg", startRow).le("row_end", endRow).eq("status", 1)); if (null != locRule) { break; } - locRule = this.selectOne(new EntityWrapper<LocRule>().eq("model", mat.getModel()).eq("status", 1)); + locRule = this.selectOne(new EntityWrapper<LocRule>().eq("model", mat.getModel()).ge("row_beg", startRow).le("row_end", endRow).eq("status", 1)); if (null != locRule) { break; } - locRule = this.selectOne(new EntityWrapper<LocRule>().eq("batch", batch).eq("status", 1)); + locRule = this.selectOne(new EntityWrapper<LocRule>().eq("batch", batch).ge("row_beg", startRow).le("row_end", endRow).eq("status", 1)); if (null != locRule) { break; } diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java index be2e939..f70fdf4 100644 --- a/src/main/java/com/zy/common/service/CommonService.java +++ b/src/main/java/com/zy/common/service/CommonService.java @@ -314,7 +314,7 @@ if (locMast == null) { // 搴撳尯閿佸畾 - LocRule locRule = locRuleService.find(Cools.isEmpty(matNos) ? null : matNos.get(0), null); + LocRule locRule = locRuleService.find(Cools.isEmpty(matNos) ? null : matNos.get(0), null, start, end); if (!Cools.isEmpty(locRule)) { List<Integer> rows = Utils.getGroupLoc(locRule.getRowBeg()); List<LocMast> locMasts = locMastService.queryFreeLocMast1(rows, rows.size(), locTypeDto.getLocType1(), inoutEveryday -- Gitblit v1.9.1