diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsMapTraceController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsMapTraceController.java
index ab0396117..aa45d641d 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsMapTraceController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsMapTraceController.java
@@ -48,6 +48,18 @@ public class EmisTmsMapTraceController extends BaseController
     @Autowired
     private IEmisTmsMapTraceService emisTmsMapTraceService;
 
+
+    @GetMapping("/getDeviceNoByBillCode")
+    public AjaxResult getDeviceNoByBillCode(EmisTmsMapTrace emisTmsMapTrace)
+    {
+        EmisTmsMapTrace rst=emisTmsMapTraceService.getDeviceNoByBillCode(emisTmsMapTrace.getBillCode());
+        if(rst!=null){
+            return AjaxResult.success("成功",rst.getDeviceNo());
+        }else{
+            return AjaxResult.success("成功","-1");
+        }
+    }
+
     /**
      * 查询可视化物流轨迹列表
      */
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsMapTrace.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsMapTrace.java
index 4ad02ed10..f751346de 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsMapTrace.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsMapTrace.java
@@ -49,4 +49,8 @@ public class EmisTmsMapTrace extends BaseEntity
     /* 最后地点 */
     private String lastLocationInfo;
 
+
+    // 扩展
+    private String billCode;
+
 }
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsMapTraceMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsMapTraceMapper.java
index 36f3a50e1..34aab1f37 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsMapTraceMapper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsMapTraceMapper.java
@@ -28,6 +28,24 @@ public interface EmisTmsMapTraceMapper extends BaseMapper<EmisTmsMapTrace>
      */
     public EmisTmsMapTrace selectEmisTmsMapTraceById(Long id);
 
+
+    /**
+     * 根据运单号获取设备号
+     * @param billCode
+     * @return
+     */
+    public EmisTmsMapTrace selectEmisTmsMapTraceByBillCode(String billCode);
+
+
+    /**
+     * 根据运单获取对应的批次获取设备号
+     * @param billCode
+     * @return
+     */
+    public EmisTmsMapTrace selectEmisTmsMapTraceFromSiteBatch(String billCode);
+
+
+
     /**
      * 查询列表
      * 
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsMapTraceService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsMapTraceService.java
index 49da4275c..d4f88678c 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsMapTraceService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsMapTraceService.java
@@ -27,6 +27,14 @@ public interface IEmisTmsMapTraceService
      */
     public EmisTmsMapTrace selectEmisTmsMapTraceById(Long id);
 
+
+   /**
+    * 根据运单号获取设备号
+    * @param billCode
+    * @return
+    */
+    public EmisTmsMapTrace getDeviceNoByBillCode(String billCode);
+
     /**
      * 查询可视化物流轨迹列表
      * 
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsMapTraceServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsMapTraceServiceImpl.java
index ce826e90e..634971bf2 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsMapTraceServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsMapTraceServiceImpl.java
@@ -42,6 +42,17 @@ public class EmisTmsMapTraceServiceImpl implements IEmisTmsMapTraceService
     }
 
 
+    @Override
+    public EmisTmsMapTrace getDeviceNoByBillCode(String billCode)
+    {
+        EmisTmsMapTrace emisTmsMapTrace=emisTmsMapTraceMapper.selectEmisTmsMapTraceByBillCode(billCode);
+        if(emisTmsMapTrace!=null){
+            return emisTmsMapTrace;
+        }
+        return emisTmsMapTraceMapper.selectEmisTmsMapTraceFromSiteBatch(billCode);
+    }
+
+
     /**
      * 查询可视化物流轨迹列表
      * 
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsMapTraceMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsMapTraceMapper.xml
index 5414f23c6..9985abb27 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsMapTraceMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsMapTraceMapper.xml
@@ -61,12 +61,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            and update_site = #{updateSite}
 		limit 1
 	</select>
-  
+
+    <!-- 根据单号获取设备号，优先获取绑定的设备号 -->
+    <select id="selectEmisTmsMapTraceByBillCode" parameterType="String" resultMap="EmisTmsMapTraceResult">
+        select  device_no
+        from emis_tms_map_trace a
+        where a.del_flag='0' and a.trace_type='1'
+            and a.order_no = #{billCode}
+            order by create_time desc
+         limit 1
+    </select>
+
+    <select id="selectEmisTmsMapTraceFromSiteBatch" parameterType="String" resultMap="EmisTmsMapTraceResult">
+        select  a.device_no
+        from emis_tms_map_trace a,emis_tms_site_batch b
+        where a.del_flag = '0' and b.del_flag='0' AND a.trace_type = '2' and a.order_no=b.batch_no
+            and b.bill_code=#{billCode}
+            order by a.create_time desc
+         limit 1
+    </select>
+
+
+
     <select id="selectEmisTmsMapTraceById" parameterType="Long" resultMap="EmisTmsMapTraceResult">
         select id, order_no, device_no, trace_type, last_trace_date, last_trace_status, last_location_info, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site 
         from emis_tms_map_trace a
         where a.id = #{id}
     </select>
+
+
+
         
     <insert id="insertEmisTmsMapTrace" parameterType="EmisTmsMapTrace" useGeneratedKeys="true" keyProperty="id">
         insert into emis_tms_map_trace