From 386f3561cb281ebab5d168904c142f08222a3f85 Mon Sep 17 00:00:00 2001
From: loujf <loujingfei666@163.com>
Date: Wed, 17 Aug 2022 09:32:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/NdxyTwoHandServiceImpl.java  |  4 +-
 .../nl/modules/quartz/task/HomeDataQuery.java | 19 ++++-----
 qd/src/views/home2.vue                        | 40 +++++++++----------
 3 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/hd/nladmin-system/src/main/java/org/nl/hand/ndxytwo/service/impl/NdxyTwoHandServiceImpl.java b/hd/nladmin-system/src/main/java/org/nl/hand/ndxytwo/service/impl/NdxyTwoHandServiceImpl.java
index 1cab42c..b5d392c 100644
--- a/hd/nladmin-system/src/main/java/org/nl/hand/ndxytwo/service/impl/NdxyTwoHandServiceImpl.java
+++ b/hd/nladmin-system/src/main/java/org/nl/hand/ndxytwo/service/impl/NdxyTwoHandServiceImpl.java
@@ -564,7 +564,9 @@ public class NdxyTwoHandServiceImpl implements NdxyTwoHandService {
             dto.setStart_point_code(start_device_code);
             dto.setNext_device_code(next_device_code);
             dto.setNext_point_code(next_device_code);
-            dto.setQuantity(new BigDecimal(quantity));
+            if (StrUtil.isNotEmpty(quantity)) {
+                dto.setQuantity(new BigDecimal(quantity));
+            }
             dto.setRemark(remark);
             dto.setMaterial(material_type);
             try {
diff --git a/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/HomeDataQuery.java b/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/HomeDataQuery.java
index 07bf107..5076b46 100644
--- a/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/HomeDataQuery.java
+++ b/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/HomeDataQuery.java
@@ -38,16 +38,17 @@ public class HomeDataQuery {
             JSONObject json = new JSONObject();
             Map<String, AgvDto> agv_map = agvService.findAllAgvFromCache();
             AgvDto agv1 = new AgvDto();
-            agv1.setName("agv1");
-            agv1.setEnergyLevel("70");
-            agv1.setState("IDLE");
-            agv_map.put("agv1", agv1);
 
-            AgvDto agv2 = new AgvDto();
-            agv2.setName("agv2");
-            agv2.setEnergyLevel("100");
-            agv2.setState("EXECUTING");
-            agv_map.put("agv2", agv2);
+//            agv1.setName("agv1");
+//            agv1.setEnergyLevel("70");
+//            agv1.setState("IDLE");
+//            agv_map.put("agv1", agv1);
+//
+//            AgvDto agv2 = new AgvDto();
+//            agv2.setName("agv2");
+//            agv2.setEnergyLevel("100");
+//            agv2.setState("EXECUTING");
+//            agv_map.put("agv2", agv2);
 
             JSONArray agv_rows = new JSONArray();
             int i = 1;
diff --git a/qd/src/views/home2.vue b/qd/src/views/home2.vue
index 77acf96..341fb36 100644
--- a/qd/src/views/home2.vue
+++ b/qd/src/views/home2.vue
@@ -159,32 +159,32 @@ export default {
       },
       agvList: [
         {
-          car_no: 1,
-          name: 'agv1',
-          electricity: 100,
-          status_name: '待机',
-          flag: '0'
+          // car_no: 1,
+          // name: 'agv1',
+          // electricity: 100,
+          // status_name: '待机',
+          // flag: '0'
         },
         {
-          car_no: 2,
-          name: 'agv2',
-          electricity: 50,
-          status_name: '有任务',
-          flag: '1'
+          // car_no: 2,
+          // name: 'agv2',
+          // electricity: 50,
+          // status_name: '有任务',
+          // flag: '1'
         },
         {
-          car_no: 3,
-          name: 'agv3',
-          electricity: 60,
-          status_name: '充电中',
-          flag: '1'
+          // car_no: 3,
+          // name: 'agv3',
+          // electricity: 60,
+          // status_name: '充电中',
+          // flag: '1'
         },
         {
-          car_no: 4,
-          name: 'agv4',
-          electricity: 80,
-          status_name: '充电中',
-          flag: '0'
+          // car_no: 4,
+          // name: 'agv4',
+          // electricity: 80,
+          // status_name: '充电中',
+          // flag: '0'
         }
       ],
       task: {