diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java
index d715f51..1f4e9d8 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java
@@ -386,7 +386,7 @@ public class PdaIosInServiceImpl implements PdaIosInService {
     public PdaResponse getPdaCallEquipment(JSONObject whereJson) {
         List<String> deptCodeS = getcurrentUserDepts();
         List<SchBasePoint> schBasePointList = iSchBasePointService.list(new LambdaQueryWrapper<SchBasePoint>()
-                .eq(SchBasePoint::getRegion_code, whereJson.getString("region_code"))
+                .eq(StringUtils.isNotBlank(whereJson.getString("region_code")),SchBasePoint::getRegion_code, whereJson.getString("region_code"))
                 .eq(SchBasePoint::getIs_used, 1)
                         .in(SchBasePoint::getCan_material_type,deptCodeS)
                 .eq(SchBasePoint::getPoint_type, 1)
@@ -486,7 +486,7 @@ public class PdaIosInServiceImpl implements PdaIosInService {
         pmFormMaterialDto.setMaterial_code(pmFormDataList.get(0).getMaterial_code());
         pmFormMaterialDto.setExt_code(ext_code);
         pmFormMaterialDto.setSupp_code(pmFormDataList.get(0).getSupp_code());
-        pmFormMaterialDto.setSupp_code(pmFormDataList.get(0).getSupp_code());
+        pmFormMaterialDto.setSupp_name(pmFormDataList.get(0).getSupp_name());
         return PdaResponse.requestParamOk(pmFormMaterialDto);
     }
 
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosOutServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosOutServiceImpl.java
index 9bb08ca..36eeedb 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosOutServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosOutServiceImpl.java
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import net.bytebuddy.implementation.bytecode.Throw;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -361,6 +362,9 @@ public class PdaIosOutServiceImpl implements PdaIosOutService {
         //设置点位状态,有料，需要传入托盘编号
         if ("3".equals(whereJson.getString("point_status"))) {
             String vehicle_code = whereJson.getString("vehicle_code");
+            if(StringUtils.isBlank(vehicle_code)){
+                throw  new BadRequestException("需要传入托盘编号");
+            }
             //判断点位是否是空载具或者空位
             //判断点位和仓位是否有正在执行的任务
             List<SchBaseTask> schBaseTaskList = taskService.list(new LambdaQueryWrapper<SchBaseTask>()
@@ -386,9 +390,9 @@ public class PdaIosOutServiceImpl implements PdaIosOutService {
                 throw new BadRequestException("点位有误！请输入正确的点位！");
             }
 
-            if ("3".equals(schBasePointList.get(0).getPoint_status()) || StringUtils.isNotBlank(schBasePointList.get(0).getVehicle_code())) {
-                throw new BadRequestException("这个点位已存在托盘" + schBasePointList.get(0).getVehicle_code() + "，无法直接修改！");
-            }
+          //  if ("3".equals(schBasePointList.get(0).getPoint_status()) || StringUtils.isNotBlank(schBasePointList.get(0).getVehicle_code())) {
+          //      throw new BadRequestException("这个点位已存在托盘" + schBasePointList.get(0).getVehicle_code() + "，无法直接修改！");
+          //  }
 
             iSchBasePointService.update(new LambdaUpdateWrapper<SchBasePoint>()
                     .set(SchBasePoint::getPoint_status, whereJson.getString("point_status"))