diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/bigscreen/product/rest/ProductController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/ProductController.java
similarity index 96%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/bigscreen/product/rest/ProductController.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/ProductController.java
index a022e30c..ed17cf3b 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/bigscreen/product/rest/ProductController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/ProductController.java
@@ -1,5 +1,5 @@
 
-package org.nl.wms.bigscreen.product.rest;
+package org.nl.wms.ext.bigScreen.rest;
 
 
 import io.swagger.annotations.Api;
@@ -7,7 +7,8 @@ import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.annotation.Log;
-import org.nl.wms.bigscreen.product.service.ProductService;
+
+import org.nl.wms.ext.bigScreen.service.ProductService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/bigscreen/product/service/ProductService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/ProductService.java
similarity index 97%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/bigscreen/product/service/ProductService.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/ProductService.java
index 3bbfbc6e..40530827 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/bigscreen/product/service/ProductService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/ProductService.java
@@ -1,9 +1,10 @@
-package org.nl.wms.bigscreen.product.service;
+package org.nl.wms.ext.bigScreen.service;
 
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.Map;
+
 @Service
 public interface ProductService {
     /**
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/bigscreen/product/service/impl/ProductServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/impl/ProductServiceImpl.java
similarity index 98%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/bigscreen/product/service/impl/ProductServiceImpl.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/impl/ProductServiceImpl.java
index f2219b51..19e8fd0c 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/bigscreen/product/service/impl/ProductServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/impl/ProductServiceImpl.java
@@ -1,4 +1,4 @@
-package org.nl.wms.bigscreen.product.service.impl;
+package org.nl.wms.ext.bigScreen.service.impl;
 
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
@@ -6,7 +6,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.nl.wms.bigscreen.product.service.ProductService;
+import org.nl.wms.ext.bigScreen.service.ProductService;
 import org.nl.wql.WQL;
 import org.springframework.stereotype.Service;
 
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/bigscreen/product/wql/BIGSCREENPRODUCT.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/wql/BIGSCREENPRODUCT.wql
similarity index 100%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/bigscreen/product/wql/BIGSCREENPRODUCT.wql
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/wql/BIGSCREENPRODUCT.wql
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/bigscreen/ds_agv.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/wql/ds_agv.xls
similarity index 100%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/bigscreen/ds_agv.xls
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/wql/ds_agv.xls
diff --git a/mes/hd/nladmin-system/src/main/resources/config/application-dev.yml b/mes/hd/nladmin-system/src/main/resources/config/application-dev.yml
index 2ac642d6..34d80e13 100644
--- a/mes/hd/nladmin-system/src/main/resources/config/application-dev.yml
+++ b/mes/hd/nladmin-system/src/main/resources/config/application-dev.yml
@@ -1,5 +1,13 @@
 server:
   port: 8010
+  #海亮sqlserver
+erp:
+  sqlserver:
+    enabled: false
+    jdbcurl: jdbc:sqlserver://192.168.81.156;DatabaseName=hllg
+    username: sa
+    password: root
+
 
 #配置数据源
 spring:
@@ -9,9 +17,11 @@ spring:
     druid:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:hl_one_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
+      #url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:hl_one_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
+      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:hl_one_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
       username: ${DB_USER:root}
       #password: ${DB_PWD:P@ssw0rd}
+      #password: ${DB_PWD:root}
       password: ${DB_PWD:Root.123456}
       # 初始连接数
       initial-size: 5
@@ -163,5 +173,5 @@ jetcache:
         maxIdle: 200
         maxTotal: 1000
       uri:
-        - redis://47.111.78.178:6379
+        - redis://localhost:6379
 
diff --git a/mes/hd/nladmin-system/src/main/resources/config/application-prod.yml b/mes/hd/nladmin-system/src/main/resources/config/application-prod.yml
index c589404a..59ed99d8 100644
--- a/mes/hd/nladmin-system/src/main/resources/config/application-prod.yml
+++ b/mes/hd/nladmin-system/src/main/resources/config/application-prod.yml
@@ -8,7 +8,7 @@ spring:
     druid:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.46.225}:${DB_PORT:3306}/${DB_NAME:hl_one_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
+      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.46.225}:${DB_PORT:3306}/${DB_NAME:hl_one_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
       username: ${DB_USER:root}
       password: ${DB_PWD:123456}
       #password: ${DB_PWD:Root.123456}
@@ -162,5 +162,5 @@ jetcache:
         maxIdle: 200
         maxTotal: 1000
       uri:
-        - redis://192.168.46.225:6379
+        - redis://localhost:6379
 
diff --git a/mes/hd/nladmin-system/src/main/resources/config/application.yml b/mes/hd/nladmin-system/src/main/resources/config/application.yml
index 0e75762b..334120a2 100644
--- a/mes/hd/nladmin-system/src/main/resources/config/application.yml
+++ b/mes/hd/nladmin-system/src/main/resources/config/application.yml
@@ -2,7 +2,7 @@ spring:
   freemarker:
     check-template-location: false
   profiles:
-    active: prod
+    active: dev
   jackson:
     time-zone: GMT+8
   data: