From 4b291b641317d74fc039dcb7ff5a132cab18371b Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 28 十月 2025 12:35:16 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/BasLocStsController.java | 2 +-
src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java | 2 +-
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasLocStsController.java b/src/main/java/com/zy/asrs/controller/BasLocStsController.java
index 42c0978..e78a215 100644
--- a/src/main/java/com/zy/asrs/controller/BasLocStsController.java
+++ b/src/main/java/com/zy/asrs/controller/BasLocStsController.java
@@ -123,7 +123,7 @@
public R query(String condition) {
EntityWrapper<BasLocSts> wrapper = new EntityWrapper<>();
wrapper.like("loc_desc", condition);
- Page<BasLocSts> page = basLocStsService.selectPage(new Page<>(0, 32), wrapper);
+ Page<BasLocSts> page = basLocStsService.selectPage(new Page<>(0, 100), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (BasLocSts basLocSts : page.getRecords()){
Map<String, Object> map = new HashMap<>();
diff --git a/src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java b/src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java
index 2232210..9da0854 100644
--- a/src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java
+++ b/src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java
@@ -123,7 +123,7 @@
public R query(String condition) {
EntityWrapper<BasWrkIotype> wrapper = new EntityWrapper<>();
wrapper.like("io_desc", condition);
- Page<BasWrkIotype> page = basWrkIotypeService.selectPage(new Page<>(0, 20), wrapper);
+ Page<BasWrkIotype> page = basWrkIotypeService.selectPage(new Page<>(0, 100), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (BasWrkIotype basWrkIotype : page.getRecords()){
Map<String, Object> map = new HashMap<>();
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index f3821ff..86a7212 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -817,7 +817,7 @@
if (Cools.isEmpty(wrkMast)) {
throw new CoolException(workNo + "宸ヤ綔妗ｄ笉瀛樺湪");
}
- if (wrkMast.getWrkSts() == 4 || wrkMast.getWrkSts() == 14) {
+ if (wrkMast.getWrkSts() == 4 || wrkMast.getWrkSts() == 14 || wrkMast.getWrkSts() == 5 || wrkMast.getWrkSts() == 15) {
throw new CoolException("褰撳墠宸ヤ綔妗ｅ凡瀹屾垚");
}
// 鍏ュ簱 + 搴撲綅杞Щ
--
Gitblit v1.9.1