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

src/main/java/com/baosight/hpjx/hp/kc/domain/HPKC013.java

@@ -96,11 +96,11 @@ public class HPKC013 extends DaoEPBase {
 	public static final String COL_FACTORY_CODE = "FACTORY_CODE";    		/* 厂区编码*/
 	public static final String COL_FACTORY_NAME = "FACTORY_NAME";    		/* 工厂*/
 
-	public static final String QUERY = "HPKC0013.query";
-	public static final String COUNT = "HPKC0013.count";
-	public static final String INSERT = "HPKC0013.insert";
-	public static final String UPDATE = "HPKC0013.update";
-	public static final String DELETE = "HPKC0013.delete";
+	public static final String QUERY = "HPKC013.query";
+	public static final String COUNT = "HPKC013.count";
+	public static final String INSERT = "HPKC013.insert";
+	public static final String UPDATE = "HPKC013.update";
+	public static final String DELETE = "HPKC013.delete";
 
 	private Long id;	/* ID*/
 	private String companyCode = " ";		/* 企业编码 预留*/

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC004.java

@@ -169,7 +169,7 @@ public class ServiceHPKC004 extends ServiceBase {
 			}
 			inInfo = this.query(inInfo);
 			inInfo.setStatus(EiConstant.STATUS_DEFAULT);
-			inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据删除成功!");
+			inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据申请退货成功!");
 		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "删除失败");
 		}

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC013.java

@@ -92,12 +92,12 @@ public class ServiceHPKC013 extends ServiceBase {
 				HPKC010 hpkc010 = null;
 				HPKC013 fKc013 = new HPKC013();
 				fKc013.fromMap(resultRows.get(i));
+				HPKC013 dbKc013 = mapKc013.get(fKc013.getReturnNo());
 				if (!fKc013.getSubInventCode().equals(" ")) {
-					hpkc011 = HPKCTools.HpKc011.listById(fKc013.getKcId());
+					hpkc011 = HPKCTools.HpKc011.listById(dbKc013.getKcId());
 				}else {
-					hpkc010 = HPKCTools.HpKc010.listById(fKc013.getKcId());
+					hpkc010 = HPKCTools.HpKc010.listById(dbKc013.getKcId());
 				}
-				HPKC013 dbKc013 = mapKc013.get(fKc013.getReturnNo());
 				if(dbKc013.getReturnStatus().compareTo(ReturnStatusEnum.RETURNING.getCode())==0) {
 					dbKc013.setReturnStatus(ReturnStatusEnum.RETURNED.getCode());
 					DaoUtils.update(HPKC013.UPDATE, dbKc013);

src/main/java/com/baosight/hpjx/hp/mt/service/ServiceHPMT001.java

 package com.baosight.hpjx.hp.mt.service;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baosight.hpjx.core.constant.CommonConstant;
-import com.baosight.hpjx.core.dao.DaoUtils;
 import com.baosight.hpjx.core.security.UserSessionUtils;
-import com.baosight.hpjx.hp.constant.HPConstant;
-import com.baosight.hpjx.hp.constant.HPSqlConstant;
-import com.baosight.hpjx.hp.zl.domain.HPZL001;
 import com.baosight.hpjx.util.*;
-import com.baosight.iplat4j.core.ei.EiBlock;
 import com.baosight.iplat4j.core.ei.EiConstant;
 import com.baosight.iplat4j.core.ei.EiInfo;
 import com.baosight.iplat4j.core.service.impl.ServiceBase;
-import com.baosight.iplat4j.core.web.threadlocal.UserSession;
-import com.baosight.iplat4j.ed.util.SequenceGenerator;
-import org.apache.commons.collections.MapUtils;
 
 import java.math.BigDecimal;
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 

src/main/java/com/baosight/hpjx/hp/pz/service/ServiceHPPZ015A.java

 package com.baosight.hpjx.hp.pz.service;
 
-import cn.hutool.core.bean.BeanUtil;
+import com.baosight.bpm.util.BeanUtil;
 import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
 import com.baosight.hpjx.common.DdynamicEnum;
 import com.baosight.hpjx.core.constant.CommonConstant;

src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC006.java

 package com.baosight.hpjx.hp.sc.service;
 
-import cn.hutool.core.bean.BeanUtil;
 import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
 import com.baosight.hpjx.common.DdynamicEnum;
 import com.baosight.hpjx.common.HPConstants;

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/KC/HPKC004.js

@@ -139,9 +139,10 @@ function returnApply(){
 		}
 	});
 	if(flag) {
-		JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"退货\"操作? ", {
+		JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"申请退货\"操作? ", {
 			ok: function () {
 				JSUtils.submitGridsData("result", "HPKC004", "returnApply", true);
+				query();
 			}
 		});
 	}

src/main/webapp/HP/KC/HPKC013.js

@@ -10,7 +10,7 @@ $(function () {
 					if (returnStatus) {
 						if (returnStatus == 0) {
 							template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;" ' +
-								'onclick="check(' + item.returnNo + ',1)" >确认收货</a>';
+								'onclick="check(\'' + item.returnNo + '\',1)" >确认收货</a>';
 						}
 					}
 
@@ -55,7 +55,7 @@ let query = function () {
 function check(returnNo, auditStatus) {
 	const inEiInfo = new EiInfo();
 	inEiInfo.set("result-0-returnNo", returnNo);
-	inEiInfo.set("result-0-returnStatus", returnStatus);
+	inEiInfo.set("result-0-returnStatus", auditStatus);
 	EiCommunicator.send('HPKC013', 'comfirmReturn', inEiInfo, {
 			onSuccess(response) {
 				message("提交成功，已生确认收货");

src/main/webapp/HP/KC/HPKC013.jsp

@@ -64,7 +64,7 @@
 		    <EF:EFColumn ename="weight" cname="总重（T）" enable="false" width="100" align="right" format="{0:N3}"/>
 			<EF:EFComboColumn ename="returnStatus" cname="状态" width="80" align="center">
 				<EF:EFCodeOption codeName="hpjx.hpjx.returnStatus"/>
-			</EF:EFComboColumn
+			</EF:EFComboColumn>
 		    <EF:EFColumn ename="remark" cname="备注" enable="false" width="100" align="center" />
 		    <EF:EFColumn ename="projCode" cname="项目号" enable="false" width="140" align="center" hidden="true"/>
 		    <EF:EFColumn ename="prodNo" cname="生产订单号" enable="false" width="140" align="center" hidden="true"/>

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>