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:46:49 +08:00
parent 0823c8e39e
commit c29264e6e3
5 changed files with 44 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
View File

@ -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());
}
}
/**
* 获取解析地址

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

@ -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: <p> TMS合包 实体类 </p>
@ -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;
/* 总运单数 */

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

@ -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: <p> TMS合包明细 实体类 </p>
@ -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;

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

@ -33,7 +33,7 @@
del_flag='0'
<if test="id != null "> and id = #{id}</if>
<if test="packNo != null and packNo != ''"> and pack_no like concat('%', #{packNo}, '%')</if>
<if test="billCode != null "> and bill_code = #{billCode}</if>
<if test="billCode != null and billCode != ''"> and bill_code = #{billCode}</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="packStatus != null and packStatus != ''"> and pack_status like concat('%', #{packStatus}, '%')</if>
@ -62,7 +62,7 @@
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="packNo != null and packNo != ''">pack_no,</if>
<if test="billCode != null">bill_code,</if>
<if test="billCode != null and billCode != ''">bill_code,</if>
<if test="scanDate != null">scan_date,</if>
<if test="scanStatus != null and scanStatus != ''">scan_status,</if>
<if test="packStatus != null and packStatus != ''">pack_status,</if>
@ -80,7 +80,7 @@
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="packNo != null and packNo != ''">#{packNo},</if>
<if test="billCode != null">#{billCode},</if>
<if test="billCode != null and billCode != ''">#{billCode},</if>
<if test="scanDate != null">#{scanDate},</if>
<if test="scanStatus != null and scanStatus != ''">#{scanStatus},</if>
<if test="packStatus != null and packStatus != ''">#{packStatus},</if>
@ -101,7 +101,7 @@
update emis_tms_pack_dtl
<trim prefix="SET" suffixOverrides=",">
<if test="packNo != null and packNo != ''">pack_no = #{packNo},</if>
<if test="billCode != null">bill_code = #{billCode},</if>
<if test="billCode != null and billCode != ''">bill_code = #{billCode},</if>
<if test="scanDate != null">scan_date = #{scanDate},</if>
<if test="scanStatus != null and scanStatus != ''">scan_status = #{scanStatus},</if>
<if test="packStatus != null and packStatus != ''">pack_status = #{packStatus},</if>

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

@ -12,8 +12,9 @@
<result property="destCountry" column="dest_country" />
<result property="destCountryName" column="dest_country_name" />
<result property="blUnpack" column="bl_unpack" />
<result property="nextStation" column="next_station" />
<result property="sendStiteCode" column="send_stite_code" />
<result property="nextStiteCode" column="next_stite_code" />
<result property="nextStation" column="next_station" />
<result property="totalParcelQty" column="total_parcel_qty" />
<result property="totalWaybillQty" column="total_waybill_qty" />
<result property="totalVolume" column="total_volume" />
@ -37,7 +38,7 @@
</resultMap>
<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, 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
</sql>
<select id="selectEmisTmsPackList" parameterType="EmisTmsPack" resultMap="EmisTmsPackResult">
@ -51,8 +52,9 @@
<if test="destCountry != null and destCountry != ''"> and dest_country like concat('%', #{destCountry}, '%')</if>
<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="nextStation != null and nextStation != ''"> and next_station like concat('%', #{nextStation}, '%')</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="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>
<if test="totalVolume != null "> and total_volume = #{totalVolume}</if>
@ -78,7 +80,7 @@
</select>
<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, 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_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 a
where a.id = #{id}
</select>
@ -93,8 +95,9 @@
<if test="destCountry != null and destCountry != ''">dest_country,</if>
<if test="destCountryName != null and destCountryName != ''">dest_country_name,</if>
<if test="blUnpack != null and blUnpack != ''">bl_unpack,</if>
<if test="nextStation != null and nextStation != ''">next_station,</if>
<if test="sendStiteCode != null and sendStiteCode != ''">send_stite_code,</if>
<if test="nextStiteCode != null and nextStiteCode != ''">next_stite_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>
<if test="totalVolume != null">total_volume,</if>
@ -124,8 +127,9 @@
<if test="destCountry != null and destCountry != ''">#{destCountry},</if>
<if test="destCountryName != null and destCountryName != ''">#{destCountryName},</if>
<if test="blUnpack != null and blUnpack != ''">#{blUnpack},</if>
<if test="nextStation != null and nextStation != ''">#{nextStation},</if>
<if test="sendStiteCode != null and sendStiteCode != ''">#{sendStiteCode},</if>
<if test="nextStiteCode != null and nextStiteCode != ''">#{nextStiteCode},</if>
<if test="nextStation != null and nextStation != ''">#{nextStation},</if>
<if test="totalParcelQty != null">#{totalParcelQty},</if>
<if test="totalWaybillQty != null">#{totalWaybillQty},</if>
<if test="totalVolume != null">#{totalVolume},</if>
@ -158,8 +162,9 @@
<if test="destCountry != null and destCountry != ''">dest_country = #{destCountry},</if>
<if test="destCountryName != null and destCountryName != ''">dest_country_name = #{destCountryName},</if>
<if test="blUnpack != null and blUnpack != ''">bl_unpack = #{blUnpack},</if>
<if test="nextStation != null and nextStation != ''">next_station = #{nextStation},</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="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>
<if test="totalVolume != null">total_volume = #{totalVolume},</if>