Browse Source

外箱标签打印功能

master
shenzhouyu 1 month ago
parent
commit
37ddbd4c24
  1. 7
      src/main/java/com/gaotao/modules/customer/controller/ShipmentIssueController.java
  2. 1
      src/main/java/com/gaotao/modules/customer/service/ShipmentIssueService.java
  3. 5
      src/main/java/com/gaotao/modules/customer/service/impl/ShipmentIssueServiceImpl.java
  4. 4
      src/main/resources/application-dev.yml

7
src/main/java/com/gaotao/modules/customer/controller/ShipmentIssueController.java

@ -240,6 +240,13 @@ public class ShipmentIssueController {
return R.ok(); return R.ok();
} }
@PostMapping(value="/getShipmentLine")
@ResponseBody
public R getShipmentLine(@RequestBody ShipmentIssueDto data) {
List<ShipmentLineVo> rows = shipmentIssueService.getShipmentLine(data);
return R.ok().put("rows", rows);
}
@PostMapping(value="/getShipmentAndLineForIssure") @PostMapping(value="/getShipmentAndLineForIssure")
@ResponseBody @ResponseBody
public R getShipmentAndLineForIssure(@RequestBody ShipmentIssueDto data) throws Exception{ public R getShipmentAndLineForIssure(@RequestBody ShipmentIssueDto data) throws Exception{

1
src/main/java/com/gaotao/modules/customer/service/ShipmentIssueService.java

@ -85,6 +85,7 @@ public interface ShipmentIssueService {
List<ShipmentAndShipmentLineVo> getShipmentAndLineForIssure(ShipmentIssueDto data)throws Exception; List<ShipmentAndShipmentLineVo> getShipmentAndLineForIssure(ShipmentIssueDto data)throws Exception;
List<ShipmentLineVo> getShipmentLine(ShipmentIssueDto data);
String saveNewShipmentAndLine(ShipmentIssueNotifyDto data)throws Exception; String saveNewShipmentAndLine(ShipmentIssueNotifyDto data)throws Exception;
} }

5
src/main/java/com/gaotao/modules/customer/service/impl/ShipmentIssueServiceImpl.java

@ -993,4 +993,9 @@ public class ShipmentIssueServiceImpl implements ShipmentIssueService {
return valA.add(valB); return valA.add(valB);
} }
@Override
public List<ShipmentLineVo> getShipmentLine(ShipmentIssueDto data) {
return ifsApiIssueAndReturnService.getShipmentLineVo(data.getSite(), data.getOrderNo());
}
} }

4
src/main/resources/application-dev.yml

@ -4,8 +4,8 @@ spring:
druid: druid:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
type: com.alibaba.druid.pool.DruidDataSource 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://localhost:1433;databaseName=ccl_wms
# url: jdbc:sqlserver://172.19.1.32:1433;databaseName=ccl_wms_prod # url: jdbc:sqlserver://172.19.1.32:1433;databaseName=ccl_wms_prod
username: sa username: sa

Loading…
Cancel
Save