From 053dd0702da46be1ac73d25e24016ddf6ae5db0c Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sun, 28 Apr 2024 16:44:16 +0800
Subject: [PATCH] md

---
 .../xdadan/erp/emis/domain/EmisWaybill.java   |  3 +++
 .../erp/emis/domain/vo/WaybillOrder.java      | 19 +++++++++++++------
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
index 5c260fb60..364f7d9d7 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
@@ -349,4 +349,7 @@ public class EmisWaybill extends BaseEntity
     private List<EmisWaybillAttachment> attachmentList;
 
 
+    private String sendSiteName;
+
+
 }
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 5b6f8e789..459cf6070 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
@@ -179,6 +179,9 @@ public class WaybillOrder  implements Serializable {
     /* 取件员代码 */
     private String takePieceEmployeeCode;
 
+    /* 登记站点代码 */
+    private String registerSiteCode;
+
     /* 发件网点代码 */
     private String sendSiteCode;
 
@@ -236,6 +239,9 @@ public class WaybillOrder  implements Serializable {
     private String remark;
 
 
+    private String sendSiteName;
+
+
     /**
      * 转 VO
      * @param dbWaybill
@@ -424,7 +430,7 @@ public class WaybillOrder  implements Serializable {
 //        voItem.setCurrentSiteCode(dbWaybill.getCurrentSiteCode());
 //        voItem.setNextSiteCode(dbWaybill.getNextSiteCode());
 //        voItem.setLastSiteCode(dbWaybill.getLastSiteCode());
-//        voItem.setRegisterSiteCode(dbWaybill.getRegisterSiteCode());
+        voItem.setRegisterSiteCode(dbWaybill.getRegisterSiteCode());
 //        voItem.setRegisterDate(dbWaybill.getRegisterDate());
 //        voItem.setRegisterManCode(dbWaybill.getRegisterManCode());
 
@@ -432,6 +438,8 @@ public class WaybillOrder  implements Serializable {
         voItem.setSendSiteCode(dbWaybill.getSendSiteCode());
         voItem.setSendDate(dbWaybill.getSendDate());
 
+        voItem.setSendSiteName(dbWaybill.getSendSiteName());
+
 //        voItem.setDispatchManCode(dbWaybill.getDispatchManCode());
 //        voItem.setDispatchDate(dbWaybill.getDispatchDate());
         voItem.setDispatchSiteCode(dbWaybill.getDispatchSiteCode());
@@ -474,10 +482,6 @@ public class WaybillOrder  implements Serializable {
 //        voItem.setUpdateSite(dbWaybill.getUpdateSite());
 
 
-
-
-
-
         return voItem;
     }
 
@@ -633,12 +637,15 @@ public class WaybillOrder  implements Serializable {
 //        dbWaybill.setCurrentSiteCode(this.getCurrentSiteCode());
 //        dbWaybill.setNextSiteCode(this.getNextSiteCode());
 //        dbWaybill.setLastSiteCode(this.getLastSiteCode());
-//        dbWaybill.setRegisterSiteCode(this.getRegisterSiteCode());
+        dbWaybill.setRegisterSiteCode(this.getRegisterSiteCode());
 //        dbWaybill.setRegisterDate(this.getRegisterDate());
 //        dbWaybill.setRegisterManCode(this.getRegisterManCode());
         dbWaybill.setTakePieceEmployeeCode(this.getTakePieceEmployeeCode());
         dbWaybill.setSendSiteCode(this.getSendSiteCode());
         dbWaybill.setSendDate(this.getSendDate());
+
+        dbWaybill.setSendSiteName(this.getSendSiteName());
+
 //        dbWaybill.setDispatchManCode(this.getDispatchManCode());
 //        dbWaybill.setDispatchDate(this.getDispatchDate());
         dbWaybill.setDispatchSiteCode(this.getDispatchSiteCode());