代码合并修改

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

@@ -120,7 +120,7 @@ public class HPKC003 extends DaoEPBase {
 	private Integer inventType;	/* 存货类型*/
 	private String inventCode = " ";		/* 存货编码*/
 	private String inventName = " ";		/* 存货名称*/
-	private Integer inventRecordId = new Integer(0);		/* 存货档案ID*/
+	private Long inventRecordId = new Long(0);		/* 存货档案ID*/
 	private BigDecimal amount = new BigDecimal("0");		/* 数量*/
 	private BigDecimal weight = new BigDecimal("0");		/* 重量*/
 	private String remark = " ";		/* 备注*/
@@ -516,7 +516,7 @@ public class HPKC003 extends DaoEPBase {
 	 * get the inventRecordId - 存货档案ID.
 	 * @return the inventRecordId
 	 */
-	public Integer getInventRecordId() {
+	public Long getInventRecordId() {
 		return this.inventRecordId;
 	}
 
@@ -525,7 +525,7 @@ public class HPKC003 extends DaoEPBase {
 	 *
 	 * @param inventRecordId - 存货档案ID
 	 */
-	public void setInventRecordId(Integer inventRecordId) {
+	public void setInventRecordId(Long inventRecordId) {
 		this.inventRecordId = inventRecordId;
 	}
 	/**
@@ -1010,7 +1010,7 @@ public class HPKC003 extends DaoEPBase {
 		setInventType(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_INVENT_TYPE)), inventType));
 		setInventCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_INVENT_CODE)), inventCode));
 		setInventName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_INVENT_NAME)), inventName));
-		setInventRecordId(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_INVENT_RECORD_ID)), inventRecordId));
+		setInventRecordId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_INVENT_RECORD_ID)), inventRecordId));
 		setAmount(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_AMOUNT)), amount));
 		setWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_WEIGHT)), weight));
 		setRemark(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_REMARK)), remark));

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

@@ -3,7 +3,7 @@ package com.baosight.hpjx.hp.kc.service;
 import com.baosight.hpjx.common.DdynamicEnum;
 import com.baosight.hpjx.core.dao.DaoUtils;
 import com.baosight.hpjx.hp.constant.HPConstant;
-import com.baosight.hpjx.hp.kc.domain.HPKC003;
+import com.baosight.hpjx.hp.kc.HPKC003;
 import com.baosight.hpjx.hp.kc.tools.HPKCTools;
 import com.baosight.hpjx.hp.pz.tools.HPPZTools;
 import com.baosight.hpjx.hp.sc.domain.HPSC004;

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

@@ -4,9 +4,9 @@ import com.baosight.hpjx.common.DdynamicEnum;
 import com.baosight.hpjx.core.constant.CommonConstant;
 import com.baosight.hpjx.hp.constant.HPConstant;
 import com.baosight.hpjx.hp.constant.HPSqlConstant;
+import com.baosight.hpjx.hp.kc.HPKC003;
 import com.baosight.hpjx.hp.kc.domain.HPKC001;
 import com.baosight.hpjx.hp.kc.domain.HPKC002;
-import com.baosight.hpjx.hp.kc.domain.HPKC003;
 import com.baosight.hpjx.hp.kc.domain.HPKC004;
 import com.baosight.hpjx.hp.kc.domain.HPKC005;
 import com.baosight.hpjx.hp.kc.domain.HPKC006;

src/main/java/com/baosight/hpjx/hp/pz/tools/HPPZTools.java

 package com.baosight.hpjx.hp.pz.tools;
 
+import com.baosight.eplat.utils.StringUtils;
 import com.baosight.hpjx.common.InventTypeEnum;
 import com.baosight.hpjx.core.constant.CommonConstant;
 import com.baosight.hpjx.core.dao.DaoBase;
@@ -8,12 +9,10 @@ import com.baosight.hpjx.hp.pz.domain.HPPZ007;
 import com.baosight.hpjx.hp.pz.domain.HPPZ009;
 import com.baosight.hpjx.hp.pz.domain.HPPZ004;
 import com.baosight.hpjx.util.AssertUtils;
-import com.baosight.iplat4j.core.util.StringUtils;
 import com.baosight.iplat4j.core.ei.EiConstant;
 import com.baosight.iplat4j.core.ei.EiInfo;
 import com.baosight.iplat4j.core.exception.PlatException;
 import com.baosight.iplat4j.core.service.soa.XLocalManager;
-import org.apache.commons.lang.StringUtils;
 import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
@@ -155,15 +154,15 @@ public class HPPZTools {
 	public static String jointSpec(BigDecimal length, BigDecimal width, BigDecimal thick) {
 		StringBuffer sb = new StringBuffer();
 		if (length != null && length.compareTo(BigDecimal.ZERO) != 0) {
-			sb.append(StringUtils.toString(length));
+			sb.append(com.baosight.iplat4j.core.util.StringUtils.toString(length));
 			sb.append("*");
 		}
 		if (width != null && width.compareTo(BigDecimal.ZERO) != 0) {
-			sb.append(StringUtils.toString(width));
+			sb.append(com.baosight.iplat4j.core.util.StringUtils.toString(width));
 			sb.append("*");
 		}
 		if (thick != null && thick.compareTo(BigDecimal.ZERO) != 0) {
-			sb.append(StringUtils.toString(thick));
+			sb.append(com.baosight.iplat4j.core.util.StringUtils.toString(thick));
 		}
 		return sb.toString();
 	}