From 88e823bb6c7ac1b5a443c4902848aa6c19049189 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sun, 5 Jan 2025 12:36:48 +0800
Subject: [PATCH] md

---
 .../web/emis/EmisTmsScanRecordController.java | 33 +++++++++
 .../emis/mapper/EmisTmsScanRecordMapper.java  |  7 ++
 .../service/IEmisTmsScanRecordService.java    |  2 +
 .../impl/EmisTmsScanRecordServiceImpl.java    |  7 ++
 .../mapper/EmisTmsScanRecordMapper.xml        | 72 ++++++++++++++++++-
 5 files changed, 119 insertions(+), 2 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java
index 55d21dbd4..186cf4d9a 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java
@@ -326,6 +326,39 @@ public class EmisTmsScanRecordController extends EmisBaseController
         return getDataTable(list);
     }
 
+    /**
+     * 查询TMS扫描记录列表
+     */
+    @GetMapping("/scanMonitorList")
+    public TableDataInfo scanMonitorList(EmisTmsScanRecord emisTmsScanRecord)
+    {
+        startPage();
+
+        // 设置通用权限查询参数
+        setPrivParams(emisTmsScanRecord);
+
+        if(!StringUtils.isEmpty(emisTmsScanRecord.getBillCode())){
+            emisTmsScanRecord.setBillCode(WaybillHelper.formatQueryValue(emisTmsScanRecord.getBillCode()));
+            String[] billCodeSortList = emisTmsScanRecord.getBillCode().split(",");
+            if(billCodeSortList.length>1){
+                emisTmsScanRecord.getParams().put("billCodeSortList",Arrays.asList(billCodeSortList));
+            }
+        }
+
+        if(!StringUtils.isEmpty(emisTmsScanRecord.getOrderSn())){
+            emisTmsScanRecord.setOrderSn(WaybillHelper.formatQueryValue(emisTmsScanRecord.getOrderSn()));
+            String[] orderSnSortList = emisTmsScanRecord.getOrderSn().split(",");
+            if(orderSnSortList.length>1){
+                emisTmsScanRecord.getParams().put("orderSnSortList",Arrays.asList(orderSnSortList));
+            }
+        }
+
+
+        List<EmisTmsScanRecord> list = emisTmsScanRecordService.selectMonitorScanRecordList(emisTmsScanRecord);
+
+        return getDataTable(list);
+    }
+
 
     /**
      * 快件跟踪
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsScanRecordMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsScanRecordMapper.java
index b3b02efaf..95f506737 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsScanRecordMapper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsScanRecordMapper.java
@@ -54,6 +54,13 @@ public interface EmisTmsScanRecordMapper extends BaseMapper<EmisTmsScanRecord>
      */
     public List<EmisTmsScanRecord> selectEmisTmsScanRecordList(EmisTmsScanRecord emisTmsScanRecord);
 
+    /**
+     * 对比监控
+     * @param emisTmsScanRecord
+     * @return
+     */
+    public List<EmisTmsScanRecord> selectMonitorScanRecordList(EmisTmsScanRecord emisTmsScanRecord);
+
     public List<EmisTmsScanRecord> queryScanWaybillList(EmisTmsScanRecord emisTmsScanRecord);
 
 
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsScanRecordService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsScanRecordService.java
index 6d5b8456c..d22cbd79b 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsScanRecordService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsScanRecordService.java
@@ -46,6 +46,8 @@ public interface IEmisTmsScanRecordService extends IDataAuditService
      */
     public List<EmisTmsScanRecord> selectEmisTmsScanRecordList(EmisTmsScanRecord emisTmsScanRecord);
 
+    public List<EmisTmsScanRecord> selectMonitorScanRecordList(EmisTmsScanRecord emisTmsScanRecord);
+
 
 
 
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
index 357acd177..f82db40a4 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
@@ -130,6 +130,13 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
      * @param emisTmsScanRecord TMS扫描记录
      * @return TMS扫描记录
      */
+    @Override
+    public List<EmisTmsScanRecord> selectMonitorScanRecordList(EmisTmsScanRecord emisTmsScanRecord)
+    {
+        List<EmisTmsScanRecord> listTraceList = emisTmsScanRecordMapper.selectMonitorScanRecordList(emisTmsScanRecord);
+        return listTraceList;
+    }
+
     @Override
     public List<EmisTmsScanRecord> selectEmisTmsScanRecordList(EmisTmsScanRecord emisTmsScanRecord)
     {
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
index ef75ba6f2..84ef66bc8 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
@@ -322,7 +322,8 @@
 
 
     <select id="selectEmisTmsScanRecordList" parameterType="EmisTmsScanRecord" resultMap="EmisTmsScanRecordResult">
-        <include refid="selectEmisTmsScanRecordVo"/>
+        select id, bill_code, main_bill_code, bl_sub_bill, order_sn, scan_type, pre_or_next_station, pre_or_next_station_code, pre_or_next_station_phone, pre_or_next_man_code, pre_or_next_man_phone, scan_date, scan_man_code, scan_man_phone, scan_man, pre_or_next_man, scan_site, scan_site_code, scan_site_phone, scan_weight, weight, dest_site_code, dest_code, dispatch_or_send_man, dispatch_or_send_man_code, dispatch_or_send_man_phone, sign_date, sign_man, sign_site, sign_site_code, record_man, record_man_code, record_man_phone, record_site_code, car_no, bag_no, truck_man, truck_code, data_from, pic_url, public_trace_info, inner_trace_info, rel_id, status, del_flag, create_by, create_time, update_by, update_time, remark, update_site, create_site
+        from emis_tms_scan_record a
         <where>
 
             del_flag='0'
@@ -419,7 +420,6 @@
                 and scan_type not in('50','51','-1')
             </if>
 
-
             <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
                 and scan_site_code in (
                     SELECT t1.site_code FROM (
@@ -452,6 +452,74 @@
     </select>
 
 
+    <select id="selectMonitorScanRecordList" parameterType="EmisTmsScanRecord" resultMap="EmisTmsScanRecordResult">
+        select id, bill_code, main_bill_code, bl_sub_bill, order_sn, scan_type, pre_or_next_station, pre_or_next_station_code, pre_or_next_station_phone, pre_or_next_man_code, pre_or_next_man_phone, scan_date, scan_man_code, scan_man_phone, scan_man, pre_or_next_man, scan_site, scan_site_code, scan_site_phone, scan_weight, weight, dest_site_code, dest_code, dispatch_or_send_man, dispatch_or_send_man_code, dispatch_or_send_man_phone, sign_date, sign_man, sign_site, sign_site_code, record_man, record_man_code, record_man_phone, record_site_code, car_no, bag_no, truck_man, truck_code, data_from, pic_url, public_trace_info, inner_trace_info, rel_id, status, del_flag, create_by, create_time, update_by, update_time, remark, update_site, create_site
+        from emis_tms_scan_record a
+        <where>
+            del_flag='0'
+            <if test="preOrNextStationCode != null  and preOrNextStationCode != ''"> and pre_or_next_station_code=#{preOrNextStationCode}</if>
+            <if test="scanDate != null "> and scan_date like concat('%', #{scanDate}, '%')</if>
+            <if test="scanSiteCode != null  and scanSiteCode != ''"> and scan_site_code=#{scanSiteCode}</if>
+            <if test="destSiteCode != null  and destSiteCode != ''"> and dest_site_code=#{destSiteCode}</if>
+            <if test="destCode != null  and destCode != ''"> and dest_code like concat('%', #{destCode}, '%')</if>
+
+            <if test="params.beginScanDate != null and params.beginScanDate != ''">
+                and  scan_date <![CDATA[ >= ]]>  #{params.beginScanDate}
+            </if>
+            <if test="params.endScanDate != null and params.endScanDate != ''">
+                and  scan_date <![CDATA[ <= ]]>  #{params.endScanDate}
+            </if>
+
+            and EXISTS(
+                select 1 from emis_waybill  ewb
+                where
+                    ewb.del_flag='0' and ewb.order_status !='0'
+                    and a.main_bill_code=ewb.bill_code
+                    and  not EXISTS (
+                        select 1 from emis_waybill_problem_info ewpi where ewpi.bill_code=ewb.bill_code and  ewpi.del_flag='0' and  ewpi.`problem_type` in(151,173,170)
+                    )
+
+                    <if test="params.dispatchUnderlingSiteCode != null  and params.dispatchUnderlingSiteCode != ''">
+                        and ewb.dispatch_underling_site_code= #{params.dispatchUnderlingSiteCode}
+                    </if>
+
+
+                    <if test="params.transLineType != null  and params.transLineType != ''">
+                        and ewb.trans_line_type=#{params.transLineType}
+                     </if>
+                    <if test="params.productType != null  and params.productType != ''">
+                     and ewb.product_type=#{params.productType}
+                     </if>
+
+            )
+
+            <!--  有发未到 -->
+            <if test="params.queryHasSendNotArrive != null and params.queryHasSendNotArrive == 1 ">
+                and scan_type='20'
+                and not exists (
+                select 1 from emis_tms_scan_record b
+                where b.del_flag='0' and a.bill_code=b.bill_code
+                and b.scan_site=a.pre_or_next_station_code
+                and b.scan_type='30'
+                )
+            </if>
+
+            <!--  有到未发 -->
+            <if test="params.queryHasArriveNotSend != null and params.queryHasArriveNotSend == 1 ">
+                and scan_type='30'
+                and not exists (
+                select 1 from emis_tms_scan_record b
+                where b.del_flag='0' and a.bill_code=b.bill_code
+                    and b.pre_or_next_station_code=a.scan_site and b.scan_type='20'
+                )
+            </if>
+
+
+        </where>
+        ORDER BY scan_date desc
+    </select>
+
+
     <!--快件跟踪服务查询，没有权限限制-->
     <select id="queryScanWaybillList" parameterType="EmisTmsScanRecord" resultMap="EmisTmsScanRecordResult">
         select distinct bill_code, main_bill_code