Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/baosight/hpjx/hp/xs/sql/HPXS007.xml

@@ -31,20 +31,17 @@
 	</sql>
 
 	<sql id="condition">
-		<isNotEmpty prepend=" AND " property="repDate">
-			REP_DATE = #repDate#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="repOrderNo">
-			REP_ORDER_NO LIKE CONCAT('%', #repOrderNo#, '%')
+		<isNotEmpty prepend=" AND " property="folDate">
+			FOL_DATE = #folDate#
 		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="repCustomId">
-			REP_CUSTOM_ID = #repCustomId#
+		<isNotEmpty prepend=" AND " property="delOrderNo">
+			DEL_ORDER_NO LIKE CONCAT('%', #delOrderNo#, '%')
 		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="repUserId">
-			REP_USER_ID = #repUserId#
+		<isNotEmpty prepend=" AND " property="folType">
+			FOL_TYPE = #folType#
 		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="repStatus">
-			REP_STATUS = #repStatus#
+		<isNotEmpty prepend=" AND " property="folStatus">
+			FOL_STATUS = #folStatus#
 		</isNotEmpty>
 	</sql>
 

src/main/webapp/HP/XS/HPXS007.jsp

@@ -18,7 +18,7 @@
       <EF:EFDatePicker cname="回访日期" ename="folDate" blockId="inqu_status" row="0" colWidth="3"
                        format="yyyy-MM-dd" readonly="true"/>
  <%--     <EF:EFInput cname="发货单号" ename="inqu_status-0-folOrderNo" colWidth="3"/>--%>
-      <EF:EFSelect cname="发货单号" ename="inqu_status-0-folOrderNo" colWidth="3" filter="contains" defultValue="">
+      <EF:EFSelect cname="发货单号" ename="inqu_status-0-delOrderNo" colWidth="3" filter="contains" defultValue="">
         <EF:EFOption label="全部" value=""/>
         <EF:EFOptions blockId="sale_no_block_id" textField="textField" valueField="valueField"/>
       </EF:EFSelect>