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

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

@@ -55,7 +55,7 @@ public enum DdynamicEnum {
      * 用途：存货档案下拉框
      * 编写：wwl
      */
-    INVENT_ALL_BLOCK_ID("invent_all_block_id", "id", "inventType", "inventName", "spec", "material", "unit", "HPPZ006.queryComboBoxAll"),
+    INVENT_ALL_BLOCK_ID("invent_all_block_id", "id", "spec", "material", "unit", "HPPZ006.queryComboBoxAll"),
 	
 	/**
 	 * 模块：存货档案（规格）

src/main/java/com/baosight/hpjx/hp/constant/HPConstant.java

@@ -36,6 +36,8 @@ public class HPConstant {
 		public static final String INVENT_CODE = "INVENT_CODE";
 		// 仓库编码
 		public static final String WH_CODE = "WH_CODE";
+		// 其他入库单号
+		public static final String OTHER_ENTER_NO = "OTHER_ENTER_NO";
 	}
 
 	/**

src/main/java/com/baosight/hpjx/hp/constant/HPSqlConstant.java

@@ -7,6 +7,20 @@ package com.baosight.hpjx.hp.constant;
 public class HPSqlConstant {
 	
 	/**
+	 * HPKC006 SQL 定义
+	 *
+	 * @author:songx
+	 * @date:2024/1/20,16:45
+	 */
+	public class HPKC006 {
+		
+		// 查询
+		public static final String QUERY_SUM = "HPKC006.querySum";
+		// 锁
+		public static final String LOCK = "HPKC006.lock";
+	}
+	
+	/**
 	 * HPKC009 SQL 定义
 	 *
 	 * @author:songx

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

@@ -4,13 +4,13 @@ import com.baosight.hpjx.common.DdynamicEnum;
 import com.baosight.hpjx.core.dao.DaoUtils;
 import com.baosight.hpjx.hp.constant.HPConstant;
 import com.baosight.hpjx.hp.kc.domain.HPKC005;
+import com.baosight.hpjx.hp.kc.domain.HPKC006;
 import com.baosight.hpjx.hp.pz.tools.HPPZTools;
 import com.baosight.hpjx.util.AssertUtils;
 import com.baosight.hpjx.util.CommonMethod;
 import com.baosight.hpjx.util.EiInfoUtils;
 import com.baosight.hpjx.util.LogUtils;
 import com.baosight.hpjx.util.StringUtil;
-import com.baosight.iplat4j.core.ei.EiBlock;
 import com.baosight.iplat4j.core.ei.EiConstant;
 import com.baosight.iplat4j.core.ei.EiInfo;
 import com.baosight.iplat4j.core.exception.PlatException;
@@ -36,16 +36,16 @@ public class ServiceHPKC005 extends ServiceBase {
 	 * @return
 	 */
 	public EiInfo initLoad(EiInfo inInfo) {
-		HPKC005 HPKC005 = new HPKC005();
-		EiInfo outInfo = super.initLoad(inInfo, HPKC005);
-		outInfo.addBlock(EiConstant.queryBlock).setCell(0, "receiptDate", CommonMethod.getCurrentSameYearMonth());
-		outInfo.getBlock(EiConstant.resultBlock).getRows().clear();
-		CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.WH_RECORD_BLOCK_ID), null);
-		CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.WH_RECORD_BLOCK_ID), null);
-		CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.MATERIAL_RECORD_BLOCK_ID), null);
-		CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.INVENT_SPEC_BLOCK_ID), null);
-		CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.SPEC_NAME_BLOCK_ID), null, false);
-		return outInfo;
+		try {
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.WH_RECORD_BLOCK_ID), null);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.MATERIAL_RECORD_BLOCK_ID), null);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_SPEC_BLOCK_ID), null);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SPEC_NAME_BLOCK_ID), null, false);
+			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPKC006().eiMetadata);
+		} catch (PlatException e) {
+			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
+		}
+		return inInfo;
 	}
 	
 	/**
@@ -169,10 +169,10 @@ public class ServiceHPKC005 extends ServiceBase {
 	 */
 	public EiInfo update(EiInfo inInfo) {
 		try {
-			EiBlock eiBlock = inInfo.getBlock(EiConstant.resultBlock);
-			for (int i = 0; i < eiBlock.getRowCount(); i++) {
+			List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
+			for (int i = 0; i < resultRows.size(); i++) {
 				HPKC005 fKc005 = new HPKC005();
-				fKc005.fromMap(eiBlock.getRow(i));
+				fKc005.fromMap(resultRows.get(i));
 				// 设置基础信息
 				this.setBaseInfo(fKc005);
 				DaoUtils.update(HPKC005.UPDATE, fKc005);

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

 package com.baosight.hpjx.hp.kc.service;
 
+import com.baosight.hpjx.hp.kc.domain.HPKC007;
+import com.baosight.hpjx.util.LogUtils;
 import com.baosight.iplat4j.core.ei.EiBlock;
 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.hpjx.hp.kc.domain.HPKC007;
-
 
 import java.text.SimpleDateFormat;
 import java.util.Map;
 
+/**
+ * 其他出库单
+ *
+ * @author:songx
+ * @date:2024/1/23,21:44
+ */
 public class ServiceHPKC007 extends ServiceBase {
 	
+	/**
+	 * 画面初始化
+	 *
+	 * @param inInfo
+	 * @return
+	 */
 	public EiInfo initLoad(EiInfo inInfo) {
-        HPKC007 hpkc007 = new HPKC007();
-        EiInfo outInfo = super.initLoad(inInfo, hpkc007);
-        outInfo.addBlock(EiConstant.resultBlock).addBlockMeta(hpkc007.eiMetadata);
+		try {
+			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPKC007().eiMetadata);
+		} catch (PlatException e) {
+			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
+		}
 		return inInfo;
 	}
 	
-
 	/**
 	 * 查询操作.
 	 */

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

@@ -320,7 +320,7 @@ public class ServiceHPKC009 extends ServiceBase {
 		List<HPKC006> bItems = dao.query("HPKC006.statDate", queryMap);
 		Map<String, HPKC006> bItemMap = bItems.stream().collect(Collectors.toMap(item ->
 				item.getCompanyCode() + "#" + item.getDepCode() + "#" + item.getWhCode() + "#"
-						+ item.getMatType() + "#" + item.getMatCode(), item -> item));
+						+ item.getInventType() + "#" + item.getInventCode(), item -> item));
 		// 1.3、发出
 		List<HPKC007> cItems = dao.query("HPKC007.statDate", queryMap);
 		Map<String, HPKC007> cItemMap = cItems.stream().collect(Collectors.toMap(item ->
@@ -336,10 +336,10 @@ public class ServiceHPKC009 extends ServiceBase {
 		// 根据期末库存生成收发存对象
 		for (HPKC006 aItem : aItems) {
 			String key = aItem.getCompanyCode() + "#" + aItem.getDepCode() + "#"
-					+ aItem.getWhCode() + "#" + aItem.getMatType() + "#" + aItem.getMatCode();
+					+ aItem.getWhCode() + "#" + aItem.getInventType() + "#" + aItem.getInventCode();
 			HPKC009 kc009 = BeanUtils.copy(aItem, HPKC009.class);
-			kc009.setInventType(Integer.parseInt(aItem.getMatType()));
-			kc009.setInventCode(aItem.getMatCode());
+			kc009.setInventType(Integer.parseInt(aItem.getInventType()));
+			kc009.setInventCode(aItem.getInventCode());
 			kc009.setKcType(HPConstant.KcType.QT);
 			kc009.setDateType(queryMap.get("dateType").toString());
 			kc009.setDateProc(queryMap.get("yesterDate").toString());

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

@@ -2,7 +2,10 @@ package com.baosight.hpjx.hp.kc.service;
 
 import com.baosight.hpjx.common.DdynamicEnum;
 import com.baosight.hpjx.core.dao.DaoUtils;
+import com.baosight.hpjx.core.security.UserSessionUtils;
 import com.baosight.hpjx.hp.kc.domain.HPKC010;
+import com.baosight.hpjx.hp.pz.domain.HPPZ006;
+import com.baosight.hpjx.hp.pz.domain.HPPZ007;
 import com.baosight.hpjx.hp.pz.tools.HPPZTools;
 import com.baosight.hpjx.util.*;
 import com.baosight.iplat4j.core.ei.EiBlock;
@@ -10,6 +13,7 @@ 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;
@@ -163,19 +167,19 @@ public class ServiceHPKC010 extends ServiceBase {
 
 	/**
 	 * 更新库存
-	 * @param companyCode 企业编码
-	 * @param whCode 仓库编码
-	 * @param inventRecordId 存货档案ID
-	 * @param amout 数量
-	 * @param weight 重量
+	 *
+	 * @param inInfo
 	 * @return
 	 */
-	public EiInfo updateStock(String companyCode, String whCode, Long inventRecordId
-			, BigDecimal amout, BigDecimal weight){
-		EiInfo inInfo = new EiInfo();
+	public EiInfo updateStock(EiInfo inInfo){
+		String whCode = inInfo.getString("whCode");
+		Long inventRecordId = Long.parseLong(inInfo.getString("inventRecordId"));
+		BigDecimal amount = new BigDecimal(inInfo.getString("amount"));
+		BigDecimal weight = new BigDecimal(inInfo.getString("weight"));
+		String companyCode = UserSessionUtils.getCompanyCode();
 		try {
-			checkUpdateStockParam(companyCode,whCode,inventRecordId,amout,weight);
-			HPKC010 newObj = generatorBaseInfo(companyCode,whCode,inventRecordId,amout,weight);
+			checkUpdateStockParam(companyCode,whCode,inventRecordId,amount,weight);
+			HPKC010 newObj = generatorBaseInfo(companyCode,whCode,inventRecordId,amount,weight);
 			List<Map> list = dao.query("queryByCondition",new HashMap<String,Object>(){{
 				put("companyCode",companyCode);
 				put("whCode",whCode);
@@ -183,16 +187,17 @@ public class ServiceHPKC010 extends ServiceBase {
 			}});
 			if(CollectionUtils.isEmpty(list)){
 				//新增
-				if(Objects.isNull(amout)||amout.compareTo(BigDecimal.ZERO)<=0
-						||Objects.isNull(amout)||weight.compareTo(BigDecimal.ZERO)<=0){
+				if(Objects.isNull(amount)||amount.compareTo(BigDecimal.ZERO)<=0
+						||Objects.isNull(amount)||weight.compareTo(BigDecimal.ZERO)<=0){
 					throw new PlatException("当前库存为空，库存变更数量与重量不能小于等于0！");
 				}
+				generatorBaseInfo(newObj);
 				DaoUtils.insert("insert",newObj);
 			}else{
 				//修改
 				HPKC010 oldObj = new HPKC010();
 				oldObj.fromMap(list.get(0));
-				BigDecimal afterAmout = oldObj.getAmount().add(amout);
+				BigDecimal afterAmout = oldObj.getAmount().add(amount);
 				BigDecimal afterWeight = oldObj.getWeight().add(weight);
 				if(afterAmout.compareTo(BigDecimal.ZERO)<=0||afterWeight.compareTo(BigDecimal.ZERO)<=0){
 					throw new PlatException("库存更新失败,出库数量与重量不能大于当前库存！");
@@ -243,6 +248,45 @@ public class ServiceHPKC010 extends ServiceBase {
 		return hpkc010;
 	}
 
+	private void generatorBaseInfo(HPKC010 hpkc010) {
+		String whName = "";
+		Integer inventType = new Integer(0);
+		String inventCode = "";
+		String inventName = "";
+		EiInfo inInfo = new EiInfo();
+		try {
+			inInfo.set("whCode", hpkc010.getWhCode());
+			inInfo.set(EiConstant.serviceName, "HPPZ007");
+			inInfo.set(EiConstant.methodName, "queryByWhCode");
+			EiInfo outInfo = XLocalManager.call(inInfo);
+			List<HPPZ007> 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.getInventRecordId());}});}});
+			inInfo.set(EiConstant.serviceName, "HPPZ006");
+			inInfo.set(EiConstant.methodName, "query");
+			EiInfo outInfo = XLocalManager.call(inInfo);
+			HPPZ006 hppz006 = new HPPZ006();
+			List<Map> inventList =  outInfo.getBlock(EiConstant.resultBlock).getRows();
+			hppz006.fromMap(inventList.get(0));
+			inventType = hppz006.getInventType();
+			inventCode = hppz006.getInventCode();
+			inventName = hppz006.getInventName();
+		}catch (Exception e){
+			LogUtils.setDetailMsg(inInfo, e, "库存更新失败!");
+			throw new PlatException("存货档案ID异常，找不到对应的存货档案！");
+		}
+		hpkc010.setWhName(whName);
+		hpkc010.setInventType(inventType.toString());
+		hpkc010.setInventCode(inventCode);
+		hpkc010.setInventName(inventName);
+	}
+
+
 	/**
 	 * 校验库存变更请求参数
 	 * @param companyCode

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

@@ -6,10 +6,10 @@
         ID as "id",
         COMPANY_CODE as "companyCode",  <!-- 企业编码 预留 -->
         WH_CODE as "whCode",  <!-- 仓库编码 -->
-<!--        WH_NAME as "whName",  &lt;!&ndash; 仓库名称 &ndash;&gt;-->
-<!--        INVENT_TYPE as "inventType",  &lt;!&ndash; 物料类型 &ndash;&gt;-->
-<!--        INVENT_CODE as "inventCode",  &lt;!&ndash; 物料编码 &ndash;&gt;-->
-<!--        INVENT_NAME as "inventName",  &lt;!&ndash; 物料名称 &ndash;&gt;-->
+        WH_NAME as "whName",  <!-- 仓库名称 -->
+        INVENT_TYPE as "inventType",  <!-- 物料类型 -->
+        INVENT_CODE as "inventCode",  <!-- 物料编码 -->
+        INVENT_NAME as "inventName",  <!-- 物料名称 -->
         INVENT_RECORD_ID as "inventRecordId",  <!-- 存货档案ID -->
         AMOUNT as "amount",  <!-- 数量 -->
         WEIGHT as "weight",  <!-- 重量 -->

src/main/java/com/baosight/hpjx/hp/kc/tools/HPKCTools.java

+package com.baosight.hpjx.hp.kc.tools;
+
+import com.baosight.hpjx.core.dao.DaoBase;
+import com.baosight.hpjx.hp.constant.HPSqlConstant;
+import com.baosight.hpjx.hp.kc.domain.HPKC006;
+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.soa.XLocalManager;
+import org.springframework.util.CollectionUtils;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @author:songx
+ * @date:2024/1/23,21:18
+ */
+public class HPKCTools {
+	
+	/**
+	 * 锁
+	 *
+	 * @param otherEnterNos
+	 * @return
+	 */
+	public static void lockKc006(List<String> otherEnterNos) {
+		if (CollectionUtils.isEmpty(otherEnterNos)) {
+			return;
+		}
+		Map queryMap = new HashMap();
+		queryMap.put("otherEnterNos", otherEnterNos);
+		DaoBase.getInstance().update(HPSqlConstant.HPKC006.LOCK, queryMap);
+	}
+	
+	/**
+	 * 查询其他入库信息
+	 *
+	 * @param otherEnterNos
+	 * @return
+	 */
+	public static List<HPKC006> listKc006(List<String> otherEnterNos) {
+		if (CollectionUtils.isEmpty(otherEnterNos)) {
+			return null;
+		}
+		Map queryMap = new HashMap();
+		queryMap.put("otherEnterNos", otherEnterNos);
+		return DaoBase.getInstance().query(HPKC006.QUERY, queryMap);
+	}
+	
+	/**
+	 * 查询其他入库信息
+	 *
+	 * @param otherEnterNos
+	 * @return
+	 */
+	public static Map<String, HPKC006> mapKc006(List<String> otherEnterNos) {
+		List<HPKC006> results = listKc006(otherEnterNos);
+		if (CollectionUtils.isEmpty(results)) {
+			return null;
+		}
+		return results.stream().collect(Collectors.toMap(HPKC006::getOtherEnterNo, item -> item));
+	}
+	
+	/**
+	 * 更新库存
+	 *
+	 * @param whCode
+	 * @param inventRecordId
+	 * @param amount
+	 * @param weight
+	 */
+	public static void updateStock(String whCode, Long inventRecordId, BigDecimal amount, BigDecimal weight) {
+		EiInfo inInfo = new EiInfo();
+		inInfo.set("whCode", whCode);
+		inInfo.set("inventRecordId", inventRecordId);
+		inInfo.set("amount", amount);
+		inInfo.set("weight", weight);
+		inInfo.set(EiConstant.serviceName, "HPKC010");
+		inInfo.set(EiConstant.methodName, "updateStock");
+		EiInfo outInfo = XLocalManager.call(inInfo);
+		if (outInfo.getStatus() < 0) {
+			throw new PlatException("跟新库存失败：" + outInfo.getMsg());
+		}
+	}
+	
+}

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

@@ -3,7 +3,6 @@ package com.baosight.hpjx.hp.pz.service;
 import com.baosight.hpjx.common.DdynamicEnum;
 import com.baosight.hpjx.common.InitiateModeEnum;
 import com.baosight.hpjx.core.dao.DaoUtils;
-import com.baosight.hpjx.hp.kc.domain.HPKC006;
 import com.baosight.hpjx.hp.pz.domain.HPPZ006;
 import com.baosight.hpjx.hp.pz.tools.HPPZTools;
 import com.baosight.hpjx.util.AssertUtils;
@@ -52,7 +51,7 @@ public class ServiceHPPZ006 extends ServiceBase {
 	@Override
 	public EiInfo query(EiInfo inInfo) {
 		try {
-			inInfo = super.query(inInfo, "HPPZ006.query", new HPKC006());
+			inInfo = super.query(inInfo, "HPPZ006.query", new HPPZ006());
 		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "查询失败");
 		}
@@ -205,4 +204,5 @@ public class ServiceHPPZ006 extends ServiceBase {
 		}
 		return inInfo;
 	}
+
 }

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

@@ -200,8 +200,6 @@
     <select id="queryComboBoxAll" parameterClass="java.util.HashMap" resultClass="java.util.HashMap">
         SELECT DISTINCT
         ID AS "id",
-        INVENT_TYPE AS "inventType",
-        CONCAT(INVENT_CODE,'-',INVENT_NAME) AS "inventName",
         (CASE WHEN SPEC = '' THEN '无规格' ELSE SPEC END) AS "spec",
         MATERIAL AS "material" ,  <!-- 材质 -->
         UNIT AS "unit"   <!-- 单位 -->

src/main/java/com/baosight/hpjx/util/AssertUtils.java

@@ -5,6 +5,7 @@ import org.apache.commons.lang.StringUtils;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 
+import java.math.BigDecimal;
 import java.util.Collection;
 import java.util.Map;
 
@@ -148,4 +149,17 @@ public class AssertUtils {
 		}
 	}
 	
+	/**
+	 * A大于B
+	 *
+	 * @param a
+	 * @param b
+	 * @param message
+	 */
+	public static void isGt(BigDecimal a, BigDecimal b, String message) {
+		if (a.compareTo(b) < 1) {
+			throw new PlatException(message);
+		}
+	}
+	
 }

src/main/java/com/baosight/hpjx/util/ObjectUtils.java

 package com.baosight.hpjx.util;
 
+import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang.StringUtils;
 
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 /**
  * 重写Apache.ObjectUtils类方法
  *
@@ -83,4 +88,15 @@ public class ObjectUtils extends org.apache.commons.lang.ObjectUtils {
 		return StringUtils.isBlank(object.toString());
 	}
 	
+	/**
+	 * 从集合MAP中取KEY
+	 *
+	 * @param items
+	 * @param keyName
+	 * @return
+	 */
+	public static List<String> listKey(List<Map> items, String keyName) {
+		return items.stream().map(item -> MapUtils.getString(item, keyName)).collect(Collectors.toList());
+	}
+	
 }

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

@@ -41,7 +41,7 @@
     <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="statisticalNumber" cname="盘点单号" enable="false" width="130" algin="center"/>
+		    <EF:EFColumn ename="statisticalNumber" cname="盘点单号" enable="false" width="130" align="center"/>
 		    <EF:EFColumn ename="receiptDate" cname="单据日期" editType="date" dateFormat="yyyy-MM-dd"
 		                 parseFormats="['yyyyMMdd']" width="90" align="center" required="true"/>
 		    <%--<EF:EFComboColumn ename="status" cname="单据状态" enable="false" width="100" readonly="true"

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

-$(function () {
+var inventNameGlobalData = [];
+var specGlobalData = [];
+$(function() {
 
-    $("#QUERY").on("click", function () {
-        resultGrid.dataSource.page(1);
+	IPLATUI.EFGrid = {
+		pageable: {
+			pageSize: 20,
+			pageSizes: [10, 20, 50, 70, 100],
+		},
+		"result": {
+			columns: [{
+				field: "inventCode",
+				template: function (dataItem) {
+					for (let i = 0; i < inventNameGlobalData.length; i++) {
+						if (inventNameGlobalData[i]['valueField'] === dataItem['inventCode']) {
+							return inventNameGlobalData[i]['textField'];
+						}
+					}
+					return "";
+				},
+				editor: function (container, options) {
+					var grid = container.closest(".k-grid").data("kendoGrid");
+					var cellIndex = grid.cellIndex(container);
+					var input = $('<input />');
+					input.attr("name", options.field);
+					input.attr("id", options.field);
+					input.appendTo(container);
+					let eiInfo = new EiInfo();
+					eiInfo.set("inventType", options.model["inventType"]);
+					var dataSource;
+					EiCommunicator.send("HPPZ006", "queryMaterialComboBox", eiInfo, {
+						onSuccess: function (ei) {
+							dataSource = ei.getBlock("material_record_block_id").getMappedRows();
+						},
+						onFail: function (ei) {
+						}
+					}, {async: false});
+					input.kendoDropDownList({
+						valuePrimitive: true,
+						dataTextField: "textField",
+						dataValueField: "valueField",
+						dataSource: dataSource,
+						template: "#=textField#"
+					});
+				}
+			}, {
+				field: "inventRecordId",
+				template: function (dataItem) {
+					for (let i = 0; i < specGlobalData.length; i++) {
+						if (specGlobalData[i]['valueField'] === dataItem['inventRecordId']) {
+							return specGlobalData[i]['textField'];
+						}
+					}
+					return "";
+				},
+				editor: function (container, options) {
+					refreshsel
+					var grid = container.closest(".k-grid").data("kendoGrid");
+					var cellIndex = grid.cellIndex(container);
+					var input = $('<input />');
+					input.attr("name", options.field);
+					input.attr("id", options.field);
+					input.appendTo(container);
+					let eiInfo = new EiInfo();
+					eiInfo.set("inqu_status-0-inventCode", options.model["inventCode"]);
+					var dataSource;
+					EiCommunicator.send("HPPZ006", "queryComboBoxSpec", eiInfo, {
+						onSuccess: function (ei) {
+							dataSource = ei.getBlock("invent_spec_block_id").getMappedRows();
+						},
+						onFail: function (ei) {
+						}
+					}, {async: false});
+					input.kendoDropDownList({
+						valuePrimitive: true,
+						dataTextField: "textField",
+						dataValueField: "valueField",
+						dataSource: dataSource,
+						template: "#=textField#"
 					});
+				}
+			}],
+			loadComplete: function (grid) {
+			}
+		}
+	}
 
+	// 查询
+	$("#QUERY").on("click", query);
 
+	// 保存
+	$("#BTN_SAVE").on("click", save);
+});
 
-    IPLATUI.EFGrid.result = {
-        pageable: {
-            pageSize: 20,
-            pageSizes: [10, 20, 30, 50, 100, 200],
+/**
+ * 页面加载时执行
+ */
+$(window).load(function () {
+	// 存货名称
+	let eiInfo = new EiInfo();
+	EiCommunicator.send("HPPZ004", "queryComboBox", eiInfo, {
+		onSuccess: function (ei) {
+			inventNameGlobalData = ei.getBlock("invent_name_block_id").getMappedRows();
 		},
+		onFail: function (ei) {
 		}
+	}, {async: false});
+	// 规格
+	EiCommunicator.send("HPPZ006", "queryComboBoxSpec", eiInfo, {
+		onSuccess: function (ei) {
+			specGlobalData = ei.getBlock("invent_spec_block_id").getMappedRows();
+		},
+		onFail: function (ei) {
+		}
+	}, {async: false});
+	// 查询
+	query();
 });
+
+/**
+ * 查询
+ */
+let query = function () {
+	resultGrid.dataSource.page(1); // 点击查询按钮，从第1页开始查询
+}
+
+/**
+ * 保存
+ */
+let save = function () {
+	let rows = resultGrid.getCheckedRows();
+	if (rows.length < 1) {
+		message("请选择数据");
+		return;
+	}
+	JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"保存\"操作? ", {
+		ok: function () {
+			JSUtils.submitGridsData("result", "HPKC006", "save", true);
+		}
+	});
+}
+

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

@@ -4,60 +4,61 @@
 <%@ taglib prefix="EF" tagdir="/WEB-INF/tags/EF" %>
 
 <c:set var="ctx" value="${pageContext.request.contextPath}"/>
-<head>
-    <%--    <link rel="stylesheet" href="${ctx}/css/simulatedOperation.css"/>--%>
-</head>
-<EF:EFPage title="其他入库单">
-
-    <EF:EFRegion id="inqu" title="查询条件" align-item="center"><%-- type="query" efRegionShowClear="true" efRegionSave="true"--%>
-        <style>
-            .row {
-                display: flex;
-                justify-content: space-between;
-                align-items: center;
-            }
-        </style>
-        <div class="row"> <%--    blockId="inqu_status" row="0"   --%>
-            <EF:EFDatePicker blockId="inqu_status" ename = "receiptTime" cname="单据日期"
-                             format="yyyy-MM-dd"  />
 
-            <EF:EFInput blockId="inqu_status" ename="otherEnthouse" cname="其他入库单号" row="0"/>
-            <EF:EFInput blockId="inqu_status" ename="whName" cname="仓库名称" row="0"/>
-
-            <EF:EFSelect cname="单据状态" optionLabel="全部" blockId="inqu_status" ename="status" row="0">
-                <EF:EFOption label="审核" value="1"/>
-                <EF:EFOption label="反审" value="0"/>
+<EF:EFPage title="其他入库单">
+	<EF:EFRegion id="inqu" title="查询条件" align-item="center">
+		<div class="row">
+			<EF:EFDatePicker cname="单据日期" ename="inqu_status-0-receiptDate" colWidth="3"
+			                 role="date" format="yyyy-MM-dd" readonly="true"/>
+			<EF:EFInput cname="入库单号" ename="inqu_status-0-otherEnterNo" colWidth="3"/>
+			<EF:EFSelect ename="inqu_status-0-whCode" cname="仓库名称" colWidth="3" filter="contains" defultValue="">
+				<EF:EFOption label="全部" value=""/>
+				<EF:EFOptions blockId="wh_record_block_id" textField="textField" valueField="valueField"/>
+			</EF:EFSelect>
+			<EF:EFSelect cname="存货类型" ename="inqu_status-0-inventType" colWidth="3" filter="contains"
+			             template="#=valueField#-#=textField#" valueTemplate="#=valueField#-#=textField#">
+				<EF:EFOption label="全部" value=""/>
+				<EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
+			</EF:EFSelect>
+		</div>
+		<div class="row">
+			<EF:EFSelect cname="存货名称" ename="inqu_status-0-inventCode" colWidth="3" filter="contains" defultValue="">
+				<EF:EFOption label="全部" value=""/>
+				<EF:EFOptions blockId="material_record_block_id" textField="textField" valueField="valueField"/>
+			</EF:EFSelect>
+			<EF:EFSelect ename="inqu_status-0-spec" cname="规格" colWidth="3" filter="contains" defultValue="">
+				<EF:EFOption label="全部" value=""/>
+				<EF:EFOptions blockId="spec_name_block_id" textField="textField" valueField="valueField"/>
 			</EF:EFSelect>
 		</div>
-
 	</EF:EFRegion>
 
 	<EF:EFRegion id="result" title="记录集">
-        <EF:EFGrid blockId="result" autoDraw="no">
+		<EF:EFGrid blockId="result" autoDraw="override" checkMode="row">
 			<EF:EFColumn ename="id" cname="主键" hidden="true"/>
-
-            <EF:EFColumn ename="receiptTime" cname="单据日期"/>
-            <EF:EFColumn ename="otherEnthouse" cname="其他入库单号"/>
-            <EF:EFColumn ename="whCode" cname="仓库编码"/>
-            <EF:EFColumn ename="whName" cname="仓库名称"/>
-            <EF:EFColumn ename="matType" cname="物料类型"/>
-            <EF:EFColumn ename="matCode" cname="物料编码"/>
-            <EF:EFColumn ename="matName" cname="物料名称"/>
-            <EF:EFColumn ename="spec" cname="规格"/>
-            <EF:EFColumn ename="amount" cname="数量"/>
-            <EF:EFColumn ename="weight" cname="重量"/>
-            <EF:EFComboColumn align="center" ename="status" cname="操作">
-                <EF:EFOption label="审核" value="1"/>
-                <EF:EFOption label="反审" value="0"/>
+			<EF:EFColumn ename="otherEnterNo" cname="入库单号" enable="false" width="130" align="center"/>
+			<EF:EFColumn ename="receiptDate" cname="单据日期" editType="date" dateFormat="yyyy-MM-dd"
+			             parseFormats="['yyyyMMdd']" width="90" align="center" required="true"/>
+			<EF:EFComboColumn ename="whCode" cname="仓库编码" width="120" columnTemplate="#=textField#"
+			                  itemTemplate="#=textField#" blockName="wh_record_block_id"
+			                  textField="textField" valueField="valueField"
+			                  align="center" filter="contains" required="true">
 			</EF:EFComboColumn>
-            <EF:EFColumn ename="remark" cname="备注"/>
-
+			<EF:EFComboColumn ename="inventType" cname="存货类型" width="100" align="center" required="true"
+			                  columnTemplate="#=valueField#-#=textField#" itemTemplate="#=valueField#-#=textField#">
+				<EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
+			</EF:EFComboColumn>
+			<EF:EFColumn ename="inventCode" cname="存货名称" width="120" align="center" required="true"/>
+			<EF:EFColumn ename="inventRecordId" cname="规格" width="120" align="center"/>
+			<EF:EFColumn ename="amount" cname="数量" format="{0:N3}" maxLength="20" width="100" align="right"
+			             sumType="all" required="true"/>
+			<EF:EFColumn ename="weight" cname="重量" format="{0:N3}" maxLength="20" width="100" align="right"
+			             sumType="all" required="true"/>
+			<EF:EFColumn ename="notes" cname="备注" width="100"/>
+			<EF:EFColumn ename="createdBy" cname="创建人" enable="false" width="100" align="center"/>
+			<EF:EFColumn ename="createdTime" cname="创建时刻" enable="false" width="140" align="center"
+			             editType="datetime" parseFormats="['yyyyMMddHHmmss']"/>
 		</EF:EFGrid>
 	</EF:EFRegion>
-</EF:EFPage>
-
 
-<script>
-    var ctx = "${ctx}";
-</script>
-<script src="${ctx}/HP/KC/HPKC006.js"></script>
\ No newline at end of file
+</EF:EFPage>
\ No newline at end of file

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

@@ -9,6 +9,97 @@ $(function() {
 
     IPLATUI.EFGrid = {
         "result": {
+            columns: [{
+                field: "inventCode",
+                template: function (dataItem) {
+                    for (let i = 0; i < inventNameGlobalData.length; i++) {
+                        if (inventNameGlobalData[i]['valueField'] === dataItem['inventCode']) {
+                            return inventNameGlobalData[i]['textField'];
+                        }
+                    }
+                    return "";
+                },
+                editor: function (container, options) {
+                    var grid = container.closest(".k-grid").data("kendoGrid");
+                    var cellIndex = grid.cellIndex(container);
+                    var input = $('<input />');
+                    input.attr("name", options.field);
+                    input.attr("id", options.field);
+                    input.appendTo(container);
+                    let eiInfo = new EiInfo();
+                    eiInfo.set("inventType", options.model["inventType"]);
+                    var dataSource;
+                    EiCommunicator.send("HPPZ006", "queryMaterialComboBox", eiInfo, {
+                        onSuccess: function (ei) {
+                            dataSource = ei.getBlock("material_record_block_id").getMappedRows();
+                        },
+                        onFail: function (ei) {
+                        }
+                    }, {async: false});
+                    input.kendoDropDownList({
+                        valuePrimitive: true,
+                        dataTextField: "textField",
+                        dataValueField: "valueField",
+                        dataSource: dataSource,
+                        template: "#=textField#"
+                    });
+                }
+            }, {
+                field: "spec",
+                template: function (dataItem) {
+                    for (let i = 0; i < specGlobalData.length; i++) {
+                        if (specGlobalData[i]['valueField'] === dataItem['inventRecordId']) {
+                            return specGlobalData[i]['textField'];
+                        }
+                    }
+                    return "";
+                },
+                editor: function (container, options) {
+                    var grid = container.closest(".k-grid").data("kendoGrid");
+                    var cellIndex = grid.cellIndex(container);
+                    var input = $('<input />');
+                    input.attr("name", options.field);
+                    input.attr("id", options.field);
+                    input.appendTo(container);
+                    let eiInfo = new EiInfo();
+                    eiInfo.set("inqu_status-0-inventCode", options.model["inventCode"]);
+                    var dataSource;
+                    EiCommunicator.send("HPPZ006", "queryComboBoxSpec", eiInfo, {
+                        onSuccess: function (ei) {
+                            dataSource = ei.getBlock("invent_spec_block_id").getMappedRows();
+                        },
+                        onFail: function (ei) {
+                        }
+                    }, {async: false});
+                    input.kendoDropDownList({
+                        valuePrimitive: true,
+                        dataTextField: "textField",
+                        dataValueField: "valueField",
+                        dataSource: dataSource,
+                        template: "#=textField#"
+                    });
+                }
+            }, {
+                field: "material",
+                template: function (dataItem) {
+                    for (let i = 0; i < specGlobalData.length; i++) {
+                        if (specGlobalData[i]['valueField'] === dataItem['inventRecordId']) {
+                            return specGlobalData[i]['param1Field'];
+                        }
+                    }
+                    return "";
+                }
+            }, {
+                field: "unit",
+                template: function (dataItem) {
+                    for (let i = 0; i < specGlobalData.length; i++) {
+                        if (specGlobalData[i]['valueField'] === dataItem['inventRecordId']) {
+                            return specGlobalData[i]['param2Field'];
+                        }
+                    }
+                    return "";
+                }
+            }],
             loadComplete: function (grid) {
                 //删除
                 $("#DELETE").on("click", function () {
@@ -55,15 +146,23 @@ $(function() {
  * 页面加载时执行
  */
 $(window).load(function () {
-	// let eiInfo = new EiInfo();
-	// // 规格
-	// EiCommunicator.send("HPPZ006", "queryComboBoxAll", eiInfo, {
-	// 	onSuccess: function (ei) {
-	// 		specGlobalData = ei.getBlock("invent_all_block_id").getMappedRows();
-	// 	},
-	// 	onFail: function (ei) {
-	// 	}
-	// }, {async: false});
+    // 存货名称
+    let eiInfo = new EiInfo();
+    EiCommunicator.send("HPPZ004", "queryComboBox", eiInfo, {
+        onSuccess: function (ei) {
+            inventNameGlobalData = ei.getBlock("invent_name_block_id").getMappedRows();
+        },
+        onFail: function (ei) {
+        }
+    }, {async: false});
+	// 规格
+	EiCommunicator.send("HPPZ006", "queryComboBoxAll", eiInfo, {
+		onSuccess: function (ei) {
+			specGlobalData = ei.getBlock("invent_all_block_id").getMappedRows();
+		},
+		onFail: function (ei) {
+		}
+	}, {async: false});
 	// 查询
 	query();
 });

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

@@ -30,31 +30,14 @@
 		                      textField="textField" valueField="valueField"
 		                      align="center" filter="contains">
 		    </EF:EFComboColumn>
-			<EF:EFComboColumn ename="inventType" cname="存货类型" width="120" columnTemplate="#=textField#"
-							  itemTemplate="#=textField#" blockName="invent_all_block_id"
-							  textField="textField" valueField="valueField"
-							  align="center" filter="contains">
-			</EF:EFComboColumn>
-			<EF:EFComboColumn ename="inventCode" cname="存货名称" width="120" columnTemplate="#=param1Field#"
-							  itemTemplate="#=param1Field#" blockName="invent_all_block_id"
-							  textField="param1Field" valueField="valueField"
-							  align="center" filter="contains">
-			</EF:EFComboColumn>
-			<EF:EFComboColumn ename="spec" cname="规格" width="120" columnTemplate="#=param2Field#"
-							  itemTemplate="#=param2Field#" blockName="invent_all_block_id"
-							  textField="param2Field" valueField="valueField"
-							  align="center" filter="contains">
-			</EF:EFComboColumn>
-			<EF:EFComboColumn ename="material" cname="材质" width="120" columnTemplate="#=param3Field#"
-							  itemTemplate="#=param3Field#" blockName="invent_all_block_id"
-							  textField="param3Field" valueField="valueField"
-							  align="center" filter="contains">
-			</EF:EFComboColumn>
-			<EF:EFComboColumn ename="unit" cname="单位" width="120" columnTemplate="#=param4Field#"
-							  itemTemplate="#=param4Field#" blockName="invent_all_block_id"
-							  textField="param4Field" valueField="valueField"
-							  align="center" filter="contains">
+			<EF:EFComboColumn ename="inventType" cname="存货类型" width="100" align="center" required="true"
+							  columnTemplate="#=valueField#-#=textField#" itemTemplate="#=valueField#-#=textField#">
+				<EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
 			</EF:EFComboColumn>
+			<EF:EFColumn ename="inventCode" cname="存货名称" width="120" align="center" required="true"/>
+			<EF:EFColumn ename="spec" cname="规格" width="120" align="center"/>
+			<EF:EFColumn ename="material" cname="材质" width="120" align="center"/>
+			<EF:EFColumn ename="unit" cname="单位" width="120" align="center"/>
 		    <EF:EFColumn ename="amount" cname="数量" format="{0:N3}" maxLength="20" width="90" align="right"/>
 		    <EF:EFColumn ename="weight" cname="重量" format="{0:N3}" maxLength="20" width="90" align="right"/>
 		    <EF:EFColumn ename="createdBy" cname="创建人" enable="false" width="100" align="center"/>