Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly

src/main/java/com/baosight/hggp/hg/cw/domain/HGCW017.java

@@ -61,6 +61,9 @@ public class HGCW017 extends DaoEPBase {
 	public static final String UPDATE = "HGCW017.update";
 	public static final String DELETE = "HGCW017.delete";
 
+	public static final String QUERY_NO_AUTH = "HGCW017.queryNoAuth";
+
+
 	private Long id = new Long(0);	
 	private Long mainId = new Long(0);	/* 主表ID*/
 	private String accountCode = " ";		/* 企业编码*/

src/main/java/com/baosight/hggp/hg/cw/service/ServiceHGCW016C.java

@@ -46,7 +46,7 @@ public class ServiceHGCW016C extends ServiceBase {
 	@Override
 	public EiInfo query(EiInfo inInfo) {
 		try {
-			inInfo = super.query(inInfo, HGCW017.QUERY, new HGCW017());
+			inInfo = super.query(inInfo, HGCW017.QUERY_NO_AUTH, new HGCW017());
 		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "查询失败");
 		}

src/main/java/com/baosight/hggp/hg/cw/sql/HGCW001.xml

@@ -376,10 +376,10 @@
 			COMPANY_CODE = #companyCode#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="bussinessTime">
-			<![CDATA[ ACCOUNT_PERIOD_DATE_START >= #bussinessTime# ]]>
+			<![CDATA[ ACCOUNT_PERIOD_DATE_START <= #bussinessTime# ]]>
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="bussinessTime">
-			<![CDATA[ ACCOUNT_PERIOD_DATE_END <= #bussinessTime# ]]>
+			<![CDATA[ ACCOUNT_PERIOD_DATE_END >= #bussinessTime# ]]>
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="accountPeriodStatus">
 			ACCOUNT_PERIOD_STATUS = #accountPeriodStatus#

src/main/java/com/baosight/hggp/hg/cw/sql/HGCW012.xml

@@ -423,4 +423,14 @@
 		</dynamic>
 	</select>
 
+	<update id="updateDeductionAmount">
+		UPDATE ${hggpSchema}.HGCW012
+		SET
+		REMAINING_AMOUNT	= #remainingAmount#,   <!-- 剩余开票/收票金额 -->
+		UPDATED_BY	= #updatedBy#,   <!-- 记录修改者 -->
+		UPDATED_NAME	= #updatedName#,   <!-- 记录修改名称 -->
+		UPDATED_TIME	= #updatedTime#   <!-- 记录修改时间 -->
+		WHERE
+		ID = #id#
+	</update>
 </sqlMap>

src/main/java/com/baosight/hggp/hg/cw/sql/HGCW012A.xml

@@ -414,5 +414,7 @@
 		WHERE
 		ID = #id#
 	</update>
+
+
 </sqlMap>
 

src/main/java/com/baosight/hggp/hg/cw/sql/HGCW017.xml

@@ -22,8 +22,7 @@
 	-->
 <sqlMap namespace="HGCW017">
 
-	<sql id="condition">
-		<include refid="HGXSDataAuth.authCondition"/>
+	<sql id="condition_no_auth">
 		<isNotEmpty prepend=" AND " property="id">
 			ID = #id#
 		</isNotEmpty>
@@ -74,6 +73,11 @@
 		</isNotEmpty>
 	</sql>
 
+	<sql id="condition">
+		<include refid="HGXSDataAuth.authCondition"/>
+		<include refid="condition_no_auth"/>
+	</sql>
+
 	<select id="query" parameterClass="java.util.HashMap"
 			resultClass="com.baosight.hggp.hg.cw.domain.HGCW017">
 		SELECT
@@ -105,6 +109,37 @@
 
 	</select>
 
+	<select id="queryNoAuth" parameterClass="java.util.HashMap"
+	resultClass="com.baosight.hggp.hg.cw.domain.HGCW017">
+	SELECT
+	ID	as "id",
+	MAIN_ID	as "mainId",  <!-- 主表ID -->
+	ACCOUNT_CODE	as "accountCode",  <!-- 企业编码 -->
+	COMPANY_CODE	as "companyCode",  <!-- 公司编码 -->
+	COMPANY_NAME	as "companyName",  <!-- 公司名称 -->
+	CONTRACT_NUMBER	as "contractNumber",  <!-- 来源单号 -->
+	PARTY_A	as "partyA",  <!-- 供应商名称 -->
+	TOTAL_CONTRACT_PRICE_INCLUDING	as "totalContractPriceIncluding",  <!-- 收款总额 -->
+	CREATED_BY	as "createdBy",  <!-- 记录创建者 -->
+	CREATED_NAME	as "createdName",  <!-- 记录创建名称 -->
+	CREATED_TIME	as "createdTime",  <!-- 记录创建时间 -->
+	UPDATED_BY	as "updatedBy",  <!-- 记录修改者 -->
+	UPDATED_NAME	as "updatedName",  <!-- 记录修改名称 -->
+	UPDATED_TIME	as "updatedTime",  <!-- 记录修改时间 -->
+	DEP_CODE	as "depCode" <!-- 部门编码 -->
+	FROM ${hggpSchema}.HGCW017 WHERE 1=1
+	<include refid="condition_no_auth" />
+	<dynamic prepend="ORDER BY">
+		<isNotEmpty property="orderBy">
+			$orderBy$
+		</isNotEmpty>
+		<isEmpty property="orderBy">
+			ID asc
+		</isEmpty>
+	</dynamic>
+
+</select>
+
 	<select id="count" resultClass="int">
 		SELECT COUNT(*) FROM ${hggpSchema}.HGCW017 WHERE 1=1
     <include refid="condition" />

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

@@ -33,11 +33,11 @@ $(function() {
 			}
 		}, {
 			field: "inventType",
-			filter: function (options) {
-				return _.filter(inventTypeBox, function (item) {
-					return item["param1Field"]=="true" && item["param2Field"] != "root";
-				})
-			},
+			// filter: function (options) {
+			// 	return _.filter(inventTypeBox, function (item) {
+			// 		return item["param1Field"]=="true" && item["param2Field"] != "root";
+			// 	})
+			// },
 			editor: function (container, options) {
 				this.filter(options);
 			}

src/main/webapp/HG/SC/HGSC004A.js

@@ -186,7 +186,7 @@ $(function () {
                         inInfo.set("inqu_status-0-companyCode", options.model["companyCode"]);
                         var nodeData = IPLATUI.EFTree.materialTree.selectTreeNode;
                         if (nodeData.lv == 2) {
-                            inInfo.set("inqu_status-0-parInventType", "root");
+                            // inInfo.set("inqu_status-0-parInventType", "root");
                             //3级节点选择只能是构建
                             inInfo.set("inqu_status-0-inventTypeDetail", "1");
                         } else if (nodeData.lv == 3) {