Merge branch 'dev' of http://git.pseer.com/platform/hp-smart into dev-ly

src/main/java/com/baosight/hpjx/hp/cg/sql/HPCG002A.xml

@@ -61,7 +61,7 @@
 			A.PRO_APPLY_DATE = #proApplyDate#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="proApplyNo">
-			A.PRO_APPLY_NO = #proApplyNo#
+			A.PRO_APPLY_NO LIKE CONCAT( '%',#proApplyNo#, '%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="whCode">
 			A.WH_CODE = #whCode#
@@ -335,7 +335,6 @@
 	<update id="check">
 		UPDATE ${hpjxSchema}.T_HPCG002A
 		SET
-		CUST_CODE	= #custCode#,   <!-- 供应商编码 -->
 		PRO_APPLY_STATUS	= #proApplyStatus#   <!-- 提交状态 0-未提交 1-已提交 -->
 		WHERE
 		ID = #id#

src/main/webapp/HP/CG/HPCG002A.js

@@ -82,7 +82,6 @@ function check(id, auditStatus,custCode,parentid,proPlanStatus) {
     inEiInfo.set("result-0-parentId", parentid);
     inEiInfo.set("result-0-proApplyStatus", auditStatus);
     inEiInfo.set("result-0-proPlanStatus", proPlanStatus);
-    inEiInfo.set("result-0-custCode", custCode);
     EiCommunicator.send('HPCG002A', 'check', inEiInfo, {
             onSuccess(response) {
                 //NotificationUtil(response.msg);