2024/03/20 仓库档案添加厂区

src/main/java/com/baosight/hpjx/hp/pz/domain/HPPZ007.java

@@ -35,6 +35,8 @@ public class HPPZ007 extends DaoEPBase {
 	public static final String FIELD_UPDATED_BY = "updatedBy";    		/* 修改人*/
 	public static final String FIELD_UPDATED_NAME = "updatedName";    		/* 修改人名称*/
 	public static final String FIELD_UPDATED_TIME = "updatedTime";    		/* 修改时间*/
+	public static final String FIELD_FACTORY_CODE = "factoryCode";            /* 厂区编码*/
+	public static final String FIELD_FACTORY_NAME = "factoryName";            /* 工厂*/
 
 	public static final String COL_ID = "ID";
 	public static final String COL_COMPANY_CODE = "COMPANY_CODE";    		/* 企业编码 预留*/
@@ -50,6 +52,8 @@ public class HPPZ007 extends DaoEPBase {
 	public static final String COL_UPDATED_BY = "UPDATED_BY";    		/* 修改人*/
 	public static final String COL_UPDATED_NAME = "UPDATED_NAME";    		/* 修改人名称*/
 	public static final String COL_UPDATED_TIME = "UPDATED_TIME";    		/* 修改时间*/
+	public static final String COL_FACTORY_CODE = "FACTORY_CODE";            /* 厂区编码*/
+	public static final String COL_FACTORY_NAME = "FACTORY_NAME";            /* 工厂*/
 
 	public static final String QUERY = "HPPZ007.query";
 	public static final String COUNT = "HPPZ007.count";
@@ -71,6 +75,9 @@ public class HPPZ007 extends DaoEPBase {
 	private String updatedBy = " ";		/* 修改人*/
 	private String updatedName = " ";		/* 修改人名称*/
 	private String updatedTime = " ";		/* 修改时间*/
+	private String factoryCode = " ";        /* 厂区编码*/
+	private String factoryName = " ";        /* 工厂*/
+
 
 	/**
 	 * initialize the metadata.
@@ -135,6 +142,14 @@ public class HPPZ007 extends DaoEPBase {
 		eiColumn.setDescName("修改时间");
 		eiMetadata.addMeta(eiColumn);
 
+		eiColumn = new EiColumn(FIELD_FACTORY_CODE);
+		eiColumn.setDescName("厂区编码");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_FACTORY_NAME);
+		eiColumn.setDescName("工厂");
+		eiMetadata.addMeta(eiColumn);
+
 
 	}
 
@@ -369,6 +384,23 @@ public class HPPZ007 extends DaoEPBase {
 	public void setUpdatedTime(String updatedTime) {
 		this.updatedTime = updatedTime;
 	}
+
+	public String getFactoryCode() {
+		return factoryCode;
+	}
+
+	public void setFactoryCode(String factoryCode) {
+		this.factoryCode = factoryCode;
+	}
+
+	public String getFactoryName() {
+		return factoryName;
+	}
+
+	public void setFactoryName(String factoryName) {
+		this.factoryName = factoryName;
+	}
+
 	/**
 	 * get the value from Map.
 	 *
@@ -391,6 +423,8 @@ public class HPPZ007 extends DaoEPBase {
 		setUpdatedBy(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_BY)), updatedBy));
 		setUpdatedName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_NAME)), updatedName));
 		setUpdatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_TIME)), updatedTime));
+		setFactoryCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_FACTORY_CODE)), factoryCode));
+		setFactoryName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_FACTORY_NAME)), factoryName));
 	}
 
 	/**
@@ -414,6 +448,8 @@ public class HPPZ007 extends DaoEPBase {
 		map.put(FIELD_UPDATED_BY, StringUtils.toString(updatedBy, eiMetadata.getMeta(FIELD_UPDATED_BY)));
 		map.put(FIELD_UPDATED_NAME, StringUtils.toString(updatedName, eiMetadata.getMeta(FIELD_UPDATED_NAME)));
 		map.put(FIELD_UPDATED_TIME, StringUtils.toString(updatedTime, eiMetadata.getMeta(FIELD_UPDATED_TIME)));
+		map.put(FIELD_FACTORY_CODE, StringUtils.toString(factoryCode, eiMetadata.getMeta(FIELD_FACTORY_CODE)));
+		map.put(FIELD_FACTORY_NAME, StringUtils.toString(factoryName, eiMetadata.getMeta(FIELD_FACTORY_NAME)));
 
 		return map;
 	}

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

@@ -38,6 +38,7 @@ public class ServiceHPPZ007 extends ServiceBase {
 	public EiInfo initLoad(EiInfo inInfo) {
 		try {
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.USER_BLOCK_ID), null,true);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.FACTORY_RECORD_BLOCK_ID), null, false);
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPPZ007().eiMetadata);
 		} catch (PlatException e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");

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

@@ -16,7 +16,9 @@
         CREATED_TIME as "createdTime",  <!-- 创建时间 -->
         UPDATED_BY as "updatedBy",  <!-- 修改人 -->
         UPDATED_NAME as "updatedName",  <!-- 修改人名称 -->
-        UPDATED_TIME as "updatedTime" <!-- 修改时间 -->
+        UPDATED_TIME as "updatedTime", <!-- 修改时间 -->
+        FACTORY_CODE as "factoryCode",  <!-- 厂区编码 -->
+        FACTORY_NAME as "factoryName"  <!-- 工厂 -->
     </sql>
 
     <sql id="condition">
@@ -45,6 +47,9 @@
         <isNotEmpty prepend=" AND " property="status">
             STATUS = #status#
         </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="factoryCode">
+            FACTORY_CODE = #factoryCode#
+        </isNotEmpty>
     </sql>
 
     <sql id="customCondition">
@@ -93,10 +98,12 @@
             STATUS,  <!-- 状态 0未启用  1启用 -->
             CREATED_BY,  <!-- 创建人 -->
             CREATED_NAME,  <!-- 创建人名称 -->
-            CREATED_TIME  <!-- 创建时间 -->
+            CREATED_TIME,  <!-- 创建时间 -->
+            FACTORY_CODE,  <!-- 厂区编码 -->
+            FACTORY_NAME  <!-- 工厂 -->
         ) VALUES (
             #companyCode#, #depCode#, #whType#, #whCode#, #whName#, #princ#, #status#,
-            #createdBy#, #createdName#, #createdTime#
+            #createdBy#, #createdName#, #createdTime#, #factoryCode#, #factoryName#
         )
     </insert>
 
@@ -112,6 +119,8 @@
             WH_NAME = #whName#,   <!-- 仓库名称 -->
             PRINC = #princ#,   <!-- 负责人 -->
             STATUS = #status#,   <!-- 状态 0未启用  1启用 -->
+            FACTORY_CODE = #factoryCode#,   <!-- 厂区编码 -->
+            FACTORY_NAME = #factoryName#,   <!-- 工厂 -->
             UPDATED_BY = #updatedBy#,   <!-- 修改人 -->
             UPDATED_NAME = #updatedName#,   <!-- 修改人名称 -->
             UPDATED_TIME = #updatedTime#  <!-- 修改时间 -->

src/main/webapp/HP/PZ/HPPZ007.jsp

@@ -8,6 +8,10 @@
 <EF:EFPage title="仓库档案">
 	<EF:EFRegion id="inqu" title="查询条件">
 		<div class="row">
+			<EF:EFSelect cname="厂区" blockId="inqu_status" ename="factoryCode" row="0" colWidth="3" filter="contains">
+				<EF:EFOption label="全部" value=""/>
+				<EF:EFOptions blockId="factory_record_block_id" textField="textField" valueField="valueField"/>
+			</EF:EFSelect>
 			<EF:EFInput cname="仓库名称:" blockId="inqu_status" ename="whName" row="0" colWidth="3"/>
 			<EF:EFSelect cname="仓库类型:" blockId="inqu_status" ename="whType" row="0" colWidth="3">
 				<EF:EFOption label="全部" value=""/>
@@ -23,6 +27,10 @@
 	<EF:EFRegion id="result" title="记录集">
 		<EF:EFGrid blockId="result" autoDraw="override" checkMode="row">
 			<EF:EFColumn ename="id" cname="主键" hidden="true"/>
+			<EF:EFComboColumn ename="factoryCode" cname="厂区" width="110" align="center" defaultValue="" required="true"
+							  filter="contains">
+				<EF:EFOptions blockId="factory_record_block_id" valueField="valueField" textField="textField"/>
+			</EF:EFComboColumn>
 			<EF:EFColumn ename="whCode" cname="仓库编码" enable="false" width="120" align="center"/>
 			<EF:EFColumn ename="whName" cname="仓库名称" width="120" align="center" required="true"/>
 			<EF:EFComboColumn ename="whType" cname="仓库类型" width="120" align="center" required="true">