存货档案枚举

src/main/java/com/baosight/hpjx/common/DdynamicEnum.java

@@ -37,6 +37,13 @@ public enum DdynamicEnum {
     INVENT_NAME_BLOCK_ID("invent_name_block_id","inventCode","inventName","HPPZ004.queryComboBox"),
 
     /**
+     * 模块：存货档案
+     * 用途：存货档案下拉框
+     * 编写：wwl
+     */
+    INVENT_RECORD_BLOCK_ID("invent_record_block_id","id","inventName","HPPZ006.queryComboBox"),
+
+    /**
      * 模块：仓库档案
      * 用途：仓库档案下拉框
      * 编写：wwl

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

@@ -138,7 +138,7 @@
 		SELECT DISTINCT
 		CUST_CODE as "custCode",
 		CUST_NAME as "custName"
-		FROM hpjx.t_hppz002 WHERE 1=1
+		FROM hpjx.t_hppz002 WHERE STATUS=1
 		<isNotEmpty prepend=" AND " property="companyCode">
 			COMPANY_CODE = #companyCode#
 		</isNotEmpty>

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

@@ -139,7 +139,7 @@
 		SELECT DISTINCT
 		CUST_CODE as "custCode",
 		CUST_CNAME as "custName"
-		FROM hpjx.t_hppz003 WHERE 1=1
+		FROM hpjx.t_hppz003 WHERE STATUS=1
 		<isNotEmpty prepend=" AND " property="companyCode">
 			COMPANY_CODE = #companyCode#
 		</isNotEmpty>

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

@@ -133,7 +133,7 @@
 		SELECT DISTINCT
 		INVENT_CODE as "inventCode",
 		INVENT_NAME as "inventName"
-		FROM hpjx.t_hppz004 WHERE 1=1
+		FROM hpjx.t_hppz004 WHERE STATUS=1
 		<isNotEmpty prepend=" AND " property="companyCode">
 			COMPANY_CODE = #companyCode#
 		</isNotEmpty>

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

@@ -180,5 +180,19 @@
 			WHERE 	
 			ID = #id#
 	</update>
-  
+
+	<select id="queryComboBox" parameterClass="java.util.HashMap"
+			resultClass="java.util.HashMap">
+		SELECT DISTINCT
+		ID as "id",
+		CONCAT(INVENT_CODE,'-',INVENT_NAME,'[',SPEC,']') as "inventName"
+		FROM hpjx.t_hppz006 WHERE STATUS=1
+		<isNotEmpty prepend=" AND " property="companyCode">
+			COMPANY_CODE = #companyCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="inventType">
+			INVENT_TYPE = #inventType#
+		</isNotEmpty>
+		ORDER BY INVENT_CODE
+	</select>
 </sqlMap>
\ No newline at end of file

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

@@ -135,9 +135,9 @@
 	<select id="queryComboBox" parameterClass="java.util.HashMap"
 			resultClass="java.util.HashMap">
 		SELECT DISTINCT
-		WH_CODE	= #whCode#,
-		WH_NAME	= #whName#
-		FROM hpjx.t_hppz004 WHERE 1=1
+		WH_CODE	as "whCode",  <!-- 仓库编码 -->
+		WH_NAME	as "whName"  <!-- 仓库名称 -->
+		FROM hpjx.t_hppz004 WHERE STATUS=1
 		<isNotEmpty prepend=" AND " property="companyCode">
 			COMPANY_CODE = #companyCode#
 		</isNotEmpty>