diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillProblemFaqController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillProblemFaqController.java
new file mode 100644
index 000000000..1cbc37334
--- /dev/null
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillProblemFaqController.java
@@ -0,0 +1,118 @@
+
+/** 
+  * @Project: emis
+  * @Title: EmisWaybillProblemFaqController.java
+  * @author linfso
+  * @date 2024-05-20 09:36:48
+  * @Copyright: ShangHai Duta 2022 All rights reserved.
+  * @version v1.0  
+  * @Description: <p> 问题件FAG 控制器 </p>
+ */
+
+package com.xdadan.erp.web.emis;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.xdadan.erp.common.annotation.Log;
+import com.xdadan.erp.common.core.controller.BaseController;
+import com.xdadan.erp.common.core.domain.AjaxResult;
+import com.xdadan.erp.common.core.page.TableDataInfo;
+import com.xdadan.erp.common.enums.BusinessType;
+import com.xdadan.erp.common.utils.StringUtils;
+import com.xdadan.erp.common.utils.poi.ExcelUtil;
+
+import com.xdadan.erp.emis.domain.EmisWaybillProblemFaq;
+import com.xdadan.erp.emis.service.IEmisWaybillProblemFaqService;
+
+/**
+ * 问题件FAGController
+ * 
+ * @author linfso
+ * @date 2024-05-20 09:36:48
+ */
+@RestController
+@RequestMapping("/emis/emisWaybillProblemFaq")
+public class EmisWaybillProblemFaqController extends BaseController
+{
+    @Autowired
+    private IEmisWaybillProblemFaqService emisWaybillProblemFaqService;
+
+    /**
+     * 查询问题件FAG列表
+     */
+    @PreAuthorize("@ss.hasPermi('emis:emisWaybillProblemFaq:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(EmisWaybillProblemFaq emisWaybillProblemFaq)
+    {
+        startPage();
+        List<EmisWaybillProblemFaq> list = emisWaybillProblemFaqService.selectEmisWaybillProblemFaqList(emisWaybillProblemFaq);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出问题件FAG列表
+     */
+    @PreAuthorize("@ss.hasPermi('emis:emisWaybillProblemFaq:export')")
+    @Log(title = "问题件FAG", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, EmisWaybillProblemFaq emisWaybillProblemFaq)
+    {
+        List<EmisWaybillProblemFaq> list = emisWaybillProblemFaqService.selectEmisWaybillProblemFaqList(emisWaybillProblemFaq);
+        ExcelUtil<EmisWaybillProblemFaq> util = new ExcelUtil<EmisWaybillProblemFaq>(EmisWaybillProblemFaq.class);
+        util.exportExcel(response, list, "问题件FAG数据");
+    }
+
+    /**
+     * 获取问题件FAG详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('emis:emisWaybillProblemFaq:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(emisWaybillProblemFaqService.selectEmisWaybillProblemFaqById(id));
+    }
+
+    /**
+     * 新增问题件FAG
+     */
+    @PreAuthorize("@ss.hasPermi('emis:emisWaybillProblemFaq:add')")
+    @Log(title = "问题件FAG", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody EmisWaybillProblemFaq emisWaybillProblemFaq)
+    {
+        return toAjax(emisWaybillProblemFaqService.insertEmisWaybillProblemFaq(emisWaybillProblemFaq));
+    }
+
+    /**
+     * 修改问题件FAG
+     */
+    @PreAuthorize("@ss.hasPermi('emis:emisWaybillProblemFaq:edit')")
+    @Log(title = "问题件FAG", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody EmisWaybillProblemFaq emisWaybillProblemFaq)
+    {
+        return toAjax(emisWaybillProblemFaqService.updateEmisWaybillProblemFaq(emisWaybillProblemFaq));
+    }
+
+    /**
+     * 删除问题件FAG
+     */
+    @PreAuthorize("@ss.hasPermi('emis:emisWaybillProblemFaq:remove')")
+    @Log(title = "问题件FAG", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(emisWaybillProblemFaqService.deleteEmisWaybillProblemFaqByIds(ids));
+    }
+}
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillProblemFaq.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillProblemFaq.java
new file mode 100644
index 000000000..0ab8ed40d
--- /dev/null
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillProblemFaq.java
@@ -0,0 +1,53 @@
+/** 
+ * @Project: emis
+ * @Title: EmisWaybillProblemFaq.java
+ * @author linfso
+ * @date 2024-05-20 09:36:48
+ * @Copyright: ShangHai Duta 2022 All rights reserved.
+ * @version v1.0  
+ * @Description: <p> 问题件FAG 实体类 </p>
+ */
+
+package com.xdadan.erp.emis.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.xdadan.erp.common.annotation.Excel;
+import com.xdadan.erp.common.core.domain.BaseEntity;
+import com.xdadan.erp.common.core.domain.TreeEntity;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * @ClassName EmisWaybillProblemFaq
+ * @Description 问题件FAG
+ * @author linfso
+ * @date 2024-05-20 09:36:48
+ */
+ @Data
+public class EmisWaybillProblemFaq extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /* id */
+    private Long id;
+    /* 问题件序号 */
+    private Long probId;
+    /* 运单编号 */
+    private String billCode;
+    /* 标题 */
+    private String title;
+    /* 具体内容 */
+    private String content;
+    /* 状态 0-初始 1-启用 */
+    private Integer status;
+    /* 是否显示 1-显示 0-不显示 */
+    private String showFlag;
+    /* 针对的回复的ID */
+    private Long replayId;
+
+}
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsScanRecordMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsScanRecordMapper.java
index 8e791950c..4d0d6cfa5 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsScanRecordMapper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsScanRecordMapper.java
@@ -10,6 +10,7 @@
  */
 package com.xdadan.erp.emis.mapper;
 
+import java.util.Date;
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xdadan.erp.emis.domain.EmisTmsScanRecord;
@@ -68,6 +69,9 @@ public interface EmisTmsScanRecordMapper extends BaseMapper<EmisTmsScanRecord>
      */
     public int deleteEmisTmsScanRecordByIds(Long[] ids);
 
+//    where billCode = #{billCode} and scan_type=#{scanType}
+//    and scan_site_code=#{scanSiteCode}
+//    and to_days(scan_date) = to_days(#{scanDate})
 
-    public int checkSiteScanUnique(EmisTmsScanRecord emisTmsScanRecord);
+    public int checkSiteScanUnique(String billCode, String scanType, String scanSiteCode, Date scanDate);
 }
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java
index e4b74b035..d0b247c6c 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java
@@ -68,6 +68,8 @@ public interface EmisWaybillMapper extends BaseMapper<EmisWaybill>
      */
     public int updateEmisWaybill(EmisWaybill emisWaybill);
 
+
+
     /**
      * 删除
      * 
@@ -95,4 +97,7 @@ public interface EmisWaybillMapper extends BaseMapper<EmisWaybill>
 
     public int updatePrintStatus(EmisWaybill emisWaybill);
 
+
+    public int updateEmisWaybillByBillCode(EmisWaybill emisWaybill);
+
 }
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillProblemFaqMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillProblemFaqMapper.java
new file mode 100644
index 000000000..de21c234a
--- /dev/null
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillProblemFaqMapper.java
@@ -0,0 +1,70 @@
+/** 
+ * @Project: emis
+ * @Title: EmisWaybillProblemFaqMapper.java
+ * @author linfso
+ * @date 2024-05-20 09:36:48
+ * @Copyright: ShangHai Doitinfo 2022 All rights reserved.
+ * @version v1.0  
+ * @Description: <p> 问题件FAG Mapper 接口 </p>
+ *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
+ */
+package com.xdadan.erp.emis.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xdadan.erp.emis.domain.EmisWaybillProblemFaq;
+/**
+ * @ClassName EmisWaybillProblemFaqMapper
+ * @Description <p> 问题件FAG Mapper 接口 </p>
+ * @author linfso
+ * @date 2024-05-20 09:36:48
+ */
+public interface EmisWaybillProblemFaqMapper extends BaseMapper<EmisWaybillProblemFaq>
+{
+    /**
+     * 主键查询
+     * @param  id
+     * @return 
+     */
+    public EmisWaybillProblemFaq selectEmisWaybillProblemFaqById(Long id);
+
+    /**
+     * 查询列表
+     * 
+     * @param emisWaybillProblemFaq 
+     * @return 集合
+     */
+    public List<EmisWaybillProblemFaq> selectEmisWaybillProblemFaqList(EmisWaybillProblemFaq emisWaybillProblemFaq);
+
+    /**
+     * 新增 
+     * 
+     * @param emisWaybillProblemFaq
+     * @return 
+     */
+    public int insertEmisWaybillProblemFaq(EmisWaybillProblemFaq emisWaybillProblemFaq);
+
+    /**
+     * 修改
+     * 
+     * @param emisWaybillProblemFaq 
+     * @return 
+     */
+    public int updateEmisWaybillProblemFaq(EmisWaybillProblemFaq emisWaybillProblemFaq);
+
+    /**
+     * 删除
+     * 
+     * @param id 主键
+     * @return 结果
+     */
+    public int deleteEmisWaybillProblemFaqById(Long id);
+
+    /**
+     * 批量删除
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteEmisWaybillProblemFaqByIds(Long[] ids);
+}
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
index 013cc8527..a7cd45bdc 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
@@ -153,8 +153,33 @@ public class EmisBaseService {
      }
 
 
+     /**
+      * 转件登记
+      * @param billCode
+      * @param transferCode
+      * @param transferBillcode
+      * @param destCity
+      */
+     public void wayBillTransfer(String billCode,String transferCode,String transferBillcode,String destCity){
+         EmisWaybill waybill=getWaybillByBillCode(billCode);
+         if(waybill!=null){
+             EmisWaybill upd=new EmisWaybill();
+             upd.setId(waybill.getId());
+             upd.preUpdate();
+             upd.setTransferCode(transferCode);
+             upd.setTransferBillcode(transferBillcode);
+             upd.setBlDispFd("1");// 转单标识
+
+             emisWaybillMapper.updateEmisWaybill(upd);
+         }
+     }
 
 
+     /**
+      * 根据billCode 获取单号信息
+      * @param billCode
+      * @return
+      */
      public EmisWaybill getWaybillByBillCode(String billCode){
             if(StringUtils.isEmpty(billCode)){
                 return null;
@@ -163,6 +188,10 @@ public class EmisBaseService {
             return emisWaybillMapper.selectEmisWaybillByBillCode(billCode);
      }
 
+     /**
+      * 更新打印状态
+      * @param billCode
+      */
      public void updatePrintStatus(String billCode) {
 
          EmisWaybill waybill = new EmisWaybill();
@@ -173,6 +202,14 @@ public class EmisBaseService {
 
      }
 
+     /**
+      * 获取打印信息
+      * @param billCode
+      * @param billCodeRange
+      * @param lang
+      * @param printType
+      * @return
+      */
      public Map<String,Object>  getWaybillPrintOrder(String billCode, String billCodeRange, String lang, String printType){
          if(StringUtils.isEmpty(billCode)){
              return null;
@@ -249,8 +286,53 @@ public class EmisBaseService {
      }
 
 
+     /**
+      * 改变运单上站点
+      * @param billCode
+      * @param siteCode
+      * @return
+      */
+     public int changeWaybillLastSite(String billCode,String siteCode){
+         EmisWaybill emisWaybill = new EmisWaybill();
+         emisWaybill.setBillCode(billCode);
+         emisWaybill.setLastSiteCode(siteCode);
+         return emisWaybillMapper.updateEmisWaybillByBillCode(emisWaybill);
+     }
+
+     /**
+      * 改变运单下站点
+      * @param billCode
+      * @param siteCode
+      * @return
+      */
+     public int changeWaybillNextSite(String billCode,String siteCode){
+         EmisWaybill emisWaybill = new EmisWaybill();
+         emisWaybill.setBillCode(billCode);
+         emisWaybill.setNextSiteCode(siteCode);
+         return emisWaybillMapper.updateEmisWaybillByBillCode(emisWaybill);
+     }
+
+     /**
+      * 改变运单当前站点
+      * @param billCode
+      * @param siteCode
+      * @return
+      */
+     public int changeWaybillCurrentSite(String billCode,String siteCode){
+         EmisWaybill emisWaybill = new EmisWaybill();
+         emisWaybill.setBillCode(billCode);
+         emisWaybill.setCurrentSiteCode(siteCode);
+         return emisWaybillMapper.updateEmisWaybillByBillCode(emisWaybill);
+     }
 
 
+
+     /**
+      * 改变运单状态
+      * @param billCode
+      * @param waybillStatus
+      * @return
+      */
      public int changeWaybillStatus(String billCode,String waybillStatus){
          EmisWaybill emisWaybill = new EmisWaybill();
          emisWaybill.setBillCode(billCode);
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillProblemFaqService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillProblemFaqService.java
new file mode 100644
index 000000000..749a7f6cb
--- /dev/null
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillProblemFaqService.java
@@ -0,0 +1,69 @@
+ /** 
+ * @Project: emis
+ * @Title: EmisWaybillProblemFaqService.java
+ * @author linfso
+ * @date 2024-05-20 09:36:48
+ * @Copyright: ShangHai Duta 2022 All rights reserved.
+ * @version v1.0  
+ * @Description: <p> 问题件FAG 服务类接口 </p>
+ */
+package com.xdadan.erp.emis.service;
+
+import java.util.List;
+import com.xdadan.erp.emis.domain.EmisWaybillProblemFaq;
+
+/**
+ * @ClassName EmisWaybillProblemFaqService
+ * @Description 问题件FAG
+ * @author linfso
+ * @date 2024-05-20 09:36:48
+ */
+public interface IEmisWaybillProblemFaqService 
+{
+   /**
+     * 主键查询
+     * @param id
+     * @return 
+     */
+    public EmisWaybillProblemFaq selectEmisWaybillProblemFaqById(Long id);
+
+    /**
+     * 查询问题件FAG列表
+     * 
+     * @param emisWaybillProblemFaq 问题件FAG
+     * @return 问题件FAG集合
+     */
+    public List<EmisWaybillProblemFaq> selectEmisWaybillProblemFaqList(EmisWaybillProblemFaq emisWaybillProblemFaq);
+
+    /**
+     * 新增问题件FAG
+     * 
+     * @param emisWaybillProblemFaq 问题件FAG
+     * @return 结果
+     */
+    public int insertEmisWaybillProblemFaq(EmisWaybillProblemFaq emisWaybillProblemFaq);
+
+    /**
+     * 修改问题件FAG
+     * 
+     * @param emisWaybillProblemFaq 问题件FAG
+     * @return 结果
+     */
+    public int updateEmisWaybillProblemFaq(EmisWaybillProblemFaq emisWaybillProblemFaq);
+
+    /**
+     * 批量删除问题件FAG
+     * 
+     * @param ids 需要删除的问题件FAG主键集合
+     * @return 结果
+     */
+    public int deleteEmisWaybillProblemFaqByIds(Long[] ids);
+
+    /**
+     * 删除问题件FAG信息
+     * 
+     * @param id 问题件FAG主键
+     * @return 结果
+     */
+    public int deleteEmisWaybillProblemFaqById(Long id);
+}
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
index afe97e91a..2ab8f4ad5 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
@@ -19,12 +19,14 @@ import java.util.Map;
 import com.xdadan.erp.common.core.domain.entity.SysUser;
 import com.xdadan.erp.common.utils.DateUtils;
 import com.xdadan.erp.emis.domain.EmisSite;
+import com.xdadan.erp.emis.domain.EmisTmsScanPicInfo;
 import com.xdadan.erp.emis.domain.EmisWaybill;
 import com.xdadan.erp.emis.domain.enumtype.ScanType;
 import com.xdadan.erp.emis.domain.exception.EmisBizError;
 import com.xdadan.erp.emis.domain.vo.scan.ScanInfo;
 import com.xdadan.erp.emis.domain.vo.scan.ScanResult;
 import com.xdadan.erp.emis.domain.vo.scan.ScanResultItem;
+import com.xdadan.erp.emis.mapper.EmisTmsScanPicInfoMapper;
 import com.xdadan.erp.emis.service.EmisBaseService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,6 +47,8 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
     @Autowired
     private EmisTmsScanRecordMapper emisTmsScanRecordMapper;
 
+    @Autowired
+    private EmisTmsScanPicInfoMapper emisTmsScanPicInfoMapper;
     /**
      * 查询TMS扫描记录
      * 
@@ -153,29 +157,18 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
                 continue;
             }
 
-
-            EmisTmsScanRecord emisTmsScanRecord=new EmisTmsScanRecord();
-
-            // 公共部分
-            emisTmsScanRecord.setBillCode(billCode);
-            emisTmsScanRecord.setOrderSn(emisWaybill.getOrderSn());
-            emisTmsScanRecord.setWeight(emisWaybill.getBillWeight());
-
-            emisTmsScanRecord.setScanType(scanType);
-            emisTmsScanRecord.setScanDate(scanDate);
-            emisTmsScanRecord.setScanManCode(getCurrentUser().getEmpCode());
-            emisTmsScanRecord.setScanManPhone(getCurrentUser().getPhonenumber());
-            emisTmsScanRecord.setScanMan(getCurrentUser().getEmpName());
-            emisTmsScanRecord.setScanSite(getCurrentUser().getOwnerSiteName());
-            emisTmsScanRecord.setScanSiteCode(getCurrentUser().getOwnerSiteCode());
-
-            EmisSite scanSite=getSiteByCode(emisTmsScanRecord.getScanSiteCode());
-            if(scanSite!=null){
-                emisTmsScanRecord.setScanSitePhone(scanSite.getPhone());
+            // 已签收不允许扫描
+            if(ScanType.SIGNED.opCode.equals(emisWaybill.getWaybillStatus())){
+                scanResultItem.setResult("fail");
+                scanResultItem.setMessage("已签收");
+                itemList.add(scanResultItem);
+                continue;
             }
 
+
             // 重复扫描
-            int scanCnt=emisTmsScanRecordMapper.checkSiteScanUnique(emisTmsScanRecord);
+            // 同站点，同动作，同一天不允许重复扫描
+            int scanCnt=emisTmsScanRecordMapper.checkSiteScanUnique(billCode,scanType,getCurrentUser().getOwnerSiteCode(),scanDate);
             if(scanCnt>0){
                 scanResultItem.setResult("fail");
                 scanResultItem.setMessage("重复扫描");
@@ -194,6 +187,37 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
         return itemList;
     }
 
+    /**
+     * 填充公共数据
+     * @param emisTmsScanRecord
+     * @param emisWaybill
+     */
+    private void fillBillBaseData(EmisTmsScanRecord emisTmsScanRecord,EmisWaybill emisWaybill){
+        // 公共部分
+        emisTmsScanRecord.setBillCode(emisWaybill.getBillCode());
+        emisTmsScanRecord.setOrderSn(emisWaybill.getOrderSn());
+        emisTmsScanRecord.setWeight(emisWaybill.getBillWeight());
+
+
+        emisTmsScanRecord.setScanManCode(getCurrentUser().getEmpCode());
+        emisTmsScanRecord.setScanManPhone(getCurrentUser().getPhonenumber());
+        emisTmsScanRecord.setScanMan(getCurrentUser().getEmpName());
+        emisTmsScanRecord.setScanSite(getCurrentUser().getOwnerSiteName());
+        emisTmsScanRecord.setScanSiteCode(getCurrentUser().getOwnerSiteCode());
+
+        EmisSite scanSite=getSiteByCode(emisTmsScanRecord.getScanSiteCode());
+        if(scanSite!=null){
+            emisTmsScanRecord.setScanSitePhone(scanSite.getPhone());
+        }
+
+        emisTmsScanRecord.setRecordMan(getCurrentUser().getEmpName());
+        emisTmsScanRecord.setRecordManCode(getCurrentUser().getEmpCode());
+        emisTmsScanRecord.setRecordManPhone(getCurrentUser().getPhonenumber());
+        emisTmsScanRecord.setRecordSiteCode(getCurrentUser().getOwnerSiteCode());
+        emisTmsScanRecord.setDataFrom("pc");
+        emisTmsScanRecord.setStatus("1");
+        emisTmsScanRecord.preInsert();
+    }
     /**
      * 扫描操作
      * @param scanType
@@ -216,19 +240,19 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
         // 开始检查数据
         String[] billCodeArr = billCodeInStr.split(",");
         String scanDateStr = (String)scanDataItem.get("scanDate");
-
         Date scanDate = DateUtils.parseDate(scanDateStr);;
         if(scanDate ==null){
             scanDate = new Date();
         }
 
-
         for (String billCode:billCodeArr) {
 
+            // 返回结果     // 原始数据返回
             ScanResultItem scanResultItem = new ScanResultItem();
             scanResultItem.setBillCode(billCode);
-            // 检查数据
+            scanResultItem.getData().putAll(scanDataItem);
 
+            // 1.运单号不存在
             EmisWaybill emisWaybill = getWaybillByBillCode(billCode);
             if(emisWaybill==null){
                 scanResultItem.setResult("fail");
@@ -238,30 +262,9 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
             }
 
 
-            scanResultItem.getData().put("billWeight",emisWaybill.getBillWeight());
-            scanResultItem.getData().put("parcelQty",emisWaybill.getParcelQty());
-
-            // 公共部分
-            EmisTmsScanRecord emisTmsScanRecord=new EmisTmsScanRecord();
-            emisTmsScanRecord.setBillCode(billCode);
-            emisTmsScanRecord.setOrderSn(emisWaybill.getOrderSn());
-            emisTmsScanRecord.setWeight(emisWaybill.getBillWeight());
-            emisTmsScanRecord.setScanType(scanType);
-            emisTmsScanRecord.setScanDate(scanDate);
-            emisTmsScanRecord.setScanManCode(getCurrentUser().getEmpCode());
-            emisTmsScanRecord.setScanManPhone(getCurrentUser().getPhonenumber());
-            emisTmsScanRecord.setScanMan(getCurrentUser().getEmpName());
-            emisTmsScanRecord.setScanSite(getCurrentUser().getOwnerSiteName());
-            emisTmsScanRecord.setScanSiteCode(getCurrentUser().getOwnerSiteCode());
-
-            EmisSite scanSite=getSiteByCode(emisTmsScanRecord.getScanSiteCode());
-            if(scanSite!=null){
-                emisTmsScanRecord.setScanSitePhone(scanSite.getPhone());
-            }
-
-            // 重复扫描
+            // 2.重复扫描
             // 同站点，同动作，同一天不允许重复扫描
-            int scanCnt=emisTmsScanRecordMapper.checkSiteScanUnique(emisTmsScanRecord);
+            int scanCnt=emisTmsScanRecordMapper.checkSiteScanUnique(billCode,scanType,getCurrentUser().getOwnerSiteCode(),scanDate);
             if(scanCnt>0){
                 scanResultItem.setResult("fail");
                 scanResultItem.setMessage("重复扫描");
@@ -269,25 +272,22 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
                 continue;
             }
 
-
-            // 原始数据返回
-            scanResultItem.getData().putAll(scanDataItem);
+            // 生成扫描记录并填充公共数据
+            EmisTmsScanRecord emisTmsScanRecord=new EmisTmsScanRecord();
+            this.fillBillBaseData(emisTmsScanRecord,emisWaybill);
+            emisTmsScanRecord.setScanType(scanType);
+            emisTmsScanRecord.setScanDate(scanDate);
 
             // 填充特殊数据
-            this.fillScanDataByScanType(scanType,emisTmsScanRecord,scanDataItem);
+            this.fillScanDataByScanType(emisTmsScanRecord,scanType,scanDataItem);
 
-
-            emisTmsScanRecord.setRecordMan(getCurrentUser().getEmpName());
-            emisTmsScanRecord.setRecordManCode(getCurrentUser().getEmpCode());
-            emisTmsScanRecord.setRecordManPhone(getCurrentUser().getPhonenumber());
-            emisTmsScanRecord.setRecordSiteCode(getCurrentUser().getOwnerSiteCode());
-            emisTmsScanRecord.setDataFrom("pc");
-            emisTmsScanRecord.setStatus("1");
-            emisTmsScanRecord.preInsert();
+            // 返回数据
+            scanResultItem.getData().put("billWeight",emisWaybill.getBillWeight());
+            scanResultItem.getData().put("parcelQty",emisWaybill.getParcelQty());
             emisTmsScanRecordMapper.insertEmisTmsScanRecord(emisTmsScanRecord);
 
             // 修改运单状态
-            changeWaybillStatus(billCode,scanType);
+            this.changeWaybillStatus(billCode,scanType);
 
             scanResultItem.setResult("success");
             scanResultItem.setMessage("操作成功");
@@ -298,29 +298,228 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
         return itemList;
     }
 
-    public void fillScanDataByScanType(String scanType, EmisTmsScanRecord emisTmsScanRecord, Map<String,Object> scanDataItem){
+    public void fillScanDataByScanType(EmisTmsScanRecord emisTmsScanRecord, String scanType, Map<String,Object> scanDataItem){
 
         // 揽收扫描
         if(ScanType.GOT.opCode.equals(scanType)){
-            String scanWeightStr = (String)scanDataItem.get("scanWeight");
-            String dispatchOrSendManCode = (String)scanDataItem.get("dispatchOrSendManCode");
+//            String scanWeightStr = (String)scanDataItem.get("scanWeight");
 
-            double scanWeight = 0.0D;
-            if(!StringUtils.isEmpty(scanWeightStr)){
-                scanWeight= Double.valueOf(scanWeightStr);
-                emisTmsScanRecord.setScanWeight(BigDecimal.valueOf(scanWeight));
+//            double scanWeight = 0.0D;
+//            if(!StringUtils.isEmpty(scanWeightStr)){
+//                scanWeight= Double.valueOf(scanWeightStr);
+//                emisTmsScanRecord.setScanWeight(BigDecimal.valueOf(scanWeight));
+//            }
+
+            String dispatchOrSendManCode = (String)scanDataItem.get("dispatchOrSendManCode");
+            if(!StringUtils.isEmpty(dispatchOrSendManCode)) {
+                emisTmsScanRecord.setDispatchOrSendManCode(dispatchOrSendManCode);
+            }else{
+                emisTmsScanRecord.setDispatchOrSendManCode(getCurrentUser().getEmpCode());
             }
 
-            emisTmsScanRecord.setDispatchOrSendManCode(dispatchOrSendManCode);
-            SysUser emUser=getEmisStaffByCode(dispatchOrSendManCode);
+            SysUser emUser=getEmisStaffByCode(emisTmsScanRecord.getDispatchOrSendManCode());
             if(emUser!=null){
                 emisTmsScanRecord.setDispatchOrSendMan(emUser.getEmpName());
                 emisTmsScanRecord.setDispatchOrSendManPhone(emUser.getPhonenumber());
+            }else{
+                emisTmsScanRecord.setDispatchOrSendManCode(getCurrentUser().getEmpCode());
+                emisTmsScanRecord.setDispatchOrSendMan(getCurrentUser().getEmpName());
+                emisTmsScanRecord.setDispatchOrSendManPhone(getCurrentUser().getPhonenumber());
             }
+
+            // 当前站点
+            changeWaybillCurrentSite(emisTmsScanRecord.getBillCode(),emisTmsScanRecord.getScanSiteCode());
+
         }
         // 发件扫描
         else if(ScanType.DEPARTURE.opCode.equals(scanType)){
+            // 下一站
+//           String scanWeightStr = (String)scanDataItem.get("scanWeight");
+            String preOrNextStationCode = (String)scanDataItem.get("preOrNextStationCode");
+            if(!StringUtils.isEmpty(preOrNextStationCode)) {
+                EmisSite site=getSiteByCode(preOrNextStationCode);
+                emisTmsScanRecord.setPreOrNextStationCode(preOrNextStationCode);
+                emisTmsScanRecord.setPreOrNextStation(site.getSiteName());
+                emisTmsScanRecord.setPreOrNextStationPhone(site.getPhone());
 
+                // 当前站点
+                changeWaybillCurrentSite(emisTmsScanRecord.getBillCode(),emisTmsScanRecord.getScanSiteCode());
+                // 下一站点
+                changeWaybillNextSite(emisTmsScanRecord.getBillCode(),preOrNextStationCode);
+            }
+
+        }
+        // 到件扫描
+        else if(ScanType.ARRIVAL.opCode.equals(scanType)){
+
+            EmisWaybill waybill=getWaybillByBillCode(emisTmsScanRecord.getBillCode());
+
+            if(!StringUtils.isEmpty(waybill.getCurrentSiteCode())) {
+                EmisSite site = getSiteByCode(waybill.getCurrentSiteCode());
+                // 获取上一站
+                emisTmsScanRecord.setPreOrNextStationCode(site.getSiteCode());
+                emisTmsScanRecord.setPreOrNextStation(site.getSiteName());
+                emisTmsScanRecord.setPreOrNextStationPhone(site.getPhone());
+            }
+
+            // 改变当前站点
+            changeWaybillCurrentSite(emisTmsScanRecord.getBillCode(),emisTmsScanRecord.getScanSiteCode());
+        }
+        // 派送扫描
+        else if(ScanType.SENT.opCode.equals(scanType)){
+//            派送员
+//            "dispatchOrSendManCode": "25001108",
+            String dispatchOrSendManCode = (String)scanDataItem.get("dispatchOrSendManCode");
+            if(!StringUtils.isEmpty(dispatchOrSendManCode)) {
+                emisTmsScanRecord.setDispatchOrSendManCode(dispatchOrSendManCode);
+            }else{
+                emisTmsScanRecord.setDispatchOrSendManCode(getCurrentUser().getEmpCode());
+            }
+
+            SysUser emUser=getEmisStaffByCode(emisTmsScanRecord.getDispatchOrSendManCode());
+            if(emUser!=null){
+                emisTmsScanRecord.setDispatchOrSendMan(emUser.getEmpName());
+                emisTmsScanRecord.setDispatchOrSendManPhone(emUser.getPhonenumber());
+            }else{
+                emisTmsScanRecord.setDispatchOrSendManCode(getCurrentUser().getEmpCode());
+                emisTmsScanRecord.setDispatchOrSendMan(getCurrentUser().getEmpName());
+                emisTmsScanRecord.setDispatchOrSendManPhone(getCurrentUser().getPhonenumber());
+            }
+
+        }
+        // 签收扫描
+        else if(ScanType.SIGNED.opCode.equals(scanType)){
+            //            "signMan": "签收人",
+//                    "picUrl": "签收图片,逗号隔开",
+//                    "remark": "签收备注",
+            String signMan = (String)scanDataItem.get("signMan");
+            String picUrl = (String)scanDataItem.get("picUrl");
+            String remark = (String)scanDataItem.get("remark");
+            emisTmsScanRecord.setSignMan(signMan);
+            emisTmsScanRecord.setSignDate(emisTmsScanRecord.getScanDate());
+
+            // 签收站点
+            emisTmsScanRecord.setSignSite(getCurrentUser().getOwnerSiteName());
+            emisTmsScanRecord.setSignSiteCode(getCurrentUser().getOwnerSiteCode());
+
+            emisTmsScanRecord.setRemark(remark);
+
+            EmisTmsScanPicInfo emisTmsScanPicInfo = new EmisTmsScanPicInfo();
+            emisTmsScanPicInfo.setBillCode(emisTmsScanRecord.getBillCode());
+            emisTmsScanPicInfo.setPicType(scanType);
+            emisTmsScanPicInfo.setPicUrl(picUrl);
+            emisTmsScanPicInfo.preInsert();
+            emisTmsScanPicInfoMapper.insertEmisTmsScanPicInfo(emisTmsScanPicInfo);
+
+        }
+        // 留仓
+        else if(ScanType.HOLD.opCode.equals(scanType)){
+//            "billCode": "T001,T002,T002",
+//                    "picUrl": "留仓图片,逗号隔开",
+//                    "remark": "留仓备注",
+//                    "scanDate": "2024-05-02 12:03:05",
+//                    "scanWeight": "0.2"
+
+            String picUrl = (String)scanDataItem.get("picUrl");
+            String remark = (String)scanDataItem.get("remark");
+
+            emisTmsScanRecord.setRemark(remark);
+
+            EmisTmsScanPicInfo emisTmsScanPicInfo = new EmisTmsScanPicInfo();
+            emisTmsScanPicInfo.setBillCode(emisTmsScanRecord.getBillCode());
+            emisTmsScanPicInfo.setPicType(scanType);
+            emisTmsScanPicInfo.setPicUrl(picUrl);
+            emisTmsScanPicInfo.setRemark(remark);
+            emisTmsScanPicInfo.preInsert();
+            emisTmsScanPicInfoMapper.insertEmisTmsScanPicInfo(emisTmsScanPicInfo);
+
+        }
+        // 转单扫描
+        else if(ScanType.TRANSFER.opCode.equals(scanType)){
+//        "billCode": "T001,T002,T002",
+//                "transferCode": "转单同行快递代码",
+//                "transferBillcode": "转单同行单号",
+//                "destCity": "目的城市",
+//                "scanDate": "2024-05-02 12:03:05",
+//                "scanWeight": "0.0"
+
+            String transferCode = (String)scanDataItem.get("transferCode");
+            String transferBillcode = (String)scanDataItem.get("transferBillcode");
+            String destCity = (String)scanDataItem.get("destCity");
+
+            emisTmsScanRecord.setPreOrNextStation(destCity);
+
+            // 更新waybill做转单
+            wayBillTransfer(emisTmsScanRecord.getBillCode(),transferCode,transferBillcode,destCity);
+
+        }
+        // 问题件
+        else if(ScanType.ISSUE.opCode.equals(scanType)){
+
+//            "billCode": "T001,T002,T002",
+//                    "problemType": "问题件类型",
+//                    "notifySite": "寄件或收件网点编码",
+//                    "picUrl": "问题件图片",
+//                    "remark": "问题备注",
+//                    "scanDate": "2024-05-02 12:03:05",
+//                    "scanWeight": "0.2"
+
+            String problemType = (String)scanDataItem.get("problemType");
+            String notifySite = (String)scanDataItem.get("notifySite");
+            String picUrl = (String)scanDataItem.get("picUrl");
+            String remark = (String)scanDataItem.get("remark");
+
+            emisTmsScanRecord.setRemark(remark);
+
+        }
+        // 合包
+        else if(ScanType.CO_PACKING.opCode.equals(scanType)){
+
+//            "billCode": "T001,T002,T002",
+//                    "bagNo": "合包袋号",
+//                    "scanDate": "2024-05-02 12:03:05",
+//                    "scanWeight": "0.2"
+
+            String bagNo = (String)scanDataItem.get("bagNo");
+            emisTmsScanRecord.setBagNo(bagNo);
+        }
+        else if(ScanType.UN_PACKING.opCode.equals(scanType)){
+//            "billCode": "T001,T002,T002",
+//                    "scanDate": "2024-05-02 12:03:05",
+//                    "scanWeight": "0.2"
+//            String bagNo = (String)scanDataItem.get("bagNo");
+//            emisTmsScanRecord.setBagNo(bagNo);
+            // 从包里面去除
+
+        }
+        // 装车
+        else if(ScanType.LOADING.opCode.equals(scanType)){
+//            "billCode": "T001",
+//                    "carNo": "粤Z01023",
+//                    "preOrNextStationCode": "25001108",
+//                    "scanDate": "2024-05-02 12:03:05",
+//                    "scanWeight": "0.2"
+            String carNo = (String)scanDataItem.get("carNo");
+            String preOrNextStationCode = (String)scanDataItem.get("preOrNextStationCode");
+            emisTmsScanRecord.setCarNo(carNo);
+            emisTmsScanRecord.setPreOrNextStationCode(preOrNextStationCode);
+
+            if(!StringUtils.isEmpty(preOrNextStationCode)) {
+                EmisSite site=getSiteByCode(preOrNextStationCode);
+                emisTmsScanRecord.setPreOrNextStationCode(preOrNextStationCode);
+                emisTmsScanRecord.setPreOrNextStation(site.getSiteName());
+                emisTmsScanRecord.setPreOrNextStationPhone(site.getPhone());
+            }
+
+        }
+        // 卸车
+        else if(ScanType.UN_LOADING.opCode.equals(scanType)){
+//            "billCode": "T001",
+//                    "carNo": "粤Z01023",
+//                    "scanDate": "2024-05-02 12:03:05",
+//                    "scanWeight": "0.2"
+            String carNo = (String)scanDataItem.get("carNo");
+            emisTmsScanRecord.setCarNo(carNo);
         }
 
     }
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillProblemFaqServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillProblemFaqServiceImpl.java
new file mode 100644
index 000000000..0eb60d236
--- /dev/null
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillProblemFaqServiceImpl.java
@@ -0,0 +1,104 @@
+ /** 
+ * @Project: emis
+ * @Title: EmisWaybillProblemFaqServiceImpl.java
+ * @author linfso
+ * @date 2024-05-20 09:36:48
+ * @Copyright: ShangHai Duta 2022 All rights reserved.
+ * @version v1.0  
+ * @Description: <p> 问题件FAG 实体类 </p>
+ */
+
+package com.xdadan.erp.emis.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.xdadan.erp.emis.domain.EmisWaybillProblemFaq;
+import com.xdadan.erp.emis.mapper.EmisWaybillProblemFaqMapper;
+import com.xdadan.erp.emis.service.IEmisWaybillProblemFaqService;
+
+/**
+ * 问题件FAGService业务层处理
+ * 
+ * @author linfso
+ * @date 2024-05-20 09:36:48
+ */
+@Service
+public class EmisWaybillProblemFaqServiceImpl implements IEmisWaybillProblemFaqService 
+{
+    @Autowired
+    private EmisWaybillProblemFaqMapper emisWaybillProblemFaqMapper;
+
+    /**
+     * 查询问题件FAG
+     * 
+     * @param id 问题件FAG主键
+     * @return 问题件FAG
+     */
+    @Override
+    public EmisWaybillProblemFaq selectEmisWaybillProblemFaqById(Long id)
+    {
+        return emisWaybillProblemFaqMapper.selectEmisWaybillProblemFaqById(id);
+    }
+
+    /**
+     * 查询问题件FAG列表
+     * 
+     * @param emisWaybillProblemFaq 问题件FAG
+     * @return 问题件FAG
+     */
+    @Override
+    public List<EmisWaybillProblemFaq> selectEmisWaybillProblemFaqList(EmisWaybillProblemFaq emisWaybillProblemFaq)
+    {
+        return emisWaybillProblemFaqMapper.selectEmisWaybillProblemFaqList(emisWaybillProblemFaq);
+    }
+
+    /**
+     * 新增问题件FAG
+     * 
+     * @param emisWaybillProblemFaq 问题件FAG
+     * @return 结果
+     */
+    @Override
+    public int insertEmisWaybillProblemFaq(EmisWaybillProblemFaq emisWaybillProblemFaq)
+    {
+        return emisWaybillProblemFaqMapper.insertEmisWaybillProblemFaq(emisWaybillProblemFaq);
+    }
+
+    /**
+     * 修改问题件FAG
+     * 
+     * @param emisWaybillProblemFaq 问题件FAG
+     * @return 结果
+     */
+    @Override
+    public int updateEmisWaybillProblemFaq(EmisWaybillProblemFaq emisWaybillProblemFaq)
+    {
+        return emisWaybillProblemFaqMapper.updateEmisWaybillProblemFaq(emisWaybillProblemFaq);
+    }
+
+    /**
+     * 批量删除问题件FAG
+     * 
+     * @param ids 需要删除的问题件FAG主键
+     * @return 结果
+     */
+    @Override
+    public int deleteEmisWaybillProblemFaqByIds(Long[] ids)
+    {
+        return emisWaybillProblemFaqMapper.deleteEmisWaybillProblemFaqByIds(ids);
+    }
+
+    /**
+     * 删除问题件FAG信息
+     * 
+     * @param id 问题件FAG主键
+     * @return 结果
+     */
+    @Override
+    public int deleteEmisWaybillProblemFaqById(Long id)
+    {
+        return emisWaybillProblemFaqMapper.deleteEmisWaybillProblemFaqById(id);
+    }
+
+}
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index f14de9f10..3d6ab1851 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -816,7 +816,18 @@
     <update id="updateEmisWaybill" parameterType="EmisWaybill">
         update emis_waybill
         <trim prefix="SET" suffixOverrides=",">
+            <if test="custOrderId != null and custOrderId != ''">cust_order_id = #{custOrderId},</if>
             <if test="billCodeSub != null and billCodeSub != ''">bill_code_sub = #{billCodeSub},</if>
+            <if test="orderType != null and orderType != ''">order_type = #{orderType},</if>
+            <if test="orderDate != null">order_date = #{orderDate},</if>
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="customerCode != null and customerCode != ''">customer_code = #{customerCode},</if>
+            <if test="customerName != null and customerName != ''">customer_name = #{customerName},</if>
+            <if test="receiveCustomerCode != null and receiveCustomerCode != ''">receive_customer_code = #{receiveCustomerCode},</if>
+            <if test="receiveCustomerName != null and receiveCustomerName != ''">receive_customer_name = #{receiveCustomerName},</if>
+            <if test="thirdCustomerCode != null and thirdCustomerCode != ''">third_customer_code = #{thirdCustomerCode},</if>
+            <if test="thirdCustomerName != null and thirdCustomerName != ''">third_customer_name = #{thirdCustomerName},</if>
+            <if test="openId != null and openId != ''">open_id = #{openId},</if>
             <if test="receiveName != null and receiveName != ''">receive_name = #{receiveName},</if>
             <if test="receiveCompany != null and receiveCompany != ''">receive_company = #{receiveCompany},</if>
             <if test="receiveMobile != null and receiveMobile != ''">receive_mobile = #{receiveMobile},</if>
@@ -848,6 +859,7 @@
             <if test="productType != null and productType != ''">product_type = #{productType},</if>
             <if test="timeType != null and timeType != ''">time_type = #{timeType},</if>
             <if test="meterType != null and meterType != ''">meter_type = #{meterType},</if>
+            <if test="carryType != null and carryType != ''">carry_type = #{carryType},</if>
             <if test="customsClear != null and customsClear != ''">customs_clear = #{customsClear},</if>
             <if test="customsEclaration != null and customsEclaration != ''">customs_eclaration = #{customsEclaration},</if>
             <if test="estimateDate != null">estimate_date = #{estimateDate},</if>
@@ -883,9 +895,15 @@
             <if test="volumeWeight != null">volume_weight = #{volumeWeight},</if>
             <if test="currency != null and currency != ''">currency = #{currency},</if>
             <if test="settlementWeight != null">settlement_weight = #{settlementWeight},</if>
+            <if test="scanWeight != null">scan_weight = #{scanWeight},</if>
             <if test="feeWeight != null">fee_weight = #{feeWeight},</if>
             <if test="freight != null">freight = #{freight},</if>
+            <if test="realPaymentType != null and realPaymentType != ''">real_payment_type = #{realPaymentType},</if>
+            <if test="realFee != null">real_fee = #{realFee},</if>
+            <if test="blSpecialQuote != null and blSpecialQuote != ''">bl_special_quote = #{blSpecialQuote},</if>
             <if test="blOverLong != null and blOverLong != ''">bl_over_long = #{blOverLong},</if>
+            <if test="blBill != null and blBill != ''">bl_bill = #{blBill},</if>
+            <if test="blBillText != null and blBillText != ''">bl_bill_text = #{blBillText},</if>
             <if test="blOverWeight != null and blOverWeight != ''">bl_over_weight = #{blOverWeight},</if>
             <if test="overWeightNumber != null and overWeightNumber != ''">over_weight_number = #{overWeightNumber},</if>
             <if test="feeRemaker != null and feeRemaker != ''">fee_remaker = #{feeRemaker},</if>
@@ -899,7 +917,31 @@
             <if test="insureRemark != null and insureRemark != ''">insure_remark = #{insureRemark},</if>
             <if test="insureSiteCode != null and insureSiteCode != ''">insure_site_code = #{insureSiteCode},</if>
             <if test="insureDate != null and insureDate != ''">insure_date = #{insureDate},</if>
+            <if test="blPrint != null and blPrint != ''">bl_print = #{blPrint},</if>
+            <if test="printManCode != null and printManCode != ''">print_man_code = #{printManCode},</if>
+            <if test="printSite != null and printSite != ''">print_site = #{printSite},</if>
+            <if test="printDate != null and printDate != ''">print_date = #{printDate},</if>
+            <if test="printCount != null and printCount != ''">print_count = #{printCount},</if>
+            <if test="blDispFd != null and blDispFd != ''">bl_disp_fd = #{blDispFd},</if>
+            <if test="transferCode != null and transferCode != ''">transfer_code = #{transferCode},</if>
+            <if test="transferBillcode != null and transferBillcode != ''">transfer_billcode = #{transferBillcode},</if>
+            <if test="dispFdDate != null">disp_fd_date = #{dispFdDate},</if>
+            <if test="dispFdReason != null and dispFdReason != ''">disp_fd_reason = #{dispFdReason},</if>
+            <if test="currentSiteCode != null and currentSiteCode != ''">current_site_code = #{currentSiteCode},</if>
+            <if test="nextSiteCode != null and nextSiteCode != ''">next_site_code = #{nextSiteCode},</if>
+            <if test="lastSiteCode != null and lastSiteCode != ''">last_site_code = #{lastSiteCode},</if>
+            <if test="registerSiteCode != null and registerSiteCode != ''">register_site_code = #{registerSiteCode},</if>
+            <if test="registerDate != null">register_date = #{registerDate},</if>
+            <if test="registerManCode != null and registerManCode != ''">register_man_code = #{registerManCode},</if>
             <if test="takePieceEmployeeCode != null and takePieceEmployeeCode != ''">take_piece_employee_code = #{takePieceEmployeeCode},</if>
+            <if test="sendSiteCode != null and sendSiteCode != ''">send_site_code = #{sendSiteCode},</if>
+            <if test="sendDate != null">send_date = #{sendDate},</if>
+            <if test="dispatchManCode != null and dispatchManCode != ''">dispatch_man_code = #{dispatchManCode},</if>
+            <if test="dispatchDate != null and dispatchDate != ''">dispatch_date = #{dispatchDate},</if>
+            <if test="dispatchSiteCode != null and dispatchSiteCode != ''">dispatch_site_code = #{dispatchSiteCode},</if>
+            <if test="produceBillDate != null">produce_bill_date = #{produceBillDate},</if>
+            <if test="produceBillSiteCode != null and produceBillSiteCode != ''">produce_bill_site_code = #{produceBillSiteCode},</if>
+            <if test="produceBillManCode != null and produceBillManCode != ''">produce_bill_man_code = #{produceBillManCode},</if>
             <if test="destinationCode != null and destinationCode != ''">destination_code = #{destinationCode},</if>
             <if test="destinationProvince != null and destinationProvince != ''">destination_province = #{destinationProvince},</if>
             <if test="destinationCity != null and destinationCity != ''">destination_city = #{destinationCity},</if>
@@ -910,16 +952,199 @@
             <if test="payee != null and payee != ''">payee = #{payee},</if>
             <if test="salesmen != null and salesmen != ''">salesmen = #{salesmen},</if>
             <if test="operateEmployeeCode != null and operateEmployeeCode != ''">operate_employee_code = #{operateEmployeeCode},</if>
+            <if test="blIsQuestion != null and blIsQuestion != ''">bl_is_question = #{blIsQuestion},</if>
+            <if test="problemType != null and problemType != ''">problem_type = #{problemType},</if>
+            <if test="problemCause != null and problemCause != ''">problem_cause = #{problemCause},</if>
+            <if test="problemDelayDays != null">problem_delay_days = #{problemDelayDays},</if>
             <if test="blMessage != null and blMessage != ''">bl_message = #{blMessage},</if>
             <if test="blAcceptMessage != null and blAcceptMessage != ''">bl_accept_message = #{blAcceptMessage},</if>
+            <if test="blGenSubbill != null and blGenSubbill != ''">bl_gen_subbill = #{blGenSubbill},</if>
+            <if test="signMan != null and signMan != ''">sign_man = #{signMan},</if>
+            <if test="signManCode != null and signManCode != ''">sign_man_code = #{signManCode},</if>
+            <if test="signSiteCode != null and signSiteCode != ''">sign_site_code = #{signSiteCode},</if>
+            <if test="signDate != null and signDate != ''">sign_date = #{signDate},</if>
+            <if test="billPicSendRmk != null and billPicSendRmk != ''">bill_pic_send_rmk = #{billPicSendRmk},</if>
+            <if test="billPicDispatchRmk != null and billPicDispatchRmk != ''">bill_pic_dispatch_rmk = #{billPicDispatchRmk},</if>
+            <if test="timezoneOffset != null and timezoneOffset != ''">timezone_offset = #{timezoneOffset},</if>
+            <if test="dataFrom != null and dataFrom != ''">data_from = #{dataFrom},</if>
+            <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
+            <if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null and remark != ''">remark = #{remark},</if>
+            <if test="createSite != null and createSite != ''">create_site = #{createSite},</if>
             <if test="updateSite != null and updateSite != ''">update_site = #{updateSite},</if>
         </trim>
         where id = #{id}
     </update>
 
+    <update id="updateEmisWaybillByBillCode" parameterType="EmisWaybill">
+        update emis_waybill
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="custOrderId != null and custOrderId != ''">cust_order_id = #{custOrderId},</if>
+            <if test="billCodeSub != null and billCodeSub != ''">bill_code_sub = #{billCodeSub},</if>
+            <if test="orderType != null and orderType != ''">order_type = #{orderType},</if>
+            <if test="orderDate != null">order_date = #{orderDate},</if>
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="customerCode != null and customerCode != ''">customer_code = #{customerCode},</if>
+            <if test="customerName != null and customerName != ''">customer_name = #{customerName},</if>
+            <if test="receiveCustomerCode != null and receiveCustomerCode != ''">receive_customer_code = #{receiveCustomerCode},</if>
+            <if test="receiveCustomerName != null and receiveCustomerName != ''">receive_customer_name = #{receiveCustomerName},</if>
+            <if test="thirdCustomerCode != null and thirdCustomerCode != ''">third_customer_code = #{thirdCustomerCode},</if>
+            <if test="thirdCustomerName != null and thirdCustomerName != ''">third_customer_name = #{thirdCustomerName},</if>
+            <if test="openId != null and openId != ''">open_id = #{openId},</if>
+            <if test="receiveName != null and receiveName != ''">receive_name = #{receiveName},</if>
+            <if test="receiveCompany != null and receiveCompany != ''">receive_company = #{receiveCompany},</if>
+            <if test="receiveMobile != null and receiveMobile != ''">receive_mobile = #{receiveMobile},</if>
+            <if test="receiveTel != null and receiveTel != ''">receive_tel = #{receiveTel},</if>
+            <if test="receiveCountry != null and receiveCountry != ''">receive_country = #{receiveCountry},</if>
+            <if test="receiveProvince != null and receiveProvince != ''">receive_province = #{receiveProvince},</if>
+            <if test="receiveCity != null and receiveCity != ''">receive_city = #{receiveCity},</if>
+            <if test="receiveCounty != null and receiveCounty != ''">receive_county = #{receiveCounty},</if>
+            <if test="receiveTown != null and receiveTown != ''">receive_town = #{receiveTown},</if>
+            <if test="receiveAddress != null and receiveAddress != ''">receive_address = #{receiveAddress},</if>
+            <if test="receivePostcode != null and receivePostcode != ''">receive_postcode = #{receivePostcode},</if>
+            <if test="receivePcd != null and receivePcd != ''">receive_pcd = #{receivePcd},</if>
+            <if test="sendName != null and sendName != ''">send_name = #{sendName},</if>
+            <if test="sendCompany != null and sendCompany != ''">send_company = #{sendCompany},</if>
+            <if test="sendMobile != null and sendMobile != ''">send_mobile = #{sendMobile},</if>
+            <if test="sendTel != null and sendTel != ''">send_tel = #{sendTel},</if>
+            <if test="sendCountry != null and sendCountry != ''">send_country = #{sendCountry},</if>
+            <if test="sendProvince != null and sendProvince != ''">send_province = #{sendProvince},</if>
+            <if test="sendCity != null and sendCity != ''">send_city = #{sendCity},</if>
+            <if test="sendCounty != null and sendCounty != ''">send_county = #{sendCounty},</if>
+            <if test="sendTown != null and sendTown != ''">send_town = #{sendTown},</if>
+            <if test="sendAddress != null and sendAddress != ''">send_address = #{sendAddress},</if>
+            <if test="sendPostcode != null and sendPostcode != ''">send_postcode = #{sendPostcode},</if>
+            <if test="sendPcd != null and sendPcd != ''">send_pcd = #{sendPcd},</if>
+            <if test="paymentType != null and paymentType != ''">payment_type = #{paymentType},</if>
+            <if test="calcFeeType != null and calcFeeType != ''">calc_fee_type = #{calcFeeType},</if>
+            <if test="custNo != null and custNo != ''">cust_no = #{custNo},</if>
+            <if test="transLineType != null and transLineType != ''">trans_line_type = #{transLineType},</if>
+            <if test="productType != null and productType != ''">product_type = #{productType},</if>
+            <if test="timeType != null and timeType != ''">time_type = #{timeType},</if>
+            <if test="meterType != null and meterType != ''">meter_type = #{meterType},</if>
+            <if test="carryType != null and carryType != ''">carry_type = #{carryType},</if>
+            <if test="customsClear != null and customsClear != ''">customs_clear = #{customsClear},</if>
+            <if test="customsEclaration != null and customsEclaration != ''">customs_eclaration = #{customsEclaration},</if>
+            <if test="estimateDate != null">estimate_date = #{estimateDate},</if>
+            <if test="packType != null and packType != ''">pack_type = #{packType},</if>
+            <if test="dispatchMethod != null and dispatchMethod != ''">dispatch_method = #{dispatchMethod},</if>
+            <if test="pickupMethod != null and pickupMethod != ''">pickup_method = #{pickupMethod},</if>
+            <if test="pickStartDate != null">pick_start_date = #{pickStartDate},</if>
+            <if test="pickFinishDate != null">pick_finish_date = #{pickFinishDate},</if>
+            <if test="pickFailReason != null and pickFailReason != ''">pick_fail_reason = #{pickFailReason},</if>
+            <if test="intoWarehouseCode != null and intoWarehouseCode != ''">into_warehouse_code = #{intoWarehouseCode},</if>
+            <if test="intoWarehouseName != null and intoWarehouseName != ''">into_warehouse_name = #{intoWarehouseName},</if>
+            <if test="intoWarehouseAddress != null and intoWarehouseAddress != ''">into_warehouse_address = #{intoWarehouseAddress},</if>
+            <if test="intoWarehouseContact != null and intoWarehouseContact != ''">into_warehouse_contact = #{intoWarehouseContact},</if>
+            <if test="intoWarehousePhone != null and intoWarehousePhone != ''">into_warehouse_phone = #{intoWarehousePhone},</if>
+            <if test="intoWarehouseBillCode != null and intoWarehouseBillCode != ''">into_warehouse_bill_code = #{intoWarehouseBillCode},</if>
+            <if test="warehouseInNo != null and warehouseInNo != ''">warehouse_in_no = #{warehouseInNo},</if>
+            <if test="customerDeliveryBeginTime != null and customerDeliveryBeginTime != ''">customer_delivery_begin_time = #{customerDeliveryBeginTime},</if>
+            <if test="customerDeliveryEndTime != null and customerDeliveryEndTime != ''">customer_delivery_end_time = #{customerDeliveryEndTime},</if>
+            <if test="goodsType != null and goodsType != ''">goods_type = #{goodsType},</if>
+            <if test="goodsInfo != null and goodsInfo != ''">goods_info = #{goodsInfo},</if>
+            <if test="goodsPics != null and goodsPics != ''">goods_pics = #{goodsPics},</if>
+            <if test="blPrepareInFreight != null and blPrepareInFreight != ''">bl_prepare_in_freight = #{blPrepareInFreight},</if>
+            <if test="prepareInEstFee != null">prepare_in_est_fee = #{prepareInEstFee},</if>
+            <if test="prepareInRealFee != null">prepare_in_real_fee = #{prepareInRealFee},</if>
+            <if test="prepareInExpress != null and prepareInExpress != ''">prepare_in_express = #{prepareInExpress},</if>
+            <if test="prepareInBillCode != null and prepareInBillCode != ''">prepare_in_bill_code = #{prepareInBillCode},</if>
+            <if test="prepareInRemark != null and prepareInRemark != ''">prepare_in_remark = #{prepareInRemark},</if>
+            <if test="prepareInSupplier != null and prepareInSupplier != ''">prepare_in_supplier = #{prepareInSupplier},</if>
+            <if test="totalWeight != null">total_weight = #{totalWeight},</if>
+            <if test="totalVolume != null">total_volume = #{totalVolume},</if>
+            <if test="parcelQty != null">parcel_qty = #{parcelQty},</if>
+            <if test="billWeight != null">bill_weight = #{billWeight},</if>
+            <if test="volumeWeight != null">volume_weight = #{volumeWeight},</if>
+            <if test="currency != null and currency != ''">currency = #{currency},</if>
+            <if test="settlementWeight != null">settlement_weight = #{settlementWeight},</if>
+            <if test="scanWeight != null">scan_weight = #{scanWeight},</if>
+            <if test="feeWeight != null">fee_weight = #{feeWeight},</if>
+            <if test="freight != null">freight = #{freight},</if>
+            <if test="realPaymentType != null and realPaymentType != ''">real_payment_type = #{realPaymentType},</if>
+            <if test="realFee != null">real_fee = #{realFee},</if>
+            <if test="blSpecialQuote != null and blSpecialQuote != ''">bl_special_quote = #{blSpecialQuote},</if>
+            <if test="blOverLong != null and blOverLong != ''">bl_over_long = #{blOverLong},</if>
+            <if test="blBill != null and blBill != ''">bl_bill = #{blBill},</if>
+            <if test="blBillText != null and blBillText != ''">bl_bill_text = #{blBillText},</if>
+            <if test="blOverWeight != null and blOverWeight != ''">bl_over_weight = #{blOverWeight},</if>
+            <if test="overWeightNumber != null and overWeightNumber != ''">over_weight_number = #{overWeightNumber},</if>
+            <if test="feeRemaker != null and feeRemaker != ''">fee_remaker = #{feeRemaker},</if>
+            <if test="thirdCode != null and thirdCode != ''">third_code = #{thirdCode},</if>
+            <if test="realValue != null and realValue != ''">real_value = #{realValue},</if>
+            <if test="blInsure != null and blInsure != ''">bl_insure = #{blInsure},</if>
+            <if test="insureValue != null and insureValue != ''">insure_value = #{insureValue},</if>
+            <if test="insureValueCurrency != null and insureValueCurrency != ''">insure_value_currency = #{insureValueCurrency},</if>
+            <if test="insureFeeCurrency != null and insureFeeCurrency != ''">insure_fee_currency = #{insureFeeCurrency},</if>
+            <if test="insureFee != null">insure_fee = #{insureFee},</if>
+            <if test="insureRemark != null and insureRemark != ''">insure_remark = #{insureRemark},</if>
+            <if test="insureSiteCode != null and insureSiteCode != ''">insure_site_code = #{insureSiteCode},</if>
+            <if test="insureDate != null and insureDate != ''">insure_date = #{insureDate},</if>
+            <if test="blPrint != null and blPrint != ''">bl_print = #{blPrint},</if>
+            <if test="printManCode != null and printManCode != ''">print_man_code = #{printManCode},</if>
+            <if test="printSite != null and printSite != ''">print_site = #{printSite},</if>
+            <if test="printDate != null and printDate != ''">print_date = #{printDate},</if>
+            <if test="printCount != null and printCount != ''">print_count = #{printCount},</if>
+            <if test="blDispFd != null and blDispFd != ''">bl_disp_fd = #{blDispFd},</if>
+            <if test="transferCode != null and transferCode != ''">transfer_code = #{transferCode},</if>
+            <if test="transferBillcode != null and transferBillcode != ''">transfer_billcode = #{transferBillcode},</if>
+            <if test="dispFdDate != null">disp_fd_date = #{dispFdDate},</if>
+            <if test="dispFdReason != null and dispFdReason != ''">disp_fd_reason = #{dispFdReason},</if>
+            <if test="currentSiteCode != null and currentSiteCode != ''">current_site_code = #{currentSiteCode},</if>
+            <if test="nextSiteCode != null and nextSiteCode != ''">next_site_code = #{nextSiteCode},</if>
+            <if test="lastSiteCode != null and lastSiteCode != ''">last_site_code = #{lastSiteCode},</if>
+            <if test="registerSiteCode != null and registerSiteCode != ''">register_site_code = #{registerSiteCode},</if>
+            <if test="registerDate != null">register_date = #{registerDate},</if>
+            <if test="registerManCode != null and registerManCode != ''">register_man_code = #{registerManCode},</if>
+            <if test="takePieceEmployeeCode != null and takePieceEmployeeCode != ''">take_piece_employee_code = #{takePieceEmployeeCode},</if>
+            <if test="sendSiteCode != null and sendSiteCode != ''">send_site_code = #{sendSiteCode},</if>
+            <if test="sendDate != null">send_date = #{sendDate},</if>
+            <if test="dispatchManCode != null and dispatchManCode != ''">dispatch_man_code = #{dispatchManCode},</if>
+            <if test="dispatchDate != null and dispatchDate != ''">dispatch_date = #{dispatchDate},</if>
+            <if test="dispatchSiteCode != null and dispatchSiteCode != ''">dispatch_site_code = #{dispatchSiteCode},</if>
+            <if test="produceBillDate != null">produce_bill_date = #{produceBillDate},</if>
+            <if test="produceBillSiteCode != null and produceBillSiteCode != ''">produce_bill_site_code = #{produceBillSiteCode},</if>
+            <if test="produceBillManCode != null and produceBillManCode != ''">produce_bill_man_code = #{produceBillManCode},</if>
+            <if test="destinationCode != null and destinationCode != ''">destination_code = #{destinationCode},</if>
+            <if test="destinationProvince != null and destinationProvince != ''">destination_province = #{destinationProvince},</if>
+            <if test="destinationCity != null and destinationCity != ''">destination_city = #{destinationCity},</if>
+            <if test="destinationCounty != null and destinationCounty != ''">destination_county = #{destinationCounty},</if>
+            <if test="dispatchUnderlingSiteCode != null and dispatchUnderlingSiteCode != ''">dispatch_underling_site_code = #{dispatchUnderlingSiteCode},</if>
+            <if test="destinationCenterCode != null and destinationCenterCode != ''">destination_center_code = #{destinationCenterCode},</if>
+            <if test="marketManCode != null and marketManCode != ''">market_man_code = #{marketManCode},</if>
+            <if test="payee != null and payee != ''">payee = #{payee},</if>
+            <if test="salesmen != null and salesmen != ''">salesmen = #{salesmen},</if>
+            <if test="operateEmployeeCode != null and operateEmployeeCode != ''">operate_employee_code = #{operateEmployeeCode},</if>
+            <if test="blIsQuestion != null and blIsQuestion != ''">bl_is_question = #{blIsQuestion},</if>
+            <if test="problemType != null and problemType != ''">problem_type = #{problemType},</if>
+            <if test="problemCause != null and problemCause != ''">problem_cause = #{problemCause},</if>
+            <if test="problemDelayDays != null">problem_delay_days = #{problemDelayDays},</if>
+            <if test="blMessage != null and blMessage != ''">bl_message = #{blMessage},</if>
+            <if test="blAcceptMessage != null and blAcceptMessage != ''">bl_accept_message = #{blAcceptMessage},</if>
+            <if test="blGenSubbill != null and blGenSubbill != ''">bl_gen_subbill = #{blGenSubbill},</if>
+            <if test="signMan != null and signMan != ''">sign_man = #{signMan},</if>
+            <if test="signManCode != null and signManCode != ''">sign_man_code = #{signManCode},</if>
+            <if test="signSiteCode != null and signSiteCode != ''">sign_site_code = #{signSiteCode},</if>
+            <if test="signDate != null and signDate != ''">sign_date = #{signDate},</if>
+            <if test="billPicSendRmk != null and billPicSendRmk != ''">bill_pic_send_rmk = #{billPicSendRmk},</if>
+            <if test="billPicDispatchRmk != null and billPicDispatchRmk != ''">bill_pic_dispatch_rmk = #{billPicDispatchRmk},</if>
+            <if test="timezoneOffset != null and timezoneOffset != ''">timezone_offset = #{timezoneOffset},</if>
+            <if test="dataFrom != null and dataFrom != ''">data_from = #{dataFrom},</if>
+            <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
+            <if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null and remark != ''">remark = #{remark},</if>
+            <if test="createSite != null and createSite != ''">create_site = #{createSite},</if>
+            <if test="updateSite != null and updateSite != ''">update_site = #{updateSite},</if>
+        </trim>
+        where bill_code=#{billCode}
+    </update>
+
 
     <update id="updatePrintStatus" parameterType="EmisWaybill">
         update emis_waybill set bl_print='1',print_man_code=#{printManCode},print_site=#{printSite},print_date=now(),print_count=print_count+1 where bill_code=#{billCode}
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillProblemFaqMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillProblemFaqMapper.xml
new file mode 100644
index 000000000..396b3408a
--- /dev/null
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillProblemFaqMapper.xml
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xdadan.erp.emis.mapper.EmisWaybillProblemFaqMapper">
+    
+    <resultMap type="EmisWaybillProblemFaq" id="EmisWaybillProblemFaqResult">
+        <result property="id"    column="id"    />
+        <result property="probId"    column="prob_id"    />
+        <result property="billCode"    column="bill_code"    />
+        <result property="title"    column="title"    />
+        <result property="content"    column="content"    />
+        <result property="status"    column="status"    />
+        <result property="showFlag"    column="show_flag"    />
+        <result property="replayId"    column="replay_id"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+        <result property="createSite"    column="create_site"    />
+        <result property="updateSite"    column="update_site"    />
+    </resultMap>
+
+    <sql id="selectEmisWaybillProblemFaqVo">
+        select id, prob_id, bill_code, title, content, status, show_flag, replay_id, del_flag, create_by, create_time, update_by, update_time, remark, create_site, update_site from emis_waybill_problem_faq
+    </sql>
+
+    <select id="selectEmisWaybillProblemFaqList" parameterType="EmisWaybillProblemFaq" resultMap="EmisWaybillProblemFaqResult">
+        <include refid="selectEmisWaybillProblemFaqVo"/>
+        <where>  
+            <if test="id != null "> and id = #{id}</if>
+            <if test="probId != null "> and prob_id = #{probId}</if>
+            <if test="billCode != null  and billCode != ''"> and bill_code like concat('%', #{billCode}, '%')</if>
+            <if test="title != null  and title != ''"> and title like concat('%', #{title}, '%')</if>
+            <if test="content != null  and content != ''"> and content like concat('%', #{content}, '%')</if>
+            <if test="status != null "> and status = #{status}</if>
+            <if test="showFlag != null  and showFlag != ''"> and show_flag like concat('%', #{showFlag}, '%')</if>
+            <if test="replayId != null "> and replay_id = #{replayId}</if>
+            <if test="delFlag != null  and delFlag != ''"> and del_flag like concat('%', #{delFlag}, '%')</if>
+            <if test="createBy != null  and createBy != ''"> and create_by like concat('%', #{createBy}, '%')</if>
+            <if test="createTime != null "> and create_time = #{createTime}</if>
+            <if test="updateBy != null  and updateBy != ''"> and update_by like concat('%', #{updateBy}, '%')</if>
+            <if test="updateTime != null "> and update_time = #{updateTime}</if>
+            <if test="remark != null  and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
+            <if test="createSite != null  and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
+            <if test="updateSite != null  and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
+        </where>
+        order by create_time desc
+    </select>
+  
+    <select id="selectEmisWaybillProblemFaqById" parameterType="Long" resultMap="EmisWaybillProblemFaqResult">
+        select id, prob_id, bill_code, title, content, status, show_flag, replay_id, del_flag, create_by, create_time, update_by, update_time, remark, create_site, update_site 
+        from emis_waybill_problem_faq a
+        where a.id = #{id}
+    </select>
+        
+    <insert id="insertEmisWaybillProblemFaq" parameterType="EmisWaybillProblemFaq">
+        insert into emis_waybill_problem_faq
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="probId != null">prob_id,</if>
+            <if test="billCode != null and billCode != ''">bill_code,</if>
+            <if test="title != null and title != ''">title,</if>
+            <if test="content != null and content != ''">content,</if>
+            <if test="status != null">status,</if>
+            <if test="showFlag != null and showFlag != ''">show_flag,</if>
+            <if test="replayId != null">replay_id,</if>
+            <if test="delFlag != null and delFlag != ''">del_flag,</if>
+            <if test="createBy != null and createBy != ''">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null and updateBy != ''">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null and remark != ''">remark,</if>
+            <if test="createSite != null and createSite != ''">create_site,</if>
+            <if test="updateSite != null and updateSite != ''">update_site,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="probId != null">#{probId},</if>
+            <if test="billCode != null and billCode != ''">#{billCode},</if>
+            <if test="title != null and title != ''">#{title},</if>
+            <if test="content != null and content != ''">#{content},</if>
+            <if test="status != null">#{status},</if>
+            <if test="showFlag != null and showFlag != ''">#{showFlag},</if>
+            <if test="replayId != null">#{replayId},</if>
+            <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
+            <if test="createBy != null and createBy != ''">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null and updateBy != ''">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null and remark != ''">#{remark},</if>
+            <if test="createSite != null and createSite != ''">#{createSite},</if>
+            <if test="updateSite != null and updateSite != ''">#{updateSite},</if>
+         </trim>
+    </insert>
+
+    <update id="updateEmisWaybillProblemFaq" parameterType="EmisWaybillProblemFaq">
+        update emis_waybill_problem_faq
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="probId != null">prob_id = #{probId},</if>
+            <if test="billCode != null and billCode != ''">bill_code = #{billCode},</if>
+            <if test="title != null and title != ''">title = #{title},</if>
+            <if test="content != null and content != ''">content = #{content},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="showFlag != null and showFlag != ''">show_flag = #{showFlag},</if>
+            <if test="replayId != null">replay_id = #{replayId},</if>
+            <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
+            <if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null and remark != ''">remark = #{remark},</if>
+            <if test="createSite != null and createSite != ''">create_site = #{createSite},</if>
+            <if test="updateSite != null and updateSite != ''">update_site = #{updateSite},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteEmisWaybillProblemFaqById" parameterType="Long">
+        delete from emis_waybill_problem_faq where id = #{id}
+    </delete>
+
+    <delete id="deleteEmisWaybillProblemFaqByIds" parameterType="String">
+        delete from emis_waybill_problem_faq where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file