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-08-31 05:36:10 +08:00
parent a323ab5b7d
commit 7341e3967c
41 changed files with 112 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisBaseInvoiceChInfo.java
View File

@ -54,7 +54,7 @@ public class EmisBaseInvoiceChInfo extends BaseEntity
/* token */
private String token;
/* token失效时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date tokenExpireTime;
}

4
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerUser.java
View File

@ -70,7 +70,7 @@ public class EmisCustomerUser extends BaseEntity
/* 最后登录ip */
private String loginIp;
/* 最后登录日期 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date loginDate;
/* 称呼 */
private String nickName;
@ -157,7 +157,7 @@ public class EmisCustomerUser extends BaseEntity
private String opEmpName;
// 最近下单时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date lastOrderTime;

2
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisElectronicPag.java
View File

@ -52,7 +52,7 @@ public class EmisElectronicPag extends BaseEntity
/* 剩余数量 */
private Integer hasBillCount;
/* 提供日期 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date provideDate;
/* 发放人 */
private String provideMan;

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

@ -40,7 +40,7 @@ public class EmisElectronicPagApply extends BaseEntity
/* 申购序号 */
private String applySeq;
/* 申购时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date applyDate;
/* 申购类型 1-网点 2-个人 */
private String provideType;
@ -61,7 +61,7 @@ public class EmisElectronicPagApply extends BaseEntity
/* 是否已发放 */
private String blSend;
/* 发放时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date sendDate;
/* 发放人编号 */
private String sendManCode;
@ -76,7 +76,7 @@ public class EmisElectronicPagApply extends BaseEntity
/* 取消人代码 */
private String cancelManCode;
/* 取消时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date cancelDate;
/* 取消站点代码 */
private String cancelSiteCode;

2
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisElectronicSitePag.java
View File

@ -56,7 +56,7 @@ public class EmisElectronicSitePag extends BaseEntity
/* 面单费 */
private BigDecimal billFee;
/* 发放日期 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date provideDate;
/* 发放人 */
private String provideMan;

4
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisExchangeRate.java
View File

@ -42,10 +42,10 @@ public class EmisExchangeRate extends BaseEntity
/* rate */
private String rate;
/* start_date */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date startDate;
/* end_date */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date endDate;
/* 1-valid */
private String blValid;

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

@ -92,19 +92,19 @@ public class EmisMonthpayAccount extends BaseEntity
/* 改动内容 */
private String contractChangeContent;
/* 合同开始日 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date contractStartdate;
/* 合同结束日 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date contractEnddate;
/* 合同签署日 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date contractSigndate;
/* 合同寄出日 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date contractSenddate;
/* 合同收到日 (我方收到) */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date contractRecievedate;
/* 快递公司 */
private String expressName;

4
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisMonthpayUseApply.java
View File

@ -42,12 +42,12 @@ public class EmisMonthpayUseApply extends BaseEntity
/* 申请序号 */
private String applySeq;
/* 申请时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date applyDate;
/* 物料名称:电子面单 */
private String applyName;
/* 审核时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date auditDate;
/* 审核状态 0-待审核 1-通过 2-审核拒绝 */
private Integer auditStatus;

22
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisOrder.java
View File

@ -50,7 +50,7 @@ public class EmisOrder extends BaseEntity
/* 订单类型 0-预报订单 1-正式订单 */
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;
/* 客户ID */
private Long userId;
@ -131,7 +131,7 @@ public class EmisOrder extends BaseEntity
/* 报关方式 */
private String customsEclaration;
/* 预计到达时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date estimateDate;
/* 包装类型 */
private String packType;
@ -140,10 +140,10 @@ public class EmisOrder extends BaseEntity
/* 取件方式:1-上门取件 2-仓库收货 3-整柜提货 */
private String pickupMethod;
/* 预计上门取件开始时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date pickStartDate;
/* 预计上门取件结束时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date pickFinishDate;
/* 取货失败原因 */
private String pickFailReason;
@ -262,7 +262,7 @@ public class EmisOrder extends BaseEntity
/* 转单单号 */
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 String dispFdReason;
@ -275,7 +275,7 @@ public class EmisOrder extends BaseEntity
/* 登记站点代码 */
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 String registerManCode;
@ -286,17 +286,17 @@ public class EmisOrder extends BaseEntity
/* 发件财务中心代码 */
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 String dispatchManCode;
/* 派件时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@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")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date produceBillDate;
/* 生成账单站点代码 */
private String produceBillSiteCode;
@ -345,7 +345,7 @@ public class EmisOrder extends BaseEntity
/* 签收站点代码 */
private String signSiteCode;
/* sign_date */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date signDate;
/* 揽收图片备注 */
private String billPicSendRmk;
@ -356,7 +356,7 @@ public class EmisOrder extends BaseEntity
/* 付款状态 字典:emis_payment_status */
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 String paymentRemark;

4
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisQuotePrice.java
View File

@ -98,10 +98,10 @@ public class EmisQuotePrice extends BaseEntity
/* 价格取值 */
private String priceType;
/* 开始日期 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date startDate;
/* 结束日期 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date endDate;
/* 优先级 */
private Integer priorityLevel;

8
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleBill.java
View File

@ -45,10 +45,10 @@ public class EmisSettleBill extends BaseEntity
/* 结算账单类型 1-现金 2-月结 */
private String settleType;
/* 结算开始时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date settleStartDate;
/* 结算结束时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date settleEndDate;
/* 账单月份 202402 */
private String billMonth;
@ -113,7 +113,7 @@ public class EmisSettleBill extends BaseEntity
/* 财务确认状态 0-待确认 1-已确认 2-驳回 */
private String blConfirmCenter;
/* 财务确认日期 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date confirmCenterDate;
/* 财务确认备注 */
private String confirmCenterNote;
@ -124,7 +124,7 @@ public class EmisSettleBill extends BaseEntity
/* 站点确认状态 0-待确认 1-已确认 2-驳回 3-账单异常 */
private String blConfirmSite;
/* 站点确认日期 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date confirmSiteDate;
/* 站点确认人 */
private String confirmSiteManCode;

2
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleInvoiceChRecord.java
View File

@ -92,7 +92,7 @@ public class EmisSettleInvoiceChRecord extends BaseEntity
/* 操作人 */
private String opManCode;
/* 操作时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date opDate;
/* 操作站点 */
private String opSiteCode;

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

@ -40,7 +40,7 @@ public class EmisSettleInvoiceRecord extends BaseEntity
/* 申请序号 */
private String applySeqNo;
/* 申请时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date applyDate;
/* 审核人 */
private String applyManCode;
@ -105,7 +105,7 @@ public class EmisSettleInvoiceRecord extends BaseEntity
/* 审核状态 0-未审核 1-已审核 */
private String blAudit;
/* 审核日期 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date auditDate;
/* 审核人 */
private String auditManCode;
@ -116,7 +116,7 @@ public class EmisSettleInvoiceRecord extends BaseEntity
/* 操作人 */
private String opManCode;
/* 操作时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date opDate;
/* 操作站点 */
private String opSiteCode;

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

@ -50,7 +50,7 @@ public class EmisSettlePayRecord extends BaseEntity
/* 审核状态 0-未审核 1-已审核 */
private String blAudit;
/* 审核日期 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date auditDate;
/* 审核人 */
private String auditManCode;
@ -77,7 +77,7 @@ public class EmisSettlePayRecord extends BaseEntity
/* 结算类型 1-现金 2-月结 */
private String settleType;
/* 退款日期 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date refundDate;
/* 退款人 */
private String refundManCode;
@ -114,7 +114,7 @@ public class EmisSettlePayRecord extends BaseEntity
/* other_reason */
private String otherReason;
/* 交易时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date tradeDate;
}

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

@ -47,7 +47,7 @@ public class EmisSettleSubBill extends BaseEntity
/* 运单号 */
private String billCode;
/* 出账时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date billDate;
/* 账单费用 */
private BigDecimal billFee;
@ -80,7 +80,7 @@ public class EmisSettleSubBill extends BaseEntity
/* 财务确认状态 0-待确认 1-已确认 2-驳回 */
private String blConfirmCenter;
/* 财务确认日期 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date confirmCenterDate;
/* 财务确认备注 */
private String confirmCenterNote;
@ -91,7 +91,7 @@ public class EmisSettleSubBill extends BaseEntity
/* 站点确认状态 0-待确认 1-已确认 2-驳回 */
private String blConfirmSite;
/* 站点确认日期 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date confirmSiteDate;
/* 站点确认人 */
private String confirmSiteManCode;

4
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSite.java
View File

@ -216,7 +216,7 @@ public class EmisSite extends BaseEntity
/* 是否推送京东 */
private String blPushJd;
/* 推送时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date pushDate;
/* 原因 */
private String reason;
@ -235,7 +235,7 @@ public class EmisSite extends BaseEntity
/* 审核状态 */
private String auditStatus;
/* 审核时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date auditDate;
/* 审核人代码 */
private String auditManCode;

4
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSiteAccount.java
View File

@ -56,7 +56,7 @@ public class EmisSiteAccount extends BaseEntity
/* 币种 */
private String currency;
/* 开户日期 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date startDate;
/* 是否启用 1-启用 0-未启用 */
private String blOpen;
@ -67,7 +67,7 @@ public class EmisSiteAccount extends BaseEntity
/* 清理站点代码 */
private String clearSiteCode;
/* 清理日期 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date clearDate;
/* 清理人编号 */
private String clearManCode;

2
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSiteBillControl.java
View File

@ -40,7 +40,7 @@ public class EmisSiteBillControl extends BaseEntity
/* 目的网点 */
private String destSiteCode;
/* 控制时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date controlDate;
/* 1-启用 */
private String blOpen;

4
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSitePrepaidRecharge.java
View File

@ -52,14 +52,14 @@ public class EmisSitePrepaidRecharge extends BaseEntity
/* 汇款卡号 */
private String remittanceCardNo;
/* 汇款日期 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date remittanceDate;
/* 审核网点 */
private String auditSiteCode;
/* 审核人 */
private String auditManCode;
/* 审核时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date auditDate;
/* 审核状态 0-待审核 1-审核通过 2-审核拒绝 */
private String auditStatus;

12
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSiteSettleRecord.java
View File

@ -62,7 +62,7 @@ public class EmisSiteSettleRecord extends BaseEntity
/* 操作类型 加,减 */
private String changeType;
/* 操作时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date changeDate;
/* 财务中心代码 */
private String centerCode;
@ -81,13 +81,13 @@ public class EmisSiteSettleRecord extends BaseEntity
/* 站点人名称 */
private String siteManName;
/* 财务操作时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date financeDate;
/* 网点操作时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date operataDate;
/* 中心日期 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date centerDate;
/* 是否确认 */
private String blConfirm;
@ -104,7 +104,7 @@ public class EmisSiteSettleRecord extends BaseEntity
/* 是否站点审核 */
private String blSite;
/* 站点日期 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date siteDate;
/* 是否改变费用 */
private String blChargeFee;
@ -113,7 +113,7 @@ public class EmisSiteSettleRecord extends BaseEntity
/* 结算ebr代码 */
private String settleEbrCode;
/* 结算ebr日期 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date settleEbrDate;
/* 客户代码 */
private String customerCode;

4
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSmsSendRecord.java
View File

@ -56,7 +56,7 @@ public class EmisSmsSendRecord extends BaseEntity
/* 发送渠道 */
private String smsChannel;
/* 发送时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date sendDate;
/* 渠道发送状态 0-未发送 1-已发送 -1 发送错误 */
private String sendStatus;
@ -65,7 +65,7 @@ public class EmisSmsSendRecord extends BaseEntity
/* 渠道错误信息 */
private String errMsg;
/* 任务处理时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date taskDate;
}

4
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSpecialCalcWeight.java
View File

@ -51,10 +51,10 @@ public class EmisSpecialCalcWeight extends BaseEntity
/* 结束重量 */
private BigDecimal endWeight;
/* 起始时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date beginDate;
/* 结束时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date endDate;

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

@ -42,7 +42,7 @@ public class EmisTmsDriver extends BaseEntity
/* 婚姻状态 */
private String maritalStatus;
/* 生日 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date birthDate;
/* 健康状态 */
private String healthStatus;
@ -79,10 +79,10 @@ public class EmisTmsDriver extends BaseEntity
/* 2档票数 */
private String secondNum;
/* 入职日期 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date entryTime;
/* 登记日期 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date registerDate;
/* 显示顺序 */
private Integer orderNum;

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

@ -40,7 +40,7 @@ public class EmisTmsPack extends BaseEntity
/* 合包名称 */
private String packName;
/* 合包时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date packDate;
/* 目的国家 */
private String destCountry;
@ -69,7 +69,7 @@ public class EmisTmsPack extends BaseEntity
/* 打印次数 */
private Integer printCount;
/* 打印时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date printDate;
/* 扩展数据 */
private String extData;

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

@ -43,7 +43,7 @@ public class EmisTmsPackDtl extends BaseEntity
/* 是否子单 */
private String blSubBill;
/* 扫描时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date scanDate;
/* 扫描状态 1-已扫描 0-未扫描 */
private String scanStatus;

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

@ -40,7 +40,7 @@ public class EmisTmsSiteBatch extends BaseEntity
/* 批次名称 */
private String batchName;
/* 批次时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date batchDate;
/* 所属线路 */
private String transLineType;
@ -58,10 +58,10 @@ public class EmisTmsSiteBatch extends BaseEntity
/* 航空单号 */
private String airBilllNo;
/* 预计出发时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date etd;
/* 预计到达时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date eta;
/* 包数 */
private Integer packNum;

2
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatchDtl.java
View File

@ -40,7 +40,7 @@ public class EmisTmsSiteBatchDtl extends BaseEntity
/* 批次代码 */
private String batchNo;
/* 扫描时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date scanDate;
/* 扫描状态 1-已扫描 0-未扫描 */
private String scanStatus;

2
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsTransferTrace.java
View File

@ -36,7 +36,7 @@ public class EmisTmsTransferTrace extends BaseEntity
/* 单号 */
private String billCode;
/* 跟进日期 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date lastTraceDate;
/* 50-签收 */
private String lastWaybillStatus;

4
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseIn.java
View File

@ -50,12 +50,12 @@ public class EmisWarehouseIn extends BaseEntity
/* 客户名称 */
private String customerName;
/* 进仓日期 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date entryDate;
/* 客户确认状态 0-未确认 1-确认 2-部分确认 3-异常反馈 */
private String confirmStatus;
/* 确认时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date confirmDate;
/* 占用状态 0-未占用 1-已全部占用 2-不分占用 */
private String usedStatus;

4
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseInBatch.java
View File

@ -52,12 +52,12 @@ public class EmisWarehouseInBatch extends BaseEntity
/* 运输工具编号 例如车牌号等 */
private String transCarNo;
/* 进仓日期 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date entryDate;
/* 客户确认状态 0-未确认 1-确认 2-部分确认3-异常反馈 */
private String confirmStatus;
/* 确认时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date confirmDate;
/* 状态 */
private String status;

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

@ -46,14 +46,14 @@ public class EmisWaybillAjustApply extends BaseEntity
/* 申请财务中心编码 */
private String applyFinanceCenterCode;
/* 申请时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date applyDate;
/* 目的网点是否审核 0-未审核 1-审核通过 2-审核拒绝 */
private String blDestConfirmed;
/* 目的站点代码 */
private String destConfirmSiteCode;
/* 目的网点确认时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date destConfirmDate;
/* 目的网点审核备注 */
private String destConfirmNote;
@ -78,7 +78,7 @@ public class EmisWaybillAjustApply extends BaseEntity
/* 中心确认人 */
private String centerConfirmManCode;
/* 中心确认时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date centerConfirmDate;
/* 中心审核备注 */
private String centerConfirmNote;

2
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillComplaints.java
View File

@ -54,7 +54,7 @@ public class EmisWaybillComplaints extends BaseEntity
/* 回复网点 */
private String reversionSiteCode;
/* 回复日期 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date reversionDate;
/* 是否检查 0-否 1-是 */
private String blCheckok;

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

@ -58,10 +58,10 @@ public class EmisWaybillProblemInfo extends BaseEntity
/* 登记站点代码 */
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;
/* 登记保存时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date registerSaveDate;
/* 数据来源 pc,app */
private String dataFrom;
@ -80,7 +80,7 @@ public class EmisWaybillProblemInfo extends BaseEntity
/* 回复网点 */
private String reversionSiteCode;
/* 回复日期 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date reversionDate;
/* 是否检查 0-否 1-是 */
private String blCheckok;

2
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillTransfer.java
View File

@ -40,7 +40,7 @@ public class EmisWaybillTransfer extends BaseEntity
/* 转件单号 */
private String transferBillCode;
/* 转件日期 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date transferDate;
/* 转件公司 */
private String transferExpress;

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

@ -54,7 +54,7 @@ public class WaybillOrder implements Serializable {
private String billCodeSub;
/* 下单时间 - 取客户当地时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date orderDate;
/* 客户ID */
@ -95,7 +95,7 @@ public class WaybillOrder implements Serializable {
private String customsEclaration;
/* 预计到达时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date estimateDate;
/* 包装类型 */
@ -108,10 +108,10 @@ public class WaybillOrder implements Serializable {
private String pickupMethod;
/* 预计上门取件开始时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date pickStartDate;
/* 预计上门取件结束时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date pickFinishDate;
/* 入仓代码 */
@ -184,7 +184,7 @@ public class WaybillOrder implements Serializable {
/* 转单单号 */
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;
/* 转单原因 */
@ -196,7 +196,7 @@ public class WaybillOrder implements Serializable {
/* 登记站点代码 */
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 String registerManCode;
@ -212,7 +212,7 @@ public class WaybillOrder implements Serializable {
/* 派件时间 */
private Date dispatchDate;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date sendDate;
/* 目的地编号 */
@ -330,7 +330,7 @@ public class WaybillOrder implements Serializable {
/* 签收站点代码 */
private String signSiteCode;
/* 签收时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date signDate;
/* 当前网点编号 */

6
emis-biz/src/main/java/com/xdadan/erp/emis/service/openbill/hx/HXOrderInfo.java
View File

@ -97,7 +97,7 @@ public class HXOrderInfo implements Serializable {
/**
* 订单时间（销售日期）
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date orderDate;
/**
@ -118,7 +118,7 @@ public class HXOrderInfo implements Serializable {
/**
* 原蓝票开票时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date oldInvoiceDate;
/**
@ -315,7 +315,7 @@ public class HXOrderInfo implements Serializable {
/**
* 发货时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date deliveryTime;
/**

8
emis-wms/src/main/java/com/xdadan/erp/wms/domain/WmsCustomer.java
View File

@ -65,13 +65,13 @@ public class WmsCustomer extends BaseEntity
/* 合同号 */
private String contractNo;
/* 首签日期 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date firstContractDate;
/* 终止合作日期 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date cooperationEndDate;
/* 申请日期 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date applyDate;
/* 客户计重方式 */
private String calcWeightType;
@ -124,7 +124,7 @@ public class WmsCustomer extends BaseEntity
/* 批准文号 */
private String approvalNo;
/* 注册日期 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date registrationDate;
/* 联系人1 */
private String contact1;

14
emis-wms/src/main/java/com/xdadan/erp/wms/domain/WmsOrder.java
View File

@ -66,14 +66,14 @@ public class WmsOrder extends BaseEntity
/* 发货单号 */
private String shipNo;
/* 发货时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date shipTime;
/* 发货状态 0-待发货 1-已发货 2-终止 */
private Integer shipStatus;
/* 订单状态 0-未确认 1-已确认 2-已取消 3-无效 4-退货 */
private Integer orderStatus;
/* 下单时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date orderTime;
/* 确认状态 0-待确认 1-确认通过 2-确认拒绝 */
private Integer confirmStatus;
@ -82,31 +82,31 @@ public class WmsOrder extends BaseEntity
/* 确认信息 */
private String confirmMsg;
/* 确认时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date confirmTime;
/* 毛重 kg */
private BigDecimal grossWeight;
/* 净重 kg */
private BigDecimal netWeight;
/* 称重时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date weightTime;
/* 打包状态 0-待打包 1-已打包 */
private Integer packStatus;
/* 打包时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date packTime;
/* 运输状态 0-待运输 1-已运输 */
private Integer transportStatus;
/* 运输开始时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date transportTime;
/* 运输提单号 */
private String transportMainNo;
/* 挂单状态 0-无 1-挂单 */
private Integer hangStatus;
/* 挂单时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date hangTime;
/* 挂单原因 */
private String hangMsg;

2
emis-wms/src/main/java/com/xdadan/erp/wms/domain/WmsReceiptItemDetail.java
View File

@ -59,7 +59,7 @@ public class WmsReceiptItemDetail extends BaseEntity
/* 确认信息 */
private String confirmMsg;
/* 确认时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date confirmTime;
}

2
emis-wms/src/main/java/com/xdadan/erp/wms/domain/WmsReceiptOrder.java
View File

@ -51,7 +51,7 @@ public class WmsReceiptOrder extends BaseEntity
/* 确认信息 */
private String confirmMsg;
/* 确认时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date confirmTime;
/* 所属仓库 */
private Long warehouseId;

8
emis-wms/src/main/java/com/xdadan/erp/wms/domain/WmsSupplier.java
View File

@ -63,13 +63,13 @@ public class WmsSupplier extends BaseEntity
/* 合同号 */
private String contractNo;
/* 首签日期 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date firstContractDate;
/* 终止合作日期 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date cooperationEndDate;
/* 申请日期 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date applyDate;
/* 计重方式 */
private String calcWeightType;
@ -122,7 +122,7 @@ public class WmsSupplier extends BaseEntity
/* 批准文号 */
private String approvalNo;
/* 注册日期 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date registrationDate;
/* 联系人1 */
private String contact1;