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

src/main/java/com/baosight/hpjx/hp/kc/domain/HPKC012.java

@@ -25,12 +25,18 @@ public class HPKC012 extends HPKC010 {
 	
 	public static final String FIELD_WARN_NUM = "warnNum";    		/* 预警数量*/
 
+	public static final String FIELD_PRINC = "princ";    		/* 负责人*/
+	
 	public static final String COL_WARN_NUM = "WARN_NUM";    		/* 预警数量*/
 
+	public static final String COL_PRINC = "PRINC";    		/* 负责人*/
+	
 	public static final String QUERY = "HPKC012.query";
 	
 	private BigDecimal warnNum = new BigDecimal("0");		/* 预警数量*/
 
+	private String princ = " ";		/* 负责人*/
+	
 	/**
 	 * initialize the metadata.
 	 */
@@ -43,6 +49,10 @@ public class HPKC012 extends HPKC010 {
 		eiColumn.setFieldLength(12);
 		eiColumn.setDescName("预警数量");
 		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_PRINC);
+		eiColumn.setDescName("负责人");
+		eiMetadata.addMeta(eiColumn);
 	}
 	
 	/**
@@ -73,10 +83,29 @@ public class HPKC012 extends HPKC010 {
 	 *
 	 * @param map - source data map
 	 */
+
+	/**
+	 * get the princ - 负责人.
+	 * @return the princ
+	 */
+	public String getPrinc() {
+		return this.princ;
+	}
+
+	/**
+	 * set the princ - 负责人.
+	 *
+	 * @param princ - 负责人
+	 */
+	public void setPrinc(String princ) {
+		this.princ = princ;
+	}
+
 	@Override
 	public void fromMap(Map map) {
 		super.fromMap(map);
 		setWarnNum(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_WARN_NUM)), warnNum));
+		setPrinc(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PRINC)), princ));
 	}
 	
 	/**
@@ -87,7 +116,7 @@ public class HPKC012 extends HPKC010 {
 		
 		Map map = super.toMap();
 		map.put(FIELD_WARN_NUM, StringUtils.toString(warnNum, eiMetadata.getMeta(FIELD_WARN_NUM)));
-		
+		map.put(FIELD_PRINC, StringUtils.toString(princ, eiMetadata.getMeta(FIELD_PRINC)));
 		return map;
 	}
 }

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

@@ -39,6 +39,7 @@ public class ServiceHPKC012 extends ServiceBase {
 		try {
 			Map queryMap = new HashMap();
 			queryMap.put("inventTypes", DEFAULT_INVENT_CODE);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.USER_BLOCK_ID), null,true);
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.WH_RECORD_BLOCK_ID), queryMap);
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_NAME_BLOCK_ID), queryMap);
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SPEC_NAME_BLOCK_ID), queryMap);

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

@@ -21,7 +21,8 @@
         A.UPDATED_NAME as "updatedName",  <!-- 更新人名称 -->
         A.UPDATED_TIME as "updatedTime",  <!-- 更新时间 -->
         A.VERSION as "version", <!-- 版本号 -->
-        B.WARN_NUM as warnNum <!-- 预警值 -->
+        B.WARN_NUM as warnNum, <!-- 预警值 -->
+        C.PRINC as "princ"  <!-- 负责人 -->
     </sql>
 
 	<sql id="condition">
@@ -77,6 +78,7 @@
 		SELECT <include refid="column"/>
 		FROM hpjx.T_HPKC010 A
         INNER JOIN hpjx.T_HPPZ012 B ON A.INVENT_RECORD_ID = B.INVENT_RECORD_ID
+        LEFT JOIN hpjx.t_hppz007 C ON A.WH_CODE = C.WH_CODE
         WHERE 1=1
         AND A.AMOUNT &lt;= B.WARN_NUM
         <include refid="condition"/>

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

@@ -58,9 +58,16 @@
 			<EF:EFColumn ename="amount" cname="库存数量" enable="false" width="90" align="right" format="{0:N3}"/>
 			<EF:EFColumn ename="warnNum" cname="预警值" enable="false" width="90" align="right" format="{0:N3}"/>
 			<EF:EFColumn ename="weight" cname="库存重量" enable="false" width="90" align="right" format="{0:N3}"/>
-			<EF:EFColumn ename="createdName" cname="创建人" enable="false" width="100" align="center"/>
+			<EF:EFComboColumn ename="princ" cname="仓库负责人" width="120" align="center"  enable="false"
+							  blockName="user_block_id" textField="textField" valueField="valueField"
+							  columnTemplate="#=textField#" itemTemplate="#=textField#"
+							  filter="contains">
+			</EF:EFComboColumn>
+			<%--<EF:EFColumn ename="princ" cname="仓库负责人" width="120" align="center"/>--%>
+
+<%--			<EF:EFColumn ename="createdName" cname="创建人" enable="false" width="100" align="center"/>
 			<EF:EFColumn ename="createdTime" cname="创建时刻" enable="false" width="140" align="center"
-			             editType="datetime" parseFormats="['yyyyMMddHHmmss']"/>
+			             editType="datetime" parseFormats="['yyyyMMddHHmmss']"/>--%>
 		</EF:EFGrid>
 	</EF:EFRegion>