diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java
index 425d72eb9..dedb23441 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java
@@ -528,6 +528,15 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                     Instruction instruction = instructionService.findByTaskcode(taskDto.getTask_code());
                     String start_device_code = instruction.getStart_device_code();
                     String next_device_code = instruction.getNext_device_code();
+                    Device device = deviceAppService.findDeviceByCode(next_device_code);
+                    PhotoelectricInspectionSiteDeviceDriver photoelectricInspectionSiteDeviceDriver;
+                    if (device.getDeviceDriver() instanceof PhotoelectricInspectionSiteDeviceDriver){
+                        photoelectricInspectionSiteDeviceDriver = (PhotoelectricInspectionSiteDeviceDriver) device.getDeviceDriver();
+                        if (photoelectricInspectionSiteDeviceDriver.getMove() != 0){
+                            notCreateInstMessage = "手动创建指令未下发电气信号原因->烘箱对接位:" + photoelectricInspectionSiteDeviceDriver.getDevice_code() + "有货,无法下发指令!";
+                            return false;
+                        }
+                    }
                     //判断关联的同一列烘箱设备是否都关门 都关门返回false，有一个不关门就返回true
                     boolean isCloseDoor = this.judgeCloseDoor(start_device_code, next_device_code);
                     //未关门结束
@@ -566,6 +575,15 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                 }
             }
             if (!ObjectUtil.isEmpty(task)) {
+                Device device = deviceAppService.findDeviceByCode(task.getNext_device_code());
+                PhotoelectricInspectionSiteDeviceDriver photoelectricInspectionSiteDeviceDriver;
+                if (device.getDeviceDriver() instanceof PhotoelectricInspectionSiteDeviceDriver){
+                    photoelectricInspectionSiteDeviceDriver = (PhotoelectricInspectionSiteDeviceDriver) device.getDeviceDriver();
+                    if (photoelectricInspectionSiteDeviceDriver.getMove() != 0){
+                        notCreateInstMessage = "就绪任务未创建指令原因->烘箱对接位:" + photoelectricInspectionSiteDeviceDriver.getDevice_code() + "有货,无法生成指令!";
+                        return false;
+                    }
+                }
                 String taskid = task.getTask_id();
                 String taskcode = task.getTask_code();
                 String vehiclecode = task.getVehicle_code();
diff --git a/acs/nladmin-system/src/main/resources/config/application-dev.yml b/acs/nladmin-system/src/main/resources/config/application-dev.yml
index d4bbec25a..73b246e26 100644
--- a/acs/nladmin-system/src/main/resources/config/application-dev.yml
+++ b/acs/nladmin-system/src/main/resources/config/application-dev.yml
@@ -13,11 +13,11 @@ spring:
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
       #      url: jdbc:log4jdbc:mysql://${DB_HOST:10.1.3.91}:${DB_PORT:3306}/${DB_NAME:acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
       #      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:lzhl_one_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
-      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:lzhl_one_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
+      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:lzhl_one_wcs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
       username: ${DB_USER:root}
       #      password: ${DB_PWD:P@ssw0rd}
       #      password: ${DB_PWD:Root.123456}
-      password: ${DB_PWD:123456}
+      password: ${DB_PWD:password}
 
       # 初始连接数
       initial-size: 5