From 3f9e85eb42a7f2053752023b5ae82684adaa505a Mon Sep 17 00:00:00 2001 From: zhangzq Date: Tue, 4 Mar 2025 19:49:49 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E7=82=B9=E4=BD=8D=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../util/impl/OutBoxManageServiceImpl.java | 18 +++++++++--------- .../wms/sch/service/impl/PointServiceImpl.java | 10 ++++++---- .../nl/wms/sch/service/wql/QSCH_BASE_POINT.wql | 2 +- lms/nladmin-ui/public/config.js | 4 ++-- lms/nladmin-ui/src/views/loki/view/index.vue | 2 +- 5 files changed, 19 insertions(+), 17 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBoxManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBoxManageServiceImpl.java index 131d7a9dd..4757c83ac 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBoxManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBoxManageServiceImpl.java @@ -808,14 +808,14 @@ public class OutBoxManageServiceImpl implements OutBoxManageService { } } } - // 校验木箱是否绑定了托盘 - JSONObject jsonExt = extList.stream() - .filter(row -> row.getString("pcsn").equals(json.getString("storagevehicle_code"))) - .findFirst().orElse(null); - - if (ObjectUtil.isEmpty(jsonExt)) { - throw new BadRequestException("此木箱【"+json.getString("storagevehicle_code")+"】没有绑定托盘，请核查"); - } +// // 校验木箱是否绑定了托盘 +// JSONObject jsonExt = extList.stream() +// .filter(row -> row.getString("pcsn").equals(json.getString("storagevehicle_code"))) +// .findFirst().orElse(null); +// +// if (ObjectUtil.isEmpty(jsonExt)) { +// throw new BadRequestException("此木箱【"+json.getString("storagevehicle_code")+"】没有绑定托盘，请核查"); +// } // 创建任务 JSONObject jsonTaskParam = new JSONObject(); @@ -823,7 +823,7 @@ public class OutBoxManageServiceImpl implements OutBoxManageService { jsonTaskParam.put("start_device_code", json.getString("struct_code")); jsonTaskParam.put("next_device_code", IOSEnum.EXCEP_OUT.code("异常出库口")); jsonTaskParam.put("vehicle_code", json.getString("storagevehicle_code")); - jsonTaskParam.put("vehicle_code2", jsonExt.getString("storagevehicle_code")); +// jsonTaskParam.put("vehicle_code2", jsonExt.getString("storagevehicle_code")); jsonTaskParam.put("task_group_id", IdUtil.getStringId()); jsonTaskParam.put("priority", json.getString("zdepth")); JSONObject request_param = new JSONObject(); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java index 632813e1e..e33475460 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java @@ -24,6 +24,7 @@ import org.nl.wms.sch.service.dto.RegionDto; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; import java.io.IOException; @@ -55,13 +56,14 @@ public class PointServiceImpl implements PointService { map.put("point_type", whereJson.get("point_type")); Object name = whereJson.get("name"); if (ObjectUtil.isNotEmpty(name)) { - String search = (String) name; - String[] split = search.split("_"); - name = String.join("\\_", split); - map.put("name", name); + + map.put("name", "%"+name+"%"); } JSONObject json = WQL.getWO("QSCH_BASE_POINT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "point_code asc"); JSONArray content = json.getJSONArray("content"); + if (CollectionUtils.isEmpty(content)){ + return json; + } List regionIds = new ArrayList<>(); for (int i = 0; i < content.size(); i++) { JSONObject object = content.getJSONObject(i); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_BASE_POINT.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_BASE_POINT.wql index 01f061771..0c3d5c549 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_BASE_POINT.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_BASE_POINT.wql @@ -78,7 +78,7 @@ point.is_used = 输入.is_used ENDOPTION OPTION 输入.name <> "" - ( point.point_code like "%" 输入.name "%" or point.point_name like "%" 输入.name "%" ) + ( point.point_code like 输入.name or point.point_name like 输入.name ) ENDOPTION ENDSELECT ENDPAGEQUERY diff --git a/lms/nladmin-ui/public/config.js b/lms/nladmin-ui/public/config.js index 60da82920..a4c28810e 100644 --- a/lms/nladmin-ui/public/config.js +++ b/lms/nladmin-ui/public/config.js @@ -1,9 +1,9 @@ window.g = { dev: { - VUE_APP_BASE_API: 'http://localhost:8013' + VUE_APP_BASE_API: 'http://localhost:8081' }, prod: { - VUE_APP_BASE_API: 'http://localhost:8013' + VUE_APP_BASE_API: 'http://localhost:8081' } diff --git a/lms/nladmin-ui/src/views/loki/view/index.vue b/lms/nladmin-ui/src/views/loki/view/index.vue index b5f94375a..51223c6aa 100644 --- a/lms/nladmin-ui/src/views/loki/view/index.vue +++ b/lms/nladmin-ui/src/views/loki/view/index.vue @@ -22,7 +22,7 @@