凯和导出对账明细修改

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

@@ -45,9 +45,21 @@ public class ExportFinancial {
     private BigDecimal fAmount;
 
     /**
-     * 运输条款
+     * 起运港运输条款
      */
     private String fServiceitems;
+    /**
+     * 目的港运输条款
+     */
+    private String fServiceitemsNew;
+
+    public String getfServiceitemsNew() {
+        return fServiceitemsNew;
+    }
+
+    public void setfServiceitemsNew(String fServiceitemsNew) {
+        this.fServiceitemsNew = fServiceitemsNew;
+    }
 
     public Long getRankNo() {
         return rankNo;
@@ -142,6 +154,7 @@ public class ExportFinancial {
                 ", fUnitPrice=" + fUnitPrice +
                 ", fAmount=" + fAmount +
                 ", fServiceitems=" + fServiceitems +
+                ", fServiceitemsNew=" + fServiceitemsNew +
                 '}';
     }
 }

ruoyi-warehouse/src/main/java/com/ruoyi/finance/service/impl/TFeeServiceImpl.java

@@ -1929,7 +1929,7 @@ public class TFeeServiceImpl implements ITFeeService {
                         cellValue = list.get(i).getDestinationPort();
                     } else if (j == 4) {
                         //运输条款
-                        cellValue = list.get(i).getfServiceitems();
+                        cellValue = list.get(i).getfServiceitems()+"-"+list.get(i).getfServiceitemsNew();
                     } else if (j == 5) {
                         //货名
                         cellValue = list.get(i).getGoodName();

ruoyi-warehouse/src/main/resources/mapper/finance/TFeeMapper.xml

@@ -2355,7 +2355,8 @@
         tp.specification AS specification,
         ROUND(IFNULL(tp.fUnitPrice,0),2) AS fUnitPrice,
         ROUND(IFNULL(tp.fAmount,0),2) AS fAmount,
-		tp.fServiceitems AS fServiceitems
+		tp.fServiceitems AS fServiceitems,
+		tp.fServiceitemsNew AS fServiceitemsNew
         FROM
         (
             SELECT
@@ -2370,7 +2371,8 @@
 	        ELSE 0
 	        END AS fUnitPrice,
 	        IFNULL(temp.fAmount,0) AS fAmount,
-			sd.dict_label fServiceitems
+			sd.dict_label fServiceitems,
+			si.dict_label fServiceitemsNew
             FROM
             (
                 SELECT
@@ -2392,6 +2394,7 @@
             LEFT JOIN t_cntr tr ON tr.f_id = tc.f_cntrid
             LEFT JOIN t_goods tg ON tc.f_goodsid = tg.f_id
 			LEFT JOIN sys_dict_data sd ON sd.dict_value = tw.f_serviceitems AND sd.dict_type = 'f_serviceitems'
+			LEFT JOIN sys_dict_data si ON si.dict_value = tw.f_serviceitems_new AND si.dict_type = 'f_serviceitemsNew'
         )tp,
         (SELECT @rank:= 0) b
     </select>