Merge remote-tracking branch 'origin/master'

src/main/resources/database/template/pubInquiryReply.xml

@@ -19,6 +19,7 @@
                     insert into inquiryAutoDetail(id_id,id_inid,id_detno,id_prodid,id_prodcode,id_vendname,id_vendyyzzh,id_currency,id_venduu,id_ptid,id_incode,id_leadtime,id_minbuyqty,id_minqty,id_rate,id_attach,id_remark,id_vendcontact,id_vendcontacttel,id_vendcontactuu,id_replace_cmpcode,id_replace_spec,id_replace_brand,id_isReplace)
                     select v_id_id,0,v_id_detno,pr_id,pr_code,${detail.id_vendname},${detail.id_vendyyzzh},${detail.id_currency},
                     ${detail.ve_uu},${detail.b2b_id_id},${detail.in_code},${detail.id_leadtime},${detail.id_minbuyqty},${detail.id_minqty},${detail.id_rate},${detail.attach},${detail.id_remark},${detail.ve_contact},${detail.ve_contacttel},${detail.ve_contactuu},${detail.replaceCmpCode},${detail.replaceSpec},${detail.replaceBrand},${detail.isReplace} from product where pr_code=${detail.id_prodcode};
+                    update inquiryAutoDetail set id_replace_code = (select pr_code from product where pr_orispeccode=${detail.replaceCmpCode} and pr_brand=${detail.replaceBrand} and rownum = 1) where id_id = v_id_id;
                 end if;
             </block>
             <iterator loop="detail.dets" var="det">