From 7594a2d0e830cac67d73e19b69ca1ed7fba476d4 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 23 May 2024 15:08:07 +0800
Subject: [PATCH] md

---
 .../xdadan/erp/web/emis/EmisWaybillController.java   | 12 ++++++++++++
 .../java/com/xdadan/erp/emis/domain/EmisWaybill.java |  5 ++++-
 .../com/xdadan/erp/emis/domain/vo/WaybillOrder.java  | 11 +++++++++--
 .../emis/service/impl/EmisWaybillServiceImpl.java    |  5 +++++
 4 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
index 1249be954..e78262927 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
@@ -23,6 +23,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter;
 import com.xdadan.erp.common.config.PayConfig;
+import com.xdadan.erp.common.core.domain.entity.SysUser;
 import com.xdadan.erp.common.utils.DateUtils;
 import com.xdadan.erp.common.utils.file.FileUtils;
 import com.xdadan.erp.common.utils.idgen.UUID;
@@ -34,6 +35,8 @@ import com.xdadan.erp.emis.service.print.IXddTplPrint;
 import com.xdadan.erp.emis.service.print.tanex.TanexTplPrintImpl;
 import com.xdadan.erp.system.domain.SysFileInfo;
 import com.xdadan.erp.system.service.ISysFileInfoService;
+import com.xdadan.erp.system.service.ISysUserService;
+import com.xdadan.erp.system.service.impl.SysUserServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,6 +74,9 @@ public class EmisWaybillController extends BaseController
     @Autowired
     private ISysFileInfoService sysFileInfoService;
 
+    @Autowired
+    private ISysUserService sysUserService;
+
 
 
     @Autowired
@@ -101,6 +107,12 @@ public class EmisWaybillController extends BaseController
                 }
             }
 
+            // 获取取件员电话
+            if(!StringUtils.isEmpty(waybillOrder.getTakePieceEmployeeCode())){
+               SysUser user= sysUserService.selectUserByUserName(waybillOrder.getTakePieceEmployeeCode());
+                waybillOrder.setTakePieceEmployeePhone(user.getPhonenumber());
+            }
+
             return AjaxResult.success("获取成功",waybillOrder);
         }
         catch (Exception ex){
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 490a5317a..fe4223195 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
@@ -388,8 +388,11 @@ public class EmisWaybill extends BaseEntity
     /* 录单人 */
     private String registerManName;
 
-    // 取件员 ,操作员
+    // 取件员 取件员电话
     private String takePieceEmployeeName;
+    private String takePieceEmployeePhone;
+    // 操作员
+
     private String operateEmployeeName;
 
     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 f46182f13..8b2ef67c2 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
@@ -36,6 +36,11 @@ public class WaybillOrder  implements Serializable {
     /* 客户单号，合同号 */
     private String custOrderId;
 
+    /* 订单状态  字典 */
+    private String orderStatus;
+    /* 运单状态 字典 */
+    private String waybillStatus;
+
     /* 运单号 */
     private String billCode;
 
@@ -262,6 +267,8 @@ public class WaybillOrder  implements Serializable {
 
     // 取件员
     private String takePieceEmployeeName;
+    private String takePieceEmployeePhone;
+
     // 操作员
     private String operateEmployeeName;
 
@@ -375,8 +382,8 @@ public class WaybillOrder  implements Serializable {
         voItem.setBillCode(dbWaybill.getBillCode());
         voItem.setBillCodeSub(dbWaybill.getBillCodeSub());
 
-//        voItem.setOrderStatus(dbWaybill.getOrderStatus());
-//        voItem.setWaybillStatus(dbWaybill.getWaybillStatus());
+        voItem.setOrderStatus(dbWaybill.getOrderStatus());
+        voItem.setWaybillStatus(dbWaybill.getWaybillStatus());
 //        voItem.setOrderType(dbWaybill.getOrderType());
 
         voItem.setOrderDate(dbWaybill.getOrderDate());
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
index d7c0394a0..89fb8a5a6 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
@@ -31,6 +31,7 @@ import com.xdadan.erp.emis.mapper.EmisRegionMapper;
 import com.xdadan.erp.emis.mapper.EmisTransLineMapper;
 import com.xdadan.erp.emis.service.*;
 import com.xdadan.erp.emis.utils.WaybillHelper;
+import com.xdadan.erp.system.service.ISysUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -66,6 +67,8 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
     private EmisTransLineMapper emisTransLineMapper;
 
 
+
+
     /**
      * 精准查询 查询运单列表 by billCode
      *
@@ -175,6 +178,8 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
             return null;
         }
 
+
+
         // 收费项 // 查询收费项
         EmisWaybillFeeitem queryFeeitem = new EmisWaybillFeeitem();
         queryFeeitem.setWaybillId(dbEmisWaybill.getId());