md

emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java

@@ -233,6 +233,27 @@ public class EmisTmsScanRecordController extends EmisBaseController
     }
 
 
+
+    /**
+     * 查询运单最后一条轨迹
+     * @param billCode
+     * @return
+     */
+    @GetMapping("/queryLastRecord")
+    public AjaxResult queryLastRecord(String billCode)
+    {
+        if(StringUtils.isEmpty(billCode)){
+//            return AjaxResult.error("运单号不能为空");
+            return AjaxResult.success("查询成功","");
+        }
+
+        EmisTmsScanRecord lastScanRecord=emisTmsScanRecordService.selectLastRecord(billCode);
+        String traceStr=emisBaseService.cvtScanRecordToTraceStr(lastScanRecord,true);
+
+        return AjaxResult.success("查询成功",traceStr);
+    }
+
+
     /**
      * 查询TMS扫描记录列表
      */

emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java

@@ -473,6 +473,7 @@ public class EmisWaybillController extends EmisBaseController
 
     }
 
+
     /**
      * 查询运单列表列表
      */
@@ -504,6 +505,10 @@ public class EmisWaybillController extends EmisBaseController
         return getDataTable(list);
     }
 
+
+
+
+
     /**
      * 查询订单列表
      */

emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsScanRecordMapper.java

@@ -37,6 +37,9 @@ public interface EmisTmsScanRecordMapper extends BaseMapper<EmisTmsScanRecord>
      */
     public EmisTmsScanRecord selectEmisTmsScanRecordById(Long id);
 
+
+    public EmisTmsScanRecord selectLastRecordBaseInfoByBillCode(String billCode);
+
     /**
      * 查询列表
      * 

emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsScanRecordService.java

@@ -33,6 +33,8 @@ public interface IEmisTmsScanRecordService
      */
     public EmisTmsScanRecord selectEmisTmsScanRecordById(Long id);
 
+    public EmisTmsScanRecord selectLastRecord(String billCode);
+
     /**
      * 查询TMS扫描记录列表
      * 
@@ -60,6 +62,9 @@ public interface IEmisTmsScanRecordService
      */
     public int updateEmisTmsScanRecord(EmisTmsScanRecord emisTmsScanRecord);
 
+
+
+
     /**
      * 批量删除TMS扫描记录
      * 

emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java

@@ -87,6 +87,17 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
         return emisTmsScanRecordMapper.selectEmisTmsScanRecordById(id);
     }
 
+    /**
+     * 查询运单最后一条扫描记录
+     * @param billCode
+     * @return
+     */
+    @Override
+    public EmisTmsScanRecord selectLastRecord(String billCode)
+    {
+        return emisTmsScanRecordMapper.selectLastRecordBaseInfoByBillCode(billCode);
+    }
+
     /**
      * 查询TMS扫描记录列表
      * 

emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml

@@ -260,23 +260,6 @@
             )
     </select>
 
-    <select id="queryScanStatRecordList_old" parameterType="EmisTmsScanRecord" resultMap="EmisTmsScanRecordResult">
-        select  a.main_bill_code as bill_code,a.main_bill_code,a.bl_sub_bill,a.scan_type,max(scan_date) as scan_date,
-        a.pre_or_next_station,a.pre_or_next_station_code,a.scan_site, a.scan_site_code,a.scan_man,a.scan_man_code
-        from emis_tms_scan_record a,emis_waybill b
-        where  a.del_flag='0' and b.del_flag='0' and a.main_bill_code=b.bill_code and b.bl_sign!='1'
-        and a.main_bill_code in(
-            select  distinct x.main_bill_code
-            from emis_tms_scan_record x
-            where x.del_flag='0'  and x.scan_site_code=#{scanSiteCode}
-            and x.scan_type=#{scanType}
-            <if test="preOrNextStationCode != null  and preOrNextStationCode != ''"> and  x.pre_or_next_station_code=#{preOrNextStationCode}</if>
-            <if test="scanManCode != null  and scanManCode != ''"> and  x.scan_man_code=#{scanManCode}</if>
-            <if test="params.beginScanDate != null and params.beginScanDate != ''">and  x.scan_date <![CDATA[ >= ]]>  #{params.beginScanDate}</if>
-            <if test="params.endScanDate != null and params.endScanDate != ''">and  x.scan_date <![CDATA[ <= ]]>  #{params.endScanDate}</if>
-        )
-        GROUP BY  a.main_bill_code
-    </select>
 
     <!-- 获取订单最后一条扫描记录 -->
     <select id="selectLastRecordBaseInfoByBillCode" parameterType="string" resultMap="BaseEmisTmsScanRecordResult">