From 0f4c8ebe296e31210cd11e021c917a21230b49df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?= Date: Thu, 15 Jan 2026 10:18:40 +0800 Subject: [PATCH] =?UTF-8?q?fix(config):=20=E6=9B=B4=E6=96=B0=E5=BC=80?= =?UTF-8?q?=E5=8F=91=E7=8E=AF=E5=A2=83=E6=95=B0=E6=8D=AE=E5=BA=93=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E5=B9=B6=E4=BF=AE=E5=A4=8D=E4=BB=BB=E5=8A=A1=E5=8D=95?= =?UTF-8?q?=E5=8F=B7=E7=94=9F=E6=88=90=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将开发环境数据库URL从外网地址切换回内网地址 - 修改托盘合并查询中的任务单号前缀从 WTT 改为 WOT - 在 WCS 集成查询中添加库存预留标识过滤条件 --- .../service/impl/PalletMergeQueryServiceImpl.java | 2 +- src/main/resources/application-dev.yml | 4 ++-- .../mapper/automatedWarehouse/WcsIntegrationMapper.xml | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) 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