diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTransLineServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTransLineServiceImpl.java
index e19576453..13fe8a4e8 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTransLineServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTransLineServiceImpl.java
@@ -11,6 +11,9 @@
 package com.xdadan.erp.emis.service.impl;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.xdadan.erp.emis.domain.EmisTransLine;
@@ -62,6 +65,17 @@ public class EmisTransLineServiceImpl implements IEmisTransLineService
     @Override
     public int insertEmisTransLine(EmisTransLine emisTransLine)
     {
+        // 获取线路编号
+        QueryWrapper<EmisTransLine> queryWrapper=new QueryWrapper();
+        queryWrapper.eq("country",emisTransLine.getCountry());
+        Long count = emisTransLineMapper.selectCount(queryWrapper);
+        String lineCode=emisTransLine.getCountry()+"-"+ StringUtils.leftPad(String.valueOf(count),3,"0");
+        emisTransLine.setLineCode(lineCode);
+
+        // 更新网点
+        emisTransLine.preInsert();
+
+
         return emisTransLineMapper.insertEmisTransLine(emisTransLine);
     }
 
@@ -74,6 +88,7 @@ public class EmisTransLineServiceImpl implements IEmisTransLineService
     @Override
     public int updateEmisTransLine(EmisTransLine emisTransLine)
     {
+        emisTransLine.preUpdate();
         return emisTransLineMapper.updateEmisTransLine(emisTransLine);
     }
 
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTransProductServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTransProductServiceImpl.java
index 679c0ed4c..905f71de3 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTransProductServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTransProductServiceImpl.java
@@ -11,6 +11,10 @@
 package com.xdadan.erp.emis.service.impl;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.xdadan.erp.emis.domain.EmisTransLine;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.xdadan.erp.emis.domain.EmisTransProduct;
@@ -62,6 +66,14 @@ public class EmisTransProductServiceImpl implements IEmisTransProductService
     @Override
     public int insertEmisTransProduct(EmisTransProduct emisTransProduct)
     {
+        // 获取线路编号
+        QueryWrapper<EmisTransProduct> queryWrapper=new QueryWrapper();
+        queryWrapper.eq("trans_line_code",emisTransProduct.getTransLineCode());
+        Long count = emisTransProductMapper.selectCount(queryWrapper);
+        String prodCode=emisTransProduct.getTransLineCode()+"-"+ StringUtils.leftPad(String.valueOf(count),4,"0");
+        emisTransProduct.setProdCode(prodCode);
+
+        emisTransProduct.preInsert();
         return emisTransProductMapper.insertEmisTransProduct(emisTransProduct);
     }
 
@@ -74,6 +86,7 @@ public class EmisTransProductServiceImpl implements IEmisTransProductService
     @Override
     public int updateEmisTransProduct(EmisTransProduct emisTransProduct)
     {
+        emisTransProduct.preUpdate();
         return emisTransProductMapper.updateEmisTransProduct(emisTransProduct);
     }
 
diff --git a/emis-biz/src/main/resources/mapper/EmisTransProductMapper.xml b/emis-biz/src/main/resources/mapper/EmisTransProductMapper.xml
index aeadc7d8e..d0f651bc8 100644
--- a/emis-biz/src/main/resources/mapper/EmisTransProductMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTransProductMapper.xml
@@ -51,6 +51,7 @@
     <select id="selectEmisTransProductList" parameterType="EmisTransProduct" resultMap="EmisTransProductResult">
         <include refid="selectEmisTransProductVo"/>
         <where>
+            del_flag = '0'
             <if test="id != null "> and id = #{id}</if>
             <if test="prodCode != null  and prodCode != ''"> and prod_code=#{prodCode}</if>
             <if test="prodName != null  and prodName != ''"> and prod_name like concat('%', #{prodName}, '%')</if>