rev:新增需求

acs/nladmin-system/package-lock.json

@@ -0,0 +1,3 @@
+{
+  "lockfileVersion": 1
+}

acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java

@@ -219,7 +219,8 @@ public class XianGongAgvServiceImpl implements XianGongAgvService {
                 return result;
             } catch (Exception e) {
                 log.error("取消AGV指令信息错误:{}", e.getMessage());
-                throw new BadRequestException(e.getMessage());
+                //throw new BadRequestException(e.getMessage());
+                return null;
             }
         } else {
             return null;

acs/nladmin-system/src/main/java/org/nl/hand/amb/service/impl/HFHandServiceImpl.java

@@ -46,6 +46,8 @@ import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
 
 
 /**
@@ -233,6 +235,23 @@ public class HFHandServiceImpl implements HFHandService {
             return resultJson;
         }
 
+        String only_next_device_code = Optional.ofNullable(startDevice.getExtraValue().get("next_device_code"))
+                .map(Objects::toString).orElse(null);
+        if (only_next_device_code == null || only_next_device_code.length() <= 2) {
+            resultJson.put("code", "0");
+            resultJson.put("desc", "起点'" + start_devicecode + "',驱动未配置定点任务中的下一点位!");
+            resultJson.put("result", "");
+            return resultJson;
+        }
+
+        JSONArray array = JSONArray.parseArray(only_next_device_code);
+        if (!array.contains(next_devicecode)) {
+            resultJson.put("code", "0");
+            resultJson.put("desc", "起点'" + start_devicecode + "',驱动配置的定点任务中的下一点位中的点位信息不包含该终点!");
+            resultJson.put("result", "");
+            return resultJson;
+        }
+
         //判断起点有货，终点为空
         if (0 == startDevice.getHas_goods() || "1".equals(startDevice.getIslock())) {
             resultJson.put("code", "0");

acs/nladmin-system/src/main/java/org/nl/hand/amb/wql/QJN_QUERY001.wql

@@ -54,7 +54,7 @@
             WHERE
             	`name` = 'region'
             OPTION 输入.region_code <> ""
-                 value in ('2','3')
+                 value in ('2','3','5','7','8','11')
             ENDOPTION
 		ENDSELECT
 	ENDQUERY

acs/nladmin-system/src/main/resources/config/application-dev.yml

@@ -8,7 +8,7 @@ spring:
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
       url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:nl4_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true
       username: ${DB_USER:root}
-      password: ${DB_PWD:123456}
+      password: ${DB_PWD:password}
       # 初始连接数
       initial-size: 5
       # 最小连接数
@@ -126,11 +126,11 @@ file:
   avatarMaxSize: 5
 logging:
   file:
-    path: C:\log\ACS
+    path: /Users/onepiece/myFile/acs_logs
   config: classpath:logback-spring.xml
 lucene:
   index:
-    path: D:\lucene\index
+    path: /Users/onepiece/myFile/lucene/index
 
 # Sa-Token配置
 sa-token:
@@ -153,5 +153,5 @@ sa-token:
   token-prefix: Bearer
 
 loki:
-  url: http://localhost:3100/loki/api/v1
+  url: http://10.211.55.3:3100/loki/api/v1
   systemName: acs

acs/nladmin-ui/src/views/acs/device/driver/nl4/nl4_station.vue

@@ -211,6 +211,27 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="下一点位" prop="next_device_code" label-width="200">
+              <el-select
+                v-model="form.next_device_code"
+                filterable
+                multiple
+                reserve-keyword
+                placeholder="请选择"
+                style="width: 250px"
+              >
+                <el-option
+                  v-for="item in deviceList"
+                  :key="item.device_id"
+                  :label="item.device_name"
+                  :value="item.device_code"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </el-card>
 
@@ -450,7 +471,8 @@ export default {
         gantry_device_code2: [],
         gantry_device_code3: [],
         channel_steel_device_code1: [],
-        channel_steel_device_code2: []
+        channel_steel_device_code2: [],
+        next_device_code: []
       },
       rules: {}
     }

acs/nladmin-ui/src/views/acs/device/driver/standard_ordinary_site.vue

@@ -92,6 +92,25 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="下一点位" prop="next_device_code" label-width="200">
+              <el-select
+                v-model="form.next_device_code"
+                filterable
+                multiple
+                reserve-keyword
+                placeholder="请选择"
+                style="width: 250px"
+              >
+                <el-option
+                  v-for="item in deviceList"
+                  :key="item.device_id"
+                  :label="item.device_name"
+                  :value="item.device_code"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
     </el-card>
@@ -168,7 +187,8 @@ export default {
         is_release: true,
         station_manager: true,
         auto_clean_task: true,
-        input_material: true
+        input_material: true,
+        next_device_code: []
       },
       rules: {}
     }