调拨单生成的其它入库、其他出库问题修改

src/main/java/com/baosight/hggp/hg/pz/domain/HGPZ007.java

@@ -54,6 +54,7 @@ public class HGPZ007 extends DaoEPBase {
 	public static final String COL_DELETE_FLAG = "DELETE_FLAG";    		/* 是否删除0.否1.是*/
 
 	public static final String QUERY = "HGPZ007.query";
+	public static final String QUERY_NOT_BY_ROLE = "HGPZ007.queryNotByRole";
 	public static final String COUNT = "HGPZ007.count";
 	public static final String INSERT = "HGPZ007.insert";
 	public static final String UPDATE = "HGPZ007.update";

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

@@ -4,20 +4,20 @@
    		Version :  1.0
 		schema : hggp
 		tableName : HGPZ007
-		 ID  BIGINT   NOT NULL   primarykey, 
-		 ACCOUNT_CODE  VARCHAR, 
-		 DEP_CODE  VARCHAR, 
-		 WH_TYPE  VARCHAR, 
-		 WH_CODE  VARCHAR, 
-		 WH_NAME  VARCHAR, 
-		 PRINC  VARCHAR, 
-		 STATUS  TINYINT, 
-		 CREATED_BY  VARCHAR, 
-		 CREATED_NAME  VARCHAR, 
-		 CREATED_TIME  VARCHAR, 
-		 UPDATED_BY  VARCHAR, 
-		 UPDATED_NAME  VARCHAR, 
-		 UPDATED_TIME  VARCHAR, 
+		 ID  BIGINT   NOT NULL   primarykey,
+		 ACCOUNT_CODE  VARCHAR,
+		 DEP_CODE  VARCHAR,
+		 WH_TYPE  VARCHAR,
+		 WH_CODE  VARCHAR,
+		 WH_NAME  VARCHAR,
+		 PRINC  VARCHAR,
+		 STATUS  TINYINT,
+		 CREATED_BY  VARCHAR,
+		 CREATED_NAME  VARCHAR,
+		 CREATED_TIME  VARCHAR,
+		 UPDATED_BY  VARCHAR,
+		 UPDATED_NAME  VARCHAR,
+		 UPDATED_TIME  VARCHAR,
 		 DELETE_FLAG  TINYINT
 	-->
 <sqlMap namespace="HGPZ007">
@@ -128,6 +128,37 @@
 	<include refid="authCondition" />
 	</select>
 
+	<select id="queryNotByRole" parameterClass="java.util.HashMap"
+			resultClass="com.baosight.hggp.hg.pz.domain.HGPZ007">
+		SELECT
+		ID	as "id",  <!-- 主键ID -->
+		ACCOUNT_CODE	as "accountCode",  <!-- 帐套编码 -->
+		DEP_CODE	as "depCode",  <!-- 部门编码 -->
+		WH_TYPE	as "whType",  <!-- 仓库类型 -->
+		WH_CODE	as "whCode",  <!-- 仓库编码 -->
+		WH_NAME	as "whName",  <!-- 仓库名称 -->
+		PRINC	as "princ",  <!-- 负责人 -->
+		STATUS	as "status",  <!-- 状态 0停用 1启用 -->
+		CREATED_BY	as "createdBy",  <!-- 创建人 -->
+		CREATED_NAME	as "createdName",  <!-- 创建人名称 -->
+		CREATED_TIME	as "createdTime",  <!-- 创建时间 -->
+		UPDATED_BY	as "updatedBy",  <!-- 修改人 -->
+		UPDATED_NAME	as "updatedName",  <!-- 修改人名称 -->
+		UPDATED_TIME	as "updatedTime",  <!-- 修改时间 -->
+		DELETE_FLAG	as "deleteFlag" <!-- 是否删除0.否1.是 -->
+		FROM ${hggpSchema}.HGPZ007 WHERE 1=1 AND DELETE_FLAG = 0
+		<include refid="condition" />
+		<dynamic prepend="ORDER BY">
+			<isNotEmpty property="orderBy">
+				$orderBy$
+			</isNotEmpty>
+			<isEmpty property="orderBy">
+				CREATED_TIME desc
+			</isEmpty>
+		</dynamic>
+
+	</select>
+
 	<!--
 		<isNotEmpty prepend=" AND " property="id">
 			ID = #id#

src/main/java/com/baosight/hggp/hg/pz/tools/HGPZTools.java

@@ -154,7 +154,7 @@ public class HGPZTools {
 			AssertUtils.isEmpty(whCode, "仓库编码不能为空");
 			Map queryMap = new HashMap();
 			queryMap.put("whCode", whCode);
-			List<HGPZ007> results = DaoBase.getInstance().query(HGPZ007.QUERY, queryMap);
+			List<HGPZ007> results = DaoBase.getInstance().query(HGPZ007.QUERY_NOT_BY_ROLE, queryMap);
 			return CollectionUtils.isEmpty(results) ? null : results.get(0);
 		}