diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
index 72f77b309..9c444a3fc 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
@@ -99,6 +99,25 @@ public class EmisCommonController extends BaseController
}
}
+ /**
+ * 获取进仓单号
+ */
+ @RequestMapping(value = "/getWareHouseInNo")
+ public AjaxResult getWareHouseInNo()
+ {
+ try {
+ String YYYYMMDD = "yyyyMMdd";
+
+ String hbKey= "TAN-7080"+DateUtils.parseDateToStr(YYYYMMDD,new Date());
+ Long lockNo = redissonService.addAndGetLong(hbKey,1L);
+ String packNo =hbKey+ "-" +StringUtils.leftPad(String.valueOf(lockNo),4,"0");
+ return AjaxResult.success("获取成功",packNo);
+ }catch (Exception ex){
+ ex.printStackTrace();
+ return AjaxResult.error(ex.getMessage());
+ }
+ }
+
/**
* 获取解析地址
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 5f408716f..bacecef33 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:28:34
+ * @date 2024-05-21 23:43:06
* @Copyright: ShangHai Duta 2022 All rights reserved.
* @version v1.0
* @Description: TMS合包 实体类
@@ -26,7 +26,7 @@ import lombok.Data;
* @ClassName EmisTmsPack
* @Description TMS合包
* @author linfso
- * @date 2024-05-21 23:28:34
+ * @date 2024-05-21 23:43:06
*/
@Data
public class EmisTmsPack extends BaseEntity
@@ -48,10 +48,12 @@ public class EmisTmsPack extends BaseEntity
private String destCountryName;
/* 是否可拆 1-可拆 0-不可拆 */
private String blUnpack;
- /* 下一站 */
- private String nextStation;
+ /* 发出网点 */
+ private String sendStiteCode;
/* 下一网点 */
private String nextStiteCode;
+ /* 下一目的地 */
+ private String nextStation;
/* 总件数 */
private Integer totalParcelQty;
/* 总运单数 */
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsPackDtl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsPackDtl.java
index 5acbfc849..2ae7f485d 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsPackDtl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsPackDtl.java
@@ -2,7 +2,7 @@
* @Project: emis
* @Title: EmisTmsPackDtl.java
* @author linfso
- * @date 2024-05-21 23:29:08
+ * @date 2024-05-21 23:44:45
* @Copyright: ShangHai Duta 2022 All rights reserved.
* @version v1.0
* @Description: TMS合包明细 实体类
@@ -26,7 +26,7 @@ import lombok.Data;
* @ClassName EmisTmsPackDtl
* @Description TMS合包明细
* @author linfso
- * @date 2024-05-21 23:29:08
+ * @date 2024-05-21 23:44:45
*/
@Data
public class EmisTmsPackDtl extends BaseEntity
@@ -38,7 +38,7 @@ public class EmisTmsPackDtl extends BaseEntity
/* 合包号 */
private String packNo;
/* 运单号 */
- private Long billCode;
+ private String billCode;
/* 扫描时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date scanDate;
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsPackDtlMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsPackDtlMapper.xml
index aa9c8a865..f025f04e1 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsPackDtlMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsPackDtlMapper.xml
@@ -33,7 +33,7 @@
del_flag='0'
and id = #{id}
and pack_no like concat('%', #{packNo}, '%')
- and bill_code = #{billCode}
+ and bill_code = #{billCode}
and scan_date = #{scanDate}
and scan_status like concat('%', #{scanStatus}, '%')
and pack_status like concat('%', #{packStatus}, '%')
@@ -62,7 +62,7 @@
id,
pack_no,
- bill_code,
+ bill_code,
scan_date,
scan_status,
pack_status,
@@ -80,7 +80,7 @@
#{id},
#{packNo},
- #{billCode},
+ #{billCode},
#{scanDate},
#{scanStatus},
#{packStatus},
@@ -101,7 +101,7 @@
update emis_tms_pack_dtl
pack_no = #{packNo},
- bill_code = #{billCode},
+ bill_code = #{billCode},
scan_date = #{scanDate},
scan_status = #{scanStatus},
pack_status = #{packStatus},
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsPackMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsPackMapper.xml
index 030367d1a..b68198f25 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsPackMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsPackMapper.xml
@@ -12,8 +12,9 @@
-
+
+
@@ -37,7 +38,7 @@
- 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
+ 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
@@ -93,8 +95,9 @@
dest_country,
dest_country_name,
bl_unpack,
- next_station,
+ send_stite_code,
next_stite_code,
+ next_station,
total_parcel_qty,
total_waybill_qty,
total_volume,
@@ -124,8 +127,9 @@
#{destCountry},
#{destCountryName},
#{blUnpack},
- #{nextStation},
+ #{sendStiteCode},
#{nextStiteCode},
+ #{nextStation},
#{totalParcelQty},
#{totalWaybillQty},
#{totalVolume},
@@ -158,8 +162,9 @@
dest_country = #{destCountry},
dest_country_name = #{destCountryName},
bl_unpack = #{blUnpack},
- next_station = #{nextStation},
+ send_stite_code = #{sendStiteCode},
next_stite_code = #{nextStiteCode},
+ next_station = #{nextStation},
total_parcel_qty = #{totalParcelQty},
total_waybill_qty = #{totalWaybillQty},
total_volume = #{totalVolume},