修改公共询价方法，针对已经转报价单的明细回传公共询价库更新状态为不可报价；针对ERP采纳决策上传到公共询价库

src/main/java/com/uas/erp/schedular/b2b/domain/InquiryDecide.java

@@ -16,6 +16,7 @@ public class InquiryDecide extends KeyEntity{
 	private String in_code;
 	private Short id_detno;
 	private Short id_agreed;
+	private Long b2b_id;
 
 	@JsonIgnore
 	public long getId_id() {
@@ -58,6 +59,14 @@ public class InquiryDecide extends KeyEntity{
 		this.b2b_qu_id = b2b_qu_id;
 	}
 
+	public Long getB2b_id() {
+		return b2b_id;
+	}
+
+	public void setB2b_id(Long b2b_id) {
+		this.b2b_id = b2b_id;
+	}
+
 	@Override
 	public Object getKey() {
 		return id_id;

src/main/java/com/uas/erp/schedular/b2b/domain/InquiryDetail.java

@@ -43,6 +43,7 @@ public class InquiryDetail extends KeyEntity{
 	private String in_code; // 存在公共询价但是询价单没有数据的问题，这时需要处理
 	// 询价明细状态，用于确认消息是报价还是修改报价
 	private String id_status;
+	private String id_incode;// 询价单号
 
 	public Long getB2b_id_id() {
 		return b2b_id_id;
@@ -268,6 +269,14 @@ public class InquiryDetail extends KeyEntity{
 		this.id_status = id_status;
 	}
 
+	public String getId_incode() {
+		return id_incode;
+	}
+
+	public void setId_incode(String id_incode) {
+		this.id_incode = id_incode;
+	}
+
 	/**
 	 * 主动报价SQL封装
 	 * 

src/main/java/com/uas/erp/schedular/publicinquiry/task/PubInquiryTask.java

@@ -173,8 +173,12 @@ public class PubInquiryTask extends AbstractTask {
     public void uploadCheckInquiry() {
         Enterprise enterprise = getEnterprise();
         if (null != enterprise) {
-            List<Inquiry> inquiries = jdbcTemplate.queryForBeanList("select * from (select in_id,in_code from inquiryAuto where in_checkStatus = '已提交' and in_checkSendStatus='待上传' and nvl(in_class,' ')<>'主动报价' and in_sendStatus='已上传' order by in_id) where rownum < 100", Inquiry.class);
+            List<Inquiry> inquiries = jdbcTemplate.queryForBeanList("select * from (select in_id,in_code from inquiryAuto where in_checkStatus = '已提交' and in_sendstatus ='待上传' and nvl(in_class,' ')<>'主动报价' order by in_id) where rownum < 100", Inquiry.class);
             if (!CollectionUtils.isEmpty(inquiries)) {
+                for (Inquiry inquiry : inquiries) {
+                    List<InquiryDetail> details = jdbcTemplate.queryForBeanList("select * from InquiryAutoDetail where id_inid = " + inquiry.getIn_id(), InquiryDetail.class);
+                    inquiry.setDetails(details);
+                }
                 ContextHolder.setDataSize(inquiries.size());
                 new StatusBasedHandler<Inquiry>("inquiryAuto", "in_id", "in_checkSendStatus", "/inquiry/public/checking?enuu=" + enterprise.getEn_uu(), inquiries).run();
             }
@@ -191,7 +195,7 @@ public class PubInquiryTask extends AbstractTask {
     public void uploadInquiryDecide() {
         Enterprise enterprise = getEnterprise();
         if (null != enterprise) {
-            List<InquiryDecide> replies = jdbcTemplate.queryForBeanList("select id_id,in_code,id_detno,id_isagreed id_agreed from InquiryAutoDetail left join InquiryAuto on id_inid=in_id left join vendor on id_vendcode=ve_code where IN_SENDSTATUS='已上传' and nvl(in_class,' ')<>'主动报价' and ID_SENDSTATUS='待上传' and id_isagreed is not null and ve_uu is not null and nvl(ve_b2benable,0)=1 and rownum < 100 order by in_code,id_detno",
+            List<InquiryDecide> replies = jdbcTemplate.queryForBeanList("select id_id,id_incode in_code,id_detno,abs(id_isagreed) id_agreed,id_ptid id_b2bid from InquiryAutoDetail left join InquiryAuto on id_inid=in_id left join vendor on id_vendcode=ve_code where IN_SENDSTATUS='已上传' and nvl(in_class,' ')<>'主动报价' and nvl(ID_SENDSTATUS, ' ')<>'已上传' and id_isagreed is not null and ve_uu is not null and nvl(ve_b2benable,0)=1 and rownum < 100 order by in_code,id_detno",
                     InquiryDecide.class);
             if (!CollectionUtils.isEmpty(replies)) {
                 ContextHolder.setDataSize(replies.size());