diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatch.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatch.java
index 36133b7f6..dd7cbc561 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatch.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatch.java
@@ -1,11 +1,11 @@
-/**
+/**
* @Project: emis
* @Title: EmisTmsSiteBatch.java
* @author linfso
- * @date 2024-03-01 08:54:56
+ * @date 2024-06-03 05:43:37
* @Copyright: ShangHai Duta 2022 All rights reserved.
- * @version v1.0
- * @Description: 一级网点TMS组批次 实体类
+ * @version v1.0
+ * @Description: TMS组批次 实体类
*/
package com.xdadan.erp.emis.domain;
@@ -24,23 +24,26 @@ import lombok.Data;
/**
* @ClassName EmisTmsSiteBatch
- * @Description 一级网点TMS组批次
+ * @Description TMS组批次
* @author linfso
- * @date 2024-03-01 08:54:56
+ * @date 2024-06-03 05:43:37
*/
- @Data
+@Data
public class EmisTmsSiteBatch extends BaseEntity
{
private static final long serialVersionUID = 1L;
/* id */
private Long id;
- /* 批次代码 */
- private String batchCode;
+ /* 批次号 */
+ private String batchNo;
/* 批次名称 */
private String batchName;
/* 批次时间 */
- private String batchDate;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date batchDate;
+ /* 批次类型 1-网点组批次 2-总部组批 */
+ private String batchType;
/* 运输方式: 空运 陆运 海运 */
private String transType;
/* 起始网点 */
@@ -50,11 +53,13 @@ public class EmisTmsSiteBatch extends BaseEntity
/* 航空单号 */
private String airBilllNo;
/* 预计出发时间 */
- private String etd;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date etd;
/* 预计到达时间 */
- private String eta;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date eta;
/* 包数 */
- private String packNum;
+ private Integer packNum;
/* 车牌号 */
private String carNo;
/* 船次号 */
@@ -63,9 +68,19 @@ public class EmisTmsSiteBatch extends BaseEntity
private String clearanceResStatus;
/* 报关资料状态 1-清关资料完整 2-清关资料异常 */
private String declareResStatus;
- /* 创建站点代码 */
- private String createSiteCode;
- /* 修改站点代码 */
- private String modifySiteCode;
+ /* 目的国家 */
+ private String destCountry;
+ /* 目的国家名称 */
+ private String destCountryName;
+ /* 总件数 */
+ private Integer totalParcelQty;
+ /* 总运单数 */
+ private Integer totalWaybillQty;
+ /* 总体积 */
+ private BigDecimal totalVolume;
+ /* 总重量 */
+ private BigDecimal totalWeight;
+ /* 操作员 */
+ private String opMan;
}
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatchDtl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatchDtl.java
index 4f04e443c..e6ed3264a 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatchDtl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatchDtl.java
@@ -1,11 +1,11 @@
-/**
+/**
* @Project: emis
* @Title: EmisTmsSiteBatchDtl.java
* @author linfso
- * @date 2024-03-01 08:54:56
+ * @date 2024-06-03 05:44:39
* @Copyright: ShangHai Duta 2022 All rights reserved.
- * @version v1.0
- * @Description: 一级网点TMS组批次明细 实体类
+ * @version v1.0
+ * @Description: TMS组批次明细 实体类
*/
package com.xdadan.erp.emis.domain;
@@ -24,22 +24,31 @@ import lombok.Data;
/**
* @ClassName EmisTmsSiteBatchDtl
- * @Description 一级网点TMS组批次明细
+ * @Description TMS组批次明细
* @author linfso
- * @date 2024-03-01 08:54:56
+ * @date 2024-06-03 05:44:39
*/
- @Data
+@Data
public class EmisTmsSiteBatchDtl extends BaseEntity
{
private static final long serialVersionUID = 1L;
/* id */
private Long id;
- /* 批次号 */
- private Long batchId;
- /* 运单id */
- private Long waybillId;
/* 运单号 */
- private Long billCode;
+ private String billCode;
+ /* 批次代码 */
+ private String batchNo;
+ /* 扫描时间 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date scanDate;
+ /* 扫描状态 1-已扫描 0-未扫描 */
+ private String scanStatus;
+ /* 状态 1-组批 2-拿出 */
+ private String groupStatus;
+ /* 扫描员 */
+ private String scanMan;
+ /* 扫描站点 */
+ private String scanSite;
}
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatchLoading.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatchLoading.java
index 224a30998..64a826cd6 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatchLoading.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatchLoading.java
@@ -1,11 +1,11 @@
-/**
+/**
* @Project: emis
* @Title: EmisTmsSiteBatchLoading.java
* @author linfso
- * @date 2024-03-01 08:54:57
+ * @date 2024-06-03 05:44:54
* @Copyright: ShangHai Duta 2022 All rights reserved.
- * @version v1.0
- * @Description: 一级网点TMS组批次配置 实体类
+ * @version v1.0
+ * @Description: TMS组批次配载 实体类
*/
package com.xdadan.erp.emis.domain;
@@ -24,11 +24,11 @@ import lombok.Data;
/**
* @ClassName EmisTmsSiteBatchLoading
- * @Description 一级网点TMS组批次配置
+ * @Description TMS组批次配载
* @author linfso
- * @date 2024-03-01 08:54:57
+ * @date 2024-06-03 05:44:54
*/
- @Data
+@Data
public class EmisTmsSiteBatchLoading extends BaseEntity
{
private static final long serialVersionUID = 1L;
@@ -36,9 +36,15 @@ public class EmisTmsSiteBatchLoading extends BaseEntity
/* id */
private Long id;
/* 批次号 */
- private Long batchId;
- /* 位置信息 行列 00---05 00-20 3行6列 */
+ private String batchNo;
+ /* 位置编号 行列 00---05 00-20 3行6列 */
private String posNo;
+ /* 行坐标 */
+ private String row;
+ /* 列坐标 */
+ private String col;
+ /* 层坐标 */
+ private String layer;
/* 位置描述 */
private String posDesc;
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
index ebc968f11..f4c1ca4d1 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
@@ -246,11 +246,11 @@
and sign_date #{params.endSignDate}
-
+
and pic_url is not null
-
+
and pic_url is null
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchDtlMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchDtlMapper.xml
index f0b6a2ec1..a72fece77 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchDtlMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchDtlMapper.xml
@@ -1,89 +1,139 @@
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
- select id, batch_id, waybill_id, bill_code, del_flag, create_by, create_time, update_by, update_time, remark from emis_tms_site_batch_dtl
+ select id, bill_code, batch_no, scan_date, scan_status, group_status, scan_man, scan_site, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_tms_site_batch_dtl
-
+
+
+
-
-
+
+
insert into emis_tms_site_batch_dtl
id,
- batch_id,
- waybill_id,
- bill_code,
+ bill_code,
+ batch_no,
+ scan_date,
+ scan_status,
+ group_status,
+ scan_man,
+ scan_site,
+ remark,
+ tenant_id,
del_flag,
create_by,
create_time,
update_by,
update_time,
- remark,
-
+ create_site,
+ update_site,
+
#{id},
- #{batchId},
- #{waybillId},
- #{billCode},
+ #{billCode},
+ #{batchNo},
+ #{scanDate},
+ #{scanStatus},
+ #{groupStatus},
+ #{scanMan},
+ #{scanSite},
+ #{remark},
+ #{tenantId},
#{delFlag},
#{createBy},
#{createTime},
#{updateBy},
#{updateTime},
- #{remark},
-
+ #{createSite},
+ #{updateSite},
+
update emis_tms_site_batch_dtl
- batch_id = #{batchId},
- waybill_id = #{waybillId},
- bill_code = #{billCode},
+ bill_code = #{billCode},
+ batch_no = #{batchNo},
+ scan_date = #{scanDate},
+ scan_status = #{scanStatus},
+ group_status = #{groupStatus},
+ scan_man = #{scanMan},
+ scan_site = #{scanSite},
+ remark = #{remark},
+ tenant_id = #{tenantId},
del_flag = #{delFlag},
create_by = #{createBy},
create_time = #{createTime},
update_by = #{updateBy},
update_time = #{updateTime},
- remark = #{remark},
+ create_site = #{createSite},
+ update_site = #{updateSite},
where id = #{id}
@@ -93,7 +143,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- delete from emis_tms_site_batch_dtl where id in
+ delete from emis_tms_site_batch_dtl where id in
#{id}
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchLoadingMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchLoadingMapper.xml
index 8d807cb3e..34f9d16d5 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchLoadingMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchLoadingMapper.xml
@@ -1,84 +1,133 @@
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
+
-
+
+
+
+
-
- select id, batch_id, pos_no, pos_desc, del_flag, create_by, create_time, update_by, update_time, remark from emis_tms_site_batch_loading
+ select id, batch_no, pos_no, row, col, layer, pos_desc, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_tms_site_batch_loading
-
+
+
+
-
-
+
+
insert into emis_tms_site_batch_loading
id,
- batch_id,
+ batch_no,
pos_no,
+ row,
+ col,
+ layer,
pos_desc,
+ remark,
+ tenant_id,
del_flag,
create_by,
create_time,
update_by,
update_time,
- remark,
-
+ create_site,
+ update_site,
+
#{id},
- #{batchId},
+ #{batchNo},
#{posNo},
+ #{row},
+ #{col},
+ #{layer},
#{posDesc},
+ #{remark},
+ #{tenantId},
#{delFlag},
#{createBy},
#{createTime},
#{updateBy},
#{updateTime},
- #{remark},
-
+ #{createSite},
+ #{updateSite},
+
update emis_tms_site_batch_loading
- batch_id = #{batchId},
+ batch_no = #{batchNo},
pos_no = #{posNo},
+ row = #{row},
+ col = #{col},
+ layer = #{layer},
pos_desc = #{posDesc},
+ remark = #{remark},
+ tenant_id = #{tenantId},
del_flag = #{delFlag},
create_by = #{createBy},
create_time = #{createTime},
update_by = #{updateBy},
update_time = #{updateTime},
- remark = #{remark},
+ create_site = #{createSite},
+ update_site = #{updateSite},
where id = #{id}
@@ -88,7 +137,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- delete from emis_tms_site_batch_loading where id in
+ delete from emis_tms_site_batch_loading where id in
#{id}
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml
index e73f12f9e..2aa0700f1 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml
@@ -1,14 +1,15 @@
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
+
-
+
+
@@ -20,128 +21,209 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-
+
+
+
+
+
+
+
- select id, batch_code, batch_name, batch_date, 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, create_site_code, modify_site_code, del_flag, create_by, create_time, update_by, update_time, remark from emis_tms_site_batch
+ 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
-
+
+
+
-
-
+
+
insert into emis_tms_site_batch
id,
- batch_code,
+ batch_no,
batch_name,
- batch_date,
+ batch_date,
+ batch_type,
trans_type,
start_site_code,
next_site_code,
air_billl_no,
- etd,
- eta,
- pack_num,
+ etd,
+ eta,
+ pack_num,
car_no,
ship_no,
clearance_res_status,
declare_res_status,
- create_site_code,
- modify_site_code,
+ 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,
- remark,
-
+ create_site,
+ update_site,
+
#{id},
- #{batchCode},
+ #{batchNo},
#{batchName},
- #{batchDate},
+ #{batchDate},
+ #{batchType},
#{transType},
#{startSiteCode},
#{nextSiteCode},
#{airBilllNo},
- #{etd},
- #{eta},
- #{packNum},
+ #{etd},
+ #{eta},
+ #{packNum},
#{carNo},
#{shipNo},
#{clearanceResStatus},
#{declareResStatus},
- #{createSiteCode},
- #{modifySiteCode},
+ #{destCountry},
+ #{destCountryName},
+ #{totalParcelQty},
+ #{totalWaybillQty},
+ #{totalVolume},
+ #{totalWeight},
+ #{opMan},
+ #{remark},
+ #{tenantId},
#{delFlag},
#{createBy},
#{createTime},
#{updateBy},
#{updateTime},
- #{remark},
-
+ #{createSite},
+ #{updateSite},
+
update emis_tms_site_batch
- batch_code = #{batchCode},
+ batch_no = #{batchNo},
batch_name = #{batchName},
- batch_date = #{batchDate},
+ batch_date = #{batchDate},
+ batch_type = #{batchType},
trans_type = #{transType},
start_site_code = #{startSiteCode},
next_site_code = #{nextSiteCode},
air_billl_no = #{airBilllNo},
- etd = #{etd},
- eta = #{eta},
- pack_num = #{packNum},
+ etd = #{etd},
+ eta = #{eta},
+ pack_num = #{packNum},
car_no = #{carNo},
ship_no = #{shipNo},
clearance_res_status = #{clearanceResStatus},
declare_res_status = #{declareResStatus},
- create_site_code = #{createSiteCode},
- modify_site_code = #{modifySiteCode},
+ dest_country = #{destCountry},
+ dest_country_name = #{destCountryName},
+ total_parcel_qty = #{totalParcelQty},
+ total_waybill_qty = #{totalWaybillQty},
+ total_volume = #{totalVolume},
+ total_weight = #{totalWeight},
+ op_man = #{opMan},
+ remark = #{remark},
+ tenant_id = #{tenantId},
del_flag = #{delFlag},
create_by = #{createBy},
create_time = #{createTime},
update_by = #{updateBy},
update_time = #{updateTime},
- remark = #{remark},
+ create_site = #{createSite},
+ update_site = #{updateSite},
where id = #{id}
@@ -151,7 +233,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- delete from emis_tms_site_batch where id in
+ delete from emis_tms_site_batch where id in
#{id}