diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillProblemInfo.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillProblemInfo.java
index e1f46fde5..739fb321a 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillProblemInfo.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillProblemInfo.java
@@ -37,6 +37,10 @@ public class EmisWaybillProblemInfo extends BaseEntity
     private Long id;
     /* 运单号 */
     private String billCode;
+    /* 主单号 */
+    private String mainBillCode;
+    /* 是否子单 1-是 0-否 */
+    private String blSubBill;
     /* 问题类型id: 航班拉货 */
     private Integer problemType;
     /* 问题件标题 */
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillProblemInfoMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillProblemInfoMapper.java
index bfe8a744f..58ee743f5 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillProblemInfoMapper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillProblemInfoMapper.java
@@ -28,6 +28,14 @@ public interface EmisWaybillProblemInfoMapper extends BaseMapper<EmisWaybillProb
      */
     public EmisWaybillProblemInfo selectEmisWaybillProblemInfoById(Long id);
 
+    /**
+     * 检查是否重复
+     *
+     * @param emisWaybillProblemInfo
+     * @return 数量
+     */
+    public int checkUnique(EmisWaybillProblemInfo emisWaybillProblemInfo);
+
     /**
      * 查询列表
      * 
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillProblemInfoMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillProblemInfoMapper.xml
index 70dbd91e5..3d9624ecd 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillProblemInfoMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillProblemInfoMapper.xml
@@ -7,6 +7,8 @@
     <resultMap type="EmisWaybillProblemInfo" id="EmisWaybillProblemInfoResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="billCode"    column="bill_code"    />
+        <result property="mainBillCode"    column="main_bill_code"    />
+        <result property="blSubBill"    column="bl_sub_bill"    />
         <result property="problemType"    column="problem_type"    />
         <result property="problemTitle"    column="problem_title"    />
         <result property="problemCause"    column="problem_cause"    />
@@ -41,7 +43,7 @@
     </resultMap>
 
     <sql id="selectEmisWaybillProblemInfoVo">
-        select id, bill_code, problem_type, problem_title, problem_cause, send_site, send_site_code, register_man_code, register_man_dept, register_site_code, register_date, register_save_date, data_from, status, is_send_site_register, bl_reversion, reversion_str, reversion_man, reversion_man_code, reversion_site_code, reversion_date, bl_checkok, deal_result, bl_see, file_path, del_flag, create_by, create_time, update_by, update_time, remark, create_site, update_site from emis_waybill_problem_info
+        select id, bill_code, main_bill_code, bl_sub_bill, problem_type, problem_title, problem_cause, send_site, send_site_code, register_man_code, register_man_dept, register_site_code, register_date, register_save_date, data_from, status, is_send_site_register, bl_reversion, reversion_str, reversion_man, reversion_man_code, reversion_site_code, reversion_date, bl_checkok, deal_result, bl_see, file_path, del_flag, create_by, create_time, update_by, update_time, remark, create_site, update_site from emis_waybill_problem_info
     </sql>
 
     <select id="selectEmisWaybillProblemInfoList" parameterType="EmisWaybillProblemInfo" resultMap="EmisWaybillProblemInfoResult">
@@ -50,6 +52,8 @@
             del_flag='0'
             <if test="id != null "> and id = #{id}</if>
             <if test="billCode != null  and billCode != ''"> and ( FIND_IN_SET(`bill_code`,#{billCode}) or bill_code like concat('%', #{billCode}, '%') )  </if>
+            <if test="mainBillCode != null  and mainBillCode != ''"> and main_bill_code=#{mainBillCode}</if>
+            <if test="blSubBill != null  and blSubBill != ''"> and bl_sub_bill=#{blSubBill}</if>
 
             <if test="problemType != null  and problemType != ''"> and FIND_IN_SET(problem_type,#{problemType})</if>
             <if test="problemTitle != null  and problemTitle != ''"> and problem_title like concat('%', #{problemTitle}, '%')</if>
@@ -114,8 +118,16 @@
         order by create_time desc
     </select>
 
+    <select id="checkUnique" parameterType="EmisWaybillProblemInfo"  resultType="int">
+		select count(1) from  emis_waybill_problem_info
+		where del_flag='0'
+           and bill_code = #{billCode}
+           and problem_type = #{problemType}
+		limit 1
+	</select>
+
     <select id="selectEmisWaybillProblemInfoById" parameterType="Long" resultMap="EmisWaybillProblemInfoResult">
-        select id, bill_code, problem_type, problem_title, problem_cause, send_site, send_site_code, register_man_code, register_man_dept, register_site_code, register_date, register_save_date, data_from, status, is_send_site_register, bl_reversion, reversion_str, reversion_man, reversion_man_code, reversion_site_code, reversion_date, bl_checkok, deal_result, bl_see, file_path, del_flag, create_by, create_time, update_by, update_time, remark, create_site, update_site from emis_waybill_problem_info
+        select id, bill_code, main_bill_code, bl_sub_bill, problem_type, problem_title, problem_cause, send_site, send_site_code, register_man_code, register_man_dept, register_site_code, register_date, register_save_date, data_from, status, is_send_site_register, bl_reversion, reversion_str, reversion_man, reversion_man_code, reversion_site_code, reversion_date, bl_checkok, deal_result, bl_see, file_path, del_flag, create_by, create_time, update_by, update_time, remark, create_site, update_site
         from emis_waybill_problem_info a
         where a.id = #{id}
     </select>
@@ -125,6 +137,8 @@
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="billCode != null and billCode != ''">bill_code,</if>
+            <if test="mainBillCode != null and mainBillCode != ''">main_bill_code,</if>
+            <if test="blSubBill != null and blSubBill != ''">bl_sub_bill,</if>
             <if test="problemType != null">problem_type,</if>
             <if test="problemTitle != null and problemTitle != ''">problem_title,</if>
             <if test="problemCause != null and problemCause != ''">problem_cause,</if>
@@ -134,7 +148,7 @@
             <if test="registerManDept != null and registerManDept != ''">register_man_dept,</if>
             <if test="registerSiteCode != null and registerSiteCode != ''">register_site_code,</if>
             <if test="registerDate != null">register_date,</if>
-            <if test="registerSaveDate != null ">register_save_date,</if>
+            <if test="registerSaveDate != null">register_save_date,</if>
             <if test="dataFrom != null and dataFrom != ''">data_from,</if>
             <if test="status != null and status != ''">status,</if>
             <if test="isSendSiteRegister != null and isSendSiteRegister != ''">is_send_site_register,</if>
@@ -160,6 +174,8 @@
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="billCode != null and billCode != ''">#{billCode},</if>
+            <if test="mainBillCode != null and mainBillCode != ''">#{mainBillCode},</if>
+            <if test="blSubBill != null and blSubBill != ''">#{blSubBill},</if>
             <if test="problemType != null">#{problemType},</if>
             <if test="problemTitle != null and problemTitle != ''">#{problemTitle},</if>
             <if test="problemCause != null and problemCause != ''">#{problemCause},</if>
@@ -198,6 +214,8 @@
         update emis_waybill_problem_info
         <trim prefix="SET" suffixOverrides=",">
             <if test="billCode != null and billCode != ''">bill_code = #{billCode},</if>
+            <if test="mainBillCode != null and mainBillCode != ''">main_bill_code = #{mainBillCode},</if>
+            <if test="blSubBill != null and blSubBill != ''">bl_sub_bill = #{blSubBill},</if>
             <if test="problemType != null">problem_type = #{problemType},</if>
             <if test="problemTitle != null and problemTitle != ''">problem_title = #{problemTitle},</if>
             <if test="problemCause != null and problemCause != ''">problem_cause = #{problemCause},</if>