合并代码

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

@@ -47,7 +47,6 @@ public class HPKC002 extends DaoEPBase {
 	public static final String FIELD_OLD_REQ_NO = "oldReqNo";    		/* 原领料单号*/
 	public static final String FIELD_DELETE_FLAG = "deleteFlag";    		/* 是否删除0.否1.是*/
 
-	public static final String FIELD_PROJ_CODE = "projCode";    		/* 项目编码*/
 	public static final String FIELD_HPSC006_ID = "hpsc006Id";
 
 	public static final String FIELD_PROJ_CODE = "projCode";    		/* 项目编码*/
@@ -77,7 +76,6 @@ public class HPKC002 extends DaoEPBase {
 	public static final String COL_KC_ID = "KC_ID";    		/* 库存ID*/
 	public static final String COL_OLD_REQ_NO = "OLD_REQ_NO";    		/* 原领料单号*/
 	public static final String COL_DELETE_FLAG = "DELETE_FLAG";    		/* 是否删除0.否1.是*/
-	public static final String COL_PROJ_CODE = "PROJ_CODE";    		/* 项目编码*/
 	public static final String COL_HPSC006_ID = "HPSC006_ID";
 	public static final String COL_PROJ_CODE = "PROJ_CODE";    		/* 项目编码*/
 	public static final String COL_PROJ_NAME = "PROJ_NAME";    		/* 项目名称*/
@@ -112,7 +110,6 @@ public class HPKC002 extends DaoEPBase {
 	private Long kcId;	/* 库存ID*/
 	private String oldReqNo = " ";		/* 原领料单号*/
 	private Integer deleteFlag;	/* 是否删除0.否1.是*/
-	private String projCode = " ";		/* 项目编码*/
 	private Long hpsc006Id;
 	private String projCode = " ";		/* 项目编码*/
 	private String projName = " ";		/* 项目名称*/
@@ -229,10 +226,6 @@ public class HPKC002 extends DaoEPBase {
 		eiColumn.setDescName("是否删除0.否1.是");
 		eiMetadata.addMeta(eiColumn);
 
-		eiColumn = new EiColumn(FIELD_PROJ_CODE);
-		eiColumn.setDescName("项目编码");
-		eiMetadata.addMeta(eiColumn);
-
 		eiColumn = new EiColumn(FIELD_HPSC006_ID);
 		eiColumn.setDescName("下料清单id");
 		eiMetadata.addMeta(eiColumn);
@@ -641,22 +634,6 @@ public class HPKC002 extends DaoEPBase {
 	}
 
 	/**
-	 * get the projCode - 项目编码.
-	 * @return the projCode
-	 */
-	public String getProjCode() {
-		return this.projCode;
-	}
-
-	/**
-	 * set the projCode - 项目编码.
-	 *
-	 * @param projCode - 项目编码
-	 */
-	public void setProjCode(String projCode) {
-		this.projCode = projCode;
-	}
-	/**
 	 * get the projName - 项目名称.
 	 * @return the projName
 	 */
@@ -736,7 +713,6 @@ public class HPKC002 extends DaoEPBase {
 		setKcId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_KC_ID)), kcId));
 		setOldReqNo(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_OLD_REQ_NO)), oldReqNo));
 		setDeleteFlag(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_DELETE_FLAG)), deleteFlag));
-		setProjCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PROJ_CODE)), projCode));
 		setHpsc006Id(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_HPSC006_ID)), hpsc006Id));
 		setProjCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PROJ_CODE)), projCode));
 		setProjName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PROJ_NAME)), projName));
@@ -773,7 +749,6 @@ public class HPKC002 extends DaoEPBase {
 		map.put(FIELD_KC_ID, StringUtils.toString(kcId, eiMetadata.getMeta(FIELD_KC_ID)));
 		map.put(FIELD_OLD_REQ_NO, StringUtils.toString(oldReqNo, eiMetadata.getMeta(FIELD_OLD_REQ_NO)));
 		map.put(FIELD_DELETE_FLAG, StringUtils.toString(deleteFlag, eiMetadata.getMeta(FIELD_DELETE_FLAG)));
-		map.put(FIELD_PROJ_CODE, StringUtils.toString(projCode, eiMetadata.getMeta(FIELD_PROJ_CODE)));
 		map.put(FIELD_HPSC006_ID, StringUtils.toString(hpsc006Id, eiMetadata.getMeta(FIELD_HPSC006_ID)));
 
 		map.put(FIELD_PROJ_CODE, StringUtils.toString(projCode, eiMetadata.getMeta(FIELD_PROJ_CODE)));