Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/baosight/hggp/hg/cg/service/ServiceHGCG001.java

@@ -10,6 +10,7 @@ import com.baosight.hggp.hg.cg.tools.HGCGTools;
 import com.baosight.hggp.hg.cg.utils.HGCGUtils;
 import com.baosight.hggp.hg.constant.HGConstant;
 import com.baosight.hggp.hg.constant.HGSqlConstant;
+import com.baosight.hggp.hg.xs.domain.Company;
 import com.baosight.hggp.util.AssertUtils;
 import com.baosight.hggp.util.CommonMethod;
 import com.baosight.hggp.util.DateUtils;
@@ -33,7 +34,7 @@ import java.util.Map;
  * @date:2024/5/9,11:04
  */
 public class ServiceHGCG001 extends ServiceBase {
-	
+
 	/**
 	 * 画面初始化
 	 *
@@ -50,14 +51,15 @@ public class ServiceHGCG001 extends ServiceBase {
 			CommonMethod.distinctTextField(inInfo,DdynamicEnum.INVENT_RECORD_BLOCK_ID.getBlockId());
 			CommonMethod.objConvertComboBox(resultList,inInfo,DdynamicEnum.SPEC_NAME_BLOCK_ID.getBlockId(),HGCG001.FIELD_SPEC,HGCG001.FIELD_SPEC);
 			CommonMethod.distinctTextField(inInfo,DdynamicEnum.SPEC_NAME_BLOCK_ID.getBlockId());
+			EiInfoUtils.addBlock(inInfo,"roleCompany", UserSessionUtils.getRoleCompany(), Company.class);
 
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGCG001().eiMetadata);
-		} catch (PlatException e) {
+		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
 		}
 		return inInfo;
 	}
-	
+
 	/**
 	 * 查询操作
 	 *
@@ -76,7 +78,7 @@ public class ServiceHGCG001 extends ServiceBase {
 		}
 		return inInfo;
 	}
-	
+
 	/**
 	 * 保存操作.
 	 *
@@ -101,7 +103,7 @@ public class ServiceHGCG001 extends ServiceBase {
 		}
 		return inInfo;
 	}
-	
+
 	/**
 	 * 数据校验
 	 *
@@ -119,7 +121,7 @@ public class ServiceHGCG001 extends ServiceBase {
 			AssertUtils.isGe(BigDecimal.ZERO, fCg001.getPurWeight(), String.format("计划[%s]采购重量必须大于0", planNo));
 		}
 	}
-	
+
 	/**
 	 * 数据保存
 	 *
@@ -131,7 +133,7 @@ public class ServiceHGCG001 extends ServiceBase {
 			DaoUtils.update(HGSqlConstant.HgCg001.UPDATE_PUR, fCg001);
 		}
 	}
-	
+
 	/**
 	 * 删除操作.
 	 *
@@ -156,7 +158,7 @@ public class ServiceHGCG001 extends ServiceBase {
 		}
 		return inInfo;
 	}
-	
+
 	/**
 	 * 数据校验
 	 *
@@ -172,7 +174,7 @@ public class ServiceHGCG001 extends ServiceBase {
 					String.format("计划[%s]状态不是\"待审核\"，不允许操作", planNo));
 		}
 	}
-	
+
 	/**
 	 * 数据保存
 	 *
@@ -184,7 +186,7 @@ public class ServiceHGCG001 extends ServiceBase {
 			DaoUtils.update(HGCG001.DELETE, fCg001);
 		}
 	}
-	
+
 	/**
 	 * 提交操作.
 	 *
@@ -209,7 +211,7 @@ public class ServiceHGCG001 extends ServiceBase {
 		}
 		return inInfo;
 	}
-	
+
 	/**
 	 * 数据校验
 	 *
@@ -227,8 +229,8 @@ public class ServiceHGCG001 extends ServiceBase {
 			AssertUtils.isGe(BigDecimal.ZERO, dbCg001.getPurWeight(), String.format("计划[%s]采购重量必须大于0", planNo));
 		}
 	}
-	
-	
+
+
 	/**
 	 * 提交数据
 	 *
@@ -244,7 +246,7 @@ public class ServiceHGCG001 extends ServiceBase {
 			DaoUtils.update(HGSqlConstant.HgCg001.UPDATE_AUDIT, fCg001);
 		}
 	}
-	
+
 	/**
 	 * 锁并且获取数据
 	 *

src/main/java/com/baosight/hggp/hg/cg/service/ServiceHGCG002A.java

@@ -11,6 +11,7 @@ import com.baosight.hggp.hg.cg.tools.HGCGTools;
 import com.baosight.hggp.hg.cg.utils.HGCGUtils;
 import com.baosight.hggp.hg.constant.HGConstant;
 import com.baosight.hggp.hg.sc.domain.HGSC001;
+import com.baosight.hggp.hg.xs.domain.Company;
 import com.baosight.hggp.hg.xs.domain.User;
 import com.baosight.hggp.util.AssertUtils;
 import com.baosight.hggp.util.BeanUtils;
@@ -51,6 +52,7 @@ public class ServiceHGCG002A extends ServiceBase {
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_RECORD_BLOCK_ID));
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SPEC_NAME_BLOCK_ID));
 			EiInfoUtils.addBlock(inInfo,"userByCompany", UserSessionUtils.getUserByCompany(UserSessionUtils.getAccountCode()), User.class);
+			EiInfoUtils.addBlock(inInfo,"roleCompany", UserSessionUtils.getRoleCompany(), Company.class);
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGCG001().eiMetadata);
 		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");

src/main/java/com/baosight/hggp/hg/cg/service/ServiceHGCG003.java

@@ -4,12 +4,14 @@ import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
 import com.baosight.hggp.common.DdynamicEnum;
 import com.baosight.hggp.core.dao.DaoUtils;
 import com.baosight.hggp.core.enums.DeleteFlagEnum;
+import com.baosight.hggp.core.security.UserSessionUtils;
 import com.baosight.hggp.hg.cg.domain.HGCG002A;
 import com.baosight.hggp.hg.cg.domain.HGCG003;
 import com.baosight.hggp.hg.cg.tools.HGCGTools;
 import com.baosight.hggp.hg.cg.utils.HGCGUtils;
 import com.baosight.hggp.hg.constant.HGConstant;
 import com.baosight.hggp.hg.constant.HGSqlConstant;
+import com.baosight.hggp.hg.xs.domain.Company;
 import com.baosight.hggp.util.AssertUtils;
 import com.baosight.hggp.util.CommonMethod;
 import com.baosight.hggp.util.EiInfoUtils;
@@ -31,7 +33,7 @@ import java.util.Map;
  * @date:2024/5/9,11:04
  */
 public class ServiceHGCG003 extends ServiceBase {
-	
+
 	/**
 	 * 画面初始化
 	 *
@@ -46,13 +48,14 @@ public class ServiceHGCG003 extends ServiceBase {
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SUP_RECORD_BLOCK_ID));
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_RECORD_BLOCK_ID));
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SPEC_NAME_BLOCK_ID));
+			EiInfoUtils.addBlock(inInfo,"roleCompany", UserSessionUtils.getRoleCompany(), Company.class);
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGCG003().eiMetadata);
-		} catch (PlatException e) {
+		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
 		}
 		return inInfo;
 	}
-	
+
 	/**
 	 * 查询操作
 	 *
@@ -71,7 +74,7 @@ public class ServiceHGCG003 extends ServiceBase {
 		}
 		return inInfo;
 	}
-	
+
 	/**
 	 * 保存操作.
 	 *
@@ -99,7 +102,7 @@ public class ServiceHGCG003 extends ServiceBase {
 		}
 		return inInfo;
 	}
-	
+
 	/**
 	 * 数据校验
 	 *
@@ -128,7 +131,7 @@ public class ServiceHGCG003 extends ServiceBase {
 			}
 		}
 	}
-	
+
 	/**
 	 * 数据保存
 	 *
@@ -149,7 +152,7 @@ public class ServiceHGCG003 extends ServiceBase {
 			HGCGTools.HgCg002.updateReceive(dbCg002AMap.get(contractNo), diffQty);
 		}
 	}
-	
+
 	/**
 	 * 删除操作.
 	 *
@@ -177,7 +180,7 @@ public class ServiceHGCG003 extends ServiceBase {
 		}
 		return inInfo;
 	}
-	
+
 	/**
 	 * 数据校验
 	 *
@@ -193,7 +196,7 @@ public class ServiceHGCG003 extends ServiceBase {
 					String.format("收货单[%s]状态不是\"待确认\"，不允许操作", receiveNo));
 		}
 	}
-	
+
 	/**
 	 * 数据保存
 	 *
@@ -212,7 +215,7 @@ public class ServiceHGCG003 extends ServiceBase {
 			HGCGTools.HgCg002.updateReceive(dbCg002AMap.get(contractNo), dbCg003.getReceiveQty().negate());
 		}
 	}
-	
+
 	/**
 	 * 确认操作.
 	 *
@@ -237,7 +240,7 @@ public class ServiceHGCG003 extends ServiceBase {
 		}
 		return inInfo;
 	}
-	
+
 	/**
 	 * 数据校验
 	 *
@@ -258,7 +261,7 @@ public class ServiceHGCG003 extends ServiceBase {
 							fCg003.getDeliverQty(), fCg003.getDepositQty(), dbCg003.getReceiveQty()));
 		}
 	}
-	
+
 	/**
 	 * 确认数据
 	 *
@@ -270,5 +273,5 @@ public class ServiceHGCG003 extends ServiceBase {
 			DaoUtils.update(HGSqlConstant.HgCg003.UPDATE_CONFIRM, fCg003);
 		}
 	}
-	
+
 }

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

@@ -355,4 +355,32 @@
 		</dynamic>
 	</select>
 
+	<!--查询采购已审核开票金额-->
+	<select id="queryInvoicing" parameterClass="java.util.HashMap" resultClass="java.util.HashMap">
+		SELECT
+			B.ACCOUNT_CODE as "accountCode",
+		    B.COMPANY_CODE as "companyCode",
+			C.SETTLEMENT_NUMBER as "receiveNo",  <!-- 收货单号 -->
+			SUM(C.THIS_SETTLEMENT_TAX)	as "thisSettlementAmount"  <!-- 金额 -->
+		from ${hggpSchema}.HGCW012 B
+		inner join ${hggpSchema}.HGCW013 C on B.ID = C.MAIN_ID
+		WHERE B.CONTRACT_TYPE = 1 AND B.REVIEW_STATUS = 1
+		<isNotEmpty prepend=" AND " property="accountCode">
+			B.ACCOUNT_CODE = #accountCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="companyCode">
+			B.COMPANY_CODE = #companyCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="companyCodes">
+			B.COMPANY_CODE IN <iterate close=")" open="(" conjunction="," property="companyCodes">#companyCodes[]#</iterate>
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="settlementNumber">
+			B.SETTLEMENT_NUMBER = #settlementNumber#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="accountPeriod">
+			left(B.SIGNING_DATE,6) = #accountPeriod#
+		</isNotEmpty>
+		GROUP BY B.ACCOUNT_CODE, B.COMPANY_CODE, C.SETTLEMENT_NUMBER
+	</select>
+
 </sqlMap>

src/main/java/com/baosight/hggp/hg/cw/tools/HGCWTools.java

@@ -3,6 +3,7 @@ package com.baosight.hggp.hg.cw.tools;
 import com.baosight.hggp.core.constant.CommonConstant;
 import com.baosight.hggp.core.dao.DaoBase;
 import com.baosight.hggp.core.dao.DaoUtils;
+import com.baosight.hggp.hg.constant.HGSqlConstant;
 import com.baosight.hggp.hg.cw.domain.*;
 import com.baosight.hggp.hg.cw.vo.UserVO;
 import com.baosight.hggp.hg.pz.domain.HGPZ003;
@@ -31,11 +32,11 @@ public class HGCWTools {
             return DaoBase.getInstance().query("HGCW001.queryCheckList", paramMap);
         }
 
-        public static Map getMaxAccountPeriod(String companyCode) {
+        public static HGCW001 getMaxAccountPeriod(String companyCode) {
             Map<String, Object> params = new HashMap<>();
             params.put("companyCode", companyCode);
             params.put("accountPeriodStatus",0);
-            List<Map> list = DaoBase.getInstance().query("HGCW001.getMaxAccountPeriod", params);
+            List<HGCW001> list = DaoBase.getInstance().query("HGCW001.getMaxAccountPeriod", params);
             AssertUtils.isEmpty(list, "未找到公司对应的会计期间");
             return list.get(0);
         }
@@ -466,6 +467,19 @@ public class HGCWTools {
             AssertUtils.isEmpty(paramMap, "数据检查参数不能为空");
             return DaoBase.getInstance().query("HGCW012.queryCheckList", paramMap);
         }
+
+        /**
+         * 根据收货号查询
+         * @param receiveNo 收货单号
+         * @return Map
+         */
+        public static Map getReceiveNo(String receiveNo){
+            AssertUtils.isEmpty(receiveNo, "发票号不能为空");
+            Map queryMap = new HashMap<>();
+            queryMap.put(HGCW012.FIELD_SETTLEMENT_NUMBER,receiveNo);
+            List<Map> list = DaoBase.getInstance().query(HGSqlConstant.HgCw012.INVOICING, queryMap);
+            return list.size() > 0 ? list.get(0) : null;
+        }
     }
 
     /**

src/main/java/com/baosight/hggp/hg/kc/service/ServiceHGKC001.java

@@ -4,12 +4,14 @@ import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
 import com.baosight.hggp.common.DdynamicEnum;
 import com.baosight.hggp.core.dao.DaoUtils;
 import com.baosight.hggp.core.enums.DeleteFlagEnum;
+import com.baosight.hggp.core.security.UserSessionUtils;
 import com.baosight.hggp.hg.cg.tools.HGCGTools;
 import com.baosight.hggp.hg.constant.HGConstant;
 import com.baosight.hggp.hg.kc.domain.HGKC001;
 import com.baosight.hggp.hg.kc.domain.HGKC003;
 import com.baosight.hggp.hg.kc.tools.HGKCTools;
 import com.baosight.hggp.hg.kc.utils.HGKCUtils;
+import com.baosight.hggp.hg.xs.domain.Company;
 import com.baosight.hggp.util.*;
 import com.baosight.iplat4j.core.ei.EiBlock;
 import com.baosight.iplat4j.core.ei.EiConstant;
@@ -43,8 +45,9 @@ public class ServiceHGKC001 extends ServiceBase {
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_RECORD_BLOCK_ID));
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SPEC_NAME_BLOCK_ID));
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.WH_RECORD_BLOCK_ID));
+			EiInfoUtils.addBlock(inInfo,"roleCompany", UserSessionUtils.getRoleCompany(), Company.class);
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGKC001().eiMetadata);
-		} catch (PlatException e) {
+		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
 		}
 		return inInfo;

src/main/java/com/baosight/hggp/hg/kc/service/ServiceHGKC006.java

@@ -14,6 +14,7 @@ import com.baosight.hggp.hg.kc.domain.HGKC006;
 import com.baosight.hggp.hg.kc.tools.HGKCTools;
 import com.baosight.hggp.hg.kc.utils.HGKCUtils;
 import com.baosight.hggp.hg.utils.HGUtils;
+import com.baosight.hggp.hg.xs.domain.Company;
 import com.baosight.hggp.hg.xs.tools.HGXSTools;
 import com.baosight.hggp.util.*;
 import com.baosight.iplat4j.core.ei.EiBlock;
@@ -50,8 +51,9 @@ public class ServiceHGKC006 extends ServiceBase {
 			CommonMethod.initBlock(inInfo,
 					Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID,DdynamicEnum.WH_RECORD_BLOCK_ID),map,false
 			);
+			EiInfoUtils.addBlock(inInfo,"roleCompany", UserSessionUtils.getRoleCompany(), Company.class);
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGKC006().eiMetadata);
-		} catch (PlatException e) {
+		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
 		}
 		return inInfo;

src/main/java/com/baosight/hggp/hg/kc/service/ServiceHGKC007.java

@@ -15,6 +15,7 @@ import com.baosight.hggp.hg.kc.domain.HGKC007;
 import com.baosight.hggp.hg.kc.tools.HGKCTools;
 import com.baosight.hggp.hg.kc.utils.HGKCUtils;
 import com.baosight.hggp.hg.utils.HGUtils;
+import com.baosight.hggp.hg.xs.domain.Company;
 import com.baosight.hggp.hg.xs.tools.HGXSTools;
 import com.baosight.hggp.util.*;
 import com.baosight.iplat4j.core.ei.EiBlock;
@@ -54,8 +55,9 @@ public class ServiceHGKC007 extends ServiceBase {
 			CommonMethod.initBlock(inInfo,
 					Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID,DdynamicEnum.WH_RECORD_BLOCK_ID),map,false
 			);
+			EiInfoUtils.addBlock(inInfo,"roleCompany", UserSessionUtils.getRoleCompany(), Company.class);
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGKC007().eiMetadata);
-		} catch (PlatException e) {
+		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
 		}
 		return inInfo;

src/main/java/com/baosight/hggp/hg/kc/service/ServiceHGKC010.java

@@ -8,6 +8,7 @@ import com.baosight.hggp.hg.kc.domain.HGKC010;
 import com.baosight.hggp.hg.pz.domain.HGPZ005;
 import com.baosight.hggp.hg.pz.domain.HGPZ007;
 import com.baosight.hggp.hg.sc.domain.HGSC001;
+import com.baosight.hggp.hg.xs.domain.Company;
 import com.baosight.hggp.util.CommonMethod;
 import com.baosight.hggp.util.EiInfoUtils;
 import com.baosight.hggp.util.LogUtils;
@@ -46,8 +47,9 @@ public class ServiceHGKC010 extends ServiceBase {
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_RECORD_BLOCK_ID));
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SPEC_NAME_BLOCK_ID));
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.WH_RECORD_BLOCK_ID));
+			EiInfoUtils.addBlock(inInfo,"roleCompany", UserSessionUtils.getRoleCompany(), Company.class);
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGKC010().eiMetadata);
-		} catch (PlatException e) {
+		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
 		}
 		return inInfo;

src/main/java/com/baosight/hggp/hg/kc/sql/HGKC012.xml

@@ -35,16 +35,16 @@
         <!-- C.PRINC as "princ"   负责人 -->
     </sql>
 
-    <sql id="authCondition">
-        <!-- 无权限时使用 -->
+    <!--<sql id="authCondition">
+        &lt;!&ndash; 无权限时使用 &ndash;&gt;
         <isNotEmpty prepend=" AND " property="authDepCode">
             A.DEP_CODE = #authDepCode#
         </isNotEmpty>
-        <!-- 仅本人和部门组合 -->
+        &lt;!&ndash; 仅本人和部门组合 &ndash;&gt;
         <isEqual prepend=" AND " property="authCombination" compareValue="1">
             (A.CREATED_BY = #authOnlyPeople# OR A.DEP_CODE IN <iterate close=")" open="(" conjunction="," property="authDepCodes">#authDepCodes[]#</iterate>)
         </isEqual>
-        <!-- 仅本人或部门 -->
+        &lt;!&ndash; 仅本人或部门 &ndash;&gt;
         <isNotEqual prepend=" AND " property="authCombination" compareValue="1">
             <isNotEmpty property="authOnlyPeople">
                 A.CREATED_BY = #authOnlyPeople#
@@ -53,10 +53,9 @@
                 A.DEP_CODE IN <iterate close=")" open="(" conjunction="," property="authDepCodes">#authDepCodes[]#</iterate>
             </isNotEmpty>
         </isNotEqual>
-    </sql>
+    </sql>-->
 
     <sql id="condition">
-        <include refid="authCondition"/>
         <isNotEmpty prepend=" AND " property="specId">
             A.SPEC_ID = #specId#
         </isNotEmpty>
@@ -107,7 +106,6 @@
         FROM ${hggpSchema}.HGKC010 A
         INNER JOIN ${hggpSchema}.HGPZ010 B ON A.SPEC_ID = B.INVENT_RECORD_ID
         WHERE A.INV_QTY &lt;= B.WARN_NUM
-        <include refid="authCondition"/>
         <isNotEmpty prepend=" AND " property="spec">
             A.SPEC = #spec#
         </isNotEmpty>

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/HGPZ001.xml

@@ -62,16 +62,16 @@
 		</isNotEmpty>
 	</sql>
 
-	<sql id="authCondition">
-		<!-- 无权限时使用 -->
+	<!--<sql id="authCondition">
+		&lt;!&ndash; 无权限时使用 &ndash;&gt;
 		<isNotEmpty prepend=" AND " property="authDepCode">
 			DEP_CODE = #authDepCode#
 		</isNotEmpty>
-		<!-- 仅本人和部门组合 -->
+		&lt;!&ndash; 仅本人和部门组合 &ndash;&gt;
 		<isEqual prepend=" AND " property="authCombination" compareValue="1">
 			(CREATED_BY = #authOnlyPeople# OR DEP_CODE IN <iterate close=")" open="(" conjunction="," property="authDepCodes">#authDepCodes[]#</iterate>)
 		</isEqual>
-		<!-- 仅本人或部门 -->
+		&lt;!&ndash; 仅本人或部门 &ndash;&gt;
 		<isNotEqual prepend=" AND " property="authCombination" compareValue="1">
 			<isNotEmpty property="authOnlyPeople">
 				CREATED_BY = #authOnlyPeople#
@@ -80,7 +80,7 @@
 				DEP_CODE IN <iterate close=")" open="(" conjunction="," property="authDepCodes">#authDepCodes[]#</iterate>
 			</isNotEmpty>
 		</isNotEqual>
-	</sql>
+	</sql>-->
 
 	<select id="query" parameterClass="java.util.HashMap"
 			resultClass="com.baosight.hggp.hg.pz.domain.HGPZ001">
@@ -100,7 +100,6 @@
 				DELETE_FLAG	as "deleteFlag" <!-- 是否删除0.否1.是 -->
 		FROM ${hggpSchema}.HGPZ001 WHERE 1=1 AND DELETE_FLAG = 0
         <include refid="condition" />
-		<include refid="authCondition" />
 		<dynamic prepend="ORDER BY">
 			<isNotEmpty property="orderBy">
     		  $orderBy$
@@ -115,7 +114,6 @@
 	<select id="count" resultClass="int">
 		SELECT COUNT(*) FROM ${hggpSchema}.HGPZ001 WHERE 1=1 AND DELETE_FLAG = 0
     <include refid="condition" />
-	<include refid="authCondition" />
 	</select>
 
 	<!--

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

@@ -106,16 +106,16 @@
 		</isNotEmpty>
 	</sql>
 
-	<sql id="authCondition">
-		<!-- 无权限时使用 -->
+	<!--<sql id="authCondition">
+		&lt;!&ndash; 无权限时使用 &ndash;&gt;
 		<isNotEmpty prepend=" AND " property="authDepCode">
 			DEP_CODE = #authDepCode#
 		</isNotEmpty>
-		<!-- 仅本人和部门组合 -->
+		&lt;!&ndash; 仅本人和部门组合 &ndash;&gt;
 		<isEqual prepend=" AND " property="authCombination" compareValue="1">
 			(CREATED_BY = #authOnlyPeople# OR DEP_CODE IN <iterate close=")" open="(" conjunction="," property="authDepCodes">#authDepCodes[]#</iterate>)
 		</isEqual>
-		<!-- 仅本人或部门 -->
+		&lt;!&ndash; 仅本人或部门 &ndash;&gt;
 		<isNotEqual prepend=" AND " property="authCombination" compareValue="1">
 			<isNotEmpty property="authOnlyPeople">
 				CREATED_BY = #authOnlyPeople#
@@ -124,7 +124,7 @@
 				DEP_CODE IN <iterate close=")" open="(" conjunction="," property="authDepCodes">#authDepCodes[]#</iterate>
 			</isNotEmpty>
 		</isNotEqual>
-	</sql>
+	</sql>-->
 
 	<select id="query" parameterClass="java.util.HashMap"
 			resultClass="com.baosight.hggp.hg.pz.domain.HGPZ002">
@@ -155,7 +155,6 @@
 				DELETE_FLAG	as "deleteFlag" <!-- 是否删除0.否1.是 -->
 		FROM ${hggpSchema}.HGPZ002 WHERE 1=1 AND DELETE_FLAG = 0
         <include refid="condition" />
-		<include refid="authCondition" />
 		<dynamic prepend="ORDER BY">
 			<isNotEmpty property="orderBy">
     		  $orderBy$
@@ -170,7 +169,6 @@
 	<select id="count" resultClass="int">
 		SELECT COUNT(*) FROM ${hggpSchema}.HGPZ002 WHERE 1=1 AND DELETE_FLAG = 0
     <include refid="condition" />
-	<include refid="authCondition" />
 	</select>
 
 	<!--

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

@@ -106,16 +106,16 @@
 		</isNotEmpty>
 	</sql>
 
-	<sql id="authCondition">
-		<!-- 无权限时使用 -->
+	<!--<sql id="authCondition">
+		&lt;!&ndash; 无权限时使用 &ndash;&gt;
 		<isNotEmpty prepend=" AND " property="authDepCode">
 			DEP_CODE = #authDepCode#
 		</isNotEmpty>
-		<!-- 仅本人和部门组合 -->
+		&lt;!&ndash; 仅本人和部门组合 &ndash;&gt;
 		<isEqual prepend=" AND " property="authCombination" compareValue="1">
 			(CREATED_BY = #authOnlyPeople# OR DEP_CODE IN <iterate close=")" open="(" conjunction="," property="authDepCodes">#authDepCodes[]#</iterate>)
 		</isEqual>
-		<!-- 仅本人或部门 -->
+		&lt;!&ndash; 仅本人或部门 &ndash;&gt;
 		<isNotEqual prepend=" AND " property="authCombination" compareValue="1">
 			<isNotEmpty property="authOnlyPeople">
 				CREATED_BY = #authOnlyPeople#
@@ -124,7 +124,7 @@
 				DEP_CODE IN <iterate close=")" open="(" conjunction="," property="authDepCodes">#authDepCodes[]#</iterate>
 			</isNotEmpty>
 		</isNotEqual>
-	</sql>
+	</sql>-->
 
 	<select id="query" parameterClass="java.util.HashMap"
 			resultClass="com.baosight.hggp.hg.pz.domain.HGPZ003">
@@ -155,7 +155,6 @@
 				DELETE_FLAG	as "deleteFlag" <!-- 是否删除0:否1.是 -->
 		FROM ${hggpSchema}.HGPZ003 WHERE 1=1 AND DELETE_FLAG = 0
         <include refid="condition" />
-		<include refid="authCondition" />
 		<dynamic prepend="ORDER BY">
 			<isNotEmpty property="orderBy">
     		  $orderBy$
@@ -170,7 +169,6 @@
 	<select id="count" resultClass="int">
 		SELECT COUNT(*) FROM ${hggpSchema}.HGPZ003 WHERE 1=1 AND DELETE_FLAG = 0
     <include refid="condition" />
-	<include refid="authCondition" />
 	</select>
 
 	<!--

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

@@ -73,16 +73,16 @@
 		</isNotEmpty>
 	</sql>
 
-	<sql id="authCondition">
-		<!-- 无权限时使用 -->
+	<!--<sql id="authCondition">
+		&lt;!&ndash; 无权限时使用 &ndash;&gt;
 		<isNotEmpty prepend=" AND " property="authDepCode">
 			DEP_CODE = #authDepCode#
 		</isNotEmpty>
-		<!-- 仅本人和部门组合 -->
+		&lt;!&ndash; 仅本人和部门组合 &ndash;&gt;
 		<isEqual prepend=" AND " property="authCombination" compareValue="1">
 			(CREATED_BY = #authOnlyPeople# OR DEP_CODE IN <iterate close=")" open="(" conjunction="," property="authDepCodes">#authDepCodes[]#</iterate>)
 		</isEqual>
-		<!-- 仅本人或部门 -->
+		&lt;!&ndash; 仅本人或部门 &ndash;&gt;
 		<isNotEqual prepend=" AND " property="authCombination" compareValue="1">
 			<isNotEmpty property="authOnlyPeople">
 				CREATED_BY = #authOnlyPeople#
@@ -91,7 +91,7 @@
 				DEP_CODE IN <iterate close=")" open="(" conjunction="," property="authDepCodes">#authDepCodes[]#</iterate>
 			</isNotEmpty>
 		</isNotEqual>
-	</sql>
+	</sql>-->
 
 	<select id="query" parameterClass="java.util.HashMap"
 			resultClass="com.baosight.hggp.hg.pz.domain.HGPZ004">
@@ -114,24 +114,23 @@
 			INVENT_TYPE_DETAIL as  "inventTypeDetail"
 		FROM ${hggpSchema}.HGPZ004 WHERE 1=1 AND DELETE_FLAG = 0
         <include refid="condition" />
-	<!--  物料类型需要全部账套公用，如果不公用需要对HGPZ004表存货类型的键进行处理
-    	<include refid="authCondition" />
-	-->
-    <dynamic prepend="ORDER BY">
-        <isNotEmpty property="orderBy">
-          $orderBy$
-        </isNotEmpty>
-        <isEmpty property="orderBy">
-            CREATED_TIME desc
-        </isEmpty>
-    </dynamic>
+		<!--  物料类型需要全部账套公用，如果不公用需要对HGPZ004表存货类型的键进行处理
+			<include refid="authCondition" />
+		-->
+		<dynamic prepend="ORDER BY">
+			<isNotEmpty property="orderBy">
+			  $orderBy$
+			</isNotEmpty>
+			<isEmpty property="orderBy">
+				CREATED_TIME desc
+			</isEmpty>
+		</dynamic>
 
-</select>
+	</select>
 
 <select id="count" resultClass="int">
     SELECT COUNT(*) FROM ${hggpSchema}.HGPZ004 WHERE 1=1 AND DELETE_FLAG = 0
 <include refid="condition" />
-<include refid="authCondition" />
 </select>
 
 <!--

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

@@ -62,16 +62,16 @@
 		</isNotEmpty>
 	</sql>
 
-	<sql id="authCondition">
-		<!-- 无权限时使用 -->
+	<!--<sql id="authCondition">
+		&lt;!&ndash; 无权限时使用 &ndash;&gt;
 		<isNotEmpty prepend=" AND " property="authDepCode">
 			DEP_CODE = #authDepCode#
 		</isNotEmpty>
-		<!-- 仅本人和部门组合 -->
+		&lt;!&ndash; 仅本人和部门组合 &ndash;&gt;
 		<isEqual prepend=" AND " property="authCombination" compareValue="1">
 			(CREATED_BY = #authOnlyPeople# OR DEP_CODE IN <iterate close=")" open="(" conjunction="," property="authDepCodes">#authDepCodes[]#</iterate>)
 		</isEqual>
-		<!-- 仅本人或部门 -->
+		&lt;!&ndash; 仅本人或部门 &ndash;&gt;
 		<isNotEqual prepend=" AND " property="authCombination" compareValue="1">
 			<isNotEmpty property="authOnlyPeople">
 				CREATED_BY = #authOnlyPeople#
@@ -80,7 +80,7 @@
 				DEP_CODE IN <iterate close=")" open="(" conjunction="," property="authDepCodes">#authDepCodes[]#</iterate>
 			</isNotEmpty>
 		</isNotEqual>
-	</sql>
+	</sql>-->
 
 	<select id="query" parameterClass="java.util.HashMap"
 			resultClass="com.baosight.hggp.hg.pz.domain.HGPZ006">
@@ -100,7 +100,6 @@
 				DELETE_FLAG	as "deleteFlag" <!-- 是否删除0.否1.是 -->
 		FROM ${hggpSchema}.HGPZ006 WHERE 1=1 AND DELETE_FLAG = 0
         <include refid="condition" />
-		<include refid="authCondition" />
 		<dynamic prepend="ORDER BY">
 			<isNotEmpty property="orderBy">
     		  $orderBy$
@@ -115,7 +114,6 @@
 	<select id="count" resultClass="int">
 		SELECT COUNT(*) FROM ${hggpSchema}.HGPZ006 WHERE 1=1 AND DELETE_FLAG = 0
     <include refid="condition" />
-	<include refid="authCondition" />
 	</select>
 
 	<!--

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">
@@ -70,16 +70,16 @@
 		</isNotEmpty>
 	</sql>
 
-	<sql id="authCondition">
-		<!-- 无权限时使用 -->
+	<!--<sql id="authCondition">
+		&lt;!&ndash; 无权限时使用 &ndash;&gt;
 		<isNotEmpty prepend=" AND " property="authDepCode">
 			DEP_CODE = #authDepCode#
 		</isNotEmpty>
-		<!-- 仅本人和部门组合 -->
+		&lt;!&ndash; 仅本人和部门组合 &ndash;&gt;
 		<isEqual prepend=" AND " property="authCombination" compareValue="1">
 			(CREATED_BY = #authOnlyPeople# OR DEP_CODE IN <iterate close=")" open="(" conjunction="," property="authDepCodes">#authDepCodes[]#</iterate>)
 		</isEqual>
-		<!-- 仅本人或部门 -->
+		&lt;!&ndash; 仅本人或部门 &ndash;&gt;
 		<isNotEqual prepend=" AND " property="authCombination" compareValue="1">
 			<isNotEmpty property="authOnlyPeople">
 				CREATED_BY = #authOnlyPeople#
@@ -88,7 +88,7 @@
 				DEP_CODE IN <iterate close=")" open="(" conjunction="," property="authDepCodes">#authDepCodes[]#</iterate>
 			</isNotEmpty>
 		</isNotEqual>
-	</sql>
+	</sql>-->
 
 	<select id="query" parameterClass="java.util.HashMap"
 			resultClass="com.baosight.hggp.hg.pz.domain.HGPZ007">
@@ -110,7 +110,6 @@
 				DELETE_FLAG	as "deleteFlag" <!-- 是否删除0.否1.是 -->
 		FROM ${hggpSchema}.HGPZ007 WHERE 1=1 AND DELETE_FLAG = 0
         <include refid="condition" />
-		<include refid="authCondition" />
 		<dynamic prepend="ORDER BY">
 			<isNotEmpty property="orderBy">
     		  $orderBy$
@@ -125,7 +124,37 @@
 	<select id="count" resultClass="int">
 		SELECT COUNT(*) FROM ${hggpSchema}.HGPZ007 WHERE 1=1 AND DELETE_FLAG = 0
     <include refid="condition" />
-	<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>
 
 	<!--

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

@@ -62,16 +62,16 @@
 		</isNotEmpty>
 	</sql>
 
-	<sql id="authCondition">
-		<!-- 无权限时使用 -->
+	<!--<sql id="authCondition">
+		&lt;!&ndash; 无权限时使用 &ndash;&gt;
 		<isNotEmpty prepend=" AND " property="authDepCode">
 			DEP_CODE = #authDepCode#
 		</isNotEmpty>
-		<!-- 仅本人和部门组合 -->
+		&lt;!&ndash; 仅本人和部门组合 &ndash;&gt;
 		<isEqual prepend=" AND " property="authCombination" compareValue="1">
 			(CREATED_BY = #authOnlyPeople# OR DEP_CODE IN <iterate close=")" open="(" conjunction="," property="authDepCodes">#authDepCodes[]#</iterate>)
 		</isEqual>
-		<!-- 仅本人或部门 -->
+		&lt;!&ndash; 仅本人或部门 &ndash;&gt;
 		<isNotEqual prepend=" AND " property="authCombination" compareValue="1">
 			<isNotEmpty property="authOnlyPeople">
 				CREATED_BY = #authOnlyPeople#
@@ -80,7 +80,7 @@
 				DEP_CODE IN <iterate close=")" open="(" conjunction="," property="authDepCodes">#authDepCodes[]#</iterate>
 			</isNotEmpty>
 		</isNotEqual>
-	</sql>
+	</sql>-->
 
 	<select id="query" parameterClass="java.util.HashMap"
 			resultClass="com.baosight.hggp.hg.pz.domain.HGPZ008">
@@ -100,7 +100,6 @@
 				DELETE_FLAG	as "deleteFlag" <!-- 是否删除0.否1.是 -->
 		FROM ${hggpSchema}.HGPZ008 WHERE 1=1 AND DELETE_FLAG = 0
         <include refid="condition" />
-		<include refid="authCondition" />
 		<dynamic prepend="ORDER BY">
 			<isNotEmpty property="orderBy">
     		  $orderBy$
@@ -115,7 +114,6 @@
 	<select id="count" resultClass="int">
 		SELECT COUNT(*) FROM ${hggpSchema}.HGPZ008 WHERE 1=1 AND DELETE_FLAG = 0
     <include refid="condition" />
-	<include refid="authCondition" />
 	</select>
 
 	<!--

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

@@ -89,16 +89,16 @@
 		</isNotEmpty>
 	</sql>
 
-	<sql id="authCondition">
-		<!-- 无权限时使用 -->
+	<!--<sql id="authCondition">
+		&lt;!&ndash; 无权限时使用 &ndash;&gt;
 		<isNotEmpty prepend=" AND " property="authDepCode">
 			DEP_CODE = #authDepCode#
 		</isNotEmpty>
-		<!-- 仅本人和部门组合 -->
+		&lt;!&ndash; 仅本人和部门组合 &ndash;&gt;
 		<isEqual prepend=" AND " property="authCombination" compareValue="1">
 			(CREATED_BY = #authOnlyPeople# OR DEP_CODE IN <iterate close=")" open="(" conjunction="," property="authDepCodes">#authDepCodes[]#</iterate>)
 		</isEqual>
-		<!-- 仅本人或部门 -->
+		&lt;!&ndash; 仅本人或部门 &ndash;&gt;
 		<isNotEqual prepend=" AND " property="authCombination" compareValue="1">
 			<isNotEmpty property="authOnlyPeople">
 				CREATED_BY = #authOnlyPeople#
@@ -107,7 +107,7 @@
 				DEP_CODE IN <iterate close=")" open="(" conjunction="," property="authDepCodes">#authDepCodes[]#</iterate>
 			</isNotEmpty>
 		</isNotEqual>
-	</sql>
+	</sql>-->
 
 	<select id="query" parameterClass="java.util.HashMap"
 			resultClass="com.baosight.hggp.hg.pz.domain.HGPZ010">
@@ -134,7 +134,6 @@
 		INVENT_TYPE_DETAIL as  "inventTypeDetail"
 		FROM ${hggpSchema}.HGPZ010 WHERE 1=1 AND DELETE_FLAG = 0
         <include refid="condition" />
-		<include refid="authCondition" />
 		<dynamic prepend="ORDER BY">
 			<isNotEmpty property="orderBy">
     		  $orderBy$
@@ -149,7 +148,6 @@
 	<select id="count" resultClass="int">
 		SELECT COUNT(*) FROM ${hggpSchema}.HGPZ010 WHERE 1=1 AND DELETE_FLAG = 0
     <include refid="condition" />
-	<include refid="authCondition" />
 	</select>
 
 	<!--

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);
 		}
 

src/main/java/com/baosight/hggp/hg/zl/service/ServiceHGZL001.java

@@ -5,9 +5,11 @@ import com.baosight.hggp.common.DdynamicEnum;
 import com.baosight.hggp.core.constant.CommonConstant;
 import com.baosight.hggp.core.dao.DaoUtils;
 import com.baosight.hggp.core.enums.DeleteFlagEnum;
+import com.baosight.hggp.core.security.UserSessionUtils;
 import com.baosight.hggp.hg.cg.tools.HGCGTools;
 import com.baosight.hggp.hg.constant.HGSqlConstant;
 import com.baosight.hggp.hg.kc.tools.HGKCTools;
+import com.baosight.hggp.hg.xs.domain.Company;
 import com.baosight.hggp.hg.zl.domain.HGZL001;
 import com.baosight.hggp.hg.zl.utils.HGZLUtils;
 import com.baosight.hggp.util.AssertUtils;
@@ -43,6 +45,7 @@ public class ServiceHGZL001 extends ServiceBase {
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.COMPANY_CODE_BLOCK_ID));
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_RECORD_BLOCK_ID));
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SPEC_NAME_BLOCK_ID));
+			EiInfoUtils.addBlock(inInfo,"roleCompany", UserSessionUtils.getRoleCompany(), Company.class);
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGZL001().eiMetadata);
 		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");

src/main/webapp/HG/CG/HGCG001.jsp

@@ -12,8 +12,8 @@
 			                 role="date" format="yyyy-MM-dd" readonly="true"/>
 			<EF:EFInput cname="计划单号" blockId="inqu_status" ename="planNo" row="0" colWidth="3"/>
 			<EF:EFSelect cname="公司名称" blockId="inqu_status" ename="companyCode" row="0" colWidth="3"
-			             filter="contains" optionLabel="全部" defultValue="">
-				<EF:EFOptions blockId="company_code_block_id" textField="textField" valueField="valueField"/>
+						 filter="contains" optionLabel="全部" defultValue="">
+				<EF:EFOptions blockId="roleCompany" valueField="companyCode" textField="companyName"/>
 			</EF:EFSelect>
 			<EF:EFSelect cname="状态" blockId="inqu_status" ename="status" row="0" colWidth="3" optionLabel="全部"
 			             defultValue="">

src/main/webapp/HG/CG/HGCG002.js

@@ -68,7 +68,7 @@ $(function () {
 							// 数量*单价金额
 							let totalAmount = item.purQty * item.price;
 							//税额
-							let taxAmount = totalAmount* item.taxRate / 100;
+							let taxAmount = totalAmount * item.taxRate / 100;
 							//不含税金额
 							let amount = totalAmount - taxAmount;
 							//含税金额

src/main/webapp/HG/CG/HGCG002A.jsp

@@ -12,8 +12,8 @@
 			                 role="date" format="yyyy-MM-dd" readonly="true"/>
 			<EF:EFInput cname="计划单号" blockId="inqu_status" ename="planNo" row="0" colWidth="3"/>
 			<EF:EFSelect cname="公司名称" blockId="inqu_status" ename="companyCode" row="0" colWidth="3"
-			             filter="contains" optionLabel="全部" defultValue="">
-				<EF:EFOptions blockId="company_code_block_id" textField="textField" valueField="valueField"/>
+						 filter="contains" optionLabel="全部" defultValue="">
+				<EF:EFOptions blockId="roleCompany" valueField="companyCode" textField="companyName"/>
 			</EF:EFSelect>
 			<EF:EFSelect cname="存货名称" blockId="inqu_status" ename="inventCode" row="0" colWidth="3"
 			             filter="contains" optionLabel="全部" defultValue="">

src/main/webapp/HG/CG/HGCG003.jsp

@@ -19,8 +19,8 @@
 		</div>
 		<div class="row">
 			<EF:EFSelect cname="公司名称" blockId="inqu_status" ename="companyCode" row="0" colWidth="3"
-			             filter="contains" optionLabel="全部" defultValue="">
-				<EF:EFOptions blockId="company_code_block_id" textField="textField" valueField="valueField"/>
+						 filter="contains" optionLabel="全部" defultValue="">
+				<EF:EFOptions blockId="roleCompany" valueField="companyCode" textField="companyName"/>
 			</EF:EFSelect>
 			<EF:EFSelect cname="供应商名称" blockId="inqu_status" ename="supCode" row="0" colWidth="3"
 			             filter="contains" optionLabel="全部" defultValue="">

src/main/webapp/HG/KC/HGKC001.jsp

@@ -19,8 +19,8 @@
 		</div>
 		<div class="row">
 			<EF:EFSelect cname="公司名称" blockId="inqu_status" ename="companyCode" row="0" colWidth="3"
-			             filter="contains" optionLabel="全部" defultValue="">
-				<EF:EFOptions blockId="company_code_block_id" textField="textField" valueField="valueField"/>
+						 filter="contains" optionLabel="全部" defultValue="">
+				<EF:EFOptions blockId="roleCompany" valueField="companyCode" textField="companyName"/>
 			</EF:EFSelect>
 			<EF:EFSelect cname="供应商名称" blockId="inqu_status" ename="supCode" row="0" colWidth="3"
 			             filter="contains" optionLabel="全部" defultValue="">

src/main/webapp/HG/KC/HGKC006.js

 let WhNameGlobalData = [];
 $(function () {
-	var companyCodes = __eiInfo.getBlock("companyBox_block_id").getMappedRows();
+	var companyCodes = __eiInfo.getBlock("roleCompany").getMappedRows();
 	IPLATUI.EFGrid.result = {
 		pageable: {
 			pageSize: 20,
@@ -28,9 +28,9 @@ $(function () {
 			field: "companyCode",
 			template: function (dataItem) {
 				for (let i = 0; i < companyCodes.length; i++) {
-					if (companyCodes[i]['valueField'] === dataItem['companyCode']){
-						dataItem['companyName'] = companyCodes[i]['textField']
-						return companyCodes[i]['textField'];
+					if (companyCodes[i]['companyCode'] === dataItem['companyCode']){
+						dataItem['companyName'] = companyCodes[i]['companyName']
+						return companyCodes[i]['companyName'];
 					}
 				}
 				return dataItem["companyCode"];

src/main/webapp/HG/KC/HGKC006.jsp

@@ -41,9 +41,9 @@
 			<EF:EFComboColumn ename="companyCode" cname="公司名称"
 							  columnTemplate="#=textField#" itemTemplate="#=textField#"
 							  textField="textField" valueField="valueField"
-							  maxLength="16" width="120" required="true"
+							  maxLength="16" readonly="false" width="200" required="true"
 							  align="center" filter="contains" sort="true">
-				<EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
+				<EF:EFOptions blockId="roleCompany" textField="companyName" valueField="companyCode"/>
 			</EF:EFComboColumn>
 			<EF:EFColumn ename="companyName" cname="公司名称" hidden="true"/>
 			<EF:EFColumn ename="otherEnterDate" cname="单据日期"  width="100" align="center" editType="date"

src/main/webapp/HG/KC/HGKC007.js

 let whNameGlobalData = [];
 $(function () {
-	var companyCodes = __eiInfo.getBlock("companyBox_block_id").getMappedRows();
+	var companyCodes = __eiInfo.getBlock("roleCompany").getMappedRows();
 	IPLATUI.EFGrid.result = {
 		pageable: {
 			pageSize: 20,
@@ -28,9 +28,9 @@ $(function () {
 			field: "companyCode",
 			template: function (dataItem) {
 				for (let i = 0; i < companyCodes.length; i++) {
-					if (companyCodes[i]['valueField'] === dataItem['companyCode']){
-						dataItem['companyName'] = companyCodes[i]['textField']
-						return companyCodes[i]['textField'];
+					if (companyCodes[i]['companyCode'] === dataItem['companyCode']){
+						dataItem['companyName'] = companyCodes[i]['companyName']
+						return companyCodes[i]['companyName'];
 					}
 				}
 				return dataItem["companyCode"];

src/main/webapp/HG/KC/HGKC007.jsp

@@ -42,9 +42,9 @@
 			<EF:EFComboColumn ename="companyCode" cname="公司名称"
 							  columnTemplate="#=textField#" itemTemplate="#=textField#"
 							  textField="textField" valueField="valueField"
-							  maxLength="16" width="120" required="true"
+							  maxLength="16" readonly="false" width="200" required="true"
 							  align="center" filter="contains" sort="true">
-				<EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
+				<EF:EFOptions blockId="roleCompany" textField="companyName" valueField="companyCode"/>
 			</EF:EFComboColumn>
 			<EF:EFColumn ename="companyName" cname="公司名称" hidden="true"/>
 			<EF:EFColumn ename="otherOutDate" cname="单据日期"  width="100" align="center" editType="date"

src/main/webapp/HG/KC/HGKC010.jsp

@@ -9,8 +9,8 @@
 	<EF:EFRegion id="inqu" title="查询条件">
 		<div class="row">
 			<EF:EFSelect cname="公司名称" blockId="inqu_status" ename="companyCode" row="0" colWidth="3"
-			             optionLabel="全部" defultValue="" filter="contains">
-				<EF:EFOptions blockId="company_code_block_id" textField="textField" valueField="valueField"/>
+						 filter="contains" optionLabel="全部" defultValue="">
+				<EF:EFOptions blockId="roleCompany" valueField="companyCode" textField="companyName"/>
 			</EF:EFSelect>
 			<EF:EFSelect cname="仓库名称" blockId="inqu_status" ename="whCode" row="0" colWidth="3"
 			             optionLabel="全部" defultValue="" filter="contains">

src/main/webapp/HG/ZL/HGZL001.jsp

@@ -10,10 +10,10 @@
 	    <div class="row">
 		    <EF:EFDatePicker cname="单据日期" ename="receiptDate" blockId="inqu_status" row="0" colWidth="3"
 		                     format="yyyy-MM-dd" readonly="true"/>
-		    <EF:EFSelect cname="公司名称" blockId="inqu_status" ename="companyCode" row="0" colWidth="3"
-		                 filter="contains" optionLabel="全部" defultValue="">
-			    <EF:EFOptions blockId="company_code_block_id" textField="textField" valueField="valueField"/>
-		    </EF:EFSelect>
+			<EF:EFSelect cname="公司名称" blockId="inqu_status" ename="companyCode" row="0" colWidth="3"
+						 filter="contains" optionLabel="全部" defultValue="">
+				<EF:EFOptions blockId="roleCompany" valueField="companyCode" textField="companyName"/>
+			</EF:EFSelect>
 		    <EF:EFSelect cname="存货名称" blockId="inqu_status" ename="inventCode" row="0" colWidth="3"
 		                 filter="contains" optionLabel="全部" defultValue="">
 			    <EF:EFOptions blockId="invent_record_block_id" textField="textField" valueField="valueField"/>