From e03ad6269e3454f87039b662464f13b0f50786a0 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 5 Jun 2024 19:29:43 +0800
Subject: [PATCH] md

---
 .../main/java/com/xdadan/erp/emis/domain/EmisWaybill.java | 4 ++--
 .../java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java  | 8 ++++++--
 2 files changed, 8 insertions(+), 4 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 a51be8b61..57bf82da1 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
@@ -219,7 +219,7 @@ public class EmisWaybill extends BaseEntity
     private String blSpecialQuote;
     /* 是否超长 */
     private String blOverLong;
-    /* 是否出账 */
+    /* 是否付款 */
     private String blBill;
     /* 账单备注 */
     private String blBillText;
@@ -295,7 +295,7 @@ public class EmisWaybill extends BaseEntity
     /* 派件人代码 */
     private String dispatchManCode;
     /* 派件时间 */
-    private String dispatchDate;
+    private Date dispatchDate;
     /* 派件网点代码 */
     private String dispatchSiteCode;
     /* 生成账单时间 */
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 b5ab11d2f..127547919 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
@@ -199,8 +199,12 @@ public class WaybillOrder  implements Serializable {
     /* 发件网点代码 */
     private String sendSiteCode;
 
+    /* 派件人代码 */
+    private String dispatchManCode;
     /* 派件网点代码 */
     private String dispatchSiteCode;
+    /* 派件时间 */
+    private Date dispatchDate;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date sendDate;
@@ -547,8 +551,8 @@ public class WaybillOrder  implements Serializable {
 
         voItem.setSendSiteName(dbWaybill.getSendSiteName());
 
-//        voItem.setDispatchManCode(dbWaybill.getDispatchManCode());
-//        voItem.setDispatchDate(dbWaybill.getDispatchDate());
+        voItem.setDispatchManCode(dbWaybill.getDispatchManCode());
+        voItem.setDispatchDate(dbWaybill.getDispatchDate());
         voItem.setDispatchSiteCode(dbWaybill.getDispatchSiteCode());
 //        voItem.setProduceBillDate(dbWaybill.getProduceBillDate());
 //        voItem.setProduceBillSiteCode(dbWaybill.getProduceBillSiteCode());