From 70c55e091bfcdf64c7fb870a39336276b017b8de Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 30 Apr 2024 22:52:23 +0800
Subject: [PATCH] md

---
 .../erp/emis/domain/EmisTmsScanRecord.java    | 16 +++----
 .../mapper/EmisTmsScanRecordMapper.xml        | 42 +++++++++----------
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsScanRecord.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsScanRecord.java
index 7af370271..97cf973d1 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsScanRecord.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsScanRecord.java
@@ -1,10 +1,10 @@
-/** 
+/**
  * @Project: emis
  * @Title: EmisTmsScanRecord.java
  * @author linfso
- * @date 2024-03-01 08:54:59
+ * @date 2024-04-30 14:46:25
  * @Copyright: ShangHai Duta 2022 All rights reserved.
- * @version v1.0  
+ * @version v1.0
  * @Description: <p> TMS扫描记录 实体类 </p>
  */
 
@@ -26,9 +26,9 @@ import lombok.Data;
  * @ClassName EmisTmsScanRecord
  * @Description TMS扫描记录
  * @author linfso
- * @date 2024-03-01 08:54:59
+ * @date 2024-04-30 14:46:25
  */
- @Data
+@Data
 public class EmisTmsScanRecord extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -96,9 +96,9 @@ public class EmisTmsScanRecord extends BaseEntity
     private String picUrl;
     /* 状态 1-启用 0-不启用 */
     private String status;
-    /* 创建站点代码 */
-    private String createSiteCode;
     /* 修改站点代码 */
-    private String modifySiteCode;
+    private String updateSite;
+    /* 创建站点代码 */
+    private String createSite;
 
 }
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
index db6a6dfcc..9aef7b602 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xdadan.erp.emis.mapper.EmisTmsScanRecordMapper">
-    
+
     <resultMap type="EmisTmsScanRecord" id="EmisTmsScanRecordResult">
         <result property="id"    column="id"    />
         <result property="billCode"    column="bill_code"    />
@@ -36,23 +36,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="dataFrom"    column="data_from"    />
         <result property="picUrl"    column="pic_url"    />
         <result property="status"    column="status"    />
-        <result property="createSiteCode"    column="create_site_code"    />
-        <result property="modifySiteCode"    column="modify_site_code"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="remark"    column="remark"    />
+        <result property="updateSite"    column="update_site"    />
+        <result property="createSite"    column="create_site"    />
     </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_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_code, record_man_phone, record_site_code, truck_man, truck_code, data_from, pic_url, status, create_site_code, modify_site_code, del_flag, create_by, create_time, update_by, update_time, remark from emis_tms_scan_record
+        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_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_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
     </sql>
 
     <select id="selectEmisTmsScanRecordList" parameterType="EmisTmsScanRecord" resultMap="EmisTmsScanRecordResult">
         <include refid="selectEmisTmsScanRecordVo"/>
-        <where>  
+        <where>
             <if test="id != null "> and id = #{id}</if>
             <if test="billCode != null  and billCode != ''"> and bill_code like concat('%', #{billCode}, '%')</if>
             <if test="scanType != null  and scanType != ''"> and scan_type like concat('%', #{scanType}, '%')</if>
@@ -84,24 +84,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="dataFrom != null  and dataFrom != ''"> and data_from like concat('%', #{dataFrom}, '%')</if>
             <if test="picUrl != null  and picUrl != ''"> and pic_url like concat('%', #{picUrl}, '%')</if>
             <if test="status != null  and status != ''"> and status like concat('%', #{status}, '%')</if>
-            <if test="createSiteCode != null  and createSiteCode != ''"> and create_site_code like concat('%', #{createSiteCode}, '%')</if>
-            <if test="modifySiteCode != null  and modifySiteCode != ''"> and modify_site_code like concat('%', #{modifySiteCode}, '%')</if>
             <if test="delFlag != null  and delFlag != ''"> and del_flag like concat('%', #{delFlag}, '%')</if>
             <if test="createBy != null  and createBy != ''"> and create_by like concat('%', #{createBy}, '%')</if>
             <if test="createTime != null "> and create_time = #{createTime}</if>
             <if test="updateBy != null  and updateBy != ''"> and update_by like concat('%', #{updateBy}, '%')</if>
             <if test="updateTime != null "> and update_time = #{updateTime}</if>
             <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>
         </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_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_code, record_man_phone, record_site_code, truck_man, truck_code, data_from, pic_url, status, create_site_code, modify_site_code, del_flag, create_by, create_time, update_by, update_time, remark 
+        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_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_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 a
         where a.id = #{id}
     </select>
-        
+
     <insert id="insertEmisTmsScanRecord" parameterType="EmisTmsScanRecord">
         insert into emis_tms_scan_record
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -136,15 +136,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="dataFrom != null and dataFrom != ''">data_from,</if>
             <if test="picUrl != null and picUrl != ''">pic_url,</if>
             <if test="status != null and status != ''">status,</if>
-            <if test="createSiteCode != null and createSiteCode != ''">create_site_code,</if>
-            <if test="modifySiteCode != null and modifySiteCode != ''">modify_site_code,</if>
             <if test="delFlag != null and delFlag != ''">del_flag,</if>
             <if test="createBy != null and createBy != ''">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null and updateBy != ''">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null and remark != ''">remark,</if>
-         </trim>
+            <if test="updateSite != null and updateSite != ''">update_site,</if>
+            <if test="createSite != null and createSite != ''">create_site,</if>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="billCode != null and billCode != ''">#{billCode},</if>
@@ -177,15 +177,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="dataFrom != null and dataFrom != ''">#{dataFrom},</if>
             <if test="picUrl != null and picUrl != ''">#{picUrl},</if>
             <if test="status != null and status != ''">#{status},</if>
-            <if test="createSiteCode != null and createSiteCode != ''">#{createSiteCode},</if>
-            <if test="modifySiteCode != null and modifySiteCode != ''">#{modifySiteCode},</if>
             <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
             <if test="createBy != null and createBy != ''">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null and updateBy != ''">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null and remark != ''">#{remark},</if>
-         </trim>
+            <if test="updateSite != null and updateSite != ''">#{updateSite},</if>
+            <if test="createSite != null and createSite != ''">#{createSite},</if>
+        </trim>
     </insert>
 
     <update id="updateEmisTmsScanRecord" parameterType="EmisTmsScanRecord">
@@ -221,14 +221,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="dataFrom != null and dataFrom != ''">data_from = #{dataFrom},</if>
             <if test="picUrl != null and picUrl != ''">pic_url = #{picUrl},</if>
             <if test="status != null and status != ''">status = #{status},</if>
-            <if test="createSiteCode != null and createSiteCode != ''">create_site_code = #{createSiteCode},</if>
-            <if test="modifySiteCode != null and modifySiteCode != ''">modify_site_code = #{modifySiteCode},</if>
             <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
             <if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <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>
@@ -238,7 +238,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteEmisTmsScanRecordByIds" parameterType="String">
-        delete from emis_tms_scan_record where id in 
+        delete from emis_tms_scan_record where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>