diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java
index 714f596c9..fb6b94d1c 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java
@@ -109,6 +109,15 @@ public class InBoxManageServiceImpl implements InBoxManageService {
         if (count > 0) {
             throw new BadRequestException("当前木箱入库任务已存在" + boxNo);
         }
+        SchBaseTask one = ischBaseTaskService.getOne(new QueryWrapper<SchBaseTask>()
+                .eq("task_type", "010702")
+                .eq("is_delete", "0")
+                .orderByDesc("task_id")
+                .last("limit 1"));
+        String vehicleCode2 = one.getVehicle_code2();
+        if (whereJson.getString("vehicle_code").equals(vehicleCode2)){
+            throw new BadRequestException("当前托盘"+whereJson.getString("vehicle_code")+"已经存在木箱入库任务"+one.getTask_code());
+        };
         //查询仓库是否存在相同木箱
         JSONArray stIvtStructattr = WQLObject.getWQLObject("st_ivt_structattr").query("storagevehicle_code = '" + boxNo + "'").getResultJSONArray(0);
         if (stIvtStructattr != null && stIvtStructattr.size() > 0) {
diff --git a/lms/nladmin-system/src/main/resources/config/application.yml b/lms/nladmin-system/src/main/resources/config/application.yml
index a9fc87884..a435e1108 100644
--- a/lms/nladmin-system/src/main/resources/config/application.yml
+++ b/lms/nladmin-system/src/main/resources/config/application.yml
@@ -6,7 +6,7 @@ spring:
   freemarker:
     check-template-location: false
   profiles:
-    active: prod
+    active: dev
   jackson:
     time-zone: GMT+8
   data: