md

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

@@ -83,4 +83,13 @@ public interface EmisTmsTransferTraceMapper extends BaseMapper<EmisTmsTransferTr
      * @return 结果
      */
     public int deleteEmisTmsTransferTraceByIds(Long[] ids);
+
+
+    /**
+     * 删除 by billCode
+     *
+     * @param billCode 主键
+     * @return 结果
+     */
+    public int deleteEmisTmsTransferTraceByBillCode(String billCode);
 }

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

@@ -357,10 +357,14 @@ public class EmisBaseService {
          emisTmsTransferTrace.setBillCode(billCode);
          emisTmsTransferTrace.setTransferBillCode(transferBillcode);
          emisTmsTransferTrace.setTransferExpress(transferCode);
-         int rst=emisTmsTransferTraceMapper.checkUnique(emisTmsTransferTrace);
+         // 先删除历史跟踪，插入新的跟踪记录
-         if(rst==0){
+         emisTmsTransferTraceMapper.deleteEmisTmsTransferTraceByBillCode(billCode);
-             emisTmsTransferTraceMapper.insertEmisTmsTransferTrace(emisTmsTransferTrace);
+         emisTmsTransferTraceMapper.insertEmisTmsTransferTrace(emisTmsTransferTrace);
-         }
+
+//         int rst=emisTmsTransferTraceMapper.checkUnique(emisTmsTransferTrace);
+//         if(rst==0){
+//             emisTmsTransferTraceMapper.insertEmisTmsTransferTrace(emisTmsTransferTrace);
+//         }
 
      }
 
@@ -379,11 +383,8 @@ public class EmisBaseService {
       */
      public  List<EmisTmsScanRecord> cvtTransferTraceToScanRecord(String billCode) {
          try {
-//             log.error("====>三方记录查询11111");
              EmisTmsTransferTrace emisTmsTransferTrace = getEmisTmsTransferTraceByBillCode(billCode);
-
              if(emisTmsTransferTrace!=null){
-//                 log.error("====>三方记录查询222:"+JSON.toJSONString(emisTmsTransferTrace)+";");
                  return Kd100Helper.cvtTraceToScanRecord(billCode,emisTmsTransferTrace.getTraceInfo());
              }
          } catch (Exception e) {

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

@@ -63,16 +63,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		select count(1) from  emis_tms_transfer_trace
 		where del_flag='0'
            and bill_code = #{billCode}
-
+            <if test="transferExpress != null  and transferExpress != ''">
+                and transfer_express = #{transferExpress}
+            </if>
+            <if test="transferBillCode != null  and transferBillCode != ''">
+                and transfer_bill_code = #{transferBillCode}
+            </if>
 		limit 1
 	</select>
 
-<!--    <if test="transferExpress != null  and transferExpress != ''">-->
+
-<!--        and transfer_express = #{transferExpress}-->
-<!--    </if>-->
-<!--    <if test="transferBillCode != null  and transferBillCode != ''">-->
-<!--        and transfer_bill_code = #{transferBillCode}-->
-<!--    </if>-->
   
     <select id="selectEmisTmsTransferTraceById" parameterType="Long" resultMap="EmisTmsTransferTraceResult">
         select id, bill_code, last_trace_date, last_waybill_status, trace_info, ch_id, transfer_bill_code, transfer_express, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site 
@@ -81,9 +81,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectEmisTmsTransferTraceByBillCode" parameterType="String" resultMap="EmisTmsTransferTraceResult">
-        select id, bill_code, last_trace_date, last_waybill_status, trace_info, ch_id, transfer_bill_code, transfer_express, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
+        select
-        from emis_tms_transfer_trace a
+            a.id, a.bill_code, a.last_trace_date, a.last_waybill_status, a.trace_info, a.ch_id,
-        where a.bill_code = #{billCode}
+            a.transfer_bill_code, a.transfer_express, a.remark, a.del_flag, a.create_by, a.create_time,
+            a.update_by, a.update_time, a.create_site,
+            a.update_site
+        from emis_tms_transfer_trace a,emis_waybill b
+        where a.del_flag='0' and b.del_flag='0'
+         and a.bill_code=b.bill_code and a.transfer_express=b.transfer_code and a.transfer_bill_code=b.transfer_billcode
+         and a.bill_code = #{billCode}
     </select>
 
         
@@ -149,6 +155,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+    <delete id="deleteEmisTmsTransferTraceByBillCode" parameterType="String">
+        update emis_tms_transfer_trace set del_flag='1' where bill_code = #{billCode},
+    </delete>
+
     <delete id="deleteEmisTmsTransferTraceById" parameterType="Long">
         update emis_tms_transfer_trace set del_flag='1' where id = #{id}
     </delete>