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

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

@@ -47,9 +47,9 @@ public class ServiceHPKC010 extends ServiceBase {
 	@Override
 	@OperationLogAnnotation(operModul = "实时库存管理", operType = "查询", operDesc = "初始化")
 	public EiInfo initLoad(EiInfo inInfo) {
-		inInfo.getBlock(EiConstant.resultBlock).addBlockMeta(new HPKC010().eiMetadata);
+		inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPKC010().eiMetadata);
 		Map queryMap = new HashMap();
-		queryMap.put("inventCodes", DEFAULT_INVENT_CODE);
+//		queryMap.put("inventCodes", DEFAULT_INVENT_CODE);
 		CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.WH_RECORD_BLOCK_ID), queryMap);
 		CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.MATERIAL_RECORD_BLOCK_ID), queryMap);
 		CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_SPEC_BLOCK_ID), queryMap);

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

@@ -58,7 +58,7 @@ $(function() {
 $(window).load(function () {
     // 存货名称
     let eiInfo = new EiInfo();
-	inInfo.set("inqu_status-0-inventTypes", [1, 2, 5]);
+	// inInfo.set("inqu_status-0-inventTypes", [1, 2, 5]);
     EiCommunicator.send("HPPZ004", "queryComboBox", eiInfo, {
         onSuccess: function (ei) {
             inventNameGlobalData = ei.getBlock("invent_name_block_id").getMappedRows();