diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/baoshijian/BaoshijianSiteDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/baoshijian/BaoshijianSiteDeviceDriver.java
index a6988e4..a902234 100644
--- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/baoshijian/BaoshijianSiteDeviceDriver.java
+++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/baoshijian/BaoshijianSiteDeviceDriver.java
@@ -185,7 +185,7 @@ public class BaoshijianSiteDeviceDriver extends AbstractOpcDeviceDriver implemen
                 log.info("设备{}反馈收片任务完成", this.device_code);
                 this.writing("x6", 0);
                 this.writing("x8", 0);
-            } else if (x1 != last_x1 && x1 == 1 &&!in ) {
+            } else if (x1 != last_x1 && x1 == 1 &&!in && x6==0 && x8==0) {
                 in = false;
                 JSONObject jsonObject = new JSONObject();
                 String device_code = this.device_code + "DJW01";
@@ -205,7 +205,7 @@ public class BaoshijianSiteDeviceDriver extends AbstractOpcDeviceDriver implemen
                 log.info("设备{}反馈上空架完成", this.device_code);
                 this.writing("x5", 0);
                 this.writing("x7", 0);
-            } else if (x2 != last_x2 && x2 == 1 && !out) {
+            } else if (x2 != last_x2 && x2 == 1 && !out && x5==0 && x7==0) {
                 out = false;
                 JSONObject jsonObject = new JSONObject();
                 String device_code = this.device_code + "DJW02";
diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/site/SiteDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/site/SiteDeviceDriver.java
index 2e4aaf1..5ccece9 100644
--- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/site/SiteDeviceDriver.java
+++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/site/SiteDeviceDriver.java
@@ -157,9 +157,10 @@ public class SiteDeviceDriver extends AbstractOpcDeviceDriver implements DeviceD
                 //反馈输送线点位状态
                 if (device_code.startsWith("ZCSSX")) {
                     BaseRequest request = new BaseRequest();
-                    request.setType("2");
+                    request.setType("1");
                     request.setDevice_code(device_code);
-                    request.setState(String.valueOf(move));
+                    //1无货 2有货
+                    request.setState(String.valueOf(move+1));
                     acsToWmsService.notify(request);
                 }
             }