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

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

@@ -29,7 +29,7 @@ import java.util.*;
  * @date:2024/1/15,11:20
  */
 public class ServiceHGPZ007 extends ServiceBase {
-	
+
 	/**
 	 * 画面初始化
 	 *
@@ -43,13 +43,14 @@ 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, "初始化失败");
 		}
 		return inInfo;
 	}
-	
+
 	/**
 	 * 查询数据列表
 	 *
@@ -66,7 +67,7 @@ public class ServiceHGPZ007 extends ServiceBase {
 		}
 		return inInfo;
 	}
-	
+
 	/**
 	 * 保存操作.
 	 *
@@ -97,7 +98,7 @@ public class ServiceHGPZ007 extends ServiceBase {
 		}
 		return inInfo;
 	}
-	
+
 	/**
 	 * 校验保存的数据
 	 *
@@ -111,7 +112,7 @@ public class ServiceHGPZ007 extends ServiceBase {
 			AssertUtils.isNull(hgpz007.getStatus(), "是否启用不能为空");
 		}
 	}
-	
+
 	/**
 	 * 新增企业信息
 	 *
@@ -123,7 +124,7 @@ public class ServiceHGPZ007 extends ServiceBase {
 		DaoUtils.insert(HGPZ007.INSERT, hgpz007);
 
 	}
-	
+
 	/**
 	 * 修改数据
 	 *
@@ -132,7 +133,7 @@ public class ServiceHGPZ007 extends ServiceBase {
 	private void modify(HGPZ007 hgpz007) {
 		DaoUtils.update(HGPZ007.UPDATE, hgpz007);
 	}
-	
+
 	/**
 	 * 新增操作.
 	 *
@@ -186,7 +187,7 @@ public class ServiceHGPZ007 extends ServiceBase {
 		}
 		return inInfo;
 	}
-	
+
 	/**
 	 * 删除操作
 	 *
@@ -266,5 +267,5 @@ public class ServiceHGPZ007 extends ServiceBase {
 		inInfo.set("list", query);
 		return inInfo;
 	}
-	
+
 }

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">