From 2ed6ff3704fd0175ef18604996ccd921dbad86b3 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 23 May 2024 21:40:29 +0800
Subject: [PATCH] md

---
 .../erp/web/emis/EmisTmsPackController.java   |  1 +
 .../xdadan/erp/emis/domain/EmisTmsPack.java   |  6 +--
 .../emis/domain/EmisWaybillAttachment.java    |  8 ++-
 .../resources/mapper/EmisTmsPackMapper.xml    | 50 ++++++++++++++++---
 .../mapper/EmisWaybillAttachmentMapper.xml    | 49 ++++++++++++++----
 5 files changed, 91 insertions(+), 23 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsPackController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsPackController.java
index 5abbc20e5..0e3dc43a8 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsPackController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsPackController.java
@@ -71,6 +71,7 @@ public class EmisTmsPackController extends BaseController
     @JacksonFilter(include= {"id","packCode","packName","packDate","twoCode"},value= EmisTmsPack.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
     public TableDataInfo listSimple(EmisTmsPack emisTmsPack)
     {
+//        emisTmsPack.setSendStiteCode();
         startPage();
         List<EmisTmsPack> list = emisTmsPackService.selectEmisTmsPackList(emisTmsPack);
         return getDataTable(list);
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsPack.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsPack.java
index bacecef33..46ad2683c 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsPack.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsPack.java
@@ -2,7 +2,7 @@
  * @Project: emis
  * @Title: EmisTmsPack.java
  * @author linfso
- * @date 2024-05-21 23:43:06
+ * @date 2024-05-23 13:39:08
  * @Copyright: ShangHai Duta 2022 All rights reserved.
  * @version v1.0
  * @Description: <p> TMS合包 实体类 </p>
@@ -26,7 +26,7 @@ import lombok.Data;
  * @ClassName EmisTmsPack
  * @Description TMS合包
  * @author linfso
- * @date 2024-05-21 23:43:06
+ * @date 2024-05-23 13:39:08
  */
 @Data
 public class EmisTmsPack extends BaseEntity
@@ -51,7 +51,7 @@ public class EmisTmsPack extends BaseEntity
     /* 发出网点 */
     private String sendStiteCode;
     /* 下一网点 */
-    private String nextStiteCode;
+    private String nextSiteCode;
     /* 下一目的地 */
     private String nextStation;
     /* 总件数 */
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillAttachment.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillAttachment.java
index c23d02ff7..eabbdd330 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillAttachment.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillAttachment.java
@@ -2,7 +2,7 @@
  * @Project: emis
  * @Title: EmisWaybillAttachment.java
  * @author linfso
- * @date 2024-04-25 09:41:23
+ * @date 2024-05-23 13:33:16
  * @Copyright: ShangHai Duta 2022 All rights reserved.
  * @version v1.0
  * @Description: <p> 运单附件 实体类 </p>
@@ -26,7 +26,7 @@ import lombok.Data;
  * @ClassName EmisWaybillAttachment
  * @Description 运单附件
  * @author linfso
- * @date 2024-04-25 09:41:23
+ * @date 2024-05-23 13:33:16
  */
 @Data
 public class EmisWaybillAttachment extends BaseEntity
@@ -37,12 +37,16 @@ public class EmisWaybillAttachment extends BaseEntity
     private Long id;
     /* 运单id */
     private Long waybillId;
+    /* 运单号 */
+    private String billCode;
     /* 附件类型 1-清关文件 2-揽收底单 3-签收底单 */
     private String attachType;
     /* 文件名称 */
     private String fileName;
     /* 文件地址 */
     private String fileUrl;
+    /* 文件大小KB */
+    private Integer fileSiez;
     /* 文件描述 */
     private String fileDesc;
     /* 排序 */
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsPackMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsPackMapper.xml
index b68198f25..b98484293 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsPackMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsPackMapper.xml
@@ -13,7 +13,7 @@
         <result property="destCountryName"    column="dest_country_name"    />
         <result property="blUnpack"    column="bl_unpack"    />
         <result property="sendStiteCode"    column="send_stite_code"    />
-        <result property="nextStiteCode"    column="next_stite_code"    />
+        <result property="nextSiteCode"    column="next_site_code"    />
         <result property="nextStation"    column="next_station"    />
         <result property="totalParcelQty"    column="total_parcel_qty"    />
         <result property="totalWaybillQty"    column="total_waybill_qty"    />
@@ -38,7 +38,7 @@
     </resultMap>
 
     <sql id="selectEmisTmsPackVo">
-        select id, pack_no, pack_name, pack_date, dest_country, dest_country_name, bl_unpack, send_stite_code, next_stite_code, next_station, total_parcel_qty, total_waybill_qty, total_volume, total_weight, pack_status, ext_data, op_man, ext1, ext2, ext3, ext4, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_tms_pack
+        select id, pack_no, pack_name, pack_date, dest_country, dest_country_name, bl_unpack, send_stite_code, next_site_code, next_station, total_parcel_qty, total_waybill_qty, total_volume, total_weight, pack_status, ext_data, op_man, ext1, ext2, ext3, ext4, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_tms_pack
     </sql>
 
     <select id="selectEmisTmsPackList" parameterType="EmisTmsPack" resultMap="EmisTmsPackResult">
@@ -53,7 +53,7 @@
             <if test="destCountryName != null  and destCountryName != ''"> and dest_country_name like concat('%', #{destCountryName}, '%')</if>
             <if test="blUnpack != null  and blUnpack != ''"> and bl_unpack like concat('%', #{blUnpack}, '%')</if>
             <if test="sendStiteCode != null  and sendStiteCode != ''"> and send_stite_code like concat('%', #{sendStiteCode}, '%')</if>
-            <if test="nextStiteCode != null  and nextStiteCode != ''"> and next_stite_code like concat('%', #{nextStiteCode}, '%')</if>
+            <if test="nextSiteCode != null  and nextSiteCode != ''"> and next_site_code like concat('%', #{nextSiteCode}, '%')</if>
             <if test="nextStation != null  and nextStation != ''"> and next_station like concat('%', #{nextStation}, '%')</if>
             <if test="totalParcelQty != null "> and total_parcel_qty = #{totalParcelQty}</if>
             <if test="totalWaybillQty != null "> and total_waybill_qty = #{totalWaybillQty}</if>
@@ -79,8 +79,44 @@
         order by create_time desc
     </select>
 
+    <select id="checkUnique" parameterType="EmisTmsPack"  resultType="int">
+		select count(1) from  emis_tms_pack
+		where del_flag='0'
+           and id = #{id}
+           and pack_no = #{packNo}
+           and pack_name = #{packName}
+           and pack_date = #{packDate}
+           and dest_country = #{destCountry}
+           and dest_country_name = #{destCountryName}
+           and bl_unpack = #{blUnpack}
+           and send_stite_code = #{sendStiteCode}
+           and next_site_code = #{nextSiteCode}
+           and next_station = #{nextStation}
+           and total_parcel_qty = #{totalParcelQty}
+           and total_waybill_qty = #{totalWaybillQty}
+           and total_volume = #{totalVolume}
+           and total_weight = #{totalWeight}
+           and pack_status = #{packStatus}
+           and ext_data = #{extData}
+           and op_man = #{opMan}
+           and ext1 = #{ext1}
+           and ext2 = #{ext2}
+           and ext3 = #{ext3}
+           and ext4 = #{ext4}
+           and remark = #{remark}
+           and tenant_id = #{tenantId}
+           and del_flag = #{delFlag}
+           and create_by = #{createBy}
+           and create_time = #{createTime}
+           and update_by = #{updateBy}
+           and update_time = #{updateTime}
+           and create_site = #{createSite}
+           and update_site = #{updateSite}
+		limit 1
+	</select>
+
     <select id="selectEmisTmsPackById" parameterType="Long" resultMap="EmisTmsPackResult">
-        select id, pack_no, pack_name, pack_date, dest_country, dest_country_name, bl_unpack, send_stite_code, next_stite_code, next_station, total_parcel_qty, total_waybill_qty, total_volume, total_weight, pack_status, ext_data, op_man, ext1, ext2, ext3, ext4, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
+        select id, pack_no, pack_name, pack_date, dest_country, dest_country_name, bl_unpack, send_stite_code, next_site_code, next_station, total_parcel_qty, total_waybill_qty, total_volume, total_weight, pack_status, ext_data, op_man, ext1, ext2, ext3, ext4, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
         from emis_tms_pack a
         where a.id = #{id}
     </select>
@@ -96,7 +132,7 @@
             <if test="destCountryName != null and destCountryName != ''">dest_country_name,</if>
             <if test="blUnpack != null and blUnpack != ''">bl_unpack,</if>
             <if test="sendStiteCode != null and sendStiteCode != ''">send_stite_code,</if>
-            <if test="nextStiteCode != null and nextStiteCode != ''">next_stite_code,</if>
+            <if test="nextSiteCode != null and nextSiteCode != ''">next_site_code,</if>
             <if test="nextStation != null and nextStation != ''">next_station,</if>
             <if test="totalParcelQty != null">total_parcel_qty,</if>
             <if test="totalWaybillQty != null">total_waybill_qty,</if>
@@ -128,7 +164,7 @@
             <if test="destCountryName != null and destCountryName != ''">#{destCountryName},</if>
             <if test="blUnpack != null and blUnpack != ''">#{blUnpack},</if>
             <if test="sendStiteCode != null and sendStiteCode != ''">#{sendStiteCode},</if>
-            <if test="nextStiteCode != null and nextStiteCode != ''">#{nextStiteCode},</if>
+            <if test="nextSiteCode != null and nextSiteCode != ''">#{nextSiteCode},</if>
             <if test="nextStation != null and nextStation != ''">#{nextStation},</if>
             <if test="totalParcelQty != null">#{totalParcelQty},</if>
             <if test="totalWaybillQty != null">#{totalWaybillQty},</if>
@@ -163,7 +199,7 @@
             <if test="destCountryName != null and destCountryName != ''">dest_country_name = #{destCountryName},</if>
             <if test="blUnpack != null and blUnpack != ''">bl_unpack = #{blUnpack},</if>
             <if test="sendStiteCode != null and sendStiteCode != ''">send_stite_code = #{sendStiteCode},</if>
-            <if test="nextStiteCode != null and nextStiteCode != ''">next_stite_code = #{nextStiteCode},</if>
+            <if test="nextSiteCode != null and nextSiteCode != ''">next_site_code = #{nextSiteCode},</if>
             <if test="nextStation != null and nextStation != ''">next_station = #{nextStation},</if>
             <if test="totalParcelQty != null">total_parcel_qty = #{totalParcelQty},</if>
             <if test="totalWaybillQty != null">total_waybill_qty = #{totalWaybillQty},</if>
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillAttachmentMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillAttachmentMapper.xml
index 739eaf7a3..7f3101936 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillAttachmentMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillAttachmentMapper.xml
@@ -7,9 +7,11 @@
     <resultMap type="EmisWaybillAttachment" id="EmisWaybillAttachmentResult">
         <result property="id"    column="id"    />
         <result property="waybillId"    column="waybill_id"    />
+        <result property="billCode"    column="bill_code"    />
         <result property="attachType"    column="attach_type"    />
         <result property="fileName"    column="file_name"    />
         <result property="fileUrl"    column="file_url"    />
+        <result property="fileSiez"    column="file_siez"    />
         <result property="fileDesc"    column="file_desc"    />
         <result property="orderNum"    column="order_num"    />
         <result property="delFlag"    column="del_flag"    />
@@ -21,7 +23,7 @@
     </resultMap>
 
     <sql id="selectEmisWaybillAttachmentVo">
-        select id, waybill_id, attach_type, file_name, file_url, file_desc, order_num, del_flag, create_by, create_time, update_by, update_time, remark from emis_waybill_attachment
+        select id, waybill_id, bill_code, attach_type, file_name, file_url, file_siez, file_desc, order_num, del_flag, create_by, create_time, update_by, update_time, remark from emis_waybill_attachment
     </sql>
 
     <select id="selectEmisWaybillAttachmentList" parameterType="EmisWaybillAttachment" resultMap="EmisWaybillAttachmentResult">
@@ -30,9 +32,11 @@
             del_flag='0'
             <if test="id != null "> and id = #{id}</if>
             <if test="waybillId != null "> and waybill_id = #{waybillId}</if>
+            <if test="billCode != null  and billCode != ''"> and bill_code like concat('%', #{billCode}, '%')</if>
             <if test="attachType != null  and attachType != ''"> and attach_type like concat('%', #{attachType}, '%')</if>
             <if test="fileName != null  and fileName != ''"> and file_name like concat('%', #{fileName}, '%')</if>
             <if test="fileUrl != null  and fileUrl != ''"> and file_url like concat('%', #{fileUrl}, '%')</if>
+            <if test="fileSiez != null "> and file_siez = #{fileSiez}</if>
             <if test="fileDesc != null  and fileDesc != ''"> and file_desc like concat('%', #{fileDesc}, '%')</if>
             <if test="orderNum != null "> and order_num like concat('%', #{orderNum}, '%')</if>
             <if test="delFlag != null  and delFlag != ''"> and del_flag like concat('%', #{delFlag}, '%')</if>
@@ -45,19 +49,43 @@
         order by create_time desc
     </select>
 
+    <select id="checkUnique" parameterType="EmisWaybillAttachment"  resultType="int">
+		select count(1) from  emis_waybill_attachment
+		where del_flag='0'
+           and id = #{id}
+           and waybill_id = #{waybillId}
+           and bill_code = #{billCode}
+           and attach_type = #{attachType}
+           and file_name = #{fileName}
+           and file_url = #{fileUrl}
+           and file_siez = #{fileSiez}
+           and file_desc = #{fileDesc}
+           and order_num = #{orderNum}
+           and del_flag = #{delFlag}
+           and create_by = #{createBy}
+           and create_time = #{createTime}
+           and update_by = #{updateBy}
+           and update_time = #{updateTime}
+           and remark = #{remark}
+		limit 1
+	</select>
+
     <select id="selectEmisWaybillAttachmentById" parameterType="Long" resultMap="EmisWaybillAttachmentResult">
-        select id, waybill_id, attach_type, file_name, file_url, file_desc, order_num, del_flag, create_by, create_time, update_by, update_time, remark
+        select id, waybill_id, bill_code, attach_type, file_name, file_url, file_siez, file_desc, order_num, del_flag, create_by, create_time, update_by, update_time, remark
         from emis_waybill_attachment a
         where a.id = #{id}
     </select>
 
-    <insert id="insertEmisWaybillAttachment" parameterType="EmisWaybillAttachment">
+    <insert id="insertEmisWaybillAttachment" parameterType="EmisWaybillAttachment" useGeneratedKeys="true" keyProperty="id">
         insert into emis_waybill_attachment
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
             <if test="waybillId != null">waybill_id,</if>
+            <if test="billCode != null and billCode != ''">bill_code,</if>
             <if test="attachType != null and attachType != ''">attach_type,</if>
             <if test="fileName != null and fileName != ''">file_name,</if>
             <if test="fileUrl != null and fileUrl != ''">file_url,</if>
+            <if test="fileSiez != null">file_siez,</if>
             <if test="fileDesc != null and fileDesc != ''">file_desc,</if>
             <if test="orderNum != null">order_num,</if>
             <if test="delFlag != null and delFlag != ''">del_flag,</if>
@@ -68,10 +96,13 @@
             <if test="remark != null and remark != ''">remark,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
             <if test="waybillId != null">#{waybillId},</if>
+            <if test="billCode != null and billCode != ''">#{billCode},</if>
             <if test="attachType != null and attachType != ''">#{attachType},</if>
             <if test="fileName != null and fileName != ''">#{fileName},</if>
             <if test="fileUrl != null and fileUrl != ''">#{fileUrl},</if>
+            <if test="fileSiez != null">#{fileSiez},</if>
             <if test="fileDesc != null and fileDesc != ''">#{fileDesc},</if>
             <if test="orderNum != null">#{orderNum},</if>
             <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
@@ -87,9 +118,11 @@
         update emis_waybill_attachment
         <trim prefix="SET" suffixOverrides=",">
             <if test="waybillId != null">waybill_id = #{waybillId},</if>
+            <if test="billCode != null and billCode != ''">bill_code = #{billCode},</if>
             <if test="attachType != null and attachType != ''">attach_type = #{attachType},</if>
             <if test="fileName != null and fileName != ''">file_name = #{fileName},</if>
             <if test="fileUrl != null and fileUrl != ''">file_url = #{fileUrl},</if>
+            <if test="fileSiez != null">file_siez = #{fileSiez},</if>
             <if test="fileDesc != null and fileDesc != ''">file_desc = #{fileDesc},</if>
             <if test="orderNum != null">order_num = #{orderNum},</if>
             <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
@@ -103,19 +136,13 @@
     </update>
 
     <delete id="deleteEmisWaybillAttachmentById" parameterType="Long">
-        update emis_waybill_attachment set del_flag='1' where id = #{id}
+        delete from emis_waybill_attachment where id = #{id}
     </delete>
 
     <delete id="deleteEmisWaybillAttachmentByIds" parameterType="String">
-        update emis_waybill_attachment set del_flag='1' where id in
+        delete from emis_waybill_attachment where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
-
-
-    <delete id="deleteEmisWaybillAttachmentByWaybillId" parameterType="Long">
-       update emis_waybill_attachment set del_flag='1' where waybill_id = #{waybillId}
-    </delete>
-
 </mapper>
\ No newline at end of file