diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java
index 6f25baa..1032fe6 100644
--- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java
+++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java
@@ -707,9 +707,10 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD
                 case 6:
                     //码垛完成
                     if (!requireSucess) {
-                        if (applyEmpty()) {
-                            palletizing();
-                        }
+                        applyEmpty();
+                    }
+                    if (resultSucess) {
+                        palletizing();
                     }
                     break;
                 case 7:
@@ -1138,7 +1139,7 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD
                 JSONObject jsonObject = JSONObject.parseObject(result.body());
                 if ("200".equals(jsonObject.getString("status"))) {
                     this.writing(this.mode);
-                    this.setRequireSucess(true);
+                    this.setResultSucess(false);
                 }
             }
             result.close();
diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/RljnPackagePalletSplitManipulatorDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/RljnPackagePalletSplitManipulatorDeviceDriver.java
index ee4bb32..8d0d273 100644
--- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/RljnPackagePalletSplitManipulatorDeviceDriver.java
+++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/RljnPackagePalletSplitManipulatorDeviceDriver.java
@@ -729,9 +729,10 @@ public class RljnPackagePalletSplitManipulatorDeviceDriver extends AbstractOpcDe
                 case 6:
                     //码垛完成
                     if (!requireSucess) {
-                        if (applyEmpty()) {
-                            palletizing();
-                        }
+                        applyEmpty();
+                    }
+                    if (resultSucess) {
+                        palletizing();
                     }
                     break;
                 case 7:
@@ -1372,7 +1373,7 @@ public class RljnPackagePalletSplitManipulatorDeviceDriver extends AbstractOpcDe
                 JSONObject jsonObject = JSONObject.parseObject(result.body());
                 if ("200".equals(jsonObject.getString("status"))) {
                     this.writing(this.mode);
-                    this.setRequireSucess(true);
+                    this.setResultSucess(false);
                 }
             }
             result.close();
diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
index 811e898..fa2def7 100644
--- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
+++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
@@ -476,19 +476,19 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         } else {
             throw new BadRequestException("未找到指令号'" + task_id);
         }
-        if ("RYSMW01".equals(device_code)) {
-            //将之前的托盘信息删除
+        //将之前的托盘信息删除
 //        groupTable.delete("vehicle_code='" + vehicle_code + "' and task_id <>'" + task_id + "'");
-            JSONObject groupObj = groupTable.query("task_id='" + task_id + "'").uniqueResult(0);
-            if (ObjectUtil.isEmpty(groupObj)) {
-                throw new BadRequestException("未找到指令号为'" + task_id + "'的组盘信息！");
-            }
+        JSONObject groupObj = groupTable.query("task_id='" + task_id + "'").uniqueResult(0);
+        // 根据任务标识查询组盘，如果不存在表示已经走过下面的反向组盘过程，如果存在则需要走一遍反向组盘过程
+        if (ObjectUtil.isNotEmpty(groupObj)) {
+            groupObj.put("task_id", "");
             groupObj.put("vehicle_code", vehicle_code);
             groupObj.put("update_optid", SecurityUtils.getCurrentUserId());
             groupObj.put("update_optname", SecurityUtils.getNickName());
             groupObj.put("update_time", DateUtil.now());
             groupTable.update(groupObj);
         }
+
         //更新入库单单据的托盘条码
         WQLObject iosTable = WQLObject.getWQLObject("ST_IVT_workProcedureIOS");
         JSONObject iosObj = iosTable.query("task_id ='" + task_id + "'").uniqueResult(0);