2024-07-30 优化存货类型上级可以选择所有已建的存货类型

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

@@ -278,20 +278,23 @@
 		SELECT 'root' as "parInventType",'根目录' as "parInventTypeName"
 		FROM DUAL
 		UNION ALL
-		(SELECT DISTINCT
+		(	SELECT DISTINCT
 				INVENT_TYPE as "parInventType",
 				INVENT_TYPE_NAME as "parInventTypeName"
 			FROM ${hggpSchema}.HGPZ004
-		WHERE DELETE_FLAG = 0
-		AND STATUS=1
-		AND PAR_INVENT_TYPE = 'root'
+			WHERE DELETE_FLAG = 0 AND STATUS=1
+			<!-- AND PAR_INVENT_TYPE = 'root' -->
 			<isNotEmpty prepend=" AND " property="accountCode">
 				ACCOUNT_CODE = #accountCode#
 			</isNotEmpty>
 			<isNotEmpty prepend=" AND " property="inventType">
 				INVENT_TYPE <![CDATA[ <> ]]> #inventType#
 			</isNotEmpty>
-		ORDER BY INVENT_TYPE)
+			<isEmpty prepend=" AND " property="inventType">
+				PAR_INVENT_TYPE = 'root'
+			</isEmpty>
+			ORDER BY INVENT_TYPE
+		)
 	</select>
 
 </sqlMap>

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

@@ -28,7 +28,7 @@ $(function() {
 				inInfo.set("methodName", "queryParComboBox");
 				inInfo.set("blockId", "par_invent_type_block_id");
 				inInfo.set("field", options.field);
-				refreshSelect(container, inInfo);
+				ParInventNameGlobalData = refreshSelect(container, inInfo);
 			}
 		}, {
 			field: "createdName",