公司下拉框需要根据权限选择

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;
@@ -50,9 +51,10 @@ 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;

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;
@@ -46,8 +48,9 @@ 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;

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/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

@@ -13,7 +13,7 @@
 			<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"/>
+				<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

@@ -13,7 +13,7 @@
 			<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"/>
+				<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

@@ -20,7 +20,7 @@
 		<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"/>
+				<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

@@ -20,7 +20,7 @@
 		<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"/>
+				<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

@@ -12,7 +12,7 @@
 		                     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: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="">