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-22 07:29:50 +08:00
parent d3bb49c768
commit 0823c8e39e
4 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsPack.java
View File

@ -2,7 +2,7 @@
* @Project: emis * @Project: emis
* @Title: EmisTmsPack.java * @Title: EmisTmsPack.java
* @author linfso * @author linfso
* @date 2024-05-21 23:08:30 * @date 2024-05-21 23:28:34
* @Copyright: ShangHai Duta 2022 All rights reserved. * @Copyright: ShangHai Duta 2022 All rights reserved.
* @version v1.0 * @version v1.0
* @Description: <p> TMS合包 实体类 </p> * @Description: <p> TMS合包 实体类 </p>
@ -26,7 +26,7 @@ import lombok.Data;
* @ClassName EmisTmsPack * @ClassName EmisTmsPack
* @Description TMS合包 * @Description TMS合包
* @author linfso * @author linfso
* @date 2024-05-21 23:08:30 * @date 2024-05-21 23:28:34
*/ */
@Data @Data
public class EmisTmsPack extends BaseEntity public class EmisTmsPack extends BaseEntity
@ -64,6 +64,8 @@ public class EmisTmsPack extends BaseEntity
private String packStatus; private String packStatus;
/* 扩展数据 */ /* 扩展数据 */
private String extData; private String extData;
/* 操作员 */
private String opMan;
/* ext1 */ /* ext1 */
private String ext1; private String ext1;
/* ext2 */ /* ext2 */

6
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsPackDtl.java
View File

@ -2,7 +2,7 @@
* @Project: emis * @Project: emis
* @Title: EmisTmsPackDtl.java * @Title: EmisTmsPackDtl.java
* @author linfso * @author linfso
* @date 2024-05-21 23:09:55 * @date 2024-05-21 23:29:08
* @Copyright: ShangHai Duta 2022 All rights reserved. * @Copyright: ShangHai Duta 2022 All rights reserved.
* @version v1.0 * @version v1.0
* @Description: <p> TMS合包明细 实体类 </p> * @Description: <p> TMS合包明细 实体类 </p>
@ -26,7 +26,7 @@ import lombok.Data;
* @ClassName EmisTmsPackDtl * @ClassName EmisTmsPackDtl
* @Description TMS合包明细 * @Description TMS合包明细
* @author linfso * @author linfso
* @date 2024-05-21 23:09:55 * @date 2024-05-21 23:29:08
*/ */
@Data @Data
public class EmisTmsPackDtl extends BaseEntity public class EmisTmsPackDtl extends BaseEntity
@ -46,5 +46,7 @@ public class EmisTmsPackDtl extends BaseEntity
private String scanStatus; private String scanStatus;
/* 状态 1-合包 2-拆包 */ /* 状态 1-合包 2-拆包 */
private String packStatus; private String packStatus;
/* 扫描员 */
private String scanMan;
} }

9
emis-biz/src/main/resources/mapper/EmisTmsPackDtlMapper.xml
View File

@ -11,6 +11,7 @@
<result property="scanDate" column="scan_date" /> <result property="scanDate" column="scan_date" />
<result property="scanStatus" column="scan_status" /> <result property="scanStatus" column="scan_status" />
<result property="packStatus" column="pack_status" /> <result property="packStatus" column="pack_status" />
<result property="scanMan" column="scan_man" />
<result property="remark" column="remark" /> <result property="remark" column="remark" />
<result property="tenantId" column="tenant_id" /> <result property="tenantId" column="tenant_id" />
<result property="delFlag" column="del_flag" /> <result property="delFlag" column="del_flag" />
@ -23,7 +24,7 @@
</resultMap> </resultMap>
<sql id="selectEmisTmsPackDtlVo"> <sql id="selectEmisTmsPackDtlVo">
select id, pack_no, bill_code, scan_date, scan_status, pack_status, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_tms_pack_dtl select id, pack_no, bill_code, scan_date, scan_status, pack_status, scan_man, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_tms_pack_dtl
</sql> </sql>
<select id="selectEmisTmsPackDtlList" parameterType="EmisTmsPackDtl" resultMap="EmisTmsPackDtlResult"> <select id="selectEmisTmsPackDtlList" parameterType="EmisTmsPackDtl" resultMap="EmisTmsPackDtlResult">
@ -36,6 +37,7 @@
<if test="scanDate != null "> and scan_date = #{scanDate}</if> <if test="scanDate != null "> and scan_date = #{scanDate}</if>
<if test="scanStatus != null and scanStatus != ''"> and scan_status like concat('%', #{scanStatus}, '%')</if> <if test="scanStatus != null and scanStatus != ''"> and scan_status like concat('%', #{scanStatus}, '%')</if>
<if test="packStatus != null and packStatus != ''"> and pack_status like concat('%', #{packStatus}, '%')</if> <if test="packStatus != null and packStatus != ''"> and pack_status like concat('%', #{packStatus}, '%')</if>
<if test="scanMan != null and scanMan != ''"> and scan_man like concat('%', #{scanMan}, '%')</if>
<if test="remark != null and remark != ''"> and remark like concat('%', #{remark}, '%')</if> <if test="remark != null and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
<if test="tenantId != null and tenantId != ''"> and tenant_id like concat('%', #{tenantId}, '%')</if> <if test="tenantId != null and tenantId != ''"> and tenant_id like concat('%', #{tenantId}, '%')</if>
<if test="delFlag != null and delFlag != ''"> and del_flag like concat('%', #{delFlag}, '%')</if> <if test="delFlag != null and delFlag != ''"> and del_flag like concat('%', #{delFlag}, '%')</if>
@ -50,7 +52,7 @@
</select> </select>
<select id="selectEmisTmsPackDtlById" parameterType="Long" resultMap="EmisTmsPackDtlResult"> <select id="selectEmisTmsPackDtlById" parameterType="Long" resultMap="EmisTmsPackDtlResult">
select id, pack_no, bill_code, scan_date, scan_status, pack_status, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site select id, pack_no, bill_code, scan_date, scan_status, pack_status, scan_man, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
from emis_tms_pack_dtl a from emis_tms_pack_dtl a
where a.id = #{id} where a.id = #{id}
</select> </select>
@ -64,6 +66,7 @@
<if test="scanDate != null">scan_date,</if> <if test="scanDate != null">scan_date,</if>
<if test="scanStatus != null and scanStatus != ''">scan_status,</if> <if test="scanStatus != null and scanStatus != ''">scan_status,</if>
<if test="packStatus != null and packStatus != ''">pack_status,</if> <if test="packStatus != null and packStatus != ''">pack_status,</if>
<if test="scanMan != null and scanMan != ''">scan_man,</if>
<if test="remark != null and remark != ''">remark,</if> <if test="remark != null and remark != ''">remark,</if>
<if test="tenantId != null and tenantId != ''">tenant_id,</if> <if test="tenantId != null and tenantId != ''">tenant_id,</if>
<if test="delFlag != null and delFlag != ''">del_flag,</if> <if test="delFlag != null and delFlag != ''">del_flag,</if>
@ -81,6 +84,7 @@
<if test="scanDate != null">#{scanDate},</if> <if test="scanDate != null">#{scanDate},</if>
<if test="scanStatus != null and scanStatus != ''">#{scanStatus},</if> <if test="scanStatus != null and scanStatus != ''">#{scanStatus},</if>
<if test="packStatus != null and packStatus != ''">#{packStatus},</if> <if test="packStatus != null and packStatus != ''">#{packStatus},</if>
<if test="scanMan != null and scanMan != ''">#{scanMan},</if>
<if test="remark != null and remark != ''">#{remark},</if> <if test="remark != null and remark != ''">#{remark},</if>
<if test="tenantId != null and tenantId != ''">#{tenantId},</if> <if test="tenantId != null and tenantId != ''">#{tenantId},</if>
<if test="delFlag != null and delFlag != ''">#{delFlag},</if> <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
@ -101,6 +105,7 @@
<if test="scanDate != null">scan_date = #{scanDate},</if> <if test="scanDate != null">scan_date = #{scanDate},</if>
<if test="scanStatus != null and scanStatus != ''">scan_status = #{scanStatus},</if> <if test="scanStatus != null and scanStatus != ''">scan_status = #{scanStatus},</if>
<if test="packStatus != null and packStatus != ''">pack_status = #{packStatus},</if> <if test="packStatus != null and packStatus != ''">pack_status = #{packStatus},</if>
<if test="scanMan != null and scanMan != ''">scan_man = #{scanMan},</if>
<if test="remark != null and remark != ''">remark = #{remark},</if> <if test="remark != null and remark != ''">remark = #{remark},</if>
<if test="tenantId != null and tenantId != ''">tenant_id = #{tenantId},</if> <if test="tenantId != null and tenantId != ''">tenant_id = #{tenantId},</if>
<if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if> <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>

9
emis-biz/src/main/resources/mapper/EmisTmsPackMapper.xml
View File

@ -20,6 +20,7 @@
<result property="totalWeight" column="total_weight" /> <result property="totalWeight" column="total_weight" />
<result property="packStatus" column="pack_status" /> <result property="packStatus" column="pack_status" />
<result property="extData" column="ext_data" /> <result property="extData" column="ext_data" />
<result property="opMan" column="op_man" />
<result property="ext1" column="ext1" /> <result property="ext1" column="ext1" />
<result property="ext2" column="ext2" /> <result property="ext2" column="ext2" />
<result property="ext3" column="ext3" /> <result property="ext3" column="ext3" />
@ -36,7 +37,7 @@
</resultMap> </resultMap>
<sql id="selectEmisTmsPackVo"> <sql id="selectEmisTmsPackVo">
select id, pack_no, pack_name, pack_date, dest_country, dest_country_name, bl_unpack, next_station, next_stite_code, total_parcel_qty, total_waybill_qty, total_volume, total_weight, pack_status, ext_data, 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, next_station, next_stite_code, 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> </sql>
<select id="selectEmisTmsPackList" parameterType="EmisTmsPack" resultMap="EmisTmsPackResult"> <select id="selectEmisTmsPackList" parameterType="EmisTmsPack" resultMap="EmisTmsPackResult">
@ -58,6 +59,7 @@
<if test="totalWeight != null "> and total_weight = #{totalWeight}</if> <if test="totalWeight != null "> and total_weight = #{totalWeight}</if>
<if test="packStatus != null and packStatus != ''"> and pack_status like concat('%', #{packStatus}, '%')</if> <if test="packStatus != null and packStatus != ''"> and pack_status like concat('%', #{packStatus}, '%')</if>
<if test="extData != null and extData != ''"> and ext_data like concat('%', #{extData}, '%')</if> <if test="extData != null and extData != ''"> and ext_data like concat('%', #{extData}, '%')</if>
<if test="opMan != null and opMan != ''"> and op_man like concat('%', #{opMan}, '%')</if>
<if test="ext1 != null and ext1 != ''"> and ext1 like concat('%', #{ext1}, '%')</if> <if test="ext1 != null and ext1 != ''"> and ext1 like concat('%', #{ext1}, '%')</if>
<if test="ext2 != null and ext2 != ''"> and ext2 like concat('%', #{ext2}, '%')</if> <if test="ext2 != null and ext2 != ''"> and ext2 like concat('%', #{ext2}, '%')</if>
<if test="ext3 != null and ext3 != ''"> and ext3 like concat('%', #{ext3}, '%')</if> <if test="ext3 != null and ext3 != ''"> and ext3 like concat('%', #{ext3}, '%')</if>
@ -76,7 +78,7 @@
</select> </select>
<select id="selectEmisTmsPackById" parameterType="Long" resultMap="EmisTmsPackResult"> <select id="selectEmisTmsPackById" parameterType="Long" resultMap="EmisTmsPackResult">
select id, pack_no, pack_name, pack_date, dest_country, dest_country_name, bl_unpack, next_station, next_stite_code, total_parcel_qty, total_waybill_qty, total_volume, total_weight, pack_status, ext_data, 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, next_station, next_stite_code, 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 from emis_tms_pack a
where a.id = #{id} where a.id = #{id}
</select> </select>
@ -99,6 +101,7 @@
<if test="totalWeight != null">total_weight,</if> <if test="totalWeight != null">total_weight,</if>
<if test="packStatus != null and packStatus != ''">pack_status,</if> <if test="packStatus != null and packStatus != ''">pack_status,</if>
<if test="extData != null and extData != ''">ext_data,</if> <if test="extData != null and extData != ''">ext_data,</if>
<if test="opMan != null and opMan != ''">op_man,</if>
<if test="ext1 != null and ext1 != ''">ext1,</if> <if test="ext1 != null and ext1 != ''">ext1,</if>
<if test="ext2 != null and ext2 != ''">ext2,</if> <if test="ext2 != null and ext2 != ''">ext2,</if>
<if test="ext3 != null and ext3 != ''">ext3,</if> <if test="ext3 != null and ext3 != ''">ext3,</if>
@ -129,6 +132,7 @@
<if test="totalWeight != null">#{totalWeight},</if> <if test="totalWeight != null">#{totalWeight},</if>
<if test="packStatus != null and packStatus != ''">#{packStatus},</if> <if test="packStatus != null and packStatus != ''">#{packStatus},</if>
<if test="extData != null and extData != ''">#{extData},</if> <if test="extData != null and extData != ''">#{extData},</if>
<if test="opMan != null and opMan != ''">#{opMan},</if>
<if test="ext1 != null and ext1 != ''">#{ext1},</if> <if test="ext1 != null and ext1 != ''">#{ext1},</if>
<if test="ext2 != null and ext2 != ''">#{ext2},</if> <if test="ext2 != null and ext2 != ''">#{ext2},</if>
<if test="ext3 != null and ext3 != ''">#{ext3},</if> <if test="ext3 != null and ext3 != ''">#{ext3},</if>
@ -162,6 +166,7 @@
<if test="totalWeight != null">total_weight = #{totalWeight},</if> <if test="totalWeight != null">total_weight = #{totalWeight},</if>
<if test="packStatus != null and packStatus != ''">pack_status = #{packStatus},</if> <if test="packStatus != null and packStatus != ''">pack_status = #{packStatus},</if>
<if test="extData != null and extData != ''">ext_data = #{extData},</if> <if test="extData != null and extData != ''">ext_data = #{extData},</if>
<if test="opMan != null and opMan != ''">op_man = #{opMan},</if>
<if test="ext1 != null and ext1 != ''">ext1 = #{ext1},</if> <if test="ext1 != null and ext1 != ''">ext1 = #{ext1},</if>
<if test="ext2 != null and ext2 != ''">ext2 = #{ext2},</if> <if test="ext2 != null and ext2 != ''">ext2 = #{ext2},</if>
<if test="ext3 != null and ext3 != ''">ext3 = #{ext3},</if> <if test="ext3 != null and ext3 != ''">ext3 = #{ext3},</if>