aike/emis-oms2c-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2025-01-11 07:29:39 +08:00
parent 1ac371f708
commit d623e46654
4 changed files with 278 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

134
emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/EmisWaybill.java
View File

@ -10,14 +10,18 @@
package com.xdadan.erp.oms.domain;
import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.xdadan.erp.oms.common.core.domain.BaseEntity;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import lombok.Data;
/**
@ -26,7 +30,6 @@ import lombok.Data;
* @author linfso
* @date 2024-04-11 05:48:01
*/
//@JsonInclude(JsonInclude.Include.ALWAYS.NON_NULL)
@Data
@TableName("emis_waybill")
public class EmisWaybill extends BaseEntity
@ -52,7 +55,7 @@ public class EmisWaybill extends BaseEntity
/* 订单类型 0-预报订单 1-正式订单 */
private String orderType;
/* 下单时间 - 取客户当地时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date orderDate;
/* 客户ID */
private Long userId;
@ -64,33 +67,41 @@ public class EmisWaybill extends BaseEntity
private String openId;
/* 收货人名 */
@TableField
// @DataAuditField(fieldComment = "收货人")
private String receiveName;
/* 收货公司 */
@TableField
// @DataAuditField(fieldComment = "收件公司")
private String receiveCompany;
/* 收货人手机号 */
@TableField
// @DataAuditField(fieldComment = "收件电话")
private String receiveMobile;
/* 收货人电话 */
@TableField
private String receiveTel;
/* 收货人国家 */
@TableField
// @DataAuditField(fieldComment = "收件国家")
private String receiveCountry;
/* 省 */
@TableField
// @DataAuditField(fieldComment = "收件省")
private String receiveProvince;
/* 市 */
@TableField
// @DataAuditField(fieldComment = "收件市")
private String receiveCity;
/* 区 */
@TableField
// @DataAuditField(fieldComment = "收件区")
private String receiveCounty;
/* 县 */
@TableField
private String receiveTown;
/* 收货地址 */
@TableField
// @DataAuditField(fieldComment = "收件地址")
private String receiveAddress;
/* 邮编 */
private String receivePostcode;
@ -98,32 +109,40 @@ public class EmisWaybill extends BaseEntity
private String receivePcd;
/* 寄件人名 */
@TableField
// @DataAuditField(fieldComment = "寄件人")
private String sendName;
/* 寄件公司 */
@TableField
// @DataAuditField(fieldComment = "寄件公司")
private String sendCompany;
/* 寄件人手机号 */
@TableField
// @DataAuditField(fieldComment = "寄件电话")
private String sendMobile;
/* 寄件人电话 */
@TableField
private String sendTel;
/* 寄件人国家 */
@TableField
// @DataAuditField(fieldComment = "寄件国家")
private String sendCountry;
/* 寄件省 */
@TableField
// @DataAuditField(fieldComment = "寄件省")
private String sendProvince;
/* 寄件市 */
@TableField
// @DataAuditField(fieldComment = "寄件市")
private String sendCity;
/* 寄件区 */
@TableField
// @DataAuditField(fieldComment = "寄件区")
private String sendCounty;
/* 寄件县 */
private String sendTown;
/* 寄件地址 */
@TableField
// @DataAuditField(fieldComment = "寄件地址")
private String sendAddress;
/* 寄件邮编 */
private String sendPostcode;
@ -131,21 +150,27 @@ public class EmisWaybill extends BaseEntity
private String sendPcd;
/* 支付方式 : 现金或月结 */
@TableField
// @DataAuditField(fieldComment = "支付方式",dictType="emis_payment_type")
private String paymentType;
/* 计费方式 1-按重量 2-按体积 3-一口价 */
@TableField
// @DataAuditField(fieldComment = "计费方式",dictType="emis_calc_fee_type")
private String calcFeeType;
/* 支付月结编号 */
@TableField
// @DataAuditField(fieldComment = "月结客户编号")
private String custNo;
/* 月结客户的名称 */
@TableField
// @DataAuditField(fieldComment = "月结客户名称")
private String custName;
/* 快递线路 */
@TableField
// @DataAuditField(fieldComment = "线路")
private String transLineType;
/* 快递产品类型 */
@TableField
// @DataAuditField(fieldComment = "产品类型")
private String productType;
/* 时效 */
private String timeType;
@ -155,29 +180,35 @@ public class EmisWaybill extends BaseEntity
private String carryType;
/* 清关方式 */
@TableField
// @DataAuditField(fieldComment = "清关方式",dictType="emis_customs_clear")
private String customsClear;
/* 报关方式 */
@TableField
// @DataAuditField(fieldComment = "报关方式",dictType="emis_declare_mode")
private String customsEclaration;
/* 预计到达时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
@TableField
// @DataAuditField(fieldComment = "预计到达时间")
private Date estimateDate;
/* 包装类型 */
@TableField
// @DataAuditField(fieldComment = "包装类型",dictType="emis_tab_packing_type")
private String packType;
/* 派件方式:1-派送 2-自提 */
@TableField
// @DataAuditField(fieldComment = "派件方式",dictType="emis_dispatch_method")
private String dispatchMethod;
/* 取件方式:pickupMethod:1-上门取件 2-仓库收货 3-整柜提货 */
/* 取件方式:1-上门取件 2-仓库收货 3-整柜提货 */
@TableField
// @DataAuditField(fieldComment = "取件方式",dictType="emis_qujian_fangshi")
private String pickupMethod;
/* 预计上门取件开始时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
@TableField
private Date pickStartDate;
/* 预计上门取件结束时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
@TableField
private Date pickFinishDate;
/* 取货失败原因 */
@ -204,6 +235,7 @@ public class EmisWaybill extends BaseEntity
private String goodsType;
/* 货物描述 */
@TableField
// @DataAuditField(fieldComment = "货物描述")
private String goodsInfo;
/* 货物图片，逗号隔开 */
private String goodsPics;
@ -225,20 +257,25 @@ public class EmisWaybill extends BaseEntity
private BigDecimal totalWeight;
/* 总体积 */
@TableField
// @DataAuditField(fieldComment = "体积")
private BigDecimal totalVolume;
/* 件数 */
@TableField
// @DataAuditField(fieldComment = "件数")
private Integer parcelQty;
/* 实际重量 */
@TableField
// @DataAuditField(fieldComment = "实际重量")
private BigDecimal billWeight;
/* 体积重量 */
@TableField
// @DataAuditField(fieldComment = "体积重量")
private BigDecimal volumeWeight;
/* 费用币种 */
private String currency;
/* 结算重量 */
@TableField
// @DataAuditField(fieldComment = "结算重量")
private BigDecimal settlementWeight;
/* 扫描重量 */
private BigDecimal scanWeight;
@ -246,16 +283,21 @@ public class EmisWaybill extends BaseEntity
private BigDecimal feeWeight;
/* 运费 */
@TableField
// @DataAuditField(fieldComment = "运费")
private BigDecimal freight;
/* 实际支付方式 : 现金或月结 */
private String realPaymentType;
/* 实收运费 */
/* 标准报价 */
private BigDecimal realFee;
/* 是否特殊报价 */
@TableField
// @DataAuditField(fieldComment = "是否特殊报价")
private String blSpecialQuote;
/* 是否超长 */
private String blOverLong;
/* 是否虚拟单 */
private String blVirtual;
/* 是否付款 */
private String blBill;
/* 账单备注 */
@ -266,6 +308,7 @@ public class EmisWaybill extends BaseEntity
private String overWeightNumber;
/* 费用备注 */
@TableField
// @DataAuditField(fieldComment = "费用备注")
private String feeRemark;
/* 三段码 */
private String thirdCode;
@ -299,14 +342,18 @@ public class EmisWaybill extends BaseEntity
private Integer printCount;
/* 是否同行转单 */
@TableField
// @DataAuditField(fieldComment = "是否转件")
private String blDispFd;
/* 转单快递代码 */
@TableField
// @DataAuditField(fieldComment = "转件公司")
private String transferCode;
/* 转单单号 */
@TableField
// @DataAuditField(fieldComment = "转件单号")
private String transferBillcode;
/* 转单时间 */
/* 转件时间 */
// @DataAuditField(fieldComment = "转件时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date dispFdDate;
/* 转单原因 */
@ -320,7 +367,7 @@ public class EmisWaybill extends BaseEntity
/* 登记站点代码 */
private String registerSiteCode;
/* 登记时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date registerDate;
/* 登记人编号 */
private String registerManCode;
@ -331,17 +378,16 @@ public class EmisWaybill extends BaseEntity
/* 发件财务中心代码 */
private String sendCenterCode;
/* 发货时间 - 取本地时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date sendDate;
/* 派件人代码 */
private String dispatchManCode;
/* 派件时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date dispatchDate;
/* 派件网点代码 */
private String dispatchSiteCode;
/* 生成账单时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date produceBillDate;
/* 生成账单站点代码 */
private String produceBillSiteCode;
@ -349,6 +395,7 @@ public class EmisWaybill extends BaseEntity
private String produceBillManCode;
/* 目的地编号 */
@TableField
// @DataAuditField(fieldComment = "目的地编号")
private String destinationCode;
/* 目的省 */
private String destinationProvince;
@ -359,6 +406,7 @@ public class EmisWaybill extends BaseEntity
private String destinationCounty;
/* 目的地网点代码 */
@TableField
// @DataAuditField(fieldComment = "目的地网点代码")
private String dispatchUnderlingSiteCode;
/* 目的地财务中心代码 */
private String destinationCenterCode;
@ -366,47 +414,61 @@ public class EmisWaybill extends BaseEntity
private String marketManCode;
/* 销售回款人 */
@TableField
// @DataAuditField(fieldComment = "回款人联系人")
private String payee;
/* 销售联系人 */
@TableField
// @DataAuditField(fieldComment = "销售联系人")
private String salesmen;
/* 操作员代码 */
@TableField
// @DataAuditField(fieldComment = "操作员")
private String operateEmployeeCode;
/* 是否问题件 1-是 0-否 */
@TableField
// @DataAuditField(fieldComment = "是否问题件")
private String blIsQuestion;
/* 问题件类型 */
@TableField
// @DataAuditField(fieldComment = "问题件类型")
private Integer problemType;
/* 问题件原因 */
@TableField
// @DataAuditField(fieldComment = "问题件原因")
private String problemCause;
/* 问题件延期天数 */
private Integer problemDelayDays;
/* 是否给寄件人发短信 */
@TableField
// @DataAuditField(fieldComment = "是否寄件短信")
private String blMessage;
/* 是否给收件人发短信 */
@TableField
// @DataAuditField(fieldComment = "是否收件短信")
private String blAcceptMessage;
/* 是否生成子单 1-是 0-否 */
// @DataAuditField(fieldComment = "是否生成子单")
private String blGenSubbill;
/* 签收状态 字典 */
@TableField
// @DataAuditField(fieldComment = "签收状态")
private String blSign;
/* 签收人(客户) */
@TableField
// @DataAuditField(fieldComment = "签收人")
private String signMan;
/* 签收员代码 */
@TableField
// @DataAuditField(fieldComment = "签收操作员")
private String signManCode;
/* 签收站点代码 */
@TableField
// @DataAuditField(fieldComment = "签收网点")
private String signSiteCode;
/* sign_date */
@TableField
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
// @DataAuditField(fieldComment = "签收时间")
private Date signDate;
/* 时区偏差 */
@ -414,50 +476,73 @@ public class EmisWaybill extends BaseEntity
/* 付款状态 字典:emis_payment_status */
private String paymentStatus;
/* 付款时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date paymentDate;
/* 付款备注 */
private String paymentRemark;
/* 订单备注 */
// @DataAuditField(fieldComment = "订单备注")
private String orderRemark;
/* 数据来源 */
private String dataFrom;
/* 是否敏感物 */
// @DataAuditField(fieldComment = "是否敏感物")
private String blSpecialGoods;
/* ext_info */
// @DataAuditField(fieldComment = "扩展信息")
private String extInfo;
// 体积信息
@TableField(exist = false)
private List<EmisWaybillCargo> cargoList;
// 费用列表信息
@TableField(exist = false)
private List<EmisWaybillFeeitem> feeitemList;
// 附件信息
@TableField(exist = false)
private List<EmisWaybillAttachment> attachmentList;
// 快递报关资料信息
@TableField(exist = false)
private List<EmisWaybillDeclareGoods> declareGoodsList;
// 陆运报关附件信息
@TableField(exist = false)
private List<EmisWaybillDeclareAttachment> declareAttachmentList;
/* 扩展信息 */
@TableField(exist = false)
// @DataAuditField(fieldComment = "收件国")
private String receiveCountryName;
@TableField(exist = false)
// @DataAuditField(fieldComment = "收件省")
private String receiveProvinceName;
@TableField(exist = false)
// @DataAuditField(fieldComment = "收件市")
private String receiveCityName;
@TableField(exist = false)
private String receiveCountyName;
@TableField(exist = false)
// @DataAuditField(fieldComment = "发件国")
private String sendCountryName;
@TableField(exist = false)
// @DataAuditField(fieldComment = "发件省")
private String sendProvinceName;
@TableField(exist = false)
// @DataAuditField(fieldComment = "发件市")
private String sendCityName;
@TableField(exist = false)
private String sendCountyName;
@TableField(exist = false)
// @DataAuditField(fieldComment = "线路")
private String transLineTypeName;
@TableField(exist = false)
// @DataAuditField(fieldComment = "产品类型")
private String productTypeName;
@ -479,12 +564,22 @@ public class EmisWaybill extends BaseEntity
@TableField(exist = false)
private String sendSiteName;
@TableField(exist = false)
private String sendCenterName;
// 目的地名称
@TableField(exist = false)
// @DataAuditField(fieldComment = "目的地名称")
private String destinationName;
// 目的网点名称
@TableField(exist = false)
// @DataAuditField(fieldComment = "目的网点名称")
private String dispatchUnderlingSiteName;
/* 目的地中心代码 */
@TableField(exist = false)
private String destinationCenterName;
// 派件网点名称,派件人
@TableField(exist = false)
@ -520,8 +615,6 @@ public class EmisWaybill extends BaseEntity
@TableField(exist = false)
private String problemTypeName;
// 最近一条扫描记录
@TableField(exist = false)
private EmisTmsScanRecord lastScanRecord;
@ -544,4 +637,9 @@ public class EmisWaybill extends BaseEntity
@TableField(exist = false)
private String lockReason;
@TableField
// @DataAuditField(fieldComment = "录单备注")
private String remark;
}

63
emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/EmisWaybillDeclareAttachment.java Normal file
View File

@ -0,0 +1,63 @@
/**
* @Project: emis
* @Title: EmisWaybillDeclareAttachment.java
* @author linfso
* @date 2025-01-02 13:09:50
* @Copyright: ShangHai Duta 2022 All rights reserved.
* @version v1.0
* @Description: <p> 申报附件 实体类 </p>
*/
package com.xdadan.erp.oms.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.xdadan.erp.oms.common.core.domain.BaseEntity;
import lombok.Data;
import java.util.Date;
/**
* @ClassName EmisWaybillDeclareAttachment
* @Description 申报附件
* @author linfso
* @date 2025-01-02 13:09:50
*/
@Data
public class EmisWaybillDeclareAttachment extends BaseEntity
{
private static final long serialVersionUID = 1L;
/* id */
private Long id;
/* 运单id */
private Long waybillId;
/* 运单号 */
private String billCode;
/* 附件类型 1-清关文件 2-揽收底单 3-签收底单 */
private String attachType;
/* 文件名称 */
private String fileName;
/* 文件地址 */
private String fileUrl;
/* 文件大小KB */
private Integer fileSiez;
/* 文件描述 */
private String fileDesc;
/* 排序 */
private Integer orderNum;
/* 数据来源 */
private String dataFrom;
/* 审核状态 0-未审核 1-已审核 */
private String blAudit;
/* 审核日期 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date auditDate;
/* 审核人 */
private String auditManCode;
/* 审核站点 */
private String auditSiteCode;
/* 审核异常原因 */
private String auditNote;
}

93
emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/EmisWaybillDeclareGoods.java Normal file
View File

@ -0,0 +1,93 @@
/**
* @Project: emis
* @Title: EmisWaybillDeclareGoods.java
* @author linfso
* @date 2025-01-02 13:09:51
* @Copyright: ShangHai Duta 2022 All rights reserved.
* @version v1.0
* @Description: <p> 申报物品 实体类 </p>
*/
package com.xdadan.erp.oms.domain;
import com.xdadan.erp.oms.common.core.domain.BaseEntity;
import lombok.Data;
import java.math.BigDecimal;
/**
* @ClassName EmisWaybillDeclareGoods
* @Description 申报物品
* @author linfso
* @date 2025-01-02 13:09:51
*/
@Data
public class EmisWaybillDeclareGoods extends BaseEntity
{
private static final long serialVersionUID = 1L;
/* id */
private Long id;
/* 运单id */
private Long waybillId;
/* 运单编号 */
private String billCode;
/* 货物编码 */
private String goodsCode;
/* 货物名称 */
private String goodsName;
/* 规格型号 */
private String goodsModel;
/* 毛重 */
private BigDecimal grossWeight;
/* 净重 */
private BigDecimal netWeight;
/* 实际数量 */
private BigDecimal cargoQty;
/* 异常数量 */
private BigDecimal abnormalQty;
/* 单位 */
private String unit;
/* 重量 */
private BigDecimal weight;
/* 申报单价 */
private BigDecimal price;
/* 申报币种 */
private String currency;
/* 原产国 */
private String nationArea;
/* 行邮税号 */
private String taxNo;
/* 海关编码 */
private String hscode;
/* 品牌 */
private String brand;
/* 材质 */
private String material;
/* 用途 */
private String purpose;
/* 成分 */
private String ingredients;
/* 厂家 */
private String manufacturer;
/* 供应商 */
private String supplier;
/* 功能 */
private String function;
/* 长 */
private BigDecimal length;
/* 宽 */
private BigDecimal width;
/* 高 */
private BigDecimal height;
/* 体积 */
private BigDecimal volume;
/* 条码 */
private String barcode;
/* 附加信息 */
private String extraData;
/* 排序 */
private Integer orderNum;
}

12
emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/vo/WaybillOrder.java
View File

@ -1,7 +1,7 @@
package com.xdadan.erp.oms.domain.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.xdadan.erp.emis.domain.*;
import com.xdadan.erp.oms.domain.*;
import lombok.Data;
import java.io.Serializable;
@ -392,11 +392,11 @@ public class WaybillOrder implements Serializable {
* @return
*/
public static WaybillOrder toVo(EmisWaybill dbWaybill,
List<EmisWaybillCargo> dbCargoList,
List<EmisWaybillFeeitem> dbFeeitemList,
List<EmisWaybillAttachment> dbAttachmentList,
List<EmisWaybillDeclareGoods> dbDecareGoodsList,
List<EmisWaybillDeclareAttachment> dbDeclareAttachmentList
List<EmisWaybillCargo> dbCargoList,
List<EmisWaybillFeeitem> dbFeeitemList,
List<EmisWaybillAttachment> dbAttachmentList,
List<EmisWaybillDeclareGoods> dbDecareGoodsList,
List<EmisWaybillDeclareAttachment> dbDeclareAttachmentList
){
WaybillOrder voItem = new WaybillOrder();