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

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

@@ -43,6 +43,7 @@ public class ServiceHGPZ007 extends ServiceBase {
 			/*CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_TYPE_BOX_BLOCK_ID), new HashMap<String, Object>(){{
 				put(HGPZ004.FIELD_INVENT_TYPE_DETAILS, InventTypeDetailEnum.getProdTypeFour());
 			}}, false);*/
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.WH_TYPE_BLOCK_ID), null, false);
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGPZ007().eiMetadata);
 		} catch (PlatException e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");

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

 $(function() {
 
-	//var whTypeBox = __eiInfo.getBlock("invent_type_box_block_id").getMappedRows();
+	var whTypeBox = __eiInfo.getBlock("invent_type_box_block_id").getMappedRows();
 
 	// 查询
 	$("#QUERY").on("click", query);

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

@@ -24,10 +24,9 @@
 			<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"
-							  textField="textField" valueField="valueField"
+							  blockName="wh_type_block_id" 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:EFComboColumn ename="inventTypeDetail" cname="存货类型明细" width="80" align="center" readonly="false">