md

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

@@ -239,10 +239,44 @@ public class WaybillOrder  implements Serializable {
     private String remark;
 
 
-    private String sendSiteName;
+    /* 扩展信息 */
     /* 是否生成子单 1-是 0-否 */
     private String blGenSubbill;
 
+    private String receiveCountryName;
+    private String receiveProvinceName;
+    private String receiveCityName;
+
+    private String sendCountryName;
+    private String sendProvinceName;
+    private String sendCityName;
+
+    private String transLineTypeName;
+    private String productTypeName;
+
+
+    //扩展信息-------
+
+    /* 寄件客户客户名称 */
+    private String customerName;
+
+    // 取件员
+    private String takePieceEmployeeName;
+
+    private String sendSiteName;
+    // 目的地名称
+    private String destinationName;
+    // 目的网点名称
+    private String dispatchUnderlingSiteName;
+
+    // 派件网点名称,派件人
+    private String dispatchSiteName;
+    private String dispatchManName;
+
+    // 打印
+    private String printManName;
+    private String printSiteName;
+
 
     /**
      * 转 VO
@@ -309,8 +343,17 @@ public class WaybillOrder  implements Serializable {
         voItem.setOrderDate(dbWaybill.getOrderDate());
         voItem.setUserId(dbWaybill.getUserId());
         voItem.setCustomerCode(dbWaybill.getCustomerCode());
+        voItem.setCustomerName(dbWaybill.getCustomerName());
+        voItem.setSendSiteName(dbWaybill.getSendSiteName());
+        voItem.setTakePieceEmployeeName(dbWaybill.getTakePieceEmployeeName());
+        voItem.setDestinationName(dbWaybill.getDestinationName());
+        voItem.setDispatchUnderlingSiteName(dbWaybill.getDispatchUnderlingSiteName());
+        voItem.setDispatchSiteName(dbWaybill.getDispatchSiteName());
+        voItem.setDispatchManName(dbWaybill.getDispatchManName());
+        voItem.setPrintManName(dbWaybill.getPrintManName());
+        voItem.setPrintSiteName(dbWaybill.getPrintSiteName());
+
 
-//        voItem.setCustomerName(dbWaybill.getCustomerName());
 //        voItem.setReceiveCustomerCode(dbWaybill.getReceiveCustomerCode());
 //        voItem.setReceiveCustomerName(dbWaybill.getReceiveCustomerName());
 //        voItem.setThirdCustomerCode(dbWaybill.getThirdCustomerCode());