diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/LnshRGVDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/LnshRGVDeviceDriver.java
index 0b42da1..cc2afaf 100644
--- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/LnshRGVDeviceDriver.java
+++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/LnshRGVDeviceDriver.java
@@ -359,6 +359,7 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi
                     if (mode == 3 && move_2 == 1 && action_2 == 1 && move_1 == 0 && !requireSucess1) {
                         instruction_require();
                     }
+                    break;
             }
 
             switch (flag) {
diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java b/acs/hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java
index 24cd33a..4b2a23f 100644
--- a/acs/hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java
+++ b/acs/hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java
@@ -139,8 +139,10 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
                     if (ikey != 0) {
                         inst = instructionService.findByCodeFromCache(String.valueOf(ikey));
                     }
-                    log.info("接收agv上报信息：" + bs);
-                    log.info("接收agv上报信息：" + "phase--" + phase + "  index--" + index + "  ikey--" + ikey + "  agvaddr--" + agvaddr + "  Car--" + carno);
+//                    log.info("接收agv上报信息：" + bs);
+//                    log.info("接收agv上报信息：" + "phase--" + phase + "  index--" + index + "  ikey--" + ikey + "  agvaddr--" + agvaddr + "  Car--" + carno);
+                    logServer.deviceExecuteLog("ndc", "","","接收agv上报信息：" + bs);
+                    logServer.deviceExecuteLog("ndc", "","","接收agv上报信息：" + "phase--" + phase + "  index--" + index + "  ikey--" + ikey + "  agvaddr--" + agvaddr + "  Car--" + carno);
                     Device device = null;
                     String device_code = null;
                     String old_device_code = null;
diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/SendMaterialTask.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/SendMaterialTask.java
index ee38b4a..fb98cfe 100644
--- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/SendMaterialTask.java
+++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/SendMaterialTask.java
@@ -117,18 +117,11 @@ public class SendMaterialTask extends AbstractAcsTask {
             pointTab.update(endpointObj);
 
             JSONObject startPointObj = pointTab.query("point_code='" + jsonTask.getString("start_point_code") + "'").uniqueResult(0);
-            //假如起点是码垛位置则不需要更新
-            if (!(StrUtil.equals(jsonTask.getString("start_point_code"), "FJJXSXLW201") ||
-                    StrUtil.equals(jsonTask.getString("start_point_code"), "FJJXSXLW202") ||
-                    StrUtil.equals(jsonTask.getString("start_point_code"), "FJJXSXLW301") ||
-                    StrUtil.equals(jsonTask.getString("start_point_code"), "FJJXSXLW302"))
 
-            ) {
-                startPointObj.put("lock_type", "00");
-                startPointObj.put("point_status", "00");
-                startPointObj.put("vehicle_code", "");
-                pointTab.update(startPointObj);
-            }
+            startPointObj.put("lock_type", "00");
+            startPointObj.put("point_status", "00");
+            startPointObj.put("vehicle_code", "");
+            pointTab.update(startPointObj);
 
             taskTab.update(jsonTask);
             String area_type = endpointObj.getString("area_type");
diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/ToPackIngTask.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/ToPackIngTask.java
index c8c339c..f06ab3c 100644
--- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/ToPackIngTask.java
+++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/ToPackIngTask.java
@@ -62,10 +62,18 @@ public class ToPackIngTask extends AbstractAcsTask {
             WQLObject pointTab = WQLObject.getWQLObject("sch_base_point");
             //将起点的载具清除
             JSONObject startPointObj = pointTab.query("point_code='" + jsonTask.getString("start_point_code") + "'").uniqueResult(0);
-            startPointObj.put("lock_type", "00");
-            startPointObj.put("point_status", "00");
-            startPointObj.put("vehicle_code", "");
-            pointTab.update(startPointObj);
+            //假如起点是码垛位置则不需要更新
+            if (!(StrUtil.equals(jsonTask.getString("start_point_code"), "FJJXSXLW201") ||
+                    StrUtil.equals(jsonTask.getString("start_point_code"), "FJJXSXLW202") ||
+                    StrUtil.equals(jsonTask.getString("start_point_code"), "FJJXSXLW301") ||
+                    StrUtil.equals(jsonTask.getString("start_point_code"), "FJJXSXLW302"))
+
+            ) {
+                startPointObj.put("lock_type", "00");
+                startPointObj.put("point_status", "00");
+                startPointObj.put("vehicle_code", "");
+                pointTab.update(startPointObj);
+            }
             //将组盘表删除
             WQLObject group_Table = WQLObject.getWQLObject("st_buss_vehiclegroup");
             JSONObject groupObj = group_Table.query("vehicle_code='" + jsonTask.getString("vehicle_code") + "' and is_delete='0'").uniqueResult(0);