Merge remote-tracking branch 'origin/dev' into dev

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

@@ -40,12 +40,12 @@ public enum CompanyTypeEnum {
         EiBlock block = new EiBlock("company_type_block_id");
         List<Map<String,Object>> rows = new ArrayList<Map<String,Object>>(){{
            add(new HashMap<String,Object>(){{
-               put(HPConstants.TEXT_FIELD,GQ.code);
-               put(HPConstants.VALUE_FIELD,GQ.value);
+               put(HPConstants.TEXT_FIELD,GQ.value);
+               put(HPConstants.VALUE_FIELD,GQ.code);
            }});
            add(new HashMap<String,Object>(){{
-               put(HPConstants.TEXT_FIELD,MY.code);
-               put(HPConstants.VALUE_FIELD,MY.value);
+               put(HPConstants.TEXT_FIELD,MY.value);
+               put(HPConstants.VALUE_FIELD,MY.code);
            }});
         }};
         block.setRows(rows);

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

@@ -37,26 +37,25 @@ public enum DdynamicEnum {
     INVENT_NAME_BLOCK_ID("invent_name_block_id","inventCode","inventName","HPPZ004.queryComboBox"),
 	
     /**
-     * 模块：存货档案
+     * 模块：存货档案（存货名称）
      * 用途：存货档案下拉框
-     * 编写：wwl
+     * 编写：jhs
      */
-    INVENT_RECORD_BLOCK_ID("invent_record_block_id","id","inventName","HPPZ006.queryComboBox"),
+    MATERIAL_RECORD_BLOCK_ID("material_record_block_id","inventCode","inventName","HPPZ006.queryMaterialComboBox"),
 	
 	/**
-     * 模块：存货档案
+	 * 模块：存货档案（规格）
 	 * 用途：存货档案下拉框
-     * 编写：jhs
+	 * 编写：wwl
 	 */
-    MATERIAL_RECORD_BLOCK_ID("material_record_block_id","inventCode","inventName","HPPZ006.queryMaterialComboBox"),
+	INVENT_SPEC_BLOCK_ID("invent_spec_block_id", "id", "spec", "HPPZ006.queryComboBoxSpec"),
 	
 	/**
-	 * 模块：存货档案
+	 * 模块：存货档案（规格）
 	 * 用途：存货档案下拉框
 	 * 编写：wwl
 	 */
-	INVENT_SPEC_BLOCK_ID("invent_spec_block_id","spec","spec","HPPZ006.queryComboBoxSpec"),
-
+	SPEC_NAME_BLOCK_ID("spec_name_block_id", "spec", "spec", "HPPZ006.queryComboBoxSpecName"),
 	
 	/**
      * 模块：仓库档案

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

@@ -16,7 +16,7 @@ import com.baosight.iplat4j.core.util.StringUtils;
  * Copyrigth:Baosight Software LTD.co Copyright (c) 2019. <br>
  *
  * @version 1.0
- * @history 2024-01-11 15:32:44 create
+ * @history 2024-01-23 13:41:00 create
  */
 public class HPKC005 extends DaoEPBase {
 	
@@ -24,14 +24,15 @@ public class HPKC005 extends DaoEPBase {
 	
 	public static final String FIELD_ID = "id";
 	public static final String FIELD_COMPANY_CODE = "companyCode";    		/* 企业编码 预留*/
+	public static final String FIELD_DEP_CODE = "depCode";    		/* 部门编码 预留*/
 	public static final String FIELD_RECEIPT_DATE = "receiptDate";    		/* 单据日期*/
 	public static final String FIELD_STATISTICAL_NUMBER = "statisticalNumber";    		/* 盘点单号*/
 	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_SPEC = "spec";    		/* 规格*/
+	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_BOOK_AMOUNT = "bookAmount";    		/* 账面数量*/
 	public static final String FIELD_BOOK_WEIGHT = "bookWeight";    		/* 账面重量*/
 	public static final String FIELD_ENTITY_AMOUNT = "entityAmount";    		/* 实物数量*/
@@ -39,23 +40,25 @@ public class HPKC005 extends DaoEPBase {
 	public static final String FIELD_DIFF_AMOUNT = "diffAmount";    		/* 差异数量*/
 	public static final String FIELD_DIFF_WEIGHT = "diffWeight";    		/* 差异重量*/
 	public static final String FIELD_STATUS = "status";    		/* 单据状态 0待审核 1已审核*/
-	public static final String FIELD_NOTES = "notes";    		/* 备注*/
+	public static final String FIELD_REMARK = "remark";    		/* 备注*/
 	public static final String FIELD_CREATED_BY = "createdBy";    		/* 创建人*/
+	public static final String FIELD_CREATED_NAME = "createdName";    		/* 创建人名称*/
 	public static final String FIELD_CREATED_TIME = "createdTime";    		/* 创建时间*/
 	public static final String FIELD_UPDATED_BY = "updatedBy";    		/* 更新人*/
+	public static final String FIELD_UPDATED_NAME = "updatedName";    		/* 更新人名称*/
 	public static final String FIELD_UPDATED_TIME = "updatedTime";    		/* 更新时间*/
-	public static final String FIELD_DEP_CODE = "depCode";    		/* 部门编码*/
 	
 	public static final String COL_ID = "ID";
 	public static final String COL_COMPANY_CODE = "COMPANY_CODE";    		/* 企业编码 预留*/
+	public static final String COL_DEP_CODE = "DEP_CODE";    		/* 部门编码 预留*/
 	public static final String COL_RECEIPT_DATE = "RECEIPT_DATE";    		/* 单据日期*/
 	public static final String COL_STATISTICAL_NUMBER = "STATISTICAL_NUMBER";    		/* 盘点单号*/
 	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_SPEC = "SPEC";    		/* 规格*/
+	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_BOOK_AMOUNT = "BOOK_AMOUNT";    		/* 账面数量*/
 	public static final String COL_BOOK_WEIGHT = "BOOK_WEIGHT";    		/* 账面重量*/
 	public static final String COL_ENTITY_AMOUNT = "ENTITY_AMOUNT";    		/* 实物数量*/
@@ -63,12 +66,13 @@ public class HPKC005 extends DaoEPBase {
 	public static final String COL_DIFF_AMOUNT = "DIFF_AMOUNT";    		/* 差异数量*/
 	public static final String COL_DIFF_WEIGHT = "DIFF_WEIGHT";    		/* 差异重量*/
 	public static final String COL_STATUS = "STATUS";    		/* 单据状态 0待审核 1已审核*/
-	public static final String COL_NOTES = "NOTES";    		/* 备注*/
+	public static final String COL_REMARK = "REMARK";    		/* 备注*/
 	public static final String COL_CREATED_BY = "CREATED_BY";    		/* 创建人*/
+	public static final String COL_CREATED_NAME = "CREATED_NAME";    		/* 创建人名称*/
 	public static final String COL_CREATED_TIME = "CREATED_TIME";    		/* 创建时间*/
 	public static final String COL_UPDATED_BY = "UPDATED_BY";    		/* 更新人*/
+	public static final String COL_UPDATED_NAME = "UPDATED_NAME";    		/* 更新人名称*/
 	public static final String COL_UPDATED_TIME = "UPDATED_TIME";    		/* 更新时间*/
-	public static final String COL_DEP_CODE = "DEP_CODE";    		/* 部门编码*/
 	
 	public static final String QUERY = "HPKC005.query";
 	public static final String COUNT = "HPKC005.count";
@@ -76,29 +80,31 @@ public class HPKC005 extends DaoEPBase {
 	public static final String UPDATE = "HPKC005.update";
 	public static final String DELETE = "HPKC005.delete";
 	
-	private Long id = new Long(0);
+	private Long id = null;
 	private String companyCode = " ";		/* 企业编码 预留*/
+	private String depCode = " ";		/* 部门编码 预留*/
 	private String receiptDate = " ";		/* 单据日期*/
 	private String statisticalNumber = " ";		/* 盘点单号*/
 	private String whCode = " ";		/* 仓库编码*/
 	private String whName = " ";		/* 仓库名称*/
-	private String inventType = " ";		/* 物料类型*/
-	private String inventCode = " ";		/* 物料编码*/
-	private String inventName = " ";		/* 物料名称*/
-	private String spec = " ";		/* 规格*/
+	private String inventType = " ";		/* 存货类型*/
+	private String inventCode = " ";		/* 存货编码*/
+	private String inventName = " ";		/* 存货名称*/
+	private Long inventRecordId = null;	/* 存货档案ID*/
 	private BigDecimal bookAmount = new BigDecimal(0.00);		/* 账面数量*/
 	private BigDecimal bookWeight = new BigDecimal(0.00);		/* 账面重量*/
 	private BigDecimal entityAmount = new BigDecimal(0.00);		/* 实物数量*/
 	private BigDecimal entityWeight = new BigDecimal(0.00);		/* 实物重量*/
 	private BigDecimal diffAmount = new BigDecimal(0.00);		/* 差异数量*/
 	private BigDecimal diffWeight = new BigDecimal(0.00);		/* 差异重量*/
-	private int status;	/* 单据状态 0待审核 1已审核*/
-	private String notes = " ";		/* 备注*/
+	private Integer status;	/* 单据状态 0待审核 1已审核*/
+	private String remark = " ";		/* 备注*/
 	private String createdBy = " ";		/* 创建人*/
+	private String createdName = " ";		/* 创建人名称*/
 	private String createdTime = " ";		/* 创建时间*/
 	private String updatedBy = " ";		/* 更新人*/
+	private String updatedName = " ";		/* 更新人名称*/
 	private String updatedTime = " ";		/* 更新时间*/
-	private String depCode = " ";		/* 部门编码*/
 	
 	/**
 	 * initialize the metadata.
@@ -115,6 +121,10 @@ public class HPKC005 extends DaoEPBase {
 		eiColumn.setDescName("企业编码 预留");
 		eiMetadata.addMeta(eiColumn);
 		
+		eiColumn = new EiColumn(FIELD_DEP_CODE);
+		eiColumn.setDescName("部门编码 预留");
+		eiMetadata.addMeta(eiColumn);
+		
 		eiColumn = new EiColumn(FIELD_RECEIPT_DATE);
 		eiColumn.setDescName("单据日期");
 		eiMetadata.addMeta(eiColumn);
@@ -143,8 +153,8 @@ public class HPKC005 extends DaoEPBase {
 		eiColumn.setDescName("存货名称");
 		eiMetadata.addMeta(eiColumn);
 		
-		eiColumn = new EiColumn(FIELD_SPEC);
-		eiColumn.setDescName("规格");
+		eiColumn = new EiColumn(FIELD_INVENT_RECORD_ID);
+		eiColumn.setDescName("存货档案ID");
 		eiMetadata.addMeta(eiColumn);
 		
 		eiColumn = new EiColumn(FIELD_BOOK_AMOUNT);
@@ -193,7 +203,7 @@ public class HPKC005 extends DaoEPBase {
 		eiColumn.setDescName("单据状态 0待审核 1已审核");
 		eiMetadata.addMeta(eiColumn);
 		
-		eiColumn = new EiColumn(FIELD_NOTES);
+		eiColumn = new EiColumn(FIELD_REMARK);
 		eiColumn.setDescName("备注");
 		eiMetadata.addMeta(eiColumn);
 		
@@ -201,6 +211,10 @@ public class HPKC005 extends DaoEPBase {
 		eiColumn.setDescName("创建人");
 		eiMetadata.addMeta(eiColumn);
 		
+		eiColumn = new EiColumn(FIELD_CREATED_NAME);
+		eiColumn.setDescName("创建人名称");
+		eiMetadata.addMeta(eiColumn);
+		
 		eiColumn = new EiColumn(FIELD_CREATED_TIME);
 		eiColumn.setDescName("创建时间");
 		eiMetadata.addMeta(eiColumn);
@@ -209,12 +223,12 @@ public class HPKC005 extends DaoEPBase {
 		eiColumn.setDescName("更新人");
 		eiMetadata.addMeta(eiColumn);
 		
-		eiColumn = new EiColumn(FIELD_UPDATED_TIME);
-		eiColumn.setDescName("更新时间");
+		eiColumn = new EiColumn(FIELD_UPDATED_NAME);
+		eiColumn.setDescName("更新人名称");
 		eiMetadata.addMeta(eiColumn);
 		
-		eiColumn = new EiColumn(FIELD_DEP_CODE);
-		eiColumn.setDescName("部门编码");
+		eiColumn = new EiColumn(FIELD_UPDATED_TIME);
+		eiColumn.setDescName("更新时间");
 		eiMetadata.addMeta(eiColumn);
 		
 		
@@ -260,6 +274,22 @@ public class HPKC005 extends DaoEPBase {
 		this.companyCode = companyCode;
 	}
 	/**
+	 * get the depCode - 部门编码 预留.
+	 * @return the depCode
+	 */
+	public String getDepCode() {
+		return this.depCode;
+	}
+	
+	/**
+	 * set the depCode - 部门编码 预留.
+	 *
+	 * @param depCode - 部门编码 预留
+	 */
+	public void setDepCode(String depCode) {
+		this.depCode = depCode;
+	}
+	/**
 	 * get the receiptDate - 单据日期.
 	 * @return the receiptDate
 	 */
@@ -324,62 +354,69 @@ public class HPKC005 extends DaoEPBase {
 		this.whName = whName;
 	}
 	/**
-	 * get the matType - 物料类型.
-	 * @return the matType
+	 * get the inventType - 存货类型.
+	 * @return the inventType
 	 */
 	public String getInventType() {
 		return this.inventType;
 	}
 	
 	/**
-	 * set the matType - 物料类型.
+	 * set the inventType - 存货类型.
 	 *
-	 * @param inventType - 物料类型
+	 * @param inventType - 存货类型
 	 */
 	public void setInventType(String inventType) {
 		this.inventType = inventType;
 	}
 	/**
-	 * get the matCode - 物料编码.
-	 * @return the matCode
+	 * get the inventCode - 存货编码.
+	 * @return the inventCode
 	 */
 	public String getInventCode() {
 		return this.inventCode;
 	}
 	
 	/**
-	 * set the matCode - 物料编码.
+	 * set the inventCode - 存货编码.
 	 *
-	 * @param inventCode - 物料编码
+	 * @param inventCode - 存货编码
 	 */
 	public void setInventCode(String inventCode) {
 		this.inventCode = inventCode;
 	}
 	/**
-	 * get the matName - 物料名称.
-	 * @return the matName
+	 * get the inventName - 存货名称.
+	 * @return the inventName
 	 */
 	public String getInventName() {
 		return this.inventName;
 	}
 	
 	/**
-	 * set the matName - 物料名称.
+	 * set the inventName - 存货名称.
 	 *
-	 * @param inventName - 物料名称
+	 * @param inventName - 存货名称
 	 */
 	public void setInventName(String inventName) {
 		this.inventName = inventName;
 	}
-	
-	public String getSpec() {
-		return spec;
+	/**
+	 * get the inventRecordId - 存货档案ID.
+	 * @return the inventRecordId
+	 */
+	public Long getInventRecordId() {
+		return this.inventRecordId;
 	}
 	
-	public void setSpec(String spec) {
-		this.spec = spec;
+	/**
+	 * set the inventRecordId - 存货档案ID.
+	 *
+	 * @param inventRecordId - 存货档案ID
+	 */
+	public void setInventRecordId(Long inventRecordId) {
+		this.inventRecordId = inventRecordId;
 	}
-	
 	/**
 	 * get the bookAmount - 账面数量.
 	 * @return the bookAmount
@@ -480,7 +517,7 @@ public class HPKC005 extends DaoEPBase {
 	 * get the status - 单据状态 0待审核 1已审核.
 	 * @return the status
 	 */
-	public int getStatus() {
+	public Integer getStatus() {
 		return this.status;
 	}
 	
@@ -489,24 +526,24 @@ public class HPKC005 extends DaoEPBase {
 	 *
 	 * @param status - 单据状态 0待审核 1已审核
 	 */
-	public void setStatus(int status) {
+	public void setStatus(Integer status) {
 		this.status = status;
 	}
 	/**
-	 * get the notes - 备注.
-	 * @return the notes
+	 * get the remark - 备注.
+	 * @return the remark
 	 */
-	public String getNotes() {
-		return this.notes;
+	public String getRemark() {
+		return this.remark;
 	}
 	
 	/**
-	 * set the notes - 备注.
+	 * set the remark - 备注.
 	 *
-	 * @param notes - 备注
+	 * @param remark - 备注
 	 */
-	public void setNotes(String notes) {
-		this.notes = notes;
+	public void setRemark(String remark) {
+		this.remark = remark;
 	}
 	/**
 	 * get the createdBy - 创建人.
@@ -525,6 +562,22 @@ public class HPKC005 extends DaoEPBase {
 		this.createdBy = createdBy;
 	}
 	/**
+	 * get the createdName - 创建人名称.
+	 * @return the createdName
+	 */
+	public String getCreatedName() {
+		return this.createdName;
+	}
+	
+	/**
+	 * set the createdName - 创建人名称.
+	 *
+	 * @param createdName - 创建人名称
+	 */
+	public void setCreatedName(String createdName) {
+		this.createdName = createdName;
+	}
+	/**
 	 * get the createdTime - 创建时间.
 	 * @return the createdTime
 	 */
@@ -557,36 +610,36 @@ public class HPKC005 extends DaoEPBase {
 		this.updatedBy = updatedBy;
 	}
 	/**
-	 * get the updatedTime - 更新时间.
-	 * @return the updatedTime
+	 * get the updatedName - 更新人名称.
+	 * @return the updatedName
 	 */
-	public String getUpdatedTime() {
-		return this.updatedTime;
+	public String getUpdatedName() {
+		return this.updatedName;
 	}
 	
 	/**
-	 * set the updatedTime - 更新时间.
+	 * set the updatedName - 更新人名称.
 	 *
-	 * @param updatedTime - 更新时间
+	 * @param updatedName - 更新人名称
 	 */
-	public void setUpdatedTime(String updatedTime) {
-		this.updatedTime = updatedTime;
+	public void setUpdatedName(String updatedName) {
+		this.updatedName = updatedName;
 	}
 	/**
-	 * get the depCode - 部门编码.
-	 * @return the depCode
+	 * get the updatedTime - 更新时间.
+	 * @return the updatedTime
 	 */
-	public String getDepCode() {
-		return this.depCode;
+	public String getUpdatedTime() {
+		return this.updatedTime;
 	}
 	
 	/**
-	 * set the depCode - 部门编码.
+	 * set the updatedTime - 更新时间.
 	 *
-	 * @param depCode - 部门编码
+	 * @param updatedTime - 更新时间
 	 */
-	public void setDepCode(String depCode) {
-		this.depCode = depCode;
+	public void setUpdatedTime(String updatedTime) {
+		this.updatedTime = updatedTime;
 	}
 	/**
 	 * get the value from Map.
@@ -598,6 +651,7 @@ public class HPKC005 extends DaoEPBase {
 		
 		setId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_ID)), id));
 		setCompanyCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_COMPANY_CODE)), companyCode));
+		setDepCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEP_CODE)), depCode));
 		setReceiptDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_RECEIPT_DATE)), receiptDate));
 		setStatisticalNumber(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_STATISTICAL_NUMBER)), statisticalNumber));
 		setWhCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_WH_CODE)), whCode));
@@ -605,20 +659,21 @@ public class HPKC005 extends DaoEPBase {
 		setInventType(StringUtils.defaultIfEmpty(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));
-		setSpec(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_SPEC)), spec));
+		setInventRecordId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_INVENT_RECORD_ID)), inventRecordId));
 		setBookAmount(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_BOOK_AMOUNT)), bookAmount));
 		setBookWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_BOOK_WEIGHT)), bookWeight));
 		setEntityAmount(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_ENTITY_AMOUNT)), entityAmount));
 		setEntityWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_ENTITY_WEIGHT)), entityWeight));
 		setDiffAmount(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_DIFF_AMOUNT)), diffAmount));
 		setDiffWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_DIFF_WEIGHT)), diffWeight));
-		setStatus(NumberUtils.toint(StringUtils.toString(map.get(FIELD_STATUS)), status));
-		setNotes(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_NOTES)), notes));
+		setStatus(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_STATUS)), status));
+		setRemark(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_REMARK)), remark));
 		setCreatedBy(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CREATED_BY)), createdBy));
+		setCreatedName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CREATED_NAME)), createdName));
 		setCreatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CREATED_TIME)), createdTime));
 		setUpdatedBy(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_BY)), updatedBy));
+		setUpdatedName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_NAME)), updatedName));
 		setUpdatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_TIME)), updatedTime));
-		setDepCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEP_CODE)), depCode));
 	}
 	
 	/**
@@ -630,6 +685,7 @@ public class HPKC005 extends DaoEPBase {
 		Map map = new HashMap();
 		map.put(FIELD_ID, StringUtils.toString(id, eiMetadata.getMeta(FIELD_ID)));
 		map.put(FIELD_COMPANY_CODE, StringUtils.toString(companyCode, eiMetadata.getMeta(FIELD_COMPANY_CODE)));
+		map.put(FIELD_DEP_CODE, StringUtils.toString(depCode, eiMetadata.getMeta(FIELD_DEP_CODE)));
 		map.put(FIELD_RECEIPT_DATE, StringUtils.toString(receiptDate, eiMetadata.getMeta(FIELD_RECEIPT_DATE)));
 		map.put(FIELD_STATISTICAL_NUMBER, StringUtils.toString(statisticalNumber, eiMetadata.getMeta(FIELD_STATISTICAL_NUMBER)));
 		map.put(FIELD_WH_CODE, StringUtils.toString(whCode, eiMetadata.getMeta(FIELD_WH_CODE)));
@@ -637,7 +693,7 @@ public class HPKC005 extends DaoEPBase {
 		map.put(FIELD_INVENT_TYPE, StringUtils.toString(inventType, eiMetadata.getMeta(FIELD_INVENT_TYPE)));
 		map.put(FIELD_INVENT_CODE, StringUtils.toString(inventCode, eiMetadata.getMeta(FIELD_INVENT_CODE)));
 		map.put(FIELD_INVENT_NAME, StringUtils.toString(inventName, eiMetadata.getMeta(FIELD_INVENT_NAME)));
-		map.put(FIELD_SPEC, StringUtils.toString(spec, eiMetadata.getMeta(FIELD_SPEC)));
+		map.put(FIELD_INVENT_RECORD_ID, StringUtils.toString(inventRecordId, eiMetadata.getMeta(FIELD_INVENT_RECORD_ID)));
 		map.put(FIELD_BOOK_AMOUNT, StringUtils.toString(bookAmount, eiMetadata.getMeta(FIELD_BOOK_AMOUNT)));
 		map.put(FIELD_BOOK_WEIGHT, StringUtils.toString(bookWeight, eiMetadata.getMeta(FIELD_BOOK_WEIGHT)));
 		map.put(FIELD_ENTITY_AMOUNT, StringUtils.toString(entityAmount, eiMetadata.getMeta(FIELD_ENTITY_AMOUNT)));
@@ -645,12 +701,13 @@ public class HPKC005 extends DaoEPBase {
 		map.put(FIELD_DIFF_AMOUNT, StringUtils.toString(diffAmount, eiMetadata.getMeta(FIELD_DIFF_AMOUNT)));
 		map.put(FIELD_DIFF_WEIGHT, StringUtils.toString(diffWeight, eiMetadata.getMeta(FIELD_DIFF_WEIGHT)));
 		map.put(FIELD_STATUS, StringUtils.toString(status, eiMetadata.getMeta(FIELD_STATUS)));
-		map.put(FIELD_NOTES, StringUtils.toString(notes, eiMetadata.getMeta(FIELD_NOTES)));
+		map.put(FIELD_REMARK, StringUtils.toString(remark, eiMetadata.getMeta(FIELD_REMARK)));
 		map.put(FIELD_CREATED_BY, StringUtils.toString(createdBy, eiMetadata.getMeta(FIELD_CREATED_BY)));
+		map.put(FIELD_CREATED_NAME, StringUtils.toString(createdName, eiMetadata.getMeta(FIELD_CREATED_NAME)));
 		map.put(FIELD_CREATED_TIME, StringUtils.toString(createdTime, eiMetadata.getMeta(FIELD_CREATED_TIME)));
 		map.put(FIELD_UPDATED_BY, StringUtils.toString(updatedBy, eiMetadata.getMeta(FIELD_UPDATED_BY)));
+		map.put(FIELD_UPDATED_NAME, StringUtils.toString(updatedName, eiMetadata.getMeta(FIELD_UPDATED_NAME)));
 		map.put(FIELD_UPDATED_TIME, StringUtils.toString(updatedTime, eiMetadata.getMeta(FIELD_UPDATED_TIME)));
-		map.put(FIELD_DEP_CODE, StringUtils.toString(depCode, eiMetadata.getMeta(FIELD_DEP_CODE)));
 		
 		return map;
 	}

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

@@ -42,7 +42,9 @@ public class ServiceHPKC005 extends ServiceBase {
 		outInfo.getBlock(EiConstant.resultBlock).getRows().clear();
 		CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.WH_RECORD_BLOCK_ID), null);
 		CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.WH_RECORD_QUERY_BLOCK_ID), null);
+		CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.MATERIAL_RECORD_BLOCK_ID), null);
 		CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.INVENT_SPEC_BLOCK_ID), null);
+		CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.SPEC_NAME_BLOCK_ID), null, false);
 		return outInfo;
 	}
 	
@@ -150,6 +152,8 @@ public class ServiceHPKC005 extends ServiceBase {
 						HPConstant.SequenceId.STATISTICAL_NUMBER));
 				DaoUtils.insert(HPKC005.INSERT, fKc005);
 			}
+			inInfo = this.query(inInfo);
+			inInfo.setStatus(EiConstant.STATUS_DEFAULT);
 			inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据新增成功!");
 		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "新增失败");

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

@@ -5,14 +5,15 @@
     <sql id="column">
         ID as "id",
         COMPANY_CODE as "companyCode",  <!-- 企业编码 预留 -->
+        DEP_CODE as "depCode",  <!-- 部门编码 预留 -->
         RECEIPT_DATE as "receiptDate",  <!-- 单据日期 -->
         STATISTICAL_NUMBER as "statisticalNumber",  <!-- 盘点单号 -->
         WH_CODE as "whCode",  <!-- 仓库编码 -->
         WH_NAME as "whName",  <!-- 仓库名称 -->
-        INVENT_TYPE as "inventType",  <!-- 物料类型 -->
-        INVENT_CODE as "inventCode",  <!-- 物料编码 -->
-        INVENT_NAME as "inventName",  <!-- 物料名称 -->
-        SPEC as "spec",  <!-- 规格 -->
+        INVENT_TYPE as "inventType",  <!-- 存货类型 -->
+        INVENT_CODE as "inventCode",  <!-- 存货编码 -->
+        INVENT_NAME as "inventName",  <!-- 存货名称 -->
+        INVENT_RECORD_ID as "inventRecordId",  <!-- 存货档案ID -->
         BOOK_AMOUNT as "bookAmount",  <!-- 账面数量 -->
         BOOK_WEIGHT as "bookWeight",  <!-- 账面重量 -->
         ENTITY_AMOUNT as "entityAmount",  <!-- 实物数量 -->
@@ -20,12 +21,13 @@
         DIFF_AMOUNT as "diffAmount",  <!-- 差异数量 -->
         DIFF_WEIGHT as "diffWeight",  <!-- 差异重量 -->
         STATUS as "status",  <!-- 单据状态 0待审核 1已审核 -->
-        NOTES as "notes",  <!-- 备注 -->
+        REMARK as "remark",  <!-- 备注 -->
         CREATED_BY as "createdBy",  <!-- 创建人 -->
+        CREATED_NAME as "createdName",  <!-- 创建人名称 -->
         CREATED_TIME as "createdTime",  <!-- 创建时间 -->
         UPDATED_BY as "updatedBy",  <!-- 更新人 -->
-        UPDATED_TIME as "updatedTime",  <!-- 更新时间 -->
-        DEP_CODE as "depCode" <!-- 部门编码 -->
+        UPDATED_NAME as "updatedName",  <!-- 更新人名称 -->
+        UPDATED_TIME as "updatedTime" <!-- 更新时间 -->
     </sql>
 
 	<sql id="condition">
@@ -79,11 +81,18 @@
 		</isNotEmpty>
 	</sql>
 
-	<select id="query" resultClass="com.baosight.hpjx.hp.kc.domain.HPKC005">
-		SELECT <include refid="column"/>
-		FROM hpjx.T_HPKC005
-        WHERE 1=1
-        <include refid="condition"/>
+    <sql id="customCondition">
+        <isNotEmpty prepend=" AND " property="spec">
+            <isEqual property="spec" compareValue="无规格">
+                INVENT_RECORD_ID IN (SELECT ID FROM ${hpjxSchema}.T_HPPZ006 WHERE SPEC = '')
+            </isEqual>
+            <isNotEqual property="spec" compareValue="无规格">
+                INVENT_RECORD_ID IN (SELECT ID FROM ${hpjxSchema}.T_HPPZ006 WHERE SPEC = #spec#)
+            </isNotEqual>
+        </isNotEmpty>
+    </sql>
+
+    <sql id="order">
         <dynamic prepend="ORDER BY">
             <isNotEmpty property="orderBy">
                 $orderBy$
@@ -92,12 +101,22 @@
                 ID DESC
             </isEmpty>
         </dynamic>
+    </sql>
+
+	<select id="query" resultClass="com.baosight.hpjx.hp.kc.domain.HPKC005">
+		SELECT <include refid="column"/>
+		FROM hpjx.T_HPKC005
+        WHERE 1=1
+        <include refid="condition"/>
+        <include refid="customCondition"/>
+		<include refid="order"/>
 	</select>
 
 	<select id="count" resultClass="int">
 		SELECT COUNT(*) FROM hpjx.T_HPKC005
         WHERE 1=1
 		<include refid="condition"/>
+        <include refid="customCondition"/>
 	</select>
 
     <!-- 查询统计 -->
@@ -112,37 +131,36 @@
         FROM ${hpjxSchema}.T_HPKC005
         WHERE 1=1
         <include refid="condition"/>
+        <include refid="customCondition"/>
     </select>
 
 	<insert id="insert">
 		INSERT INTO hpjx.T_HPKC005 (
             COMPANY_CODE,  <!-- 企业编码 预留 -->
+            DEP_CODE,  <!-- 部门编码 预留 -->
             RECEIPT_DATE,  <!-- 单据日期 -->
             STATISTICAL_NUMBER,  <!-- 盘点单号 -->
             WH_CODE,  <!-- 仓库编码 -->
             WH_NAME,  <!-- 仓库名称 -->
-            INVENT_TYPE,  <!-- 物料类型 -->
-            INVENT_CODE,  <!-- 物料编码 -->
-            INVENT_NAME,  <!-- 物料名称 -->
-            SPEC,  <!-- 规格 -->
+            INVENT_TYPE,  <!-- 存货类型 -->
+            INVENT_CODE,  <!-- 存货编码 -->
+            INVENT_NAME,  <!-- 存货名称 -->
+            INVENT_RECORD_ID,  <!-- 存货档案ID -->
             BOOK_AMOUNT,  <!-- 账面数量 -->
             BOOK_WEIGHT,  <!-- 账面重量 -->
             ENTITY_AMOUNT,  <!-- 实物数量 -->
             ENTITY_WEIGHT,  <!-- 实物重量 -->
             DIFF_AMOUNT,  <!-- 差异数量 -->
             DIFF_WEIGHT,  <!-- 差异重量 -->
-            STATUS,  <!-- 单据状态 0待审核 1已审核 -->
-            NOTES,  <!-- 备注 -->
+            REMARK,  <!-- 备注 -->
             CREATED_BY,  <!-- 创建人 -->
-            CREATED_TIME,  <!-- 创建时间 -->
-            UPDATED_BY,  <!-- 更新人 -->
-            UPDATED_TIME,  <!-- 更新时间 -->
-            DEP_CODE  <!-- 部门编码 -->
+            CREATED_NAME,  <!-- 创建人名称 -->
+            CREATED_TIME  <!-- 创建时间 -->
         )  VALUES (
-            #companyCode#, #receiptDate#, #statisticalNumber#, #whCode#, #whName#, #inventType#,
-            #inventCode#, #inventName#, #spec#, #bookAmount#, #bookWeight#, #entityAmount#, #entityWeight#,
-            #diffAmount#, #diffWeight#, 0, #notes#, #createdBy#, #createdTime#, #updatedBy#,
-            #updatedTime#, #depCode#
+            #companyCode#, #depCode#, #receiptDate#, #statisticalNumber#, #whCode#, #whName#,
+            #inventType#, #inventCode#, #inventName#, #inventRecordId#, #bookAmount#,
+            #bookWeight#, #entityAmount#, #entityWeight#, #diffAmount#, #diffWeight#,
+            #remark#, #createdBy#, #createdName#, #createdTime#
         )
     </insert>
 
@@ -153,20 +171,22 @@
 	<update id="update">
 		UPDATE hpjx.T_HPKC005
 		SET
+            RECEIPT_DATE = #receiptDate#,   <!-- 单据日期 -->
             WH_CODE = #whCode#,   <!-- 仓库编码 -->
             WH_NAME = #whName#,   <!-- 仓库名称 -->
-            INVENT_TYPE = #inventType#,   <!-- 物料类型 -->
-            INVENT_CODE = #inventCode#,   <!-- 物料编码 -->
-            INVENT_NAME = #inventName#,   <!-- 物料名称 -->
-            SPEC = #spec#,   <!-- 规格 -->
+            INVENT_TYPE = #inventType#,   <!-- 存货类型 -->
+            INVENT_CODE = #inventCode#,   <!-- 存货编码 -->
+            INVENT_NAME = #inventName#,   <!-- 存货名称 -->
+            INVENT_RECORD_ID = #inventRecordId#,   <!-- 存货档案ID -->
             BOOK_AMOUNT = #bookAmount#,   <!-- 账面数量 -->
             BOOK_WEIGHT = #bookWeight#,   <!-- 账面重量 -->
             ENTITY_AMOUNT = #entityAmount#,   <!-- 实物数量 -->
             ENTITY_WEIGHT = #entityWeight#,   <!-- 实物重量 -->
             DIFF_AMOUNT = #diffAmount#,   <!-- 差异数量 -->
             DIFF_WEIGHT = #diffWeight#,   <!-- 差异重量 -->
-            NOTES = #notes#,   <!-- 备注 -->
+            REMARK = #remark#,   <!-- 备注 -->
             UPDATED_BY = #updatedBy#,   <!-- 更新人 -->
+            UPDATED_NAME = #updatedName#,   <!-- 更新人名称 -->
             UPDATED_TIME = #updatedTime#  <!-- 更新时间 -->
 		WHERE ID = #id#
 	</update>

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

@@ -6,6 +6,8 @@ import com.baosight.hpjx.core.dao.DaoUtils;
 import com.baosight.hpjx.hp.constant.HPConstant;
 import com.baosight.hpjx.hp.pz.domain.HPPZ003;
 import com.baosight.hpjx.hp.pz.domain.HPPZ004;
+import com.baosight.hpjx.hp.pz.domain.HPPZ006;
+import com.baosight.hpjx.util.AssertUtils;
 import com.baosight.hpjx.util.CommonMethod;
 import com.baosight.hpjx.util.LogUtils;
 import com.baosight.iplat4j.core.ei.EiConstant;
@@ -117,6 +119,14 @@ public class ServiceHPPZ004 extends ServiceBase {
 		try {
 			List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
 			for (int i = 0; i < resultRows.size(); i++) {
+				HPPZ004 fPz004 = new HPPZ004();
+				fPz004.fromMap(resultRows.get(i));
+				// 校验是否已经配置规格信息
+				Map paramMap = new HashMap();
+				paramMap.put("inventCode", fPz004.getInventCode());
+				List<HPPZ006> dbPz006 = dao.query(HPPZ006.QUERY, paramMap);
+				AssertUtils.isNotEmpty(dbPz006, String.format("存货编码[%s]已存在档案信息，请先删除对应档案",
+						fPz004.getInventCode()));
 				DaoUtils.update(HPPZ004.DELETE, resultRows.get(i));
 			}
 			inInfo = this.query(inInfo);

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

@@ -15,7 +15,11 @@ import com.baosight.iplat4j.core.ei.EiInfo;
 import com.baosight.iplat4j.core.exception.PlatException;
 import com.baosight.iplat4j.core.service.impl.ServiceBase;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author:songx
@@ -159,16 +163,12 @@ public class ServiceHPPZ006 extends ServiceBase {
 		return inInfo;
 	}
 	
-
-	public EiInfo queryComboBox(EiInfo eiInfo) {
-		Map map = new HashMap();
-		map.put("inventType", eiInfo.getString("inventType"));
-		List<DdynamicEnum> list = new ArrayList<>();
-		list.add(DdynamicEnum.INVENT_RECORD_BLOCK_ID);
-		CommonMethod.initBlock(eiInfo, list, map);
-		return eiInfo;
-	}
-
+	/**
+	 * 存货名称
+	 *
+	 * @param eiInfo
+	 * @return
+	 */
 	public EiInfo queryMaterialComboBox(EiInfo eiInfo) {
 		Map map = new HashMap();
 		map.put("inventType", eiInfo.getString("inventType"));

src/main/java/com/baosight/hpjx/hp/pz/sql/HPPZ002.xml

@@ -20,6 +20,7 @@
     </sql>
 
     <sql id="condition">
+        AND DELETE_FLAG = 0
         <isNotEmpty prepend=" AND " property="id">
             ID = #id#
         </isNotEmpty>
@@ -89,8 +90,9 @@
         )
     </insert>
 
+    <!-- 逻辑删除 -->
 	<delete id="delete">
-		DELETE FROM hpjx.t_hppz002 WHERE ID = #id#
+		UPDATE hpjx.T_HPPZ002 SET DELETE_FLAG = 1 WHERE ID = #id#
 	</delete>
 
 	<update id="update">
@@ -113,7 +115,9 @@
 		SELECT DISTINCT
 		CUST_CODE as "custCode",
 		CUST_NAME as "custName"
-		FROM hpjx.t_hppz002 WHERE STATUS=1
+		FROM hpjx.t_hppz002
+        WHERE DELETE_FLAG = 0
+        AND STATUS=1
 		<isNotEmpty prepend=" AND " property="companyCode">
 			COMPANY_CODE = #companyCode#
 		</isNotEmpty>

src/main/java/com/baosight/hpjx/hp/pz/sql/HPPZ003.xml

@@ -20,6 +20,7 @@
     </sql>
 
     <sql id="condition">
+        AND DELETE_FLAG = 0
         <isNotEmpty prepend=" AND " property="id">
             ID = #id#
         </isNotEmpty>
@@ -88,8 +89,9 @@
         )
     </insert>
 
+    <!-- 逻辑删除 -->
 	<delete id="delete">
-		DELETE FROM hpjx.t_hppz003 WHERE ID = #id#
+		UPDATE hpjx.T_HPPZ003 SET DELETE_FLAG = 1 WHERE ID = #id#
 	</delete>
 
 	<update id="update">
@@ -109,7 +111,9 @@
 		SELECT DISTINCT
 		CUST_CODE as "custCode",
 		CUST_NAME as "custName"
-		FROM hpjx.t_hppz003 WHERE STATUS=1
+		FROM hpjx.t_hppz003
+        WHERE DELETE_FLAG = 0
+        AND STATUS=1
 		<isNotEmpty prepend=" AND " property="companyCode">
 			COMPANY_CODE = #companyCode#
 		</isNotEmpty>

src/main/java/com/baosight/hpjx/hp/pz/sql/HPPZ004.xml

@@ -19,6 +19,7 @@
     </sql>
 
     <sql id="condition">
+        AND DELETE_FLAG = 0
         <isNotEmpty prepend=" AND " property="id">
             ID = #id#
         </isNotEmpty>
@@ -91,8 +92,9 @@
         )
     </insert>
 
+    <!-- 逻辑删除 -->
     <delete id="delete">
-		DELETE FROM hpjx.t_hppz004 WHERE ID = #id#
+		UPDATE hpjx.T_HPPZ004 SET DELETE_FLAG = 1 WHERE ID = #id#
 	</delete>
 
 	<update id="update">
@@ -113,7 +115,8 @@
 		INVENT_CODE as "inventCode",
 		INVENT_NAME as "inventName"
 		FROM hpjx.t_hppz004
-        WHERE STATUS = 1
+        WHERE DELETE_FLAG = 0
+        AND STATUS = 1
 		<isNotEmpty prepend=" AND " property="companyCode">
 			COMPANY_CODE = #companyCode#
 		</isNotEmpty>

src/main/java/com/baosight/hpjx/hp/pz/sql/HPPZ006.xml

@@ -26,6 +26,7 @@
     </sql>
 
     <sql id="condition">
+        AND DELETE_FLAG = 0
         <isNotEmpty prepend=" AND " property="id">
             ID = #id#
         </isNotEmpty>
@@ -101,8 +102,9 @@
         )
     </insert>
 
+    <!-- 逻辑删除 -->
 	<delete id="delete">
-		DELETE FROM hpjx.t_hppz006 WHERE ID = #id#
+		UPDATE hpjx.T_HPPZ006 SET DELETE_FLAG = 1 WHERE ID = #id#
 	</delete>
 
 	<update id="update">
@@ -126,7 +128,9 @@
 		SELECT DISTINCT
 		    ID as "id",
 		    CONCAT(INVENT_CODE,'-',INVENT_NAME,'[',SPEC,']') as "inventName"
-		FROM hpjx.t_hppz006 WHERE STATUS=1
+		FROM hpjx.t_hppz006
+        WHERE DELETE_FLAG = 1
+        AND STATUS=1
 		<isNotEmpty prepend=" AND " property="companyCode">
 			COMPANY_CODE = #companyCode#
 		</isNotEmpty>
@@ -141,7 +145,9 @@
 		SELECT DISTINCT
 		INVENT_CODE as "inventCode",
 		INVENT_NAME as "inventName"
-		FROM hpjx.t_hppz006 WHERE STATUS=1
+		FROM hpjx.t_hppz006
+        WHERE DELETE_FLAG = 0
+        AND STATUS=1
 		<isNotEmpty prepend=" AND " property="companyCode">
 			COMPANY_CODE = #companyCode#
 		</isNotEmpty>
@@ -154,8 +160,11 @@
     <!-- 规格下拉框 -->
     <select id="queryComboBoxSpec" parameterClass="java.util.HashMap" resultClass="java.util.HashMap">
         SELECT DISTINCT
-            SPEC AS "spec"
-        FROM hpjx.t_hppz006 WHERE STATUS=1
+            ID AS "id",
+            (CASE WHEN SPEC = '' THEN '无规格' ELSE SPEC END) AS "spec"
+        FROM hpjx.t_hppz006
+        WHERE DELETE_FLAG = 0
+        AND STATUS=1
         <isNotEmpty prepend=" AND " property="companyCode">
             COMPANY_CODE = #companyCode#
         </isNotEmpty>
@@ -168,4 +177,23 @@
         ORDER BY ID
     </select>
 
+    <!-- 规格下拉框(无ID) -->
+    <select id="queryComboBoxSpecName" parameterClass="java.util.HashMap" resultClass="java.util.HashMap">
+        SELECT DISTINCT
+        (CASE WHEN SPEC = '' THEN '无规格' ELSE SPEC END) AS "spec"
+        FROM hpjx.t_hppz006
+        WHERE DELETE_FLAG = 0
+        AND STATUS=1
+        <isNotEmpty prepend=" AND " property="companyCode">
+            COMPANY_CODE = #companyCode#
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="inventCode">
+            INVENT_CODE = #inventCode#
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="inventType">
+            INVENT_TYPE = #inventType#
+        </isNotEmpty>
+        ORDER BY SPEC DESC
+    </select>
+
 </sqlMap>

src/main/java/com/baosight/hpjx/hp/pz/sql/HPPZ007.xml

@@ -26,6 +26,7 @@
     </sql>
 
     <sql id="condition">
+        AND DELETE_FLAG = 0
         <isNotEmpty prepend=" AND " property="id">
             ID = #id#
         </isNotEmpty>
@@ -96,8 +97,9 @@
         )
     </insert>
 
+    <!-- 逻辑删除 -->
 	<delete id="delete">
-		DELETE FROM hpjx.t_hppz007 WHERE ID = #id#
+		UPDATE hpjx.T_HPPZ007 SET DELETE_FLAG = 1 WHERE ID = #id#
 	</delete>
 
 	<update id="update">
@@ -118,7 +120,9 @@
 		SELECT DISTINCT
 		WH_CODE	as "whCode",  <!-- 仓库编码 -->
 		WH_NAME	as "whName"  <!-- 仓库名称 -->
-		FROM hpjx.t_hppz007 WHERE STATUS=1
+		FROM hpjx.t_hppz007
+        WHERE DELETE_FLAG = 0
+        AND STATUS=1
 		<isNotEmpty prepend=" AND " property="companyCode">
 			COMPANY_CODE = #companyCode#
 		</isNotEmpty>
@@ -130,7 +134,8 @@
 
 	<select id="queryByWhCode" resultClass="com.baosight.hpjx.hp.pz.domain.HPPZ007">
 		SELECT WH_NAME	as "whName"
-		FROM hpjx.t_hppz007 WHERE 1=1
+		FROM hpjx.t_hppz007
+        WHERE DELETE_FLAG = 0
         AND WH_CODE = #whCode#
 	</select>
 

src/main/java/com/baosight/hpjx/hp/pz/sql/HPPZ009.xml

@@ -17,7 +17,7 @@
     </sql>
 
     <sql id="conditions">
-        AND DELETE_FLAG = '0'
+        AND DELETE_FLAG = 0
         <isNotEmpty prepend=" AND " property="companyCode">
             COMPANY_CODE = #companyCode#
         </isNotEmpty>

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

@@ -37,10 +37,9 @@ $(function() {
 			        let eiInfo = new EiInfo();
 			        eiInfo.set("inventType", options.model["inventType"]);
 			        var dataSource;
-			        EiCommunicator.send("HPPZ004", "queryComboBox", eiInfo, {
+			        EiCommunicator.send("HPPZ006", "queryMaterialComboBox", eiInfo, {
 				        onSuccess: function (ei) {
-					        dataSource = ei.getBlock("invent_name_block_id").getMappedRows();
-					        inventNameGlobalData = dataSource;
+					        dataSource = ei.getBlock("material_record_block_id").getMappedRows();
 				        },
 				        onFail: function (ei) {
 				        }
@@ -54,10 +53,10 @@ $(function() {
 			        });
 		        }
 	        }, {
-		        field: "spec",
+		        field: "inventRecordId",
 		        template: function (dataItem) {
 			        for (let i = 0; i < specGlobalData.length; i++) {
-				        if (specGlobalData[i]['valueField'] === dataItem['spec']) {
+				        if (specGlobalData[i]['valueField'] === dataItem['inventRecordId']) {
 					        return specGlobalData[i]['textField'];
 				        }
 			        }
@@ -76,7 +75,6 @@ $(function() {
 			        EiCommunicator.send("HPPZ006", "queryComboBoxSpec", eiInfo, {
 				        onSuccess: function (ei) {
 					        dataSource = ei.getBlock("invent_spec_block_id").getMappedRows();
-					        specGlobalData = dataSource;
 				        },
 				        onFail: function (ei) {
 				        }

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

@@ -8,15 +8,20 @@
 <EF:EFPage title="库存盘点单">
 	<EF:EFRegion id="inqu" title="查询条件">
 		<div class="row">
-		    <EF:EFDatePicker ename="inqu_status-0-receiptDate" cname="单据日期"
+			<EF:EFDatePicker ename="inqu_status-0-receiptDate" cname="单据日期" colWidth="3"
 			                 role="date" format="yyyy-MM-dd" readonly="true"/>
-			<EF:EFSelect ename="inqu_status-0-inventType" cname="存货类型" filter="contains" defaultValue="">
-				<EF:EFOption label="请选择" value=""/>
+			<EF:EFSelect ename="inqu_status-0-whCode" cname="仓库名称" colWidth="3" filter="contains" defultValue="">
+				<EF:EFOption label="全部" value=""/>
+				<EF:EFOptions blockId="whName_block_id" textField="textField" valueField="valueField"/>
+			</EF:EFSelect>
+			<EF:EFSelect ename="inqu_status-0-inventType" cname="存货类型" colWidth="3" filter="contains"
+			             template="#=valueField#-#=textField#" valueTemplate="#=valueField#-#=textField#">
+				<EF:EFOption label="全部" value=""/>
 				<EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
 			</EF:EFSelect>
-		    <EF:EFSelect ename="inqu_status-0-whCode" cname="仓库名称" filter="contains" defultValue="">
-			    <EF:EFOption label="请选择" value=""/>
-			    <EF:EFOptions blockId="whName_block_id" textField="textField" valueField="valueField"/>
+			<EF:EFSelect ename="inqu_status-0-inventCode" cname="存货名称" colWidth="3" filter="contains" defultValue="">
+				<EF:EFOption label="全部" value=""/>
+				<EF:EFOptions blockId="material_record_block_id" textField="textField" valueField="valueField"/>
 			</EF:EFSelect>
 				<%--<EF:EFSelect ename="inqu_status-0-status" cname="单据状态" filter="contains" required="false"
 							 template="#=textField#" valueTemplate="#=textField#" defaultValue="">
@@ -25,6 +30,12 @@
 					<EF:EFOption label="1-已审核" value="1"></EF:EFOption>
 				</EF:EFSelect>--%>
 		</div>
+		<div class="row">
+			<EF:EFSelect ename="inqu_status-0-spec" cname="规格" colWidth="3" filter="contains" defultValue="">
+				<EF:EFOption label="全部" value=""/>
+				<EF:EFOptions blockId="spec_name_block_id" textField="textField" valueField="valueField"/>
+			</EF:EFSelect>
+		</div>
 	</EF:EFRegion>
 
     <EF:EFRegion id="result" title="明细信息">
@@ -32,7 +43,7 @@
 		    <EF:EFColumn ename="id" cname="内码" hidden="true"/>
 		    <EF:EFColumn ename="statisticalNumber" cname="盘点单号" enable="false" width="130" algin="center"/>
 		    <EF:EFColumn ename="receiptDate" cname="单据日期" editType="date" dateFormat="yyyy-MM-dd"
-		                 parseFormats="['yyyyMMdd']" width="90" align="center"/>
+		                 parseFormats="['yyyyMMdd']" width="90" align="center" required="true"/>
 		    <%--<EF:EFComboColumn ename="status" cname="单据状态" enable="false" width="100" readonly="true"
 		                      textField="textField" valueField="valueField" align="center">
 			    <EF:EFOption label="0-待审核" value="0"></EF:EFOption>
@@ -41,21 +52,22 @@
 		    <EF:EFComboColumn ename="whCode" cname="仓库编码" width="120" columnTemplate="#=textField#"
 		                      itemTemplate="#=textField#" blockName="wh_record_block_id"
 		                      textField="textField" valueField="valueField"
-		                      align="center" filter="contains">
+		                      align="center" filter="contains" required="true">
 		    </EF:EFComboColumn>
-		    <EF:EFComboColumn ename="inventType" cname="存货类型" width="100" align="center">
+		    <EF:EFComboColumn ename="inventType" cname="存货类型" width="100" align="center" required="true"
+		                      columnTemplate="#=valueField#-#=textField#" itemTemplate="#=valueField#-#=textField#">
 			    <EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
 		    </EF:EFComboColumn>
-		    <EF:EFColumn ename="inventCode" cname="存货名称" width="120" align="center"/>
-		    <EF:EFColumn ename="spec" cname="规格" width="120" align="center"/>
+		    <EF:EFColumn ename="inventCode" cname="存货名称" width="120" align="center" required="true"/>
+		    <EF:EFColumn ename="inventRecordId" cname="规格" width="120" align="center"/>
 		    <EF:EFColumn ename="bookAmount" cname="账面数量" format="{0:N3}" maxLength="20" width="90" align="right"
-		                 sumType="all"/>
+		                 sumType="all" required="true"/>
 		    <EF:EFColumn ename="bookWeight" cname="账面重量" format="{0:N3}" maxLength="20" width="90" align="right"
-		                 sumType="all"/>
+		                 sumType="all" required="true"/>
 		    <EF:EFColumn ename="entityAmount" cname="实物数量" format="{0:N3}" maxLength="20" width="100" align="right"
-		                 sumType="all"/>
+		                 sumType="all" required="true"/>
 		    <EF:EFColumn ename="entityWeight" cname="实物重量" format="{0:N3}" maxLength="20" width="100" align="right"
-		                 sumType="all"/>
+		                 sumType="all" required="true"/>
 		    <EF:EFColumn ename="diffAmount" cname="差异数量" enable="false" format="{0:N3}" maxLength="20" width="100"
 		                 align="right" sumType="all"/>
 		    <EF:EFColumn ename="diffWeight" cname="差异重量" enable="false" format="{0:N3}" maxLength="20" width="100"

src/main/webapp/HP/PZ/HPPZ003.jsp

@@ -27,12 +27,14 @@
 			<EF:EFColumn ename="id" cname="主键" hidden="true"/>
 			<EF:EFColumn ename="custCode" cname="客户编码" enable="false" width="100" align="center"/>
 			<EF:EFComboColumn ename="custType" cname="客户类型" width="100" align="center"
-			                  blockName="company_type_block_id" itemTemplate="#=textField#-#=valueField#"
-			                  textField="valueField" valueField="textField" required="true">
+			                  blockName="company_type_block_id" textField="textField" valueField="valueField"
+			                  columnTemplate="#=valueField#-#=textField#" itemTemplate="#=valueField#-#=textField#"
+			                  required="true">
 			</EF:EFComboColumn>
 			<EF:EFColumn ename="custName" cname="客户名称" width="120" align="center" required="true"/>
 			<EF:EFColumn ename="address" cname="地址" width="150" align="center" required="true"/>
-			<EF:EFComboColumn ename="status" cname="状态" align="center" width="100" required="true">
+			<EF:EFComboColumn ename="status" cname="状态" width="100" align="center" required="true"
+			                  columnTemplate="#=valueField#-#=textField#" itemTemplate="#=valueField#-#=textField#">
 				<EF:EFCodeOption codeName="hpjx.hpjx.status"/>
 			</EF:EFComboColumn>
 			<EF:EFColumn ename="createdName" cname="创建人名称" enable="false" width="100" align="center"/>

src/main/webapp/HP/PZ/HPPZ004.jsp

@@ -8,10 +8,10 @@
 <EF:EFPage title="存货类型">
 	<EF:EFRegion id="inqu" title="查询条件">
 		<div class="row">
-			<EF:EFInput cname="存货名称" ename="inventName" blockId="inqu_status" row="0" colWidth="3"/>
-			<EF:EFSelect cname="存货类型" ename="inventType" blockId="inqu_status" row="0" colWidth="3" filter="contains"
-			             defaultValue="">
-				<EF:EFOption label="请选择" value=""/>
+			<EF:EFInput cname="存货名称" ename="inqu_status-0-inventName" colWidth="3"/>
+			<EF:EFSelect cname="存货类型" ename="inqu_status-0-inventType" colWidth="3"
+			             template="#=valueField#-#=textField#" valueTemplate="#=valueField#-#=textField#">
+				<EF:EFOption label="全部" value=""/>
 				<EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
 			</EF:EFSelect>
 			<EF:EFSelect cname="状态" ename="inqu_status-0-status" colWidth="3"
@@ -27,10 +27,12 @@
 			<EF:EFColumn ename="id" cname="内码" hidden="true"/>
 			<EF:EFColumn ename="inventCode" cname="存货编码" enable="false" width="100" align="center"/>
 			<EF:EFColumn ename="inventName" cname="存货名称" width="120" required="true"/>
-			<EF:EFComboColumn ename="inventType" cname="存货类型" width="90" align="center">
+			<EF:EFComboColumn ename="inventType" cname="存货类型" width="90" align="center" required="true"
+			                  columnTemplate="#=valueField#-#=textField#" itemTemplate="#=valueField#-#=textField#">
 				<EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
 			</EF:EFComboColumn>
-			<EF:EFComboColumn ename="status" cname="状态" align="center" width="100" required="true">
+			<EF:EFComboColumn ename="status" cname="状态" align="center" width="100" required="true"
+			                  columnTemplate="#=valueField#-#=textField#" itemTemplate="#=valueField#-#=textField#">
 				<EF:EFCodeOption codeName="hpjx.hpjx.status"/>
 			</EF:EFComboColumn>
 			<EF:EFColumn ename="createdName" cname="创建人名称" enable="false" width="100" align="center"/>

src/main/webapp/HP/PZ/HPPZ006.js

@@ -10,6 +10,21 @@ $(function() {
 			pageSizes: [10, 20, 30, 50, 100, 200]
 		},
 		columns: [{
+			field: "length",
+			template: function (options) {
+				return options.length == 0 ? "-" : options.length;
+			}
+		}, {
+			field: "wide",
+			template: function (options) {
+				return options.length == 0 ? "-" : options.length;
+			}
+		}, {
+			field: "thick",
+			template: function (options) {
+				return options.length == 0 ? "-" : options.length;
+			}
+		}, {
 			field: "inventCode",
 			template: function (dataItem) {
 				for (let i = 0; i < inventNameGlobalData.length; i++) {

src/main/webapp/HP/PZ/HPPZ006.jsp

@@ -8,16 +8,17 @@
 <EF:EFPage title="存货档案">
     <EF:EFRegion id="inqu" title="查询条件">
 	    <div class="row">
-		    <EF:EFSelect cname="存货类型" ename="inventType" blockId="inqu_status" row="0" colWidth="3" filter="contains"
-		                 defaultValue="">
-			    <EF:EFOption label="请选择" value=""/>
+		    <EF:EFSelect cname="存货类型" ename="inqu_status-0-inventType" colWidth="3"
+		                 valueTemplate="#=valueField#-#=textField#" template="#=valueField#-#=textField#">
+			    <EF:EFOption label="全部" value=""/>
 			    <EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
 		    </EF:EFSelect>
 		    <EF:EFSelect cname="存货名称" ename="inqu_status-0-inventCode" colWidth="3" filter="contains">
-			    <EF:EFOption label="--全部--" value=""/>
+			    <EF:EFOption label="全部" value=""/>
 			    <EF:EFOptions blockId="invent_name_block_id" textField="textField" valueField="valueField"/>
 		    </EF:EFSelect>
-		    <EF:EFSelect cname="状态" ename="inqu_status-0-status" colWidth="3">
+		    <EF:EFSelect cname="状态" ename="inqu_status-0-status" colWidth="3" valueTemplate="#=valueField#-#=textField#"
+		                 template="#=valueField#-#=textField#">
 			    <EF:EFOption label="全部" value=""/>
 			    <EF:EFCodeOption codeName="hpjx.hpjx.status"/>
 		    </EF:EFSelect>
@@ -27,23 +28,20 @@
 	<EF:EFRegion id="result" title="明细信息">
 		<EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="row">
 			<EF:EFColumn ename="id" cname="内码" hidden="true"/>
-			<EF:EFComboColumn ename="inventType" cname="存货类型" width="120" align="center">
+			<EF:EFComboColumn ename="inventType" cname="存货类型" width="120" align="center"
+			                  columnTemplate="#=valueField#-#=textField#" itemTemplate="#=valueField#-#=textField#">
 				<EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
 			</EF:EFComboColumn>
 			<EF:EFColumn ename="inventCode" cname="存货名称" width="120" align="center"/>
-			<EF:EFColumn ename="spec" cname="规格" width="120" align="center" maxLength="50"
-			             required="true"/>
-			<EF:EFColumn ename="length" cname="长" width="100" align="right" format="{0:N2}" maxLength="10"
-			             required="true"/>
-			<EF:EFColumn ename="wide" cname="宽" width="100" align="right" format="{0:N2}" maxLength="10"
-			             required="true"/>
-			<EF:EFColumn ename="thick" cname="厚" width="100" align="right" format="{0:N2}" maxLength="10"
-			             required="true"/>
+			<EF:EFColumn ename="spec" cname="规格" width="120" align="center" maxLength="50"/>
+			<EF:EFColumn ename="length" cname="长" width="100" align="right" format="{0:N2}" maxLength="10"/>
+			<EF:EFColumn ename="wide" cname="宽" width="100" align="right" format="{0:N2}" maxLength="10"/>
+			<EF:EFColumn ename="thick" cname="厚" width="100" align="right" format="{0:N2}" maxLength="10"/>
 			<EF:EFColumn ename="material" cname="材质" width="100" align="center" required="true"/>
-			<EF:EFColumn ename="coefficient" cname="系数" width="100" align="right" format="{0:N2}" maxLength="10"
-			             required="true"/>
+			<EF:EFColumn ename="coefficient" cname="系数" width="100" align="right" format="{0:N2}" maxLength="10"/>
 			<EF:EFColumn ename="unit" cname="单位" width="100" align="center" required="true"/>
-			<EF:EFComboColumn ename="status" cname="状态" align="center" width="100" required="true">
+			<EF:EFComboColumn ename="status" cname="状态" align="center" width="100" required="true"
+			                  columnTemplate="#=valueField#-#=textField#" itemTemplate="#=valueField#-#=textField#">
 				<EF:EFCodeOption codeName="hpjx.hpjx.status"/>
 			</EF:EFComboColumn>
 			<EF:EFColumn ename="createdName" cname="创建人名称" enable="false" width="100" align="center"/>

src/main/webapp/HP/PZ/HPPZ007.jsp

@@ -6,15 +6,16 @@
 <c:set var="ctx" value="${pageContext.request.contextPath}"/>
 
 <EF:EFPage title="仓库档案">
-
 	<EF:EFRegion id="inqu" title="查询条件">
 		<div class="row">
 			<EF:EFInput cname="仓库名称:" blockId="inqu_status" ename="whName" row="0" colWidth="3"/>
-			<EF:EFSelect cname="仓库类型:" blockId="inqu_status" ename="whType" row="0" colWidth="3">
+			<EF:EFSelect cname="仓库类型:" blockId="inqu_status" ename="whType" row="0" colWidth="3"
+			             valueTemplate="#=valueField#-#=textField#" template="#=valueField#-#=textField#">
 				<EF:EFOption label="全部" value=""/>
 				<EF:EFCodeOption codeName="hpjx.hppz.whType"/>
 			</EF:EFSelect>
-			<EF:EFSelect cname="状态:" blockId="inqu_status" ename="status" row="0" colWidth="3">
+			<EF:EFSelect cname="状态:" blockId="inqu_status" ename="status" row="0" colWidth="3"
+			             valueTemplate="#=valueField#-#=textField#" template="#=valueField#-#=textField#">
 				<EF:EFOption label="全部" value=""/>
 				<EF:EFCodeOption codeName="hpjx.hpjx.status"/>
 			</EF:EFSelect>
@@ -26,11 +27,13 @@
 			<EF:EFColumn ename="id" cname="主键" hidden="true"/>
 			<EF:EFColumn ename="whCode" cname="仓库编码" enable="false" width="120" align="center"/>
 			<EF:EFColumn ename="whName" cname="仓库名称" width="120" align="center" required="true"/>
-			<EF:EFComboColumn ename="whType" cname="仓库类型" width="120" align="center" required="true">
+			<EF:EFComboColumn ename="whType" cname="仓库类型" width="120" align="center" required="true"
+			                  columnTemplate="#=valueField#-#=textField#" itemTemplate="#=valueField#-#=textField#">
 				<EF:EFCodeOption codeName="hpjx.hppz.whType"/>
 			</EF:EFComboColumn>
 			<EF:EFColumn ename="princ" cname="负责人" width="120" align="center" required="true"/>
-			<EF:EFComboColumn ename="status" cname="状态" align="center" width="100" required="true">
+			<EF:EFComboColumn ename="status" cname="状态" width="100" align="center" required="true"
+			                  columnTemplate="#=valueField#-#=textField#" itemTemplate="#=valueField#-#=textField#">
 				<EF:EFCodeOption codeName="hpjx.hpjx.status"/>
 			</EF:EFComboColumn>
 			<EF:EFColumn ename="createdName" cname="创建人名称" enable="false" width="100" align="center"/>
@@ -42,9 +45,3 @@
 		</EF:EFGrid>
 	</EF:EFRegion>
 </EF:EFPage>
-
-
-<script>
-    var ctx = "${ctx}";
-</script>
-<script src="${ctx}/HP/PZ/HPPZ007.js"></script>

src/main/webapp/HP/ZL/HPZL001.jsp

@@ -31,7 +31,7 @@
 	        <EF:EFColumn ename="id" cname="内码" hidden="true"/>
 	        <EF:EFColumn ename="chkBillno" cname="检查单号" enable="false" width="130" align="center"/>
 	        <EF:EFColumn ename="receiptDate" cname="单据日期" width="120" align="center" editType="date"
-	                     dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']"/>
+	                     dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
 	        <EF:EFComboColumn ename="itemCode" cname="项目名称" width="140" columnTemplate="#=textField#"
 	                          itemTemplate="#=textField#" blockName="proj_record_block_id"
 	                          textField="textField" valueField="valueField" maxLength="20"
@@ -41,7 +41,7 @@
 	        <EF:EFColumn ename="notes" cname="质量问题描述" width="100" readonly="false"/>
 	        <EF:EFColumn ename="princ" cname="检查人" width="100" readonly="true"/>
 	        <EF:EFComboColumn ename="status" cname="状态" enable="false" align="center" textField="textField"
-	                          valueField="valueField" width="100" required="true" optionLabel=" ">
+	                          valueField="valueField" width="100" optionLabel=" ">
 		        <EF:EFOption label="--请选择--" value=""></EF:EFOption>
 		        <EF:EFOption label="审核" value="1"></EF:EFOption>
 		        <EF:EFOption label="未审核" value="0"></EF:EFOption>