diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/MagicAgvServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/MagicAgvServiceImpl.java
index 3fe94e7..4892fdd 100644
--- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/MagicAgvServiceImpl.java
+++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/MagicAgvServiceImpl.java
@@ -450,16 +450,16 @@ public class MagicAgvServiceImpl implements MagicAgvService {
                     if ("Load".equals(action)) {
                         if (lnshStationDeviceDriver.getMode() != 0 && lnshStationDeviceDriver.getMove() > 0) {
                             inst.setExecute_status("1");
-//                            lnshStationDeviceDriver.setFlag(1);
-                            lnshStationDeviceDriver.writing(5);
+                            lnshStationDeviceDriver.setFlag(1);
+//                            lnshStationDeviceDriver.writing(5);
                             is_feedback = true;
                         }
                         //请求放货
                     } else if ("Unload".equals(action)) {
                         if (lnshStationDeviceDriver.getMode() != 0 && lnshStationDeviceDriver.getMove() == 0) {
                             inst.setExecute_status("3");
-//                            lnshStationDeviceDriver.setFlag(3);
-                            lnshStationDeviceDriver.writing(6);
+                            lnshStationDeviceDriver.setFlag(3);
+//                            lnshStationDeviceDriver.writing(6);
                             is_feedback = true;
                         }
                     }  else if ("NOP".equals(action)) {
@@ -520,14 +520,14 @@ public class MagicAgvServiceImpl implements MagicAgvService {
                     if ("Load".equals(action)) {
                         if (lnshPalletizingManipulatorSiteDeviceDriver.getMode() != 0 && lnshPalletizingManipulatorSiteDeviceDriver.getMove() > 0) {
                             inst.setExecute_status("1");
-                            lnshPalletizingManipulatorSiteDeviceDriver.writing(12);
+                            lnshPalletizingManipulatorSiteDeviceDriver.setFlag(1);
                             is_feedback = true;
                         }
                         //请求放货
                     } else if ("Unload".equals(action)) {
                         if (lnshPalletizingManipulatorSiteDeviceDriver.getMode() != 0 && lnshPalletizingManipulatorSiteDeviceDriver.getMove() == 0) {
                             inst.setExecute_status("3");
-                            lnshPalletizingManipulatorSiteDeviceDriver.writing(13);
+                            lnshPalletizingManipulatorSiteDeviceDriver.setFlag(3);
                             is_feedback = true;
                         }
                     }
@@ -590,7 +590,7 @@ public class MagicAgvServiceImpl implements MagicAgvService {
                         if (lnshStationDeviceDriver.getMode() != 0 && lnshStationDeviceDriver.getMove() == 0) {
                             inst.setExecute_device_code(processingVehicle);
                             inst.setExecute_status("2");
-                            lnshStationDeviceDriver.writing(2);
+//                            lnshStationDeviceDriver.writing(2);
                             is_feedback = true;
                         }
                         //放货完成
@@ -598,7 +598,7 @@ public class MagicAgvServiceImpl implements MagicAgvService {
                         if (lnshStationDeviceDriver.getMode() != 0 && lnshStationDeviceDriver.getMove() > 0) {
                             inst.setExecute_device_code(address);
                             inst.setExecute_status("4");
-                            lnshStationDeviceDriver.writing(3);
+//                            lnshStationDeviceDriver.writing(3);
                             is_feedback = true;
                         }
                     }
@@ -611,7 +611,7 @@ public class MagicAgvServiceImpl implements MagicAgvService {
                         if (lnshLaminatingMachineDeviceDriver.getMode() != 0 && lnshLaminatingMachineDeviceDriver.getMove() == 0) {
                             inst.setExecute_device_code(processingVehicle);
                             inst.setExecute_status("2");
-                            lnshLaminatingMachineDeviceDriver.writing(2);
+                            lnshLaminatingMachineDeviceDriver.setFlag(1);
                             is_feedback = true;
                         }
                         //放货完成
@@ -619,7 +619,7 @@ public class MagicAgvServiceImpl implements MagicAgvService {
                         if (lnshLaminatingMachineDeviceDriver.getMode() != 0 && lnshLaminatingMachineDeviceDriver.getMove() > 0) {
                             inst.setExecute_device_code(address);
                             inst.setExecute_status("4");
-                            lnshLaminatingMachineDeviceDriver.writing(3);
+                            lnshLaminatingMachineDeviceDriver.setFlag(2);
                             is_feedback = true;
                         }
                     }
@@ -784,38 +784,38 @@ public class MagicAgvServiceImpl implements MagicAgvService {
 //                flag = true;
                 log.info("agvstatus:" + lnshStationDeviceDriver.getFlag() + "");
                 //取货完成离开
-//                if (lnshStationDeviceDriver.getFlag() == 1) {
+                if (lnshStationDeviceDriver.getFlag() == 1) {
                     if (lnshStationDeviceDriver.getMove() == 0) {
                         flag = true;
-                        lnshStationDeviceDriver.writing(2);
+                        lnshStationDeviceDriver.setFlag(2);
                     }
-//                }
+                }
                 //放货完成离开
-//                if (lnshStationDeviceDriver.getFlag() == 3) {
+                if (lnshStationDeviceDriver.getFlag() == 3) {
                     if (lnshStationDeviceDriver.getMove() == 1) {
                         flag = true;
-                        lnshStationDeviceDriver.writing(3);
+                        lnshStationDeviceDriver.setFlag(4);
                     }
-//                }
+                }
             }
             if (addressdevice.getDeviceDriver() instanceof LnshPalletizingManipulatorSiteDeviceDriver) {
                 lnshPalletizingManipulatorSiteDeviceDriver = (LnshPalletizingManipulatorSiteDeviceDriver) addressdevice.getDeviceDriver();
 //                flag = true;
                 log.info("agvstatus:" + lnshPalletizingManipulatorSiteDeviceDriver.getFlag() + "");
                 //取货完成离开
-//                if (lnshPalletizingManipulatorSiteDeviceDriver.getFlag() == 1) {
+                if (lnshPalletizingManipulatorSiteDeviceDriver.getFlag() == 1) {
                     if (lnshPalletizingManipulatorSiteDeviceDriver.getMove() == 0) {
                         flag = true;
-                        lnshPalletizingManipulatorSiteDeviceDriver.writing(10);
+                        lnshPalletizingManipulatorSiteDeviceDriver.setFlag(2);
                     }
-//                }
+                }
                 //放货完成离开
-//                if (lnshPalletizingManipulatorSiteDeviceDriver.getFlag() == 3) {
+                if (lnshPalletizingManipulatorSiteDeviceDriver.getFlag() == 3) {
                     if (lnshPalletizingManipulatorSiteDeviceDriver.getMove() == 1) {
                         flag = true;
-                        lnshPalletizingManipulatorSiteDeviceDriver.writing(11);
+                        lnshPalletizingManipulatorSiteDeviceDriver.setFlag(4);
                     }
-//                }
+                }
             }
 
             if (addressdevice.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) {
diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/LnshLaminatingMachineDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/LnshLaminatingMachineDeviceDriver.java
index 9cbee72..0dc7a31 100644
--- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/LnshLaminatingMachineDeviceDriver.java
+++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/LnshLaminatingMachineDeviceDriver.java
@@ -212,13 +212,13 @@ public class LnshLaminatingMachineDeviceDriver extends AbstractOpcDeviceDriver i
 
             switch (flag) {
                 //取货完成
-//                case 1:
-//                    writing(2);
-//                    return;
-//                //放货完成
-//                case 2:
-//                    writing(3);
-//                    return;
+                case 1:
+                    writing(2);
+                    return;
+                //放货完成
+                case 2:
+                    writing(3);
+                    return;
 
             }
 
diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java
index a4c824b..2d1c865 100644
--- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java
+++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java
@@ -183,26 +183,6 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
                 logServer.deviceItemValue(this.device_code,"specifications", specifications);
                 logServer.deviceExecuteLog(this.device_code,"","","信号specifications：" + last_specifications + "->" + specifications);
             }
-//            if (flag != last_flag) {
-//                switch (flag) {
-//                    //请求取货
-//                    case 1:
-//                        writing(5);
-//                        return;
-//                    //取货完成
-//                    case 2:
-//                        writing(2);
-//                        return;
-//                    //请求放货
-//                    case 3:
-//                        writing(6);
-//                        return;
-//                    //放货完成
-//                    case 4:
-//                        writing(3);
-//                        return;
-//                }
-//            }
 
         } catch (Exception var17) {
             return;
@@ -283,24 +263,24 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
                     break;
             }
 
-//            switch (flag) {
-//                //请求取货
-//                case 1:
-//                    writing(5);
-//                    return;
-//                //取货完成
-//                case 2:
-//                    writing(2);
-//                    return;
-//                //请求放货
-//                case 3:
-//                    writing(6);
-//                    return;
-//                //放货完成
-//                case 4:
-//                    writing(3);
-//                    return;
-//            }
+            switch (flag) {
+                //请求取货
+                case 1:
+                    writing(5);
+                    return;
+                //取货完成
+                case 2:
+                    writing(2);
+                    return;
+                //请求放货
+                case 3:
+                    writing(6);
+                    return;
+                //放货完成
+                case 4:
+                    writing(3);
+                    return;
+            }
         }
 
         last_mode = mode;
@@ -392,7 +372,7 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
             JSONObject json = new JSONObject();
             json.put("device_code",this.device_code);
             json.put("vehicle_code",barcode);
-//            json.put("task_code",inst.getTask_code());
+            json.put("task_code",inst.getTask_code());
 
             HttpResponse result = acsToWmsService.applyIntoKiln(json);
             if (ObjectUtil.isNotEmpty(result)) {