2024-05-21 更改仓库档案仓库类型停用显示问题

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

@@ -105,7 +105,7 @@ public enum DdynamicEnum {
      * 用途：仓库类型下拉框
      * 编写：
      */
-    WH_TYPE_BLOCK_ID("wh_type_block_id", "whType", "whTypeName", "HGPZ006.queryComboBox"),
+    WH_TYPE_BLOCK_ID("wh_type_block_id", "whType", "whTypeName","status", "HGPZ006.queryComboBox"),
 
 	/**
 	 * 模块：仓库档案

src/main/java/com/baosight/hggp/hg/pz/sql/HGPZ006.xml

@@ -205,16 +205,19 @@
 			resultClass="java.util.HashMap">
 		SELECT DISTINCT
 		WH_TYPE as "whType",
-		WH_TYPE_NAME as "whTypeName"
+		WH_TYPE_NAME as "whTypeName",
+		STATUS as "status"
 		FROM ${hggpSchema}.HGPZ006
 		WHERE DELETE_FLAG = 0
-		AND STATUS=1
 		<isNotEmpty prepend=" AND " property="accountCode">
 			ACCOUNT_CODE = #accountCode#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="whType">
 			WH_TYPE = #whType#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="status">
+			STATUS = #status#
+		</isNotEmpty>
 		ORDER BY WH_TYPE
 	</select>
 

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

 $(function() {
 
+	var whTypeBox = __eiInfo.getBlock("wh_type_block_id").getMappedRows();
+
 	// 查询
 	$("#QUERY").on("click", query);
 
@@ -9,6 +11,16 @@ $(function() {
 			pageSizes: [10, 20, 30, 50, 100, 200]
 		},
 		columns: [{
+			field: "whType",
+			filter: function (options) {
+				return _.filter(whTypeBox, function (item) {
+					return item["param1Field"]=="true";
+				})
+			},
+			editor: function (container, options) {
+				this.filter(options);
+			}
+		},{
 			field: "createdName",
 			template: function (options) {
 				return showUserName(options.createdBy, options.createdName);