md
This commit is contained in:
linfso
parent
8512e18e1f
commit
5752e8658a
@ -2,7 +2,7 @@
|
||||
* @Project: emis
|
||||
* @Title: EmisTmsSiteBatch.java
|
||||
* @author linfso
|
||||
* @date 2024-06-03 05:43:37
|
||||
* @date 2024-06-07 04:52:26
|
||||
* @Copyright: ShangHai Duta 2022 All rights reserved.
|
||||
* @version v1.0
|
||||
* @Description: <p> TMS组批次 实体类 </p>
|
||||
@ -26,7 +26,7 @@ import lombok.Data;
|
||||
* @ClassName EmisTmsSiteBatch
|
||||
* @Description TMS组批次
|
||||
* @author linfso
|
||||
* @date 2024-06-03 05:43:37
|
||||
* @date 2024-06-07 04:52:26
|
||||
*/
|
||||
@Data
|
||||
public class EmisTmsSiteBatch extends BaseEntity
|
||||
@ -42,12 +42,17 @@ public class EmisTmsSiteBatch extends BaseEntity
|
||||
/* 批次时间 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date batchDate;
|
||||
/* 所属线路 */
|
||||
private String transLineType;
|
||||
/* 所属产品 */
|
||||
private String productType;
|
||||
/* 批次类型 1-网点组批次 2-总部组批 */
|
||||
private String batchType;
|
||||
/* 运输方式: 空运 陆运 海运 */
|
||||
private String transType;
|
||||
/* 起始网点 */
|
||||
private String startSiteCode;
|
||||
|
||||
/* 下一网点 */
|
||||
private String nextSiteCode;
|
||||
/* 航空单号 */
|
||||
@ -70,8 +75,7 @@ public class EmisTmsSiteBatch extends BaseEntity
|
||||
private String declareResStatus;
|
||||
/* 目的国家 */
|
||||
private String destCountry;
|
||||
/* 目的国家名称 */
|
||||
private String destCountryName;
|
||||
|
||||
/* 总件数 */
|
||||
private Integer totalParcelQty;
|
||||
/* 总运单数 */
|
||||
@ -83,4 +87,13 @@ public class EmisTmsSiteBatch extends BaseEntity
|
||||
/* 操作员 */
|
||||
private String opMan;
|
||||
|
||||
|
||||
//-- 扩展数据 ------------------------
|
||||
|
||||
private String transLineTypeName;
|
||||
private String productTypeName;
|
||||
/* 发件国家 目的国家名称 */
|
||||
private String sendCountryName;
|
||||
private String destCountryName;
|
||||
|
||||
}
|
||||
|
||||
@ -22,7 +22,7 @@ import org.apache.ibatis.annotations.CacheNamespace;
|
||||
* @author linfso
|
||||
* @date 2023-12-14 13:02:46
|
||||
*/
|
||||
//@CacheNamespace(implementation= MybatisRedisCache.class,eviction=MybatisRedisCache.class)
|
||||
@CacheNamespace(implementation= MybatisRedisCache.class,eviction=MybatisRedisCache.class)
|
||||
public interface EmisSiteMapper extends BaseMapper<EmisSite>
|
||||
{
|
||||
/**
|
||||
|
||||
@ -9,9 +9,12 @@
|
||||
<result property="batchNo" column="batch_no" />
|
||||
<result property="batchName" column="batch_name" />
|
||||
<result property="batchDate" column="batch_date" />
|
||||
<result property="transLineType" column="trans_line_type" />
|
||||
<result property="productType" column="product_type" />
|
||||
<result property="batchType" column="batch_type" />
|
||||
<result property="transType" column="trans_type" />
|
||||
<result property="startSiteCode" column="start_site_code" />
|
||||
|
||||
<result property="nextSiteCode" column="next_site_code" />
|
||||
<result property="airBilllNo" column="air_billl_no" />
|
||||
<result property="etd" column="etd" />
|
||||
@ -22,16 +25,27 @@
|
||||
<result property="clearanceResStatus" column="clearance_res_status" />
|
||||
<result property="declareResStatus" column="declare_res_status" />
|
||||
<result property="destCountry" column="dest_country" />
|
||||
<result property="destCountryName" column="dest_country_name" />
|
||||
|
||||
<result property="totalParcelQty" column="total_parcel_qty" />
|
||||
<result property="totalWaybillQty" column="total_waybill_qty" />
|
||||
<result property="totalVolume" column="total_volume" />
|
||||
<result property="totalWeight" column="total_weight" />
|
||||
<result property="opMan" column="op_man" />
|
||||
|
||||
<association property="productTypeName" column="product_type" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectProdNameByCode"/>
|
||||
<association property="transLineTypeName" column="trans_line_type" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectLineNameByCode"/>
|
||||
|
||||
<!-- 个性化查询 -->
|
||||
<!-- <result property="destCountryName" column="dest_country_name" />-->
|
||||
<!-- <result property="sendCountry" column="send_country" />-->
|
||||
|
||||
<association property="sendCountryName" column="trans_line_type" select="selectFromCountryNameByLineCode"/>
|
||||
<association property="destCountryName" column="dest_country" select="selectCountryNameByCode"/>
|
||||
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectEmisTmsSiteBatchVo">
|
||||
select id, batch_no, batch_name, batch_date, batch_type, trans_type, start_site_code, next_site_code, air_billl_no, etd, eta, pack_num, car_no, ship_no, clearance_res_status, declare_res_status, dest_country, dest_country_name, total_parcel_qty, total_waybill_qty, total_volume, total_weight, op_man, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_tms_site_batch
|
||||
select id, batch_no, batch_name, batch_date, trans_line_type, product_type, batch_type, trans_type, start_site_code, send_country, next_site_code, air_billl_no, etd, eta, pack_num, car_no, ship_no, clearance_res_status, declare_res_status, dest_country, dest_country_name, total_parcel_qty, total_waybill_qty, total_volume, total_weight, op_man, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_tms_site_batch
|
||||
</sql>
|
||||
|
||||
<select id="selectEmisTmsSiteBatchList" parameterType="EmisTmsSiteBatch" resultMap="EmisTmsSiteBatchResult">
|
||||
@ -42,9 +56,12 @@
|
||||
<if test="batchNo != null and batchNo != ''"> and batch_no like concat('%', #{batchNo}, '%')</if>
|
||||
<if test="batchName != null and batchName != ''"> and batch_name like concat('%', #{batchName}, '%')</if>
|
||||
<if test="batchDate != null "> and batch_date = #{batchDate}</if>
|
||||
<if test="transLineType != null and transLineType != ''"> and trans_line_type like concat('%', #{transLineType}, '%')</if>
|
||||
<if test="productType != null and productType != ''"> and product_type like concat('%', #{productType}, '%')</if>
|
||||
<if test="batchType != null and batchType != ''"> and batch_type like concat('%', #{batchType}, '%')</if>
|
||||
<if test="transType != null and transType != ''"> and trans_type like concat('%', #{transType}, '%')</if>
|
||||
<if test="startSiteCode != null and startSiteCode != ''"> and start_site_code like concat('%', #{startSiteCode}, '%')</if>
|
||||
<if test="sendCountry != null and sendCountry != ''"> and send_country like concat('%', #{sendCountry}, '%')</if>
|
||||
<if test="nextSiteCode != null and nextSiteCode != ''"> and next_site_code like concat('%', #{nextSiteCode}, '%')</if>
|
||||
<if test="airBilllNo != null and airBilllNo != ''"> and air_billl_no like concat('%', #{airBilllNo}, '%')</if>
|
||||
<if test="etd != null "> and etd = #{etd}</if>
|
||||
@ -81,9 +98,12 @@
|
||||
and batch_no = #{batchNo}
|
||||
and batch_name = #{batchName}
|
||||
and batch_date = #{batchDate}
|
||||
and trans_line_type = #{transLineType}
|
||||
and product_type = #{productType}
|
||||
and batch_type = #{batchType}
|
||||
and trans_type = #{transType}
|
||||
and start_site_code = #{startSiteCode}
|
||||
and send_country = #{sendCountry}
|
||||
and next_site_code = #{nextSiteCode}
|
||||
and air_billl_no = #{airBilllNo}
|
||||
and etd = #{etd}
|
||||
@ -113,7 +133,7 @@
|
||||
</select>
|
||||
|
||||
<select id="selectEmisTmsSiteBatchById" parameterType="Long" resultMap="EmisTmsSiteBatchResult">
|
||||
select id, batch_no, batch_name, batch_date, batch_type, trans_type, start_site_code, next_site_code, air_billl_no, etd, eta, pack_num, car_no, ship_no, clearance_res_status, declare_res_status, dest_country, dest_country_name, total_parcel_qty, total_waybill_qty, total_volume, total_weight, op_man, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
|
||||
select id, batch_no, batch_name, batch_date, trans_line_type, product_type, batch_type, trans_type, start_site_code, send_country, next_site_code, air_billl_no, etd, eta, pack_num, car_no, ship_no, clearance_res_status, declare_res_status, dest_country, dest_country_name, total_parcel_qty, total_waybill_qty, total_volume, total_weight, op_man, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
|
||||
from emis_tms_site_batch a
|
||||
where a.id = #{id}
|
||||
</select>
|
||||
@ -125,9 +145,12 @@
|
||||
<if test="batchNo != null and batchNo != ''">batch_no,</if>
|
||||
<if test="batchName != null and batchName != ''">batch_name,</if>
|
||||
<if test="batchDate != null">batch_date,</if>
|
||||
<if test="transLineType != null and transLineType != ''">trans_line_type,</if>
|
||||
<if test="productType != null and productType != ''">product_type,</if>
|
||||
<if test="batchType != null and batchType != ''">batch_type,</if>
|
||||
<if test="transType != null and transType != ''">trans_type,</if>
|
||||
<if test="startSiteCode != null and startSiteCode != ''">start_site_code,</if>
|
||||
<if test="sendCountry != null and sendCountry != ''">send_country,</if>
|
||||
<if test="nextSiteCode != null and nextSiteCode != ''">next_site_code,</if>
|
||||
<if test="airBilllNo != null and airBilllNo != ''">air_billl_no,</if>
|
||||
<if test="etd != null">etd,</if>
|
||||
@ -159,9 +182,12 @@
|
||||
<if test="batchNo != null and batchNo != ''">#{batchNo},</if>
|
||||
<if test="batchName != null and batchName != ''">#{batchName},</if>
|
||||
<if test="batchDate != null">#{batchDate},</if>
|
||||
<if test="transLineType != null and transLineType != ''">#{transLineType},</if>
|
||||
<if test="productType != null and productType != ''">#{productType},</if>
|
||||
<if test="batchType != null and batchType != ''">#{batchType},</if>
|
||||
<if test="transType != null and transType != ''">#{transType},</if>
|
||||
<if test="startSiteCode != null and startSiteCode != ''">#{startSiteCode},</if>
|
||||
<if test="sendCountry != null and sendCountry != ''">#{sendCountry},</if>
|
||||
<if test="nextSiteCode != null and nextSiteCode != ''">#{nextSiteCode},</if>
|
||||
<if test="airBilllNo != null and airBilllNo != ''">#{airBilllNo},</if>
|
||||
<if test="etd != null">#{etd},</if>
|
||||
@ -196,9 +222,12 @@
|
||||
<if test="batchNo != null and batchNo != ''">batch_no = #{batchNo},</if>
|
||||
<if test="batchName != null and batchName != ''">batch_name = #{batchName},</if>
|
||||
<if test="batchDate != null">batch_date = #{batchDate},</if>
|
||||
<if test="transLineType != null and transLineType != ''">trans_line_type = #{transLineType},</if>
|
||||
<if test="productType != null and productType != ''">product_type = #{productType},</if>
|
||||
<if test="batchType != null and batchType != ''">batch_type = #{batchType},</if>
|
||||
<if test="transType != null and transType != ''">trans_type = #{transType},</if>
|
||||
<if test="startSiteCode != null and startSiteCode != ''">start_site_code = #{startSiteCode},</if>
|
||||
<if test="sendCountry != null and sendCountry != ''">send_country = #{sendCountry},</if>
|
||||
<if test="nextSiteCode != null and nextSiteCode != ''">next_site_code = #{nextSiteCode},</if>
|
||||
<if test="airBilllNo != null and airBilllNo != ''">air_billl_no = #{airBilllNo},</if>
|
||||
<if test="etd != null">etd = #{etd},</if>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user