物料名称统一改为存货名称

src/main/java/com/baosight/hpjx/common/DdynamicEnum.java

@@ -72,22 +72,22 @@ public enum DdynamicEnum {
     WH_RECORD_BLOCK_ID("wh_record_block_id","whCode","whName","HPPZ007.queryComboBox"),
 
     /**
-     * 模块：物料类型
-     * 用途：物料类型下拉框
+     * 模块：存货类型
+     * 用途：存货类型下拉框
      * 编写：yk
      */
     MAT_TYPE_BLOCK_ID("mat_type_block_id","matType","matType","HPPZ007.queryMatTypeComboBox"),
 
     /**
-     * 模块：物料编码
-     * 用途：物料编码下拉框
+     * 模块：存货编码
+     * 用途：存货编码下拉框
      * 编写：yk
      */
     MAT_CODE_BLOCK_ID("mat_code_block_id","matCode","matCode","HPPZ007.queryMatCodeComboBox"),
 	
 	/**
-	 * 模块：物料编码
-	 * 用途：物料编码下拉框
+	 * 模块：存货编码
+	 * 用途：存货编码下拉框
 	 * 编写：yk
 	 */
 	USER_BLOCK_ID("user_block_id","loginName","userName","HPXSUser.queryComboBox"),

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

@@ -33,10 +33,10 @@ public class HPKC001 extends DaoEPBase {
     private String documentTime = " ";		/* 单据日期*/
     private String whCode = " ";		/* 仓库编码*/
     private String whName = " ";		/* 仓库名称*/
-    private String materialType = " ";		/* 物料类型编码*/
-    private String materialTypeName = " ";		/* 物料类型名称*/
-    private String materialCode = " ";		/* 物料编码*/
-    private String materialName = " ";		/* 物料名称*/
+    private String materialType = " ";		/* 存货类型编码*/
+    private String materialTypeName = " ";		/* 存货类型名称*/
+    private String materialCode = " ";		/* 存货编码*/
+    private String materialName = " ";		/* 存货名称*/
     private String spec = " ";		/* 规格*/
     private String unit = " ";		/* 单位*/
     private Long quantity = 0L;		/* 数量*/
@@ -112,19 +112,19 @@ EiColumn eiColumn;
         eiMetadata.addMeta(eiColumn);
 
         eiColumn = new EiColumn("materialType");
-        eiColumn.setDescName("物料类型编码");
+        eiColumn.setDescName("存货类型编码");
         eiMetadata.addMeta(eiColumn);
 
         eiColumn = new EiColumn("materialTypeName");
-        eiColumn.setDescName("物料类型名称");
+        eiColumn.setDescName("存货类型名称");
         eiMetadata.addMeta(eiColumn);
 
         eiColumn = new EiColumn("materialCode");
-        eiColumn.setDescName("物料编码");
+        eiColumn.setDescName("存货编码");
         eiMetadata.addMeta(eiColumn);
 
         eiColumn = new EiColumn("materialName");
-        eiColumn.setDescName("物料名称");
+        eiColumn.setDescName("存货名称");
         eiMetadata.addMeta(eiColumn);
 
         eiColumn = new EiColumn("spec");

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

@@ -33,10 +33,10 @@ public class HPKC002 extends DaoEPBase {
     private String documentTime = " ";		/* 单据日期*/
     private String whCode = " ";		/* 仓库编码*/
     private String whName = " ";		/* 仓库名称*/
-    private String materialType = " ";		/* 物料类型编码*/
-    private String materialTypeName = " ";		/* 物料类型名称*/
-    private String materialCode = " ";		/* 物料编码*/
-    private String materialName = " ";		/* 物料名称*/
+    private String materialType = " ";		/* 存货类型编码*/
+    private String materialTypeName = " ";		/* 存货类型名称*/
+    private String materialCode = " ";		/* 存货编码*/
+    private String materialName = " ";		/* 存货名称*/
     private String spec = " ";		/* 规格*/
     private String unit = " ";		/* 单位*/
     private Long quantity = 0L;		/* 数量*/
@@ -112,19 +112,19 @@ public class HPKC002 extends DaoEPBase {
         eiMetadata.addMeta(eiColumn);
 
         eiColumn = new EiColumn("materialType");
-        eiColumn.setDescName("物料类型编码");
+        eiColumn.setDescName("存货类型编码");
         eiMetadata.addMeta(eiColumn);
 
         eiColumn = new EiColumn("materialTypeName");
-        eiColumn.setDescName("物料类型名称");
+        eiColumn.setDescName("存货类型名称");
         eiMetadata.addMeta(eiColumn);
 
         eiColumn = new EiColumn("materialCode");
-        eiColumn.setDescName("物料编码");
+        eiColumn.setDescName("存货编码");
         eiMetadata.addMeta(eiColumn);
 
         eiColumn = new EiColumn("materialName");
-        eiColumn.setDescName("物料名称");
+        eiColumn.setDescName("存货名称");
         eiMetadata.addMeta(eiColumn);
 
         eiColumn = new EiColumn("spec");

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

@@ -32,9 +32,9 @@ public class HPKC003 extends DaoEPBase {
 	public static final String FIELD_PRODUCTION_ORDER_NO = "productionOrderNo";    		/* 生产订单号*/
 	public static final String FIELD_WH_CODE = "whCode";    		/* 仓库编码*/
 	public static final String FIELD_WH_NAME = "whName";    		/* 仓库名称*/
-	public static final String FIELD_INVENT_TYPE = "inventType";    		/* 物料类型*/
-	public static final String FIELD_INVENT_CODE = "inventCode";    		/* 物料编码*/
-	public static final String FIELD_INVENT_NAME = "inventName";    		/* 物料名称*/
+	public static final String FIELD_INVENT_TYPE = "inventType";    		/* 存货类型*/
+	public static final String FIELD_INVENT_CODE = "inventCode";    		/* 存货编码*/
+	public static final String FIELD_INVENT_NAME = "inventName";    		/* 存货名称*/
 	public static final String FIELD_AMOUNT = "amount";    		/* 数量*/
 	public static final String FIELD_WEIGHT = "weight";    		/* 重量*/
 	public static final String FIELD_REMARK = "remark";    		/* 备注*/
@@ -57,9 +57,9 @@ public class HPKC003 extends DaoEPBase {
 	public static final String COL_PRODUCTION_ORDER_NO = "PRODUCTION_ORDER_NO";    		/* 生产订单号*/
 	public static final String COL_WH_CODE = "WH_CODE";    		/* 仓库编码*/
 	public static final String COL_WH_NAME = "WH_NAME";    		/* 仓库名称*/
-	public static final String COL_INVENT_TYPE = "INVENT_TYPE";    		/* 物料类型*/
-	public static final String COL_INVENT_CODE = "INVENT_CODE";    		/* 物料编码*/
-	public static final String COL_INVENT_NAME = "INVENT_NAME";    		/* 物料名称*/
+	public static final String COL_INVENT_TYPE = "INVENT_TYPE";    		/* 存货类型*/
+	public static final String COL_INVENT_CODE = "INVENT_CODE";    		/* 存货编码*/
+	public static final String COL_INVENT_NAME = "INVENT_NAME";    		/* 存货名称*/
 	public static final String COL_AMOUNT = "AMOUNT";    		/* 数量*/
 	public static final String COL_WEIGHT = "WEIGHT";    		/* 重量*/
 	public static final String COL_REMARK = "REMARK";    		/* 备注*/
@@ -69,7 +69,7 @@ public class HPKC003 extends DaoEPBase {
 	public static final String COL_UPDATED_BY = "UPDATED_BY";    		/* 更新人*/
 	public static final String COL_UPDATED_TIME = "UPDATED_TIME";    		/* 更新时间*/
 	public static final String COL_UPDATED_NAME = "UPDATED_NAME";    		/* 修改人名称*/
-	public static final String COL_DELETE_FLAG = "DELETE_FLAG";    		/* 物料类型*/
+	public static final String COL_DELETE_FLAG = "DELETE_FLAG";    		/* 存货类型*/
 
 	private Long id = null;
 	private String companyCode = " ";		/* 企业编码 预留*/
@@ -80,9 +80,9 @@ public class HPKC003 extends DaoEPBase {
 	private String productionOrderNo = " ";		/* 生产订单号*/
 	private String whCode = " ";		/* 仓库编码*/
 	private String whName = " ";		/* 仓库名称*/
-	private Integer inventType;	/* 物料类型*/
-	private String inventCode = " ";		/* 物料编码*/
-	private String inventName = " ";		/* 物料名称*/
+	private Integer inventType;	/* 存货类型*/
+	private String inventCode = " ";		/* 存货编码*/
+	private String inventName = " ";		/* 存货名称*/
 	private BigDecimal amount = new BigDecimal(0.00);		/* 数量*/
 	private BigDecimal weight = new BigDecimal(0.00);		/* 重量*/
 	private String remark = " ";		/* 备注*/
@@ -138,15 +138,15 @@ public class HPKC003 extends DaoEPBase {
 		eiMetadata.addMeta(eiColumn);
 
 		eiColumn = new EiColumn(FIELD_INVENT_TYPE);
-		eiColumn.setDescName("物料类型");
+		eiColumn.setDescName("存货类型");
 		eiMetadata.addMeta(eiColumn);
 
 		eiColumn = new EiColumn(FIELD_INVENT_CODE);
-		eiColumn.setDescName("物料编码");
+		eiColumn.setDescName("存货编码");
 		eiMetadata.addMeta(eiColumn);
 
 		eiColumn = new EiColumn(FIELD_INVENT_NAME);
-		eiColumn.setDescName("物料名称");
+		eiColumn.setDescName("存货名称");
 		eiMetadata.addMeta(eiColumn);
 
 		eiColumn = new EiColumn(FIELD_AMOUNT);
@@ -349,7 +349,7 @@ public class HPKC003 extends DaoEPBase {
 		this.whName = whName;
 	}
 	/**
-	 * get the inventType - 物料类型.
+	 * get the inventType - 存货类型.
 	 * @return the inventType
 	 */
 	public Integer getInventType() {
@@ -357,15 +357,15 @@ public class HPKC003 extends DaoEPBase {
 	}
 
 	/**
-	 * set the inventType - 物料类型.
+	 * set the inventType - 存货类型.
 	 *
-	 * @param inventType - 物料类型
+	 * @param inventType - 存货类型
 	 */
 	public void setInventType(Integer inventType) {
 		this.inventType = inventType;
 	}
 	/**
-	 * get the inventCode - 物料编码.
+	 * get the inventCode - 存货编码.
 	 * @return the inventCode
 	 */
 	public String getInventCode() {
@@ -373,15 +373,15 @@ public class HPKC003 extends DaoEPBase {
 	}
 
 	/**
-	 * set the inventCode - 物料编码.
+	 * set the inventCode - 存货编码.
 	 *
-	 * @param inventCode - 物料编码
+	 * @param inventCode - 存货编码
 	 */
 	public void setInventCode(String inventCode) {
 		this.inventCode = inventCode;
 	}
 	/**
-	 * get the inventName - 物料名称.
+	 * get the inventName - 存货名称.
 	 * @return the inventName
 	 */
 	public String getInventName() {
@@ -389,9 +389,9 @@ public class HPKC003 extends DaoEPBase {
 	}
 
 	/**
-	 * set the inventName - 物料名称.
+	 * set the inventName - 存货名称.
 	 *
-	 * @param inventName - 物料名称
+	 * @param inventName - 存货名称
 	 */
 	public void setInventName(String inventName) {
 		this.inventName = inventName;
@@ -542,7 +542,7 @@ public class HPKC003 extends DaoEPBase {
 	}
 
 	/**
-	 * get the deleteFlag - 物料类型.
+	 * get the deleteFlag - 存货类型.
 	 * @return the deleteFlag
 	 */
 	public Integer getDeleteFlag() {
@@ -550,9 +550,9 @@ public class HPKC003 extends DaoEPBase {
 	}
 
 	/**
-	 * set the deleteFlag - 物料类型.
+	 * set the deleteFlag - 存货类型.
 	 *
-	 * @param deleteFlag - 物料类型
+	 * @param deleteFlag - 存货类型
 	 */
 	public void setDeleteFlag(Integer deleteFlag) {
 		this.deleteFlag = deleteFlag;

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

@@ -29,9 +29,9 @@ public class HPKC006 extends DaoEPBase {
 	public static final String FIELD_OTHER_ENTER_NO = "otherEnterNo";    		/* 其他入库单号*/
 	public static final String FIELD_WH_CODE = "whCode";    		/* 仓库编码*/
 	public static final String FIELD_WH_NAME = "whName";    		/* 仓库名称*/
-	public static final String FIELD_INVENT_TYPE = "inventType";    		/* 物料类型*/
-	public static final String FIELD_INVENT_CODE = "inventCode";    		/* 物料编码*/
-	public static final String FIELD_INVENT_NAME = "inventName";    		/* 物料名称*/
+	public static final String FIELD_INVENT_TYPE = "inventType";    		/* 存货类型*/
+	public static final String FIELD_INVENT_CODE = "inventCode";    		/* 存货编码*/
+	public static final String FIELD_INVENT_NAME = "inventName";    		/* 存货名称*/
 	public static final String FIELD_INVENT_RECORD_ID = "inventRecordId";    		/* 规格*/
 	public static final String FIELD_AMOUNT = "amount";    		/* 数量*/
 	public static final String FIELD_WEIGHT = "weight";    		/* 重量*/
@@ -51,9 +51,9 @@ public class HPKC006 extends DaoEPBase {
 	public static final String COL_OTHER_ENTER_NO = "OTHER_ENTER_NO";    		/* 其他入库单号*/
 	public static final String COL_WH_CODE = "WH_CODE";    		/* 仓库编码*/
 	public static final String COL_WH_NAME = "WH_NAME";    		/* 仓库名称*/
-	public static final String COL_INVENT_TYPE = "INVENT_TYPE";    		/* 物料类型*/
-	public static final String COL_INVENT_CODE = "INVENT_CODE";    		/* 物料编码*/
-	public static final String COL_INVENT_NAME = "INVENT_NAME";    		/* 物料名称*/
+	public static final String COL_INVENT_TYPE = "INVENT_TYPE";    		/* 存货类型*/
+	public static final String COL_INVENT_CODE = "INVENT_CODE";    		/* 存货编码*/
+	public static final String COL_INVENT_NAME = "INVENT_NAME";    		/* 存货名称*/
 	public static final String COL_INVENT_RECORD_ID = "INVENT_RECORD_ID";    		/* 规格*/
 	public static final String COL_AMOUNT = "AMOUNT";    		/* 数量*/
 	public static final String COL_WEIGHT = "WEIGHT";    		/* 重量*/
@@ -79,9 +79,9 @@ public class HPKC006 extends DaoEPBase {
 	private String otherEnterNo = " ";		/* 其他入库单号*/
 	private String whCode = " ";		/* 仓库编码*/
 	private String whName = " ";		/* 仓库名称*/
-	private String inventType = " ";		/* 物料类型*/
-	private String inventCode = " ";		/* 物料编码*/
-	private String inventName = " ";		/* 物料名称*/
+	private String inventType = " ";		/* 存货类型*/
+	private String inventCode = " ";		/* 存货编码*/
+	private String inventName = " ";		/* 存货名称*/
 	private Long inventRecordId = null;	/* 规格*/
 	private BigDecimal amount = new BigDecimal(0.00);		/* 数量*/
 	private BigDecimal weight = new BigDecimal(0.00);		/* 重量*/
@@ -130,15 +130,15 @@ public class HPKC006 extends DaoEPBase {
 		eiMetadata.addMeta(eiColumn);
 
 		eiColumn = new EiColumn(FIELD_INVENT_TYPE);
-		eiColumn.setDescName("物料类型");
+		eiColumn.setDescName("存货类型");
 		eiMetadata.addMeta(eiColumn);
 
 		eiColumn = new EiColumn(FIELD_INVENT_CODE);
-		eiColumn.setDescName("物料编码");
+		eiColumn.setDescName("存货编码");
 		eiMetadata.addMeta(eiColumn);
 
 		eiColumn = new EiColumn(FIELD_INVENT_NAME);
-		eiColumn.setDescName("物料名称");
+		eiColumn.setDescName("存货名称");
 		eiMetadata.addMeta(eiColumn);
 
 		eiColumn = new EiColumn(FIELD_INVENT_RECORD_ID);
@@ -314,7 +314,7 @@ public class HPKC006 extends DaoEPBase {
 		this.whName = whName;
 	}
 	/**
-	 * get the inventType - 物料类型.
+	 * get the inventType - 存货类型.
 	 * @return the inventType
 	 */
 	public String getInventType() {
@@ -322,15 +322,15 @@ public class HPKC006 extends DaoEPBase {
 	}
 
 	/**
-	 * set the inventType - 物料类型.
+	 * set the inventType - 存货类型.
 	 *
-	 * @param inventType - 物料类型
+	 * @param inventType - 存货类型
 	 */
 	public void setInventType(String inventType) {
 		this.inventType = inventType;
 	}
 	/**
-	 * get the inventCode - 物料编码.
+	 * get the inventCode - 存货编码.
 	 * @return the inventCode
 	 */
 	public String getInventCode() {
@@ -338,15 +338,15 @@ public class HPKC006 extends DaoEPBase {
 	}
 
 	/**
-	 * set the inventCode - 物料编码.
+	 * set the inventCode - 存货编码.
 	 *
-	 * @param inventCode - 物料编码
+	 * @param inventCode - 存货编码
 	 */
 	public void setInventCode(String inventCode) {
 		this.inventCode = inventCode;
 	}
 	/**
-	 * get the inventName - 物料名称.
+	 * get the inventName - 存货名称.
 	 * @return the inventName
 	 */
 	public String getInventName() {
@@ -354,9 +354,9 @@ public class HPKC006 extends DaoEPBase {
 	}
 
 	/**
-	 * set the inventName - 物料名称.
+	 * set the inventName - 存货名称.
 	 *
-	 * @param inventName - 物料名称
+	 * @param inventName - 存货名称
 	 */
 	public void setInventName(String inventName) {
 		this.inventName = inventName;

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

@@ -29,9 +29,9 @@ public class HPKC007 extends DaoEPBase {
 	public static final String FIELD_OTHER_OUTER_NO = "otherOuterNo";    		/* 其他出库单号*/
 	public static final String FIELD_WH_CODE = "whCode";    		/* 仓库编码*/
 	public static final String FIELD_WH_NAME = "whName";    		/* 仓库名称*/
-	public static final String FIELD_INVENT_TYPE = "inventType";    		/* 物料类型*/
-	public static final String FIELD_INVENT_CODE = "inventCode";    		/* 物料编码*/
-	public static final String FIELD_INVENT_NAME = "inventName";    		/* 物料名称*/
+	public static final String FIELD_INVENT_TYPE = "inventType";    		/* 存货类型*/
+	public static final String FIELD_INVENT_CODE = "inventCode";    		/* 存货编码*/
+	public static final String FIELD_INVENT_NAME = "inventName";    		/* 存货名称*/
 	public static final String FIELD_INVENT_RECORD_ID = "inventRecordId";    		/* 规格ID*/
 	public static final String FIELD_AMOUNT = "amount";    		/* 数量*/
 	public static final String FIELD_WEIGHT = "weight";    		/* 重量*/
@@ -54,9 +54,9 @@ public class HPKC007 extends DaoEPBase {
 	public static final String COL_OTHER_OUTER_NO = "OTHER_OUTER_NO";    		/* 其他出库单号*/
 	public static final String COL_WH_CODE = "WH_CODE";    		/* 仓库编码*/
 	public static final String COL_WH_NAME = "WH_NAME";    		/* 仓库名称*/
-	public static final String COL_INVENT_TYPE = "INVENT_TYPE";    		/* 物料类型*/
-	public static final String COL_INVENT_CODE = "INVENT_CODE";    		/* 物料编码*/
-	public static final String COL_INVENT_NAME = "INVENT_NAME";    		/* 物料名称*/
+	public static final String COL_INVENT_TYPE = "INVENT_TYPE";    		/* 存货类型*/
+	public static final String COL_INVENT_CODE = "INVENT_CODE";    		/* 存货编码*/
+	public static final String COL_INVENT_NAME = "INVENT_NAME";    		/* 存货名称*/
 	public static final String COL_INVENT_RECORD_ID = "INVENT_RECORD_ID";    		/* 规格ID*/
 	public static final String COL_AMOUNT = "AMOUNT";    		/* 数量*/
 	public static final String COL_WEIGHT = "WEIGHT";    		/* 重量*/
@@ -85,9 +85,9 @@ public class HPKC007 extends DaoEPBase {
 	private String otherOuterNo = " ";		/* 其他出库单号*/
 	private String whCode = " ";		/* 仓库编码*/
 	private String whName = " ";		/* 仓库名称*/
-	private String inventType = " ";		/* 物料类型*/
-	private String inventCode = " ";		/* 物料编码*/
-	private String inventName = " ";		/* 物料名称*/
+	private String inventType = " ";		/* 存货类型*/
+	private String inventCode = " ";		/* 存货编码*/
+	private String inventName = " ";		/* 存货名称*/
 	private Long inventRecordId = null;	/* 规格ID*/
 	private BigDecimal amount = new BigDecimal(0.00);		/* 数量*/
 	private BigDecimal weight = new BigDecimal(0.00);		/* 重量*/
@@ -139,15 +139,15 @@ public class HPKC007 extends DaoEPBase {
 		eiMetadata.addMeta(eiColumn);
 
 		eiColumn = new EiColumn(FIELD_INVENT_TYPE);
-		eiColumn.setDescName("物料类型");
+		eiColumn.setDescName("存货类型");
 		eiMetadata.addMeta(eiColumn);
 
 		eiColumn = new EiColumn(FIELD_INVENT_CODE);
-		eiColumn.setDescName("物料编码");
+		eiColumn.setDescName("存货编码");
 		eiMetadata.addMeta(eiColumn);
 
 		eiColumn = new EiColumn(FIELD_INVENT_NAME);
-		eiColumn.setDescName("物料名称");
+		eiColumn.setDescName("存货名称");
 		eiMetadata.addMeta(eiColumn);
 
 		eiColumn = new EiColumn(FIELD_INVENT_RECORD_ID);
@@ -335,7 +335,7 @@ public class HPKC007 extends DaoEPBase {
 		this.whName = whName;
 	}
 	/**
-	 * get the inventType - 物料类型.
+	 * get the inventType - 存货类型.
 	 * @return the inventType
 	 */
 	public String getInventType() {
@@ -343,15 +343,15 @@ public class HPKC007 extends DaoEPBase {
 	}
 
 	/**
-	 * set the inventType - 物料类型.
+	 * set the inventType - 存货类型.
 	 *
-	 * @param inventType - 物料类型
+	 * @param inventType - 存货类型
 	 */
 	public void setInventType(String inventType) {
 		this.inventType = inventType;
 	}
 	/**
-	 * get the inventCode - 物料编码.
+	 * get the inventCode - 存货编码.
 	 * @return the inventCode
 	 */
 	public String getInventCode() {
@@ -359,15 +359,15 @@ public class HPKC007 extends DaoEPBase {
 	}
 
 	/**
-	 * set the inventCode - 物料编码.
+	 * set the inventCode - 存货编码.
 	 *
-	 * @param inventCode - 物料编码
+	 * @param inventCode - 存货编码
 	 */
 	public void setInventCode(String inventCode) {
 		this.inventCode = inventCode;
 	}
 	/**
-	 * get the inventName - 物料名称.
+	 * get the inventName - 存货名称.
 	 * @return the inventName
 	 */
 	public String getInventName() {
@@ -375,9 +375,9 @@ public class HPKC007 extends DaoEPBase {
 	}
 
 	/**
-	 * set the inventName - 物料名称.
+	 * set the inventName - 存货名称.
 	 *
-	 * @param inventName - 物料名称
+	 * @param inventName - 存货名称
 	 */
 	public void setInventName(String inventName) {
 		this.inventName = inventName;

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

@@ -27,9 +27,9 @@ public class HPKC010 extends DaoEPBase {
 	public static final String FIELD_COMPANY_CODE = "companyCode";    		/* 企业编码 预留*/
 	public static final String FIELD_WH_CODE = "whCode";    		/* 仓库编码*/
 	public static final String FIELD_WH_NAME = "whName";    		/* 仓库名称*/
-	public static final String FIELD_INVENT_TYPE = "inventType";    		/* 物料类型*/
-	public static final String FIELD_INVENT_CODE = "inventCode";    		/* 物料编码*/
-	public static final String FIELD_INVENT_NAME = "inventName";    		/* 物料名称*/
+	public static final String FIELD_INVENT_TYPE = "inventType";    		/* 存货类型*/
+	public static final String FIELD_INVENT_CODE = "inventCode";    		/* 存货编码*/
+	public static final String FIELD_INVENT_NAME = "inventName";    		/* 存货名称*/
 	public static final String FIELD_INVENT_RECORD_ID = "inventRecordId";    		/* 存货档案ID*/
 	public static final String FIELD_AMOUNT = "amount";    		/* 账面数量*/
 	public static final String FIELD_WEIGHT = "weight";    		/* 账面重量*/
@@ -45,9 +45,9 @@ public class HPKC010 extends DaoEPBase {
 	public static final String COL_COMPANY_CODE = "COMPANY_CODE";    		/* 企业编码 预留*/
 	public static final String COL_WH_CODE = "WH_CODE";    		/* 仓库编码*/
 	public static final String COL_WH_NAME = "WH_NAME";    		/* 仓库名称*/
-	public static final String COL_INVENT_TYPE = "INVENT_TYPE";    		/* 物料类型*/
-	public static final String COL_INVENT_CODE = "INVENT_CODE";    		/* 物料编码*/
-	public static final String COL_INVENT_NAME = "INVENT_NAME";    		/* 物料名称*/
+	public static final String COL_INVENT_TYPE = "INVENT_TYPE";    		/* 存货类型*/
+	public static final String COL_INVENT_CODE = "INVENT_CODE";    		/* 存货编码*/
+	public static final String COL_INVENT_NAME = "INVENT_NAME";    		/* 存货名称*/
 	public static final String COL_INVENT_RECORD_ID = "inventRecordId";    		/* 存货档案ID*/
 	public static final String COL_AMOUNT = "amount";    		/* 数量*/
 	public static final String COL_WEIGHT = "weight";    		/* 重量*/
@@ -69,9 +69,9 @@ public class HPKC010 extends DaoEPBase {
 	private String companyCode = " ";		/* 企业编码 预留*/
 	private String whCode = " ";		/* 仓库编码*/
 	private String whName = " ";		/* 仓库名称*/
-	private String inventType = " ";		/* 物料类型*/
-	private String inventCode = " ";		/* 物料编码*/
-	private String inventName = " ";		/* 物料名称*/
+	private String inventType = " ";		/* 存货类型*/
+	private String inventCode = " ";		/* 存货编码*/
+	private String inventName = " ";		/* 存货名称*/
 	private Long inventRecordId = new Long(0);		/* 存货档案ID*/
 	private BigDecimal amount = new BigDecimal(0.00);		/* 数量*/
 	private BigDecimal weight = new BigDecimal(0.00);		/* 重量*/
@@ -240,7 +240,7 @@ public class HPKC010 extends DaoEPBase {
 		this.whName = whName;
 	}
 	/**
-	 * get the matType - 物料类型.
+	 * get the matType - 存货类型.
 	 * @return the matType
 	 */
 	public String getInventType() {
@@ -248,15 +248,15 @@ public class HPKC010 extends DaoEPBase {
 	}
 
 	/**
-	 * set the matType - 物料类型.
+	 * set the matType - 存货类型.
 	 *
-	 * @param inventType - 物料类型
+	 * @param inventType - 存货类型
 	 */
 	public void setInventType(String inventType) {
 		this.inventType = inventType;
 	}
 	/**
-	 * get the matCode - 物料编码.
+	 * get the matCode - 存货编码.
 	 * @return the matCode
 	 */
 	public String getInventCode() {
@@ -264,15 +264,15 @@ public class HPKC010 extends DaoEPBase {
 	}
 
 	/**
-	 * set the matCode - 物料编码.
+	 * set the matCode - 存货编码.
 	 *
-	 * @param inventCode - 物料编码
+	 * @param inventCode - 存货编码
 	 */
 	public void setInventCode(String inventCode) {
 		this.inventCode = inventCode;
 	}
 	/**
-	 * get the matName - 物料名称.
+	 * get the matName - 存货名称.
 	 * @return the matName
 	 */
 	public String getInventName() {
@@ -280,9 +280,9 @@ public class HPKC010 extends DaoEPBase {
 	}
 
 	/**
-	 * set the matName - 物料名称.
+	 * set the matName - 存货名称.
 	 *
-	 * @param inventName - 物料名称
+	 * @param inventName - 存货名称
 	 */
 	public void setInventName(String inventName) {
 		this.inventName = inventName;

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

@@ -76,7 +76,7 @@ public class ServiceHPKC001 extends ServiceBase {
                 params.put("whCode", insertEntity.getWhCode());
                 List query = dao.query("HPPZ007.queryByWhCode", params);
                 insertEntity.setWhName(((HPPZ007) query.get(0)).getWhName());
-                //物料类型
+                //存货类型
                 insertEntity.setMaterialTypeName(InventTypeEnun.getNameByCode(insertEntity.getMaterialType()));
                 // 生成单据号
                 insertEntity.setDocumentCode(SequenceGenerator.getNextSequence(HPConstant.SequenceId.HPKC001_NUMBER));
@@ -108,7 +108,7 @@ public class ServiceHPKC001 extends ServiceBase {
         for (int i = 0; i < resultRows.size(); i++) {
             HPKC001 entity = new HPKC001();
             entity.fromMap(resultRows.get(i));
-            AssertUtils.isEmpty(entity.getMaterialType(), "物料类型不能为空");
+            AssertUtils.isEmpty(entity.getMaterialType(), "存货类型不能为空");
             AssertUtils.isEmpty(entity.getMaterialCode(), "物料不能为空");
             AssertUtils.isEmpty(entity.getWhCode(), "仓库不能为空");
 
@@ -193,7 +193,7 @@ public class ServiceHPKC001 extends ServiceBase {
                 params.put("whCode", updateEntity.getWhCode());
                 List query = dao.query("HPPZ007.queryByWhCode", params);
                 updateEntity.setWhName(((HPPZ007) query.get(0)).getWhName());
-                //物料类型
+                //存货类型
                 updateEntity.setMaterialTypeName(InventTypeEnun.getNameByCode(updateEntity.getMaterialType()));
                 dao.insert("HPKC001.update", updateEntity);
             }

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

@@ -75,7 +75,7 @@ public class ServiceHPKC002 extends ServiceBase {
                 params.put("whCode", insertEntity.getWhCode());
                 List query = dao.query("HPPZ007.queryByWhCode", params);
                 insertEntity.setWhName(((HPPZ007) query.get(0)).getWhName());
-                //物料类型
+                //存货类型
                 insertEntity.setMaterialTypeName(InventTypeEnun.getNameByCode(insertEntity.getMaterialType()));
                 // 生成单据号
                 insertEntity.setDocumentCode(SequenceGenerator.getNextSequence(HPConstant.SequenceId.HPKC002_NUMBER));
@@ -107,7 +107,7 @@ public class ServiceHPKC002 extends ServiceBase {
         for (int i = 0; i < resultRows.size(); i++) {
             HPKC002 entity = new HPKC002();
             entity.fromMap(resultRows.get(i));
-            AssertUtils.isEmpty(entity.getMaterialType(), "物料类型不能为空");
+            AssertUtils.isEmpty(entity.getMaterialType(), "存货类型不能为空");
             AssertUtils.isEmpty(entity.getMaterialCode(), "物料不能为空");
             AssertUtils.isEmpty(entity.getWhCode(), "仓库不能为空");
 
@@ -134,7 +134,7 @@ public class ServiceHPKC002 extends ServiceBase {
                 params.put("whCode", updateEntity.getWhCode());
                 List query = dao.query("HPPZ007.queryByWhCode", params);
                 updateEntity.setWhName(((HPPZ007) query.get(0)).getWhName());
-                //物料类型
+                //存货类型
                 updateEntity.setMaterialTypeName(InventTypeEnun.getNameByCode(updateEntity.getMaterialType()));
                 dao.insert("HPKC002.update", updateEntity);
             }

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

@@ -85,7 +85,7 @@ public class ServiceHPKC003 extends ServiceBase {
 				fKc003.setDocumentDate(StringUtil.removeHorizontalLine(fKc003.getDocumentDate()));
 				// 仓库名称
 				fKc003.setWhName(HPPZTools.getPz007ByCode(fKc003.getWhCode()).getWhName());
-				// 物料名称
+				// 存货名称
 				fKc003.setInventName(HPPZTools.getPz004ByCode(fKc003.getInventCode()).getInventName());
 				// 生成入库单号
 				fKc003.setProdNo(SequenceGenerator.getNextSequence(HPConstant.SequenceId.HPKC003_PROD_NO));
@@ -119,7 +119,7 @@ public class ServiceHPKC003 extends ServiceBase {
 				fKc003.setDocumentDate(StringUtil.removeHorizontalLine(fKc003.getDocumentDate()));
 				// 仓库名称
 				fKc003.setWhName(HPPZTools.getPz007ByCode(fKc003.getWhCode()).getWhName());
-				// 物料名称
+				// 存货名称
 				fKc003.setInventName(HPPZTools.getPz004ByCode(fKc003.getInventCode()).getInventName());
 				DaoUtils.update("HPKC003.update", fKc003);
 			}

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

@@ -81,7 +81,7 @@ public class ServiceHPKC004 extends ServiceBase {
 				fKc004.setReceiptDate(StringUtil.removeHorizontalLine(fKc004.getReceiptDate()));
 				// 仓库名称
 				fKc004.setWhName(HPPZTools.getPz007ByCode(fKc004.getWhCode()).getWhName());
-				// 物料名称
+				// 存货名称
 				fKc004.setInventName(HPPZTools.getPz004ByCode(fKc004.getInventCode()).getInventName());
 				// 生成销售单号
 				fKc004.setSaleNo(SequenceGenerator.getNextSequence(HPConstant.SequenceId.HPKC004_SALE_NO));
@@ -112,7 +112,7 @@ public class ServiceHPKC004 extends ServiceBase {
 			    fKc004.setReceiptDate(StringUtil.removeHorizontalLine(fKc004.getReceiptDate()));
 			    // 仓库名称
 			    fKc004.setWhName(HPPZTools.getPz007ByCode(fKc004.getWhCode()).getWhName());
-			    // 物料名称
+			    // 存货名称
 			    fKc004.setInventName(HPPZTools.getPz004ByCode(fKc004.getInventCode()).getInventName());
 			    DaoUtils.update("HPKC004.update", fKc004);
 		    }

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

@@ -196,7 +196,7 @@ public class ServiceHPKC005 extends ServiceBase {
 		fKc005.setReceiptDate(StringUtil.removeHorizontalLine(fKc005.getReceiptDate()));
 		// 仓库名称
 		fKc005.setWhName(HPPZTools.getPz007ByCode(fKc005.getWhCode()).getWhName());
-		// 物料名称
+		// 存货名称
 		fKc005.setInventName(HPPZTools.getPz004ByCode(fKc005.getInventCode()).getInventName());
 		// 差异数量
 		fKc005.setDiffAmount(fKc005.getEntityAmount().subtract(fKc005.getBookAmount()));

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

@@ -172,7 +172,7 @@ public class ServiceHPKC006 extends ServiceBase {
 		fKc006.setReceiptDate(StringUtil.removeHorizontalLine(fKc006.getReceiptDate()));
 		// 仓库名称
 		fKc006.setWhName(HPPZTools.getPz007ByCode(fKc006.getWhCode()).getWhName());
-		// 物料名称
+		// 存货名称
 		fKc006.setInventName(HPPZTools.getPz004ByCode(fKc006.getInventCode()).getInventName());
 	}
 	

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

@@ -180,7 +180,7 @@ public class ServiceHPKC007 extends ServiceBase {
 		fKc007.setReceiptDate(StringUtil.removeHorizontalLine(fKc007.getReceiptDate()));
 		// 仓库名称
 		fKc007.setWhName(HPPZTools.getPz007ByCode(fKc007.getWhCode()).getWhName());
-		// 物料名称
+		// 存货名称
 		fKc007.setInventName(HPPZTools.getPz004ByCode(fKc007.getInventCode()).getInventName());
 	}
 	

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

@@ -71,7 +71,7 @@ public class ServiceHPKC008 extends ServiceBase {
 				fKc008.fromMap(resultRows.get(i));
 				// 去除日期字符串中的-
 				fKc008.setDateMonth(StringUtil.removeHorizontalLine(fKc008.getDateMonth()));
-				// 物料名称
+				// 存货名称
 				fKc008.setInventName(HPPZTools.getPz004ByCode(fKc008.getInventCode()).getInventName());
 				// 计算总金额
 				fKc008.setTotalPrice(fKc008.getAmount().multiply(fKc008.getPrice()));
@@ -101,7 +101,7 @@ public class ServiceHPKC008 extends ServiceBase {
 				fKc008.fromMap(resultRows.get(i));
 				// 去除日期字符串中的-
 				fKc008.setDateMonth(StringUtil.removeHorizontalLine(fKc008.getDateMonth()));
-				// 物料名称
+				// 存货名称
 				fKc008.setInventName(HPPZTools.getPz004ByCode(fKc008.getInventCode()).getInventName());
 				// 计算总金额
 				fKc008.setTotalPrice(fKc008.getAmount().multiply(fKc008.getPrice()));

src/main/java/com/baosight/hpjx/hp/kc/sql/HPKC001.xml

@@ -42,10 +42,10 @@
 				DOCUMENT_TIME	as "documentTime", <!-- 单据日期 -->
 				WH_CODE	as "whCode", <!-- 仓库编码 -->
 				WH_NAME	as "whName", <!-- 仓库名称 -->
-				MATERIAL_TYPE	as "materialType", <!-- 物料类型编码 -->
-				MATERIAL_TYPE_NAME	as "materialTypeName", <!-- 物料类型名称 -->
-				MATERIAL_CODE	as "materialCode", <!-- 物料编码 -->
-				MATERIAL_NAME	as "materialName", <!-- 物料名称 -->
+				MATERIAL_TYPE	as "materialType", <!-- 存货类型编码 -->
+				MATERIAL_TYPE_NAME	as "materialTypeName", <!-- 存货类型名称 -->
+				MATERIAL_CODE	as "materialCode", <!-- 存货编码 -->
+				MATERIAL_NAME	as "materialName", <!-- 存货名称 -->
 				SPEC	as "spec", <!-- 规格 -->
 				UNIT	as "unit", <!-- 单位 -->
 				QUANTITY	as "quantity", <!-- 数量 -->
@@ -86,10 +86,10 @@
 				DOCUMENT_TIME, <!-- 单据日期 -->
 				WH_CODE, <!-- 仓库编码 -->
 				WH_NAME, <!-- 仓库名称 -->
-				MATERIAL_TYPE, <!-- 物料类型编码 -->
-				MATERIAL_TYPE_NAME, <!-- 物料类型名称 -->
-				MATERIAL_CODE, <!-- 物料编码 -->
-				MATERIAL_NAME, <!-- 物料名称 -->
+				MATERIAL_TYPE, <!-- 存货类型编码 -->
+				MATERIAL_TYPE_NAME, <!-- 存货类型名称 -->
+				MATERIAL_CODE, <!-- 存货编码 -->
+				MATERIAL_NAME, <!-- 存货名称 -->
 				SPEC, <!-- 规格 -->
 				UNIT, <!-- 单位 -->
 				QUANTITY, <!-- 数量 -->

src/main/java/com/baosight/hpjx/hp/kc/sql/HPKC002.xml

@@ -42,10 +42,10 @@
 				DOCUMENT_TIME	as "documentTime", <!-- 单据日期 -->
 				WH_CODE	as "whCode", <!-- 仓库编码 -->
 				WH_NAME	as "whName", <!-- 仓库名称 -->
-				MATERIAL_TYPE	as "materialType", <!-- 物料类型编码 -->
-				MATERIAL_TYPE_NAME	as "materialTypeName", <!-- 物料类型名称 -->
-				MATERIAL_CODE	as "materialCode", <!-- 物料编码 -->
-				MATERIAL_NAME	as "materialName", <!-- 物料名称 -->
+				MATERIAL_TYPE	as "materialType", <!-- 存货类型编码 -->
+				MATERIAL_TYPE_NAME	as "materialTypeName", <!-- 存货类型名称 -->
+				MATERIAL_CODE	as "materialCode", <!-- 存货编码 -->
+				MATERIAL_NAME	as "materialName", <!-- 存货名称 -->
 				SPEC	as "spec", <!-- 规格 -->
 				UNIT	as "unit", <!-- 单位 -->
 				QUANTITY	as "quantity", <!-- 数量 -->
@@ -88,10 +88,10 @@
 				DOCUMENT_TIME, <!-- 单据日期 -->
 				WH_CODE, <!-- 仓库编码 -->
 				WH_NAME, <!-- 仓库名称 -->
-				MATERIAL_TYPE, <!-- 物料类型编码 -->
-				MATERIAL_TYPE_NAME, <!-- 物料类型名称 -->
-				MATERIAL_CODE, <!-- 物料编码 -->
-				MATERIAL_NAME, <!-- 物料名称 -->
+				MATERIAL_TYPE, <!-- 存货类型编码 -->
+				MATERIAL_TYPE_NAME, <!-- 存货类型名称 -->
+				MATERIAL_CODE, <!-- 存货编码 -->
+				MATERIAL_NAME, <!-- 存货名称 -->
 				SPEC, <!-- 规格 -->
 				UNIT, <!-- 单位 -->
 				QUANTITY, <!-- 数量 -->

src/main/java/com/baosight/hpjx/hp/kc/sql/HPKC003.xml

@@ -11,9 +11,9 @@
         PRODUCTION_ORDER_NO as "productionOrderNo",  <!-- 生产订单号 -->
         WH_CODE as "whCode",  <!-- 仓库编码 -->
         WH_NAME as "whName",  <!-- 仓库名称 -->
-        INVENT_TYPE as "inventType",  <!-- 物料类型 -->
-        INVENT_CODE as "inventCode",  <!-- 物料编码 -->
-        INVENT_NAME as "inventName",  <!-- 物料名称 -->
+        INVENT_TYPE as "inventType",  <!-- 存货类型 -->
+        INVENT_CODE as "inventCode",  <!-- 存货编码 -->
+        INVENT_NAME as "inventName",  <!-- 存货名称 -->
         AMOUNT as "amount",  <!-- 数量 -->
         WEIGHT as "weight",  <!-- 重量 -->
         REMARK as "remark",  <!-- 备注 -->
@@ -88,9 +88,9 @@
             PRODUCTION_ORDER_NO,  <!-- 生产订单号 -->
             WH_CODE,  <!-- 仓库编码 -->
             WH_NAME,  <!-- 仓库名称 -->
-            INVENT_TYPE,  <!-- 物料类型 -->
-            INVENT_CODE,  <!-- 物料编码 -->
-            INVENT_NAME,  <!-- 物料名称 -->
+            INVENT_TYPE,  <!-- 存货类型 -->
+            INVENT_CODE,  <!-- 存货编码 -->
+            INVENT_NAME,  <!-- 存货名称 -->
             AMOUNT,  <!-- 数量 -->
             WEIGHT,  <!-- 重量 -->
             REMARK,  <!-- 备注 -->
@@ -119,9 +119,9 @@
             PROD_NO = #prodNo#,   <!-- 生产入库单号 -->
             WH_CODE = #whCode#,   <!-- 仓库编码 -->
             WH_NAME = #whName#,   <!-- 仓库名称 -->
-            INVENT_TYPE = #inventType#,   <!-- 物料类型 -->
-            INVENT_CODE = #inventCode#,   <!-- 物料编码 -->
-            INVENT_NAME = #inventName#,   <!-- 物料名称 -->
+            INVENT_TYPE = #inventType#,   <!-- 存货类型 -->
+            INVENT_CODE = #inventCode#,   <!-- 存货编码 -->
+            INVENT_NAME = #inventName#,   <!-- 存货名称 -->
             AMOUNT = #amount#,   <!-- 数量 -->
             WEIGHT = #weight#,   <!-- 重量 -->
             REMARK = #remark#,   <!-- 备注 -->

src/main/java/com/baosight/hpjx/hp/kc/sql/HPKC006.xml

@@ -10,9 +10,9 @@
         OTHER_ENTER_NO as "otherEnterNo",  <!-- 其他入库单号 -->
         WH_CODE as "whCode",  <!-- 仓库编码 -->
         WH_NAME as "whName",  <!-- 仓库名称 -->
-        INVENT_TYPE as "inventType",  <!-- 物料类型 -->
-        INVENT_CODE as "inventCode",  <!-- 物料编码 -->
-        INVENT_NAME as "inventName",  <!-- 物料名称 -->
+        INVENT_TYPE as "inventType",  <!-- 存货类型 -->
+        INVENT_CODE as "inventCode",  <!-- 存货编码 -->
+        INVENT_NAME as "inventName",  <!-- 存货名称 -->
         INVENT_RECORD_ID as "inventRecordId",  <!-- 规格 -->
         AMOUNT as "amount",  <!-- 数量 -->
         WEIGHT as "weight",  <!-- 重量 -->
@@ -122,9 +122,9 @@
             OTHER_ENTER_NO,  <!-- 其他入库单号 -->
             WH_CODE,  <!-- 仓库编码 -->
             WH_NAME,  <!-- 仓库名称 -->
-            INVENT_TYPE,  <!-- 物料类型 -->
-            INVENT_CODE,  <!-- 物料编码 -->
-            INVENT_NAME,  <!-- 物料名称 -->
+            INVENT_TYPE,  <!-- 存货类型 -->
+            INVENT_CODE,  <!-- 存货编码 -->
+            INVENT_NAME,  <!-- 存货名称 -->
             INVENT_RECORD_ID,  <!-- 规格 -->
             AMOUNT,  <!-- 数量 -->
             WEIGHT,  <!-- 重量 -->
@@ -149,9 +149,9 @@
             RECEIPT_DATE = #receiptDate#,   <!-- 单据日期 -->
             WH_CODE = #whCode#,   <!-- 仓库编码 -->
             WH_NAME = #whName#,   <!-- 仓库名称 -->
-            INVENT_TYPE = #inventType#,   <!-- 物料类型 -->
-            INVENT_CODE = #inventCode#,   <!-- 物料编码 -->
-            INVENT_NAME = #inventName#,   <!-- 物料名称 -->
+            INVENT_TYPE = #inventType#,   <!-- 存货类型 -->
+            INVENT_CODE = #inventCode#,   <!-- 存货编码 -->
+            INVENT_NAME = #inventName#,   <!-- 存货名称 -->
             INVENT_RECORD_ID = #inventRecordId#,   <!-- 规格 -->
             AMOUNT = #amount#,   <!-- 数量 -->
             WEIGHT = #weight#,   <!-- 重量 -->

src/main/java/com/baosight/hpjx/hp/kc/sql/HPKC007.xml

@@ -10,9 +10,9 @@
         OTHER_OUTER_NO as "otherOuterNo",  <!-- 其他出库单号 -->
         WH_CODE as "whCode",  <!-- 仓库编码 -->
         WH_NAME as "whName",  <!-- 仓库名称 -->
-        INVENT_TYPE as "inventType",  <!-- 物料类型 -->
-        INVENT_CODE as "inventCode",  <!-- 物料编码 -->
-        INVENT_NAME as "inventName",  <!-- 物料名称 -->
+        INVENT_TYPE as "inventType",  <!-- 存货类型 -->
+        INVENT_CODE as "inventCode",  <!-- 存货编码 -->
+        INVENT_NAME as "inventName",  <!-- 存货名称 -->
         INVENT_RECORD_ID as "inventRecordId",  <!-- 规格 -->
         AMOUNT as "amount",  <!-- 数量 -->
         WEIGHT as "weight",  <!-- 重量 -->
@@ -126,9 +126,9 @@
             OTHER_OUTER_NO,  <!-- 其他出库单号 -->
             WH_CODE,  <!-- 仓库编码 -->
             WH_NAME,  <!-- 仓库名称 -->
-            INVENT_TYPE,  <!-- 物料类型 -->
-            INVENT_CODE,  <!-- 物料编码 -->
-            INVENT_NAME,  <!-- 物料名称 -->
+            INVENT_TYPE,  <!-- 存货类型 -->
+            INVENT_CODE,  <!-- 存货编码 -->
+            INVENT_NAME,  <!-- 存货名称 -->
             INVENT_RECORD_ID,  <!-- 规格 -->
             AMOUNT,  <!-- 数量 -->
             WEIGHT,  <!-- 重量 -->

src/main/java/com/baosight/hpjx/hp/kc/sql/HPKC010.xml

@@ -7,9 +7,9 @@
         COMPANY_CODE as "companyCode",  <!-- 企业编码 预留 -->
         WH_CODE as "whCode",  <!-- 仓库编码 -->
         WH_NAME as "whName",  <!-- 仓库名称 -->
-        INVENT_TYPE as "inventType",  <!-- 物料类型 -->
-        INVENT_CODE as "inventCode",  <!-- 物料编码 -->
-        INVENT_NAME as "inventName",  <!-- 物料名称 -->
+        INVENT_TYPE as "inventType",  <!-- 存货类型 -->
+        INVENT_CODE as "inventCode",  <!-- 存货编码 -->
+        INVENT_NAME as "inventName",  <!-- 存货名称 -->
         INVENT_RECORD_ID as "inventRecordId",  <!-- 存货档案ID -->
         AMOUNT as "amount",  <!-- 数量 -->
         WEIGHT as "weight",  <!-- 重量 -->
@@ -113,9 +113,9 @@
             COMPANY_CODE,  <!-- 企业编码 预留 -->
             WH_CODE,  <!-- 仓库编码 -->
             WH_NAME,  <!-- 仓库名称 -->
-            INVENT_TYPE,  <!-- 物料类型 -->
-            INVENT_CODE,  <!-- 物料编码 -->
-            INVENT_NAME,  <!-- 物料名称 -->
+            INVENT_TYPE,  <!-- 存货类型 -->
+            INVENT_CODE,  <!-- 存货编码 -->
+            INVENT_NAME,  <!-- 存货名称 -->
             INVENT_RECORD_ID,  <!-- 存货档案ID -->
             AMOUNT,  <!-- 数量 -->
             WEIGHT,  <!-- 重量 -->

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

@@ -11,7 +11,7 @@
         <div class="row">
             <EF:EFDatePicker ename="inqu_status-0-documentTime" cname="单据日期" format="yyyy-MM-dd" required="true"/>
             <EF:EFInput ename="inqu_status-0-documentCode" cname="采购入库单号" colWidth="4" readonly="false"/>
-            <EF:EFSelect cname="物料类型" blockId="inqu_status" ename="materialType" row="0" colWidth="3">
+            <EF:EFSelect cname="存货类型" blockId="inqu_status" ename="materialType" row="0" colWidth="3">
                 <EF:EFOption label="全部" value=""/>
                 <EF:EFCodeOption codeName="hpjx.hpkc.inventType" />
             </EF:EFSelect>
@@ -22,7 +22,7 @@
                 <EF:EFOption label="请选择" value=""></EF:EFOption>
                 <EF:EFOptions blockId="wh_record_block_id" textField="textField" valueField="valueField"/>
             </EF:EFSelect>
-            <EF:EFSelect ename="inqu_status-0-materialCode" cname="物料名称"
+            <EF:EFSelect ename="inqu_status-0-materialCode" cname="存货名称"
                          valueTemplate="#=textField#" filter="contains"
                          required="false" defultValue="ALL"
                          template="#=textField#">
@@ -37,13 +37,13 @@
             <EF:EFColumn ename="id" cname="主键id" hidden="true"/>
             <EF:EFColumn ename="documentTime" cname="单据日期" editType="date" dateFormat="yyyy-MM-dd" parseFormats="['yyyy-MM-dd']" width="100" required="true"/>
             <EF:EFColumn ename="documentCode" cname="采购入库单号" width="100" readonly="false" align="center" required="false" enable="false" />
-            <EF:EFComboColumn ename="materialType" cname="物料类型" width="90" align="center">
+            <EF:EFComboColumn ename="materialType" cname="存货类型" width="90" align="center">
                 <EF:EFCodeOption codeName="hpjx.hpkc.inventType" />
             </EF:EFComboColumn>
             <EF:EFColumn ename="whCode" cname="仓库名称" width="100" readonly="false" required="true"/>
             <EF:EFColumn ename="whName" cname="仓库名称" width="100" readonly="false" hidden="true"/>
-            <EF:EFColumn ename="materialCode" cname="物料名称" width="100" readonly="false" required="true"/>
-            <EF:EFColumn ename="materialName" cname="物料名称" width="100" readonly="false" hidden="true"/>
+            <EF:EFColumn ename="materialCode" cname="存货名称" width="100" readonly="false" required="true"/>
+            <EF:EFColumn ename="materialName" cname="存货名称" width="100" readonly="false" hidden="true"/>
             <EF:EFColumn ename="spec" cname="规格" width="120" readonly="false" align="center"  required="true"/>
             <EF:EFColumn ename="unit" cname="单位" width="80" readonly="false" align="center" enable="false"  required="true"/>
             <EF:EFColumn ename="quantity" cname="数量" width="80" defaultValue="0" data-regex="/^[0-9]\\\d*$/" data-errorprompt="请输入正整数" readonly="false" align="right" required="true"/>

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

@@ -11,7 +11,7 @@
         <div class="row">
             <EF:EFDatePicker ename="inqu_status-0-documentTime" cname="单据日期" format="yyyy-MM-dd" required="true"/>
             <EF:EFInput ename="inqu_status-0-documentCode" cname="生产领料单号" colWidth="4" readonly="false"/>
-            <EF:EFSelect cname="物料类型" blockId="inqu_status" ename="materialType" row="0" colWidth="3">
+            <EF:EFSelect cname="存货类型" blockId="inqu_status" ename="materialType" row="0" colWidth="3">
                 <EF:EFOption label="全部" value=""/>
                 <EF:EFCodeOption codeName="hpjx.hpkc.inventType" />
             </EF:EFSelect>
@@ -22,7 +22,7 @@
                 <EF:EFOption label="请选择" value=""></EF:EFOption>
                 <EF:EFOptions blockId="wh_record_block_id" textField="textField" valueField="valueField"/>
             </EF:EFSelect>
-            <EF:EFSelect ename="inqu_status-0-materialCode" cname="物料名称"
+            <EF:EFSelect ename="inqu_status-0-materialCode" cname="存货名称"
                          valueTemplate="#=textField#" filter="contains"
                          required="false" defultValue="ALL"
                          template="#=textField#">
@@ -37,13 +37,13 @@
             <EF:EFColumn ename="id" cname="主键id" hidden="true"/>
             <EF:EFColumn ename="documentTime" cname="单据日期" editType="date" dateFormat="yyyy-MM-dd" parseFormats="['yyyy-MM-dd']" width="100" required="true"/>
             <EF:EFColumn ename="documentCode" cname="生产领料单号" width="100" readonly="false" align="center" required="false" enable="false" />
-            <EF:EFComboColumn ename="materialType" cname="物料类型" width="90" align="center">
+            <EF:EFComboColumn ename="materialType" cname="存货类型" width="90" align="center">
                 <EF:EFCodeOption codeName="hpjx.hpkc.inventType" />
             </EF:EFComboColumn>
             <EF:EFColumn ename="whCode" cname="仓库名称" width="100" readonly="false" required="true"/>
             <EF:EFColumn ename="whName" cname="仓库名称" width="100" readonly="false" hidden="true"/>
-            <EF:EFColumn ename="materialCode" cname="物料名称" width="100" readonly="false" required="true"/>
-            <EF:EFColumn ename="materialName" cname="物料名称" width="100" readonly="false" hidden="true"/>
+            <EF:EFColumn ename="materialCode" cname="存货名称" width="100" readonly="false" required="true"/>
+            <EF:EFColumn ename="materialName" cname="存货名称" width="100" readonly="false" hidden="true"/>
             <EF:EFColumn ename="spec" cname="规格" width="120" readonly="false" align="center"  required="true"/>
             <EF:EFColumn ename="unit" cname="单位" width="80" readonly="false" align="center" enable="false"  required="true"/>
             <EF:EFColumn ename="quantity" cname="数量" width="80" defaultValue="0" data-regex="/^[0-9]\\\d*$/" data-errorprompt="请输入正整数" readonly="false" align="right" required="true"/>