diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisElectronicPag.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisElectronicPag.java
index bee4d42a1..7e0d3ec32 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisElectronicPag.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisElectronicPag.java
@@ -1,10 +1,10 @@
-/**
+/**
* @Project: emis
* @Title: EmisElectronicPag.java
* @author linfso
- * @date 2024-03-01 10:49:49
+ * @date 2024-03-28 03:40:50
* @Copyright: ShangHai Duta 2022 All rights reserved.
- * @version v1.0
+ * @version v1.0
* @Description:
电子面单 实体类
*/
@@ -26,9 +26,9 @@ import lombok.Data;
* @ClassName EmisElectronicPag
* @Description 电子面单
* @author linfso
- * @date 2024-03-01 10:49:49
+ * @date 2024-03-28 03:40:50
*/
- @Data
+@Data
public class EmisElectronicPag extends BaseEntity
{
private static final long serialVersionUID = 1L;
@@ -40,13 +40,13 @@ public class EmisElectronicPag extends BaseEntity
/* 结束编号 */
private String endNo;
/* 单号数量 */
- private String billCount;
+ private Integer billCount;
/* 面单费 */
- private String billFee;
+ private BigDecimal billFee;
/* 已分配当前编号 */
private String curStartNo;
/* 剩余数量 */
- private String hasBillCount;
+ private Integer hasBillCount;
/* 提供日期 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date provideDate;
@@ -55,7 +55,7 @@ public class EmisElectronicPag extends BaseEntity
/* 提供站点 */
private String provideSite;
/* 状态 0-未启用 1-启用 */
- private String status;
+ private Integer status;
/* 创建站点代码 */
private String createSiteCode;
/* 修改站点代码 */
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisElectronicPagServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisElectronicPagServiceImpl.java
index 11a235ec6..3add998dd 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisElectronicPagServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisElectronicPagServiceImpl.java
@@ -158,6 +158,15 @@ public class EmisElectronicPagServiceImpl implements IEmisElectronicPagService
return emisElectronicPagMapper.deleteEmisElectronicPagById(id);
}
+ public static void main(String[] args) {
+ String curStartNo="T7080110001";
+ long newStartNumber = Long.valueOf(curStartNo.replace(PAG_PREFIX,""));
+ newStartNumber= newStartNumber+1;
+
+ String waybillNo=PAG_PREFIX+String.valueOf(newStartNumber);
+ System.out.println(waybillNo);
+
+ }
}
diff --git a/emis-biz/src/main/resources/mapper/EmisElectronicPagMapper.xml b/emis-biz/src/main/resources/mapper/EmisElectronicPagMapper.xml
index bf9c76795..5233978ae 100644
--- a/emis-biz/src/main/resources/mapper/EmisElectronicPagMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisElectronicPagMapper.xml
@@ -1,9 +1,9 @@
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
+
@@ -32,18 +32,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-
+
-
+
insert into emis_electronic_pag
id,
start_no,
end_no,
- bill_count,
- bill_fee,
+ bill_count,
+ bill_fee,
cur_start_no,
- has_bill_count,
+ has_bill_count,
provide_date,
provide_man,
provide_site,
- status,
+ status,
create_site_code,
modify_site_code,
del_flag,
@@ -84,19 +84,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update_by,
update_time,
remark,
-
+
#{id},
#{startNo},
#{endNo},
- #{billCount},
- #{billFee},
+ #{billCount},
+ #{billFee},
#{curStartNo},
- #{hasBillCount},
+ #{hasBillCount},
#{provideDate},
#{provideMan},
#{provideSite},
- #{status},
+ #{status},
#{createSiteCode},
#{modifySiteCode},
#{delFlag},
@@ -105,7 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{updateBy},
#{updateTime},
#{remark},
-
+
@@ -113,14 +113,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
start_no = #{startNo},
end_no = #{endNo},
- bill_count = #{billCount},
- bill_fee = #{billFee},
+ bill_count = #{billCount},
+ bill_fee = #{billFee},
cur_start_no = #{curStartNo},
- has_bill_count = #{hasBillCount},
+ has_bill_count = #{hasBillCount},
provide_date = #{provideDate},
provide_man = #{provideMan},
provide_site = #{provideSite},
- status = #{status},
+ status = #{status},
create_site_code = #{createSiteCode},
modify_site_code = #{modifySiteCode},
del_flag = #{delFlag},
@@ -138,11 +138,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- delete from emis_electronic_pag where id in
+ delete from emis_electronic_pag where id in
#{id}
-
-
\ No newline at end of file