diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java
index fa760e28..767959d9 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java
@@ -151,6 +151,11 @@ public class MdGruopDickServiceImpl extends ServiceImpl<MdGruopDickMapper, MdGru
                 .eq("is_delete",false)
                 .in("vehicle_code", map.keySet()));
         if (tmpCount1.size()>0){
+            List<MdPbVehicleMater> collect = tmpCount1.stream().filter(mdPbVehicleMater -> mdPbVehicleMater.getNeed_pick()&&mdPbVehicleMater.getVehicle_code().contains("T")).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(collect)){
+                String vehicles = collect.stream().map(MdPbVehicleMater::getVehicle_code).collect(Collectors.joining(","));
+                throw new BadRequestException("载具"+vehicles+"为拣选回库无需组盘");
+            }
             throw new BadRequestException("组盘失败：载具已经存在组盘信息"+tmpCount1.stream().map(MdPbVehicleMater::getVehicle_code).collect(Collectors.joining(",")));
         }
         this.saveBatch(map.values());
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/IOStorageController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/IOStorageController.java
index 695efdae..520ed90d 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/IOStorageController.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/IOStorageController.java
@@ -29,6 +29,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.math.BigDecimal;
+
 /**
  * <p>
  * 出入库单主表 前端控制器
@@ -52,7 +54,7 @@ public class IOStorageController {
 
     @PostMapping("out")
     @SaIgnore
-    @Log("出库却润")
+    @Log("手持出库解绑")
     public ResponseEntity<Object> outStorage(@RequestBody JSONObject form) {
         String vehicle_code = form.getString("vehicle_code");
         MdPbVehicleMater one = iMdPbVehicleMaterService.getOne(new QueryWrapper<MdPbVehicleMater>()
@@ -70,14 +72,10 @@ public class IOStorageController {
                     throw new BadRequestException(String.format("当前载具%s业务流程%s未完成",vehicle_code,parent_id));
                 }
             }
-            //单据校验"针对托盘库拣选
+            //单据校验"针对托盘库做条件判断
             if (vehicle_code.contains("T")){
-                int count = iPmFormDataService.count(new QueryWrapper<PmFormData>()
-                        .eq("form_type", "Picking")
-                        .eq("vehicle_code", vehicle_code)
-                        .lt("status", StatusEnum.FORM_STATUS.code("完成")));
-                if (count>0){
-                    throw new BadRequestException(String.format("当前载具%s为拣选出库请先进行拣选操作",vehicle_code));
+                if (one.getNeed_pick() && one.getQty().compareTo(BigDecimal.ZERO)>0){
+                    throw new BadRequestException(one.getRemark());
                 }
             }
             iMdPbVehicleMaterService.update(new UpdateWrapper<MdPbVehicleMater>()
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/impl/StIvtStructattrServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/impl/StIvtStructattrServiceImpl.java
index 35fc86cd..b1909038 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/impl/StIvtStructattrServiceImpl.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/impl/StIvtStructattrServiceImpl.java
@@ -102,6 +102,7 @@ public class StIvtStructattrServiceImpl extends ServiceImpl<StIvtStructattrMappe
                     .eq("id", vehicleMater.getId());
             if (vehicleCode.contains("T") && subtract.intValue()>0){
                 update.set("need_pick",true);
+                update.set("remark","托盘"+vehicleMater.getVehicle_code()+"为人工拣选,请先拣选"+vehicleMater.getFrozen_qty()+",在直接回库!");
             }
             vehicleMaterService.update(update);
             StIvtStructivtflow record = new StIvtStructivtflow();