From 3c87705b9743e83e1322df991f92d6dc8f7d9cdc Mon Sep 17 00:00:00 2001 From: liuhanqing Date: Wed, 11 Feb 2026 10:38:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BD=8D=E7=BD=AE=E7=94=9F?= =?UTF-8?q?=E6=88=90=E4=BB=BB=E5=8A=A1=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/pda/service/PdaServiceImp.java | 8 +- .../src/main/resources/application-druid.yml | 2 +- .../src/main/resources/application.yml | 2 +- .../main/resources/mapper/pda/PdaMapper.xml | 1 + ruoyi-ui/src/lang/en.js | 5202 ++++++++--------- 5 files changed, 2609 insertions(+), 2606 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java index d05fd0a..9ccabfb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java @@ -291,8 +291,8 @@ public class PdaServiceImp implements PdaService { * @param mydoJob * @return */ - - private AjaxResult handleOutType2(TrayCodeMakeSure trayCodeMakeSure, List mydoJobDetailList, MydoJob mydoJob) { + @Transactional(rollbackFor = Exception.class) + public AjaxResult handleOutType2(TrayCodeMakeSure trayCodeMakeSure, List mydoJobDetailList, MydoJob mydoJob) { BasWarehouse basWarehouse = basWarehouseService.selectBasWarehouseByWarehouseId(mydoJob.getWarehouseId()); //修改拣选数量 for (MydoJobDetail mydoJobDetail : mydoJobDetailList) { @@ -348,7 +348,8 @@ public class PdaServiceImp implements PdaService { * @param mydoJob * @return */ - private AjaxResult handleOutType1(TrayCodeMakeSure trayCodeMakeSure, List mydoJobDetailList, MydoJob mydoJob) { + @Transactional(rollbackFor = Exception.class) + public AjaxResult handleOutType1(TrayCodeMakeSure trayCodeMakeSure, List mydoJobDetailList, MydoJob mydoJob) { BasWarehouse basWarehouse = basWarehouseService.selectBasWarehouseByWarehouseId(mydoJob.getWarehouseId()); @@ -482,6 +483,7 @@ public class PdaServiceImp implements PdaService { HashMap map = new HashMap<>(); map.put("v_tray_code", trayCodeMakeSure.getTrayCode()); + map.put("v_entrance_id", getEntranceIdByExitId(mydoJob.getExitId())); //执行【盘点确认出库】过程 pdaMapper.checkMakeSure(map); diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 47f698d..7d99e4b 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -6,7 +6,7 @@ spring: druid: #主数据信息 master: - url: jdbc:sqlserver://172.16.2.170:1433;databaseName=FT501; + url: jdbc:sqlserver://172.16.4.12:1433;databaseName=FT501; username: sa password: Flrd0914. # 从库数据源 diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 7829527..cb0898a 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -68,7 +68,7 @@ spring: # redis 配置 redis: # 地址 - host: 172.16.2.170 + host: 127.0.0.1 # 端口,默认为6379 port: 6379 # 数据库索引 diff --git a/ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml b/ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml index f5a85ca..94bf519 100644 --- a/ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml @@ -73,6 +73,7 @@