demand: 1.新增查询海运网点列表接口 2.查询运单列表、查询运单详情返回增加起运港名称、目的港名称

committer: heyu

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<EmisSite> list = emisSiteService.selectSeaWaySiteList(emisSite);
+        return getDataTable(list);
+    }
+
 
     /**
      * 导出网点列表

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<String> inNos) {

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;

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;

emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSiteMapper.java

@@ -85,4 +85,12 @@ public interface EmisSiteMapper extends BaseMapper<EmisSite>
      * @return 结果
      */
     public int deleteEmisSiteByIds(Long[] ids);
+
+    /**
+     * 查询海运网点列表
+     *
+     * @param emisSite
+     * @return
+     */
+    List<EmisSite> selectSeaWaySiteList(EmisSite emisSite);
 }

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<EmisSite> selectSeaWaySiteList(EmisSite emisSite);
 }

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<EmisSite> selectSeaWaySiteList(EmisSite emisSite) {
+        emisSite.setStatus("1");
+        emisSite.setTransTypeId("4");
+        return emisSiteMapper.selectSeaWaySiteList(emisSite);
+    }
+
 }

emis-biz/src/main/resources/mapper/EmisSiteMapper.xml

@@ -307,6 +307,17 @@
 
     </select>
 
+    <select id="selectSeaWaySiteList" parameterType="EmisSite" resultMap="EmisSiteResult">
+        <include refid="selectEmisSiteVo"/>
+        <where>
+            del_flag='0'
+            <if test="status != null  and status != ''"> and status like concat('%', #{status}, '%')</if>
+            <if test="siteCode != null  and siteCode != ''">and site_code=#{siteCode}</if>
+            <if test="transTypeId != null  and transTypeId != ''">and trans_type_id like concat('%', #{transTypeId}, '%')</if>
+        </where>
+        ORDER BY id desc
+    </select>
+
     <!--            <if test="parentSiteCode != null  and parentSiteCode != ''"> and parent_site_code = #{parentSiteCode}</if>-->
     <select id="selectEmisSiteListAsWarehouse" parameterType="EmisSite" resultType="map">
         select

emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml

@@ -175,6 +175,8 @@
         <result property="companyCode"    column="company_code"    />
         <result property="departurePort"    column="departure_port"    />
         <result property="destinationPort"    column="destination_port"    />
+        <result property="departurePortName"    column="departure_port_name"    />
+        <result property="destinationPortName"    column="destination_port_name"    />
         <result property="boxQuantity"    column="box_quantity"    />
 
         <!-- 扩展属性 -->
@@ -306,6 +308,7 @@
             a.remark, a.del_flag, a.create_by,
             a.create_time, a.update_by, a.update_time, a.create_site, a.update_site,
             a.cod_fee_desc, a.lading_bill_code, a.company_code, a.departure_port, a.destination_port, a.box_quantity,
+            seaway1.site_name as departure_port_name,seaway2.site_name as destination_port_name,
 
             b.name as receive_country_name,c.name as send_country_name,
             d.region_name as receive_province_name,e.region_name as receive_city_name,f.region_name as receive_county_name,
@@ -367,6 +370,8 @@
           left join emis_site a1 on a.send_center_code=a1.site_code and a1.del_flag='0'
           left join emis_site a2 on a.destination_center_code=a2.site_code and a2.del_flag='0'
           left join emis_customer_user a3 on a.customer_code=a3.customer_code and a3.del_flag='0'
+          left join emis_site seaway1 on a.departure_port=seaway1.site_code and seaway1.del_flag='0'
+          left join emis_site seaway2 on a.destination_port=seaway2.site_code and seaway2.del_flag='0'
 
     </sql>
 
@@ -402,6 +407,7 @@
             a.remark, a.del_flag, a.create_by,
             a.create_time, a.update_by, a.update_time, a.create_site, a.update_site,
             a.cod_fee_desc, a.lading_bill_code, a.company_code, a.departure_port, a.destination_port, a.box_quantity,
+            seaway1.site_name as departure_port_name,seaway2.site_name as destination_port_name,
 
             b.name as receive_country_name,c.name as send_country_name,
             d.region_name as receive_province_name,e.region_name as receive_city_name,f.region_name as receive_county_name,
@@ -464,6 +470,8 @@
           left join emis_site a1 on a.send_center_code=a1.site_code and a1.del_flag='0'
           left join emis_site a2 on a.destination_center_code=a2.site_code and a2.del_flag='0'
           left join emis_customer_user a3 on a.customer_code=a3.customer_code and a3.del_flag='0'
+          left join emis_site seaway1 on a.departure_port=seaway1.site_code and seaway1.del_flag='0'
+          left join emis_site seaway2 on a.destination_port=seaway2.site_code and seaway2.del_flag='0'
 
     </sql>