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-07-20 12:25:31 +08:00
parent 21a9c9232a
commit f2f7a488d4
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,7 +60,7 @@ public class EmisWaybill extends BaseEntity
/* 订单类型 0-预报订单 1-正式订单 */ /* 订单类型 0-预报订单 1-正式订单 */
private String orderType; private String orderType;
/* 下单时间 - 取客户当地时间 */ /* 下单时间 - 取客户当地时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date orderDate; private Date orderDate;
/* 客户ID */ /* 客户ID */
private Long userId; private Long userId;
@ -168,7 +168,7 @@ public class EmisWaybill extends BaseEntity
@TableField @TableField
private String customsEclaration; private String customsEclaration;
/* 预计到达时间 */ /* 预计到达时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
@TableField @TableField
private Date estimateDate; private Date estimateDate;
/* 包装类型 */ /* 包装类型 */
@ -181,11 +181,11 @@ public class EmisWaybill extends BaseEntity
@TableField @TableField
private String pickupMethod; private String pickupMethod;
/* 预计上门取件开始时间 */ /* 预计上门取件开始时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
@TableField @TableField
private Date pickStartDate; private Date pickStartDate;
/* 预计上门取件结束时间 */ /* 预计上门取件结束时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
@TableField @TableField
private Date pickFinishDate; private Date pickFinishDate;
/* 取货失败原因 */ /* 取货失败原因 */
@ -315,7 +315,7 @@ public class EmisWaybill extends BaseEntity
@TableField @TableField
private String transferBillcode; private String transferBillcode;
/* 转单时间 */ /* 转单时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date dispFdDate; private Date dispFdDate;
/* 转单原因 */ /* 转单原因 */
private String dispFdReason; private String dispFdReason;
@ -328,7 +328,7 @@ public class EmisWaybill extends BaseEntity
/* 登记站点代码 */ /* 登记站点代码 */
private String registerSiteCode; private String registerSiteCode;
/* 登记时间 */ /* 登记时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date registerDate; private Date registerDate;
/* 登记人编号 */ /* 登记人编号 */
private String registerManCode; private String registerManCode;
@ -339,7 +339,7 @@ public class EmisWaybill extends BaseEntity
/* 发件财务中心代码 */ /* 发件财务中心代码 */
private String sendCenterCode; private String sendCenterCode;
/* 发货时间 - 取本地时间 */ /* 发货时间 - 取本地时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date sendDate; private Date sendDate;
/* 派件人代码 */ /* 派件人代码 */
private String dispatchManCode; private String dispatchManCode;
@ -348,7 +348,7 @@ public class EmisWaybill extends BaseEntity
/* 派件网点代码 */ /* 派件网点代码 */
private String dispatchSiteCode; private String dispatchSiteCode;
/* 生成账单时间 */ /* 生成账单时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date produceBillDate; private Date produceBillDate;
/* 生成账单站点代码 */ /* 生成账单站点代码 */
private String produceBillSiteCode; private String produceBillSiteCode;
@ -413,7 +413,7 @@ public class EmisWaybill extends BaseEntity
private String signSiteCode; private String signSiteCode;
/* sign_date */ /* sign_date */
@TableField @TableField
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date signDate; private Date signDate;
/* 时区偏差 */ /* 时区偏差 */
@ -421,7 +421,7 @@ public class EmisWaybill extends BaseEntity
/* 付款状态 字典:emis_payment_status */ /* 付款状态 字典:emis_payment_status */
private String paymentStatus; private String paymentStatus;
/* 付款时间 */ /* 付款时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date paymentDate; private Date paymentDate;
/* 付款备注 */ /* 付款备注 */
private String paymentRemark; private String paymentRemark;

4
emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
View File

@ -1468,7 +1468,9 @@
<include refid="selectEmisWaybillVo"/> <include refid="selectEmisWaybillVo"/>
<where> <where>
a.del_flag='0' and order_status !='0' a.del_flag='0' and order_status !='0'
<if test="billCode != null and billCode != ''"> and ( FIND_IN_SET(`bill_code`,#{billCode}) or bill_code like concat('%', #{billCode}, '%') ) </if> <if test="billCode != null and billCode != ''"> and ( FIND_IN_SET( a.`bill_code`,#{billCode}) or a.bill_code like concat('%', #{billCode}, '%') ) </if>
<if test="dispatchUnderlingSiteCode != null and dispatchUnderlingSiteCode != ''"> and a.dispatch_underling_site_code=#{dispatchUnderlingSiteCode}</if>
<if test="sendSiteCode != null and sendSiteCode != ''"> and a.send_site_code= #{sendSiteCode}</if>
<if test="params.beginDate != null and params.beginDate != ''"> <if test="params.beginDate != null and params.beginDate != ''">
and a.send_date <![CDATA[ >= ]]> #{params.beginDate} and a.send_date <![CDATA[ >= ]]> #{params.beginDate}