From b8f1d1b01d007fa74c4b37793a694bbc3bc697a1 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Mon, 28 Apr 2025 09:40:50 +0800 Subject: [PATCH] =?UTF-8?q?demand:=201.=E6=96=B0=E5=A2=9E=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=B5=B7=E8=BF=90=E7=BD=91=E7=82=B9=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20=20=202.=E6=9F=A5=E8=AF=A2=E8=BF=90?= =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8=E3=80=81=E6=9F=A5=E8=AF=A2=E8=BF=90?= =?UTF-8?q?=E5=8D=95=E8=AF=A6=E6=83=85=E8=BF=94=E5=9B=9E=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=B5=B7=E8=BF=90=E6=B8=AF=E5=90=8D=E7=A7=B0=E3=80=81=E7=9B=AE?= =?UTF-8?q?=E7=9A=84=E6=B8=AF=E5=90=8D=E7=A7=B0=20committer:=20heyu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xdadan/erp/web/emis/EmisSiteController.java | 14 ++++++++++++++ .../erp/web/emis/EmisWarehouseInController.java | 2 +- .../com/xdadan/erp/emis/domain/EmisWaybill.java | 8 ++++++++ .../xdadan/erp/emis/domain/vo/WaybillOrder.java | 10 ++++++++++ .../com/xdadan/erp/emis/mapper/EmisSiteMapper.java | 8 ++++++++ .../xdadan/erp/emis/service/IEmisSiteService.java | 8 ++++++++ .../erp/emis/service/impl/EmisSiteServiceImpl.java | 7 +++++++ .../src/main/resources/mapper/EmisSiteMapper.xml | 11 +++++++++++ .../main/resources/mapper/EmisWaybillMapper.xml | 8 ++++++++ 9 files changed, 75 insertions(+), 1 deletion(-) diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteController.java index bc60fc72f..94ee043f5 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteController.java @@ -91,6 +91,20 @@ public class EmisSiteController extends EmisBaseController return getDataTable(list); } + /** + * 查询海运网点 + */ + @PreAuthorize("@ss.hasPermi('emis:emisSite:listSeaWay')") + @JacksonFilter(include= {"id","siteCode","siteName","siteNameEn","parentSiteCode","province","provinceName","sizeCode2","sizeCode3"},value=EmisSite.class,type= JacksonFilter.JscksonFilterType.RESPONSE) + @GetMapping("/listSeaWay") + public TableDataInfo listSeaWay(EmisSite emisSite) + { + startPage(); + + List list = emisSiteService.selectSeaWaySiteList(emisSite); + return getDataTable(list); + } + /** * 导出网点列表 diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWarehouseInController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWarehouseInController.java index 8fc5379a9..8904da3ec 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWarehouseInController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWarehouseInController.java @@ -213,7 +213,7 @@ public class EmisWarehouseInController extends EmisBaseController /** * 导出进仓单详细信息 */ - @PreAuthorize("@ss.hasPermi('emis:exportWarehouseInInfo:export')") + @PreAuthorize("@ss.hasPermi('emis:emisWarehouseIn:exportWarehouseInInfo')") @Log(title = "导出进仓单详细信息", businessType = BusinessType.EXPORT) @PostMapping("/exportWarehouseInInfo") public void exportWarehouseInInfo(HttpServletResponse response, @RequestBody List inNos) { diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java index 9197fad63..73bd785d6 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java @@ -696,6 +696,14 @@ public class EmisWaybill extends BaseEntity @DataAuditField(fieldComment = "目的港") private String destinationPort; + @TableField(exist = false) + @DataAuditField(fieldComment = "起运港名称") + private String departurePortName; + + @TableField(exist = false) + @DataAuditField(fieldComment = "目的港名称") + private String destinationPortName; + @TableField @DataAuditField(fieldComment = "箱量") private String boxQuantity; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java index 671095a0f..7432882b2 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java @@ -379,6 +379,14 @@ public class WaybillOrder implements Serializable { /* 目的港 */ private String destinationPort; + @TableField(exist = false) + @DataAuditField(fieldComment = "起运港名称") + private String departurePortName; + + @TableField(exist = false) + @DataAuditField(fieldComment = "目的港名称") + private String destinationPortName; + /* 箱量 */ private String boxQuantity; @@ -680,6 +688,8 @@ public class WaybillOrder implements Serializable { voItem.setCompanyCode(dbWaybill.getCompanyCode()); voItem.setDeparturePort(dbWaybill.getDeparturePort()); voItem.setDestinationPort(dbWaybill.getDestinationPort()); + voItem.setDeparturePortName(dbWaybill.getDeparturePortName()); + voItem.setDestinationPortName(dbWaybill.getDestinationPortName()); voItem.setBoxQuantity(dbWaybill.getBoxQuantity()); return voItem; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSiteMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSiteMapper.java index 60ee330ff..66d72464f 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSiteMapper.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSiteMapper.java @@ -85,4 +85,12 @@ public interface EmisSiteMapper extends BaseMapper * @return 结果 */ public int deleteEmisSiteByIds(Long[] ids); + + /** + * 查询海运网点列表 + * + * @param emisSite + * @return + */ + List selectSeaWaySiteList(EmisSite emisSite); } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSiteService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSiteService.java index a9b5abbea..a1f640672 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSiteService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSiteService.java @@ -76,4 +76,12 @@ public interface IEmisSiteService * @return 结果 */ public int deleteEmisSiteById(Long id); + + /** + * 查询海运网点 + * + * @param emisSite 网点 + * @return 海运网点 + */ + List selectSeaWaySiteList(EmisSite emisSite); } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSiteServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSiteServiceImpl.java index 9d92f34e6..37c00412c 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSiteServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSiteServiceImpl.java @@ -186,4 +186,11 @@ public class EmisSiteServiceImpl extends EmisBaseService implements IEmisSiteSer return emisSiteMapper.deleteEmisSiteById(id); } + @Override + public List selectSeaWaySiteList(EmisSite emisSite) { + emisSite.setStatus("1"); + emisSite.setTransTypeId("4"); + return emisSiteMapper.selectSeaWaySiteList(emisSite); + } + } diff --git a/emis-biz/src/main/resources/mapper/EmisSiteMapper.xml b/emis-biz/src/main/resources/mapper/EmisSiteMapper.xml index 4413abb49..2ba9c5c69 100644 --- a/emis-biz/src/main/resources/mapper/EmisSiteMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisSiteMapper.xml @@ -307,6 +307,17 @@ + +