fix(config): 更新开发环境数据库配置并修复任务单号生成问题

- 将开发环境数据库URL从外网地址切换回内网地址
- 修改托盘合并查询中的任务单号前缀从 WTT 改为 WOT
- 在 WCS 集成查询中添加库存预留标识过滤条件

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");
 

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

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>