From 02e22c023dec6aae2e3a68f08b6595e8416fcf1e Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 21 Jan 2025 13:51:43 +0800
Subject: [PATCH] md

---
 .../erp/web/emis/EmisWaybillOperLogController.java  | 13 +++++++++++++
 .../erp/emis/mapper/EmisWaybillOperLogMapper.java   |  5 +++++
 .../emis/service/IEmisWaybillOperLogService.java    |  2 ++
 .../service/impl/EmisWaybillOperLogServiceImpl.java |  6 ++++++
 .../resources/mapper/EmisWaybillOperLogMapper.xml   | 10 ++++++++--
 5 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillOperLogController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillOperLogController.java
index 3a9511a04..83a8b8eef 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillOperLogController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillOperLogController.java
@@ -48,6 +48,19 @@ public class EmisWaybillOperLogController extends BaseController
     @Autowired
     private IEmisWaybillOperLogService emisWaybillOperLogService;
 
+
+    /**
+     * 获取操作记录
+     * @param billCode
+     * @return
+     */
+    @GetMapping("/getWaybillOperLog")
+    public TableDataInfo getWaybillOperLog(String billCode)
+    {
+        List<EmisWaybillOperLog> list = emisWaybillOperLogService.selectListByMainBillCode(billCode);
+        return getDataTable(list);
+    }
+
     /**
      * 查询运单操作日志列表
      */
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillOperLogMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillOperLogMapper.java
index 25c0c0371..647410e14 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillOperLogMapper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillOperLogMapper.java
@@ -13,6 +13,8 @@ package com.xdadan.erp.emis.mapper;
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xdadan.erp.emis.domain.EmisWaybillOperLog;
+import org.apache.ibatis.annotations.Param;
+
 /**
  * @ClassName EmisWaybillOperLogMapper
  * @Description <p> 运单操作日志 Mapper 接口 </p>
@@ -37,6 +39,9 @@ public interface EmisWaybillOperLogMapper extends BaseMapper<EmisWaybillOperLog>
     public List<EmisWaybillOperLog> selectEmisWaybillOperLogList(EmisWaybillOperLog emisWaybillOperLog);
 
 
+    public List<EmisWaybillOperLog> selectListByMainBillCode(@Param("mainBillCode") String mainBillCode);
+
+
      /**
      * 检查是否重复
      * 
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillOperLogService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillOperLogService.java
index 14931f437..80170af9e 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillOperLogService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillOperLogService.java
@@ -35,6 +35,8 @@ public interface IEmisWaybillOperLogService
      */
     public List<EmisWaybillOperLog> selectEmisWaybillOperLogList(EmisWaybillOperLog emisWaybillOperLog);
 
+    public List<EmisWaybillOperLog> selectListByMainBillCode(String mainBillCode);
+
 
     /**
      * 检查是否重复
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillOperLogServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillOperLogServiceImpl.java
index 5c70337e8..1d130f381 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillOperLogServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillOperLogServiceImpl.java
@@ -54,6 +54,12 @@ public class EmisWaybillOperLogServiceImpl implements IEmisWaybillOperLogService
         return emisWaybillOperLogMapper.selectEmisWaybillOperLogList(emisWaybillOperLog);
     }
 
+    @Override
+    public List<EmisWaybillOperLog> selectListByMainBillCode(String mainBillCode)
+    {
+        return emisWaybillOperLogMapper.selectListByMainBillCode(mainBillCode);
+    }
+
     /**
      * 检查是否重复
      * 
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillOperLogMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillOperLogMapper.xml
index 8f03f8e6b..a49a6b0ca 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillOperLogMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillOperLogMapper.xml
@@ -24,14 +24,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, bill_code, order_sn, main_bill_code, bl_sub_bill, op_type, op_date, op_man_code, op_man, op_site_code, op_site_name, op_desc, data_from, del_flag, remark, create_by, create_time, update_by, update_time, update_site, create_site from emis_waybill_oper_log
     </sql>
 
+    <select id="selectListByMainBillCode" parameterType="String" resultMap="EmisWaybillOperLogResult">
+        select id, bill_code, order_sn, main_bill_code, bl_sub_bill, op_type, op_date, op_man_code, op_man, op_site_code, op_site_name, op_desc, data_from, del_flag, remark, create_by, create_time, update_by, update_time, update_site, create_site
+        from emis_waybill_oper_log
+        where del_flag='0' and main_bill_code=#{mainBillCode}
+    </select>
+
     <select id="selectEmisWaybillOperLogList" parameterType="EmisWaybillOperLog" resultMap="EmisWaybillOperLogResult">
         <include refid="selectEmisWaybillOperLogVo"/>
         <where>  
              del_flag='0'
             <if test="id != null "> and id = #{id}</if>
-            <if test="billCode != null  and billCode != ''"> and bill_code like concat('%', #{billCode}, '%')</if>
+            <if test="billCode != null  and billCode != ''"> and bill_code=#{billCode}</if>
             <if test="orderSn != null  and orderSn != ''"> and order_sn like concat('%', #{orderSn}, '%')</if>
-            <if test="mainBillCode != null  and mainBillCode != ''"> and main_bill_code like concat('%', #{mainBillCode}, '%')</if>
+            <if test="mainBillCode != null  and mainBillCode != ''"> and main_bill_code=#{mainBillCode}</if>
             <if test="blSubBill != null  and blSubBill != ''"> and bl_sub_bill like concat('%', #{blSubBill}, '%')</if>
             <if test="opType != null  and opType != ''"> and op_type like concat('%', #{opType}, '%')</if>
             <if test="opDate != null "> and op_date = #{opDate}</if>