From 05970911988e200c5de3ca08ea836ce61aa1bcb9 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sun, 28 Apr 2024 11:03:45 +0800
Subject: [PATCH] md

---
 .../erp/emis/domain/vo/WaybillOrder.java      | 39 +++++--------------
 1 file changed, 9 insertions(+), 30 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java
index b7e90a42c..f77e3e33f 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java
@@ -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());