更新

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 {

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();
+//            agv1.setName("agv1");
-            agv2.setName("agv2");
+//            agv1.setEnergyLevel("70");
-            agv2.setEnergyLevel("100");
+//            agv1.setState("IDLE");
-            agv2.setState("EXECUTING");
+//            agv_map.put("agv1", agv1);
-            agv_map.put("agv2", agv2);
+//
+//            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;

qd/src/views/home2.vue

@@ -159,32 +159,32 @@ export default {
       },
       agvList: [
         {
-          car_no: 1,
+          // car_no: 1,
-          name: 'agv1',
+          // name: 'agv1',
-          electricity: 100,
+          // electricity: 100,
-          status_name: '待机',
+          // status_name: '待机',
-          flag: '0'
+          // flag: '0'
         },
         {
-          car_no: 2,
+          // car_no: 2,
-          name: 'agv2',
+          // name: 'agv2',
-          electricity: 50,
+          // electricity: 50,
-          status_name: '有任务',
+          // status_name: '有任务',
-          flag: '1'
+          // flag: '1'
         },
         {
-          car_no: 3,
+          // car_no: 3,
-          name: 'agv3',
+          // name: 'agv3',
-          electricity: 60,
+          // electricity: 60,
-          status_name: '充电中',
+          // status_name: '充电中',
-          flag: '1'
+          // flag: '1'
         },
         {
-          car_no: 4,
+          // car_no: 4,
-          name: 'agv4',
+          // name: 'agv4',
-          electricity: 80,
+          // electricity: 80,
-          status_name: '充电中',
+          // status_name: '充电中',
-          flag: '0'
+          // flag: '0'
         }
       ],
       task: {