aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-10-13 16:17:36 +08:00
parent c29269f87f
commit 1c371950ac
2 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsCostFeeRel.java
View File

@ -45,6 +45,10 @@ public class EmisTmsCostFeeRel extends BaseEntity
private String splitType;
/* 分摊成本 */
private BigDecimal costFee;
/* 总体积 */
private BigDecimal totalVolume;
/* 实际重量 */
private BigDecimal billWeight;
/* 计算备注 */
private String calcRemark;

41
emis-biz/src/main/resources/mapper/EmisTmsCostFeeRelMapper.xml
View File

@ -11,6 +11,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="feeType" column="fee_type" />
<result property="splitType" column="split_type" />
<result property="costFee" column="cost_fee" />
<result property="totalVolume" column="total_volume" />
<result property="billWeight" column="bill_weight" />
<result property="calcRemark" column="calc_remark" />
</resultMap>
@ -24,19 +26,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectEmisTmsCostFeeRelVo">
select id, cost_no, bill_code, fee_type, split_type, cost_fee, calc_remark, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_tms_cost_fee_rel
select id, cost_no, bill_code, fee_type, split_type, cost_fee, total_volume, bill_weight, calc_remark, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_tms_cost_fee_rel
</sql>
<select id="selectEmisTmsCostFeeRelList" parameterType="EmisTmsCostFeeRel" resultMap="EmisTmsCostFeeRelResult">
<include refid="selectEmisTmsCostFeeRelVo"/>
<where>
del_flag='0'
<where>
del_flag='0'
<if test="id != null "> and id = #{id}</if>
<if test="costNo != null and costNo != ''"> and cost_no like concat('%', #{costNo}, '%')</if>
<if test="billCode != null and billCode != ''"> and bill_code like concat('%', #{billCode}, '%')</if>
<if test="feeType != null and feeType != ''"> and fee_type like concat('%', #{feeType}, '%')</if>
<if test="splitType != null and splitType != ''"> and split_type like concat('%', #{splitType}, '%')</if>
<if test="costFee != null "> and cost_fee = #{costFee}</if>
<if test="totalVolume != null "> and total_volume = #{totalVolume}</if>
<if test="billWeight != null "> and bill_weight = #{billWeight}</if>
<if test="calcRemark != null and calcRemark != ''"> and calc_remark like concat('%', #{calcRemark}, '%')</if>
<if test="remark != null and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
<if test="delFlag != null and delFlag != ''"> and del_flag like concat('%', #{delFlag}, '%')</if>
@ -59,6 +63,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and fee_type = #{feeType}
and split_type = #{splitType}
and cost_fee = #{costFee}
and total_volume = #{totalVolume}
and bill_weight = #{billWeight}
and calc_remark = #{calcRemark}
and remark = #{remark}
and del_flag = #{delFlag}
@ -71,18 +77,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
limit 1
</select>
<select id="selectEmisTmsCostFeeRelById" parameterType="Long" resultMap="EmisTmsCostFeeRelResult">
select id, cost_no, bill_code, fee_type, split_type, cost_fee, total_volume, bill_weight, calc_remark, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
from emis_tms_cost_fee_rel a
where a.id = #{id}
</select>
<select id="selectEmisTmsCostFeeRelListByCostNo" parameterType="String" resultMap="EmisTmsCostFeeRelWithSubBillResult">
select id, cost_no, bill_code, fee_type, split_type, cost_fee, calc_remark, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
select id, cost_no, bill_code, fee_type, split_type, cost_fee, total_volume, bill_weight, calc_remark, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
from emis_tms_cost_fee_rel a
where del_flag='0' and a.cost_no = #{costNo}
</select>
<select id="selectEmisTmsCostFeeRelById" parameterType="Long" resultMap="EmisTmsCostFeeRelResult">
select id, cost_no, bill_code, fee_type, split_type, cost_fee, calc_remark, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
from emis_tms_cost_fee_rel a
where a.id = #{id}
</select>
<insert id="insertEmisTmsCostFeeRel" parameterType="EmisTmsCostFeeRel" useGeneratedKeys="true" keyProperty="id">
insert into emis_tms_cost_fee_rel
<trim prefix="(" suffix=")" suffixOverrides=",">
@ -92,6 +99,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="feeType != null and feeType != ''">fee_type,</if>
<if test="splitType != null and splitType != ''">split_type,</if>
<if test="costFee != null">cost_fee,</if>
<if test="totalVolume != null">total_volume,</if>
<if test="billWeight != null">bill_weight,</if>
<if test="calcRemark != null and calcRemark != ''">calc_remark,</if>
<if test="remark != null and remark != ''">remark,</if>
<if test="delFlag != null and delFlag != ''">del_flag,</if>
@ -101,7 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateTime != null">update_time,</if>
<if test="createSite != null and createSite != ''">create_site,</if>
<if test="updateSite != null and updateSite != ''">update_site,</if>
</trim>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="costNo != null and costNo != ''">#{costNo},</if>
@ -109,6 +118,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="feeType != null and feeType != ''">#{feeType},</if>
<if test="splitType != null and splitType != ''">#{splitType},</if>
<if test="costFee != null">#{costFee},</if>
<if test="totalVolume != null">#{totalVolume},</if>
<if test="billWeight != null">#{billWeight},</if>
<if test="calcRemark != null and calcRemark != ''">#{calcRemark},</if>
<if test="remark != null and remark != ''">#{remark},</if>
<if test="delFlag != null and delFlag != ''">#{delFlag},</if>
@ -118,7 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateTime != null">#{updateTime},</if>
<if test="createSite != null and createSite != ''">#{createSite},</if>
<if test="updateSite != null and updateSite != ''">#{updateSite},</if>
</trim>
</trim>
</insert>
<update id="updateEmisTmsCostFeeRel" parameterType="EmisTmsCostFeeRel">
@ -129,6 +140,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="feeType != null and feeType != ''">fee_type = #{feeType},</if>
<if test="splitType != null and splitType != ''">split_type = #{splitType},</if>
<if test="costFee != null">cost_fee = #{costFee},</if>
<if test="totalVolume != null">total_volume = #{totalVolume},</if>
<if test="billWeight != null">bill_weight = #{billWeight},</if>
<if test="calcRemark != null and calcRemark != ''">calc_remark = #{calcRemark},</if>
<if test="remark != null and remark != ''">remark = #{remark},</if>
<if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
@ -143,11 +156,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</update>
<delete id="deleteEmisTmsCostFeeRelById" parameterType="Long">
delete from emis_tms_cost_fee_rel where id = #{id}
update emis_tms_cost_fee_rel set del_flag='1' where id = #{id}
</delete>
<delete id="deleteEmisTmsCostFeeRelByIds" parameterType="String">
delete from emis_tms_cost_fee_rel where id in
update emis_tms_cost_fee_rel set del_flag='1' where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>