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-12-05 17:08:13 +08:00
parent 680caf47c7
commit 253bd2adfc
2 changed files with 11 additions and 6 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/EmisTmsCostFee.java
View File

@ -41,6 +41,8 @@ public class EmisTmsCostFee extends BaseEntity
private String costNo;
/* 成本名称 */
private String costName;
/* 运输批次号 */
private String batchNo;
/* 成本类型 字典 emis_cost_fee_type */
private String feeType;
/* 分摊类型 1-按重量 2-按体积 3-按票 */
@ -60,7 +62,7 @@ public class EmisTmsCostFee extends BaseEntity
/* 成本费 */
private BigDecimal costFee;
/* 交易时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date tradeDate;
/* 总票数 */
private Integer sendPieceSum;

13
emis-biz/src/main/resources/mapper/EmisTmsCostFeeMapper.xml
View File

@ -8,6 +8,7 @@
<result property="id" column="id" />
<result property="costNo" column="cost_no" />
<result property="costName" column="cost_name" />
<result property="batchNo" column="batch_no" />
<result property="feeType" column="fee_type" />
<result property="splitType" column="split_type" />
<result property="transType" column="trans_type" />
@ -38,7 +39,7 @@
</resultMap>
<sql id="selectEmisTmsCostFeeVo">
select id, cost_no, cost_name, fee_type, split_type, trans_type, trans_sign_no, supplier_code, supplier_name, send_place, dest_place, cost_fee, trade_date, send_piece_sum, piece_number, total_weight, total_volume, bl_confirm_center, real_piece_number, real_total_weight, real_total_volume, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_tms_cost_fee
select id, cost_no, cost_name, batch_no, fee_type, split_type, trans_type, trans_sign_no, supplier_code, supplier_name, send_place, dest_place, cost_fee, trade_date, send_piece_sum, piece_number, total_weight, total_volume, bl_confirm_center, real_piece_number, real_total_weight, real_total_volume, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_tms_cost_fee
</sql>
<select id="selectEmisTmsCostFeeList" parameterType="EmisTmsCostFee" resultMap="EmisTmsCostFeeResult">
@ -49,6 +50,7 @@
<if test="costNo != null and costNo != ''"> and cost_no = #{costNo}</if>
<if test="costName != null and costName != ''"> and cost_name like concat('%', #{costName}, '%')</if>
<if test="feeType != null and feeType != ''"> and fee_type = #{feeType}</if>
<if test="batchNo != null and batchNo != ''"> and batch_no=#{batchNo}</if>
<if test="splitType != null and splitType != ''"> and split_type = #{splitType}</if>
<if test="transType != null and transType != ''"> and trans_type like concat('%', #{transType}, '%')</if>
<if test="transSignNo != null and transSignNo != ''"> and trans_sign_no like concat('%', #{transSignNo}, '%')</if>
@ -132,13 +134,13 @@
</select>
<select id="selectEmisTmsCostFeeById" parameterType="Long" resultMap="EmisTmsCostFeeResult">
select id, cost_no, cost_name, fee_type, split_type, trans_type, trans_sign_no, supplier_code, supplier_name, send_place, dest_place, cost_fee, trade_date, send_piece_sum, piece_number, total_weight, total_volume, bl_confirm_center, real_piece_number, real_total_weight, real_total_volume, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
select id, cost_no, cost_name, batch_no, fee_type, split_type, trans_type, trans_sign_no, supplier_code, supplier_name, send_place, dest_place, cost_fee, trade_date, send_piece_sum, piece_number, total_weight, total_volume, bl_confirm_center, real_piece_number, real_total_weight, real_total_volume, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
from emis_tms_cost_fee a
where a.id = #{id}
</select>
<select id="selectEmisTmsCostFeeByCostNo" parameterType="String" resultMap="EmisTmsCostFeeResult">
select id, cost_no, cost_name, fee_type, split_type, trans_type, trans_sign_no, supplier_code, supplier_name, send_place, dest_place, cost_fee, trade_date, send_piece_sum, piece_number, total_weight, total_volume, bl_confirm_center, real_piece_number, real_total_weight, real_total_volume, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
select id, cost_no, cost_name, batch_no, fee_type, split_type, trans_type, trans_sign_no, supplier_code, supplier_name, send_place, dest_place, cost_fee, trade_date, send_piece_sum, piece_number, total_weight, total_volume, bl_confirm_center, real_piece_number, real_total_weight, real_total_volume, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
from emis_tms_cost_fee a
where a.cost_no = #{costNo}
</select>
@ -146,9 +148,9 @@
<insert id="insertEmisTmsCostFee" parameterType="EmisTmsCostFee" useGeneratedKeys="true" keyProperty="id">
insert into emis_tms_cost_fee
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="costNo != null and costNo != ''">cost_no,</if>
<if test="costName != null and costName != ''">cost_name,</if>
<if test="batchNo != null and batchNo != ''">batch_no,</if>
<if test="feeType != null and feeType != ''">fee_type,</if>
<if test="splitType != null and splitType != ''">split_type,</if>
<if test="transType != null and transType != ''">trans_type,</if>
@ -186,9 +188,9 @@
<if test="updateSite != null and updateSite != ''">update_site,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="costNo != null and costNo != ''">#{costNo},</if>
<if test="costName != null and costName != ''">#{costName},</if>
<if test="batchNo != null and batchNo != ''">#{batchNo},</if>
<if test="feeType != null and feeType != ''">#{feeType},</if>
<if test="splitType != null and splitType != ''">#{splitType},</if>
<if test="transType != null and transType != ''">#{transType},</if>
@ -232,6 +234,7 @@
<trim prefix="SET" suffixOverrides=",">
<if test="costNo != null and costNo != ''">cost_no = #{costNo},</if>
<if test="costName != null and costName != ''">cost_name = #{costName},</if>
<if test="batchNo != null and batchNo != ''">batch_no = #{batchNo},</if>
<if test="feeType != null and feeType != ''">fee_type = #{feeType},</if>
<if test="splitType != null and splitType != ''">split_type = #{splitType},</if>
<if test="transType != null and transType != ''">trans_type = #{transType},</if>