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

src/main/java/com/baosight/hggp/hg/kc/domain/HGKC003.java

@@ -63,6 +63,7 @@ public class HGKC003 extends DaoEPBase {
 	public static final String FIELD_PART_WIDTH = "partWidth";    		/* 零件-宽*/
 	public static final String FIELD_PART_THICK = "partThick";    		/* 零件-厚*/
 	public static final String FIELD_PART_SPEC = "partSpec";    		/* 零件规格*/
+	public static final String FIELD_SUBMIT_STATUS = "submitStatus";    		/* 提交状态 0未提交，1已提交*/
 
 	public static final String COL_ID = "ID";
 	public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE";    		/* 企业编码*/
@@ -104,6 +105,7 @@ public class HGKC003 extends DaoEPBase {
 	public static final String COL_PART_WIDTH = "PART_WIDTH";    		/* 零件-宽*/
 	public static final String COL_PART_THICK = "PART_THICK";    		/* 零件-厚*/
 	public static final String COL_PART_SPEC = "PART_SPEC";    		/* 零件规格*/
+	public static final String COL_SUBMIT_STATUS = "SUBMIT_STATUS";    		/* 提交状态 0未提交，1已提交*/
 
 	public static final String QUERY = "HGKC003.query";
 	public static final String COUNT = "HGKC003.count";
@@ -151,6 +153,7 @@ public class HGKC003 extends DaoEPBase {
 	private BigDecimal partWidth = new BigDecimal(0.000);		/* 零件-宽*/
 	private BigDecimal partThick = new BigDecimal(0.000);		/* 零件-厚*/
 	private String partSpec = " ";		/* 零件规格*/
+	private Integer submitStatus;		/* 提交状态 0未提交，1已提交*/
 
 	/**
 	 * initialize the metadata.
@@ -346,6 +349,10 @@ public class HGKC003 extends DaoEPBase {
 		eiColumn.setDescName("零件规格");
 		eiMetadata.addMeta(eiColumn);
 
+		eiColumn = new EiColumn(FIELD_SUBMIT_STATUS);
+		eiColumn.setDescName("提交状态");
+		eiMetadata.addMeta(eiColumn);
+
 
 	}
 
@@ -996,6 +1003,15 @@ public class HGKC003 extends DaoEPBase {
 	public void setPartSpec(String partSpec) {
 		this.partSpec = partSpec;
 	}
+
+	public Integer getSubmitStatus() {
+		return submitStatus;
+	}
+
+	public void setSubmitStatus(Integer submitStatus) {
+		this.submitStatus = submitStatus;
+	}
+
 	/**
 	 * get the value from Map.
 	 *
@@ -1044,6 +1060,7 @@ public class HGKC003 extends DaoEPBase {
 		setPartWidth(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_PART_WIDTH)), partWidth));
 		setPartThick(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_PART_THICK)), partThick));
 		setPartSpec(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PART_SPEC)), partSpec));
+		setSubmitStatus(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_SUBMIT_STATUS)), submitStatus));
 	}
 
 	/**
@@ -1093,6 +1110,7 @@ public class HGKC003 extends DaoEPBase {
 		map.put(FIELD_PART_WIDTH, StringUtils.toString(partWidth, eiMetadata.getMeta(FIELD_PART_WIDTH)));
 		map.put(FIELD_PART_THICK, StringUtils.toString(partThick, eiMetadata.getMeta(FIELD_PART_THICK)));
 		map.put(FIELD_PART_SPEC, StringUtils.toString(partSpec, eiMetadata.getMeta(FIELD_PART_SPEC)));
+		map.put(FIELD_SUBMIT_STATUS, StringUtils.toString(submitStatus, eiMetadata.getMeta(FIELD_SUBMIT_STATUS)));
 
 		return map;
 	}

src/main/java/com/baosight/hggp/hg/kc/domain/HGKC003A.java

+package com.baosight.hggp.hg.kc.domain;
+
+import com.baosight.iplat4j.core.util.NumberUtils;
+import java.math.BigDecimal;
+import com.baosight.iplat4j.core.ei.EiColumn;
+import com.baosight.iplat4j.core.data.DaoEPBase;
+import java.util.HashMap;
+import java.util.Map;
+import com.baosight.iplat4j.core.util.StringUtils;
+
+/**
+ * Project: <br>
+ * Title:HGKC003A.java <br>
+ * Description: <br>
+ *
+ * Copyrigth:Baosight Software LTD.co Copyright (c) 2019. <br>
+ *
+ * @version 1.0
+ * @history 2024-05-23 18:28:15 create
+ */
+public class HGKC003A extends DaoEPBase {
+
+	private static final long serialVersionUID = 1L;
+
+	public static final String FIELD_ID = "id";
+	public static final String FIELD_ACCOUNT_CODE = "accountCode";    		/* 企业编码*/
+	public static final String FIELD_DEP_CODE = "depCode";    		/* 部门编码*/
+	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_DELETE_FLAG = "deleteFlag";    		/* 0-未删除，1-已删除*/
+	public static final String FIELD_COMPANY_CODE = "companyCode";    		/* 公司编码*/
+	public static final String FIELD_COMPANY_NAME = "companyName";    		/* 公司名称*/
+	public static final String FIELD_DEPOSIT_DATE = "depositDate";    		/* 入库日期*/
+	public static final String FIELD_DEPOSIT_NO = "depositNo";    		/* 入库单号*/
+	public static final String FIELD_WH_CODE = "whCode";    		/* 仓库编码*/
+	public static final String FIELD_WH_NAME = "whName";    		/* 仓库名称*/
+	public static final String FIELD_INV_QTY = "invQty";    		/* 数量*/
+	public static final String FIELD_INV_UNIT_WEIGHT = "invUnitWeight";    		/* 单重*/
+	public static final String FIELD_INV_WEIGHT = "invWeight";    		/* 重量*/
+	public static final String FIELD_DEPOSIT_NO_OLD = "depositNoOld";    		/* 入库单号(旧)*/
+	public static final String FIELD_REMARK = "remark";    		/* 备注*/
+	public static final String FIELD_FACTORY_CODE = "factoryCode";    		/* 工厂代码*/
+	public static final String FIELD_PROD_ORDER_NO = "prodOrderNo";    		/* 生产订单号*/
+	public static final String FIELD_PROD_TASK_NO = "prodTaskNo";    		/* 生产任务号*/
+	public static final String FIELD_PROJ_CODE = "projCode";    		/* 项目编码*/
+	public static final String FIELD_PROJ_NAME = "projName";    		/* 项目名称*/
+	public static final String FIELD_PRDT_TYPE = "prdtType";    		/* 产品类型*/
+	public static final String FIELD_PRDT_CODE = "prdtCode";    		/* 产品编码*/
+	public static final String FIELD_PRDT_NAME = "prdtName";    		/* 产品名称*/
+	public static final String FIELD_PRDT_LENGTH = "prdtLength";    		/* 产品-长*/
+	public static final String FIELD_PRDT_WIDTH = "prdtWidth";    		/* 产品-宽*/
+	public static final String FIELD_PRDT_THICK = "prdtThick";    		/* 产品-厚*/
+	public static final String FIELD_PRDT_SPEC = "prdtSpec";    		/* 产品规格*/
+	public static final String FIELD_PART_TYPE = "partType";    		/* 零件类型*/
+	public static final String FIELD_PART_CODE = "partCode";    		/* 零件编码*/
+	public static final String FIELD_PART_NAME = "partName";    		/* 零件名称*/
+	public static final String FIELD_PART_LENGTH = "partLength";    		/* 零件-长*/
+	public static final String FIELD_PART_WIDTH = "partWidth";    		/* 零件-宽*/
+	public static final String FIELD_PART_THICK = "partThick";    		/* 零件-厚*/
+	public static final String FIELD_PART_SPEC = "partSpec";    		/* 零件规格*/
+	public static final String FIELD_PRIMARY_ID = "primaryId";    		/* 主表id*/
+	public static final String FIELD_PRICE = "price";    		/* 单价*/
+	public static final String FIELD_AMOUNT = "amount";    		/* 金额*/
+	public static final String FIELD_STORAGE_TYPE = "storageType";    		/* 入库类型：0：入库 1：退回*/
+
+	public static final String COL_ID = "ID";
+	public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE";    		/* 企业编码*/
+	public static final String COL_DEP_CODE = "DEP_CODE";    		/* 部门编码*/
+	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_DELETE_FLAG = "DELETE_FLAG";    		/* 0-未删除，1-已删除*/
+	public static final String COL_COMPANY_CODE = "COMPANY_CODE";    		/* 公司编码*/
+	public static final String COL_COMPANY_NAME = "COMPANY_NAME";    		/* 公司名称*/
+	public static final String COL_DEPOSIT_DATE = "DEPOSIT_DATE";    		/* 入库日期*/
+	public static final String COL_DEPOSIT_NO = "DEPOSIT_NO";    		/* 入库单号*/
+	public static final String COL_WH_CODE = "WH_CODE";    		/* 仓库编码*/
+	public static final String COL_WH_NAME = "WH_NAME";    		/* 仓库名称*/
+	public static final String COL_INV_QTY = "INV_QTY";    		/* 数量*/
+	public static final String COL_INV_UNIT_WEIGHT = "INV_UNIT_WEIGHT";    		/* 单重*/
+	public static final String COL_INV_WEIGHT = "INV_WEIGHT";    		/* 重量*/
+	public static final String COL_DEPOSIT_NO_OLD = "DEPOSIT_NO_OLD";    		/* 入库单号(旧)*/
+	public static final String COL_REMARK = "REMARK";    		/* 备注*/
+	public static final String COL_FACTORY_CODE = "FACTORY_CODE";    		/* 工厂代码*/
+	public static final String COL_PROD_ORDER_NO = "PROD_ORDER_NO";    		/* 生产订单号*/
+	public static final String COL_PROD_TASK_NO = "PROD_TASK_NO";    		/* 生产任务号*/
+	public static final String COL_PROJ_CODE = "PROJ_CODE";    		/* 项目编码*/
+	public static final String COL_PROJ_NAME = "PROJ_NAME";    		/* 项目名称*/
+	public static final String COL_PRDT_TYPE = "PRDT_TYPE";    		/* 产品类型*/
+	public static final String COL_PRDT_CODE = "PRDT_CODE";    		/* 产品编码*/
+	public static final String COL_PRDT_NAME = "PRDT_NAME";    		/* 产品名称*/
+	public static final String COL_PRDT_LENGTH = "PRDT_LENGTH";    		/* 产品-长*/
+	public static final String COL_PRDT_WIDTH = "PRDT_WIDTH";    		/* 产品-宽*/
+	public static final String COL_PRDT_THICK = "PRDT_THICK";    		/* 产品-厚*/
+	public static final String COL_PRDT_SPEC = "PRDT_SPEC";    		/* 产品规格*/
+	public static final String COL_PART_TYPE = "PART_TYPE";    		/* 零件类型*/
+	public static final String COL_PART_CODE = "PART_CODE";    		/* 零件编码*/
+	public static final String COL_PART_NAME = "PART_NAME";    		/* 零件名称*/
+	public static final String COL_PART_LENGTH = "PART_LENGTH";    		/* 零件-长*/
+	public static final String COL_PART_WIDTH = "PART_WIDTH";    		/* 零件-宽*/
+	public static final String COL_PART_THICK = "PART_THICK";    		/* 零件-厚*/
+	public static final String COL_PART_SPEC = "PART_SPEC";    		/* 零件规格*/
+	public static final String COL_PRIMARY_ID = "PRIMARY_ID";    		/* 主表id*/
+	public static final String COL_PRICE = "PRICE";    		/* 单价*/
+	public static final String COL_AMOUNT = "AMOUNT";    		/* 金额*/
+	public static final String COL_STORAGE_TYPE = "STORAGE_TYPE";    		/* 入库类型：0：入库 1：退回*/
+
+	public static final String QUERY = "hgkc003a.query";
+	public static final String COUNT = "hgkc003a.count";
+	public static final String INSERT = "hgkc003a.insert";
+	public static final String UPDATE = "hgkc003a.update";
+	public static final String DELETE = "hgkc003a.delete";
+	public static final String BATCH_DELETE = "hgkc003a.batchDelete";
+
+	private Long id = new Long(0);
+	private String accountCode = " ";		/* 企业编码*/
+	private String depCode = " ";		/* 部门编码*/
+	private String createdBy = " ";		/* 记录创建者*/
+	private String createdName = " ";		/* 记录创建名称*/
+	private String createdTime = " ";		/* 记录创建时间*/
+	private String updatedBy = " ";		/* 记录修改者*/
+	private String updatedName = " ";		/* 记录修改名称*/
+	private String updatedTime = " ";		/* 记录修改时间*/
+	private Boolean deleteFlag;	/* 0-未删除，1-已删除*/
+	private String companyCode = " ";		/* 公司编码*/
+	private String companyName = " ";		/* 公司名称*/
+	private String depositDate = " ";		/* 入库日期*/
+	private String depositNo = " ";		/* 入库单号*/
+	private String whCode = " ";		/* 仓库编码*/
+	private String whName = " ";		/* 仓库名称*/
+	private BigDecimal invQty = new BigDecimal(0.000);		/* 数量*/
+	private BigDecimal invUnitWeight = new BigDecimal(0.000);		/* 单重*/
+	private BigDecimal invWeight = new BigDecimal(0.000);		/* 重量*/
+	private String depositNoOld = " ";		/* 入库单号(旧)*/
+	private String remark = " ";		/* 备注*/
+	private String factoryCode = " ";		/* 工厂代码*/
+	private String prodOrderNo = " ";		/* 生产订单号*/
+	private String prodTaskNo = " ";		/* 生产任务号*/
+	private String projCode = " ";		/* 项目编码*/
+	private String projName = " ";		/* 项目名称*/
+	private Boolean prdtType;	/* 产品类型*/
+	private String prdtCode = " ";		/* 产品编码*/
+	private String prdtName = " ";		/* 产品名称*/
+	private BigDecimal prdtLength = new BigDecimal(0.000);		/* 产品-长*/
+	private BigDecimal prdtWidth = new BigDecimal(0.000);		/* 产品-宽*/
+	private BigDecimal prdtThick = new BigDecimal(0.000);		/* 产品-厚*/
+	private String prdtSpec = " ";		/* 产品规格*/
+	private Boolean partType;	/* 零件类型*/
+	private String partCode = " ";		/* 零件编码*/
+	private String partName = " ";		/* 零件名称*/
+	private BigDecimal partLength = new BigDecimal(0.000);		/* 零件-长*/
+	private BigDecimal partWidth = new BigDecimal(0.000);		/* 零件-宽*/
+	private BigDecimal partThick = new BigDecimal(0.000);		/* 零件-厚*/
+	private String partSpec = " ";		/* 零件规格*/
+	private Long primaryId = new Long(0);	/* 主表id*/
+	private BigDecimal price = new BigDecimal("0");		/* 单价*/
+	private BigDecimal amount = new BigDecimal("0");		/* 金额*/
+	private Boolean storageType;	/* 入库类型：0：入库 1：退回*/
+
+	/**
+	 * initialize the metadata.
+	 */
+	public void initMetaData() {
+		EiColumn eiColumn;
+
+		eiColumn = new EiColumn(FIELD_ID);
+		eiColumn.setPrimaryKey(true);
+		eiColumn.setDescName(" ");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_ACCOUNT_CODE);
+		eiColumn.setDescName("企业编码");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_DEP_CODE);
+		eiColumn.setDescName("部门编码");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_CREATED_BY);
+		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);
+
+		eiColumn = new EiColumn(FIELD_UPDATED_BY);
+		eiColumn.setDescName("记录修改者");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_UPDATED_NAME);
+		eiColumn.setDescName("记录修改名称");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_UPDATED_TIME);
+		eiColumn.setDescName("记录修改时间");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_DELETE_FLAG);
+		eiColumn.setDescName("0-未删除，1-已删除");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_COMPANY_CODE);
+		eiColumn.setDescName("公司编码");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_COMPANY_NAME);
+		eiColumn.setDescName("公司名称");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_DEPOSIT_DATE);
+		eiColumn.setDescName("入库日期");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_DEPOSIT_NO);
+		eiColumn.setDescName("入库单号");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_WH_CODE);
+		eiColumn.setDescName("仓库编码");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_WH_NAME);
+		eiColumn.setDescName("仓库名称");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_INV_QTY);
+		eiColumn.setType("N");
+		eiColumn.setScaleLength(3);
+		eiColumn.setFieldLength(20);
+		eiColumn.setDescName("数量");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_INV_UNIT_WEIGHT);
+		eiColumn.setType("N");
+		eiColumn.setScaleLength(3);
+		eiColumn.setFieldLength(20);
+		eiColumn.setDescName("单重");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_INV_WEIGHT);
+		eiColumn.setType("N");
+		eiColumn.setScaleLength(3);
+		eiColumn.setFieldLength(20);
+		eiColumn.setDescName("重量");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_DEPOSIT_NO_OLD);
+		eiColumn.setDescName("入库单号(旧)");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_REMARK);
+		eiColumn.setDescName("备注");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_FACTORY_CODE);
+		eiColumn.setDescName("工厂代码");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_PROD_ORDER_NO);
+		eiColumn.setDescName("生产订单号");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_PROD_TASK_NO);
+		eiColumn.setDescName("生产任务号");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_PROJ_CODE);
+		eiColumn.setDescName("项目编码");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_PROJ_NAME);
+		eiColumn.setDescName("项目名称");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_PRDT_TYPE);
+		eiColumn.setDescName("产品类型");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_PRDT_CODE);
+		eiColumn.setDescName("产品编码");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_PRDT_NAME);
+		eiColumn.setDescName("产品名称");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_PRDT_LENGTH);
+		eiColumn.setType("N");
+		eiColumn.setScaleLength(3);
+		eiColumn.setFieldLength(12);
+		eiColumn.setDescName("产品-长");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_PRDT_WIDTH);
+		eiColumn.setType("N");
+		eiColumn.setScaleLength(3);
+		eiColumn.setFieldLength(12);
+		eiColumn.setDescName("产品-宽");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_PRDT_THICK);
+		eiColumn.setType("N");
+		eiColumn.setScaleLength(3);
+		eiColumn.setFieldLength(12);
+		eiColumn.setDescName("产品-厚");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_PRDT_SPEC);
+		eiColumn.setDescName("产品规格");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_PART_TYPE);
+		eiColumn.setDescName("零件类型");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_PART_CODE);
+		eiColumn.setDescName("零件编码");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_PART_NAME);
+		eiColumn.setDescName("零件名称");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_PART_LENGTH);
+		eiColumn.setType("N");
+		eiColumn.setScaleLength(3);
+		eiColumn.setFieldLength(12);
+		eiColumn.setDescName("零件-长");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_PART_WIDTH);
+		eiColumn.setType("N");
+		eiColumn.setScaleLength(3);
+		eiColumn.setFieldLength(12);
+		eiColumn.setDescName("零件-宽");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_PART_THICK);
+		eiColumn.setType("N");
+		eiColumn.setScaleLength(3);
+		eiColumn.setFieldLength(12);
+		eiColumn.setDescName("零件-厚");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_PART_SPEC);
+		eiColumn.setDescName("零件规格");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_PRIMARY_ID);
+		eiColumn.setDescName("主表id");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_PRICE);
+		eiColumn.setType("N");
+		eiColumn.setScaleLength(3);
+		eiColumn.setFieldLength(12);
+		eiColumn.setDescName("单价");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_AMOUNT);
+		eiColumn.setType("N");
+		eiColumn.setScaleLength(3);
+		eiColumn.setFieldLength(12);
+		eiColumn.setDescName("金额");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_STORAGE_TYPE);
+		eiColumn.setDescName("入库类型：0：入库 1：退回");
+		eiMetadata.addMeta(eiColumn);
+
+
+	}
+
+	/**
+	 * the constructor.
+	 */
+	public HGKC003A() {
+		initMetaData();
+	}
+
+	/**
+	 * get the id .
+	 * @return the id
+	 */
+	public Long getId() {
+		return this.id;
+	}
+
+	/**
+	 * set the id .
+	 *
+	 * @param id
+	 */
+	public void setId(Long id) {
+		this.id = id;
+	}
+	/**
+	 * get the accountCode - 企业编码.
+	 * @return the accountCode
+	 */
+	public String getAccountCode() {
+		return this.accountCode;
+	}
+
+	/**
+	 * set the accountCode - 企业编码.
+	 *
+	 * @param accountCode - 企业编码
+	 */
+	public void setAccountCode(String accountCode) {
+		this.accountCode = accountCode;
+	}
+	/**
+	 * 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 createdBy - 记录创建者.
+	 * @return the createdBy
+	 */
+	public String getCreatedBy() {
+		return this.createdBy;
+	}
+
+	/**
+	 * set the createdBy - 记录创建者.
+	 *
+	 * @param createdBy - 记录创建者
+	 */
+	public void setCreatedBy(String createdBy) {
+		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
+	 */
+	public String getCreatedTime() {
+		return this.createdTime;
+	}
+
+	/**
+	 * set the createdTime - 记录创建时间.
+	 *
+	 * @param createdTime - 记录创建时间
+	 */
+	public void setCreatedTime(String createdTime) {
+		this.createdTime = createdTime;
+	}
+	/**
+	 * get the updatedBy - 记录修改者.
+	 * @return the updatedBy
+	 */
+	public String getUpdatedBy() {
+		return this.updatedBy;
+	}
+
+	/**
+	 * set the updatedBy - 记录修改者.
+	 *
+	 * @param updatedBy - 记录修改者
+	 */
+	public void setUpdatedBy(String updatedBy) {
+		this.updatedBy = updatedBy;
+	}
+	/**
+	 * get the updatedName - 记录修改名称.
+	 * @return the updatedName
+	 */
+	public String getUpdatedName() {
+		return this.updatedName;
+	}
+
+	/**
+	 * set the updatedName - 记录修改名称.
+	 *
+	 * @param updatedName - 记录修改名称
+	 */
+	public void setUpdatedName(String updatedName) {
+		this.updatedName = updatedName;
+	}
+	/**
+	 * get the updatedTime - 记录修改时间.
+	 * @return the updatedTime
+	 */
+	public String getUpdatedTime() {
+		return this.updatedTime;
+	}
+
+	/**
+	 * set the updatedTime - 记录修改时间.
+	 *
+	 * @param updatedTime - 记录修改时间
+	 */
+	public void setUpdatedTime(String updatedTime) {
+		this.updatedTime = updatedTime;
+	}
+	/**
+	 * get the deleteFlag - 0-未删除，1-已删除.
+	 * @return the deleteFlag
+	 */
+	public Boolean getDeleteFlag() {
+		return this.deleteFlag;
+	}
+
+	/**
+	 * set the deleteFlag - 0-未删除，1-已删除.
+	 *
+	 * @param deleteFlag - 0-未删除，1-已删除
+	 */
+	public void setDeleteFlag(Boolean deleteFlag) {
+		this.deleteFlag = deleteFlag;
+	}
+	/**
+	 * get the companyCode - 公司编码.
+	 * @return the companyCode
+	 */
+	public String getCompanyCode() {
+		return this.companyCode;
+	}
+
+	/**
+	 * set the companyCode - 公司编码.
+	 *
+	 * @param companyCode - 公司编码
+	 */
+	public void setCompanyCode(String companyCode) {
+		this.companyCode = companyCode;
+	}
+	/**
+	 * get the companyName - 公司名称.
+	 * @return the companyName
+	 */
+	public String getCompanyName() {
+		return this.companyName;
+	}
+
+	/**
+	 * set the companyName - 公司名称.
+	 *
+	 * @param companyName - 公司名称
+	 */
+	public void setCompanyName(String companyName) {
+		this.companyName = companyName;
+	}
+	/**
+	 * get the depositDate - 入库日期.
+	 * @return the depositDate
+	 */
+	public String getDepositDate() {
+		return this.depositDate;
+	}
+
+	/**
+	 * set the depositDate - 入库日期.
+	 *
+	 * @param depositDate - 入库日期
+	 */
+	public void setDepositDate(String depositDate) {
+		this.depositDate = depositDate;
+	}
+	/**
+	 * get the depositNo - 入库单号.
+	 * @return the depositNo
+	 */
+	public String getDepositNo() {
+		return this.depositNo;
+	}
+
+	/**
+	 * set the depositNo - 入库单号.
+	 *
+	 * @param depositNo - 入库单号
+	 */
+	public void setDepositNo(String depositNo) {
+		this.depositNo = depositNo;
+	}
+	/**
+	 * get the whCode - 仓库编码.
+	 * @return the whCode
+	 */
+	public String getWhCode() {
+		return this.whCode;
+	}
+
+	/**
+	 * set the whCode - 仓库编码.
+	 *
+	 * @param whCode - 仓库编码
+	 */
+	public void setWhCode(String whCode) {
+		this.whCode = whCode;
+	}
+	/**
+	 * get the whName - 仓库名称.
+	 * @return the whName
+	 */
+	public String getWhName() {
+		return this.whName;
+	}
+
+	/**
+	 * set the whName - 仓库名称.
+	 *
+	 * @param whName - 仓库名称
+	 */
+	public void setWhName(String whName) {
+		this.whName = whName;
+	}
+	/**
+	 * get the invQty - 数量.
+	 * @return the invQty
+	 */
+	public BigDecimal getInvQty() {
+		return this.invQty;
+	}
+
+	/**
+	 * set the invQty - 数量.
+	 *
+	 * @param invQty - 数量
+	 */
+	public void setInvQty(BigDecimal invQty) {
+		this.invQty = invQty;
+	}
+	/**
+	 * get the invUnitWeight - 单重.
+	 * @return the invUnitWeight
+	 */
+	public BigDecimal getInvUnitWeight() {
+		return this.invUnitWeight;
+	}
+
+	/**
+	 * set the invUnitWeight - 单重.
+	 *
+	 * @param invUnitWeight - 单重
+	 */
+	public void setInvUnitWeight(BigDecimal invUnitWeight) {
+		this.invUnitWeight = invUnitWeight;
+	}
+	/**
+	 * get the invWeight - 重量.
+	 * @return the invWeight
+	 */
+	public BigDecimal getInvWeight() {
+		return this.invWeight;
+	}
+
+	/**
+	 * set the invWeight - 重量.
+	 *
+	 * @param invWeight - 重量
+	 */
+	public void setInvWeight(BigDecimal invWeight) {
+		this.invWeight = invWeight;
+	}
+	/**
+	 * get the depositNoOld - 入库单号(旧).
+	 * @return the depositNoOld
+	 */
+	public String getDepositNoOld() {
+		return this.depositNoOld;
+	}
+
+	/**
+	 * set the depositNoOld - 入库单号(旧).
+	 *
+	 * @param depositNoOld - 入库单号(旧)
+	 */
+	public void setDepositNoOld(String depositNoOld) {
+		this.depositNoOld = depositNoOld;
+	}
+	/**
+	 * get the remark - 备注.
+	 * @return the remark
+	 */
+	public String getRemark() {
+		return this.remark;
+	}
+
+	/**
+	 * set the remark - 备注.
+	 *
+	 * @param remark - 备注
+	 */
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+	/**
+	 * get the factoryCode - 工厂代码.
+	 * @return the factoryCode
+	 */
+	public String getFactoryCode() {
+		return this.factoryCode;
+	}
+
+	/**
+	 * set the factoryCode - 工厂代码.
+	 *
+	 * @param factoryCode - 工厂代码
+	 */
+	public void setFactoryCode(String factoryCode) {
+		this.factoryCode = factoryCode;
+	}
+	/**
+	 * get the prodOrderNo - 生产订单号.
+	 * @return the prodOrderNo
+	 */
+	public String getProdOrderNo() {
+		return this.prodOrderNo;
+	}
+
+	/**
+	 * set the prodOrderNo - 生产订单号.
+	 *
+	 * @param prodOrderNo - 生产订单号
+	 */
+	public void setProdOrderNo(String prodOrderNo) {
+		this.prodOrderNo = prodOrderNo;
+	}
+	/**
+	 * get the prodTaskNo - 生产任务号.
+	 * @return the prodTaskNo
+	 */
+	public String getProdTaskNo() {
+		return this.prodTaskNo;
+	}
+
+	/**
+	 * set the prodTaskNo - 生产任务号.
+	 *
+	 * @param prodTaskNo - 生产任务号
+	 */
+	public void setProdTaskNo(String prodTaskNo) {
+		this.prodTaskNo = prodTaskNo;
+	}
+	/**
+	 * get the projCode - 项目编码.
+	 * @return the projCode
+	 */
+	public String getProjCode() {
+		return this.projCode;
+	}
+
+	/**
+	 * set the projCode - 项目编码.
+	 *
+	 * @param projCode - 项目编码
+	 */
+	public void setProjCode(String projCode) {
+		this.projCode = projCode;
+	}
+	/**
+	 * get the projName - 项目名称.
+	 * @return the projName
+	 */
+	public String getProjName() {
+		return this.projName;
+	}
+
+	/**
+	 * set the projName - 项目名称.
+	 *
+	 * @param projName - 项目名称
+	 */
+	public void setProjName(String projName) {
+		this.projName = projName;
+	}
+	/**
+	 * get the prdtType - 产品类型.
+	 * @return the prdtType
+	 */
+	public Boolean getPrdtType() {
+		return this.prdtType;
+	}
+
+	/**
+	 * set the prdtType - 产品类型.
+	 *
+	 * @param prdtType - 产品类型
+	 */
+	public void setPrdtType(Boolean prdtType) {
+		this.prdtType = prdtType;
+	}
+	/**
+	 * get the prdtCode - 产品编码.
+	 * @return the prdtCode
+	 */
+	public String getPrdtCode() {
+		return this.prdtCode;
+	}
+
+	/**
+	 * set the prdtCode - 产品编码.
+	 *
+	 * @param prdtCode - 产品编码
+	 */
+	public void setPrdtCode(String prdtCode) {
+		this.prdtCode = prdtCode;
+	}
+	/**
+	 * get the prdtName - 产品名称.
+	 * @return the prdtName
+	 */
+	public String getPrdtName() {
+		return this.prdtName;
+	}
+
+	/**
+	 * set the prdtName - 产品名称.
+	 *
+	 * @param prdtName - 产品名称
+	 */
+	public void setPrdtName(String prdtName) {
+		this.prdtName = prdtName;
+	}
+	/**
+	 * get the prdtLength - 产品-长.
+	 * @return the prdtLength
+	 */
+	public BigDecimal getPrdtLength() {
+		return this.prdtLength;
+	}
+
+	/**
+	 * set the prdtLength - 产品-长.
+	 *
+	 * @param prdtLength - 产品-长
+	 */
+	public void setPrdtLength(BigDecimal prdtLength) {
+		this.prdtLength = prdtLength;
+	}
+	/**
+	 * get the prdtWidth - 产品-宽.
+	 * @return the prdtWidth
+	 */
+	public BigDecimal getPrdtWidth() {
+		return this.prdtWidth;
+	}
+
+	/**
+	 * set the prdtWidth - 产品-宽.
+	 *
+	 * @param prdtWidth - 产品-宽
+	 */
+	public void setPrdtWidth(BigDecimal prdtWidth) {
+		this.prdtWidth = prdtWidth;
+	}
+	/**
+	 * get the prdtThick - 产品-厚.
+	 * @return the prdtThick
+	 */
+	public BigDecimal getPrdtThick() {
+		return this.prdtThick;
+	}
+
+	/**
+	 * set the prdtThick - 产品-厚.
+	 *
+	 * @param prdtThick - 产品-厚
+	 */
+	public void setPrdtThick(BigDecimal prdtThick) {
+		this.prdtThick = prdtThick;
+	}
+	/**
+	 * get the prdtSpec - 产品规格.
+	 * @return the prdtSpec
+	 */
+	public String getPrdtSpec() {
+		return this.prdtSpec;
+	}
+
+	/**
+	 * set the prdtSpec - 产品规格.
+	 *
+	 * @param prdtSpec - 产品规格
+	 */
+	public void setPrdtSpec(String prdtSpec) {
+		this.prdtSpec = prdtSpec;
+	}
+	/**
+	 * get the partType - 零件类型.
+	 * @return the partType
+	 */
+	public Boolean getPartType() {
+		return this.partType;
+	}
+
+	/**
+	 * set the partType - 零件类型.
+	 *
+	 * @param partType - 零件类型
+	 */
+	public void setPartType(Boolean partType) {
+		this.partType = partType;
+	}
+	/**
+	 * get the partCode - 零件编码.
+	 * @return the partCode
+	 */
+	public String getPartCode() {
+		return this.partCode;
+	}
+
+	/**
+	 * set the partCode - 零件编码.
+	 *
+	 * @param partCode - 零件编码
+	 */
+	public void setPartCode(String partCode) {
+		this.partCode = partCode;
+	}
+	/**
+	 * get the partName - 零件名称.
+	 * @return the partName
+	 */
+	public String getPartName() {
+		return this.partName;
+	}
+
+	/**
+	 * set the partName - 零件名称.
+	 *
+	 * @param partName - 零件名称
+	 */
+	public void setPartName(String partName) {
+		this.partName = partName;
+	}
+	/**
+	 * get the partLength - 零件-长.
+	 * @return the partLength
+	 */
+	public BigDecimal getPartLength() {
+		return this.partLength;
+	}
+
+	/**
+	 * set the partLength - 零件-长.
+	 *
+	 * @param partLength - 零件-长
+	 */
+	public void setPartLength(BigDecimal partLength) {
+		this.partLength = partLength;
+	}
+	/**
+	 * get the partWidth - 零件-宽.
+	 * @return the partWidth
+	 */
+	public BigDecimal getPartWidth() {
+		return this.partWidth;
+	}
+
+	/**
+	 * set the partWidth - 零件-宽.
+	 *
+	 * @param partWidth - 零件-宽
+	 */
+	public void setPartWidth(BigDecimal partWidth) {
+		this.partWidth = partWidth;
+	}
+	/**
+	 * get the partThick - 零件-厚.
+	 * @return the partThick
+	 */
+	public BigDecimal getPartThick() {
+		return this.partThick;
+	}
+
+	/**
+	 * set the partThick - 零件-厚.
+	 *
+	 * @param partThick - 零件-厚
+	 */
+	public void setPartThick(BigDecimal partThick) {
+		this.partThick = partThick;
+	}
+	/**
+	 * get the partSpec - 零件规格.
+	 * @return the partSpec
+	 */
+	public String getPartSpec() {
+		return this.partSpec;
+	}
+
+	/**
+	 * set the partSpec - 零件规格.
+	 *
+	 * @param partSpec - 零件规格
+	 */
+	public void setPartSpec(String partSpec) {
+		this.partSpec = partSpec;
+	}
+	/**
+	 * get the primaryId - 主表id.
+	 * @return the primaryId
+	 */
+	public Long getPrimaryId() {
+		return this.primaryId;
+	}
+
+	/**
+	 * set the primaryId - 主表id.
+	 *
+	 * @param primaryId - 主表id
+	 */
+	public void setPrimaryId(Long primaryId) {
+		this.primaryId = primaryId;
+	}
+	/**
+	 * get the price - 单价.
+	 * @return the price
+	 */
+	public BigDecimal getPrice() {
+		return this.price;
+	}
+
+	/**
+	 * set the price - 单价.
+	 *
+	 * @param price - 单价
+	 */
+	public void setPrice(BigDecimal price) {
+		this.price = price;
+	}
+	/**
+	 * get the amount - 金额.
+	 * @return the amount
+	 */
+	public BigDecimal getAmount() {
+		return this.amount;
+	}
+
+	/**
+	 * set the amount - 金额.
+	 *
+	 * @param amount - 金额
+	 */
+	public void setAmount(BigDecimal amount) {
+		this.amount = amount;
+	}
+	/**
+	 * get the storageType - 入库类型：0：入库 1：退回.
+	 * @return the storageType
+	 */
+	public Boolean getStorageType() {
+		return this.storageType;
+	}
+
+	/**
+	 * set the storageType - 入库类型：0：入库 1：退回.
+	 *
+	 * @param storageType - 入库类型：0：入库 1：退回
+	 */
+	public void setStorageType(Boolean storageType) {
+		this.storageType = storageType;
+	}
+	/**
+	 * get the value from Map.
+	 *
+	 * @param map - source data map
+	 */
+	@Override
+	public void fromMap(Map map) {
+
+		setId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_ID)), id));
+		setAccountCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_ACCOUNT_CODE)), accountCode));
+		setDepCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEP_CODE)), depCode));
+		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));
+		setDeleteFlag(NumberUtils.toBoolean(StringUtils.toString(map.get(FIELD_DELETE_FLAG)), deleteFlag));
+		setCompanyCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_COMPANY_CODE)), companyCode));
+		setCompanyName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_COMPANY_NAME)), companyName));
+		setDepositDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEPOSIT_DATE)), depositDate));
+		setDepositNo(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEPOSIT_NO)), depositNo));
+		setWhCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_WH_CODE)), whCode));
+		setWhName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_WH_NAME)), whName));
+		setInvQty(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_INV_QTY)), invQty));
+		setInvUnitWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_INV_UNIT_WEIGHT)), invUnitWeight));
+		setInvWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_INV_WEIGHT)), invWeight));
+		setDepositNoOld(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEPOSIT_NO_OLD)), depositNoOld));
+		setRemark(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_REMARK)), remark));
+		setFactoryCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_FACTORY_CODE)), factoryCode));
+		setProdOrderNo(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PROD_ORDER_NO)), prodOrderNo));
+		setProdTaskNo(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PROD_TASK_NO)), prodTaskNo));
+		setProjCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PROJ_CODE)), projCode));
+		setProjName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PROJ_NAME)), projName));
+		setPrdtType(NumberUtils.toBoolean(StringUtils.toString(map.get(FIELD_PRDT_TYPE)), prdtType));
+		setPrdtCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PRDT_CODE)), prdtCode));
+		setPrdtName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PRDT_NAME)), prdtName));
+		setPrdtLength(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_PRDT_LENGTH)), prdtLength));
+		setPrdtWidth(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_PRDT_WIDTH)), prdtWidth));
+		setPrdtThick(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_PRDT_THICK)), prdtThick));
+		setPrdtSpec(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PRDT_SPEC)), prdtSpec));
+		setPartType(NumberUtils.toBoolean(StringUtils.toString(map.get(FIELD_PART_TYPE)), partType));
+		setPartCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PART_CODE)), partCode));
+		setPartName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PART_NAME)), partName));
+		setPartLength(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_PART_LENGTH)), partLength));
+		setPartWidth(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_PART_WIDTH)), partWidth));
+		setPartThick(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_PART_THICK)), partThick));
+		setPartSpec(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PART_SPEC)), partSpec));
+		setPrimaryId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_PRIMARY_ID)), primaryId));
+		setPrice(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_PRICE)), price));
+		setAmount(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_AMOUNT)), amount));
+		setStorageType(NumberUtils.toBoolean(StringUtils.toString(map.get(FIELD_STORAGE_TYPE)), storageType));
+	}
+
+	/**
+	 * set the value to Map.
+	 */
+	@Override
+	public Map toMap() {
+
+		Map map = new HashMap();
+		map.put(FIELD_ID, StringUtils.toString(id, eiMetadata.getMeta(FIELD_ID)));
+		map.put(FIELD_ACCOUNT_CODE, StringUtils.toString(accountCode, eiMetadata.getMeta(FIELD_ACCOUNT_CODE)));
+		map.put(FIELD_DEP_CODE, StringUtils.toString(depCode, eiMetadata.getMeta(FIELD_DEP_CODE)));
+		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_DELETE_FLAG, StringUtils.toString(deleteFlag, eiMetadata.getMeta(FIELD_DELETE_FLAG)));
+		map.put(FIELD_COMPANY_CODE, StringUtils.toString(companyCode, eiMetadata.getMeta(FIELD_COMPANY_CODE)));
+		map.put(FIELD_COMPANY_NAME, StringUtils.toString(companyName, eiMetadata.getMeta(FIELD_COMPANY_NAME)));
+		map.put(FIELD_DEPOSIT_DATE, StringUtils.toString(depositDate, eiMetadata.getMeta(FIELD_DEPOSIT_DATE)));
+		map.put(FIELD_DEPOSIT_NO, StringUtils.toString(depositNo, eiMetadata.getMeta(FIELD_DEPOSIT_NO)));
+		map.put(FIELD_WH_CODE, StringUtils.toString(whCode, eiMetadata.getMeta(FIELD_WH_CODE)));
+		map.put(FIELD_WH_NAME, StringUtils.toString(whName, eiMetadata.getMeta(FIELD_WH_NAME)));
+		map.put(FIELD_INV_QTY, StringUtils.toString(invQty, eiMetadata.getMeta(FIELD_INV_QTY)));
+		map.put(FIELD_INV_UNIT_WEIGHT, StringUtils.toString(invUnitWeight, eiMetadata.getMeta(FIELD_INV_UNIT_WEIGHT)));
+		map.put(FIELD_INV_WEIGHT, StringUtils.toString(invWeight, eiMetadata.getMeta(FIELD_INV_WEIGHT)));
+		map.put(FIELD_DEPOSIT_NO_OLD, StringUtils.toString(depositNoOld, eiMetadata.getMeta(FIELD_DEPOSIT_NO_OLD)));
+		map.put(FIELD_REMARK, StringUtils.toString(remark, eiMetadata.getMeta(FIELD_REMARK)));
+		map.put(FIELD_FACTORY_CODE, StringUtils.toString(factoryCode, eiMetadata.getMeta(FIELD_FACTORY_CODE)));
+		map.put(FIELD_PROD_ORDER_NO, StringUtils.toString(prodOrderNo, eiMetadata.getMeta(FIELD_PROD_ORDER_NO)));
+		map.put(FIELD_PROD_TASK_NO, StringUtils.toString(prodTaskNo, eiMetadata.getMeta(FIELD_PROD_TASK_NO)));
+		map.put(FIELD_PROJ_CODE, StringUtils.toString(projCode, eiMetadata.getMeta(FIELD_PROJ_CODE)));
+		map.put(FIELD_PROJ_NAME, StringUtils.toString(projName, eiMetadata.getMeta(FIELD_PROJ_NAME)));
+		map.put(FIELD_PRDT_TYPE, StringUtils.toString(prdtType, eiMetadata.getMeta(FIELD_PRDT_TYPE)));
+		map.put(FIELD_PRDT_CODE, StringUtils.toString(prdtCode, eiMetadata.getMeta(FIELD_PRDT_CODE)));
+		map.put(FIELD_PRDT_NAME, StringUtils.toString(prdtName, eiMetadata.getMeta(FIELD_PRDT_NAME)));
+		map.put(FIELD_PRDT_LENGTH, StringUtils.toString(prdtLength, eiMetadata.getMeta(FIELD_PRDT_LENGTH)));
+		map.put(FIELD_PRDT_WIDTH, StringUtils.toString(prdtWidth, eiMetadata.getMeta(FIELD_PRDT_WIDTH)));
+		map.put(FIELD_PRDT_THICK, StringUtils.toString(prdtThick, eiMetadata.getMeta(FIELD_PRDT_THICK)));
+		map.put(FIELD_PRDT_SPEC, StringUtils.toString(prdtSpec, eiMetadata.getMeta(FIELD_PRDT_SPEC)));
+		map.put(FIELD_PART_TYPE, StringUtils.toString(partType, eiMetadata.getMeta(FIELD_PART_TYPE)));
+		map.put(FIELD_PART_CODE, StringUtils.toString(partCode, eiMetadata.getMeta(FIELD_PART_CODE)));
+		map.put(FIELD_PART_NAME, StringUtils.toString(partName, eiMetadata.getMeta(FIELD_PART_NAME)));
+		map.put(FIELD_PART_LENGTH, StringUtils.toString(partLength, eiMetadata.getMeta(FIELD_PART_LENGTH)));
+		map.put(FIELD_PART_WIDTH, StringUtils.toString(partWidth, eiMetadata.getMeta(FIELD_PART_WIDTH)));
+		map.put(FIELD_PART_THICK, StringUtils.toString(partThick, eiMetadata.getMeta(FIELD_PART_THICK)));
+		map.put(FIELD_PART_SPEC, StringUtils.toString(partSpec, eiMetadata.getMeta(FIELD_PART_SPEC)));
+		map.put(FIELD_PRIMARY_ID, StringUtils.toString(primaryId, eiMetadata.getMeta(FIELD_PRIMARY_ID)));
+		map.put(FIELD_PRICE, StringUtils.toString(price, eiMetadata.getMeta(FIELD_PRICE)));
+		map.put(FIELD_AMOUNT, StringUtils.toString(amount, eiMetadata.getMeta(FIELD_AMOUNT)));
+		map.put(FIELD_STORAGE_TYPE, StringUtils.toString(storageType, eiMetadata.getMeta(FIELD_STORAGE_TYPE)));
+
+		return map;
+	}
+}

src/main/java/com/baosight/hggp/hg/kc/service/ServiceHGKC003B.java

+package com.baosight.hggp.hg.kc.service;
+
+import com.baosight.hggp.core.dao.DaoUtils;
+import com.baosight.hggp.core.security.UserSessionUtils;
+import com.baosight.hggp.hg.constant.HGConstant;
+import com.baosight.hggp.hg.kc.domain.HGKC003;
+import com.baosight.hggp.hg.kc.domain.HGKC003A;
+import com.baosight.hggp.util.*;
+import com.baosight.iplat4j.core.ei.EiConstant;
+import com.baosight.iplat4j.core.ei.EiInfo;
+import com.baosight.iplat4j.core.exception.PlatException;
+import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
+
+import java.util.*;
+
+/**
+ * 生产入库明细
+ *
+ * @author:jhs
+ * @date:2024/5/24,11:08
+ */
+public class ServiceHGKC003B extends ServiceEPBase {
+
+	public EiInfo initLoad(EiInfo inInfo) {
+		try {
+			inInfo = super.query(inInfo, HGKC003A.QUERY, new HGKC003A());
+		} catch (PlatException e) {
+			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
+		}
+		return inInfo;
+	}
+
+	public EiInfo query(EiInfo inInfo) {
+		try {
+			inInfo = super.query(inInfo, HGKC003A.QUERY, new HGKC003A());
+			inInfo.setStatus(EiConstant.STATUS_DEFAULT);
+		} catch (PlatException e) {
+			LogUtils.setDetailMsg(inInfo, e, "查询失败");
+		}
+		return inInfo;
+	}
+
+	@Override
+	public EiInfo delete(EiInfo inInfo) {
+		try {
+			List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
+			// 蓝图ids
+			List<Long> ids = ObjectUtils.listKey(resultRows, HGKC003A.FIELD_ID);
+			DaoUtils.update(HGKC003A.BATCH_DELETE, new HashMap<String,Object>(){{put("ids",ids);}});
+			inInfo = this.query(inInfo);
+			inInfo.setStatus(EiConstant.STATUS_DEFAULT);
+			inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据删除成功!");
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "删除失败");
+		}
+		return inInfo;
+	}
+
+	public EiInfo save(EiInfo inInfo){
+		try {
+			Map resultMap = EiInfoUtils.getFirstRow(inInfo,EiConstant.resultBlock);
+			HGKC003A hgkc003a = new HGKC003A();
+			hgkc003a.fromMap(resultMap);
+			//查询蓝图
+			HGKC003 hgkc003 = (HGKC003) super.dao.get(HGKC003.QUERY,HGKC003.FIELD_ID,hgkc003a.getPrimaryId());
+			//复制蓝图基本信息
+			hgkc003a.setCompanyCode(hgkc003.getCompanyCode());
+			hgkc003a.setCompanyName(hgkc003.getCompanyName());
+			hgkc003a.setDepCode(hgkc003.getDepCode());
+//			hgkc003a.setDepName(hgkc003.getDepName());
+			hgkc003a.setProjCode(hgkc003.getProjCode());
+			hgkc003a.setProjName(hgkc003.getProjName());
+			this.checkSaveData(hgkc003a,hgkc003);
+			if(Objects.nonNull(hgkc003a.getId())&&hgkc003a.getId()!=0){
+				DaoUtils.update(HGKC003A.UPDATE, hgkc003a);
+			}else {
+				DaoUtils.insert(HGKC003A.INSERT, hgkc003a);
+			}
+			inInfo.setStatus(EiConstant.STATUS_DEFAULT);
+			inInfo.setMsg("保存成功!");
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "保存失败");
+		}
+		return inInfo;
+	}
+
+	/**
+	 * 校验保存的数据
+	 *
+	 * @param hgkc003a
+	 */
+	private void checkSaveData(HGKC003A hgkc003a, HGKC003 hgkc003) {
+		if(Objects.nonNull(hgkc003a.getId())&&hgkc003a.getId()>0){
+			AssertUtils.isTrue(hgkc003.getSubmitStatus().compareTo(HGConstant.ProductStatus.YTJ) == 0,"入库单已提交，不能修改！");
+		}
+		AssertUtils.isEmpty(UserSessionUtils.getAccountCode(), "当前用户未绑定公司，无法操作数据，请联系管理员！");
+		AssertUtils.isEmpty(UserSessionUtils.getOrgId(), "当前用户未绑定部门，无法操作数据，请联系管理员！");
+		AssertUtils.isEmpty(hgkc003a.getCompanyCode(), "请选择公司！");
+		AssertUtils.isEmpty(hgkc003a.getProjCode(), "请填写项目编号！");
+		AssertUtils.isEmpty(hgkc003a.getProjName(), "请填写项目名称！");
+
+	}
+
+}

src/main/java/com/baosight/hggp/hg/kc/sql/HGKC003.xml

@@ -42,7 +42,8 @@
         PART_LENGTH as "partLength",  <!-- 零件-长 -->
         PART_WIDTH as "partWidth",  <!-- 零件-宽 -->
         PART_THICK as "partThick",  <!-- 零件-厚 -->
-        PART_SPEC as "partSpec" <!-- 零件规格 -->
+        PART_SPEC as "partSpec", <!-- 零件规格 -->
+		SUBMIT_STATUS as "submitStatus" <!-- 提交状态 -->
     </sql>
 
     <sql id="condition">
@@ -60,13 +61,13 @@
 			COMPANY_CODE = #companyCode#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="companyName">
-			COMPANY_NAME = #companyName#
+			COMPANY_NAME like '%' ||  #companyName#|| '%'
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="depositDate">
 			DEPOSIT_DATE = #depositDate#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="depositNo">
-			DEPOSIT_NO = #depositNo#
+			DEPOSIT_NO like '%' || #depositNo# || '%'
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="whCode">
 			WH_CODE = #whCode#
@@ -93,7 +94,7 @@
 			PROJ_CODE = #projCode#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="projName">
-			PROJ_NAME = #projName#
+			PROJ_NAME like '%' ||  #projName# || '%'
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="prdtType">
 			PRDT_TYPE = #prdtType#
@@ -137,6 +138,9 @@
 		<isNotEmpty prepend=" AND " property="partSpec">
 			PART_SPEC = #partSpec#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="submitStatus">
+			SUBMIT_STATUS = #submitStatus#
+		</isNotEmpty>
 	</sql>
 
     <sql id="idCondition">
@@ -224,13 +228,14 @@
         PART_LENGTH,  <!-- 零件-长 -->
         PART_WIDTH,  <!-- 零件-宽 -->
         PART_THICK,  <!-- 零件-厚 -->
-        PART_SPEC  <!-- 零件规格 -->
+        PART_SPEC,  <!-- 零件规格 -->
+		SUBMIT_STATUS  <!-- 提交状态 -->
         ) VALUES (
         #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#,
         #deleteFlag#, #companyCode#, #companyName#, #depositDate#, #depositNo#, #whCode#, #whName#,
         #invQty#, #invUnitWeight#, #invWeight#, #depositNoOld#, #remark#, #factoryCode#, #prodOrderNo#, #prodTaskNo#,
         #projCode#, #projName#, #prdtType#, #prdtCode#, #prdtName#, #prdtLength#, #prdtWidth#, #prdtThick#, #prdtSpec#,
-        #partType#, #partCode#, #partName#, #partLength#, #partWidth#, #partThick#, #partSpec#
+        #partType#, #partCode#, #partName#, #partLength#, #partWidth#, #partThick#, #partSpec#, #submitStatus#
         )
     </insert>
 
@@ -280,7 +285,8 @@
 					PART_LENGTH	= #partLength#,   <!-- 零件-长 -->
 					PART_WIDTH	= #partWidth#,   <!-- 零件-宽 -->
 					PART_THICK	= #partThick#,   <!-- 零件-厚 -->
-					PART_SPEC	= #partSpec#  <!-- 零件规格 -->
+					PART_SPEC	= #partSpec#,  <!-- 零件规格 -->
+					SUBMIT_STATUS	= #submitStatus#  <!-- 提交状态 -->
 			WHERE
 			ID = #id#
 	</update>

src/main/java/com/baosight/hggp/hg/kc/sql/HGKC003A.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE sqlMap  PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN" "http://ibatis.apache.org/dtd/sql-map-2.dtd">
+<sqlMap namespace="HGKC003A">
+
+	<sql id="condition">
+		<isNotEmpty prepend=" AND " property="id">
+			ID = #id#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="accountCode">
+			ACCOUNT_CODE = #accountCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="depCode">
+			DEP_CODE = #depCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="createdBy">
+			CREATED_BY = #createdBy#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="createdName">
+			CREATED_NAME = #createdName#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="createdTime">
+			CREATED_TIME = #createdTime#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="updatedBy">
+			UPDATED_BY = #updatedBy#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="updatedName">
+			UPDATED_NAME = #updatedName#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="updatedTime">
+			UPDATED_TIME = #updatedTime#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="deleteFlag">
+			DELETE_FLAG = #deleteFlag#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="companyCode">
+			COMPANY_CODE = #companyCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="companyName">
+			COMPANY_NAME = #companyName#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="depositDate">
+			DEPOSIT_DATE = #depositDate#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="depositNo">
+			DEPOSIT_NO = #depositNo#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="whCode">
+			WH_CODE = #whCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="whName">
+			WH_NAME = #whName#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="invQty">
+			INV_QTY = #invQty#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="invUnitWeight">
+			INV_UNIT_WEIGHT = #invUnitWeight#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="invWeight">
+			INV_WEIGHT = #invWeight#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="depositNoOld">
+			DEPOSIT_NO_OLD = #depositNoOld#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="remark">
+			REMARK = #remark#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="factoryCode">
+			FACTORY_CODE = #factoryCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="prodOrderNo">
+			PROD_ORDER_NO = #prodOrderNo#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="prodTaskNo">
+			PROD_TASK_NO = #prodTaskNo#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="projCode">
+			PROJ_CODE = #projCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="projName">
+			PROJ_NAME = #projName#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="prdtType">
+			PRDT_TYPE = #prdtType#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="prdtCode">
+			PRDT_CODE = #prdtCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="prdtName">
+			PRDT_NAME = #prdtName#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="prdtLength">
+			PRDT_LENGTH = #prdtLength#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="prdtWidth">
+			PRDT_WIDTH = #prdtWidth#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="prdtThick">
+			PRDT_THICK = #prdtThick#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="prdtSpec">
+			PRDT_SPEC = #prdtSpec#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="partType">
+			PART_TYPE = #partType#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="partCode">
+			PART_CODE = #partCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="partName">
+			PART_NAME = #partName#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="partLength">
+			PART_LENGTH = #partLength#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="partWidth">
+			PART_WIDTH = #partWidth#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="partThick">
+			PART_THICK = #partThick#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="partSpec">
+			PART_SPEC = #partSpec#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="primaryId">
+			PRIMARY_ID = #primaryId#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="price">
+			PRICE = #price#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="amount">
+			AMOUNT = #amount#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="storageType">
+			STORAGE_TYPE = #storageType#
+		</isNotEmpty>
+	</sql>
+
+	<select id="query" parameterClass="java.util.HashMap"
+			resultClass="com.baosight.hggp.hg.kc.domain.HGKC003A">
+		SELECT
+				ID	as "id",
+				ACCOUNT_CODE	as "accountCode",  <!-- 企业编码 -->
+				DEP_CODE	as "depCode",  <!-- 部门编码 -->
+				CREATED_BY	as "createdBy",  <!-- 记录创建者 -->
+				CREATED_NAME	as "createdName",  <!-- 记录创建名称 -->
+				CREATED_TIME	as "createdTime",  <!-- 记录创建时间 -->
+				UPDATED_BY	as "updatedBy",  <!-- 记录修改者 -->
+				UPDATED_NAME	as "updatedName",  <!-- 记录修改名称 -->
+				UPDATED_TIME	as "updatedTime",  <!-- 记录修改时间 -->
+				DELETE_FLAG	as "deleteFlag",  <!-- 0-未删除，1-已删除 -->
+				COMPANY_CODE	as "companyCode",  <!-- 公司编码 -->
+				COMPANY_NAME	as "companyName",  <!-- 公司名称 -->
+				DEPOSIT_DATE	as "depositDate",  <!-- 入库日期 -->
+				DEPOSIT_NO	as "depositNo",  <!-- 入库单号 -->
+				WH_CODE	as "whCode",  <!-- 仓库编码 -->
+				WH_NAME	as "whName",  <!-- 仓库名称 -->
+				INV_QTY	as "invQty",  <!-- 数量 -->
+				INV_UNIT_WEIGHT	as "invUnitWeight",  <!-- 单重 -->
+				INV_WEIGHT	as "invWeight",  <!-- 重量 -->
+				DEPOSIT_NO_OLD	as "depositNoOld",  <!-- 入库单号(旧) -->
+				REMARK	as "remark",  <!-- 备注 -->
+				FACTORY_CODE	as "factoryCode",  <!-- 工厂代码 -->
+				PROD_ORDER_NO	as "prodOrderNo",  <!-- 生产订单号 -->
+				PROD_TASK_NO	as "prodTaskNo",  <!-- 生产任务号 -->
+				PROJ_CODE	as "projCode",  <!-- 项目编码 -->
+				PROJ_NAME	as "projName",  <!-- 项目名称 -->
+				PRDT_TYPE	as "prdtType",  <!-- 产品类型 -->
+				PRDT_CODE	as "prdtCode",  <!-- 产品编码 -->
+				PRDT_NAME	as "prdtName",  <!-- 产品名称 -->
+				PRDT_LENGTH	as "prdtLength",  <!-- 产品-长 -->
+				PRDT_WIDTH	as "prdtWidth",  <!-- 产品-宽 -->
+				PRDT_THICK	as "prdtThick",  <!-- 产品-厚 -->
+				PRDT_SPEC	as "prdtSpec",  <!-- 产品规格 -->
+				PART_TYPE	as "partType",  <!-- 零件类型 -->
+				PART_CODE	as "partCode",  <!-- 零件编码 -->
+				PART_NAME	as "partName",  <!-- 零件名称 -->
+				PART_LENGTH	as "partLength",  <!-- 零件-长 -->
+				PART_WIDTH	as "partWidth",  <!-- 零件-宽 -->
+				PART_THICK	as "partThick",  <!-- 零件-厚 -->
+				PART_SPEC	as "partSpec",  <!-- 零件规格 -->
+				PRIMARY_ID	as "primaryId",  <!-- 主表id -->
+				PRICE	as "price",  <!-- 单价 -->
+				AMOUNT	as "amount",  <!-- 金额 -->
+				STORAGE_TYPE	as "storageType" <!-- 入库类型：0：入库 1：退回 -->
+		FROM ${hggpSchema}.HGKC003A WHERE 1=1
+        <include refid="condition" />
+		<dynamic prepend="ORDER BY">
+			<isNotEmpty property="orderBy">
+    		  $orderBy$
+			</isNotEmpty>
+			<isEmpty property="orderBy">
+    		  ID asc
+			</isEmpty>
+		</dynamic>
+
+	</select>
+
+	<select id="count" resultClass="int">
+		SELECT COUNT(*) FROM ${hggpSchema}.HGKC003A WHERE 1=1
+    <include refid="condition" />
+	</select>
+
+
+	<insert id="insert">
+		INSERT INTO ${hggpSchema}.HGKC003A (ID,
+										ACCOUNT_CODE,  <!-- 企业编码 -->
+										DEP_CODE,  <!-- 部门编码 -->
+										CREATED_BY,  <!-- 记录创建者 -->
+										CREATED_NAME,  <!-- 记录创建名称 -->
+										CREATED_TIME,  <!-- 记录创建时间 -->
+										UPDATED_BY,  <!-- 记录修改者 -->
+										UPDATED_NAME,  <!-- 记录修改名称 -->
+										UPDATED_TIME,  <!-- 记录修改时间 -->
+										DELETE_FLAG,  <!-- 0-未删除，1-已删除 -->
+										COMPANY_CODE,  <!-- 公司编码 -->
+										COMPANY_NAME,  <!-- 公司名称 -->
+										DEPOSIT_DATE,  <!-- 入库日期 -->
+										DEPOSIT_NO,  <!-- 入库单号 -->
+										WH_CODE,  <!-- 仓库编码 -->
+										WH_NAME,  <!-- 仓库名称 -->
+										INV_QTY,  <!-- 数量 -->
+										INV_UNIT_WEIGHT,  <!-- 单重 -->
+										INV_WEIGHT,  <!-- 重量 -->
+										DEPOSIT_NO_OLD,  <!-- 入库单号(旧) -->
+										REMARK,  <!-- 备注 -->
+										FACTORY_CODE,  <!-- 工厂代码 -->
+										PROD_ORDER_NO,  <!-- 生产订单号 -->
+										PROD_TASK_NO,  <!-- 生产任务号 -->
+										PROJ_CODE,  <!-- 项目编码 -->
+										PROJ_NAME,  <!-- 项目名称 -->
+										PRDT_TYPE,  <!-- 产品类型 -->
+										PRDT_CODE,  <!-- 产品编码 -->
+										PRDT_NAME,  <!-- 产品名称 -->
+										PRDT_LENGTH,  <!-- 产品-长 -->
+										PRDT_WIDTH,  <!-- 产品-宽 -->
+										PRDT_THICK,  <!-- 产品-厚 -->
+										PRDT_SPEC,  <!-- 产品规格 -->
+										PART_TYPE,  <!-- 零件类型 -->
+										PART_CODE,  <!-- 零件编码 -->
+										PART_NAME,  <!-- 零件名称 -->
+										PART_LENGTH,  <!-- 零件-长 -->
+										PART_WIDTH,  <!-- 零件-宽 -->
+										PART_THICK,  <!-- 零件-厚 -->
+										PART_SPEC,  <!-- 零件规格 -->
+										PRIMARY_ID,  <!-- 主表id -->
+										PRICE,  <!-- 单价 -->
+										AMOUNT,  <!-- 金额 -->
+										STORAGE_TYPE  <!-- 入库类型：0：入库 1：退回 -->
+										)
+	    VALUES (#id#, #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #deleteFlag#, #companyCode#, #companyName#, #depositDate#, #depositNo#, #whCode#, #whName#, #invQty#, #invUnitWeight#, #invWeight#, #depositNoOld#, #remark#, #factoryCode#, #prodOrderNo#, #prodTaskNo#, #projCode#, #projName#, #prdtType#, #prdtCode#, #prdtName#, #prdtLength#, #prdtWidth#, #prdtThick#, #prdtSpec#, #partType#, #partCode#, #partName#, #partLength#, #partWidth#, #partThick#, #partSpec#, #primaryId#, #price#, #amount#, #storageType#)
+	</insert>
+
+	<delete id="delete">
+		DELETE FROM ${hggpSchema}.HGKC003A WHERE
+			ID = #id#
+	</delete>
+
+	<delete id="batchDelete">
+		DELETE FROM ${hggpSchema}.HGKC003A WHERE
+		id IN <iterate close=")" open="(" conjunction="," property="ids">#ids[]#</iterate>
+	</delete>
+
+	<update id="update">
+		UPDATE ${hggpSchema}.HGKC003A
+		SET
+					ACCOUNT_CODE	= #accountCode#,   <!-- 企业编码 -->
+					DEP_CODE	= #depCode#,   <!-- 部门编码 -->
+					CREATED_BY	= #createdBy#,   <!-- 记录创建者 -->
+					CREATED_NAME	= #createdName#,   <!-- 记录创建名称 -->
+					CREATED_TIME	= #createdTime#,   <!-- 记录创建时间 -->
+					UPDATED_BY	= #updatedBy#,   <!-- 记录修改者 -->
+					UPDATED_NAME	= #updatedName#,   <!-- 记录修改名称 -->
+					UPDATED_TIME	= #updatedTime#,   <!-- 记录修改时间 -->
+					DELETE_FLAG	= #deleteFlag#,   <!-- 0-未删除，1-已删除 -->
+					COMPANY_CODE	= #companyCode#,   <!-- 公司编码 -->
+					COMPANY_NAME	= #companyName#,   <!-- 公司名称 -->
+					DEPOSIT_DATE	= #depositDate#,   <!-- 入库日期 -->
+					DEPOSIT_NO	= #depositNo#,   <!-- 入库单号 -->
+					WH_CODE	= #whCode#,   <!-- 仓库编码 -->
+					WH_NAME	= #whName#,   <!-- 仓库名称 -->
+					INV_QTY	= #invQty#,   <!-- 数量 -->
+					INV_UNIT_WEIGHT	= #invUnitWeight#,   <!-- 单重 -->
+					INV_WEIGHT	= #invWeight#,   <!-- 重量 -->
+					DEPOSIT_NO_OLD	= #depositNoOld#,   <!-- 入库单号(旧) -->
+					REMARK	= #remark#,   <!-- 备注 -->
+					FACTORY_CODE	= #factoryCode#,   <!-- 工厂代码 -->
+					PROD_ORDER_NO	= #prodOrderNo#,   <!-- 生产订单号 -->
+					PROD_TASK_NO	= #prodTaskNo#,   <!-- 生产任务号 -->
+					PROJ_CODE	= #projCode#,   <!-- 项目编码 -->
+					PROJ_NAME	= #projName#,   <!-- 项目名称 -->
+					PRDT_TYPE	= #prdtType#,   <!-- 产品类型 -->
+					PRDT_CODE	= #prdtCode#,   <!-- 产品编码 -->
+					PRDT_NAME	= #prdtName#,   <!-- 产品名称 -->
+					PRDT_LENGTH	= #prdtLength#,   <!-- 产品-长 -->
+					PRDT_WIDTH	= #prdtWidth#,   <!-- 产品-宽 -->
+					PRDT_THICK	= #prdtThick#,   <!-- 产品-厚 -->
+					PRDT_SPEC	= #prdtSpec#,   <!-- 产品规格 -->
+					PART_TYPE	= #partType#,   <!-- 零件类型 -->
+					PART_CODE	= #partCode#,   <!-- 零件编码 -->
+					PART_NAME	= #partName#,   <!-- 零件名称 -->
+					PART_LENGTH	= #partLength#,   <!-- 零件-长 -->
+					PART_WIDTH	= #partWidth#,   <!-- 零件-宽 -->
+					PART_THICK	= #partThick#,   <!-- 零件-厚 -->
+					PART_SPEC	= #partSpec#,   <!-- 零件规格 -->
+					PRIMARY_ID	= #primaryId#,   <!-- 主表id -->
+					PRICE	= #price#,   <!-- 单价 -->
+					AMOUNT	= #amount#,   <!-- 金额 -->
+					STORAGE_TYPE	= #storageType#  <!-- 入库类型：0：入库 1：退回 -->
+			WHERE
+			ID = #id#
+	</update>
+
+</sqlMap>

src/main/java/com/baosight/hggp/hg/sc/domain/HGSC004.java

@@ -72,6 +72,7 @@ public class HGSC004 extends DaoEPBase {
 	public static final String BATCH_DELETE = "HGSC004.batchDelete";
 	public static final String UPDATE_DEL = "HGSC004.updateDel";
 	public static final String UPDATE_MATERIAL_STATUS = "HGSC004.updateMaterialStatus";
+	public static final String MAX_ID = "HGSC004.maxId";
 
 	private Long id = new Long(0);	/* 主键*/
 	private Long blueprintId = new Long(0);	/* 蓝图id*/

src/main/java/com/baosight/hggp/hg/sc/service/ServiceHGSC004.java

@@ -113,6 +113,8 @@ public class ServiceHGSC004 extends ServiceBase {
                 });
                 DaoUtils.updateBatch(HGSC004A.UPDATE, hgsc004AList);
             }else {
+                Long maxId = (Long) super.dao.get(HGSC004.MAX_ID,null,null);
+                hgsc004.setId(maxId+1);
                 hgsc004.setMaterialStatus(HGConstant.MaterialStatus.WTJ);
                 DaoUtils.insert(HGSC004.INSERT, hgsc004);
 

src/main/java/com/baosight/hggp/hg/sc/service/ServiceHGSC004A.java

@@ -109,10 +109,7 @@ public class ServiceHGSC004A extends ServiceBase {
             Map resultMap = EiInfoUtils.getFirstRow(inInfo,EiConstant.resultBlock);
             HGSC004A hgsc004a = new HGSC004A();
             hgsc004a.fromMap(resultMap);
-            //蓝图信息，用于蓝图状态校验
-            HGSC003 hgsc003 = (HGSC003) super.dao.get(HGSC003.QUERY,HGSC004A.FIELD_id,hgsc004a.getId());
             //主表信息，用于取值
-
             Long materialId = Long.valueOf(inInfo.getCellStr(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSC004A.FIELD_material_id));
             HGSC004 hgsc004 = (HGSC004) super.dao.get(HGSC004.QUERY_BY_ID,HGSC004A.FIELD_id,materialId);
             if(Objects.nonNull(hgsc004)){
@@ -130,7 +127,7 @@ public class ServiceHGSC004A extends ServiceBase {
                 }else{
                     hgsc004a.setLeaf(1);
                 }
-                this.checkSaveData(hgsc004a,hgsc003);
+                this.checkSaveData(hgsc004a,hgsc004);
 
                 if(Objects.nonNull(hgsc004a.getId())&&hgsc004a.getId()!=0){
                     if(hgsc004a.getLv().intValue() == 3){
@@ -177,8 +174,10 @@ public class ServiceHGSC004A extends ServiceBase {
      *
      * @param hgsc004a
      */
-    private void checkSaveData(HGSC004A hgsc004a,HGSC003 hgsc003) {
+    private void checkSaveData(HGSC004A hgsc004a,HGSC004 hgsc004) {
         if(Objects.nonNull(hgsc004a.getId())&&hgsc004a.getId()>0){
+            //蓝图信息，用于蓝图状态校验
+            HGSC003 hgsc003 = (HGSC003) super.dao.get(HGSC003.QUERY,HGSC004A.FIELD_id,hgsc004.getBlueprintId());
             AssertUtils.isTrue(hgsc003.getBlueprintStatus().compareTo(HGConstant.EnablingStatus.TY) == 0,"蓝图已停用不可修改！");
         }
         AssertUtils.isEmpty(UserSessionUtils.getAccountCode(), "当前用户未绑定公司，无法操作数据，请联系管理员！");
@@ -196,9 +195,11 @@ public class ServiceHGSC004A extends ServiceBase {
         //获取物料详情数据
         String projCode =  StringUtils.toString(inInfo.get("projCode"));
         String companyCode =  StringUtils.toString(inInfo.get("companyCode"));
+        String materialId =  StringUtils.toString(inInfo.get("materialId"));
         Map queryMap = new HashMap();
         queryMap.put("companyCode", com.baosight.hggp.util.StringUtils.isNotBlank(companyCode) ? companyCode : "null");
         queryMap.put("projCode", com.baosight.hggp.util.StringUtils.isNotBlank(projCode) ? projCode : "null");
+        queryMap.put("materialId", com.baosight.hggp.util.StringUtils.isNotBlank(materialId) ? materialId : "null");
 
         queryMap.put("pEname", "$".equals(node) ? "root" : node);
         //2 查询节点
@@ -241,15 +242,18 @@ public class ServiceHGSC004A extends ServiceBase {
             HGSC004A hgsc004a = new HGSC004A();
             EiBlock eiBlock = inInfo.getBlock(EiConstant.resultBlock);
             String materialId = eiBlock.getCellStr(ACConstants.ROW_CODE_0, HGSC004A.FIELD_material_id);
+            //获取主表信息
             HGSC004 hgsc004 = (HGSC004) super.dao.get(HGSC004.QUERY_BY_ID,HGSC004.FIELD_id,materialId);
 
-            //校验计划父单据是否提交，提交了不让新增
-            HGSCTools.THGSC004A.checkFatherSubmitStatus(hgsc004.getId());
             for (i = 0; i < eiBlock.getRowCount(); i++) {
                 Map<?, ?> map = eiBlock.getRow(i);
+                //前端传参不完成
                 hgsc004a.fromMap(map);
                 if(Objects.nonNull(hgsc004)){
                     if(hgsc004.getMaterialStatus().intValue() == HGConstant.MaterialStatus.QBTJ){
+                        hgsc004a = (HGSC004A) super.dao.get(HGSC004A.QUERY_BY_MATERIAL_ID,HGSC004A.FIELD_id,hgsc004a.getId());
+                        //校验计划父单据是否提交，提交了不让新增
+                        HGSCTools.THGSC004A.checkFatherSubmitStatus(hgsc004.getId());
                         //子表
                         HGSC005A hgsc005a = new HGSC005A();
                         BeanUtil.copyProperties(hgsc004a,hgsc005a,"id","productType");
@@ -266,7 +270,7 @@ public class ServiceHGSC004A extends ServiceBase {
                         mapA.put("materialId",hgsc004a.getMaterialId());
                         mapA.put("productStatus",HGConstant.ProductStatus.WTJ);
                         mapA.put("notId",hgsc004a.getId());
-                        List<HGSC004A> hgsc004AList = dao.query(HGSC004A.QUERY_ALL,mapA, 0, -999999);
+                        List<HGSC004A> hgsc004AList = dao.query(HGSC004A.QUERY,mapA, 0, -999999);
 
                         if(!CollectionUtils.isEmpty(hgsc004AList)){
                             //如果存在就是部分提交
@@ -281,6 +285,7 @@ public class ServiceHGSC004A extends ServiceBase {
                     }
 
                 }
+                hgsc004a.setProductStatus(HGConstant.ProductStatus.YTJ);
                 DaoUtils.update(HGSC004A.UPDATE_PRODUCT_STATUS, hgsc004a);
             }
 

src/main/java/com/baosight/hggp/hg/sc/sql/HGSC004.xml

@@ -224,4 +224,8 @@
 		WHERE
 		ID = #id#
 	</update>
+
+	<select id="maxId" resultClass="long">
+		SELECT MAX(ID) AS "id" FROM ${hggpSchema}.HGSC004
+	</select>
 </sqlMap>

src/main/java/com/baosight/hggp/hg/sc/sql/HGSC004A.xml

@@ -214,10 +214,13 @@
 		FROM ${hggpSchema}.HGSC004A a
 		    left join ${hggpSchema}.hgpz005 b on a.product_id = b.id
 			left join ${hggpSchema}.hgsc001 c on a.proj_code = c.proj_code and c.approval_status = 2
-		WHERE 1=1
+		WHERE 1=1 and a.lv NOT IN (1,2)
 		<isNotEmpty prepend=" AND " property="materialId">
 			a.material_id = #materialId#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="id">
+			a.id = #id#
+		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="ids">
 			a.id IN <iterate close=")" open="(" conjunction="," property="ids">#ids[]#</iterate>
 		</isNotEmpty>
@@ -356,38 +359,37 @@
 
 	<select id="queryTree" resultClass="java.util.HashMap">
 		SELECT
-		PRODUCT_CODE as "nodeId",
-		product_id	as "productId",  <!-- 产品id -->
-		invent_type	as "inventType",  <!-- 档案类型 -->
-		product_type	as "productType",  <!-- 产品类别 -->
-		PRODUCT_CODE as "productCode",   <!-- 产品编码 -->
-		PROJ_CODE as "projCode",   <!-- 项目编码 -->
-		PROJ_NAME as "projName",<!-- 项目名称 -->
-		PRODUCT_NAME as "productName",   <!-- 产品名称 -->
-		PRODUCT_CODE as "label",  <!-- 名部件编码-->
-		case when lv = 3 then concat(PRODUCT_CODE,' ',PRODUCT_NAME) else PRODUCT_NAME end  as "text",  <!-- 部件名称 -->
-		PARENT_PROD_CODE as "pId", <!-- 父节点编码 -->
-		PARENT_PROD_NAME as "pName", <!-- 父节点名称 -->
-		LEAF as "leaf",  <!-- 是否有叶子节点 -->
-		SORT as "sort",  <!-- 排序字段 -->
-		lv as "lv"
+		a.PRODUCT_CODE as "nodeId",
+		a.product_id	as "productId",  <!-- 产品id -->
+		a.invent_type	as "inventType",  <!-- 档案类型 -->
+		a.product_type	as "productType",  <!-- 产品类别 -->
+		a.PRODUCT_CODE as "productCode",   <!-- 产品编码 -->
+		a.PROJ_CODE as "projCode",   <!-- 项目编码 -->
+		a.PROJ_NAME as "projName",<!-- 项目名称 -->
+		a.PRODUCT_NAME as "productName",   <!-- 产品名称 -->
+		a.PRODUCT_CODE as "label",  <!-- 名部件编码-->
+		case when a.lv = 3 then concat(a.PRODUCT_CODE,' ',a.PRODUCT_NAME) else a.PRODUCT_NAME end  as "text",  <!-- 部件名称 -->
+		a.PARENT_PROD_CODE as "pId", <!-- 父节点编码 -->
+		a.PARENT_PROD_NAME as "pName", <!-- 父节点名称 -->
+		a.LEAF as "leaf",  <!-- 是否有叶子节点 -->
+		a.SORT as "sort",  <!-- 排序字段 -->
+		a.lv as "lv"
 		FROM
-		${hggpSchema}.HGSC004A
-		WHERE 1=1
+		${hggpSchema}.HGSC004A a left join ${hggpSchema}.HGSC004 b on a.material_id = b.id
+		WHERE 1=1 and b.del_status = 0
 		<isNotEmpty prepend=" AND " property="pEname">
-			PARENT_PROD_CODE = #pEname#
+			a.PARENT_PROD_CODE = #pEname#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="projCode">
-			PROJ_CODE = #projCode#
+			a.PROJ_CODE = #projCode#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="companyCode">
-			COMPANY_CODE = #companyCode#
+			a.COMPANY_CODE = #companyCode#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="materialId">
-			MATERIAL_ID = #materialId#
+			a.MATERIAL_ID = #materialId#
 		</isNotEmpty>
-
-		ORDER BY CREATED_TIME DESC
+		ORDER BY a.CREATED_TIME DESC
 	</select>
 
 

src/main/webapp/HG/KC/HGKC003.jsp

@@ -8,48 +8,36 @@
 <EF:EFPage title="生产入库单">
 	<EF:EFRegion id="inqu" title="查询条件">
 		<div class="row">
-			<EF:EFDatePicker cname="单据日期" ename="documentDate" blockId="inqu_status" row="0" colWidth="3"
+			<EF:EFInput cname="公司名称" ename="companyName" blockId="inqu_status" row="0" colWidth="3"/>
+			<EF:EFDatePicker cname="单据日期" ename="depositDate" blockId="inqu_status" row="0" colWidth="3"
 			                 format="yyyy-MM-dd" readonly="true"/>
 			<EF:EFInput cname="项目名称" ename="projName" blockId="inqu_status" row="0" colWidth="3"/>
+			<EF:EFInput cname="生产入库单号" ename="projName" blockId="inqu_status" row="0" colWidth="3"/>
+
+		</div>
+		<div class="row">
 			<EF:EFSelect cname="仓库名称" ename="whCode" blockId="inqu_status" row="0" colWidth="3"
 						 filter="contains" defultValue="">
 				<EF:EFOption label="全部" value=""/>
 				<EF:EFOptions blockId="wh_record_block_id" textField="textField" valueField="valueField"/>
 			</EF:EFSelect>
-			<EF:EFSelect cname="是否删除" ename="deleteFlag" blockId="inqu_status" row="0" colWidth="3" defaultValue="0">
-				<EF:EFOption label="全部" value=""/>
-				<EF:EFCodeOption codeName="hpjx.hpjx.deleteFlag"/>
-			</EF:EFSelect>
-		</div>
-		<div class="row">
-			<EF:EFInput cname="部件名称" ename="prdtName" blockId="inqu_status" row="0" colWidth="3"/>
-			<EF:EFInput cname="零件名称" ename="partName" blockId="inqu_status" row="0" colWidth="3"/>
-			<EF:EFDateSpan startCname="创建日期(从)" endCname="至" blockId="inqu_status"
-			               startName="createdDateFrom" endName="createdDateTo" row="0" role="date"
-			               format="yyyy-MM-dd" ratio="3:3" satrtRatio="4:8" endRatio="4:8" readonly="true">
-			</EF:EFDateSpan>
 		</div>
 	</EF:EFRegion>
 
 	<EF:EFRegion id="result" title="明细信息">
-		<EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="row">
+		<EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="row" readonly="true">
 			<EF:EFColumn ename="id" cname="内码" hidden="true"/>
-			<EF:EFColumn ename="prodNo" cname="生产单号" enable="false" width="140" align="center"/>
+			<EF:EFColumn ename="companyName" cname="公司名称" enable="false" width="140" align="center"/>
+			<EF:EFColumn ename="projCode" cname="项目编号" enable="false" width="140" align="center"/>
+			<EF:EFColumn ename="projName" cname="项目名称" enable="false" width="140" align="center"/>
 			<EF:EFColumn ename="depositDate" cname="单据日期" enable="false" width="100" align="center" editType="date"
 						 dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
-			<EF:EFColumn ename="projName" cname="项目名称" enable="false" width="140" align="center"/>
-			<EF:EFComboColumn ename="whCode" cname="仓库名称" enable="false" width="120" align="center"
-			                  blockName="wh_record_block_id" textField="textField" valueField="valueField"
-			                  columnTemplate="#=textField#" itemTemplate="#=textField#">
+			<EF:EFColumn ename="depositNo" cname="生产入库单号" enable="false" width="120" align="center"/>
+			<EF:EFColumn ename="prodOrderNo" cname="生产任务单号" enable="false" width="120" align="center"/>
+			<EF:EFColumn ename="whName" cname="仓库名称" enable="false" width="120" align="center"/>
+			<EF:EFComboColumn cname="提交状态" ename="submitStatus" width="90" align="center" required="false">
+				<EF:EFCodeOption codeName="hggp.sc.productStatus" />
 			</EF:EFComboColumn>
-			<EF:EFColumn ename="prdtName" cname="部件名称" enable="false" width="120" align="center"/>
-			<EF:EFColumn ename="partName" cname="零件名称" enable="false" width="120" align="center"/>
-			<EF:EFColumn ename="partSpec" cname="零件规格" enable="false" width="150" align="center"/>
-			<EF:EFColumn ename="invQty" cname="数量" enable="false" width="120" align="right" format="{0:N0}"/>
-			<EF:EFColumn ename="invQeight" cname="总重（T）" enable="false" width="120" align="right" format="{0:N3}"/>
-			<EF:EFColumn ename="remark" cname="备注" enable="false" width="150"/>
-			<EF:EFColumn ename="prdtCode" cname="部件编码" enable="false" width="120" align="center" hidden="true"/>
-			<EF:EFColumn ename="partCode" cname="零件编码" enable="false" width="120" align="center" hidden="true"/>
 		</EF:EFGrid>
 	</EF:EFRegion>
 

src/main/webapp/HG/KC/HGKC003B.jsp

+<!DOCTYPE html>
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="EF" tagdir="/WEB-INF/tags/EF" %>
+
+<c:set var="ctx" value="${pageContext.request.contextPath}"/>
+
+<EF:EFPage title="生产入库详情">
+	<EF:EFRegion id="inqu" title="查询条件">
+		<div class="row">
+			<EF:EFDatePicker cname="单据日期" ename="documentDate" blockId="inqu_status" row="0" colWidth="3"
+			                 format="yyyy-MM-dd" readonly="true"/>
+			<EF:EFSelect cname="仓库名称" ename="whCode" blockId="inqu_status" row="0" colWidth="3"
+			             filter="contains" defultValue="">
+				<EF:EFOption label="全部" value=""/>
+				<EF:EFOptions blockId="wh_record_block_id" textField="textField" valueField="valueField"/>
+			</EF:EFSelect>
+			<EF:EFInput cname="存货编码" ename="prdtCode" blockId="inqu_status" row="0" colWidth="3"/>
+			<EF:EFInput cname="存货名称" ename="prdtName" blockId="inqu_status" row="0" colWidth="3"/>
+		</div>
+	</EF:EFRegion>
+
+	<EF:EFRegion id="result" title="明细信息">
+		<EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="row">
+			<EF:EFColumn ename="id" cname="内码" hidden="true"/>
+			<EF:EFColumn ename="prodNo" cname="生产单号" enable="false" width="140" align="center"/>
+			<EF:EFColumn ename="depositDate" cname="单据日期" enable="false" width="100" align="center" editType="date"
+			             dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
+			<EF:EFColumn ename="projName" cname="项目名称" enable="false" width="140" align="center"/>
+			<EF:EFComboColumn ename="whCode" cname="仓库名称" enable="false" width="120" align="center"
+			                  blockName="wh_record_block_id" textField="textField" valueField="valueField"
+			                  columnTemplate="#=textField#" itemTemplate="#=textField#">
+			</EF:EFComboColumn>
+			<EF:EFColumn ename="prdtName" cname="部件名称" enable="false" width="120" align="center"/>
+			<EF:EFColumn ename="partName" cname="零件名称" enable="false" width="120" align="center"/>
+			<EF:EFColumn ename="partSpec" cname="零件规格" enable="false" width="150" align="center"/>
+			<EF:EFColumn ename="invQty" cname="数量" enable="false" width="120" align="right" format="{0:N0}"/>
+			<EF:EFColumn ename="invQeight" cname="总重（T）" enable="false" width="120" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="remark" cname="备注" enable="false" width="150"/>
+			<EF:EFColumn ename="prdtCode" cname="部件编码" enable="false" width="120" align="center" hidden="true"/>
+			<EF:EFColumn ename="partCode" cname="零件编码" enable="false" width="120" align="center" hidden="true"/>
+		</EF:EFGrid>
+	</EF:EFRegion>
+
+
+</EF:EFPage>

src/main/webapp/HG/SC/HGSC004A.js

@@ -32,6 +32,7 @@ $(function () {
             query: function (postEiInfo, model) {
                 postEiInfo.set("companyCode",companyCode ? companyCode : null);
                 postEiInfo.set("projCode",projCode ? projCode : null);
+                postEiInfo.set("materialId",$("#inqu_status-0-materialId").val());
                 return postEiInfo;
             },
             loadComplete: function (options) {
@@ -59,6 +60,7 @@ $(function () {
                     refreshTree();
                 } else {
                     let eiInfo = new EiInfo();
+                    eiInfo.set("inqu_status-0-materialId", $("#inqu_status-0-materialId").val());
                     if (nodeData.lv == 2) {
                         eiInfo.set("inqu_status-0-parInventType", "root");
                         //3级节点选择只能是构建

src/main/webapp/HG/SC/HGSC004A.jsp

@@ -60,7 +60,7 @@
                     <EF:EFColumn ename="quantity" required="true" cname="数量"/>
                     <EF:EFColumn ename="singleWeight" required="true" format="{0:N3}" cname="单重(kg)"/>
                     <EF:EFColumn enable="true" required="true" format="{0:N3}" ename="totalWeight" cname="总重(kg)"/>
-                    <EF:EFComboColumn cname="提交状态" ename="productStatus" width="90" align="center" required="false">
+                    <EF:EFComboColumn cname="提交状态" ename="productStatus" width="90" align="center" required="false"  enable="false">
                         <EF:EFCodeOption codeName="hggp.sc.productStatus" />
                     </EF:EFComboColumn>
                 </EF:EFGrid>

src/main/webapp/HG/SC/HGSC004E.jsp

@@ -15,15 +15,17 @@
 			<EF:EFColumn enable="false" ename="productId" hidden="true" cname="产品id"/>
 			<EF:EFColumn enable="false" ename="productType" hidden="true" cname="产品类型"/>
 			<EF:EFColumn enable="false" ename="inventType" hidden="true" cname="库存类型"/>
-			<EF:EFColumn ename="operator" cname="操作" width="140"  enable="false" readonly="false"/>
 			<EF:EFComboColumn cname="变更类型" ename="changeType" width="90" align="center" enable="false" required="false">
 				<EF:EFCodeOption codeName="hggp.sc.changeType" />
 			</EF:EFComboColumn>
 			<EF:EFColumn ename="productCode" required="true" cname="产品编号"  enable="false"/>
 			<EF:EFColumn ename="productName" cname="产品名称" width="120" align="center" enable="false"/>
-			<EF:EFColumn ename="quantity" required="true" cname="数量"  enable="false"  enable="false"/>
+			<EF:EFColumn ename="length" cname="长(MM)" width="100" align="right" format="{0:N2}" maxLength="10" enable="false"/>
+			<EF:EFColumn ename="width" cname="宽(MM)" width="100" align="right" format="{0:N2}" maxLength="10" enable="false"/>
+			<EF:EFColumn ename="thick" cname="厚(MM)" width="100" align="right" format="{0:N2}" maxLength="10" enable="false"/>
+			<EF:EFColumn ename="quantity" required="true" cname="数量"  enable="false" />
 			<EF:EFColumn ename="singleWeight" required="true" format="{0:N3}" cname="单重(kg)"  enable="false"/>
-			<EF:EFColumn enable="true" required="true" format="{0:N3}" ename="totalWeight" cname="总重(kg)"  enable="false"/>
+			<EF:EFColumn enable="true" required="true" format="{0:N3}" ename="totalWeight" cname="总重(kg)"/>
 			<EF:EFComboColumn cname="提交状态" ename="productStatus" width="90" align="center" required="false"  enable="false">
 				<EF:EFCodeOption codeName="hggp.sc.productStatus" />
 			</EF:EFComboColumn>