2024-06-27 添加存货类型大类

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

@@ -70,7 +70,7 @@ public enum DdynamicEnum {
      * 用途：存货类型下拉框 (不默认状态)
      * 编写：
      */
-    INVENT_TYPE_BOX_BLOCK_ID("invent_type_box_block_id","inventType","inventTypeName","status","parInventType","HGPZ004.queryInventTypeBox"),
+    INVENT_TYPE_BOX_BLOCK_ID("invent_type_box_block_id","inventType","inventTypeName","status","parInventType","inventTypeDetail","HGPZ004.queryInventTypeBox"),
 
     /**
      * 模块：存货类型
@@ -129,7 +129,7 @@ public enum DdynamicEnum {
      * 编写：
      */
     INVENT_NAME_BOX_BLOCK_ID("invent_name_box_block_id", "inventCode", "inventText","inventName", "spec", "inventType", "length", "width", "thick",
-            "coefficient","id", "HGPZ005.queryInventNameBox"),
+            "coefficient","id","inventTypeDetail", "HGPZ005.queryInventNameBox"),
 
 	/**
 	 * 模块：规格

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

@@ -52,6 +52,7 @@ public class HGKC010 extends DaoEPBase {
 	public static final String FIELD_INV_WEIGHT = "invWeight";    		/* 库存重量*/
 	public static final String FIELD_FACTORY_CODE = "factoryCode";    		/* 厂区编码*/
 	public static final String FIELD_FACTORY_NAME = "factoryName";    		/* 厂区名称*/
+	public static final String FIELD_INVENT_TYPE_DETAIL = "inventTypeDetail"; /*存货类型明细*/
 
 	public static final String COL_ID = "ID";
 	public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE";    		/* 企业编码*/
@@ -119,6 +120,7 @@ public class HGKC010 extends DaoEPBase {
 	private BigDecimal invWeight = new BigDecimal(0.000);		/* 库存重量*/
 	private String factoryCode = " ";		/* 厂区编码*/
 	private String factoryName = " ";		/* 厂区名称*/
+	private String inventTypeDetail;	/*存货类型明细 1：构建 2：零件*/
 
 	/**
 	 * initialize the metadata.
@@ -261,6 +263,9 @@ public class HGKC010 extends DaoEPBase {
 		eiColumn.setDescName("厂区名称");
 		eiMetadata.addMeta(eiColumn);
 
+		eiColumn = new EiColumn(FIELD_INVENT_TYPE_DETAIL);
+		eiColumn.setDescName("存货类型明细");
+		eiMetadata.addMeta(eiColumn);
 
 	}
 
@@ -735,6 +740,15 @@ public class HGKC010 extends DaoEPBase {
 	public void setFactoryName(String factoryName) {
 		this.factoryName = factoryName;
 	}
+
+	public String getInventTypeDetail() {
+		return inventTypeDetail;
+	}
+
+	public void setInventTypeDetail(String inventTypeDetail) {
+		this.inventTypeDetail = inventTypeDetail;
+	}
+
 	/**
 	 * get the value from Map.
 	 *
@@ -772,6 +786,7 @@ public class HGKC010 extends DaoEPBase {
 		setInvWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_INV_WEIGHT)), invWeight));
 		setFactoryCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_FACTORY_CODE)), factoryCode));
 		setFactoryName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_FACTORY_NAME)), factoryName));
+		setInventTypeDetail(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_INVENT_TYPE_DETAIL)), inventTypeDetail));
 	}
 
 	/**
@@ -810,6 +825,7 @@ public class HGKC010 extends DaoEPBase {
 		map.put(FIELD_INV_WEIGHT, StringUtils.toString(invWeight, eiMetadata.getMeta(FIELD_INV_WEIGHT)));
 		map.put(FIELD_FACTORY_CODE, StringUtils.toString(factoryCode, eiMetadata.getMeta(FIELD_FACTORY_CODE)));
 		map.put(FIELD_FACTORY_NAME, StringUtils.toString(factoryName, eiMetadata.getMeta(FIELD_FACTORY_NAME)));
+		map.put(FIELD_INVENT_TYPE_DETAIL,StringUtils.toString(inventTypeDetail, eiMetadata.getMeta(FIELD_INVENT_TYPE_DETAIL)));
 
 		return map;
 	}

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

@@ -55,11 +55,7 @@ public class ServiceHGKC004 extends ServiceEPBase {
         if (CollectionUtils.isNotEmpty(Collections.singleton(receiptDate))) {
             inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGKC004.FIELD_RECEIPT_DATE, DateUtils.formatShort(receiptDate));
         }
-        //角色公司
-        List<String> roleCompanyCode = HGSBTools.getRoleCompanyCode();
-        if(!roleCompanyCode.isEmpty()){
-            inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB001.FIELD_COMPANY_CODES, roleCompanyCode);
-        }
+
         return super.query(inInfo, HGKC004.QUERY, new HGKC004());
     }
 

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

 package com.baosight.hggp.hg.kc.service;
 
 import com.baosight.hggp.common.DdynamicEnum;
+import com.baosight.hggp.common.InventTypeDetailEnum;
 import com.baosight.hggp.common.InventTypeEnum;
 import com.baosight.hggp.hg.kc.domain.HGKC012;
+import com.baosight.hggp.hg.pz.domain.HGPZ004;
 import com.baosight.hggp.util.CommonMethod;
 import com.baosight.iplat4j.core.ei.EiConstant;
 import com.baosight.iplat4j.core.ei.EiInfo;
@@ -26,7 +28,7 @@ public class ServiceHGKC012 extends ServiceEPBase {
     public EiInfo initLoad(EiInfo inInfo) {
         inInfo = super.query(inInfo, HGKC012.QUERY);
         Map queryMap = new HashMap();
-        //queryMap.put("inventTypes", DEFAULT_INVENT_CODE);
+        queryMap.put(HGPZ004.FIELD_INVENT_TYPE_DETAILS, InventTypeDetailEnum.getProdTypeFour());
         CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.USER_BLOCK_ID), null,true);
         CommonMethod.initBlock(inInfo, Arrays.asList(
                 DdynamicEnum.WH_RECORD_BLOCK_ID,

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

@@ -57,11 +57,7 @@ public class ServiceHGKC013 extends ServiceEPBase {
         if (StringUtils.isNotEmpty(receiptDate)){
             inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGKC013.FIELD_RECEIPT_DATE, DateUtils.formatShort(receiptDate));
         }
-        //角色公司
-        List<String> roleCompanyCode = HGSBTools.getRoleCompanyCode();
-        if(!roleCompanyCode.isEmpty()){
-            inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB001.FIELD_COMPANY_CODES, roleCompanyCode);
-        }
+
         return super.query(inInfo,HGKC013.QUERY,new HGKC013());
     }
 

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

@@ -31,7 +31,8 @@
         INV_UNIT_WEIGHT as "invUnitWeight",  <!-- 库存单重 -->
         INV_WEIGHT as "invWeight",  <!-- 库存重量 -->
         FACTORY_CODE as "factoryCode",  <!-- 厂区编码 -->
-        FACTORY_NAME as "factoryName" <!-- 厂区名称 -->
+        FACTORY_NAME as "factoryName", <!-- 厂区名称 -->
+        INVENT_TYPE_DETAIL as "inventTypeDetail"
     </sql>
 
     <sql id="condition">
@@ -92,6 +93,9 @@
         <isNotEmpty prepend=" AND " property="companyCodes">
             COMPANY_CODE IN <iterate close=")" open="(" conjunction="," property="companyCodes">#companyCodes[]#</iterate>
         </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="inventTypeDetails">
+            INVENT_TYPE_DETAIL IN <iterate close=")" open="(" conjunction="," property="inventTypeDetails">#inventTypeDetails[]#</iterate>
+        </isNotEmpty>
     </sql>
 
     <sql id="idCondition">
@@ -165,13 +169,14 @@
         INV_UNIT_WEIGHT,  <!-- 库存单重 -->
         INV_WEIGHT,  <!-- 库存重量 -->
         FACTORY_CODE,  <!-- 厂区编码 -->
-        FACTORY_NAME  <!-- 厂区名称 -->
+        FACTORY_NAME,  <!-- 厂区名称 -->
+        INVENT_TYPE_DETAIL
         ) VALUES (
         #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#,
         #updatedBy#, #updatedName#, #updatedTime#, #deleteFlag#, #companyCode#,
         #companyName#, #whCode#, #whName#, #inventType#, #inventCode#,
         #inventName#, #specId#, #spec#, #material#, #unit#, #length#, #width#,
-        #thick#, #invQty#, #invUnitWeight#, #invWeight#, #factoryCode#, #factoryName#
+        #thick#, #invQty#, #invUnitWeight#, #invWeight#, #factoryCode#, #factoryName#,#inventTypeDetail#
         )
     </insert>
 

src/main/java/com/baosight/hggp/hg/pz/domain/HGPZ004.java

@@ -37,6 +37,7 @@ public class HGPZ004 extends DaoEPBase {
 	public static final String FIELD_UPDATED_TIME = "updatedTime";    		/* 更新时间*/
 	public static final String FIELD_DELETE_FLAG = "deleteFlag";    		/* 是否删除0.否1.是*/
 	public static final String FIELD_INVENT_TYPE_DETAIL = "inventTypeDetail"; /*存货类型明细*/
+	public static final String FIELD_INVENT_TYPE_DETAILS = "inventTypeDetails"; /*存货类型明细*/
 
 	public static final String COL_ID = "ID";    		
 	public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE";    		/* 帐套编码*/

src/main/java/com/baosight/hggp/hg/pz/domain/HGPZ005.java

@@ -26,6 +26,7 @@ public class HGPZ005 extends DaoEPBase {
 	public static final String FIELD_ACCOUNT_CODE = "accountCode";    		/* 帐套编码*/
 	public static final String FIELD_DEP_CODE = "depCode";    		/* 部门编码*/
 	public static final String FIELD_INVENT_TYPE = "inventType";    		/* 存货类型*/
+	public static final String FIELD_INVENT_TYPE_DETAIL = "inventTypeDetail"; /*存货类型明细*/
 	public static final String FIELD_INVENT_CODE = "inventCode";    		/* 存货编码*/
 	public static final String FIELD_INVENT_NAME = "inventName";    		/* 存货名称*/
 	public static final String FIELD_SPEC = "spec";    		/* 规格*/
@@ -78,6 +79,7 @@ public class HGPZ005 extends DaoEPBase {
 	private String accountCode = " ";		/* 帐套编码*/
 	private String depCode = " ";		/* 部门编码*/
 	private String inventType = " ";;	/* 存货类型*/
+	private Integer inventTypeDetail;	/*存货类型明细 1：构建 2：零件*/
 	private String inventCode = " ";		/* 存货编码*/
 	private String inventName = " ";		/* 存货名称*/
 	private String spec = " ";		/* 规格*/
@@ -204,6 +206,10 @@ public class HGPZ005 extends DaoEPBase {
 		eiColumn.setDescName("工艺流程ID");
 		eiMetadata.addMeta(eiColumn);
 
+		eiColumn = new EiColumn(FIELD_INVENT_TYPE_DETAIL);
+		eiColumn.setDescName("存货类型明细");
+		eiMetadata.addMeta(eiColumn);
+
 	}
 
 	/**
@@ -558,6 +564,14 @@ public class HGPZ005 extends DaoEPBase {
 		this.flowId = flowId;
 	}
 
+	public Integer getInventTypeDetail() {
+		return inventTypeDetail;
+	}
+
+	public void setInventTypeDetail(Integer inventTypeDetail) {
+		this.inventTypeDetail = inventTypeDetail;
+	}
+
 	/**
 	 * get the value from Map.
 	 *
@@ -588,6 +602,7 @@ public class HGPZ005 extends DaoEPBase {
 		setUpdatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_TIME)), updatedTime));
 		setDeleteFlag(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_DELETE_FLAG)), deleteFlag));
 		setFlowId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_FLOW_ID)), flowId));
+		setInventTypeDetail(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_INVENT_TYPE_DETAIL)), inventTypeDetail));
 	}
 
 	/**
@@ -619,6 +634,7 @@ public class HGPZ005 extends DaoEPBase {
 		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_FLOW_ID, StringUtils.toString(flowId, eiMetadata.getMeta(FIELD_FLOW_ID)));
+		map.put(FIELD_INVENT_TYPE_DETAIL,StringUtils.toString(inventTypeDetail, eiMetadata.getMeta(FIELD_INVENT_TYPE_DETAIL)));
 
 		return map;
 	}

src/main/java/com/baosight/hggp/hg/pz/domain/HGPZ010.java

@@ -41,6 +41,7 @@ public class HGPZ010 extends DaoEPBase {
 	public static final String FIELD_INVENT_RECORD_ID = "inventRecordId";    		/* 存货档案ID*/
 	public static final String FIELD_WARN_NUM = "warnNum";    		/* 预警数量*/
 	public static final String FIELD_REMARK = "remark";    		/* 备注*/
+	public static final String FIELD_INVENT_TYPE_DETAIL = "inventTypeDetail"; /*存货类型明细*/
 
 	public static final String COL_ID = "ID";    		
 	public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE";    		/* 帐套编码*/
@@ -87,6 +88,7 @@ public class HGPZ010 extends DaoEPBase {
 	private Long inventRecordId = new Long(0);	/* 存货档案ID*/
 	private BigDecimal warnNum = new BigDecimal("0");		/* 预警数量*/
 	private String remark = " ";		/* 备注*/
+	private Integer inventTypeDetail;	/*存货类型明细 1：构建 2：零件*/
 
 	/**
 	 * initialize the metadata.
@@ -174,7 +176,9 @@ public class HGPZ010 extends DaoEPBase {
 		eiColumn.setDescName("备注");
 		eiMetadata.addMeta(eiColumn);
 
-
+		eiColumn = new EiColumn(FIELD_INVENT_TYPE_DETAIL);
+		eiColumn.setDescName("存货类型明细");
+		eiMetadata.addMeta(eiColumn);
 	}
 
 	/**
@@ -488,6 +492,15 @@ public class HGPZ010 extends DaoEPBase {
 	public void setRemark(String remark) {
 		this.remark = remark;
 	}
+
+	public Integer getInventTypeDetail() {
+		return inventTypeDetail;
+	}
+
+	public void setInventTypeDetail(Integer inventTypeDetail) {
+		this.inventTypeDetail = inventTypeDetail;
+	}
+
 	/**
 	 * get the value from Map.
 	 *
@@ -515,6 +528,7 @@ public class HGPZ010 extends DaoEPBase {
 		setInventRecordId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_INVENT_RECORD_ID)), inventRecordId));
 		setWarnNum(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_WARN_NUM)), warnNum));
 		setRemark(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_REMARK)), remark));
+		setInventTypeDetail(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_INVENT_TYPE_DETAIL)), inventTypeDetail));
 	}
 
 	/**
@@ -543,6 +557,7 @@ public class HGPZ010 extends DaoEPBase {
 		map.put(FIELD_INVENT_RECORD_ID, StringUtils.toString(inventRecordId, eiMetadata.getMeta(FIELD_INVENT_RECORD_ID)));
 		map.put(FIELD_WARN_NUM, StringUtils.toString(warnNum, eiMetadata.getMeta(FIELD_WARN_NUM)));
 		map.put(FIELD_REMARK, StringUtils.toString(remark, eiMetadata.getMeta(FIELD_REMARK)));
+		map.put(FIELD_INVENT_TYPE_DETAIL,StringUtils.toString(inventTypeDetail, eiMetadata.getMeta(FIELD_INVENT_TYPE_DETAIL)));
 
 		return map;
 	}

src/main/java/com/baosight/hggp/hg/pz/service/ServiceHGPZ005.java

@@ -2,12 +2,14 @@ package com.baosight.hggp.hg.pz.service;
 
 import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
 import com.baosight.hggp.common.DdynamicEnum;
+import com.baosight.hggp.common.InventTypeDetailEnum;
 import com.baosight.hggp.core.constant.CommonConstant;
 import com.baosight.hggp.core.dao.DaoBase;
 import com.baosight.hggp.core.dao.DaoUtils;
 import com.baosight.hggp.core.enums.OrgTypeEnum;
 import com.baosight.hggp.core.security.UserSessionUtils;
 import com.baosight.hggp.hg.constant.HGConstant;
+import com.baosight.hggp.hg.pz.domain.HGPZ004;
 import com.baosight.hggp.hg.pz.domain.HGPZ005;
 import com.baosight.hggp.hg.pz.domain.HGPZ005A;
 import com.baosight.hggp.hg.sb.domain.HGSB002;
@@ -49,7 +51,9 @@ public class ServiceHGPZ005 extends ServiceBase {
 	@OperationLogAnnotation(operModul = "存货档案", operType = "查询", operDesc = "初始化")
 	public EiInfo initLoad(EiInfo inInfo) {
 		try {
-			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_TYPE_BOX_BLOCK_ID), null, false);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_TYPE_BOX_BLOCK_ID), new HashMap<String, Object>(){{
+				put(HGPZ004.FIELD_INVENT_TYPE_DETAILS, InventTypeDetailEnum.getProdTypeFour());
+			}}, false);
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGPZ005().eiMetadata);
 		} catch (PlatException e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
@@ -87,9 +91,9 @@ public class ServiceHGPZ005 extends ServiceBase {
 			// 数据校验
 			this.checkSaveData(resultRows);
 			// 写入数据
-			for (int i = 0; i < resultRows.size(); i++) {
+			for (Map resultRow : resultRows) {
 				HGPZ005 hgpz005 = new HGPZ005();
-				hgpz005.fromMap(resultRows.get(i));
+				hgpz005.fromMap(resultRow);
 
 				// 设置规格
 				if (StringUtils.isBlank(hgpz005.getSpec())) {
@@ -186,14 +190,15 @@ public class ServiceHGPZ005 extends ServiceBase {
 	 * @return
 	 */
 	@OperationLogAnnotation(operModul = "存货档案", operType = "修改", operDesc = "修改操作")
+	@Override
 	public EiInfo update(EiInfo inInfo) {
 		try {
 			List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
 			// 数据校验
 			this.checkSaveData(resultRows);
-			for (int i = 0; i < resultRows.size(); i++) {
+			for (Map resultRow : resultRows) {
 				HGPZ005 hppz009 = new HGPZ005();
-				hppz009.fromMap(resultRows.get(i));
+				hppz009.fromMap(resultRow);
 				DaoUtils.update(HGPZ005.UPDATE, hppz009);
 			}
 			inInfo = this.query(inInfo);
@@ -212,12 +217,13 @@ public class ServiceHGPZ005 extends ServiceBase {
 	 * @return
 	 */
 	@OperationLogAnnotation(operModul = "存货档案", operType = "删除", operDesc = "删除操作")
+	@Override
 	public EiInfo delete(EiInfo inInfo) {
 		try {
 			List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
-			for (int i = 0; i < resultRows.size(); i++) {
+			for (Map resultRow : resultRows) {
 				HGPZ005 hgpz005 = new HGPZ005();
-				hgpz005.fromMap(resultRows.get(i));
+				hgpz005.fromMap(resultRow);
 				// 校验企业下是否存在用户
 				int count = HGXSTools.XsUser.countByAccount(hgpz005.getAccountCode());
 				if (count > 0) {
@@ -276,7 +282,7 @@ public class ServiceHGPZ005 extends ServiceBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "存货档案",operType = "查询",operDesc = "下拉框")
+	@OperationLogAnnotation(operModul = "存货档案",operType = "查询",operDesc = "规格下拉框")
 	public EiInfo queryComboBoxAll(EiInfo inInfo) {
 		try {
 			List<DdynamicEnum> list = new ArrayList<>();
@@ -294,7 +300,7 @@ public class ServiceHGPZ005 extends ServiceBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "存货档案",operType = "查询",operDesc = "下拉框（不默认状态）")
+	@OperationLogAnnotation(operModul = "存货档案",operType = "查询",operDesc = "规格下拉框（不默认状态）")
 	public EiInfo queryInventBoxAll(EiInfo inInfo) {
 		try {
 			List<DdynamicEnum> list = new ArrayList<>();
@@ -312,7 +318,7 @@ public class ServiceHGPZ005 extends ServiceBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "存货档案规格下拉框",operType = "查询",operDesc = "下拉框（不默认状态）")
+	@OperationLogAnnotation(operModul = "存货档案规格下拉框",operType = "查询",operDesc = "规格下拉框（不默认状态）")
 	public EiInfo queryInventSpecBox(EiInfo inInfo) {
 		try {
 			List<DdynamicEnum> list = new ArrayList<>();

src/main/java/com/baosight/hggp/hg/pz/service/ServiceHGPZ007.java

@@ -2,9 +2,11 @@ package com.baosight.hggp.hg.pz.service;
 
 import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
 import com.baosight.hggp.common.DdynamicEnum;
+import com.baosight.hggp.common.InventTypeDetailEnum;
 import com.baosight.hggp.core.constant.CommonConstant;
 import com.baosight.hggp.core.dao.DaoUtils;
 import com.baosight.hggp.hg.constant.HGConstant;
+import com.baosight.hggp.hg.pz.domain.HGPZ004;
 import com.baosight.hggp.hg.pz.domain.HGPZ007;
 import com.baosight.hggp.hg.xs.tools.HGXSTools;
 import com.baosight.hggp.util.*;
@@ -38,7 +40,9 @@ public class ServiceHGPZ007 extends ServiceBase {
 	@OperationLogAnnotation(operModul = "仓库档案", operType = "查询", operDesc = "初始化")
 	public EiInfo initLoad(EiInfo inInfo) {
 		try {
-			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.WH_TYPE_BLOCK_ID), null, false);
+			/*CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_TYPE_BOX_BLOCK_ID), new HashMap<String, Object>(){{
+				put(HGPZ004.FIELD_INVENT_TYPE_DETAILS, InventTypeDetailEnum.getProdTypeFour());
+			}}, false);*/
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGPZ007().eiMetadata);
 		} catch (PlatException e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");

src/main/java/com/baosight/hggp/hg/pz/service/ServiceHGPZ010.java

@@ -2,10 +2,14 @@ package com.baosight.hggp.hg.pz.service;
 
 import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
 import com.baosight.hggp.common.DdynamicEnum;
+import com.baosight.hggp.common.InventTypeDetailEnum;
 import com.baosight.hggp.core.constant.CommonConstant;
 import com.baosight.hggp.core.dao.DaoUtils;
 import com.baosight.hggp.hg.constant.HGConstant;
+import com.baosight.hggp.hg.pz.domain.HGPZ004;
+import com.baosight.hggp.hg.pz.domain.HGPZ005;
 import com.baosight.hggp.hg.pz.domain.HGPZ010;
+import com.baosight.hggp.hg.pz.tools.HGPZTools;
 import com.baosight.hggp.hg.xs.tools.HGXSTools;
 import com.baosight.hggp.util.AssertUtils;
 import com.baosight.hggp.util.CommonMethod;
@@ -46,7 +50,10 @@ public class ServiceHGPZ010 extends ServiceBase {
 		try {
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.WH_TYPE_BLOCK_ID), null, false);
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.WH_CODE_BLOCK_ID), null, false);
-			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_TYPE_BOX_BLOCK_ID), null, false);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_TYPE_BOX_BLOCK_ID),
+					new HashMap<String, Object>(){{
+						put(HGPZ004.FIELD_INVENT_TYPE_DETAILS, InventTypeDetailEnum.getProdTypeFour());
+					}}, false);
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGPZ010().eiMetadata);
 		} catch (PlatException e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
@@ -87,6 +94,8 @@ public class ServiceHGPZ010 extends ServiceBase {
 			for (int i = 0; i < resultRows.size(); i++) {
 				HGPZ010 hgpz010 = new HGPZ010();
 				hgpz010.fromMap(resultRows.get(i));
+				HGPZ005 hgpz005 = HGPZTools.HgPz005.get(hgpz010.getInventCode());
+				hgpz010.setInventTypeDetail(hgpz005.getInventTypeDetail());
 				if (hgpz010.getId() == null || hgpz010.getId() == 0) {
 					this.add(hgpz010);
 				} else {

src/main/java/com/baosight/hggp/hg/pz/sql/HGPZ004.xml

@@ -233,7 +233,8 @@
 		INVENT_TYPE as "inventType",
 		INVENT_TYPE_NAME as "inventTypeName",
 		PAR_INVENT_TYPE	as "parInventType",
-		STATUS AS "status"
+		STATUS AS "status",
+		INVENT_TYPE_DETAIL as  "inventTypeDetail"
 		FROM ${hggpSchema}.HGPZ004
 		WHERE DELETE_FLAG = 0
 		<isNotEmpty prepend=" AND " property="accountCode">
@@ -245,6 +246,12 @@
 		<isNotEmpty prepend=" AND " property="status">
 			STATUS = #status#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="inventTypeDetail">
+			INVENT_TYPE_DETAIL = #inventTypeDetail#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="inventTypeDetails">
+			INVENT_TYPE_DETAIL IN <iterate close=")" open="(" conjunction="," property="inventTypeDetails">#inventTypeDetails[]#</iterate>
+		</isNotEmpty>
 		ORDER BY INVENT_TYPE
 	</select>
 

src/main/java/com/baosight/hggp/hg/pz/sql/HGPZ005.xml

@@ -34,6 +34,7 @@
 		ACCOUNT_CODE	as "accountCode",  <!-- 帐套编码 -->
 		DEP_CODE	as "depCode",  <!-- 部门编码 -->
 		INVENT_TYPE	as "inventType",  <!-- 存货类型 -->
+		INVENT_TYPE_DETAIL as  "inventTypeDetail",
 		INVENT_CODE	as "inventCode",  <!-- 存货编码 -->
 		INVENT_NAME	as "inventName",  <!-- 存货名称 -->
 		SPEC	as "spec",  <!-- 规格 -->
@@ -132,6 +133,12 @@
 		<isNotEmpty prepend=" AND " property="inventTypes">
 			INVENT_TYPE IN <iterate close=")" open="(" conjunction="," property="inventTypes">#inventTypes[]#</iterate>
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="inventTypeDetail">
+			INVENT_TYPE_DETAIL = #inventTypeDetail#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="inventTypeDetails">
+			INVENT_TYPE_DETAIL IN <iterate close=")" open="(" conjunction="," property="inventTypeDetails">#inventTypeDetails[]#</iterate>
+		</isNotEmpty>
 	</sql>
 
 	<select id="query" parameterClass="java.util.HashMap" resultClass="HGPZ005">
@@ -232,6 +239,7 @@
 										ACCOUNT_CODE,  <!-- 帐套编码 -->
 										DEP_CODE,  <!-- 部门编码 -->
 										INVENT_TYPE,  <!-- 存货类型 -->
+		INVENT_TYPE_DETAIL,
 										INVENT_CODE,  <!-- 存货编码 -->
 										INVENT_NAME,  <!-- 存货名称 -->
 										SPEC,  <!-- 规格 -->
@@ -251,7 +259,7 @@
 										DELETE_FLAG,  <!-- 是否删除0.否1.是 -->
 										FLOW_ID
 										)
-	    VALUES (#id#, #accountCode#, #depCode#, #inventType#, #inventCode#, #inventName#, #spec#, #length#, #width#, #thick#, #material#, #coefficient#, #unit#, #status#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #deleteFlag#,#flowId#)
+	    VALUES (#id#, #accountCode#, #depCode#, #inventType#, #inventTypeDetail#, #inventCode#, #inventName#, #spec#, #length#, #width#, #thick#, #material#, #coefficient#, #unit#, #status#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #deleteFlag#,#flowId#)
 	</insert>
 
 	<delete id="delete">
@@ -264,6 +272,7 @@
 					ACCOUNT_CODE	= #accountCode#,   <!-- 帐套编码 -->
 					DEP_CODE	= #depCode#,   <!-- 部门编码 -->
 					INVENT_TYPE	= #inventType#,   <!-- 存货类型 -->
+		INVENT_TYPE_DETAIL = #inventTypeDetail#,
 					INVENT_CODE	= #inventCode#,   <!-- 存货编码 -->
 					INVENT_NAME	= #inventName#,   <!-- 存货名称 -->
 					SPEC	= #spec#,   <!-- 规格 -->
@@ -300,6 +309,7 @@
 	<select id="queryComboBox" parameterClass="java.util.HashMap" resultClass="java.util.HashMap">
 		SELECT DISTINCT
 		INVENT_TYPE	as "inventType",  <!-- 存货类型 -->
+		INVENT_TYPE_DETAIL as "inventTypeDetail",
 		INVENT_CODE as "inventCode",
 		INVENT_NAME as "inventName",
 		SPEC	as "spec"  <!-- 规格 -->
@@ -312,6 +322,9 @@
 		<isNotEmpty prepend=" AND " property="inventType">
 			INVENT_TYPE = #inventType#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="inventTypeDetails">
+			INVENT_TYPE_DETAIL IN <iterate close=")" open="(" conjunction="," property="inventTypeDetails">#inventTypeDetails[]#</iterate>
+		</isNotEmpty>
 		ORDER BY INVENT_CODE
 	</select>
 
@@ -340,6 +353,9 @@
 		<isNotEmpty prepend=" AND " property="status">
 			STATUS = #status#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="inventTypeDetails">
+			INVENT_TYPE_DETAIL IN <iterate close=")" open="(" conjunction="," property="inventTypeDetails">#inventTypeDetails[]#</iterate>
+		</isNotEmpty>
 		ORDER BY INVENT_CODE
 	</select>
 
@@ -370,6 +386,9 @@
 		<isNotEmpty prepend=" AND " property="inventTypeDetail">
 			b.INVENT_TYPE_DETAIL = #inventTypeDetail#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="inventTypeDetails">
+			b.INVENT_TYPE_DETAIL IN <iterate close=")" open="(" conjunction="," property="inventTypeDetails">#inventTypeDetails[]#</iterate>
+		</isNotEmpty>
 		ORDER BY INVENT_CODE
 	</select>
 	<!-- 缺省下拉框 -->
@@ -400,7 +419,8 @@
 		WIDTH AS "width" ,  <!-- 宽 -->
 		THICK AS "thick" ,  <!-- 厚 -->
 		COEFFICIENT AS "coefficient",   <!-- 系数 -->
-		ID AS "id"
+		ID AS "id",
+		INVENT_TYPE_DETAIL as "inventTypeDetail"
 		FROM ${hggpSchema}.HGPZ005
 		WHERE DELETE_FLAG = 0
 		AND STATUS = 1

src/main/java/com/baosight/hggp/hg/pz/sql/HGPZ010.xml

@@ -84,6 +84,9 @@
 		<isNotEmpty prepend=" AND " property="remark">
 			REMARK = #remark#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="inventTypeDetail">
+			INVENT_TYPE_DETAIL = #inventTypeDetail#
+		</isNotEmpty>
 	</sql>
 
 	<sql id="authCondition">
@@ -127,7 +130,8 @@
 				INVENT_NAME	as "inventName",  <!-- 物料名称 -->
 				INVENT_RECORD_ID	as "inventRecordId",  <!-- 存货档案ID -->
 				WARN_NUM	as "warnNum",  <!-- 预警数量 -->
-				REMARK	as "remark" <!-- 备注 -->
+				REMARK	as "remark", <!-- 备注 -->
+		INVENT_TYPE_DETAIL as  "inventTypeDetail"
 		FROM ${hggpSchema}.HGPZ010 WHERE 1=1 AND DELETE_FLAG = 0
         <include refid="condition" />
 		<include refid="authCondition" />
@@ -227,9 +231,10 @@
 										INVENT_NAME,  <!-- 物料名称 -->
 										INVENT_RECORD_ID,  <!-- 存货档案ID -->
 										WARN_NUM,  <!-- 预警数量 -->
-										REMARK  <!-- 备注 -->
+										REMARK,  <!-- 备注 -->
+		INVENT_TYPE_DETAIL
 										)
-	    VALUES (#id#, #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #deleteFlag#, #whType#, #whCode#, #whName#, #inventType#, #inventCode#, #inventName#, #inventRecordId#, #warnNum#, #remark#)
+	    VALUES (#id#, #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #deleteFlag#, #whType#, #whCode#, #whName#, #inventType#, #inventCode#, #inventName#, #inventRecordId#, #warnNum#, #remark#, #inventTypeDetail#)
 	</insert>
 
 	<delete id="delete">
@@ -256,7 +261,8 @@
 					INVENT_NAME	= #inventName#,   <!-- 物料名称 -->
 					INVENT_RECORD_ID	= #inventRecordId#,   <!-- 存货档案ID -->
 					WARN_NUM	= #warnNum#,   <!-- 预警数量 -->
-					REMARK	= #remark#  <!-- 备注 -->
+					REMARK	= #remark#,  <!-- 备注 -->
+		INVENT_TYPE_DETAIL = #inventTypeDetail#
 			WHERE
 			ID = #id#
 	</update>

src/main/java/com/baosight/hggp/hg/pz/tools/HGPZTools.java

@@ -589,13 +589,16 @@ public class HGPZTools {
 			List<HGPZ004> hgpz004s = DaoBase.getInstance().query(HGPZ004.QUERY, new HashMap<String, Object>(){{
 				put(HGPZ004.FIELD_STATUS, CommonConstant.YesNo.YES_1);
 			}});
-			Map parmap = hgpz004s.stream().filter(item-> !Objects.equals(item.getParInventType(), "root")).collect(Collectors.toMap(HGPZ004::getInventTypeName, HGPZ004::getInventType,(v1, v2) -> v2));
+			Map parmap = hgpz004s.stream().filter(item-> !Objects.equals(item.getParInventType(), "root")).collect(Collectors.toMap(HGPZ004::getInventTypeName, HGPZ004::getInventType,(v1, v2) -> v1));
 			for (Map map:list) {
 				String inventType = MapUtils.getString(parmap, StringUtils.trimToEmpty(map.get(HGPZ005.FIELD_INVENT_TYPE).toString()));
-				AssertUtils.isEmpty(inventType, String.format("存货类型[%s]代码不存在，添加失败！", inventType));
+				AssertUtils.isEmpty(inventType, String.format("存货类型[%s]代码不存在，添加失败！", map.get(HGPZ005.FIELD_INVENT_TYPE)));
+				Map<String,String> inventMap = hgpz004s.stream().filter(item-> Objects.equals(item.getInventType(), inventType)).collect(Collectors.toMap(HGPZ004::getInventType,HGPZ004::getInventTypeDetail));
+				AssertUtils.isEmpty(inventMap.get(inventType), String.format("存货类型[%s]明细不存在，添加失败！", map.get(HGPZ005.FIELD_INVENT_TYPE)));
 				HGPZ005 hgpz005 = new HGPZ005();
 				hgpz005.fromMap(map);
 				hgpz005.setInventType(inventType);
+				hgpz005.setInventTypeDetail(Integer.valueOf(inventMap.get(inventType)));
 				hgpz005.setStatus(1); //默认启用
 				Map<String, Object> params = new HashMap<>();
 				params.put(HGPZ005.FIELD_INVENT_CODE, hgpz005.getInventCode());

src/main/java/com/baosight/hggp/hg/sb/service/ServiceHGSB001.java

@@ -61,10 +61,6 @@ public class ServiceHGSB001 extends ServiceEPBase {
         if (!purchaseDate.isEmpty()) {
             inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0,HGSB001.FIELD_PURCHASE_DATE,StringUtil.removeHorizontalLine(purchaseDate));
         }
-        List<String> roleCompanyCode = HGSBTools.getRoleCompanyCode();
-        if (!roleCompanyCode.isEmpty()) {
-            inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0,HGSB001.FIELD_COMPANY_CODES,roleCompanyCode);
-        }
         return super.query(inInfo,HGSB001.QUERY,new HGSB001());
     }
 

src/main/java/com/baosight/hggp/hg/sb/service/ServiceHGSB002.java

@@ -69,11 +69,6 @@ public class ServiceHGSB002 extends ServiceEPBase {
         if (!planEndDate.isEmpty()){
             inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0,HGSB002.FIELD_PLAN_END_DATE, StringUtil.removeHorizontalLine(planEndDate));
         }
-        //角色公司
-        List<String> roleCompanyCode = HGSBTools.getRoleCompanyCode();
-        if(!roleCompanyCode.isEmpty()){
-            inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0,HGSB001.FIELD_COMPANY_CODES, roleCompanyCode);
-        }
 
         return super.query(inInfo,HGSB002.QUERY,new HGSB002());
     }

src/main/java/com/baosight/hggp/hg/sb/service/ServiceHGSB003.java

@@ -63,11 +63,7 @@ public class ServiceHGSB003 extends ServiceEPBase {
         if (!applyDate.isEmpty()) {
             inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0,HGSB003.FIELD_APPLY_DATE, StringUtil.removeHorizontalLine(applyDate));
         }
-        //角色公司
-        List<String> roleCompanyCode = HGSBTools.getRoleCompanyCode();
-        if(!roleCompanyCode.isEmpty()){
-            inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB001.FIELD_COMPANY_CODES, roleCompanyCode);
-        }
+
         return super.query(inInfo,HGSB003.QUERY,new HGSB003());
     }
 

src/main/java/com/baosight/hggp/hg/sb/service/ServiceHGSB004.java

@@ -60,11 +60,7 @@ public class ServiceHGSB004 extends ServiceEPBase {
         if (!planDate.isEmpty()) {
             inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0,HGSB004.FIELD_INSPEC_DATE, StringUtil.removeHorizontalLine(planDate));
         }
-        //角色公司
-        List<String> roleCompanyCode = HGSBTools.getRoleCompanyCode();
-        if(!roleCompanyCode.isEmpty()){
-            inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB001.FIELD_COMPANY_CODES, roleCompanyCode);
-        }
+
         return super.query(inInfo,HGSB004.QUERY,new HGSB004());
     }
 

src/main/java/com/baosight/hggp/hg/sb/service/ServiceHGSB004B.java

@@ -59,11 +59,7 @@ public class ServiceHGSB004B extends ServiceEPBase {
         if (!planDate.isEmpty()) {
             inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0,HGSB002.FIELD_PLAN_DATE, StringUtil.removeHorizontalLine(planDate));
         }
-        //角色公司
-        List<String> roleCompanyCode = HGSBTools.getRoleCompanyCode();
-        if(!roleCompanyCode.isEmpty()){
-            inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB001.FIELD_COMPANY_CODES, roleCompanyCode);
-        }
+
         return super.query(inInfo,HGSB002.QUERY,new HGSB002());
     }
 

src/main/java/com/baosight/hggp/hg/sb/service/ServiceHGSB005.java

@@ -61,11 +61,7 @@ public class ServiceHGSB005 extends ServiceEPBase {
         if (!upkeepDate.isEmpty()) {
             inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0,HGSB005.FIELD_UPKEEP_DATE, StringUtil.removeHorizontalLine(upkeepDate));
         }
-        //角色公司
-        List<String> roleCompanyCode = HGSBTools.getRoleCompanyCode();
-        if(!roleCompanyCode.isEmpty()){
-            inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB001.FIELD_COMPANY_CODES, roleCompanyCode);
-        }
+
         return super.query(inInfo,HGSB005.QUERY,new HGSB005());
     }
 

src/main/java/com/baosight/hggp/hg/sb/service/ServiceHGSB006.java

@@ -46,11 +46,7 @@ public class ServiceHGSB006 extends ServiceEPBase {
     public EiInfo query(EiInfo inInfo) {
         inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB006.FIELD_DELETE_FLAG, CommonConstant.YesNo.NO_0);
         inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB004.FIELD_INIT_CHECK_STATUS, CommonConstant.YesNo.YES_1);
-        //角色公司
-        List<String> roleCompanyCode = HGSBTools.getRoleCompanyCode();
-        if(!roleCompanyCode.isEmpty()){
-            inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB001.FIELD_COMPANY_CODES, roleCompanyCode);
-        }
+
         return super.query(inInfo,HGSB006.QUERY,new HGSB006());
     }
 }

src/main/java/com/baosight/hggp/hg/sb/service/ServiceHGSB007.java

@@ -45,11 +45,7 @@ public class ServiceHGSB007 extends ServiceEPBase {
     public EiInfo query(EiInfo inInfo) {
         inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB007.FIELD_DELETE_FLAG, CommonConstant.YesNo.NO_0);
         inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB005.FIELD_CHECK_STATUS, CommonConstant.YesNo.YES_1);
-        //角色公司
-        List<String> roleCompanyCode = HGSBTools.getRoleCompanyCode();
-        if(!roleCompanyCode.isEmpty()){
-            inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB001.FIELD_COMPANY_CODES, roleCompanyCode);
-        }
+
         return super.query(inInfo,HGSB007.QUERY,new HGSB007(),false, new EiBlockMeta(), EiConstant.queryBlock, CommonConstant.Field.DETAIL, CommonConstant.Field.DETAIL);
     }
 }

src/main/java/com/baosight/hggp/hg/sb/service/ServiceHGSB008.java

@@ -49,11 +49,7 @@ public class ServiceHGSB008 extends ServiceEPBase {
             inInfo.setCell(EiConstant.queryBlock,ACConstants.ROW_CODE_0,HGSB008.FIELD_LOG_DATE, DateUtils.formatShort(logDate));
         }
         inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0,HGSB008.FIELD_DELETE_FLAG, CommonConstant.YesNo.NO_0);
-        //角色公司
-        List<String> roleCompanyCode = HGSBTools.getRoleCompanyCode();
-        if(!roleCompanyCode.isEmpty()){
-            inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB001.FIELD_COMPANY_CODES, roleCompanyCode);
-        }
+
         return super.query(inInfo,HGSB008.QUERY,new HGSB008());
     }
 }

src/main/java/com/baosight/hggp/hg/sj/service/ServiceHGSJ001.java

@@ -60,12 +60,6 @@ public class ServiceHGSJ001 extends ServiceEPBase {
     @Override
     public EiInfo query(EiInfo inInfo) {
         inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSJ001.FIELD_DELETE_FLAG,CommonConstant.YesNo.NO_0);
-        List<Company> roleCompany = UserSessionUtils.getRoleCompany();
-        List<String> companys = new ArrayList<>();
-        for (Company company:roleCompany) {
-            companys.add(company.getCompanyCode());
-        }
-        inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, "factoryCodes",companys);
         return super.query(inInfo, HGSJ001.QUERY);
     }
 

src/main/java/com/baosight/hggp/hg/sj/service/ServiceHGSJ002.java

@@ -49,12 +49,6 @@ public class ServiceHGSJ002 extends ServiceEPBase {
     @Override
     public EiInfo query(EiInfo inInfo) {
         inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSJ002.FIELD_DELETE_FLAG,CommonConstant.YesNo.NO_0);
-        List<Company> roleCompany = UserSessionUtils.getRoleCompany();
-        List<String> companys = new ArrayList<>();
-        for (Company company:roleCompany) {
-            companys.add(company.getCompanyCode());
-        }
-        inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, "factoryCodes",companys);
         return super.query(inInfo, HGSJ002.QUERY,new HGSJ002());
     }
 

src/main/java/com/baosight/hggp/hg/sj/service/ServiceHGSJ003.java

@@ -45,7 +45,6 @@ public class ServiceHGSJ003 extends ServiceEPBase {
             inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSJ003.FIELD_DELETE_FLAG, CommonConstant.YesNo.NO_0);
             outInfo = super.initLoad(inInfo, EiConstant.resultBlock, new HGSJ003());
             Map qarma = new HashMap();
-            List<Org> orgList = HGXSTools.XsOrg.queryByUser();
             EiInfoUtils.addBlock(outInfo,"roleCompany", UserSessionUtils.getRoleCompany(), Company.class);
             CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.PROCESS_CODE_BLOCK_ID), qarma);
         }catch (Exception e){
@@ -57,12 +56,6 @@ public class ServiceHGSJ003 extends ServiceEPBase {
     @Override
     public EiInfo query(EiInfo inInfo) {
         inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSJ003.FIELD_DELETE_FLAG,CommonConstant.YesNo.NO_0);
-        List<Company> roleCompany = UserSessionUtils.getRoleCompany();
-        List<String> companys = new ArrayList<>();
-        for (Company company:roleCompany) {
-            companys.add(company.getCompanyCode());
-        }
-        inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, "factoryCodes",companys);
         return super.query(inInfo,HGSJ003.QUERY,new HGSJ003());
     }
 

src/main/java/com/baosight/hggp/hg/yx/domain/HGYX001A.java

@@ -44,6 +44,7 @@ public class HGYX001A extends DaoEPBase {
 	public static final String FIELD_UNIT_WEIGHT = "unitWeight";    		/* 发货单重*/
 	public static final String FIELD_WEIGHT = "weight";    		/* 发货重量*/
 	public static final String FIELD_PARENT_ID = "parentId";    		/* 销售发货ID*/
+	public static final String FIELD_INVENT_TYPE_DETAIL = "inventTypeDetail"; /*存货类型明细*/
 
 	public static final String COL_ID = "ID";    		/* ID*/
 	public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE";    		/* 企业编码*/
@@ -98,6 +99,7 @@ public class HGYX001A extends DaoEPBase {
 	private BigDecimal unitWeight = new BigDecimal("0");		/* 单重*/
 	private BigDecimal weight = new BigDecimal("0");		/* 发货重量*/
 	private Long parentId = new Long(0);	/* 销售发货ID*/
+	private String inventTypeDetail;	/*存货类型明细 1：构建 2：零件*/
 
 	/**
 	 * initialize the metadata.
@@ -212,6 +214,9 @@ public class HGYX001A extends DaoEPBase {
 		eiColumn.setDescName("销售发货ID");
 		eiMetadata.addMeta(eiColumn);
 
+		eiColumn = new EiColumn(FIELD_INVENT_TYPE_DETAIL);
+		eiColumn.setDescName("存货类型明细");
+		eiMetadata.addMeta(eiColumn);
 
 	}
 
@@ -567,6 +572,15 @@ public class HGYX001A extends DaoEPBase {
 	public void setParentId(Long parentId) {
 		this.parentId = parentId;
 	}
+
+	public String getInventTypeDetail() {
+		return inventTypeDetail;
+	}
+
+	public void setInventTypeDetail(String inventTypeDetail) {
+		this.inventTypeDetail = inventTypeDetail;
+	}
+
 	/**
 	 * get the value from Map.
 	 *
@@ -597,6 +611,7 @@ public class HGYX001A extends DaoEPBase {
 		setUnitWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_UNIT_WEIGHT)), unitWeight));
 		setWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_WEIGHT)), weight));
 		setParentId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_PARENT_ID)), parentId));
+		setInventTypeDetail(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_INVENT_TYPE_DETAIL)), inventTypeDetail));
 	}
 
 	/**
@@ -628,6 +643,7 @@ public class HGYX001A extends DaoEPBase {
 		map.put(FIELD_UNIT_WEIGHT, StringUtils.toString(unitWeight, eiMetadata.getMeta(FIELD_UNIT_WEIGHT)));
 		map.put(FIELD_WEIGHT, StringUtils.toString(weight, eiMetadata.getMeta(FIELD_WEIGHT)));
 		map.put(FIELD_PARENT_ID, StringUtils.toString(parentId, eiMetadata.getMeta(FIELD_PARENT_ID)));
+		map.put(FIELD_INVENT_TYPE_DETAIL,StringUtils.toString(inventTypeDetail, eiMetadata.getMeta(FIELD_INVENT_TYPE_DETAIL)));
 
 		return map;
 	}

src/main/java/com/baosight/hggp/hg/yx/domain/HGYX001C.java

@@ -52,6 +52,7 @@ public class HGYX001C extends DaoEPBase {
 	public static final String FIELD_CONS_WEIGHT = "consWeight";    		/* 库存重量*/
 	public static final String FIELD_FACTORY_CODE = "factoryCode";    		/* 厂区编码*/
 	public static final String FIELD_FACTORY_NAME = "factoryName";    		/* 厂区名称*/
+	public static final String FIELD_INVENT_TYPE_DETAIL = "inventTypeDetail"; /*存货类型明细*/
 
 	public static final String COL_ID = "ID";
 	public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE";    		/* 企业编码*/
@@ -118,6 +119,7 @@ public class HGYX001C extends DaoEPBase {
 	private BigDecimal consWeight = new BigDecimal(0.000);		/* 库存重量*/
 	private String factoryCode = " ";		/* 厂区编码*/
 	private String factoryName = " ";		/* 厂区名称*/
+	private String inventTypeDetail;	/*存货类型明细 1：构建 2：零件*/
 
 	/**
 	 * initialize the metadata.
@@ -260,7 +262,9 @@ public class HGYX001C extends DaoEPBase {
 		eiColumn.setDescName("厂区名称");
 		eiMetadata.addMeta(eiColumn);
 
-
+		eiColumn = new EiColumn(FIELD_INVENT_TYPE_DETAIL);
+		eiColumn.setDescName("存货类型明细");
+		eiMetadata.addMeta(eiColumn);
 	}
 
 	/**
@@ -718,6 +722,15 @@ public class HGYX001C extends DaoEPBase {
 	public void setFactoryName(String factoryName) {
 		this.factoryName = factoryName;
 	}
+
+	public String getInventTypeDetail() {
+		return inventTypeDetail;
+	}
+
+	public void setInventTypeDetail(String inventTypeDetail) {
+		this.inventTypeDetail = inventTypeDetail;
+	}
+
 	/**
 	 * get the value from Map.
 	 *
@@ -755,6 +768,7 @@ public class HGYX001C extends DaoEPBase {
 		setConsWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_CONS_WEIGHT)), consWeight));
 		setFactoryCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_FACTORY_CODE)), factoryCode));
 		setFactoryName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_FACTORY_NAME)), factoryName));
+		setInventTypeDetail(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_INVENT_TYPE_DETAIL)), inventTypeDetail));
 	}
 
 	/**
@@ -793,6 +807,7 @@ public class HGYX001C extends DaoEPBase {
 		map.put(FIELD_CONS_WEIGHT, StringUtils.toString(consWeight, eiMetadata.getMeta(FIELD_CONS_WEIGHT)));
 		map.put(FIELD_FACTORY_CODE, StringUtils.toString(factoryCode, eiMetadata.getMeta(FIELD_FACTORY_CODE)));
 		map.put(FIELD_FACTORY_NAME, StringUtils.toString(factoryName, eiMetadata.getMeta(FIELD_FACTORY_NAME)));
+		map.put(FIELD_INVENT_TYPE_DETAIL,StringUtils.toString(inventTypeDetail, eiMetadata.getMeta(FIELD_INVENT_TYPE_DETAIL)));
 
 		return map;
 	}

src/main/java/com/baosight/hggp/hg/yx/domain/HGYX002A.java

@@ -46,6 +46,7 @@ public class HGYX002A extends DaoEPBase {
 	public static final String FIELD_RETURN_QUANTITY = "returnQuantity";    		/* 退货数量*/
 	public static final String FIELD_RETURN_WEIGHT = "returnWeight";    		/* 退货重量*/
 	public static final String FIELD_PARENT_ID = "parentId";    		/* 销售退货ID*/
+	public static final String FIELD_INVENT_TYPE_DETAIL = "inventTypeDetail"; /*存货类型明细*/
 
 	public static final String COL_ID = "ID";    		/* ID*/
 	public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE";    		/* 企业编码*/
@@ -104,6 +105,7 @@ public class HGYX002A extends DaoEPBase {
 	private BigDecimal returnQuantity = new BigDecimal(0);		/* 退货数量*/
 	private BigDecimal returnWeight = new BigDecimal(0.000);		/* 退货重量*/
 	private Long parentId = new Long(0);	/* 销售退货ID*/
+	private String inventTypeDetail;	/*存货类型明细 1：构建 2：零件*/
 
 	/**
 	 * initialize the metadata.
@@ -232,7 +234,9 @@ public class HGYX002A extends DaoEPBase {
 		eiColumn.setDescName("销售退货ID");
 		eiMetadata.addMeta(eiColumn);
 
-
+		eiColumn = new EiColumn(FIELD_INVENT_TYPE_DETAIL);
+		eiColumn.setDescName("存货类型明细");
+		eiMetadata.addMeta(eiColumn);
 	}
 
 	/**
@@ -626,6 +630,15 @@ public class HGYX002A extends DaoEPBase {
 	public void setParentId(Long parentId) {
 		this.parentId = parentId;
 	}
+
+	public String getInventTypeDetail() {
+		return inventTypeDetail;
+	}
+
+	public void setInventTypeDetail(String inventTypeDetail) {
+		this.inventTypeDetail = inventTypeDetail;
+	}
+
 	/**
 	 * get the value from Map.
 	 *
@@ -658,6 +671,7 @@ public class HGYX002A extends DaoEPBase {
 		setReturnQuantity(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_RETURN_QUANTITY)), returnQuantity));
 		setReturnWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_RETURN_WEIGHT)), returnWeight));
 		setParentId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_PARENT_ID)), parentId));
+		setInventTypeDetail(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_INVENT_TYPE_DETAIL)), inventTypeDetail));
 	}
 
 	/**
@@ -691,6 +705,7 @@ public class HGYX002A extends DaoEPBase {
 		map.put(FIELD_RETURN_QUANTITY, StringUtils.toString(returnQuantity, eiMetadata.getMeta(FIELD_RETURN_QUANTITY)));
 		map.put(FIELD_RETURN_WEIGHT, StringUtils.toString(returnWeight, eiMetadata.getMeta(FIELD_RETURN_WEIGHT)));
 		map.put(FIELD_PARENT_ID, StringUtils.toString(parentId, eiMetadata.getMeta(FIELD_PARENT_ID)));
+		map.put(FIELD_INVENT_TYPE_DETAIL,StringUtils.toString(inventTypeDetail, eiMetadata.getMeta(FIELD_INVENT_TYPE_DETAIL)));
 
 		return map;
 	}

src/main/java/com/baosight/hggp/hg/yx/service/ServiceHGYX001.java

@@ -72,11 +72,7 @@ public class ServiceHGYX001 extends ServiceEPBase {
     @Override
     public EiInfo query(EiInfo inInfo) {
         inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGYX001.FIELD_DELETE_FLAG, CommonConstant.YesNo.NO_0);
-        //角色公司
-        List<String> roleCompanyCode = HGSBTools.getRoleCompanyCode();
-        if(!roleCompanyCode.isEmpty()){
-            inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB001.FIELD_COMPANY_CODES, roleCompanyCode);
-        }
+
         return super.query(inInfo,HGYX001.QUERY,new HGYX001());
     }
 

src/main/java/com/baosight/hggp/hg/yx/service/ServiceHGYX001A.java

@@ -73,10 +73,6 @@ public class ServiceHGYX001A extends ServiceEPBase {
     @Override
     public EiInfo query(EiInfo inInfo) {
         inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGYX001.FIELD_DELETE_FLAG, CommonConstant.YesNo.NO_0);
-        List<String> roleCompanyCode = HGSBTools.getRoleCompanyCode();
-        if(!roleCompanyCode.isEmpty()){
-            inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB001.FIELD_COMPANY_CODES, roleCompanyCode);
-        }
         return super.query(inInfo,HGYX001A.QUERY,new HGYX001A());
     }
 

src/main/java/com/baosight/hggp/hg/yx/service/ServiceHGYX001C.java

 package com.baosight.hggp.hg.yx.service;
 
 import com.baosight.hggp.common.DdynamicEnum;
+import com.baosight.hggp.common.InventTypeDetailEnum;
 import com.baosight.hggp.core.constant.CommonConstant;
 import com.baosight.hggp.hg.cw.tools.HGCWTools;
 import com.baosight.hggp.hg.cw.vo.UserVO;
 import com.baosight.hggp.hg.kc.domain.HGKC010;
+import com.baosight.hggp.hg.pz.domain.HGPZ004;
 import com.baosight.hggp.hg.sb.domain.HGSB001;
 import com.baosight.hggp.hg.sb.tools.HGSBTools;
 import com.baosight.hggp.hg.yx.domain.HGYX001;
@@ -17,6 +19,7 @@ import com.baosight.iplat4j.core.ei.EiInfo;
 import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
 
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -33,12 +36,16 @@ public class ServiceHGYX001C extends ServiceEPBase {
             String[] specIdArray = specIds.split(",");
             inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, "specIds", specIdArray);
         }
+        inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGPZ004.FIELD_INVENT_TYPE_DETAILS, InventTypeDetailEnum.getInentTypeTwo());
         inInfo = super.query(inInfo, HGYX001C.QUERY, new HGYX001C());
         CommonMethod.initBlock(inInfo,
                 Arrays.asList(
                         DdynamicEnum.INVENT_TYPE_BLOCK_ID,
                         DdynamicEnum.INVENT_RECORD_BLOCK_ID,
-                        DdynamicEnum.SPEC_NAME_BLOCK_ID));
+                        DdynamicEnum.SPEC_NAME_BLOCK_ID),
+                new HashMap<String, Object>(){{
+                    put(HGPZ004.FIELD_INVENT_TYPE_DETAILS, InventTypeDetailEnum.getInentTypeTwo());
+                }});
         inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGYX001C().eiMetadata);
 
         return inInfo;
@@ -47,11 +54,7 @@ public class ServiceHGYX001C extends ServiceEPBase {
     @Override
     public EiInfo query(EiInfo inInfo) {
         inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGYX001.FIELD_DELETE_FLAG, CommonConstant.YesNo.NO_0);
-        //角色公司
-        List<String> roleCompanyCode = HGSBTools.getRoleCompanyCode();
-        if(!roleCompanyCode.isEmpty()){
-            inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB001.FIELD_COMPANY_CODES, roleCompanyCode);
-        }
+
         return super.query(inInfo, HGYX001C.QUERY,new HGYX001C());
     }
 }

src/main/java/com/baosight/hggp/hg/yx/service/ServiceHGYX002.java

@@ -65,11 +65,7 @@ public class ServiceHGYX002 extends ServiceEPBase {
     @Override
     public EiInfo query(EiInfo inInfo) {
         inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGYX002.FIELD_DELETE_FLAG, CommonConstant.YesNo.NO_0);
-        //角色公司
-        List<String> roleCompanyCode = HGSBTools.getRoleCompanyCode();
-        if(!roleCompanyCode.isEmpty()){
-            inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB001.FIELD_COMPANY_CODES, roleCompanyCode);
-        }
+
         return super.query(inInfo,HGYX002.QUERY,new HGYX002());
     }
 

src/main/java/com/baosight/hggp/hg/yx/service/ServiceHGYX002A.java

@@ -80,11 +80,7 @@ public class ServiceHGYX002A extends ServiceEPBase {
     @Override
     public EiInfo query(EiInfo inInfo) {
         inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGYX002.FIELD_DELETE_FLAG, CommonConstant.YesNo.NO_0);
-        //角色公司
-        List<String> roleCompanyCode = HGSBTools.getRoleCompanyCode();
-        if(!roleCompanyCode.isEmpty()){
-            inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB001.FIELD_COMPANY_CODES, roleCompanyCode);
-        }
+
         return super.query(inInfo,HGYX002A.QUERY,new HGYX002A());
     }
 

src/main/java/com/baosight/hggp/hg/yx/service/ServiceHGYX002C.java

@@ -59,11 +59,7 @@ public class ServiceHGYX002C extends ServiceEPBase {
     @Override
     public EiInfo query(EiInfo inInfo) {
         inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGYX001.FIELD_DELETE_FLAG, CommonConstant.YesNo.NO_0);
-        //角色公司
-        List<String> roleCompanyCode = HGSBTools.getRoleCompanyCode();
-        if(!roleCompanyCode.isEmpty()){
-            inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB001.FIELD_COMPANY_CODES, roleCompanyCode);
-        }
+
         return super.query(inInfo, HGYX002C.QUERY,new HGYX001A());
     }
 }

src/main/java/com/baosight/hggp/hg/yx/sql/HGYX001A.xml

@@ -51,7 +51,8 @@
 		QUANTITY	as "quantity",  <!-- 发货数量 -->
 		UNIT_WEIGHT	as "unitWeight",  <!-- 发货单重 -->
 		WEIGHT	as "weight",  <!-- 发货重量 -->
-		PARENT_ID	as "parentId" <!-- 销售发货ID -->
+		PARENT_ID	as "parentId", <!-- 销售发货ID -->
+		INVENT_TYPE_DETAIL as "inventTypeDetail"
 	</sql>
 	<sql id="condition">
 		<include refid="HGXSDataAuth.authCondition"/>
@@ -121,6 +122,9 @@
 		<isNotEmpty prepend=" AND " property="companyCodes">
 			COMPANY_CODE IN <iterate close=")" open="(" conjunction="," property="companyCodes">#companyCodes[]#</iterate>
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="inventTypeDetails">
+			INVENT_TYPE_DETAIL IN <iterate close=")" open="(" conjunction="," property="inventTypeDetails">#inventTypeDetails[]#</iterate>
+		</isNotEmpty>
 	</sql>
 
 	<select id="query" parameterClass="java.util.HashMap" resultClass="HGYX001A">
@@ -232,9 +236,10 @@
 										QUANTITY,  <!-- 发货数量 -->
 										UNIT_WEIGHT, <!-- 发货单重 -->
 										WEIGHT,  <!-- 发货重量 -->
-										PARENT_ID  <!-- 销售发货ID -->
+										PARENT_ID,  <!-- 销售发货ID -->
+		INVENT_TYPE_DETAIL
 										)
-	    VALUES (#id#, #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #deleteFlag#, #inventRecordId#, #inventType#, #inventCode#, #inventName#, #spec#, #length#, #width#, #thick#, #quantity#, #unitWeight#, #weight#, #parentId#)
+	    VALUES (#id#, #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #deleteFlag#, #inventRecordId#, #inventType#, #inventCode#, #inventName#, #spec#, #length#, #width#, #thick#, #quantity#, #unitWeight#, #weight#, #parentId#,#inventTypeDetail#)
 	</insert>
 
 	<delete id="delete">
@@ -285,7 +290,8 @@
 					QUANTITY	= #quantity#,   <!-- 发货数量 -->
 					UNIT_WEIGHT	= #unitWeight#,  <!-- 发货单重 -->
 					WEIGHT	= #weight#,   <!-- 发货重量 -->
-					PARENT_ID	= #parentId#  <!-- 销售发货ID -->
+					PARENT_ID	= #parentId#,  <!-- 销售发货ID -->
+		    INVENT_TYPE_DETAIL    = #inventTypeDetail#
 			WHERE
 			ID = #id#
 	</update>

src/main/java/com/baosight/hggp/hg/yx/sql/HGYX001C.xml

@@ -31,7 +31,8 @@
         INV_UNIT_WEIGHT as "consUnitWeight",  <!-- 库存单重 -->
         INV_WEIGHT as "consWeight",  <!-- 库存重量 -->
         FACTORY_CODE as "factoryCode",  <!-- 厂区编码 -->
-        FACTORY_NAME as "factoryName" <!-- 厂区名称 -->
+        FACTORY_NAME as "factoryName", <!-- 厂区名称 -->
+        INVENT_TYPE_DETAIL as "inventTypeDetail"
     </sql>
 
     <sql id="condition">
@@ -88,6 +89,9 @@
         <isNotEmpty prepend=" AND " property="companyCodes">
             COMPANY_CODE IN <iterate close=")" open="(" conjunction="," property="companyCodes">#companyCodes[]#</iterate>
         </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="inventTypeDetails">
+            INVENT_TYPE_DETAIL IN <iterate close=")" open="(" conjunction="," property="inventTypeDetails">#inventTypeDetails[]#</iterate>
+        </isNotEmpty>
     </sql>
 
     <sql id="idCondition">
@@ -161,13 +165,14 @@
         INV_UNIT_WEIGHT,  <!-- 库存单重 -->
         INV_WEIGHT,  <!-- 库存重量 -->
         FACTORY_CODE,  <!-- 厂区编码 -->
-        FACTORY_NAME  <!-- 厂区名称 -->
+        FACTORY_NAME,  <!-- 厂区名称 -->
+        INVENT_TYPE_DETAIL
         ) VALUES (
         #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#,
         #updatedBy#, #updatedName#, #updatedTime#, #deleteFlag#, #companyCode#,
         #companyName#, #whCode#, #whName#, #inventType#, #inventCode#,
         #inventName#, #specId#, #spec#, #material#, #unit#, #length#, #width#,
-        #thick#, #consQuantity#, #invUnitWeight#, #consWeight#, #factoryCode#, #factoryName#
+        #thick#, #consQuantity#, #invUnitWeight#, #consWeight#, #factoryCode#, #factoryName#,#inventTypeDetail#
         )
     </insert>
 

src/main/java/com/baosight/hggp/hg/yx/sql/HGYX002A.xml

@@ -57,7 +57,8 @@
 		WEIGHT	as "weight",  <!-- 发货重量 -->
 		RETURN_QUANTITY	as "returnQuantity",  <!-- 退货数量 -->
 		RETURN_WEIGHT	as "returnWeight",  <!-- 退货重量 -->
-		PARENT_ID	as "parentId" <!-- 销售退货ID -->
+		PARENT_ID	as "parentId", <!-- 销售退货ID -->
+		INVENT_TYPE_DETAIL as "inventTypeDetail"
 	</sql>
 	<sql id="condition">
 		<include refid="HGXSDataAuth.authCondition"/>
@@ -139,6 +140,9 @@
 		<isNotEmpty prepend=" AND " property="companyCodes">
 			COMPANY_CODE IN <iterate close=")" open="(" conjunction="," property="companyCodes">#companyCodes[]#</iterate>
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="inventTypeDetails">
+			INVENT_TYPE_DETAIL IN <iterate close=")" open="(" conjunction="," property="inventTypeDetails">#inventTypeDetails[]#</iterate>
+		</isNotEmpty>
 	</sql>
 
 	<select id="query" parameterClass="HashMap" resultClass="HGYX002A">
@@ -261,9 +265,10 @@
 										WEIGHT,  <!-- 发货重量 -->
 										RETURN_QUANTITY,  <!-- 退货数量 -->
 										RETURN_WEIGHT,  <!-- 退货重量 -->
-										PARENT_ID  <!-- 销售退货ID -->
+										PARENT_ID,  <!-- 销售退货ID -->
+		INVENT_TYPE_DETAIL
 										)
-	    VALUES (#id#, #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #deleteFlag#, #inventRecordId#, #inventType#, #inventCode#, #inventName#, #spec#, #length#, #width#, #thick#, #quantity#, #unitWeight#, #weight#, #returnQuantity#, #returnWeight#, #parentId#)
+	    VALUES (#id#, #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #deleteFlag#, #inventRecordId#, #inventType#, #inventCode#, #inventName#, #spec#, #length#, #width#, #thick#, #quantity#, #unitWeight#, #weight#, #returnQuantity#, #returnWeight#, #parentId#,#inventTypeDetail#)
 	</insert>
 
 	<delete id="delete">
@@ -296,7 +301,8 @@
 					WEIGHT	= #weight#,   <!-- 发货重量 -->
 					RETURN_QUANTITY	= #returnQuantity#,   <!-- 退货数量 -->
 					RETURN_WEIGHT	= #returnWeight#,   <!-- 退货重量 -->
-					PARENT_ID	= #parentId#  <!-- 销售退货ID -->
+					PARENT_ID	= #parentId#,  <!-- 销售退货ID -->
+		    INVENT_TYPE_DETAIL = #inventTypeDetail#
 			WHERE
 			ID = #id#
 	</update>

src/main/java/com/baosight/hggp/hg/yx/sql/HGYX002C.xml

@@ -26,7 +26,8 @@
         A.WEIGHT	as "weight",  <!-- 发货重量 -->
         '0' as "returnQuantity",  <!-- 退货数量 -->
         '0'	as "returnWeight",  <!-- 退货重量 -->
-        A.PARENT_ID	as "parentId" <!-- 销售退货ID -->
+        A.PARENT_ID	as "parentId", <!-- 销售退货ID -->
+        A.INVENT_TYPE_DETAIL as "inventTypeDetail"
     </sql>
     <sql id="authCondition">
         <!-- 无权限时使用 -->
@@ -121,6 +122,9 @@
         <isNotEmpty prepend=" AND " property="companyCodes">
             A.COMPANY_CODE IN <iterate close=")" open="(" conjunction="," property="companyCodes">#companyCodes[]#</iterate>
         </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="inventTypeDetails">
+            A.INVENT_TYPE_DETAIL IN <iterate close=")" open="(" conjunction="," property="inventTypeDetails">#inventTypeDetails[]#</iterate>
+        </isNotEmpty>
     </sql>
 
     <select id="query" parameterClass="java.util.HashMap" resultClass="HGYX002C">

src/main/webapp/HG/PZ/HGPZ005.js

@@ -10,7 +10,8 @@ $(function() {
 			pageSize: 20,
 			pageSizes: [10, 20, 30, 50, 100, 200]
 		},
-		columns: [{
+		columns: [
+			{
 			field: "operator",
 			title: "操作",
 			template: function (item) {
@@ -67,6 +68,22 @@ $(function() {
 				return showUserName(options.updatedBy, options.updatedName);
 			}
 		}],
+		loadComplete: function(grid) {
+			// 此 grid 对象
+			// 处理父子级联动,通过监听 change 事件，判断父级节点是否发生变化
+			grid.dataSource.bind("change", function(e) {
+				// 判断父级节点是否发生变化
+				if (e.field === "inventType") {
+					let item = e.items[0];
+					for (let j = 0; j < inventTypeBox.length; j++) {
+						if (inventTypeBox[j].valueField === item.inventType){
+							resultGrid.setCellValue(item, "inventTypeDetail", inventTypeBox[j].param3Field);
+							break;
+						}
+					}
+				}
+			});
+		},
 		onSuccess: function (e) {
 			if(e.eiInfo.extAttr.methodName == 'save'
 				||e.eiInfo.extAttr.methodName == 'delete' ){

src/main/webapp/HG/PZ/HGPZ005.jsp

@@ -32,6 +32,7 @@
 							  columnTemplate="#=textField#" itemTemplate="#=textField#" readonly="false"
 							  filter="contains">
 			</EF:EFComboColumn>
+			<EF:EFColumn ename="inventTypeDetail" cname="存货类型大类" hidden="true"/>
 			<EF:EFColumn ename="inventName" cname="存货名称" width="120" align="center" required="true"/>
 			<EF:EFColumn ename="spec" cname="规格" width="140" align="center" maxLength="50"/>
 			<EF:EFColumn ename="length" cname="长(MM)" width="100" align="right" format="{0:N2}" maxLength="10"/>

src/main/webapp/HG/PZ/HGPZ007.js

 $(function() {
 
-	var whTypeBox = __eiInfo.getBlock("wh_type_block_id").getMappedRows();
+	//var whTypeBox = __eiInfo.getBlock("invent_type_box_block_id").getMappedRows();
 
 	// 查询
 	$("#QUERY").on("click", query);
@@ -11,16 +11,6 @@ $(function() {
 			pageSizes: [10, 20, 30, 50, 100, 200]
 		},
 		columns: [{
-			field: "whType",
-			filter: function (options) {
-				return _.filter(whTypeBox, function (item) {
-					return item["param1Field"]=="true";
-				})
-			},
-			editor: function (container, options) {
-				this.filter(options);
-			}
-		},{
 			field: "createdName",
 			template: function (options) {
 				return showUserName(options.createdBy, options.createdName);

src/main/webapp/HG/PZ/HGPZ007.jsp

@@ -9,7 +9,7 @@
 		<div class="row">
 			<EF:EFSelect cname="仓库类型" ename="inqu_status-0-whType" colWidth="3" filter="contains">
 				<EF:EFOption label="全部" value=""/>
-				<EF:EFOptions blockId="wh_type_block_id" textField="textField" valueField="valueField"/>
+				<EF:EFCodeOption codeName="hggp.hgpz.inventTypeDetail"/>
 			</EF:EFSelect>
 			<EF:EFInput cname="仓库名称:" ename="whName" blockId="inqu_status" row="0" colWidth="3"/>
 			<EF:EFSelect blockId="inqu_status" row="0" ename="status" cname="状态" colWidth="3" filter="contains">
@@ -24,9 +24,10 @@
 			<EF:EFColumn ename="id" cname="主键" hidden="true"/>
 			<EF:EFColumn cname="仓库编码" ename="whCode" width="140" align="center" enable="false"/>
 			<EF:EFComboColumn ename="whType" cname="仓库类型" width="120" align="center" required="true"
-							  blockName="wh_type_block_id" textField="textField" valueField="valueField"
+							  textField="textField" valueField="valueField"
 							  columnTemplate="#=textField#" itemTemplate="#=textField#" readonly="false"
 							  filter="contains">
+				<EF:EFCodeOption codeName="hggp.hgpz.inventTypeDetail"/>
 			</EF:EFComboColumn>
 			<EF:EFColumn cname="仓库名称" ename="whName" width="120" align="center" readonly="true" required="true"/>
 			<EF:EFColumn cname="负责人" ename="princ" align="center" width="120" readonly="true" required="true" />

src/main/webapp/HG/PZ/HGPZ010.js

@@ -181,6 +181,7 @@ $(function() {
 							resultGrid.setCellValue(item, 'inventName', InventNameGlobalData[i]['textField']);
 							resultGrid.setCellValue(item, 'material', InventNameGlobalData[i]['param5Field']);
 							resultGrid.setCellValue(item, 'unit', InventNameGlobalData[i]['param6Field']);
+							break;
 						}
 					}
 					loadChange(grid,e,"warnNum");
@@ -251,6 +252,7 @@ let query = function () {
  */
 let initWh = function () {
 	let inInfo = new EiInfo();
+	inInfo.set("inqu_status-0-inventTypeDetails", [1,2,3,4]);
 	EiCommunicator.send("HGPZ007", "queryWhCodeBox", inInfo, {
 		onSuccess: function (ei) {
 			WhNameGlobalData = ei.getBlock("wh_code_block_id").getMappedRows();
@@ -265,6 +267,7 @@ let initWh = function () {
  */
 let initInvent = function () {
 	let inInfo = new EiInfo();
+	inInfo.set("inqu_status-0-inventTypeDetails", [1,2,3,4]);
 	EiCommunicator.send("HGPZ005", "queryInventCodeBox", inInfo, {
 		onSuccess: function (ei) {
 			InventNameGlobalData = ei.getBlock("invent_record_box_block_id").getMappedRows();
@@ -279,7 +282,7 @@ let initInvent = function () {
  */
 let initSpec = function () {
 	let inInfo = new EiInfo();
-	//inInfo.set("inqu_status-0-inventTypes", [1, 2]);
+	inInfo.set("inqu_status-0-inventTypes", [1,2,3,4]);
 	inInfo.set("inqu_status-0-isSplicingSymbol", false);
 	EiCommunicator.send("HGPZ005", "queryInventBoxAll", inInfo, {
 		onSuccess: function (ei) {

src/main/webapp/HG/YX/HGYX001A.js

@@ -149,6 +149,7 @@ $(function() {
 
         //IPLAT.EFSelect.setDataSource(consCode,company);
         IPLAT.EFSelect.value(consCode,proj[0]["param1Field"]);
+        $("#inqu_status-0-consName").val(proj[0]["param2Field"]);
     })
 
     $("#inqu_status-0-consCode").change(function () {

src/main/webapp/HG/YX/HGYX001A.jsp

@@ -77,6 +77,7 @@
                               columnTemplate="#=textField#" itemTemplate="#=textField#" readonly="false"
                               filter="contains">
             </EF:EFComboColumn>
+            <EF:EFColumn ename="inventTypeDetail" cname="存货类型大类" hidden="true"/>
             <EF:EFComboColumn ename="inventCode" cname="存货名称" enable="false" width="120" align="center" required="true"
                               blockName="invent_code_box_block_id" textField="textField" valueField="valueField"
                               columnTemplate="#=textField#" itemTemplate="#=textField#" readonly="false"

src/main/webapp/HG/YX/HGYX001C.jsp

@@ -32,6 +32,7 @@
                               columnTemplate="#=textField#" itemTemplate="#=textField#" readonly="true"
                               filter="contains">
             </EF:EFComboColumn>
+            <EF:EFColumn ename="inventTypeDetail" cname="存货类型大类" hidden="true"/>
             <EF:EFComboColumn ename="inventCode" cname="存货名称" enable="true" width="120" align="center" required="true"
                               blockName="invent_record_block_id" textField="textField" valueField="valueField"
                               columnTemplate="#=textField#" itemTemplate="#=textField#" readonly="true"

src/main/webapp/HG/YX/HGYX002A.jsp

@@ -74,6 +74,7 @@
                               columnTemplate="#=textField#" itemTemplate="#=textField#" readonly="false"
                               filter="contains">
             </EF:EFComboColumn>
+            <EF:EFColumn ename="inventTypeDetail" cname="存货类型大类" hidden="true"/>
             <EF:EFComboColumn ename="inventCode" cname="存货名称" enable="false" width="120" align="center" required="true"
                               blockName="invent_code_box_block_id" textField="textField" valueField="valueField"
                               columnTemplate="#=textField#" itemTemplate="#=textField#" readonly="false"

src/main/webapp/HG/YX/HGYX002C.jsp

@@ -33,6 +33,7 @@
                               columnTemplate="#=textField#" itemTemplate="#=textField#"
                               filter="contains">
             </EF:EFComboColumn>
+            <EF:EFColumn ename="inventTypeDetail" cname="存货类型大类" hidden="true"/>
             <EF:EFComboColumn ename="inventCode" cname="存货名称" enable="true" readonly="true" width="120" align="center" required="true"
                               blockName="invent_record_block_id" textField="textField" valueField="valueField"
                               columnTemplate="#=textField#" itemTemplate="#=textField#"