From 43e09edad7743cd797ec54bf314b9ca34cb0bfa4 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 26 Jun 2024 06:50:03 +0800
Subject: [PATCH] md

---
 .../erp/web/emis/EmisStaffController.java     |  5 ++-
 .../xdadan/erp/emis/domain/EmisWaybill.java   | 42 +++++++++++++++++--
 .../resources/mapper/EmisWaybillMapper.xml    |  2 +-
 3 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisStaffController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisStaffController.java
index a08371416..a1d16c99b 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisStaffController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisStaffController.java
@@ -62,11 +62,12 @@ public class EmisStaffController extends EmisBaseController
      * 获取取件员列表
      */
 //    @PreAuthorize("@ss.hasPermi('system:user:list')")
-    @JacksonFilter(include= {"empCode","empName","ownerSiteCode","ownerSiteName"},value= SysUser.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
+    @JacksonFilter(include= {"userId","empCode","empName","ownerSiteCode","ownerSiteName"},value= SysUser.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
     @GetMapping("/getStaffList")
-    public TableDataInfo getStaffList(String postCode,String empCode,String ownerSiteCode,String searchValue)
+    public TableDataInfo getStaffList(Long userId,String postCode,String empCode,String ownerSiteCode,String searchValue)
     {
         SysUser queryUser = new SysUser();
+        queryUser.setUserId(userId);
 
         Long[] postIds = null;
         if(!StringUtils.isEmpty(postCode)) {
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 259ac477f..0d741ceaa 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
@@ -432,86 +432,120 @@ public class EmisWaybill extends BaseEntity
     /* 是否敏感物 */
     private String blSpecialGoods;
 
-
-
+    @TableField(exist = false)
     private List<EmisWaybillCargo> cargoList;
+    @TableField(exist = false)
     private List<EmisWaybillFeeitem> feeitemList;
+    @TableField(exist = false)
     private List<EmisWaybillAttachment> attachmentList;
 
 
 
     /* 扩展信息 */
+    @TableField(exist = false)
     private String receiveCountryName;
+    @TableField(exist = false)
     private String receiveProvinceName;
+    @TableField(exist = false)
     private String receiveCityName;
+    @TableField(exist = false)
     private String receiveCountyName;
 
+    @TableField(exist = false)
     private String sendCountryName;
+    @TableField(exist = false)
     private String sendProvinceName;
+    @TableField(exist = false)
     private String sendCityName;
+    @TableField(exist = false)
     private String sendCountyName;
-
+    @TableField(exist = false)
     private String transLineTypeName;
+    @TableField(exist = false)
     private String productTypeName;
 
 
     /* 录单站点 */
+    @TableField(exist = false)
     private String registerSiteName;
     /* 录单人 */
+    @TableField(exist = false)
     private String registerManName;
 
     // 取件员 取件员电话
+    @TableField(exist = false)
     private String takePieceEmployeeName;
+    @TableField(exist = false)
     private String takePieceEmployeePhone;
     // 操作员
-
+    @TableField(exist = false)
     private String operateEmployeeName;
 
+    @TableField(exist = false)
     private String sendSiteName;
     // 目的地名称
+    @TableField(exist = false)
     private String destinationName;
     // 目的网点名称
+    @TableField(exist = false)
     private String dispatchUnderlingSiteName;
 
     // 派件网点名称,派件人
+    @TableField(exist = false)
     private String dispatchSiteName;
+    @TableField(exist = false)
     private String dispatchManName;
 
     // 当前网点 下一网点 上一网点
+    @TableField(exist = false)
     private String currentSiteName;
+    @TableField(exist = false)
     private String nextSiteName;
+    @TableField(exist = false)
     private String lastSiteName;
 
     // 打印
+    @TableField(exist = false)
     private String printManName;
+    @TableField(exist = false)
     private String printSiteName;
 
     // 销售,回款
+    @TableField(exist = false)
     private String salesmenName;
+    @TableField(exist = false)
     private String payeeName;
 
     // 最后一条跟踪记录
+    @TableField(exist = false)
     private String lastTraceInfo;
 
     // 问题件类型
+    @TableField(exist = false)
     private String problemTypeName;
 
 
 
     // 最近一条扫描记录
+    @TableField(exist = false)
     private EmisTmsScanRecord lastScanRecord;
 
     // - 揽收底单图片
     // - 签收底单图片
     /* 揽收图片备注 */
+    @TableField(exist = false)
     private String billPicSendRmk;
     /* 签收底单图片 */
+    @TableField(exist = false)
     private String billPicDispatchRmk;
     // - 货物图片
+    @TableField(exist = false)
     private String billPicGoodsRmk;
 
     // 是否已锁单 T,锁单原因
+    @TableField(exist = false)
     private String lockFlag;
+    @TableField(exist = false)
     private String lockReason;
 
 }
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 384d68772..7c2a9f54d 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -693,6 +693,7 @@
                 and a.trans_line_type in(
                     select line_code from emis_trans_line etl where  etl.trans_type=1
                 )
+                and bl_sign!='1' and waybill_status!='40'
                 and a.send_site_code=#{params.privSiteCode} and a.current_site_code=#{params.privSiteCode}
             </if>
 
@@ -703,7 +704,6 @@
             </if>
 
 
-
             <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
                 and (
                     a.send_site_code in (