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-06-05 19:29:43 +08:00
parent c3dfa328fe
commit e03ad6269e
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -219,7 +219,7 @@ public class EmisWaybill extends BaseEntity
private String blSpecialQuote; private String blSpecialQuote;
/* 是否超长 */ /* 是否超长 */
private String blOverLong; private String blOverLong;
/* 是否出账 */ /* 是否付款 */
private String blBill; private String blBill;
/* 账单备注 */ /* 账单备注 */
private String blBillText; private String blBillText;
@ -295,7 +295,7 @@ public class EmisWaybill extends BaseEntity
/* 派件人代码 */ /* 派件人代码 */
private String dispatchManCode; private String dispatchManCode;
/* 派件时间 */ /* 派件时间 */
private String dispatchDate; private Date dispatchDate;
/* 派件网点代码 */ /* 派件网点代码 */
private String dispatchSiteCode; private String dispatchSiteCode;
/* 生成账单时间 */ /* 生成账单时间 */

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

@ -199,8 +199,12 @@ public class WaybillOrder implements Serializable {
/* 发件网点代码 */ /* 发件网点代码 */
private String sendSiteCode; private String sendSiteCode;
/* 派件人代码 */
private String dispatchManCode;
/* 派件网点代码 */ /* 派件网点代码 */
private String dispatchSiteCode; private String dispatchSiteCode;
/* 派件时间 */
private Date dispatchDate;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date sendDate; private Date sendDate;
@ -547,8 +551,8 @@ public class WaybillOrder implements Serializable {
voItem.setSendSiteName(dbWaybill.getSendSiteName()); voItem.setSendSiteName(dbWaybill.getSendSiteName());
// voItem.setDispatchManCode(dbWaybill.getDispatchManCode()); voItem.setDispatchManCode(dbWaybill.getDispatchManCode());
// voItem.setDispatchDate(dbWaybill.getDispatchDate()); voItem.setDispatchDate(dbWaybill.getDispatchDate());
voItem.setDispatchSiteCode(dbWaybill.getDispatchSiteCode()); voItem.setDispatchSiteCode(dbWaybill.getDispatchSiteCode());
// voItem.setProduceBillDate(dbWaybill.getProduceBillDate()); // voItem.setProduceBillDate(dbWaybill.getProduceBillDate());
// voItem.setProduceBillSiteCode(dbWaybill.getProduceBillSiteCode()); // voItem.setProduceBillSiteCode(dbWaybill.getProduceBillSiteCode());