凯和单航次配船查询

ruoyi-admin/src/main/java/com/ruoyi/web/controller/shipping/controller/KHUpdateOrderMessage.java

@@ -7,8 +7,10 @@ package com.ruoyi.web.controller.shipping.controller;
  */
 
 import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.ServletUtils;
 import com.ruoyi.common.utils.StringUtils;
@@ -16,6 +18,7 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.framework.web.service.TokenService;
 import com.ruoyi.shipping.domain.TAddress;
+import com.ruoyi.shipping.excel.singleVoyageByShipExcel;
 import com.ruoyi.warehouseBusiness.domain.TWarehouseBills;
 import com.ruoyi.warehouseBusiness.service.ITWarehouseBillsService;
 import lombok.extern.slf4j.Slf4j;
@@ -30,7 +33,7 @@ import java.util.List;
 @Slf4j
 @RestController
 @RequestMapping("/khwarehouse/updateOrderMessage")
-public class KHUpdateOrderMessage {
+public class KHUpdateOrderMessage extends BaseController {
     @Autowired
     private ITWarehouseBillsService tWarehousebillsService;
 
@@ -95,6 +98,18 @@ public class KHUpdateOrderMessage {
         return tWarehousebillsService.deleteOrder(tWarehouseBills,loginUser);
     }
 
+    /**
+     * 凯和单航次配船
+     * @param tWarehouseBills
+     * @return
+     */
+    @GetMapping("/singleVoyageByShip")
+    public TableDataInfo singleVoyageByShip (TWarehouseBills tWarehouseBills){
+        startPage();
+        List<singleVoyageByShipExcel> singleVoyageByShipExcels = tWarehousebillsService.singleVoyageByShip(tWarehouseBills);
+        return getDataTable(singleVoyageByShipExcels);
+    }
+
 }
 
 

ruoyi-shipping/src/main/java/com/ruoyi/shipping/excel/singleVoyageByShipExcel.java

@@ -0,0 +1,96 @@
+package com.ruoyi.shipping.excel;
+
+import com.ruoyi.common.annotation.Excel;
+
+import java.util.Date;
+
+/**
+ * 凯和单航次配船
+ */
+public class singleVoyageByShipExcel {
+
+    private static final long serialVersionUID = 1L;
+    @Excel(name = "船名")
+    private String vslName;
+    @Excel(name = "航次")
+    private String voyNo;
+    @Excel(name = "开船日期")
+    private Date fAtd;
+    @Excel(name = "到港日期")
+    private Date fAta;
+    @Excel(name = "航线")
+    private String fName;
+    @Excel(name = "装港")
+    private String loadportName;
+    @Excel(name = "卸港")
+    private String destportName;
+
+    public String getVslName() {
+        return vslName;
+    }
+
+    public void setVslName(String vslName) {
+        this.vslName = vslName;
+    }
+
+    public String getVoyNo() {
+        return voyNo;
+    }
+
+    public void setVoyNo(String voyNo) {
+        this.voyNo = voyNo;
+    }
+
+    public Date getfAtd() {
+        return fAtd;
+    }
+
+    public void setfAtd(Date fAtd) {
+        this.fAtd = fAtd;
+    }
+
+    public Date getfAta() {
+        return fAta;
+    }
+
+    public void setfAta(Date fAta) {
+        this.fAta = fAta;
+    }
+
+    public String getfName() {
+        return fName;
+    }
+
+    public void setfName(String fName) {
+        this.fName = fName;
+    }
+
+    public String getLoadportName() {
+        return loadportName;
+    }
+
+    public void setLoadportName(String loadportName) {
+        this.loadportName = loadportName;
+    }
+
+    public String getDestportName() {
+        return destportName;
+    }
+
+    public void setDestportName(String destportName) {
+        this.destportName = destportName;
+    }
+
+    @Override
+    public String toString() {
+        return "singleVoyageByShipExcel{" +
+                "vslName='" + vslName + '\'' +
+                ", voyNo='" + voyNo + '\'' +
+                ", fAtd=" + fAtd +
+                ", fAta=" + fAta +
+                ", fName='" + fName + '\'' +
+                ", loadportName='" + loadportName + '\'' +
+                ", destportName='" + destportName + '\'' +
+                '}';
+    }
+}

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/mapper/TWarehouseBillsMapper.java

@@ -9,6 +9,7 @@ import com.ruoyi.reportManagement.domain.SingleAnalysisFeesExcel;
 import com.ruoyi.reportManagement.domain.TWareHouseItemsExcel;
 import com.ruoyi.reportManagement.dto.TWarehousebill;
 import com.ruoyi.shipping.excel.deriveInventoryExcel;
+import com.ruoyi.shipping.excel.singleVoyageByShipExcel;
 import com.ruoyi.warehouseBusiness.domain.TWareHouseExcelItems;
 import com.ruoyi.warehouseBusiness.domain.TWarehouseBills;
 import org.apache.ibatis.annotations.Param;
@@ -220,4 +221,11 @@ public interface TWarehouseBillsMapper extends BaseMapper<TWarehouseBills> {
     public int updateTWarehousebillsByIds(@Param("fIds") Long[] fIds,
                                           @Param("fVessel") Long fVessel,
                                           @Param("fVoyage") Long fVoyage);
+
+    /**
+     * 凯和单航次配船
+     * @param tWarehouseBills 主表
+     * @return
+     */
+    public List<singleVoyageByShipExcel> singleVoyageByShip(TWarehouseBills tWarehouseBills);
 }

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/ITWarehouseBillsService.java

@@ -4,6 +4,7 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.reportManagement.domain.TWareHouseItemsExcel;
 import com.ruoyi.reportManagement.dto.TWarehousebill;
+import com.ruoyi.shipping.excel.singleVoyageByShipExcel;
 import com.ruoyi.system.domain.SysCheckCode;
 import com.ruoyi.warehouseBusiness.domain.StorageChargeInsert;
 import com.ruoyi.warehouseBusiness.domain.TWareHouseExcelItems;
@@ -544,4 +545,10 @@ public interface ITWarehouseBillsService {
      * @return 结果
      */
     public int updateKaHeOrder(TWarehouseBills tWarehousebills);
+    /**
+     * 凯和单航次配船
+     * @param tWarehouseBills 主表
+     * @return
+     */
+    public List<singleVoyageByShipExcel> singleVoyageByShip(TWarehouseBills tWarehouseBills);
 }

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseBillsServiceImpl.java

@@ -31,6 +31,7 @@ import com.ruoyi.reportManagement.mapper.TWhgenlegMapper;
 import com.ruoyi.shipping.domain.*;
 import com.ruoyi.shipping.excel.TWarehousebillsCntritemsExcel;
 import com.ruoyi.shipping.excel.deriveInventoryExcel;
+import com.ruoyi.shipping.excel.singleVoyageByShipExcel;
 import com.ruoyi.shipping.mapper.*;
 import com.ruoyi.system.domain.SysCheckCode;
 import com.ruoyi.system.domain.SysConfig;
@@ -5269,6 +5270,11 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         return tWarehouseBillsMapper.updateKaHeOrder(tWarehousebills);
     }
 
+    @Override
+    public List<singleVoyageByShipExcel> singleVoyageByShip(TWarehouseBills tWarehouseBills) {
+        return tWarehouseBillsMapper.singleVoyageByShip(tWarehouseBills);
+    }
+
     private String getAbsoluteFile(String fileName) {
         String downloadPath = RuoYiConfig.getDownloadPath() + fileName;
         File desc = new File(downloadPath);

ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehousebillsMapper.xml

@@ -2552,5 +2552,45 @@
             #{fId}
         </foreach>
     </update>
+    <!--凯和单航次配船-->
+    <select id="singleVoyageByShip" parameterType="TWarehousebills" resultType="com.ruoyi.shipping.excel.singleVoyageByShipExcel">
+       SELECT
+        tv.f_name vslName,
+        ty.f_no voyNo,
+				ty.f_ATD fAtd,
+				ty.f_ATA fAta,
+				ta.f_name fName,
+        tre.f_name loadportName,
+        ts.f_name  destportName
+
+        FROM
+        t_warehousebills tw
+        LEFT JOIN t_address ta ON ta.f_id = tw.f_laneid
+        LEFT JOIN t_address tre ON tre.f_id = tw.f_loadportid
+        LEFT JOIN t_address ts ON ts.f_id = tw.f_destportid
+        LEFT JOIN sys_dict_data sd ON sd.dict_value = tw.f_serviceitems
+        AND sd.dict_type = 'f_serviceitems'
+        LEFT JOIN t_vessel tv ON tw.f_vslid = tv.f_id
+        LEFT JOIN t_voyage ty ON tw.f_voyid = ty.f_id
+        LEFT JOIN t_corps tp ON tw.f_corpid = tp.f_id
+        LEFT JOIN (
+        SELECT
+        th.f_pid,
+        th.f_cntrcount,
+        tr.f_no,
+        th.f_cntrid,
+        tg.f_name
+        FROM
+        t_warehousebills_cntr th
+        LEFT JOIN t_cntr tr ON th.f_cntrid = tr.f_id
+        LEFT JOIN t_goods tg ON th.f_goodsid = tg.f_id
+        ) tc ON tc.f_pid = tw.f_id
+        LEFT JOIN (SELECT f_pid,f_billstatus FROM t_warehousebillsfees GROUP BY f_pid,f_billstatus)tf ON tf.f_pid = tw.f_id
+        where
+            tw.f_typeid = '1'
+            and tw.del_flag = '0'
+        <if test="fVslid != null ">and tw.f_vslid = #{fVslid}</if>
+        <if test="fVoyid != null ">and tw.f_voyid = #{fVoyid}</if>
+    </select>
 
 </mapper>