From dddc2cadc0bd18c79f565a733d694c5f4b869843 Mon Sep 17 00:00:00 2001
From: bfwms <1>
Date: 星期二, 23 九月 2025 15:45:54 +0800
Subject: [PATCH] 正式环境数据库
---
src/main/java/com/zy/asrs/service/impl/LocRuleServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
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;
}
--
Gitblit v1.9.1