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 11:03:45 +08:00
parent 6c366d94c0
commit 0597091198
1 changed files with 9 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -174,6 +174,11 @@ public class WaybillOrder implements Serializable {
/* 发件网点代码 */
private String sendSiteCode;
/* 派件网点代码 */
private String dispatchSiteCode;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date sendDate;
/* 目的地编号 */
private String destinationCode;
@ -417,11 +422,11 @@ public class WaybillOrder implements Serializable {
voItem.setTakePieceEmployeeCode(dbWaybill.getTakePieceEmployeeCode());
voItem.setSendSiteCode(dbWaybill.getSendSiteCode());
voItem.setSendDate(dbWaybill.getSendDate());
// voItem.setSendDate(dbWaybill.getSendDate());
// voItem.setDispatchManCode(dbWaybill.getDispatchManCode());
// voItem.setDispatchDate(dbWaybill.getDispatchDate());
// voItem.setDispatchSiteCode(dbWaybill.getDispatchSiteCode());
voItem.setDispatchSiteCode(dbWaybill.getDispatchSiteCode());
// voItem.setProduceBillDate(dbWaybill.getProduceBillDate());
// voItem.setProduceBillSiteCode(dbWaybill.getProduceBillSiteCode());
// voItem.setProduceBillManCode(dbWaybill.getProduceBillManCode());
@ -518,19 +523,6 @@ public class WaybillOrder implements Serializable {
dbWaybill.setReceiveCompany(reciever.getCompany());
}
// dbWaybill.setReceiveName(this.getReceiveName());
// dbWaybill.setReceiveCompany(this.getReceiveCompany());
// dbWaybill.setReceiveMobile(this.getReceiveMobile());
// dbWaybill.setReceiveTel(this.getReceiveTel());
// dbWaybill.setReceiveCountry(this.getReceiveCountry());
// dbWaybill.setReceiveProvince(this.getReceiveProvince());
// dbWaybill.setReceiveCity(this.getReceiveCity());
// dbWaybill.setReceiveCounty(this.getReceiveCounty());
// dbWaybill.setReceiveTown(this.getReceiveTown());
// dbWaybill.setReceiveAddress(this.getReceiveAddress());
// dbWaybill.setReceivePostcode(this.getReceivePostcode());
// dbWaybill.setReceivePcd(this.getReceivePcd());
if(this.getSender() != null){
Sender sender = this.getSender();
dbWaybill.setSendName(sender.getName());
@ -544,19 +536,6 @@ public class WaybillOrder implements Serializable {
dbWaybill.setSendCompany(sender.getCompany());
}
// dbWaybill.setSendName(this.getSendName());
// dbWaybill.setSendCompany(this.getSendCompany());
// dbWaybill.setSendMobile(this.getSendMobile());
// dbWaybill.setSendTel(this.getSendTel());
// dbWaybill.setSendCountry(this.getSendCountry());
// dbWaybill.setSendProvince(this.getSendProvince());
// dbWaybill.setSendCity(this.getSendCity());
// dbWaybill.setSendCounty(this.getSendCounty());
// dbWaybill.setSendTown(this.getSendTown());
// dbWaybill.setSendAddress(this.getSendAddress());
// dbWaybill.setSendPostcode(this.getSendPostcode());
// dbWaybill.setSendPcd(this.getSendPcd());
dbWaybill.setPaymentType(this.getPaymentType());
dbWaybill.setCalcFeeType(this.getCalcFeeType());
dbWaybill.setCustNo(this.getCustNo());
@ -651,10 +630,10 @@ public class WaybillOrder implements Serializable {
// dbWaybill.setRegisterManCode(this.getRegisterManCode());
dbWaybill.setTakePieceEmployeeCode(this.getTakePieceEmployeeCode());
dbWaybill.setSendSiteCode(this.getSendSiteCode());
// dbWaybill.setSendDate(this.getSendDate());
dbWaybill.setSendDate(this.getSendDate());
// dbWaybill.setDispatchManCode(this.getDispatchManCode());
// dbWaybill.setDispatchDate(this.getDispatchDate());
// dbWaybill.setDispatchSiteCode(this.getDispatchSiteCode());
dbWaybill.setDispatchSiteCode(this.getDispatchSiteCode());
// dbWaybill.setProduceBillDate(this.getProduceBillDate());
// dbWaybill.setProduceBillSiteCode(this.getProduceBillSiteCode());
// dbWaybill.setProduceBillManCode(this.getProduceBillManCode());