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 @@
-
+
{{ dict.label.product_area[scope.row.product_area] }}
diff --git a/lms/nladmin-ui/src/views/wms/pdm/ivt/cutpointivt/index.vue b/lms/nladmin-ui/src/views/wms/pdm/ivt/cutpointivt/index.vue
index 36d48de6a..8b36e6c3f 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/ivt/cutpointivt/index.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/ivt/cutpointivt/index.vue
@@ -158,8 +158,8 @@
-
-
+
+
{{ dict.label.is_used[scope.row.is_used] }}
@@ -170,15 +170,15 @@
{{ dict.label.sch_full_point_status[scope.row.full_point_status] }}
-
+
-
+
{{ dict.label.sch_empty_point_status[scope.row.empty_point_status] }}
-
+
diff --git a/lms/nladmin-ui/src/views/wms/pdm/ivt/deliverypointivt/index.vue b/lms/nladmin-ui/src/views/wms/pdm/ivt/deliverypointivt/index.vue
index a5f4f077d..77fb844ad 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/ivt/deliverypointivt/index.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/ivt/deliverypointivt/index.vue
@@ -145,9 +145,9 @@
-
-
-
+
+
+
{{ dict.label.delivery_point_status[scope.row.point_status] }}
diff --git a/lms/nladmin-ui/src/views/wms/pdm/ivt/hotpointivt/pointIvt.vue b/lms/nladmin-ui/src/views/wms/pdm/ivt/hotpointivt/pointIvt.vue
index 5042c8b77..511f138f2 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/ivt/hotpointivt/pointIvt.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/ivt/hotpointivt/pointIvt.vue
@@ -166,7 +166,7 @@
-
+
diff --git a/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue b/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue
index 5dd535c2e..d37e73278 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue
@@ -343,7 +343,7 @@
-
+