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

src/main/java/com/baosight/hggp/hg/cb/tools/HGCBTools.java

@@ -409,7 +409,7 @@ public class HGCBTools {
             hgcb003.setInventCode(hgkc007b.getInventCode());
             hgcb003.setInventName(hgkc007b.getInventName());
             hgcb003.setInventRecordId(hgkc007b.getInventRecordId());
-            hgcb003.setSpec(hgkc007b.getPartSpec());
+            hgcb003.setSpec(hgkc007b.getPrdtSpec());
             hgcb003.setIsEstimate(0);
             hgcb003.setQuantity(hgkc007b.getInvQty());
             hgcb003.setWeight(hgkc007b.getInvWeight());
@@ -578,8 +578,8 @@ public class HGCBTools {
                 dataMap.put(HGCB004.FIELD_SPEC, dataMap.get(HGKC006A.FIELD_PART_SPEC));
             }else if (dataMap.containsKey(HGKC008A.FIELD_INV_SPEC)){
                 dataMap.put(HGCB004.FIELD_SPEC, dataMap.get(HGKC008A.FIELD_INV_SPEC));
-            }else if (dataMap.containsKey(HGKC007A.FIELD_PART_SPEC)){
-                dataMap.put(HGCB004.FIELD_SPEC, dataMap.get(HGKC007A.FIELD_PART_SPEC));
+            }else if (dataMap.containsKey(HGKC007A.FIELD_PRDT_SPEC)){
+                dataMap.put(HGCB004.FIELD_SPEC, dataMap.get(HGKC007A.FIELD_PRDT_SPEC));
             }
             return buildKey(dataMap.get(HGCB004.FIELD_COMPANY_CODE), dataMap.get(HGCB004.FIELD_DEP_CODE), dataMap.get(HGCB004.FIELD_INVENT_TYPE_DETAIL),
                     dataMap.get(HGCB004.FIELD_INVENT_CODE), dataMap.get(HGCB004.FIELD_WH_CODE), dataMap.get(HGCB004.FIELD_SPEC));

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

@@ -5,6 +5,7 @@ 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.List;
 import java.util.Map;
 import com.baosight.iplat4j.core.util.StringUtils;
 
@@ -22,7 +23,7 @@ public class HGKC007 extends DaoEPBase {
 
 	private static final long serialVersionUID = 1L;
 
-	public static final String FIELD_ID = "id";    		
+	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";    		/* 记录创建者*/
@@ -45,24 +46,10 @@ public class HGKC007 extends DaoEPBase {
 	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_SUBMIT_STATUS = "submitStatus";    		/* 提交状态*/
 	public static final String FIELD_SOURCE = "source";    		/* 数据来源*/
 
-	public static final String COL_ID = "ID";    		
+	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";    		/* 记录创建者*/
@@ -85,20 +72,6 @@ public class HGKC007 extends DaoEPBase {
 	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_SUBMIT_STATUS = "SUBMIT_STATUS";    		/* 提交状态*/
 	public static final String COL_SOURCE = "SOURCE";    		/* 数据来源*/
 
@@ -108,7 +81,10 @@ public class HGKC007 extends DaoEPBase {
 	public static final String UPDATE = "HGKC007.update";
 	public static final String DELETE = "HGKC007.delete";
 	public static final String CHECK = "HGKC007.check";
-	private Long id = new Long(0);	
+	public static final String MAX_ID = "HGKC007.maxId";
+
+
+	private Long id = new Long(0);
 	private String accountCode = " ";		/* 企业编码*/
 	private String depCode = " ";		/* 部门编码*/
 	private String createdBy = " ";		/* 记录创建者*/
@@ -131,23 +107,12 @@ public class HGKC007 extends DaoEPBase {
 	private String prodTaskNo = " ";		/* 生产任务号*/
 	private String projCode = " ";		/* 项目编码*/
 	private String projName = " ";		/* 项目名称*/
-	private Integer 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 Integer 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 Integer submitStatus;	/* 提交状态*/
 	private Integer source;	/* 数据来源*/
 
+	//生成其他入库单明细数据
+	private List<HGKC007A> detailList;
+
 	/**
 	 * initialize the metadata.
 	 */
@@ -247,80 +212,6 @@ public class HGKC007 extends DaoEPBase {
 		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_SUBMIT_STATUS);
 		eiColumn.setDescName("提交状态");
 		eiMetadata.addMeta(eiColumn);
@@ -350,7 +241,7 @@ public class HGKC007 extends DaoEPBase {
 	/**
 	 * set the id .
 	 *
-	 * @param id 
+	 * @param id
 	 */
 	public void setId(Long id) {
 		this.id = id;
@@ -708,230 +599,6 @@ public class HGKC007 extends DaoEPBase {
 		this.projName = projName;
 	}
 	/**
-	 * get the prdtType - 产品类型.
-	 * @return the prdtType
-	 */
-	public Integer getPrdtType() {
-		return this.prdtType;
-	}
-
-	/**
-	 * set the prdtType - 产品类型.
-	 *
-	 * @param prdtType - 产品类型
-	 */
-	public void setPrdtType(Integer 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 Integer getPartType() {
-		return this.partType;
-	}
-
-	/**
-	 * set the partType - 零件类型.
-	 *
-	 * @param partType - 零件类型
-	 */
-	public void setPartType(Integer 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 submitStatus - 提交状态.
 	 * @return the submitStatus
 	 */
@@ -963,6 +630,15 @@ public class HGKC007 extends DaoEPBase {
 	public void setSource(Integer source) {
 		this.source = source;
 	}
+
+	public List<HGKC007A> getDetailList() {
+		return detailList;
+	}
+
+	public void setDetailList(List<HGKC007A> detailList) {
+		this.detailList = detailList;
+	}
+
 	/**
 	 * get the value from Map.
 	 *
@@ -994,20 +670,6 @@ public class HGKC007 extends DaoEPBase {
 		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.toInteger(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.toInteger(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));
 		setSubmitStatus(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_SUBMIT_STATUS)), submitStatus));
 		setSource(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_SOURCE)), source));
 	}
@@ -1042,20 +704,6 @@ public class HGKC007 extends DaoEPBase {
 		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_SUBMIT_STATUS, StringUtils.toString(submitStatus, eiMetadata.getMeta(FIELD_SUBMIT_STATUS)));
 		map.put(FIELD_SOURCE, StringUtils.toString(source, eiMetadata.getMeta(FIELD_SOURCE)));
 

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

@@ -59,14 +59,6 @@ public class HGKC007A extends DaoEPBase {
 	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_PART_SPEC_ID = "partSpecId";    		/* 零件规格ID*/
 	public static final String FIELD_PRIMARY_ID = "primaryId";    		/* 主表id*/
 	public static final String FIELD_PRICE = "price";    		/* 单价*/
 	public static final String FIELD_AMOUNT = "amount";    		/* 金额*/
@@ -110,14 +102,6 @@ public class HGKC007A extends DaoEPBase {
 	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_PART_SPEC_ID = "PART_SPEC_ID";    		/* 零件规格ID*/
 	public static final String COL_PRIMARY_ID = "PRIMARY_ID";    		/* 主表id*/
 	public static final String COL_PRICE = "PRICE";    		/* 单价*/
 	public static final String COL_AMOUNT = "AMOUNT";    		/* 金额*/
@@ -166,14 +150,6 @@ public class HGKC007A extends DaoEPBase {
 	private BigDecimal prdtWidth = new BigDecimal(0.000);		/* 产品-宽*/
 	private BigDecimal prdtThick = new BigDecimal(0.000);		/* 产品-厚*/
 	private String prdtSpec = " ";		/* 产品规格*/
-	private Integer 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 partSpecId = new Long(0);	/* 规格id*/
 	private Long primaryId = new Long(0);	/* 主表id*/
 	private BigDecimal price = new BigDecimal("0");		/* 单价*/
 	private BigDecimal amount = new BigDecimal("0");		/* 金额*/
@@ -353,47 +329,6 @@ public class HGKC007A extends DaoEPBase {
 		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_PART_SPEC_ID);
-		eiColumn.setDescName("零件规格ID");
-		eiMetadata.addMeta(eiColumn);
-
 		eiColumn = new EiColumn(FIELD_PRIMARY_ID);
 		eiColumn.setDescName("主表id");
 		eiMetadata.addMeta(eiColumn);
@@ -1021,118 +956,6 @@ public class HGKC007A extends DaoEPBase {
 		this.prdtSpec = prdtSpec;
 	}
 	/**
-	 * get the partType - 零件类型.
-	 * @return the partType
-	 */
-	public Integer getPartType() {
-		return this.partType;
-	}
-
-	/**
-	 * set the partType - 零件类型.
-	 *
-	 * @param partType - 零件类型
-	 */
-	public void setPartType(Integer 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
 	 */
@@ -1197,14 +1020,6 @@ public class HGKC007A extends DaoEPBase {
 		this.source = source;
 	}
 
-	public Long getPartSpecId() {
-		return partSpecId;
-	}
-
-	public void setPartSpecId(Long partSpecId) {
-		this.partSpecId = partSpecId;
-	}
-
 	public Integer getInventTypeDetail() {
 		return inventTypeDetail;
 	}
@@ -1258,15 +1073,7 @@ public class HGKC007A extends DaoEPBase {
 		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.toInteger(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));
-		setPartSpecId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_PART_SPEC_ID)), partSpecId));
 		setPrice(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_PRICE)), price));
 		setAmount(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_AMOUNT)), amount));
 		setSource(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_SOURCE)), source));
@@ -1317,14 +1124,6 @@ public class HGKC007A extends DaoEPBase {
 		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_PART_SPEC_ID, StringUtils.toString(partSpecId, eiMetadata.getMeta(FIELD_PART_SPEC_ID)));
 		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)));

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

@@ -283,6 +283,8 @@ public class ServiceHGKC005 extends ServiceEPBase {
                 this.checkSubmitData(hgkc005);
 
                 DaoUtils.update(HGKC005.UPDATE_SUBMIT_STATUS, hgkc005);
+
+                setHgkc007(hgkc005);
 //                //修改计划生产任务完工数量
 //                HGSCTools.complete(hgkc003.getQualityId(),hgkc003.getInvQty().intValue(),hgkc003.getRectificationId(),HGConstant.StorageType.RK);
             }
@@ -298,4 +300,14 @@ public class ServiceHGKC005 extends ServiceEPBase {
         }
         return inInfo;
     }
+
+    /**
+     * 生成其他入库单或出库单
+     * @param hgkc005
+     */
+    private void setHgkc007(HGKC005 hgkc005) {
+        HGKC007 hgkc007 = new HGKC007();
+
+        HGKCTools.HgKc007.generateHgkc007(hgkc007);
+    }
 }

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

@@ -184,10 +184,10 @@ public class ServiceHGKC013 extends ServiceEPBase {
                 hgkc006A.setInvQty(hgkc013A.getQuantity());
                 hgkc006A.setInvUnitWeight(hgkc013A.getUnitWeight());
                 hgkc006A.setInvWeight(hgkc013A.getWeight());
-                hgkc006A.setPartLength(hgkc013A.getLength());
-                hgkc006A.setPartWidth(hgkc013A.getWidth());
-                hgkc006A.setPartThick(hgkc013A.getThick());
-                hgkc006A.setPartSpec(hgkc013A.getSpec());
+                hgkc006A.setPrdtLength(hgkc013A.getLength());
+                hgkc006A.setPrdtWidth(hgkc013A.getWidth());
+                hgkc006A.setPrdtThick(hgkc013A.getThick());
+                hgkc006A.setPrdtSpec(hgkc013A.getSpec());
                 hgkc006A.setSource(InventorySource.ALLOCATION.getCode());
                 hgkc006A.setInventTypeDetail(hgkc013A.getInventTypeDetail());
                 DaoUtils.insert(HGKC006A.INSERT, hgkc006A);
@@ -226,10 +226,10 @@ public class ServiceHGKC013 extends ServiceEPBase {
                 hgkc007A.setInvQty(hgkc013A.getQuantity());
                 hgkc007A.setInvUnitWeight(hgkc013A.getUnitWeight());
                 hgkc007A.setInvWeight(hgkc013A.getWeight());
-                hgkc007A.setPartLength(hgkc013A.getLength());
-                hgkc007A.setPartWidth(hgkc013A.getWidth());
-                hgkc007A.setPartThick(hgkc013A.getThick());
-                hgkc007A.setPartSpec(hgkc013A.getSpec());
+                hgkc007A.setPrdtLength(hgkc013A.getLength());
+                hgkc007A.setPrdtWidth(hgkc013A.getWidth());
+                hgkc007A.setPrdtThick(hgkc013A.getThick());
+                hgkc007A.setPrdtSpec(hgkc013A.getSpec());
                 hgkc007A.setSource(InventorySource.ALLOCATION.getCode());
                 hgkc007A.setInventTypeDetail(hgkc013A.getInventTypeDetail());
                 DaoUtils.insert(HGKC007A.INSERT, hgkc007A);

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

@@ -72,48 +72,6 @@
 		<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="submitStatus">
 			SUBMIT_STATUS = #submitStatus#
 		</isNotEmpty>
@@ -148,20 +106,6 @@
 				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",  <!-- 零件规格 -->
 				SUBMIT_STATUS	as "submitStatus",  <!-- 提交状态 -->
 				SOURCE	as "source" <!-- 数据来源 -->
 		FROM ${hggpSchema}.HGKC007 WHERE 1=1 and DELETE_FLAG = 0
@@ -210,24 +154,10 @@
 										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,  <!-- 零件规格 -->
 										SUBMIT_STATUS,  <!-- 提交状态 -->
 										SOURCE  <!-- 数据来源 -->
 										)
-	    VALUES (#id#, #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #deleteFlag#, #companyCode#, #companyName#, #otherOutDate#, #otherOutNo#, #whCode#, #whName#, #otherOutNoOld#, #remark#, #factoryCode#, #prodOrderNo#, #prodTaskNo#, #projCode#, #projName#, #prdtType#, #prdtCode#, #prdtName#, #prdtLength#, #prdtWidth#, #prdtThick#, #prdtSpec#, #partType#, #partCode#, #partName#, #partLength#, #partWidth#, #partThick#, #partSpec#, #submitStatus#, #source#)
+	    VALUES (#id#, #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #deleteFlag#, #companyCode#, #companyName#, #otherOutDate#, #otherOutNo#, #whCode#, #whName#, #otherOutNoOld#, #remark#, #factoryCode#, #prodOrderNo#, #prodTaskNo#, #projCode#, #projName#, #submitStatus#, #source#)
 	</insert>
 
 	<delete id="delete">
@@ -259,20 +189,6 @@
 					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#,   <!-- 零件规格 -->
 					SUBMIT_STATUS	= #submitStatus#,   <!-- 提交状态 -->
 					SOURCE	= #source#  <!-- 数据来源 -->
 			WHERE
@@ -305,20 +221,6 @@
 		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",  <!-- 零件规格 -->
 		SUBMIT_STATUS	as "submitStatus",  <!-- 提交状态 -->
 		SOURCE	as "source" <!-- 数据来源 -->
 		FROM ${hggpSchema}.HGKC007 WHERE 1=1 and DELETE_FLAG = 0
@@ -396,20 +298,6 @@
 		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",  <!-- 零件规格 -->
 		SUBMIT_STATUS	as "submitStatus",  <!-- 提交状态 -->
 		SOURCE	as "source" <!-- 数据来源 -->
 		FROM ${hggpSchema}.HGKC007 WHERE 1=1 and DELETE_FLAG = 0
@@ -430,4 +318,8 @@
 
 	</select>
 
+	<select id="maxId" resultClass="long">
+		SELECT MAX(ID) AS "id" FROM ${hggpSchema}.HGKC007
+	</select>
+
 </sqlMap>

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

@@ -114,30 +114,6 @@
 		<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="partSpecId">
-			PART_SPEC_ID = #partSpecId#
-		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="primaryId">
 			PRIMARY_ID = #primaryId#
 		</isNotEmpty>
@@ -198,14 +174,6 @@
 				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",  <!-- 零件规格 -->
-				PART_SPEC_ID	as "partSpecId",  <!-- 零件规格id -->
 				PRIMARY_ID	as "primaryId",  <!-- 主表id -->
 				PRICE	as "price",  <!-- 单价 -->
 				AMOUNT	as "amount",  <!-- 金额 -->
@@ -267,14 +235,6 @@
 		PRDT_WIDTH,  <!-- 产品-宽 -->
 		PRDT_THICK,  <!-- 产品-厚 -->
 		PRDT_SPEC,  <!-- 产品规格 -->
-		PART_TYPE,  <!-- 零件类型 -->
-		PART_CODE,  <!-- 零件编码 -->
-		PART_NAME,  <!-- 零件名称 -->
-		PART_LENGTH,  <!-- 零件-长 -->
-		PART_WIDTH,  <!-- 零件-宽 -->
-		PART_THICK,  <!-- 零件-厚 -->
-		PART_SPEC,  <!-- 零件规格 -->
-		PART_SPEC_ID,  <!-- 零件规格id -->
 		PRIMARY_ID,  <!-- 主表id -->
 		PRICE,  <!-- 单价 -->
 		AMOUNT,  <!-- 金额 -->
@@ -285,8 +245,7 @@
 		#updatedTime#, #deleteFlag#, #companyCode#, #companyName#, #otherOutDate#, #otherOutNo#, #whCode#, #whName#,
 		#inventRecordId#, #inventType#, #inventCode#, #inventName#, #invQty#, #invUnitWeight#, #invWeight#,
 		#otherOutNoOld#, #remark#, #factoryCode#, #prodOrderNo#, #prodTaskNo#, #projCode#, #projName#, #prdtType#,
-		#prdtCode#, #prdtName#, #prdtLength#, #prdtWidth#, #prdtThick#, #prdtSpec#, #partType#, #partCode#, #partName#,
-		#partLength#, #partWidth#, #partThick#, #partSpec#, #partSpecId#,#primaryId#, #price#, #amount#,
+		#prdtCode#, #prdtName#, #prdtLength#, #prdtWidth#, #prdtThick#, #prdtSpec#,#primaryId#, #price#, #amount#,
 		#source#,#inventTypeDetail#)
 	</insert>
 
@@ -333,14 +292,6 @@
 		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#,   <!-- 零件规格 -->
-		PART_SPEC_ID = #partSpecId#,   <!-- 零件规格id -->
 		PRIMARY_ID = #primaryId#,   <!-- 主表id -->
 		PRICE = #price#,   <!-- 单价 -->
 		AMOUNT = #amount#,   <!-- 金额 -->
@@ -399,14 +350,6 @@
 			A.PRDT_WIDTH	as "prdtWidth",  <!-- 产品-宽 -->
 			A.PRDT_THICK	as "prdtThick",  <!-- 产品-厚 -->
 			A.PRDT_SPEC	as "prdtSpec",  <!-- 产品规格 -->
-			A.PART_TYPE	as "partType",  <!-- 零件类型 -->
-			A.PART_CODE	as "partCode",  <!-- 零件编码 -->
-			A.PART_NAME	as "partName",  <!-- 零件名称 -->
-			A.PART_LENGTH	as "partLength",  <!-- 零件-长 -->
-			A.PART_WIDTH	as "partWidth",  <!-- 零件-宽 -->
-			A.PART_THICK	as "partThick",  <!-- 零件-厚 -->
-			A.PART_SPEC	as "partSpec",  <!-- 零件规格 -->
-			A.PART_SPEC_ID	as "partSpecId",  <!-- 零件规格id -->
 			A.PRIMARY_ID	as "primaryId",  <!-- 主表id -->
 			CASE WHEN IFNULL(SUM(A.INV_QTY), 0) = 0 THEN 0 ELSE SUM(A.AMOUNT) / IFNULL(SUM(A.INV_QTY), 0) END	as "price",  <!-- 单价 -->
 			SUM(A.AMOUNT)	as "amount"  <!-- 金额 -->
@@ -435,8 +378,7 @@
 			A.INVENT_TYPE_DETAIL = #inventTypeDetail#
 		</isNotEmpty>
 		GROUP BY A.ACCOUNT_CODE, A.DEP_CODE, A.COMPANY_CODE, A.COMPANY_NAME, B.OTHER_OUT_DATE, B.OTHER_OUT_NO, A.WH_CODE, A.WH_NAME, A.INVENT_RECORD_ID, A.INVENT_TYPE, A.INVENT_CODE, A.INVENT_NAME, A.FACTORY_CODE,
-		A.PROD_ORDER_NO, A.PROD_TASK_NO, A.PROJ_CODE, A.PROJ_NAME, A.PRDT_TYPE, A.PRDT_CODE, A.PRDT_NAME, A.PRDT_LENGTH, A.PRDT_WIDTH, A.PRDT_THICK, A.PRDT_SPEC, A.PART_TYPE, A.PART_CODE, A.PART_NAME,
-		A.PART_LENGTH, A.PART_WIDTH, A.PART_THICK, A.PART_SPEC, A.PART_SPEC_ID, A.PRIMARY_ID
+		A.PROD_ORDER_NO, A.PROD_TASK_NO, A.PROJ_CODE, A.PROJ_NAME, A.PRDT_TYPE, A.PRDT_CODE, A.PRDT_NAME, A.PRDT_LENGTH, A.PRDT_WIDTH, A.PRDT_THICK, A.PRDT_SPEC, A.PRIMARY_ID
 		<dynamic prepend="ORDER BY">
 			<isNotEmpty property="orderBy">
 				$orderBy$

src/main/java/com/baosight/hggp/hg/kc/tools/HGKCTools.java

@@ -3,6 +3,7 @@ package com.baosight.hggp.hg.kc.tools;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import com.baosight.hggp.common.CheckTypeEnum;
+import com.baosight.hggp.common.InventorySource;
 import com.baosight.hggp.core.constant.CommonConstant;
 import com.baosight.hggp.core.dao.DaoBase;
 import com.baosight.hggp.core.dao.DaoUtils;
@@ -690,7 +691,23 @@ public class HGKCTools {
 			return DaoBase.getInstance().query("HGKC007.queryCheckList", paramMap);
 		}
 
+		public static void generateHgkc007(HGKC007 hgkc007) {
+			checkData(hgkc007);
+			DaoUtils.insert(HGKC007.INSERT, hgkc007);
+			DaoUtils.insertBatch(HGKC007A.INSERT, hgkc007.getDetailList());
+		}
 
+		private static void checkData(HGKC007 hgkc007) {
+			AssertUtils.isEmpty(hgkc007.getDetailList(), "其它出库单明细不能为空");
+			AssertUtils.isTrue(Objects.isNull(hgkc007.getId())||hgkc007.getId()<=0, "其它出库单ID不能为空！");
+			AssertUtils.isTrue(Objects.isNull(hgkc007.getSource())||hgkc007.getSource()<=0, "其它出库单数据来源不能为空！");
+			AssertUtils.isTrue(StringUtils.isBlank(hgkc007.getWhCode()), "其它出库单仓库不能为空！");
+			hgkc007.getDetailList().forEach(o->{
+				AssertUtils.isTrue(StringUtils.isBlank(o.getWhCode()), "其它出库单明细仓库不能为空！");
+				AssertUtils.isTrue(StringUtils.isBlank(o.getInventCode()), "其它出库单明细存货编码不能为空！");
+				AssertUtils.isTrue(StringUtils.isBlank(o.getInventName()), "其它出库单明细存货名称不能为空！");
+			});
+		}
 
 	}
 

src/main/java/com/baosight/hggp/hg/zl/service/ServiceHGZL001.java

@@ -60,7 +60,7 @@ public class ServiceHGZL001 extends ServiceBase {
 	 * @return
 	 */
 	@Override
-	@OperationLogAnnotation(operModul = "质量巡检单", operType = "查询", operDesc = "查询")
+	@OperationLogAnnotation(operModul = "入库质检单", operType = "查询", operDesc = "查询")
 	public EiInfo query(EiInfo inInfo) {
 		try {
 			Map queryMap = EiInfoUtils.getFirstRow(inInfo);
@@ -78,7 +78,7 @@ public class ServiceHGZL001 extends ServiceBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "质量巡检单",operType = "新增",operDesc = "新增")
+	@OperationLogAnnotation(operModul = "入库质检单",operType = "新增",operDesc = "新增")
 	public EiInfo insert(EiInfo inInfo) {
 		try {
 			List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
@@ -110,7 +110,7 @@ public class ServiceHGZL001 extends ServiceBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "质量巡检单",operType = "修改",operDesc = "修改")
+	@OperationLogAnnotation(operModul = "入库质检单",operType = "修改",operDesc = "修改")
 	public EiInfo update(EiInfo inInfo) {
 		try {
 			List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
@@ -159,7 +159,7 @@ public class ServiceHGZL001 extends ServiceBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "质量巡检单",operType = "删除",operDesc = "删除")
+	@OperationLogAnnotation(operModul = "入库质检单",operType = "删除",operDesc = "删除")
 	public EiInfo delete(EiInfo inInfo) {
 		try {
 			List<HGZL001> fZl001s = MapUtils.toDaoEPBase(inInfo, HGZL001.class);
@@ -187,7 +187,7 @@ public class ServiceHGZL001 extends ServiceBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "质量巡检单",operType = "修改",operDesc = "已处理")
+	@OperationLogAnnotation(operModul = "入库质检单",operType = "修改",operDesc = "已处理")
 	public EiInfo doProcess(EiInfo inInfo) {
 		try {
 			List<HGZL001> fZl001s = MapUtils.toDaoEPBase(inInfo, HGZL001.class);

src/main/webapp/HG/KC/HGKC001.js

@@ -65,6 +65,8 @@ $(function () {
 $(window).load(function () {
 	// 查询
 	query();
+	//存货编号
+	initInventCode();
 });
 
 /**
@@ -75,6 +77,32 @@ let query = function () {
 }
 
 /**
+ * 存货编号
+ */
+let initInventCode = function () {
+	//物料信息下拉
+	var inInfo=new EiInfo();
+	EiCommunicator.send("HGPZ005", "queryComboBox", inInfo, {
+		onSuccess: function (ei) {
+			let dataSource;
+			var input=$("#inqu_status-0-inventCode");
+			dataSource=ei.getBlock("invent_record_block_id").getMappedRows();
+			input.kendoDropDownList({
+				valuePrimitive: true,
+				dataTextField: "valueField",
+				dataValueField: "valueField",
+				optionLabel:"请选择",
+				dataSource: dataSource,
+				template: "[#:valueField#]#:textField#|#:param2Field#",
+				filter: "contains"
+			});
+		}, onFail: function (ei) {
+		}
+	}, {async: false});
+}
+
+
+/**
  * 仓库变更
  */
 let supCodeChange = function (e) {

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

@@ -26,14 +26,14 @@
 			             filter="contains" optionLabel="全部" defultValue="">
 				<EF:EFOptions blockId="sup_record_block_id" textField="textField" valueField="valueField"/>
 			</EF:EFSelect>
-			<EF:EFSelect cname="存货名称" blockId="inqu_status" ename="inventCode" row="0" colWidth="3"
-			             filter="contains" optionLabel="全部" defultValue="">
-				<EF:EFOptions blockId="invent_record_block_id" textField="textField" valueField="valueField"/>
-			</EF:EFSelect>
-			<EF:EFSelect cname="规格" ename="inqu_status-0-spec" colWidth="3" filter="contains" optionLabel="全部"
-			             defultValue="">
-				<EF:EFOptions blockId="spec_name_block_id" textField="textField" valueField="valueField"/>
+			<EF:EFSelect cname="存货编号" blockId="inqu_status" ename="inventCode" row="0" colWidth="3"
+						 filter="contains" optionLabel="全部" defultValue="" template="[#=valueField#]#=textField#">
+				<EF:EFOptions blockId="invent_record_block_id" textField="textField"  valueField="valueField"/>
 			</EF:EFSelect>
+<%--			<EF:EFSelect cname="规格" ename="inqu_status-0-spec" colWidth="3" filter="contains" optionLabel="全部"--%>
+<%--			             defultValue="">--%>
+<%--				<EF:EFOptions blockId="spec_name_block_id" textField="textField" valueField="valueField"/>--%>
+<%--			</EF:EFSelect>--%>
 		</div>
 		<div class="row">
 			<EF:EFDateSpan startCname="创建时间(从)" endCname="至" blockId="inqu_status"
@@ -47,9 +47,9 @@
 		<EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="row">
 			<EF:EFColumn ename="id" cname="内码" hidden="true"/>
 			<EF:EFColumn ename="operator" cname="操作" locked="true"  width="80"  enable="false" align="center" readonly="false"/>
-			<EF:EFColumn ename="companyCode" cname="公司编码" enable="false" width="100" align="center" hidden="true"/>
+			<EF:EFColumn ename="companyCode" cname="公司编码" enable="false" width="100" align="center" />
 			<EF:EFColumn ename="companyName" cname="公司名称" enable="false" width="130" align="center"/>
-			<EF:EFColumn ename="depositDate" cname="入库日期" enable="false" width="100" align="center" editType="date"
+			<EF:EFColumn ename="depositDate" cname="入库日期" enable="true" width="100" align="center" editType="date"
 			             dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']"/>
 			<EF:EFColumn ename="depositNo" cname="入库单号" enable="false" width="120" align="center"/>
 			<EF:EFColumn ename="receiveNo" cname="收货单号" enable="false" width="120" align="center"/>
@@ -58,7 +58,7 @@
 				<EF:EFOptions blockId="wh_record_block_id" valueField="valueField" textField="textField"/>
 			</EF:EFComboColumn>
 			<EF:EFColumn ename="whName" cname="仓库名称" enable="false" width="100" align="center" hidden="true"/>
-			<EF:EFColumn ename="inventCode" cname="存货编码" enable="false" width="100" align="center" hidden="true"/>
+			<EF:EFColumn ename="inventCode" cname="存货编码" enable="false" width="100" align="center"/>
 			<EF:EFColumn ename="inventName" cname="存货名称" enable="false" width="100" align="center"/>
 			<EF:EFColumn ename="specId" cname="规格ID" enable="false" width="100" align="center" hidden="true"/>
 			<EF:EFColumn ename="spec" cname="规格" enable="false" width="120" align="center"/>
@@ -74,7 +74,7 @@
 			<EF:EFColumn ename="createdName" cname="创建人" enable="false" width="100" align="center"/>
 			<EF:EFColumn ename="createdTime" cname="创建时间" enable="false" width="140" align="center"
 			             editType="datetime" parseFormats="['yyyyMMddHHmmss']"/>
-			<EF:EFComboColumn cname="提交状态" ename="submitStatus" width="90" align="center" required="false">
+			<EF:EFComboColumn cname="提交状态" ename="submitStatus" width="90" align="center" required="false" enable="false">
 				<EF:EFCodeOption codeName="hggp.sc.productStatus" />
 			</EF:EFComboColumn>
 		</EF:EFGrid>

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

@@ -68,7 +68,7 @@
 						 data-errorprompt="请输入数字，该值最大可设置17位整数和3位小数！"
 						 required="false"  enable="false"/>
 			<EF:EFColumn ename="amount" cname="金额"  width="120" align="right" enable="false" format="{0:N3}"/>
-			<EF:EFComboColumn cname="提交状态" ename="submitStatus" width="90" align="center" required="false">
+			<EF:EFComboColumn cname="提交状态" ename="submitStatus" width="90" align="center" required="false" enable="false">
 				<EF:EFCodeOption codeName="hggp.sc.productStatus" />
 			</EF:EFComboColumn>
 		</EF:EFGrid>

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

@@ -33,17 +33,21 @@
         <EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="row">
             <EF:EFColumn ename="id" cname="内码" hidden="true"/>
             <EF:EFColumn ename="operator" cname="操作" locked="true" enable="false" width="210" align="center"/>
-            <EF:EFComboColumn ename="companyCode" enable="true"  cname="公司名称" width="110" align="center"
-                              filter="contains" readonly="true" required="true">
-                <EF:EFOptions blockId="roleCompany" textField="companyName" valueField="companyCode"/>
-            </EF:EFComboColumn>
+<%--            <EF:EFComboColumn ename="companyCode" enable="true"  cname="公司名称" width="110" align="center"--%>
+<%--                              filter="contains" readonly="true">--%>
+<%--                <EF:EFOptions blockId="roleCompany" textField="companyName" valueField="companyCode"/>--%>
+<%--            </EF:EFComboColumn>--%>
+            <EF:EFColumn ename="companyCode" cname="公司编码" width="120" align="center" enable="false"/>
+            <EF:EFColumn ename="companyName" cname="公司名称" width="120" align="center" enable="false"/>
             <EF:EFColumn ename="receiptDate" cname="单据日期" enable="true" width="90" align="center"
                          editType="date" dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
             <EF:EFColumn ename="saleOutCode" cname="销售出库单号" enable="false" width="140" align="center"/>
-            <EF:EFComboColumn ename="whCode" cname="仓库名称" enable="true" width="120" align="center" required="true"
-                              blockName="wh_record_block_id" textField="textField" valueField="valueField"
-                              columnTemplate="#=textField#" itemTemplate="#=textField#">
-            </EF:EFComboColumn>
+            <EF:EFColumn ename="whCode" cname="仓库编码" width="120" align="center" enable="false"/>
+            <EF:EFColumn ename="whName" cname="仓库名称" width="120" align="center" enable="false"/>
+<%--            <EF:EFComboColumn ename="whCode" cname="仓库名称" enable="true" width="120" align="center" required="true"--%>
+<%--                              blockName="wh_record_block_id" textField="textField" valueField="valueField"--%>
+<%--                              columnTemplate="#=textField#" itemTemplate="#=textField#">--%>
+<%--            </EF:EFComboColumn>--%>
             <EF:EFComboColumn ename="status" cname="状态" width="80" align="center" enable="false" defaultValue="0" required="true">
                 <EF:EFCodeOption codeName="hggp.hgkc.status"/>
             </EF:EFComboColumn>

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

@@ -90,7 +90,7 @@
                          align="right" sumType="all" readonly="true"/>
             <EF:EFColumn ename="remark" cname="备注" width="150" />
             <EF:EFColumn ename="oldCheckNo" cname="原盘点单号" enable="false" hidden="true" width="140" align="center"/>
-            <EF:EFComboColumn cname="提交状态" ename="submitStatus" width="90" align="center" required="false">
+            <EF:EFComboColumn cname="提交状态" ename="submitStatus" width="90" align="center" required="false" enable="false">
                 <EF:EFCodeOption codeName="hggp.sc.productStatus" />
             </EF:EFComboColumn>
         </EF:EFGrid>

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

@@ -38,14 +38,8 @@
 		<EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="row">
 			<EF:EFColumn ename="id" cname="内码" hidden="true"/>
 			<EF:EFColumn ename="operator" cname="操作" locked="true" enable="false" width="100" align="center"/>
-			<EF:EFComboColumn ename="companyCode" cname="公司名称"
-							  columnTemplate="#=textField#" itemTemplate="#=textField#"
-							  textField="textField" valueField="valueField"
-							  maxLength="16" readonly="false" width="200" required="true"
-							  align="center" filter="contains" sort="true">
-				<EF:EFOptions blockId="roleCompany" textField="companyName" valueField="companyCode"/>
-			</EF:EFComboColumn>
-			<EF:EFColumn ename="companyName" cname="公司名称" hidden="true"/>
+			<EF:EFColumn ename="companyCode" cname="公司编码" width="120" align="center" enable="false"/>
+			<EF:EFColumn ename="companyName" cname="公司名称" width="120" align="center" enable="false"/>
 			<EF:EFColumn ename="otherEnterDate" cname="单据日期"  width="100" align="center" editType="date"
 			             dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
 			<EF:EFColumn ename="otherEnterNo" cname="其他入库单号" enable="false" width="140" align="center"/>

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

@@ -39,14 +39,8 @@
 		<EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="row">
 			<EF:EFColumn ename="id" cname="内码" hidden="true"/>
 			<EF:EFColumn ename="operator" cname="操作" locked="true" enable="false" width="100" align="center"/>
-			<EF:EFComboColumn ename="companyCode" cname="公司名称"
-							  columnTemplate="#=textField#" itemTemplate="#=textField#"
-							  textField="textField" valueField="valueField"
-							  maxLength="16" readonly="false" width="200" required="true"
-							  align="center" filter="contains" sort="true">
-				<EF:EFOptions blockId="roleCompany" textField="companyName" valueField="companyCode"/>
-			</EF:EFComboColumn>
-			<EF:EFColumn ename="companyName" cname="公司名称" hidden="true"/>
+			<EF:EFColumn ename="companyCode" cname="公司编码" width="120" align="center" enable="false"/>
+			<EF:EFColumn ename="companyName" cname="公司名称" width="120" align="center" enable="false"/>
 			<EF:EFColumn ename="otherOutDate" cname="单据日期"  width="100" align="center" editType="date"
 						 dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
 			<EF:EFColumn ename="otherOutNo" cname="其他出库单号" enable="false" width="140" align="center"/>

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

@@ -39,7 +39,7 @@
             <EF:EFColumn ename="projName" cname="项目名称" width="120" align="center" enable="false" required="true"/>
             <EF:EFColumn ename="applyCode" cname="生产领料单号" enable="false" width="120" align="center"/>
             <EF:EFColumn ename="receiptDate" cname="单据日期" width="120" align="center" editType="date"
-                         dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" readonly="true" required="true"/>
+                         dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
             <EF:EFColumn ename="whCode" cname="仓库编码" enable="true" width="120" align="center" required="true"/>
             <EF:EFColumn ename="whName" cname="仓库名称" width="120" align="center" enable="false" required="true"/>
             <EF:EFComboColumn cname="状态" ename="status" width="90" align="center" required="false"  enable="false">