From 1ef6c07c2e8edaedf01010f5c946428238fd0011 Mon Sep 17 00:00:00 2001 From: liuxy Date: Tue, 13 Dec 2022 13:41:48 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java index 73ab3cfca..d5b3632ab 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java @@ -472,15 +472,15 @@ public class BakingServiceImpl implements BakingService { JSONObject json = new JSONObject(); JSONObject jsonCool = coolIvtTab.query("full_point_code = '" + point_code + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(jsonCool.getString("container_name"))) { + if (ObjectUtil.isNotEmpty(jsonCool)) { json.put("container_name", jsonCool.getString("container_name")); } else { JSONObject jsonHot = hotIvtTab.query("point_code = '" + point_code + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(jsonHot.getString("container_name"))) { + if (ObjectUtil.isNotEmpty(jsonHot)) { json.put("container_name", jsonHot.getString("container_name")); } else { JSONObject jsonPoint = pointIvtTab.query("point_code = '" + point_code + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(jsonPoint.getString("material_code"))) { + if (ObjectUtil.isNotEmpty(jsonPoint)) { json.put("container_name", jsonPoint.getString("material_code")); } else { json.put("container_name", ""); From 9fac0930e29e0f76bedf2baf2bf71ae977d48258 Mon Sep 17 00:00:00 2001 From: liuxy Date: Tue, 13 Dec 2022 13:42:19 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pda/mps/service/impl/EmptyVehicleServiceImpl.java | 8 +++++--- .../src/views/wms/pdm/ivt/coolpointivt/inventory.vue | 2 +- .../src/views/wms/pdm/ivt/cutpointivt/index.vue | 10 +++++----- .../src/views/wms/pdm/ivt/deliverypointivt/index.vue | 6 +++--- .../src/views/wms/pdm/ivt/hotpointivt/pointIvt.vue | 2 +- .../src/views/wms/pdm/order/slittingplan/index.vue | 2 +- 6 files changed, 16 insertions(+), 14 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/EmptyVehicleServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/EmptyVehicleServiceImpl.java index 0da323ec4..c657ac6c2 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/EmptyVehicleServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/EmptyVehicleServiceImpl.java @@ -29,11 +29,13 @@ public class EmptyVehicleServiceImpl implements EmptyVehicleService { if (StrUtil.isEmpty(point_code)){ throw new BadRequestException("点位不能为空！"); } + + String empty_vehicle_code = ""; JSONObject point_jo = WQLObject.getWQLObject("st_ivt_coolpointivt").query("empty_point_code = '"+point_code+"'").uniqueResult(0); - if (ObjectUtil.isEmpty(point_jo)){ - throw new BadRequestException("未查询到对应点位，请扫描正确的空轴点位！"); + if (ObjectUtil.isNotEmpty(point_jo)){ + empty_vehicle_code = point_jo.getString("empty_vehicle_code"); } - String empty_vehicle_code = point_jo.getString("empty_vehicle_code"); + JSONObject vehicle_jo = new JSONObject(); vehicle_jo.put("vehicle_code",empty_vehicle_code); JSONObject jo = new JSONObject(); diff --git a/lms/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/inventory.vue b/lms/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/inventory.vue index eb1bd78a9..9823b409d 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/inventory.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/inventory.vue @@ -241,7 +241,7 @@ - +