From 37ddbd4c24dcdcc7563cde9af896ab285065ff07 Mon Sep 17 00:00:00 2001 From: shenzhouyu Date: Wed, 24 Jun 2026 11:19:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=96=E7=AE=B1=E6=A0=87=E7=AD=BE=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customer/controller/ShipmentIssueController.java | 7 +++++++ .../modules/customer/service/ShipmentIssueService.java | 1 + .../customer/service/impl/ShipmentIssueServiceImpl.java | 5 +++++ src/main/resources/application-dev.yml | 4 ++-- 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gaotao/modules/customer/controller/ShipmentIssueController.java b/src/main/java/com/gaotao/modules/customer/controller/ShipmentIssueController.java index 2a9fca1..2fbcf75 100644 --- a/src/main/java/com/gaotao/modules/customer/controller/ShipmentIssueController.java +++ b/src/main/java/com/gaotao/modules/customer/controller/ShipmentIssueController.java @@ -240,6 +240,13 @@ public class ShipmentIssueController { return R.ok(); } + @PostMapping(value="/getShipmentLine") + @ResponseBody + public R getShipmentLine(@RequestBody ShipmentIssueDto data) { + List rows = shipmentIssueService.getShipmentLine(data); + return R.ok().put("rows", rows); + } + @PostMapping(value="/getShipmentAndLineForIssure") @ResponseBody public R getShipmentAndLineForIssure(@RequestBody ShipmentIssueDto data) throws Exception{ diff --git a/src/main/java/com/gaotao/modules/customer/service/ShipmentIssueService.java b/src/main/java/com/gaotao/modules/customer/service/ShipmentIssueService.java index 3775fc6..ab6b3c8 100644 --- a/src/main/java/com/gaotao/modules/customer/service/ShipmentIssueService.java +++ b/src/main/java/com/gaotao/modules/customer/service/ShipmentIssueService.java @@ -85,6 +85,7 @@ public interface ShipmentIssueService { List getShipmentAndLineForIssure(ShipmentIssueDto data)throws Exception; + List getShipmentLine(ShipmentIssueDto data); String saveNewShipmentAndLine(ShipmentIssueNotifyDto data)throws Exception; } diff --git a/src/main/java/com/gaotao/modules/customer/service/impl/ShipmentIssueServiceImpl.java b/src/main/java/com/gaotao/modules/customer/service/impl/ShipmentIssueServiceImpl.java index 5c658b7..b5a770f 100644 --- a/src/main/java/com/gaotao/modules/customer/service/impl/ShipmentIssueServiceImpl.java +++ b/src/main/java/com/gaotao/modules/customer/service/impl/ShipmentIssueServiceImpl.java @@ -993,4 +993,9 @@ public class ShipmentIssueServiceImpl implements ShipmentIssueService { return valA.add(valB); } + @Override + public List getShipmentLine(ShipmentIssueDto data) { + return ifsApiIssueAndReturnService.getShipmentLineVo(data.getSite(), data.getOrderNo()); + } + } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index fc19b6c..4a2f911 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