//TODO

/**
* 20210708 dongyongwei
* 新增查询主表ID的逻辑,如果存在,赋值条件给合计金额
* 如果查询不到主表ID,提醒:没有找到符合条件的运价
*/
新增 备注字段传给前端

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/quotation/TSeapriceController.java

@@ -119,6 +119,14 @@ public class TSeapriceController extends BaseController
         if (StringUtils.isNull(tSeaprice.getfQty())) {
             return AjaxResult.error("请维护箱量");
         }
+
+        //TODO
+        /**
+         * 20210708 dongyongwei
+         * 新增查询主表ID的逻辑,如果存在,赋值条件给合计金额
+         * 如果查询不到主表ID,提醒:没有找到符合条件的运价
+         */
+
         return tSeapriceService.calculateOceanFreight(tSeaprice);
     }
 

ruoyi-warehouse/src/main/resources/mapper/quotation/TSeapriceMapper.xml

@@ -142,9 +142,7 @@
     </select>
 
     <select id="selectSeapriceItem" parameterType="TSeaprice" resultType="Map">
-        SELECT f.f_name                                                 fFeeid,
-               IF
-                   (s.f_type = '0', s.${fSpecification}, s.f_unitprice) fUnitprice
+        SELECT f.f_name fFeeid,s.remark remark,IF(s.f_type = '0', s.${fSpecification}, s.f_unitprice) fUnitprice
         FROM t_seaprice t
                  LEFT JOIN t_seapriceitem s ON s.f_pid = t.f_id
                  LEFT JOIN t_fees f ON f.f_id = s.f_feeid