diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java
index 7f2bcdf..1041b1d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java
@@ -492,17 +492,25 @@ public class ApiServiceImpl implements IApiService {
         requestLog.setIsSuccessful("1");
         requestLogService.insertRequestLog(requestLog);
 
-        //检查任务是否存在，避免重复生成
-        MydoJob job = new MydoJob();
-        job.setWmsTaskNo(stockoutReceive.getTaskCode());
+        // -------------------------检查推送的任务参数-------------------------
+        // 1.wms推送的任务号是否重复
+        MydoJob job = new MydoJob().builder().wmsTaskNo(stockoutReceive.getTaskCode()).build();
         List<MydoJob> tasks = mydoJobService.selectMydoJobList(job);
-
-        //校验：任务已存在
         if (tasks.size() != 0) {
-            log.info("【请求异常】wms下发出库任务失败，该任务已存在，任务号:{}", stockoutReceive.getTaskCode());
-            return AjaxResult.error("【请求异常】wms下发出库任务失败，任务号:" + stockoutReceive.getTaskCode());
+            log.info("【请求错误】wms下发出库任务失败，该任务已存在，推送任务号:{}，推送出库货位:{}", stockoutReceive.getTaskCode(), stockoutReceive.getSiteCode());
+            return AjaxResult.error("【请求错误】wms下发出库任务失败，该任务已存在，推送任务号:{}" + stockoutReceive.getTaskCode() + "，推送出库货位:" + stockoutReceive.getSiteCode());
         }
 
+        // 2.wms推送的出库货位是否已经有任务
+        job = new MydoJob().builder().cargoSpaceId(stockoutReceive.getSiteCode()).build();
+        tasks = mydoJobService.selectMydoJobList(job);
+        if (tasks.size() != 0) {
+            log.info("【请求错误】wms下发出库任务失败，已经存在该货位的出库任务，推送任务号:{}，推送出库货位:{}", stockoutReceive.getTaskCode(), stockoutReceive.getSiteCode());
+            return AjaxResult.error("【请求错误】wms下发出库任务失败，已经存在该货位的出库任务，推送任务号:{}" + stockoutReceive.getTaskCode() + "，推送出库货位:" + stockoutReceive.getSiteCode());
+        }
+
+
+
         //生成出库作业
         MydoJob mydoJob = new MydoJob();
         mydoJob.setJobId(mydoJobService.getJobId("CK"));
@@ -625,12 +633,8 @@ public class ApiServiceImpl implements IApiService {
         }
     }
 
-    @PostConstruct
-    void qwe() {
-//        LambdaQueryWrapper<MydoJob> queryWrapper = new LambdaQueryWrapper<>();
-//        queryWrapper.eq(MydoJob::getTaskNo,"6666");
-//        MydoJob mydoJob = mydoJobMapper.selectOne(queryWrapper);
-
+//    @PostConstruct
+    void test() {
 
     }