diff --git a/src/main/java/com/xujie/modules/supplier/controller/SupplierInvNotificationController.java b/src/main/java/com/xujie/modules/supplier/controller/SupplierInvNotificationController.java
index 874a400..340ca73 100644
--- a/src/main/java/com/xujie/modules/supplier/controller/SupplierInvNotificationController.java
+++ b/src/main/java/com/xujie/modules/supplier/controller/SupplierInvNotificationController.java
@@ -129,6 +129,22 @@ public class SupplierInvNotificationController {
     }
 
 
+    @PostMapping("/delPurReplyHist")
+    @ApiOperation("删除报价")
+    public R delPurReplyHist(@RequestBody PurQuotationReplyHist data) {
+//        purQuotationService.delPurReplyHist(data);
+        return R.ok();
+    }
+
+    @PostMapping(value="/getPurReplyHist")
+    @ResponseBody
+    public Object getPurReplyHist(@RequestBody PurQuotationReplyHist replyHist) {
+        List<PurQuotationReplyHist> rows = purQuotationService.getPurReplyHist(replyHist);
+        return R.ok().put("rows", rows);
+    }
+
+
+
 
 //    -----------------------------------------------------------------采购开票通知单 ---------------------------------------------------
     /**
diff --git a/src/main/java/com/xujie/modules/supplier/entity/PurQuotationReplyHist.java b/src/main/java/com/xujie/modules/supplier/entity/PurQuotationReplyHist.java
index 4cefd42..3e7b550 100644
--- a/src/main/java/com/xujie/modules/supplier/entity/PurQuotationReplyHist.java
+++ b/src/main/java/com/xujie/modules/supplier/entity/PurQuotationReplyHist.java
@@ -1,14 +1,17 @@
 package com.xujie.modules.supplier.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.xujie.common.utils.QueryPage;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * <p>
@@ -36,7 +39,7 @@ public class PurQuotationReplyHist extends QueryPage {
     private String site;
 
     @ApiModelProperty(value = "报价单行号")
-    private Float itemNo;
+    private Integer itemNo;
 
     @ApiModelProperty(value = "物料编码")
     private String partNo;
@@ -86,8 +89,10 @@ public class PurQuotationReplyHist extends QueryPage {
     @ApiModelProperty(value = "报价人")
     private String createdBy;
 
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value = "报价时间")
-    private LocalDateTime createdDate;
+    private Date createdDate;
 
     @ApiModelProperty(value = "表面处理费")
     private Float surfaceFee;
diff --git a/src/main/java/com/xujie/modules/supplier/service/PurQuotationService.java b/src/main/java/com/xujie/modules/supplier/service/PurQuotationService.java
index 1bb4bf1..fad39a7 100644
--- a/src/main/java/com/xujie/modules/supplier/service/PurQuotationService.java
+++ b/src/main/java/com/xujie/modules/supplier/service/PurQuotationService.java
@@ -297,4 +297,6 @@ public interface PurQuotationService {
 
 
     void savePurReplyHist(PurQuotationReplyHist model);
+
+    List<PurQuotationReplyHist> getPurReplyHist(PurQuotationReplyHist replyHist);
 }
diff --git a/src/main/java/com/xujie/modules/supplier/service/impl/PurQuotationServiceImpl.java b/src/main/java/com/xujie/modules/supplier/service/impl/PurQuotationServiceImpl.java
index c6def71..5ed6c2a 100644
--- a/src/main/java/com/xujie/modules/supplier/service/impl/PurQuotationServiceImpl.java
+++ b/src/main/java/com/xujie/modules/supplier/service/impl/PurQuotationServiceImpl.java
@@ -203,9 +203,16 @@ public class PurQuotationServiceImpl implements PurQuotationService {
         purQuoDetailData.setPartNo(model.getPartNo());
         purQuoDetailData.setStatus("已报价");
         purQuotationDetailMapper.updatePurDetailStatus(purQuoDetailData);
+
+        model.setCreatedDate(new Date());
         purQuotationReplyHistMapper.insert(model);
     }
 
+    @Override
+    public List<PurQuotationReplyHist> getPurReplyHist(PurQuotationReplyHist replyHist) {
+        return purQuotationReplyHistMapper.getListByModel(replyHist);
+    }
+
 
     //---------------------------------不用的方法---------------------------------------------------
 
diff --git a/src/main/resources/mapper/supplier/PurQuotationReplyHistMapper.xml b/src/main/resources/mapper/supplier/PurQuotationReplyHistMapper.xml
index e1385f7..10a95fd 100644
--- a/src/main/resources/mapper/supplier/PurQuotationReplyHistMapper.xml
+++ b/src/main/resources/mapper/supplier/PurQuotationReplyHistMapper.xml
@@ -42,10 +42,9 @@
     <select id="getListByModel" resultType="com.xujie.modules.supplier.entity.PurQuotationReplyHist">
         select <include refid="BaseColumnList" />
         from PurQuotationReplyHist
-        where 1=1
+        where site = #{site}
             <if test="id != null "> and id = #{id}</if>
             <if test="orderNo != null and orderNo != '' "> and order_no = #{orderNo}</if>
-            <if test="site != null and site != '' "> and site = #{site}</if>
             <if test="itemNo != null and itemNo != '' "> and item_no = #{itemNo}</if>
             <if test="partNo != null and partNo != '' "> and part_no = #{partNo}</if>
             <if test="partDesc != null and partDesc != '' "> and part_desc = #{partDesc}</if>