diff --git a/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/PalletMergeQueryServiceImpl.java b/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/PalletMergeQueryServiceImpl.java
index 857e7fe..30e8f96 100644
--- a/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/PalletMergeQueryServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/PalletMergeQueryServiceImpl.java
@@ -183,7 +183,7 @@ public class PalletMergeQueryServiceImpl implements PalletMergeQueryService {
         Date currentTime = new Date();
 
         // 5. 生成任务单号 - rqrq
-        TransNoControl transData = transNoService.getTransNo(site, "WTT", 10);
+        TransNoControl transData = transNoService.getTransNo(site, "WOT", 10);
         String taskNo = transData.getNewTransNo();
         System.out.println("生成任务单号：" + taskNo + " - rqrq");
 
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 4a2f911..fc19b6c 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -4,8 +4,8 @@ spring:
     druid:
       driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
       type: com.alibaba.druid.pool.DruidDataSource
-#      url: jdbc:sqlserver://192.168.1.90:1433;databaseName=ccl_wms_test
-      url: jdbc:sqlserver://xujiesoft.vicp.net:11515;databaseName=ccl_wms_test
+      url: jdbc:sqlserver://192.168.1.90:1433;databaseName=ccl_wms_test
+#      url: jdbc:sqlserver://xujiesoft.vicp.net:11515;databaseName=ccl_wms_test
 #      url: jdbc:sqlserver://localhost:1433;databaseName=ccl_wms
 #      url: jdbc:sqlserver://172.19.1.32:1433;databaseName=ccl_wms_prod
       username: sa
diff --git a/src/main/resources/mapper/automatedWarehouse/WcsIntegrationMapper.xml b/src/main/resources/mapper/automatedWarehouse/WcsIntegrationMapper.xml
index 724c08f..00cf956 100644
--- a/src/main/resources/mapper/automatedWarehouse/WcsIntegrationMapper.xml
+++ b/src/main/resources/mapper/automatedWarehouse/WcsIntegrationMapper.xml
@@ -1976,6 +1976,7 @@
             ON pd.site = hu.site AND pd.serial_no = hu.unit_id
         WHERE pd.site = #{site}
           AND pd.pallet_id = #{palletId}
+        and hu.reserve_flag='Y'
         ORDER BY pd.create_date ASC
     </select>