存货档案区分材料和产品，实时库存区分材料和产品

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

@@ -84,6 +84,10 @@ public enum InventTypeDetailEnum {
         return new Integer[]{CONSUMABLE.code};
     }
 
+    public static Integer[] getInentTypeeSeven(){
+        return new Integer[]{RAW.code,CONSUMABLE.code};
+    }
+
     public static EiBlock generatorEiBlock() {
         EiBlock block = new EiBlock("invent_type_detail_block_id");
         List<Map<String, Object>> rows = new ArrayList<Map<String, Object>>() {{

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

@@ -2,8 +2,10 @@ package com.baosight.hggp.hg.kc.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.dao.DaoUtils;
 import com.baosight.hggp.core.security.UserSessionUtils;
+import com.baosight.hggp.hg.cw.domain.HGCW002;
 import com.baosight.hggp.hg.kc.domain.HGKC010;
 import com.baosight.hggp.hg.pz.domain.HGPZ005;
 import com.baosight.hggp.hg.pz.domain.HGPZ007;
@@ -13,6 +15,7 @@ import com.baosight.hggp.util.CommonMethod;
 import com.baosight.hggp.util.EiInfoUtils;
 import com.baosight.hggp.util.LogUtils;
 import com.baosight.hggp.util.MapUtils;
+import com.baosight.hggp.util.contants.ACConstants;
 import com.baosight.iplat4j.core.ei.EiConstant;
 import com.baosight.iplat4j.core.ei.EiInfo;
 import com.baosight.iplat4j.core.exception.PlatException;
@@ -42,11 +45,12 @@ public class ServiceHGKC010 extends ServiceBase {
 	@OperationLogAnnotation(operModul = "综合库存", operType = "查询", operDesc = "初始化")
 	public EiInfo initLoad(EiInfo inInfo) {
 		try {
+			Map<String, Object> paramMap = new HashMap<>();
+			paramMap.put("inventTypeDetails", InventTypeDetailEnum.getInentTypeeSeven());
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.COMPANY_CODE_BLOCK_ID));
-			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_TYPE_BLOCK_ID));
-			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_RECORD_BLOCK_ID));
-			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SPEC_NAME_BLOCK_ID));
-			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.WH_RECORD_BLOCK_ID));
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_TYPE_BLOCK_ID),paramMap);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_RECORD_BLOCK_ID),paramMap);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.WH_RECORD_BLOCK_ID),paramMap);
 			EiInfoUtils.addBlock(inInfo,"roleCompany", UserSessionUtils.getRoleCompany(), Company.class);
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGKC010().eiMetadata);
 		} catch (Exception e) {
@@ -66,6 +70,7 @@ public class ServiceHGKC010 extends ServiceBase {
 	public EiInfo query(EiInfo inInfo) {
 		try {
 			Map queryRow = EiInfoUtils.getFirstRow(inInfo);
+			inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, "inventTypeDetails", InventTypeDetailEnum.getInentTypeeSeven());
 			inInfo = super.query(inInfo, HGKC010.QUERY, new HGKC010());
 		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "查询失败");

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

+package com.baosight.hggp.hg.kc.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.dao.DaoUtils;
+import com.baosight.hggp.core.security.UserSessionUtils;
+import com.baosight.hggp.hg.kc.domain.HGKC010;
+import com.baosight.hggp.hg.pz.domain.HGPZ005;
+import com.baosight.hggp.hg.pz.domain.HGPZ007;
+import com.baosight.hggp.hg.xs.domain.Company;
+import com.baosight.hggp.util.CommonMethod;
+import com.baosight.hggp.util.EiInfoUtils;
+import com.baosight.hggp.util.LogUtils;
+import com.baosight.hggp.util.MapUtils;
+import com.baosight.hggp.util.contants.ACConstants;
+import com.baosight.iplat4j.core.ei.EiConstant;
+import com.baosight.iplat4j.core.ei.EiInfo;
+import com.baosight.iplat4j.core.exception.PlatException;
+import com.baosight.iplat4j.core.service.impl.ServiceBase;
+import com.baosight.iplat4j.core.service.soa.XLocalManager;
+import com.baosight.iplat4j.core.util.DateUtils;
+import com.baosight.iplat4j.core.web.threadlocal.UserSession;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
+
+import java.math.BigDecimal;
+import java.util.*;
+
+/**
+ * @author:songx
+ * @date:2024/5/9,11:04
+ */
+public class ServiceHGKC010B extends ServiceBase {
+
+	/**
+	 * 画面初始化
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@Override
+	@OperationLogAnnotation(operModul = "综合库存", operType = "查询", operDesc = "初始化")
+	public EiInfo initLoad(EiInfo inInfo) {
+		try {
+			Map<String, Object> paramMap = new HashMap<>();
+			paramMap.put("inventTypeDetails", InventTypeDetailEnum.getInentTypeTwo());
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.COMPANY_CODE_BLOCK_ID));
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_TYPE_BLOCK_ID),paramMap);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_RECORD_BLOCK_ID),paramMap);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.WH_RECORD_BLOCK_ID),paramMap);
+			EiInfoUtils.addBlock(inInfo,"roleCompany", UserSessionUtils.getRoleCompany(), Company.class);
+			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGKC010().eiMetadata);
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
+		}
+		return inInfo;
+	}
+
+	/**
+	 * 查询操作
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@Override
+	@OperationLogAnnotation(operModul = "综合库存", operType = "查询", operDesc = "查询")
+	public EiInfo query(EiInfo inInfo) {
+		try {
+			Map queryRow = EiInfoUtils.getFirstRow(inInfo);
+			inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, "inventTypeDetails", InventTypeDetailEnum.getInentTypeTwo());
+			inInfo = super.query(inInfo, HGKC010.QUERY, new HGKC010());
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "查询失败");
+		}
+		return inInfo;
+	}
+
+
+	/**
+	 * 实时库存下拉框
+	 * @param inInfo
+	 * @return
+	 */
+	public EiInfo queryInventCodeBox(EiInfo inInfo){
+		Map queryMap = EiInfoUtils.getFirstRow(inInfo);
+		String whCode = MapUtils.getString(queryMap, HGKC010.FIELD_WH_CODE);
+		String inventType = MapUtils.getString(queryMap, HGKC010.FIELD_INVENT_TYPE);
+		String companyCode = MapUtils.getString(queryMap, HGKC010.FIELD_COMPANY_CODE);
+		Map map = new HashMap();
+		map.put(HGKC010.FIELD_ACCOUNT_CODE, UserSessionUtils.getAccountCode());
+		map.put(HGKC010.FIELD_WH_CODE, whCode);
+		map.put(HGKC010.FIELD_INVENT_TYPE, inventType);
+		map.put(HGKC010.FIELD_COMPANY_CODE, companyCode);
+		CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_CODE_BOX_BLOCK_ID), map,false);
+		return inInfo;
+
+	}
+
+	/**
+	 * 实时库存规格下拉框
+	 * @param inInfo
+	 * @return
+	 */
+	public EiInfo querySpecBox(EiInfo inInfo){
+		Map queryMap = EiInfoUtils.getFirstRow(inInfo);
+		String whCode = MapUtils.getString(queryMap, HGKC010.FIELD_WH_CODE);
+		String inventType = MapUtils.getString(queryMap, HGKC010.FIELD_INVENT_TYPE);
+		String inventCode = MapUtils.getString(queryMap, HGKC010.FIELD_INVENT_CODE);
+		Map map = new HashMap();
+		map.put(HGKC010.FIELD_ACCOUNT_CODE, UserSessionUtils.getAccountCode());
+		map.put(HGKC010.FIELD_WH_CODE, whCode);
+		map.put(HGKC010.FIELD_INVENT_TYPE, inventType);
+		map.put(HGKC010.FIELD_INVENT_CODE, inventCode);
+		CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SPEC_BOX_BLOCK_ID), map,false);
+		return inInfo;
+
+	}
+
+	/**
+	 * 更新库存
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@OperationLogAnnotation(operModul = "实时库存管理", operType = "修改", operDesc = "更新库存")
+	public EiInfo updateStock(EiInfo inInfo) {
+		String whCode = inInfo.getString(HGKC010.FIELD_WH_CODE);
+		String whName = inInfo.getString(HGKC010.FIELD_WH_NAME);
+		Long inventRecordId = Long.parseLong(inInfo.getString(HGKC010.FIELD_SPEC_ID));
+		BigDecimal amount = new BigDecimal(inInfo.getString(HGKC010.FIELD_INV_QTY));
+		BigDecimal weight = new BigDecimal(inInfo.getString(HGKC010.FIELD_INV_WEIGHT));
+		String unitWeightStr = inInfo.getString(HGKC010.FIELD_INV_UNIT_WEIGHT);
+		BigDecimal unitWeight = unitWeightStr == null ? BigDecimal.ZERO : new BigDecimal(unitWeightStr);
+		String companyCode = inInfo.getString(HGKC010.FIELD_COMPANY_CODE);
+		String companyName = inInfo.getString(HGKC010.FIELD_COMPANY_NAME);
+		try {
+			checkUpdateStockParam(companyCode, whCode, inventRecordId, amount, weight);
+			HGKC010 newObj = generatorBaseInfo(companyCode, companyName, whCode, whName, inventRecordId, amount, unitWeight, weight);
+			List<HGKC010> list = dao.query(HGKC010.QUERY, new HashMap<String, Object>() {{
+				put(HGKC010.FIELD_COMPANY_CODE, companyCode);
+				put(HGKC010.FIELD_WH_CODE, whCode);
+				put(HGKC010.FIELD_SPEC_ID, inventRecordId);
+			}});
+			if (CollectionUtils.isEmpty(list)) {
+				//新增
+				if (amount.compareTo(BigDecimal.ZERO) < 0
+						|| weight.compareTo(BigDecimal.ZERO) < 0) {
+					throw new PlatException("当前库存为空，库存变更数量与重量不能小于等于0！");
+				}
+				generatorBaseInfo(newObj);
+				newObj.setCompanyCode(companyCode);
+				newObj.setCompanyName(companyName);
+				DaoUtils.insert(HGKC010.INSERT, newObj);
+			} else {
+				//修改
+				HGKC010 oldObj = list.get(0);
+				BigDecimal afterAmout = oldObj.getInvQty().add(amount);
+				BigDecimal afterWeight = oldObj.getInvWeight().add(weight);
+				if (afterAmout.compareTo(BigDecimal.ZERO) < 0 || afterWeight.compareTo(BigDecimal.ZERO) < 0) {
+					throw new PlatException("库存更新失败,出库数量与重量不能大于当前库存！");
+				}
+				oldObj.setInvQty(afterAmout);
+				oldObj.setInvWeight(afterWeight);
+				oldObj.setUpdatedBy(newObj.getUpdatedBy());
+				oldObj.setUpdatedName(newObj.getUpdatedName());
+				oldObj.setUpdatedTime(newObj.getUpdatedTime());
+				int result = DaoUtils.update(HGKC010.UPDATE_INV,oldObj);
+				if(result!=1){
+					throw new PlatException("库存更新失败，库存已发生变更或系统异常，请重试！");
+				}
+			}
+			inInfo.setStatus(EiConstant.STATUS_SUCCESS);
+			inInfo.setMsg("库存更新成功！");
+		} catch (PlatException e) {
+			LogUtils.setDetailMsg(inInfo, e, "库存更新失败!");
+		}
+		return inInfo;
+	}
+
+	/**
+	 * 生成库存对象
+	 *
+	 * @param companyCode
+	 * @param whCode
+	 * @param inventRecordId
+	 * @param amout
+	 * @param weight
+	 * @reutrn HPKC010
+	 */
+	private HGKC010 generatorBaseInfo(String companyCode,String companyName,String whCode, String whName, Long inventRecordId, BigDecimal amout,
+									  BigDecimal unitWeight, BigDecimal weight) {
+		HGKC010 hpkc010 = new HGKC010();
+		hpkc010.setCompanyCode(companyCode);
+		hpkc010.setCompanyName(companyName);
+		hpkc010.setWhName(whName);
+		hpkc010.setWhCode(whCode);
+		hpkc010.setSpecId(inventRecordId);
+		hpkc010.setInvQty(amout);
+		hpkc010.setInvUnitWeight(unitWeight);
+		hpkc010.setInvWeight(weight);
+		String userId = UserSession.getLoginName();
+		String userName = UserSession.getLoginCName();
+		String time = DateUtils.curDateTimeStr14();
+		hpkc010.setCreatedBy(userId);
+		hpkc010.setCreatedName(userName);
+		hpkc010.setCreatedTime(time);
+		hpkc010.setUpdatedBy(userId);
+		hpkc010.setUpdatedName(userName);
+		hpkc010.setUpdatedTime(time);
+		return hpkc010;
+	}
+
+	private void generatorBaseInfo(HGKC010 hpkc010) {
+		String whName = "";
+		String inventType = "";
+		String inventCode = "";
+		String inventName = "";
+		Integer inventTypeDetail = 0;
+		EiInfo inInfo = new EiInfo();
+		try {
+			inInfo.set(HGKC010.FIELD_WH_CODE, hpkc010.getWhCode());
+			inInfo.set(EiConstant.serviceName, "HPPZ007");
+			inInfo.set(EiConstant.methodName, "queryByWhCode");
+			EiInfo outInfo = XLocalManager.call(inInfo);
+			List<HGPZ007> whNameList = (List) outInfo.get("list");
+			whName = whNameList.get(0).getWhName();
+		}catch (Exception e){
+			LogUtils.setDetailMsg(inInfo, e, "库存更新失败!");
+			throw new PlatException("仓库编码异常，找不到对应的仓库档案！");
+		}
+		try {
+			inInfo.setRows(EiConstant.queryBlock,new ArrayList(){{add(new HashMap<String,Object>(){{put("id",hpkc010.getSpecId());}});}});
+			inInfo.set(EiConstant.serviceName, "HPPZ005");
+			inInfo.set(EiConstant.methodName, "query");
+			EiInfo outInfo = XLocalManager.call(inInfo);
+			HGPZ005 hppz005 = new HGPZ005();
+			List<Map> inventList =  outInfo.getBlock(EiConstant.resultBlock).getRows();
+			hppz005.fromMap(inventList.get(0));
+			inventType = hppz005.getInventType();
+			inventCode = hppz005.getInventCode();
+			inventName = hppz005.getInventName();
+			inventTypeDetail = hppz005.getInventTypeDetail();
+		}catch (Exception e){
+			LogUtils.setDetailMsg(inInfo, e, "库存更新失败!");
+			throw new PlatException("存货档案ID异常，找不到对应的存货档案！");
+		}
+		hpkc010.setWhName(whName);
+		hpkc010.setInventType(inventType.toString());
+		hpkc010.setInventCode(inventCode);
+		hpkc010.setInventName(inventName);
+		hpkc010.setInventTypeDetail(inventTypeDetail);
+		//hpkc010.setVersion(new Integer(1));
+	}
+
+	/**
+	 * 校验库存变更请求参数
+	 * @param companyCode
+	 * @param whCode
+	 * @param inventRecordId
+	 * @param amout
+	 * @param weight
+	 */
+	private void checkUpdateStockParam(String companyCode, String whCode, Long inventRecordId
+			, BigDecimal amout, BigDecimal weight){
+		if(StringUtils.isBlank(companyCode)){
+			throw new PlatException("企业编码不能为空！");
+		}
+		if(StringUtils.isBlank(whCode)){
+			throw new PlatException("仓库编码不能为空！");
+		}
+		if(Objects.isNull(inventRecordId)||inventRecordId==0){
+			throw new PlatException("存货档案ID不能为空！");
+		}
+		if(Objects.isNull(amout)||
+				Objects.isNull(amout)){
+			throw new PlatException("库存变更数量或重量不能为空！");
+		}
+		if(amout.compareTo(BigDecimal.ZERO)==0
+				&&weight.compareTo(BigDecimal.ZERO)==0){
+			throw new PlatException("库存变更数量或重量不能为0)！");
+		}
+	}
+
+}

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

@@ -54,7 +54,7 @@ public class ServiceHGPZ005 extends ServiceBase {
 		try {
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_TYPE_BOX_BLOCK_ID),
 					new HashMap<String, Object>(){{
-						put(HGPZ004.FIELD_INVENT_TYPE_DETAILS, InventTypeDetailEnum.getProdTypeFour());
+						put(HGPZ004.FIELD_INVENT_TYPE_DETAILS, InventTypeDetailEnum.getInentTypeeSeven());
 						put("notInventType", HGSqlConstant.HgPz005.NOT_INVENT_TYPE);
 			}}, false);
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGPZ005().eiMetadata);
@@ -74,6 +74,7 @@ public class ServiceHGPZ005 extends ServiceBase {
 	@OperationLogAnnotation(operModul = "存货档案", operType = "查询", operDesc = "查询")
 	public EiInfo query(EiInfo inInfo) {
 		try {
+			inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, "inventTypeDetails", InventTypeDetailEnum.getInentTypeeSeven());
 			inInfo = super.query(inInfo, HGPZ005.QUERY, new HGPZ005());
 		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "查询失败");

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

+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.dao.DaoBase;
+import com.baosight.hggp.core.dao.DaoUtils;
+import com.baosight.hggp.hg.cb.domain.HGCB003;
+import com.baosight.hggp.hg.constant.HGSqlConstant;
+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.pz.tools.HGPZTools;
+import com.baosight.hggp.hg.sj.domain.HGSJ002;
+import com.baosight.hggp.hg.sj.domain.HGSJ002A;
+import com.baosight.hggp.hg.sj.tools.HGSJTools;
+import com.baosight.hggp.hg.xs.tools.HGXSTools;
+import com.baosight.hggp.util.*;
+import com.baosight.hggp.util.contants.ACConstants;
+import com.baosight.iplat4j.core.ei.EiConstant;
+import com.baosight.iplat4j.core.ei.EiInfo;
+import com.baosight.iplat4j.core.exception.PlatException;
+import com.baosight.iplat4j.core.service.impl.ServiceBase;
+
+import java.math.BigDecimal;
+import java.util.*;
+
+/**
+ * 存货档案
+ *
+ * @author:songx
+ * @date:2024/1/15,11:20
+ */
+public class ServiceHGPZ005C extends ServiceBase {
+
+	/**
+	 * 画面初始化
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@Override
+	@OperationLogAnnotation(operModul = "存货档案", operType = "查询", operDesc = "初始化")
+	public EiInfo initLoad(EiInfo inInfo) {
+		try {
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_TYPE_BOX_BLOCK_ID),
+					new HashMap<String, Object>(){{
+						put(HGPZ004.FIELD_INVENT_TYPE_DETAILS, InventTypeDetailEnum.getInentTypeTwo());
+						put("notInventType", HGSqlConstant.HgPz005.NOT_INVENT_TYPE);
+			}}, false);
+			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGPZ005().eiMetadata);
+		} catch (PlatException e) {
+			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
+		}
+		return inInfo;
+	}
+
+	/**
+	 * 查询数据列表
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@Override
+	@OperationLogAnnotation(operModul = "存货档案", operType = "查询", operDesc = "查询")
+	public EiInfo query(EiInfo inInfo) {
+		try {
+			//查询产品
+			inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, "inventTypeDetails", InventTypeDetailEnum.getInentTypeTwo());
+			inInfo = super.query(inInfo, HGPZ005.QUERY, new HGPZ005());
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "查询失败");
+		}
+		return inInfo;
+	}
+
+	/**
+	 * 保存操作.
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@OperationLogAnnotation(operModul = "存货档案", operType = "插入", operDesc = "保存")
+	public EiInfo save(EiInfo inInfo) {
+		try {
+			List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
+			// 数据校验
+			this.checkSaveData(resultRows);
+			// 写入数据
+			for (Map resultRow : resultRows) {
+				HGPZ005 hgpz005 = new HGPZ005();
+				hgpz005.fromMap(resultRow);
+
+				// 设置规格
+				if (StringUtils.isBlank(hgpz005.getSpec())) {
+					hgpz005.setSpec(HGPZTools.HgPz005.jointSpec(hgpz005.getLength(), hgpz005.getWidth(), hgpz005.getThick()));
+				}
+				// 去除空格
+				hgpz005.setSpec(StringUtils.trimToEmpty(hgpz005.getSpec()));
+				if (hgpz005.getId() == null || hgpz005.getId() == 0) {
+					this.add(hgpz005);
+				} else {
+					this.modify(hgpz005);
+				}
+			}
+			inInfo = this.query(inInfo);
+			inInfo.setStatus(EiConstant.STATUS_DEFAULT);
+			inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据保存成功!");
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "保存失败");
+		}
+		return inInfo;
+	}
+
+	/**
+	 * 校验保存的数据
+	 *
+	 * @param resultRows
+	 */
+	private void checkSaveData(List<Map> resultRows) {
+		// 数据校验
+		for (int i = 0; i < resultRows.size(); i++) {
+			HGPZ005 hgpz005 = new HGPZ005();
+			hgpz005.fromMap(resultRows.get(i));
+			AssertUtils.isNull(hgpz005.getStatus(), "是否启用不能为空");
+		}
+	}
+
+	/**
+	 * 新增企业信息
+	 *
+	 * @param hgpz005
+	 * @throws Exception
+	 */
+	private void add(HGPZ005 hgpz005) throws Exception {
+		//hgpz005.setInventCode(SequenceGenerator.getNextSequence(HGConstant.SequenceId.INVENT_CODE));
+		Map<String, Object> params = new HashMap<>();
+		params.put(HGPZ005.FIELD_INVENT_CODE, hgpz005.getInventCode());
+		List list = DaoBase.getInstance().query(HGPZ005.QUERY, params);
+		AssertUtils.isNotEmpty(list, String.format("存货编码[%s]已存在", hgpz005.getInventCode()));
+		DaoUtils.insert(HGPZ005.INSERT, hgpz005);
+	}
+
+	/**
+	 * 修改数据
+	 *
+	 * @param hgpz005
+	 */
+	private void modify(HGPZ005 hgpz005) {
+		DaoUtils.update(HGPZ005.UPDATE, hgpz005);
+	}
+
+	/**
+	 * 新增操作.
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@Override
+	@OperationLogAnnotation(operModul = "存货档案", operType = "新增", operDesc = "新增")
+	public EiInfo insert(EiInfo inInfo) {
+		try {
+			List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
+			// 数据校验
+			this.checkSaveData(resultRows);
+			// 数据写入
+			for (int i = 0; i < resultRows.size(); i++) {
+				HGPZ005 hgpz005 = new HGPZ005();
+				hgpz005.fromMap(resultRows.get(i));
+				this.add(hgpz005);
+			}
+			inInfo = this.query(inInfo);
+			inInfo.setStatus(EiConstant.STATUS_DEFAULT);
+			inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据新增成功!");
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "新增失败");
+		}
+		return inInfo;
+	}
+
+
+	/**
+	 * 修改操作
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@OperationLogAnnotation(operModul = "存货档案", operType = "修改", operDesc = "修改操作")
+	@Override
+	public EiInfo update(EiInfo inInfo) {
+		try {
+			List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
+			// 数据校验
+			this.checkSaveData(resultRows);
+			for (Map resultRow : resultRows) {
+				HGPZ005 hppz009 = new HGPZ005();
+				hppz009.fromMap(resultRow);
+				DaoUtils.update(HGPZ005.UPDATE, hppz009);
+			}
+			inInfo = this.query(inInfo);
+			inInfo.setStatus(EiConstant.STATUS_DEFAULT);
+			inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据修改成功!");
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "修改失败");
+		}
+		return inInfo;
+	}
+
+	/**
+	 * 删除操作
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@OperationLogAnnotation(operModul = "存货档案", operType = "删除", operDesc = "删除操作")
+	@Override
+	public EiInfo delete(EiInfo inInfo) {
+		try {
+			List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
+			for (Map resultRow : resultRows) {
+				HGPZ005 hgpz005 = new HGPZ005();
+				hgpz005.fromMap(resultRow);
+				// 校验企业下是否存在用户
+				int count = HGXSTools.XsUser.countByAccount(hgpz005.getAccountCode());
+				if (count > 0) {
+//					throw new PlatException(String.format("企业[%s]已关联用户，请先解除用户", hgpz005.getAccountName()));
+				}
+				DaoUtils.update(HGPZ005.DELETE, hgpz005);
+			}
+			inInfo = this.query(inInfo);
+			inInfo.setStatus(EiConstant.STATUS_DEFAULT);
+			inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据删除成功!");
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "修改失败");
+		}
+		return inInfo;
+	}
+
+	/**
+	 * 下拉框
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@OperationLogAnnotation(operModul = "存货档案",operType = "查询",operDesc = "下拉框")
+	public EiInfo queryComboBox(EiInfo inInfo) {
+		try {
+			List<DdynamicEnum> list = new ArrayList<>();
+			list.add(DdynamicEnum.INVENT_RECORD_BLOCK_ID);
+			CommonMethod.initBlock(inInfo, list, EiInfoUtils.getFirstRow(inInfo), false);
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "查询规格失败");
+		}
+		return inInfo;
+	}
+
+	/**
+	 * 下拉框 (不默认状态)
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@OperationLogAnnotation(operModul = "存货档案",operType = "查询",operDesc = "下拉框（不默认状态）")
+	public EiInfo queryInventCodeBox(EiInfo inInfo) {
+		try {
+			List<DdynamicEnum> list = new ArrayList<>();
+			list.add(DdynamicEnum.INVENT_RECORD_BOX_BLOCK_ID);
+			inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGPZ004.FIELD_INVENT_TYPE_DETAILS, InventTypeDetailEnum.getProdTypeFour());
+			inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGPZ005.FIELD_STATUS,1);
+			CommonMethod.initBlock(inInfo, list, EiInfoUtils.getFirstRow(inInfo), false);
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "查询规格失败");
+		}
+		return inInfo;
+	}
+
+	/**
+	 * 下拉框 (不默认状态)
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@OperationLogAnnotation(operModul = "存货档案",operType = "查询",operDesc = "下拉框（原料、零件、耗材）")
+	public EiInfo queryInventCodeProdTypeFourBox(EiInfo inInfo) {
+		try {
+			List<DdynamicEnum> list = new ArrayList<>();
+			list.add(DdynamicEnum.INVENT_RECORD_BOX_BLOCK_ID);
+			inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGPZ004.FIELD_INVENT_TYPE_DETAILS, InventTypeDetailEnum.getInentTypeThree());
+			inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGPZ005.FIELD_STATUS,1);
+			CommonMethod.initBlock(inInfo, list, EiInfoUtils.getFirstRow(inInfo), false);
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "查询规格失败");
+		}
+		return inInfo;
+	}
+
+	/**
+	 * 下拉框 (不默认状态)
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@OperationLogAnnotation(operModul = "存货档案",operType = "查询",operDesc = "下拉框（耗材）")
+	public EiInfo queryInventCodeProdTypeSixBox(EiInfo inInfo) {
+		try {
+			List<DdynamicEnum> list = new ArrayList<>();
+			list.add(DdynamicEnum.INVENT_RECORD_BOX_BLOCK_ID);
+			inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGPZ004.FIELD_INVENT_TYPE_DETAILS, InventTypeDetailEnum.getProdTypeSix());
+			inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGPZ005.FIELD_STATUS,1);
+			CommonMethod.initBlock(inInfo, list, EiInfoUtils.getFirstRow(inInfo), false);
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "查询规格失败");
+		}
+		return inInfo;
+	}
+
+	/**
+	 * 下拉框
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@OperationLogAnnotation(operModul = "存货档案",operType = "查询",operDesc = "规格下拉框")
+	public EiInfo queryComboBoxAll(EiInfo inInfo) {
+		try {
+			List<DdynamicEnum> list = new ArrayList<>();
+			list.add(DdynamicEnum.INVENT_ALL_BLOCK_ID);
+			CommonMethod.initBlock(inInfo, list, EiInfoUtils.getFirstRow(inInfo), false);
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "查询规格失败");
+		}
+		return inInfo;
+	}
+
+	/**
+	 * 下拉框
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@OperationLogAnnotation(operModul = "存货档案",operType = "查询",operDesc = "规格下拉框（不默认状态）")
+	public EiInfo queryInventBoxAll(EiInfo inInfo) {
+		try {
+			List<DdynamicEnum> list = new ArrayList<>();
+			list.add(DdynamicEnum.INVENT_ALL_BOX_BLOCK_ID);
+			CommonMethod.initBlock(inInfo, list, EiInfoUtils.getFirstRow(inInfo), false);
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "查询规格失败");
+		}
+		return inInfo;
+	}
+
+	/**
+	 * 下拉框
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@OperationLogAnnotation(operModul = "存货档案规格下拉框",operType = "查询",operDesc = "规格下拉框（不默认状态）")
+	public EiInfo queryInventSpecBox(EiInfo inInfo) {
+		try {
+			List<DdynamicEnum> list = new ArrayList<>();
+			list.add(DdynamicEnum.INVENT_SPEC_BOX_BLOCK_ID);
+			CommonMethod.initBlock(inInfo, list, EiInfoUtils.getFirstRow(inInfo), false);
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "查询规格失败");
+		}
+		return inInfo;
+	}
+
+
+	public EiInfo queryInventNameBox(EiInfo inInfo) {
+		try {
+			List<DdynamicEnum> list = new ArrayList<>();
+			list.add(DdynamicEnum.INVENT_NAME_BOX_BLOCK_ID);
+			CommonMethod.initBlock(inInfo, list, EiInfoUtils.getFirstRow(inInfo), false);
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "查询规格失败");
+		}
+		return inInfo;
+	}
+
+	@OperationLogAnnotation(operModul = "存货档案",operType = "导入",operDesc = "导入操作")
+	public EiInfo importData(EiInfo inInfo) {
+		try {
+			List<HGPZ005> dataList = (List) inInfo.get("dataList");
+			HGPZTools.HgPz005.add(dataList);
+			/*Map<String, Object> params = new HashMap<>(10);
+			String fileName = inInfo.getString("fileName");
+			params.put(HGPZ005.FIELD_ACCOUNT_CODE, UserSessionUtils.getAccountCode());
+			//解析文件，将文件中数据传入到inInfo中
+			ExcelUtils.importFromExcel(inInfo, fileName, params, new HGPZ005());*/
+			inInfo.setStatus(EiConstant.STATUS_DEFAULT);
+			inInfo.setMsg("导入成功" + dataList.size() + "条");
+		}catch (Exception e){
+			inInfo.setStatus(EiConstant.STATUS_FAILURE);
+			LogUtils.setDetailMsg(inInfo, e, "导入失败");
+		}
+		return inInfo;
+	}
+
+	@OperationLogAnnotation(operModul = "存货档案", operType = "修改", operDesc = "绑定流程")
+	public EiInfo updateFlowId(EiInfo inInfo) {
+		try {
+			List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
+			for (Map resultRow : resultRows) {
+				HGPZ005 hgpz005 = new HGPZ005();
+				hgpz005.fromMap(resultRow);
+				HGSJ002 hgsj002 = new HGSJ002();
+				hgsj002.fromMap((Map) resultRow.get("flow"));
+
+				hgpz005.setFlowId(hgsj002.getId());
+				DaoUtils.update(HGPZ005.UPDATE_FLOW_ID, hgpz005);
+				addHgpz005a(hgpz005,hgsj002);
+			}
+			inInfo.setStatus(EiConstant.STATUS_DEFAULT);
+			inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据修改成功!");
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "修改失败");
+		}
+		return inInfo;
+	}
+
+	@OperationLogAnnotation(operModul = "存货档案", operType = "修改", operDesc = "批量绑定流程")
+	public EiInfo updateFlowIds(EiInfo inInfo) {
+		try {
+			//List<Map> resultRows = inInfo.getBlock(EiConstant.queryBlock).getRows();
+			Map map = EiInfoUtils.getFirstRow(inInfo);
+			String[] ids = map.get("ids").toString().split(",");
+
+			List<HGPZ005> hgpz005List = HGPZTools.HgPz005.getIdStrs(Arrays.asList(ids));
+			Map flowMap = (Map) map.get("flow");
+			HGSJ002 hgsj002 = new HGSJ002();
+			hgsj002.fromMap(flowMap);
+			for (HGPZ005 hgpz005 : hgpz005List) {
+				hgpz005.setFlowId(hgsj002.getId());
+				DaoUtils.update(HGPZ005.UPDATE_FLOW_ID, hgpz005);
+				addHgpz005a(hgpz005,hgsj002);
+			}
+			inInfo.setStatus(EiConstant.STATUS_DEFAULT);
+			inInfo.setMsg("操作成功！本次对[" + hgpz005List.size() + "]条数据修改成功!");
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "修改失败");
+		}
+		return inInfo;
+	}
+
+	/**
+	 * 添加流程详情
+	 * @param hppz005
+	 */
+	public void addHgpz005a (HGPZ005 hppz005,HGSJ002 hgsj002){
+		DaoUtils.update(HGPZ005A.DELETE_PARENT_ID,new HashMap<String,Object>(){{put(HGPZ005A.FIELD_PARENT_ID,hppz005.getId());}});
+		//流程详情
+		List<HGSJ002A> hgsb002AList = HGSJTools.Hgsj002a.list(hgsj002.getId());
+		for (HGSJ002A hgsj002a: hgsb002AList) {
+			HGPZ005A hgpz005A = new HGPZ005A();
+			hgpz005A.setCompanyCode(hgsj002.getFactoryCode());
+			hgpz005A.setCompanyName(hgsj002.getFactoryName());
+			hgpz005A.setProcessCode(hgsj002a.getProcessCode());
+			hgpz005A.setProcessName(hgsj002a.getProcessName());
+			hgpz005A.setInventCode(hppz005.getInventCode());
+			hgpz005A.setUnitCoeff(BigDecimal.ONE);
+			hgpz005A.setComposingCoeff(BigDecimal.ONE);
+			hgpz005A.setParentId(hppz005.getId());
+			hgpz005A.setProcessOrder(hgsj002a.getProcessOrder());
+			hgpz005A.setCostWeight(hgsj002a.getCostWeight());
+			DaoUtils.insert(HGPZ005A.INSERT,hgpz005A.toMap());
+		}
+	}
+}

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

@@ -273,6 +273,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_TYPE
 	</select>
 

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

@@ -274,6 +274,9 @@
 		<isNotEmpty prepend=" AND " property="whType">
 			WH_TYPE = #whType#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="inventTypeDetails">
+			INVENT_TYPE_DETAIL IN <iterate close=")" open="(" conjunction="," property="inventTypeDetails">#inventTypeDetails[]#</iterate>
+		</isNotEmpty>
 		ORDER BY WH_CODE
 	</select>
 

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

+$(function () {
+
+	IPLATUI.EFGrid = {
+		"result": {
+			exportGrid: false, // 隐藏右侧自定义导出按钮
+			columns: []
+		},
+	};
+
+	// 查询
+	$("#QUERY").on("click", query);
+
+});
+
+/**
+ * 页面加载时执行
+ */
+$(window).load(function () {
+	// 查询
+	query();
+	//存货编号查询条件
+	initInventCode();
+});
+
+/**
+ * 查询
+ */
+let query = function () {
+	resultGrid.dataSource.page(1); // 点击查询按钮，从第1页开始查询
+}
+
+/**
+ * 存货编号
+ */
+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: "textField",
+				dataValueField: "valueField",
+				optionLabel:"请选择",
+				dataSource: dataSource,
+				template: "[#:valueField#]#:textField#|#:param2Field#",
+				filter: "contains"
+			});
+		}, onFail: function (ei) {
+		}
+	}, {async: false});
+}

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

+<!DOCTYPE html>
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="EF" tagdir="/WEB-INF/tags/EF" %>
+
+<c:set var="ctx" value="${pageContext.request.contextPath}"/>
+
+<EF:EFPage title="综合库存管理">
+	<EF:EFRegion id="inqu" title="查询条件">
+		<div class="row">
+			<EF:EFSelect cname="公司名称" blockId="inqu_status" ename="companyCode" row="0" colWidth="3"
+						 filter="contains" optionLabel="全部" defultValue="">
+				<EF:EFOptions blockId="roleCompany" valueField="companyCode" textField="companyName"/>
+			</EF:EFSelect>
+			<EF:EFSelect cname="仓库名称" blockId="inqu_status" ename="whCode" row="0" colWidth="3"
+			             optionLabel="全部" defultValue="" filter="contains">
+				<EF:EFOptions blockId="wh_record_block_id" textField="textField" valueField="valueField"/>
+			</EF:EFSelect>
+			<EF:EFSelect cname="存货类型" blockId="inqu_status" ename="inventType" row="0" colWidth="3"
+			             optionLabel="全部" defultValue="" filter="contains">
+				<EF:EFOptions blockId="invent_type_block_id" textField="textField" valueField="valueField"/>
+			</EF:EFSelect>
+			<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>
+		</div>
+<%--		<div class="row">--%>
+<%--			<EF:EFSelect cname="规格" blockId="inqu_status" ename="spec" row="0" colWidth="3"--%>
+<%--			             optionLabel="全部" defultValue="" filter="contains">--%>
+<%--				<EF:EFOptions blockId="spec_name_block_id" textField="textField" valueField="valueField"/>--%>
+<%--			</EF:EFSelect>--%>
+<%--		</div>--%>
+	</EF:EFRegion>
+
+	<EF:EFRegion id="result" title="明细信息">
+		<EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="row">
+			<EF:EFColumn ename="id" cname="内码" hidden="true"/>
+			<EF:EFColumn ename="companyCode" cname="公司编码" enable="false" width="100" align="center" hidden="true"/>
+			<EF:EFColumn ename="companyName" cname="公司名称" enable="false" width="130" align="center"/>
+			<EF:EFComboColumn ename="whCode" cname="仓库名称" enable="false" width="120" align="center"
+			                  blockName="wh_record_block_id" textField="textField" valueField="valueField">
+			</EF:EFComboColumn>
+			<EF:EFComboColumn ename="inventType" cname="存货类型" enable="false" width="100" align="center"
+			                  blockName="invent_type_block_id" textField="textField" valueField="valueField">
+			</EF:EFComboColumn>
+			<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"/>
+			<EF:EFColumn ename="invQty" cname="库存数量" enable="false" width="120" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="invUnitWeight" cname="单重(KG)" enable="false" width="120" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="invWeight" cname="库存总重(KG)" enable="false" width="120" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="material" cname="材质" enable="false" width="80" align="center"/>
+			<EF:EFColumn ename="unit" cname="单位" enable="false" width="80" align="center"/>
+			<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:EFColumn ename="updatedName" cname="更新人" enable="false" width="100" align="center"/>
+			<EF:EFColumn ename="updatedTime" cname="更新时刻" enable="false" width="140" align="center"
+			             editType="datetime" parseFormats="['yyyyMMddHHmmss']"/>
+		</EF:EFGrid>
+	</EF:EFRegion>
+
+</EF:EFPage>

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

+$(function() {
+
+	var inventTypeBox = __eiInfo.getBlock("invent_type_box_block_id").getMappedRows();
+
+	// 查询
+	$("#QUERY").on("click", query);
+
+	$("#BATCH_FLOW").on("click", function () {
+		batchFlow();
+	});
+
+	IPLATUI.EFGrid.result = {
+		pageable: {
+			pageSize: 20,
+			pageSizes: [10, 20, 30, 50, 100, 200]
+		},
+		columns: [
+			{
+			field: "operator",
+			title: "操作",
+			template: function (item) {
+				let status = item.status;
+				let template = '';
+				if (item.id){
+					template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
+						+ 'onclick="showFlowDetail(' + item.id + ',\''+item.inventCode+'\','+item.flowId+')"  >工艺流程</a>';
+					if (item.flowId>0){
+						template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
+							+ 'onclick="showDetail(' + item.id + ')"  >工艺流程详情</a>';
+					}
+				}
+				return template;
+			}
+		}, {
+			field: "inventType",
+			// filter: function (options) {
+			// 	return _.filter(inventTypeBox, function (item) {
+			// 		return item["param1Field"]=="true" && item["param2Field"] != "root";
+			// 	})
+			// },
+			editor: function (container, options) {
+				this.filter(options);
+			}
+		}, {
+			field: "spec",
+			template: function (options) {
+				return $.trim(options.spec) == "" ? "无规格" : options.spec;
+			}
+		}, {
+			field: "length",
+			template: function (options) {
+				return options.length == 0 ? "-" : options.length;
+			}
+		}, {
+			field: "width",
+			template: function (options) {
+				return options.width == 0 ? "-" : options.width;
+			}
+		}, {
+			field: "thick",
+			template: function (options) {
+				return options.thick == 0 ? "-" : options.thick;
+			}
+		}, {
+			field: "createdName",
+			template: function (options) {
+				return showUserName(options.createdBy, options.createdName);
+			}
+		}, {
+			field: "updatedName",
+			template: function (options) {
+				return showUserName(options.updatedBy, options.updatedName);
+			}
+		}, {
+			field: "isFlowId",
+			template: function (options) {
+				let template = '未分配';
+				if (options.flowId>0){
+					template = '已分配';
+				}
+				return template;
+			}
+		}],
+		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' ){
+				query();
+			}
+		},
+		onSave: function (e) {
+			// 阻止后台保存请求，使用自定义保存
+			e.preventDefault();
+			save();
+		},
+		onDelete: function (e) {
+			// 阻止后台删除请求，使用自定义删除
+			e.preventDefault();
+			deleteFunc();
+		}
+	}
+
+	/*$("#DOWNLOAD").on("click", function (e) {
+		var href = ${ctx} + "\\common\\template\\PZ\\HGPZ005_存货档案.xls";
+		window.location.href = href;
+	});*/
+	$("#IMPORT").on("click", function (e) {
+		JSColorbox.open({
+			href: "HGSC097?methodName=initLoad&inqu_status-0-id=route_003",
+			title: "<div style='text-align: center;'>导入</div>",
+			width: "60%",
+			height: "50%",
+			callbackName: function () {
+				// 刷新列表
+				resultGrid.dataSource.page(1);
+				// 关闭弹窗
+				JSColorbox.close();
+			}
+		})
+	});
+	//grush.openImportBox();
+	IPLATUI.EFUpload = {
+		fileUpload: {
+			showFileList: false,
+			upload: function (e) {
+				openFileWindow.close();
+				IPLAT.progress($("body"), true);
+			},
+			success: function (e) {
+				var src = e.response.docUrl;
+				var eiInfo = new EiInfo();
+				let notIsExcelFile = isExcelFile(src);
+				eiInfo.set("fileName", src);
+				EiCommunicator.send("HGPZ005", "importDate", eiInfo, {
+						onSuccess(ei) {
+							/*if (notIsExcelFile) {
+								NotificationUtil("请导入xls或xlsx文件", "error");
+								return;
+							}*/
+							if (ei.status == "-1") {
+								NotificationUtil(
+									{msg: ei.msg, detailMsg: ei.detailMsg}, "error");
+							} else {
+								NotificationUtil(ei.msg);
+								query();
+							}
+						},
+						onFail(ei) {
+							NotificationUtil("调用失败，原因[" + ei + "]", "error");
+						}
+					},
+					{
+						async: false
+					});
+				IPLAT.progress($("body"), false);
+			},
+			fail(e) {
+				IPLAT.NotificationUtil('导入失败！', "error");
+			}
+		}
+	}
+
+	grush.downloadFile(`${ctx}\\common\\template\\PZ\\HGPZ005_存货档案.xls`);
+
+	downKeyUp();
+});
+
+/**
+ * 页面加载时执行
+ */
+$(window).load(function () {
+	// 查询
+	query();
+});
+
+/**
+ * 查询
+ */
+let query = function () {
+	resultGrid.dataSource.page(1);
+}
+
+/**
+ * 保存
+ */
+let save = function () {
+	let rows = resultGrid.getCheckedRows();
+	if (rows.length < 1) {
+		message("请选择数据");
+		return;
+	}
+	let flag = true;
+	$.each(rows, function(index, item) {
+		let inventType= item.get("inventType");
+		let inventCode= item.get("inventCode");
+		let inventName= item.get("inventName");
+		let length= item.get("length");
+		let width= item.get("width");
+		let thick= item.get("thick");
+		let status= item.get("status");
+		if(isBlank(inventType)){
+			message("选中的第"+(index+1)+"行\"存货类型\"，不能为空!");
+			flag = false;
+			return false;
+		}
+		if(isBlank(inventCode)){
+			message("选中的第"+(index+1)+"行\"存货编码\"，不能为空!");
+			flag = false;
+			return false;
+		}
+		if(isBlank(inventName)){
+			message("选中的第"+(index+1)+"行\"存货名称\"，不能为空!");
+			flag = false;
+			return false;
+		}
+		if(isBlank(status)){
+			message("选中的第"+(index+1)+"行\"状态\"，不能为空!");
+			flag = false;
+			return false;
+		}
+		if(!isBlank(length) && !isNumber(length)){
+			message("选中的第" + (i + 1) + "行\"长\"，必须是数值!");
+			flag = false;
+			return false;
+		}
+		if(!isBlank(width) && !isNumber(width)){
+			message("选中的第" + (i + 1) + "行\"宽\"，必须是数值!");
+			flag = false;
+			return false;
+		}
+		if(!isBlank(thick) && !isNumber(thick)){
+			message("选中的第" + (i + 1) + "行\"厚\"，必须是数值!");
+			flag = false;
+			return false;
+		}
+	});
+	if(flag) {
+		JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"保存\"操作? ", {
+			ok: function () {
+				JSUtils.submitGridsData("result", "HGPZ005", "save", true);
+			}
+		});
+	}
+}
+
+/**
+ * 删除
+ */
+let deleteFunc = function () {
+	let rows = resultGrid.getCheckedRows();
+	if (rows.length < 1) {
+		message("请选择数据");
+		return;
+	}
+	JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"删除\"操作? ", {
+		ok: function () {
+			JSUtils.submitGridsData("result", "HGPZ005", "delete", true);
+		}
+	});
+}
+
+function showDetail(id) {
+	JSColorbox.open({
+		href: "HGPZ005A?methodName=initLoad&inqu_status-0-parentId=" + id,
+		title: "<div style='text-align: center;'>工艺流程详情</div>",
+		width: "75%",
+		height: "80%",
+	});
+}
+
+
+function showFlowDetail(id,inventCode,flowId) {
+	JSColorbox.open({
+		href: "HGPZ005B?methodName=initLoad&inqu_status-0-parentId=" + id+"&inqu_status-0-inventCode="+inventCode+"&inqu_status-0-flowId="+flowId,
+		title: "<div style='text-align: center;'>工艺流程</div>",
+		width: "75%",
+		height: "80%",
+		callbackName: cllback
+	});
+}
+
+function batchFlow() {
+	let rows = resultGrid.getCheckedRows();
+	let selectIds = [];
+	if (rows.length < 1) {
+		message("请选择数据")
+		return;
+	}
+	let inventType;
+	let flag = true;
+	$.each(rows, function(index, item) {
+		selectIds.push(item.get("id"));
+		//不存在就直接赋值
+		if(!inventType){
+			inventType = item.get("inventType")
+		}else{
+			//存在就与当前类型对比
+			if(inventType != item.get("inventType")){
+				message("只能选择同一个类型存货")
+				flag = false;
+				return false;
+			}
+		}
+	});
+	if(flag){
+		JSColorbox.open({
+			href: "HGPZ005B?methodName=initLoad&inqu_status-0-parentIds=" + selectIds,
+			title: "<div style='text-align: center;'>工艺流程</div>",
+			width: "75%",
+			height: "80%",
+			callbackName: cllback2
+		});
+	}
+}
+
+/**
+ * 回调
+ */
+function cllback(result) {
+	let inEiInfo = new EiInfo();
+	inEiInfo.set("result-0-id", result.id);
+	inEiInfo.set("result-0-inventCode", result.inventCode);
+	inEiInfo.set("result-0-flow", result.rows);
+	EiCommunicator.send('HGPZ005', 'updateFlowId', inEiInfo, {
+		onSuccess(ei) {
+			if (ei.status == "-1") {
+				NotificationUtil({msg: ei.msg, detailMsg: ei.detailMsg}, "error");
+			} else {
+				NotificationUtil(ei.msg);
+				query();
+			}
+		},
+		onFail(errorMessage, status, e) {
+			NotificationUtil("执行失败！", "error");
+		}
+	}, {
+		async: false
+	});
+}
+
+
+/**
+ * 回调
+ */
+function cllback2(result) {
+	let inEiInfo = new EiInfo();
+	inEiInfo.set("inqu_status-0-ids", result.ids);
+	inEiInfo.set("inqu_status-0-flow", result.rows);
+	EiCommunicator.send('HGPZ005', 'updateFlowIds', inEiInfo, {
+		onSuccess(ei) {
+			if (ei.status == "-1") {
+				NotificationUtil({msg: ei.msg, detailMsg: ei.detailMsg}, "error");
+			} else {
+				NotificationUtil(ei.msg);
+				query();
+			}
+		},
+		onFail(errorMessage, status, e) {
+			NotificationUtil("执行失败！", "error");
+		}
+	}, {
+		async: false
+	});
+}

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

+<!DOCTYPE html>
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="EF" tagdir="/WEB-INF/tags/EF" %>
+
+<c:set var="ctx" value="${pageContext.request.contextPath}"/>
+<script>
+	var ctx = "${ctx}";
+</script>
+<EF:EFPage title="物料数据库">
+	<EF:EFRegion id="inqu" title="查询条件">
+		<div class="row">
+			<EF:EFSelect cname="存货类型" ename="inqu_status-0-inventType" colWidth="3" filter="contains">
+				<EF:EFOption label="全部" value=""/>
+				<EF:EFOptions blockId="invent_type_box_block_id" textField="textField" valueField="valueField"/>
+			</EF:EFSelect>
+			<EF:EFInput cname="存货编码" ename="inventCodeLike" blockId="inqu_status" row="0" colWidth="3"/>
+			<EF:EFInput cname="存货名称" ename="inventName" blockId="inqu_status" row="0" colWidth="3"/>
+			<EF:EFSelect blockId="inqu_status" row="0" ename="status" cname="状态" colWidth="3" filter="contains">
+				<EF:EFOption label="全部" value=""/>
+				<EF:EFCodeOption codeName="hpjx.hpjx.status"/>
+			</EF:EFSelect>
+		</div>
+		<div class="row">
+			<EF:EFInput cname="规格" ename="spec" blockId="inqu_status" row="0" colWidth="3"/>
+			<EF:EFSelect blockId="inqu_status" row="0" ename="isFlowId" cname="是否分配" colWidth="3" filter="contains">
+				<EF:EFOption label="全部" value=""/>
+				<EF:EFCodeOption codeName="hggp.isFlowId"/>
+			</EF:EFSelect>
+		</div>
+	</EF:EFRegion>
+
+	<EF:EFRegion id="result" title="记录集">
+		<EF:EFGrid blockId="result" autoDraw="override"  isFloat="true">
+			<EF:EFColumn ename="id" cname="主键" hidden="true"/>
+			<EF:EFColumn ename="operator" cname="操作" locked="true" enable="false" width="160" align="center"/>
+			<EF:EFColumn cname="存货编码" ename="inventCode" width="140" align="center" enable="true" required="true" readonly="true"/>
+			<EF:EFComboColumn ename="inventType" cname="存货类型" width="120" align="center" required="true"
+							  blockName="invent_type_box_block_id" textField="textField" valueField="valueField"
+							  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"/>
+			<EF:EFColumn ename="width" cname="宽(MM)" width="100" align="right" format="{0:N2}" maxLength="10"/>
+			<EF:EFColumn ename="thick" cname="厚(MM)" width="100" align="right" format="{0:N2}" maxLength="10"/>
+			<EF:EFColumn ename="material" cname="材质" width="100" align="center"/>
+			<EF:EFColumn ename="coefficient" cname="系数" width="80" align="right" format="{0:N2}" maxLength="10" defaultValue="1"/>
+			<EF:EFColumn ename="unit" cname="单位" width="80" align="center"/>
+			<EF:EFComboColumn ename="status" cname="状态" align="center" width="80" required="true" defaultValue="1">
+				<EF:EFCodeOption codeName="hpjx.hpjx.status"/>
+			</EF:EFComboColumn>
+			<EF:EFColumn ename="isFlowId" cname="是否分配" width="80" align="center"/>
+			<EF:EFColumn cname="创建人" ename="createdName" enable="false" align="center"/>
+			<EF:EFColumn cname="创建时间" ename="createdTime" enable="false" width="140" align="center"
+			             editType="datetime" parseFormats="['yyyyMMddHHmmss','yyyy-MM-dd HH:mm:ss']"/>
+			<EF:EFColumn cname="修改人" ename="updatedName" enable="false" align="center"/>
+			<EF:EFColumn cname="修改时间" ename="updatedTime" enable="false" width="140" align="center"
+			             editType="datetime" parseFormats="['yyyyMMddHHmmss','yyyy-MM-dd HH:mm:ss']"/>
+		</EF:EFGrid>
+
+	</EF:EFRegion>
+	<EF:EFWindow id="openFile">
+		<EF:EFRegion id="upload" title="文件导入区">
+			<div id="button"></div>
+			<EF:EFUpload ename="fileUpload" cname="导入" docTag="HGPZ005" path="pz"/>
+		</EF:EFRegion>
+	</EF:EFWindow>
+</EF:EFPage>
+
+