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-05-10 16:40:04 +08:00
parent 290bfb9a3a
commit 538d2a5493
2 changed files with 54 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsScanRecord.java
View File

@ -2,7 +2,7 @@
* @Project: emis
* @Title: EmisTmsScanRecord.java
* @author linfso
* @date 2024-04-30 15:10:40
* @date 2024-05-10 08:21:42
* @Copyright: ShangHai Duta 2022 All rights reserved.
* @version v1.0
* @Description: <p> TMS扫描记录 实体类 </p>
@ -26,7 +26,7 @@ import lombok.Data;
* @ClassName EmisTmsScanRecord
* @Description TMS扫描记录
* @author linfso
* @date 2024-04-30 15:10:40
* @date 2024-05-10 08:21:42
*/
@Data
public class EmisTmsScanRecord extends BaseEntity
@ -37,6 +37,8 @@ public class EmisTmsScanRecord extends BaseEntity
private Long id;
/* 运单号 */
private String billCode;
/* 订单号 */
private String orderSn;
/* 扫描类型: 收发到派签 */
private String scanType;
/* 上下一站点 */
@ -70,6 +72,10 @@ public class EmisTmsScanRecord extends BaseEntity
private BigDecimal scanWeight;
/* 重量 */
private BigDecimal weight;
/* 目的网点代码 */
private String destSiteCode;
/* 目的地代码 */
private String destCode;
/* 派件或取件人 */
private String dispatchOrSendMan;
/* 派件或取件人代码 */
@ -93,6 +99,10 @@ public class EmisTmsScanRecord extends BaseEntity
private String recordManPhone;
/* 录入站点代码 */
private String recordSiteCode;
/* 车牌号 */
private String carNo;
/* 合包号 */
private String bagNo;
/* 卡车司机 */
private String truckMan;
/* 卡车司机代码 */
@ -103,9 +113,5 @@ public class EmisTmsScanRecord extends BaseEntity
private String picUrl;
/* 状态 1-启用 0-不启用 */
private String status;
/* 修改站点代码 */
private String updateSite;
/* 创建站点代码 */
private String createSite;
}

46
emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
View File

@ -7,6 +7,7 @@
<resultMap type="EmisTmsScanRecord" id="EmisTmsScanRecordResult">
<result property="id" column="id" />
<result property="billCode" column="bill_code" />
<result property="orderSn" column="order_sn" />
<result property="scanType" column="scan_type" />
<result property="preOrNextStation" column="pre_or_next_station" />
<result property="preOrNextStationCode" column="pre_or_next_station_code" />
@ -23,6 +24,8 @@
<result property="scanSitePhone" column="scan_site_phone" />
<result property="scanWeight" column="scan_weight" />
<result property="weight" column="weight" />
<result property="destSiteCode" column="dest_site_code" />
<result property="destCode" column="dest_code" />
<result property="dispatchOrSendMan" column="dispatch_or_send_man" />
<result property="dispatchOrSendManCode" column="dispatch_or_send_man_code" />
<result property="dispatchOrSendManPhone" column="dispatch_or_send_man_phone" />
@ -34,6 +37,8 @@
<result property="recordManCode" column="record_man_code" />
<result property="recordManPhone" column="record_man_phone" />
<result property="recordSiteCode" column="record_site_code" />
<result property="carNo" column="car_no" />
<result property="bagNo" column="bag_no" />
<result property="truckMan" column="truck_man" />
<result property="truckCode" column="truck_code" />
<result property="dataFrom" column="data_from" />
@ -50,14 +55,15 @@
</resultMap>
<sql id="selectEmisTmsScanRecordVo">
select id, bill_code, scan_type, pre_or_next_station, pre_or_next_station_code, pre_or_next_station_phone, pre_or_next_man_code, pre_or_next_man_phone, scan_date, scan_man_code, scan_man_phone, scan_man, pre_or_next_man, scan_site, scan_site_code, scan_site_phone, scan_weight, weight, dispatch_or_send_man, dispatch_or_send_man_code, dispatch_or_send_man_phone, sign_date, sign_man, sign_site, sign_site_code, record_man, record_man_code, record_man_phone, record_site_code, truck_man, truck_code, data_from, pic_url, status, del_flag, create_by, create_time, update_by, update_time, remark, update_site, create_site from emis_tms_scan_record
select id, bill_code, order_sn, scan_type, pre_or_next_station, pre_or_next_station_code, pre_or_next_station_phone, pre_or_next_man_code, pre_or_next_man_phone, scan_date, scan_man_code, scan_man_phone, scan_man, pre_or_next_man, scan_site, scan_site_code, scan_site_phone, scan_weight, weight, dest_site_code, dest_code, dispatch_or_send_man, dispatch_or_send_man_code, dispatch_or_send_man_phone, sign_date, sign_man, sign_site, sign_site_code, record_man, record_man_code, record_man_phone, record_site_code, car_no, bag_no, truck_man, truck_code, data_from, pic_url, status, del_flag, create_by, create_time, update_by, update_time, remark, update_site, create_site from emis_tms_scan_record
</sql>
<select id="selectEmisTmsScanRecordList" parameterType="EmisTmsScanRecord" resultMap="EmisTmsScanRecordResult">
<include refid="selectEmisTmsScanRecordVo"/>
<where>
<if test="id != null "> and id = #{id}</if>
<if test="billCode != null and billCode != ''"> and bill_code like concat('%', #{billCode}, '%')</if>
<if test="billCode != null and billCode != '' and params.queryType=1 " > and bill_code like concat(#{billCode}, '%')</if>
<if test="orderSn != null and orderSn != '' and params.queryType=2"> and order_sn like concat(#{orderSn}, '%')</if>
<if test="scanType != null and scanType != ''"> and scan_type like concat('%', #{scanType}, '%')</if>
<if test="preOrNextStation != null and preOrNextStation != ''"> and pre_or_next_station like concat('%', #{preOrNextStation}, '%')</if>
<if test="preOrNextStationCode != null and preOrNextStationCode != ''"> and pre_or_next_station_code like concat('%', #{preOrNextStationCode}, '%')</if>
@ -74,6 +80,8 @@
<if test="scanSitePhone != null and scanSitePhone != ''"> and scan_site_phone like concat('%', #{scanSitePhone}, '%')</if>
<if test="scanWeight != null "> and scan_weight like concat('%', #{scanWeight}, '%')</if>
<if test="weight != null "> and weight like concat('%', #{weight}, '%')</if>
<if test="destSiteCode != null and destSiteCode != ''"> and dest_site_code like concat('%', #{destSiteCode}, '%')</if>
<if test="destCode != null and destCode != ''"> and dest_code like concat('%', #{destCode}, '%')</if>
<if test="dispatchOrSendMan != null and dispatchOrSendMan != ''"> and dispatch_or_send_man like concat('%', #{dispatchOrSendMan}, '%')</if>
<if test="dispatchOrSendManCode != null and dispatchOrSendManCode != ''"> and dispatch_or_send_man_code like concat('%', #{dispatchOrSendManCode}, '%')</if>
<if test="dispatchOrSendManPhone != null and dispatchOrSendManPhone != ''"> and dispatch_or_send_man_phone like concat('%', #{dispatchOrSendManPhone}, '%')</if>
@ -85,6 +93,8 @@
<if test="recordManCode != null and recordManCode != ''"> and record_man_code like concat('%', #{recordManCode}, '%')</if>
<if test="recordManPhone != null and recordManPhone != ''"> and record_man_phone like concat('%', #{recordManPhone}, '%')</if>
<if test="recordSiteCode != null and recordSiteCode != ''"> and record_site_code like concat('%', #{recordSiteCode}, '%')</if>
<if test="carNo != null and carNo != ''"> and car_no like concat('%', #{carNo}, '%')</if>
<if test="bagNo != null and bagNo != ''"> and bag_no like concat('%', #{bagNo}, '%')</if>
<if test="truckMan != null and truckMan != ''"> and truck_man like concat('%', #{truckMan}, '%')</if>
<if test="truckCode != null and truckCode != ''"> and truck_code like concat('%', #{truckCode}, '%')</if>
<if test="dataFrom != null and dataFrom != ''"> and data_from like concat('%', #{dataFrom}, '%')</if>
@ -98,12 +108,24 @@
<if test="remark != null and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
<if test="updateSite != null and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
<if test="createSite != null and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
<if test="params.beginScanDate != null and params.beginScanDate != ''">
and scan_date <![CDATA[ >= ]]> #{params.beginScanDate}
</if>
<if test="params.endScanDate != null and params.endScanDate != ''">
and scan_date <![CDATA[ <= ]]> #{params.endScanDate}
</if>
<if test="params.isSubBill != null and params.isSubBill = '1'">
</if>
</where>
order by create_time desc
</select>
<select id="selectEmisTmsScanRecordById" parameterType="Long" resultMap="EmisTmsScanRecordResult">
select id, bill_code, scan_type, pre_or_next_station, pre_or_next_station_code, pre_or_next_station_phone, pre_or_next_man_code, pre_or_next_man_phone, scan_date, scan_man_code, scan_man_phone, scan_man, pre_or_next_man, scan_site, scan_site_code, scan_site_phone, scan_weight, weight, dispatch_or_send_man, dispatch_or_send_man_code, dispatch_or_send_man_phone, sign_date, sign_man, sign_site, sign_site_code, record_man, record_man_code, record_man_phone, record_site_code, truck_man, truck_code, data_from, pic_url, status, del_flag, create_by, create_time, update_by, update_time, remark, update_site, create_site
select id, bill_code, order_sn, scan_type, pre_or_next_station, pre_or_next_station_code, pre_or_next_station_phone, pre_or_next_man_code, pre_or_next_man_phone, scan_date, scan_man_code, scan_man_phone, scan_man, pre_or_next_man, scan_site, scan_site_code, scan_site_phone, scan_weight, weight, dest_site_code, dest_code, dispatch_or_send_man, dispatch_or_send_man_code, dispatch_or_send_man_phone, sign_date, sign_man, sign_site, sign_site_code, record_man, record_man_code, record_man_phone, record_site_code, car_no, bag_no, truck_man, truck_code, data_from, pic_url, status, del_flag, create_by, create_time, update_by, update_time, remark, update_site, create_site
from emis_tms_scan_record a
where a.id = #{id}
</select>
@ -113,6 +135,7 @@
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="billCode != null and billCode != ''">bill_code,</if>
<if test="orderSn != null and orderSn != ''">order_sn,</if>
<if test="scanType != null and scanType != ''">scan_type,</if>
<if test="preOrNextStation != null and preOrNextStation != ''">pre_or_next_station,</if>
<if test="preOrNextStationCode != null and preOrNextStationCode != ''">pre_or_next_station_code,</if>
@ -129,6 +152,8 @@
<if test="scanSitePhone != null and scanSitePhone != ''">scan_site_phone,</if>
<if test="scanWeight != null">scan_weight,</if>
<if test="weight != null">weight,</if>
<if test="destSiteCode != null and destSiteCode != ''">dest_site_code,</if>
<if test="destCode != null and destCode != ''">dest_code,</if>
<if test="dispatchOrSendMan != null and dispatchOrSendMan != ''">dispatch_or_send_man,</if>
<if test="dispatchOrSendManCode != null and dispatchOrSendManCode != ''">dispatch_or_send_man_code,</if>
<if test="dispatchOrSendManPhone != null and dispatchOrSendManPhone != ''">dispatch_or_send_man_phone,</if>
@ -140,6 +165,8 @@
<if test="recordManCode != null and recordManCode != ''">record_man_code,</if>
<if test="recordManPhone != null and recordManPhone != ''">record_man_phone,</if>
<if test="recordSiteCode != null and recordSiteCode != ''">record_site_code,</if>
<if test="carNo != null and carNo != ''">car_no,</if>
<if test="bagNo != null and bagNo != ''">bag_no,</if>
<if test="truckMan != null and truckMan != ''">truck_man,</if>
<if test="truckCode != null and truckCode != ''">truck_code,</if>
<if test="dataFrom != null and dataFrom != ''">data_from,</if>
@ -157,6 +184,7 @@
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="billCode != null and billCode != ''">#{billCode},</if>
<if test="orderSn != null and orderSn != ''">#{orderSn},</if>
<if test="scanType != null and scanType != ''">#{scanType},</if>
<if test="preOrNextStation != null and preOrNextStation != ''">#{preOrNextStation},</if>
<if test="preOrNextStationCode != null and preOrNextStationCode != ''">#{preOrNextStationCode},</if>
@ -173,6 +201,8 @@
<if test="scanSitePhone != null and scanSitePhone != ''">#{scanSitePhone},</if>
<if test="scanWeight != null">#{scanWeight},</if>
<if test="weight != null">#{weight},</if>
<if test="destSiteCode != null and destSiteCode != ''">#{destSiteCode},</if>
<if test="destCode != null and destCode != ''">#{destCode},</if>
<if test="dispatchOrSendMan != null and dispatchOrSendMan != ''">#{dispatchOrSendMan},</if>
<if test="dispatchOrSendManCode != null and dispatchOrSendManCode != ''">#{dispatchOrSendManCode},</if>
<if test="dispatchOrSendManPhone != null and dispatchOrSendManPhone != ''">#{dispatchOrSendManPhone},</if>
@ -184,6 +214,8 @@
<if test="recordManCode != null and recordManCode != ''">#{recordManCode},</if>
<if test="recordManPhone != null and recordManPhone != ''">#{recordManPhone},</if>
<if test="recordSiteCode != null and recordSiteCode != ''">#{recordSiteCode},</if>
<if test="carNo != null and carNo != ''">#{carNo},</if>
<if test="bagNo != null and bagNo != ''">#{bagNo},</if>
<if test="truckMan != null and truckMan != ''">#{truckMan},</if>
<if test="truckCode != null and truckCode != ''">#{truckCode},</if>
<if test="dataFrom != null and dataFrom != ''">#{dataFrom},</if>
@ -203,7 +235,8 @@
<update id="updateEmisTmsScanRecord" parameterType="EmisTmsScanRecord">
update emis_tms_scan_record
<trim prefix="SET" suffixOverrides=",">
<if test="billCode != null and billCode != ''">bill_code = #{billCode},</if>
<if test="billCode != null and billCode != '' ">bill_code = #{billCode},</if>
<if test="orderSn != null and orderSn != '' ">order_sn = #{orderSn},</if>
<if test="scanType != null and scanType != ''">scan_type = #{scanType},</if>
<if test="preOrNextStation != null and preOrNextStation != ''">pre_or_next_station = #{preOrNextStation},</if>
<if test="preOrNextStationCode != null and preOrNextStationCode != ''">pre_or_next_station_code = #{preOrNextStationCode},</if>
@ -220,6 +253,8 @@
<if test="scanSitePhone != null and scanSitePhone != ''">scan_site_phone = #{scanSitePhone},</if>
<if test="scanWeight != null">scan_weight = #{scanWeight},</if>
<if test="weight != null">weight = #{weight},</if>
<if test="destSiteCode != null and destSiteCode != ''">dest_site_code = #{destSiteCode},</if>
<if test="destCode != null and destCode != ''">dest_code = #{destCode},</if>
<if test="dispatchOrSendMan != null and dispatchOrSendMan != ''">dispatch_or_send_man = #{dispatchOrSendMan},</if>
<if test="dispatchOrSendManCode != null and dispatchOrSendManCode != ''">dispatch_or_send_man_code = #{dispatchOrSendManCode},</if>
<if test="dispatchOrSendManPhone != null and dispatchOrSendManPhone != ''">dispatch_or_send_man_phone = #{dispatchOrSendManPhone},</if>
@ -231,6 +266,8 @@
<if test="recordManCode != null and recordManCode != ''">record_man_code = #{recordManCode},</if>
<if test="recordManPhone != null and recordManPhone != ''">record_man_phone = #{recordManPhone},</if>
<if test="recordSiteCode != null and recordSiteCode != ''">record_site_code = #{recordSiteCode},</if>
<if test="carNo != null and carNo != ''">car_no = #{carNo},</if>
<if test="bagNo != null and bagNo != ''">bag_no = #{bagNo},</if>
<if test="truckMan != null and truckMan != ''">truck_man = #{truckMan},</if>
<if test="truckCode != null and truckCode != ''">truck_code = #{truckCode},</if>
<if test="dataFrom != null and dataFrom != ''">data_from = #{dataFrom},</if>
@ -244,6 +281,7 @@
<if test="remark != null and remark != ''">remark = #{remark},</if>
<if test="updateSite != null and updateSite != ''">update_site = #{updateSite},</if>
<if test="createSite != null and createSite != ''">create_site = #{createSite},</if>
</trim>
where id = #{id}
</update>