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-04-28 16:44:16 +08:00
parent eb73338afa
commit 053dd0702d
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -349,4 +349,7 @@ public class EmisWaybill extends BaseEntity
private List<EmisWaybillAttachment> attachmentList; private List<EmisWaybillAttachment> attachmentList;
private String sendSiteName;
} }

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

@ -179,6 +179,9 @@ public class WaybillOrder implements Serializable {
/* 取件员代码 */ /* 取件员代码 */
private String takePieceEmployeeCode; private String takePieceEmployeeCode;
/* 登记站点代码 */
private String registerSiteCode;
/* 发件网点代码 */ /* 发件网点代码 */
private String sendSiteCode; private String sendSiteCode;
@ -236,6 +239,9 @@ public class WaybillOrder implements Serializable {
private String remark; private String remark;
private String sendSiteName;
/** /**
* 转 VO * 转 VO
* @param dbWaybill * @param dbWaybill
@ -424,7 +430,7 @@ public class WaybillOrder implements Serializable {
// voItem.setCurrentSiteCode(dbWaybill.getCurrentSiteCode()); // voItem.setCurrentSiteCode(dbWaybill.getCurrentSiteCode());
// voItem.setNextSiteCode(dbWaybill.getNextSiteCode()); // voItem.setNextSiteCode(dbWaybill.getNextSiteCode());
// voItem.setLastSiteCode(dbWaybill.getLastSiteCode()); // voItem.setLastSiteCode(dbWaybill.getLastSiteCode());
// voItem.setRegisterSiteCode(dbWaybill.getRegisterSiteCode()); voItem.setRegisterSiteCode(dbWaybill.getRegisterSiteCode());
// voItem.setRegisterDate(dbWaybill.getRegisterDate()); // voItem.setRegisterDate(dbWaybill.getRegisterDate());
// voItem.setRegisterManCode(dbWaybill.getRegisterManCode()); // voItem.setRegisterManCode(dbWaybill.getRegisterManCode());
@ -432,6 +438,8 @@ public class WaybillOrder implements Serializable {
voItem.setSendSiteCode(dbWaybill.getSendSiteCode()); voItem.setSendSiteCode(dbWaybill.getSendSiteCode());
voItem.setSendDate(dbWaybill.getSendDate()); voItem.setSendDate(dbWaybill.getSendDate());
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());
@ -474,10 +482,6 @@ public class WaybillOrder implements Serializable {
// voItem.setUpdateSite(dbWaybill.getUpdateSite()); // voItem.setUpdateSite(dbWaybill.getUpdateSite());
return voItem; return voItem;
} }
@ -633,12 +637,15 @@ public class WaybillOrder implements Serializable {
// dbWaybill.setCurrentSiteCode(this.getCurrentSiteCode()); // dbWaybill.setCurrentSiteCode(this.getCurrentSiteCode());
// dbWaybill.setNextSiteCode(this.getNextSiteCode()); // dbWaybill.setNextSiteCode(this.getNextSiteCode());
// dbWaybill.setLastSiteCode(this.getLastSiteCode()); // dbWaybill.setLastSiteCode(this.getLastSiteCode());
// dbWaybill.setRegisterSiteCode(this.getRegisterSiteCode()); dbWaybill.setRegisterSiteCode(this.getRegisterSiteCode());
// dbWaybill.setRegisterDate(this.getRegisterDate()); // dbWaybill.setRegisterDate(this.getRegisterDate());
// dbWaybill.setRegisterManCode(this.getRegisterManCode()); // dbWaybill.setRegisterManCode(this.getRegisterManCode());
dbWaybill.setTakePieceEmployeeCode(this.getTakePieceEmployeeCode()); dbWaybill.setTakePieceEmployeeCode(this.getTakePieceEmployeeCode());
dbWaybill.setSendSiteCode(this.getSendSiteCode()); dbWaybill.setSendSiteCode(this.getSendSiteCode());
dbWaybill.setSendDate(this.getSendDate()); dbWaybill.setSendDate(this.getSendDate());
dbWaybill.setSendSiteName(this.getSendSiteName());
// dbWaybill.setDispatchManCode(this.getDispatchManCode()); // dbWaybill.setDispatchManCode(this.getDispatchManCode());
// dbWaybill.setDispatchDate(this.getDispatchDate()); // dbWaybill.setDispatchDate(this.getDispatchDate());
dbWaybill.setDispatchSiteCode(this.getDispatchSiteCode()); dbWaybill.setDispatchSiteCode(this.getDispatchSiteCode());