From 0b5a1219f95570125fde9b6c6201a48b92dd0410 Mon Sep 17 00:00:00 2001 From: liuyang <ly89170160@qq.com> Date: Tue, 3 Dec 2024 17:24:14 +0800 Subject: [PATCH] 1、采购收票格式日期 2、用户下拉框添加企业账套条件 --- src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG001.java | 8 +++----- src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG002.java | 3 ++- src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG002A.java | 8 +++----- src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG002B.java | 4 +++- src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG002C.java | 8 +++----- src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG003.java | 3 ++- src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG003A.java | 8 +++----- src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG003B.java | 4 +++- src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG003C.java | 8 +++----- src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG004.java | 8 +++----- src/main/java/com/baosight/hpjx/hp/cw/domain/HPCW002.java | 2 +- src/main/java/com/baosight/hpjx/hp/fw/service/ServiceHPFW001B.java | 6 ++++-- src/main/java/com/baosight/hpjx/hp/fw/service/ServiceHPFW002B.java | 6 ++++-- src/main/java/com/baosight/hpjx/hp/fw/service/ServiceHPFW003B.java | 9 +++++++-- src/main/java/com/baosight/hpjx/hp/fw/service/ServiceHPFW004B.java | 9 +++++++-- src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC012.java | 6 +++++- src/main/java/com/baosight/hpjx/hp/pz/service/ServiceHPPZ007.java | 6 +++++- src/main/java/com/baosight/hpjx/hp/sb/service/ServiceHPSB003A.java | 7 ++++++- src/main/java/com/baosight/hpjx/hp/yx/service/ServiceHPYX001.java | 11 ++++++----- src/main/java/com/baosight/hpjx/hp/yx/service/ServiceHPYX005.java | 10 +++++----- src/main/java/com/baosight/hpjx/hp/yx/service/ServiceHPYX005B.java | 6 +++++- src/main/java/com/baosight/hpjx/hp/yx/service/ServiceHPYX005C.java | 6 +++++- src/main/java/com/baosight/hpjx/hp/yx/service/ServiceHPYX006.java | 10 +++++----- src/main/java/com/baosight/hpjx/hp/zl/service/ServiceHPZL001.java | 17 ++++++++++++----- src/main/java/com/baosight/hpjx/hp/zl/service/ServiceHPZL004B.java | 15 +++++++++++---- 25 files changed, 116 insertions(+), 72 deletions(-) diff --git a/src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG001.java b/src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG001.java index 9b22a3a..843d325 100644 --- a/src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG001.java +++ b/src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG001.java @@ -4,6 +4,7 @@ import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation; import com.baosight.hpjx.common.DdynamicEnum; import com.baosight.hpjx.core.constant.CommonConstant; import com.baosight.hpjx.core.dao.DaoUtils; +import com.baosight.hpjx.core.security.UserSessionUtils; import com.baosight.hpjx.hp.bg.domain.HPBG001; import com.baosight.hpjx.hp.constant.HPConstant; import com.baosight.hpjx.util.CommonMethod; @@ -14,10 +15,7 @@ import com.baosight.iplat4j.core.ei.EiInfo; import com.baosight.iplat4j.core.service.impl.ServiceEPBase; import com.baosight.iplat4j.ed.util.SequenceGenerator; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.util.*; /** * @author LiuYang @@ -33,7 +31,7 @@ public class ServiceHPBG001 extends ServiceEPBase { DdynamicEnum.CUSTOMER_RECORD_BLOCK_ID, DdynamicEnum.WH_RECORD_BLOCK_ID, DdynamicEnum.USER_BLOCK_ID - ), null, false); + ), new HashMap<String, Object>(){{ put("companyCode", UserSessionUtils.getCompanyCode()); }}, false); } catch (Exception e) { LogUtils.setDetailMsg(inInfo, e, "初始化失败"); } diff --git a/src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG002.java b/src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG002.java index 39b0d3f..460a0fd 100644 --- a/src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG002.java +++ b/src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG002.java @@ -5,6 +5,7 @@ import com.baosight.hpjx.common.DdynamicEnum; import com.baosight.hpjx.common.ReviewStatusEnum; import com.baosight.hpjx.core.constant.CommonConstant; import com.baosight.hpjx.core.dao.DaoUtils; +import com.baosight.hpjx.core.security.UserSessionUtils; import com.baosight.hpjx.hp.bg.domain.HPBG001; import com.baosight.hpjx.hp.bg.domain.HPBG002; import com.baosight.hpjx.hp.bg.domain.HPBG002A; @@ -35,7 +36,7 @@ public class ServiceHPBG002 extends ServiceEPBase { CommonMethod.initBlock(inInfo, Arrays.asList( DdynamicEnum.WH_RECORD_BLOCK_ID, DdynamicEnum.USER_BLOCK_ID - ), null, false); + ), new HashMap<String, Object>(){{ put("companyCode", UserSessionUtils.getCompanyCode()); }}, false); inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPBG002().eiMetadata); } catch (Exception e) { LogUtils.setDetailMsg(inInfo, e, "初始化失败"); diff --git a/src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG002A.java b/src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG002A.java index b26f7f7..0d30658 100644 --- a/src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG002A.java +++ b/src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG002A.java @@ -5,6 +5,7 @@ import com.baosight.hpjx.common.DdynamicEnum; import com.baosight.hpjx.common.ReviewStatusEnum; import com.baosight.hpjx.core.constant.CommonConstant; import com.baosight.hpjx.core.dao.DaoUtils; +import com.baosight.hpjx.core.security.UserSessionUtils; import com.baosight.hpjx.hp.bg.domain.HPBG001; import com.baosight.hpjx.hp.bg.domain.HPBG002; import com.baosight.hpjx.hp.bg.domain.HPBG002A; @@ -17,10 +18,7 @@ import com.baosight.iplat4j.core.ei.EiInfo; import com.baosight.iplat4j.core.service.impl.ServiceEPBase; import java.math.BigDecimal; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; import java.util.stream.Collectors; /** @@ -37,7 +35,7 @@ public class ServiceHPBG002A extends ServiceEPBase { DdynamicEnum.CUSTOMER_RECORD_BLOCK_ID, DdynamicEnum.WH_RECORD_BLOCK_ID, DdynamicEnum.USER_BLOCK_ID - ), null, false); + ), new HashMap<String, Object>(){{ put("companyCode", UserSessionUtils.getCompanyCode()); }}, false); inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPBG002A().eiMetadata); } catch (Exception e) { LogUtils.setDetailMsg(inInfo, e, "初始化失败"); diff --git a/src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG002B.java b/src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG002B.java index aa5d09e..7bd4f17 100644 --- a/src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG002B.java +++ b/src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG002B.java @@ -4,6 +4,7 @@ import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation; import com.baosight.hpjx.common.DdynamicEnum; import com.baosight.hpjx.core.constant.CommonConstant; import com.baosight.hpjx.core.dao.DaoUtils; +import com.baosight.hpjx.core.security.UserSessionUtils; import com.baosight.hpjx.hp.bg.domain.HPBG002; import com.baosight.hpjx.hp.bg.domain.HPBG002A; import com.baosight.hpjx.hp.constant.HPConstant; @@ -16,6 +17,7 @@ import com.baosight.iplat4j.core.service.impl.ServiceEPBase; import com.baosight.iplat4j.ed.util.SequenceGenerator; import java.util.Arrays; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -33,7 +35,7 @@ public class ServiceHPBG002B extends ServiceEPBase { DdynamicEnum.WH_RECORD_BLOCK_ID, DdynamicEnum.USER_BLOCK_ID, DdynamicEnum.ITEM_CODE_BLOCK_ID - ), null, false); + ), new HashMap<String, Object>(){{ put("companyCode", UserSessionUtils.getCompanyCode()); }}, false); } catch (Exception e) { LogUtils.setDetailMsg(inInfo, e, "初始化失败"); } diff --git a/src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG002C.java b/src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG002C.java index 17e22a7..a78660f 100644 --- a/src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG002C.java +++ b/src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG002C.java @@ -5,6 +5,7 @@ import com.baosight.hpjx.common.DdynamicEnum; import com.baosight.hpjx.common.ReviewStatusEnum; import com.baosight.hpjx.core.constant.CommonConstant; import com.baosight.hpjx.core.dao.DaoUtils; +import com.baosight.hpjx.core.security.UserSessionUtils; import com.baosight.hpjx.hp.bg.domain.HPBG002; import com.baosight.hpjx.hp.bg.domain.HPBG002A; import com.baosight.hpjx.hp.bg.domain.HPBG003A; @@ -20,10 +21,7 @@ import com.baosight.iplat4j.core.ei.EiConstant; import com.baosight.iplat4j.core.ei.EiInfo; import com.baosight.iplat4j.core.service.impl.ServiceEPBase; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.Map; +import java.util.*; /** * @author LiuYang @@ -40,7 +38,7 @@ public class ServiceHPBG002C extends ServiceEPBase { DdynamicEnum.WH_RECORD_BLOCK_ID, DdynamicEnum.USER_BLOCK_ID, DdynamicEnum.ITEM_CODE_BLOCK_ID - ), null, false); + ), new HashMap<String, Object>(){{ put("companyCode", UserSessionUtils.getCompanyCode()); }}, false); Long id = Long.parseLong(params.get(HPBG002.FIELD_ID)); HPBG002 hpbg002 = HPBGTools.HpBg002.get(id); List<HPBG002A> hpbg002As = HPBGTools.HpBg002a.getByParentId(id); diff --git a/src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG003.java b/src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG003.java index 98cb09a..74a2fb4 100644 --- a/src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG003.java +++ b/src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG003.java @@ -5,6 +5,7 @@ import com.baosight.hpjx.common.DdynamicEnum; import com.baosight.hpjx.common.ReviewStatusEnum; import com.baosight.hpjx.core.constant.CommonConstant; import com.baosight.hpjx.core.dao.DaoUtils; +import com.baosight.hpjx.core.security.UserSessionUtils; import com.baosight.hpjx.hp.bg.domain.*; import com.baosight.hpjx.hp.bg.tools.HPBGTools; import com.baosight.hpjx.hp.constant.HPConstant; @@ -32,7 +33,7 @@ public class ServiceHPBG003 extends ServiceEPBase { CommonMethod.initBlock(inInfo, Arrays.asList( DdynamicEnum.WH_RECORD_BLOCK_ID, DdynamicEnum.USER_BLOCK_ID - ), null, false); + ), new HashMap<String, Object>(){{ put("companyCode", UserSessionUtils.getCompanyCode()); }}, false); inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPBG003().eiMetadata); } catch (Exception e) { LogUtils.setDetailMsg(inInfo, e, "初始化失败"); diff --git a/src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG003A.java b/src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG003A.java index 5b33689..12ab0f4 100644 --- a/src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG003A.java +++ b/src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG003A.java @@ -5,6 +5,7 @@ import com.baosight.hpjx.common.DdynamicEnum; import com.baosight.hpjx.common.ReviewStatusEnum; import com.baosight.hpjx.core.constant.CommonConstant; import com.baosight.hpjx.core.dao.DaoUtils; +import com.baosight.hpjx.core.security.UserSessionUtils; import com.baosight.hpjx.hp.bg.domain.*; import com.baosight.hpjx.hp.bg.tools.HPBGTools; import com.baosight.hpjx.util.*; @@ -14,10 +15,7 @@ import com.baosight.iplat4j.core.ei.EiInfo; import com.baosight.iplat4j.core.service.impl.ServiceEPBase; import java.math.BigDecimal; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; import java.util.stream.Collectors; /** @@ -33,7 +31,7 @@ public class ServiceHPBG003A extends ServiceEPBase { CommonMethod.initBlock(inInfo, Arrays.asList( DdynamicEnum.WH_RECORD_BLOCK_ID, DdynamicEnum.USER_BLOCK_ID - ), null, false); + ), new HashMap<String, Object>(){{ put("companyCode", UserSessionUtils.getCompanyCode()); }}, false); inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPBG003A().eiMetadata); } catch (Exception e) { LogUtils.setDetailMsg(inInfo, e, "初始化失败"); diff --git a/src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG003B.java b/src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG003B.java index 341cd41..8909425 100644 --- a/src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG003B.java +++ b/src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG003B.java @@ -1,12 +1,14 @@ package com.baosight.hpjx.hp.bg.service; import com.baosight.hpjx.common.DdynamicEnum; +import com.baosight.hpjx.core.security.UserSessionUtils; import com.baosight.hpjx.util.CommonMethod; import com.baosight.hpjx.util.LogUtils; import com.baosight.iplat4j.core.ei.EiInfo; import com.baosight.iplat4j.core.service.impl.ServiceEPBase; import java.util.Arrays; +import java.util.HashMap; /** * @author LiuYang @@ -22,7 +24,7 @@ public class ServiceHPBG003B extends ServiceEPBase { DdynamicEnum.WH_RECORD_BLOCK_ID, DdynamicEnum.USER_BLOCK_ID, DdynamicEnum.ITEM_CODE_BLOCK_ID - ), null, false); + ), new HashMap<String, Object>(){{ put("companyCode", UserSessionUtils.getCompanyCode()); }}, false); } catch (Exception e) { LogUtils.setDetailMsg(inInfo, e, "初始化失败"); } diff --git a/src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG003C.java b/src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG003C.java index 627690c..ee0e851 100644 --- a/src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG003C.java +++ b/src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG003C.java @@ -5,6 +5,7 @@ import com.baosight.hpjx.common.DdynamicEnum; import com.baosight.hpjx.common.ReviewStatusEnum; import com.baosight.hpjx.core.constant.CommonConstant; import com.baosight.hpjx.core.dao.DaoUtils; +import com.baosight.hpjx.core.security.UserSessionUtils; import com.baosight.hpjx.hp.bg.domain.HPBG002A; import com.baosight.hpjx.hp.bg.domain.HPBG003; import com.baosight.hpjx.hp.bg.domain.HPBG003A; @@ -20,10 +21,7 @@ import com.baosight.iplat4j.core.ei.EiConstant; import com.baosight.iplat4j.core.ei.EiInfo; import com.baosight.iplat4j.core.service.impl.ServiceEPBase; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.Map; +import java.util.*; /** * @author LiuYang @@ -40,7 +38,7 @@ public class ServiceHPBG003C extends ServiceEPBase { DdynamicEnum.WH_RECORD_BLOCK_ID, DdynamicEnum.USER_BLOCK_ID, DdynamicEnum.ITEM_CODE_BLOCK_ID - ), null, false); + ), new HashMap<String, Object>(){{ put("companyCode", UserSessionUtils.getCompanyCode()); }}, false); Long id = Long.parseLong(params.get(HPBG003.FIELD_ID)); HPBG003 hpbg003 = HPBGTools.HpBg003.get(id); List<HPBG003A> hpbg003As = HPBGTools.HpBg003a.getByParentId(id); diff --git a/src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG004.java b/src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG004.java index 42660ef..7e6e7ce 100644 --- a/src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG004.java +++ b/src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG004.java @@ -5,6 +5,7 @@ import com.baosight.hpjx.common.DdynamicEnum; import com.baosight.hpjx.common.ReviewStatusEnum; import com.baosight.hpjx.core.constant.CommonConstant; import com.baosight.hpjx.core.dao.DaoUtils; +import com.baosight.hpjx.core.security.UserSessionUtils; import com.baosight.hpjx.hp.bg.domain.HPBG001; import com.baosight.hpjx.hp.bg.domain.HPBG004; import com.baosight.hpjx.hp.bg.domain.HPBG004; @@ -16,10 +17,7 @@ import com.baosight.iplat4j.core.ei.EiInfo; import com.baosight.iplat4j.core.service.impl.ServiceEPBase; import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; /** @@ -37,7 +35,7 @@ public class ServiceHPBG004 extends ServiceEPBase { DdynamicEnum.WH_RECORD_BLOCK_ID, DdynamicEnum.USER_BLOCK_ID, DdynamicEnum.ITEM_CODE_BLOCK_ID - ), null, false); + ), new HashMap<String, Object>(){{ put("companyCode", UserSessionUtils.getCompanyCode()); }}, false); } catch (Exception e) { LogUtils.setDetailMsg(inInfo, e, "初始化失败"); } diff --git a/src/main/java/com/baosight/hpjx/hp/cw/domain/HPCW002.java b/src/main/java/com/baosight/hpjx/hp/cw/domain/HPCW002.java index 5fa827a..540d109 100644 --- a/src/main/java/com/baosight/hpjx/hp/cw/domain/HPCW002.java +++ b/src/main/java/com/baosight/hpjx/hp/cw/domain/HPCW002.java @@ -757,7 +757,7 @@ public class HPCW002 extends DaoEPBase { setThisSettlementTax(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_THIS_SETTLEMENT_TAX)), thisSettlementTax)); setThisSettlementAmount(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_THIS_SETTLEMENT_AMOUNT)), thisSettlementAmount)); setTotalContractPriceIncluding(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_TOTAL_CONTRACT_PRICE_INCLUDING)), totalContractPriceIncluding)); - setReceiveDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_RECEIVE_DATE)), receiveDate)); + setReceiveDate(StringUtils.defaultIfEmpty(StringUtils.toString(DateUtils.formatShort(map.get(FIELD_RECEIVE_DATE))), receiveDate)); setDepositQty(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_DEPOSIT_QTY)), depositQty)); setReceiveWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_RECEIVE_WEIGHT)), receiveWeight)); setPrice(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_PRICE)), price)); diff --git a/src/main/java/com/baosight/hpjx/hp/fw/service/ServiceHPFW001B.java b/src/main/java/com/baosight/hpjx/hp/fw/service/ServiceHPFW001B.java index 317b2fe..e3bb9c1 100644 --- a/src/main/java/com/baosight/hpjx/hp/fw/service/ServiceHPFW001B.java +++ b/src/main/java/com/baosight/hpjx/hp/fw/service/ServiceHPFW001B.java @@ -4,6 +4,7 @@ import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation; import com.baosight.hpjx.common.DdynamicEnum; import com.baosight.hpjx.core.constant.CommonConstant; import com.baosight.hpjx.core.dao.DaoUtils; +import com.baosight.hpjx.core.security.UserSessionUtils; import com.baosight.hpjx.hp.constant.HPConstant; import com.baosight.hpjx.hp.fw.domain.HPFW001; import com.baosight.hpjx.hp.fw.tools.HpFwTools; @@ -22,6 +23,7 @@ import com.baosight.iplat4j.core.service.impl.ServiceEPBase; import com.baosight.iplat4j.ed.util.SequenceGenerator; import java.util.Arrays; +import java.util.HashMap; import java.util.Map; /** @@ -41,8 +43,8 @@ public class ServiceHPFW001B extends ServiceEPBase { @Override public EiInfo initLoad(EiInfo inInfo) { try { - CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.USER_BLOCK_ID), null); - CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.CUSTOMER_RECORD_BLOCK_ID), null); + CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.CUSTOMER_RECORD_BLOCK_ID,DdynamicEnum.USER_BLOCK_ID), + new HashMap<String, Object>(){{ put("companyCode", UserSessionUtils.getCompanyCode()); }}); this.setBaseInfo(inInfo); } catch (Exception e) { LogUtils.setDetailMsg(inInfo, e, "初始化失败"); diff --git a/src/main/java/com/baosight/hpjx/hp/fw/service/ServiceHPFW002B.java b/src/main/java/com/baosight/hpjx/hp/fw/service/ServiceHPFW002B.java index fc6b1b4..3560c3c 100644 --- a/src/main/java/com/baosight/hpjx/hp/fw/service/ServiceHPFW002B.java +++ b/src/main/java/com/baosight/hpjx/hp/fw/service/ServiceHPFW002B.java @@ -4,6 +4,7 @@ import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation; import com.baosight.hpjx.common.DdynamicEnum; import com.baosight.hpjx.core.constant.CommonConstant; import com.baosight.hpjx.core.dao.DaoUtils; +import com.baosight.hpjx.core.security.UserSessionUtils; import com.baosight.hpjx.hp.constant.HPConstant; import com.baosight.hpjx.hp.fw.domain.HPFW002; import com.baosight.hpjx.hp.fw.tools.HpFwTools; @@ -22,6 +23,7 @@ import com.baosight.iplat4j.core.service.impl.ServiceEPBase; import com.baosight.iplat4j.ed.util.SequenceGenerator; import java.util.Arrays; +import java.util.HashMap; import java.util.Map; /** @@ -41,8 +43,8 @@ public class ServiceHPFW002B extends ServiceEPBase { @Override public EiInfo initLoad(EiInfo inInfo) { try { - CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.USER_BLOCK_ID), null); - CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.CUSTOMER_RECORD_BLOCK_ID), null); + CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.CUSTOMER_RECORD_BLOCK_ID,DdynamicEnum.USER_BLOCK_ID), + new HashMap<String, Object>(){{ put("companyCode", UserSessionUtils.getCompanyCode()); }}); this.setBaseInfo(inInfo); } catch (Exception e) { LogUtils.setDetailMsg(inInfo, e, "初始化失败"); diff --git a/src/main/java/com/baosight/hpjx/hp/fw/service/ServiceHPFW003B.java b/src/main/java/com/baosight/hpjx/hp/fw/service/ServiceHPFW003B.java index 7fd956a..4da2788 100644 --- a/src/main/java/com/baosight/hpjx/hp/fw/service/ServiceHPFW003B.java +++ b/src/main/java/com/baosight/hpjx/hp/fw/service/ServiceHPFW003B.java @@ -4,6 +4,7 @@ import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation; import com.baosight.hpjx.common.DdynamicEnum; import com.baosight.hpjx.core.constant.CommonConstant; import com.baosight.hpjx.core.dao.DaoUtils; +import com.baosight.hpjx.core.security.UserSessionUtils; import com.baosight.hpjx.hp.constant.HPConstant; import com.baosight.hpjx.hp.fw.domain.HPFW003; import com.baosight.hpjx.hp.fw.tools.HpFwTools; @@ -22,6 +23,7 @@ import com.baosight.iplat4j.core.service.impl.ServiceEPBase; import com.baosight.iplat4j.ed.util.SequenceGenerator; import java.util.Arrays; +import java.util.HashMap; import java.util.Map; /** @@ -41,8 +43,11 @@ public class ServiceHPFW003B extends ServiceEPBase { @Override public EiInfo initLoad(EiInfo inInfo) { try { - CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.USER_BLOCK_ID), null); - CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.CUSTOMER_RECORD_BLOCK_ID), null); + CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.CUSTOMER_RECORD_BLOCK_ID,DdynamicEnum.USER_BLOCK_ID), + new HashMap<String, Object>(){{ + put("companyCode", UserSessionUtils.getCompanyCode()); + }} + ); this.setBaseInfo(inInfo); } catch (Exception e) { LogUtils.setDetailMsg(inInfo, e, "初始化失败"); diff --git a/src/main/java/com/baosight/hpjx/hp/fw/service/ServiceHPFW004B.java b/src/main/java/com/baosight/hpjx/hp/fw/service/ServiceHPFW004B.java index dfd9bfc..8e33611 100644 --- a/src/main/java/com/baosight/hpjx/hp/fw/service/ServiceHPFW004B.java +++ b/src/main/java/com/baosight/hpjx/hp/fw/service/ServiceHPFW004B.java @@ -3,6 +3,7 @@ package com.baosight.hpjx.hp.fw.service; import com.baosight.hpjx.common.DdynamicEnum; import com.baosight.hpjx.core.constant.CommonConstant; import com.baosight.hpjx.core.dao.DaoUtils; +import com.baosight.hpjx.core.security.UserSessionUtils; import com.baosight.hpjx.hp.constant.HPConstant; import com.baosight.hpjx.hp.fw.domain.HPFW004; import com.baosight.hpjx.hp.fw.tools.HpFwTools; @@ -21,6 +22,7 @@ import com.baosight.iplat4j.core.service.impl.ServiceEPBase; import com.baosight.iplat4j.ed.util.SequenceGenerator; import java.util.Arrays; +import java.util.HashMap; import java.util.Map; /** @@ -40,8 +42,11 @@ public class ServiceHPFW004B extends ServiceEPBase { @Override public EiInfo initLoad(EiInfo inInfo) { try { - CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.USER_BLOCK_ID), null); - CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.CUSTOMER_RECORD_BLOCK_ID), null); + CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.CUSTOMER_RECORD_BLOCK_ID,DdynamicEnum.USER_BLOCK_ID), + new HashMap<String, Object>(){{ + put("companyCode", UserSessionUtils.getCompanyCode()); + }} + ); this.setBaseInfo(inInfo); } catch (Exception e) { LogUtils.setDetailMsg(inInfo, e, "初始化失败"); diff --git a/src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC012.java b/src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC012.java index fe06d22..6b8ddac 100644 --- a/src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC012.java +++ b/src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC012.java @@ -3,6 +3,7 @@ package com.baosight.hpjx.hp.kc.service; import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation; import com.baosight.hpjx.common.DdynamicEnum; import com.baosight.hpjx.common.InventTypeEnum; +import com.baosight.hpjx.core.security.UserSessionUtils; import com.baosight.hpjx.hp.kc.domain.HPKC012; import com.baosight.hpjx.util.CommonMethod; import com.baosight.hpjx.util.EiInfoUtils; @@ -39,7 +40,10 @@ public class ServiceHPKC012 extends ServiceBase { try { Map queryMap = new HashMap(); queryMap.put("inventTypes", DEFAULT_INVENT_CODE); - CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.USER_BLOCK_ID), null,true); + CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.USER_BLOCK_ID), + new HashMap<String, Object>(){{ + put("companyCode", UserSessionUtils.getCompanyCode()); + }},true); CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.WH_RECORD_BLOCK_ID), queryMap); CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_NAME_BLOCK_ID), queryMap); CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SPEC_NAME_BLOCK_ID), queryMap); diff --git a/src/main/java/com/baosight/hpjx/hp/pz/service/ServiceHPPZ007.java b/src/main/java/com/baosight/hpjx/hp/pz/service/ServiceHPPZ007.java index 3ae6530..e3a22d4 100644 --- a/src/main/java/com/baosight/hpjx/hp/pz/service/ServiceHPPZ007.java +++ b/src/main/java/com/baosight/hpjx/hp/pz/service/ServiceHPPZ007.java @@ -3,6 +3,7 @@ package com.baosight.hpjx.hp.pz.service; import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation; import com.baosight.hpjx.common.DdynamicEnum; import com.baosight.hpjx.core.dao.DaoUtils; +import com.baosight.hpjx.core.security.UserSessionUtils; import com.baosight.hpjx.hp.constant.HPConstant; import com.baosight.hpjx.hp.pz.domain.HPPZ004; import com.baosight.hpjx.hp.pz.domain.HPPZ007; @@ -37,7 +38,10 @@ public class ServiceHPPZ007 extends ServiceBase { @OperationLogAnnotation(operModul = "仓库档案",operType = "查询",operDesc = "初始化") public EiInfo initLoad(EiInfo inInfo) { try { - CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.USER_BLOCK_ID), null,true); + CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.USER_BLOCK_ID), + new HashMap<String, Object>(){{ + put("companyCode", UserSessionUtils.getCompanyCode()); + }},true); CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.FACTORY_RECORD_BLOCK_ID), null, false); inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPPZ007().eiMetadata); } catch (PlatException e) { diff --git a/src/main/java/com/baosight/hpjx/hp/sb/service/ServiceHPSB003A.java b/src/main/java/com/baosight/hpjx/hp/sb/service/ServiceHPSB003A.java index 9312ad3..1811a0b 100644 --- a/src/main/java/com/baosight/hpjx/hp/sb/service/ServiceHPSB003A.java +++ b/src/main/java/com/baosight/hpjx/hp/sb/service/ServiceHPSB003A.java @@ -2,6 +2,7 @@ package com.baosight.hpjx.hp.sb.service; import com.baosight.hpjx.common.DdynamicEnum; import com.baosight.hpjx.core.constant.CommonConstant; +import com.baosight.hpjx.core.security.UserSessionUtils; import com.baosight.hpjx.hp.sb.domain.HPSB003; import com.baosight.hpjx.hp.sb.domain.HPSB003A; import com.baosight.hpjx.hp.sb.domain.HPSB008; @@ -14,6 +15,7 @@ import com.baosight.iplat4j.core.ei.EiInfo; import com.baosight.iplat4j.core.service.impl.ServiceEPBase; import java.util.Arrays; +import java.util.HashMap; /** * @author LiuYang @@ -38,7 +40,10 @@ public class ServiceHPSB003A extends ServiceEPBase { Arrays.asList( DdynamicEnum.FACTORY_CODE_BOX_BLOCK_ID, DdynamicEnum.USER_BLOCK_ID, - DdynamicEnum.GROUP_CODE_BOX_BLOCK_ID),null + DdynamicEnum.GROUP_CODE_BOX_BLOCK_ID), + new HashMap<String, Object>(){{ + put("companyCode", UserSessionUtils.getCompanyCode()); + }} ); return inInfo; } diff --git a/src/main/java/com/baosight/hpjx/hp/yx/service/ServiceHPYX001.java b/src/main/java/com/baosight/hpjx/hp/yx/service/ServiceHPYX001.java index 8021aff..c73a5e8 100644 --- a/src/main/java/com/baosight/hpjx/hp/yx/service/ServiceHPYX001.java +++ b/src/main/java/com/baosight/hpjx/hp/yx/service/ServiceHPYX001.java @@ -4,6 +4,7 @@ import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation; import com.baosight.hpjx.common.DdynamicEnum; import com.baosight.hpjx.core.constant.CommonConstant; import com.baosight.hpjx.core.dao.DaoUtils; +import com.baosight.hpjx.core.security.UserSessionUtils; import com.baosight.hpjx.hp.constant.HPConstant; import com.baosight.hpjx.hp.yx.domain.HPYX001; import com.baosight.hpjx.hp.yx.domain.HPYX002; @@ -16,10 +17,7 @@ import com.baosight.iplat4j.core.ei.EiConstant; import com.baosight.iplat4j.core.ei.EiInfo; import com.baosight.iplat4j.core.service.impl.ServiceEPBase; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.util.*; /** * @author LiuYang @@ -35,7 +33,10 @@ public class ServiceHPYX001 extends ServiceEPBase { DdynamicEnum.CUSTOMER_RECORD_BLOCK_ID, DdynamicEnum.SUPPLIER_RECORD_BLOCK_ID, DdynamicEnum.USER_BLOCK_ID - ), null, false); + ), + new HashMap<String, Object>(){{ + put("companyCode", UserSessionUtils.getCompanyCode()); + }}, false); } catch (Exception e) { LogUtils.setDetailMsg(inInfo, e, "初始化失败"); } diff --git a/src/main/java/com/baosight/hpjx/hp/yx/service/ServiceHPYX005.java b/src/main/java/com/baosight/hpjx/hp/yx/service/ServiceHPYX005.java index 8182f2f..b9d64c9 100644 --- a/src/main/java/com/baosight/hpjx/hp/yx/service/ServiceHPYX005.java +++ b/src/main/java/com/baosight/hpjx/hp/yx/service/ServiceHPYX005.java @@ -4,6 +4,7 @@ import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation; import com.baosight.hpjx.common.DdynamicEnum; import com.baosight.hpjx.core.constant.CommonConstant; import com.baosight.hpjx.core.dao.DaoUtils; +import com.baosight.hpjx.core.security.UserSessionUtils; import com.baosight.hpjx.hp.constant.HPConstant; import com.baosight.hpjx.hp.wd.domain.HPWD001; import com.baosight.hpjx.hp.yx.domain.*; @@ -18,10 +19,7 @@ import com.baosight.iplat4j.core.ei.EiInfo; import com.baosight.iplat4j.core.service.impl.ServiceEPBase; import com.baosight.iplat4j.ed.util.SequenceGenerator; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.util.*; /** * @author LiuYang @@ -39,7 +37,9 @@ public class ServiceHPYX005 extends ServiceEPBase { DdynamicEnum.CUSTOMER_RECORD_BLOCK_ID, DdynamicEnum.SUPPLIER_RECORD_BLOCK_ID, DdynamicEnum.USER_BLOCK_ID - ), null, false); + ), new HashMap<String, Object>(){{ + put("companyCode", UserSessionUtils.getCompanyCode()); + }}, false); } catch (Exception e) { LogUtils.setDetailMsg(inInfo, e, "初始化失败"); } diff --git a/src/main/java/com/baosight/hpjx/hp/yx/service/ServiceHPYX005B.java b/src/main/java/com/baosight/hpjx/hp/yx/service/ServiceHPYX005B.java index 998f0fc..5c86496 100644 --- a/src/main/java/com/baosight/hpjx/hp/yx/service/ServiceHPYX005B.java +++ b/src/main/java/com/baosight/hpjx/hp/yx/service/ServiceHPYX005B.java @@ -1,6 +1,7 @@ package com.baosight.hpjx.hp.yx.service; import com.baosight.hpjx.common.DdynamicEnum; +import com.baosight.hpjx.core.security.UserSessionUtils; import com.baosight.hpjx.hp.yx.domain.HPYX005A; import com.baosight.hpjx.util.CommonMethod; import com.baosight.hpjx.util.LogUtils; @@ -9,6 +10,7 @@ import com.baosight.iplat4j.core.exception.PlatException; import com.baosight.iplat4j.core.service.impl.ServiceEPBase; import java.util.Arrays; +import java.util.HashMap; /** * @author LiuYang @@ -30,7 +32,9 @@ public class ServiceHPYX005B extends ServiceEPBase { DdynamicEnum.CUSTOMER_RECORD_BLOCK_ID, DdynamicEnum.SUPPLIER_RECORD_BLOCK_ID, DdynamicEnum.USER_BLOCK_ID - ), null, false); + ), new HashMap<String, Object>(){{ + put("companyCode", UserSessionUtils.getCompanyCode()); + }}, false); inInfo.addBlock("detail").addBlockMeta(new HPYX005A().eiMetadata); } catch (PlatException e) { LogUtils.setDetailMsg(inInfo, e, "初始化失败"); diff --git a/src/main/java/com/baosight/hpjx/hp/yx/service/ServiceHPYX005C.java b/src/main/java/com/baosight/hpjx/hp/yx/service/ServiceHPYX005C.java index e194c2e..c99a2df 100644 --- a/src/main/java/com/baosight/hpjx/hp/yx/service/ServiceHPYX005C.java +++ b/src/main/java/com/baosight/hpjx/hp/yx/service/ServiceHPYX005C.java @@ -3,6 +3,7 @@ package com.baosight.hpjx.hp.yx.service; import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation; import com.baosight.hpjx.common.DdynamicEnum; import com.baosight.hpjx.core.constant.CommonConstant; +import com.baosight.hpjx.core.security.UserSessionUtils; import com.baosight.hpjx.hp.yx.domain.HPYX005; import com.baosight.hpjx.hp.yx.domain.HPYX005A; import com.baosight.hpjx.hp.yx.tools.HPYXTools; @@ -14,6 +15,7 @@ import com.baosight.iplat4j.core.exception.PlatException; import com.baosight.iplat4j.core.service.impl.ServiceEPBase; import java.util.Arrays; +import java.util.HashMap; import java.util.List; /** @@ -36,7 +38,9 @@ public class ServiceHPYX005C extends ServiceEPBase { DdynamicEnum.CUSTOMER_RECORD_BLOCK_ID, DdynamicEnum.SUPPLIER_RECORD_BLOCK_ID, DdynamicEnum.USER_BLOCK_ID - ), null, false); + ), new HashMap<String, Object>(){{ + put("companyCode", UserSessionUtils.getCompanyCode()); + }}, false); String id = inInfo.getString("id"); HPYX005 hpyx005 = HPYXTools.HpYx005.queryById(Long.valueOf(id)); inInfo.addBlock(EiConstant.resultBlock).addRow(hpyx005); diff --git a/src/main/java/com/baosight/hpjx/hp/yx/service/ServiceHPYX006.java b/src/main/java/com/baosight/hpjx/hp/yx/service/ServiceHPYX006.java index c0f5d55..5d2b8b1 100644 --- a/src/main/java/com/baosight/hpjx/hp/yx/service/ServiceHPYX006.java +++ b/src/main/java/com/baosight/hpjx/hp/yx/service/ServiceHPYX006.java @@ -4,6 +4,7 @@ import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation; import com.baosight.hpjx.common.DdynamicEnum; import com.baosight.hpjx.core.constant.CommonConstant; import com.baosight.hpjx.core.dao.DaoUtils; +import com.baosight.hpjx.core.security.UserSessionUtils; import com.baosight.hpjx.hp.constant.HPConstant; import com.baosight.hpjx.hp.yx.domain.*; import com.baosight.hpjx.util.CommonMethod; @@ -15,10 +16,7 @@ import com.baosight.iplat4j.core.ei.EiInfo; import com.baosight.iplat4j.core.service.impl.ServiceEPBase; import com.baosight.iplat4j.ed.util.SequenceGenerator; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.util.*; /** * @author LiuYang @@ -35,7 +33,9 @@ public class ServiceHPYX006 extends ServiceEPBase { DdynamicEnum.SUPPLIER_RECORD_BLOCK_ID, DdynamicEnum.INVENT_NAME_BLOCK_ID, DdynamicEnum.USER_BLOCK_ID - ), null, false); + ), new HashMap<String, Object>(){{ + put("companyCode", UserSessionUtils.getCompanyCode()); + }}, false); } catch (Exception e) { LogUtils.setDetailMsg(inInfo, e, "初始化失败"); } diff --git a/src/main/java/com/baosight/hpjx/hp/zl/service/ServiceHPZL001.java b/src/main/java/com/baosight/hpjx/hp/zl/service/ServiceHPZL001.java index 24b3e33..bfff0e5 100644 --- a/src/main/java/com/baosight/hpjx/hp/zl/service/ServiceHPZL001.java +++ b/src/main/java/com/baosight/hpjx/hp/zl/service/ServiceHPZL001.java @@ -4,6 +4,7 @@ import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation; import com.baosight.hpjx.common.DdynamicEnum; import com.baosight.hpjx.core.constant.CommonConstant; import com.baosight.hpjx.core.dao.DaoUtils; +import com.baosight.hpjx.core.security.UserSessionUtils; import com.baosight.hpjx.core.tools.Iplat4jTools; import com.baosight.hpjx.hp.constant.HPConstant; import com.baosight.hpjx.hp.constant.HPSqlConstant; @@ -37,11 +38,17 @@ public class ServiceHPZL001 extends ServiceBase { @OperationLogAnnotation(operModul = "质量巡检单",operType = "查询",operDesc = "初始化") public EiInfo initLoad(EiInfo inInfo) { try { - CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.PROJ_RECORD_BLOCK_ID), null); - CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_RECORD_BLOCK_ID), null); - CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SUB_INVENT_RECORD_BLOCK_ID), null); - CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.ORG_RECORD_BLOCK_ID), null); - CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.USER_BLOCK_ID), null); + CommonMethod.initBlock(inInfo, + Arrays.asList( + DdynamicEnum.PROJ_RECORD_BLOCK_ID, + DdynamicEnum.INVENT_RECORD_BLOCK_ID, + DdynamicEnum.SUB_INVENT_RECORD_BLOCK_ID, + DdynamicEnum.ORG_RECORD_BLOCK_ID, + DdynamicEnum.USER_BLOCK_ID), + new HashMap<String, Object>(){{ + put("companyCode", UserSessionUtils.getCompanyCode()); + }} + ); inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPZL001().eiMetadata); } catch (Exception e) { LogUtils.setDetailMsg(inInfo, e, "初始化失败"); diff --git a/src/main/java/com/baosight/hpjx/hp/zl/service/ServiceHPZL004B.java b/src/main/java/com/baosight/hpjx/hp/zl/service/ServiceHPZL004B.java index dc7b236..0a06688 100644 --- a/src/main/java/com/baosight/hpjx/hp/zl/service/ServiceHPZL004B.java +++ b/src/main/java/com/baosight/hpjx/hp/zl/service/ServiceHPZL004B.java @@ -5,6 +5,7 @@ import com.baosight.hpjx.common.DdynamicEnum; import com.baosight.hpjx.core.constant.CommonConstant; import com.baosight.hpjx.core.dao.DaoUtils; import com.baosight.hpjx.core.enums.HandleStatusEnum; +import com.baosight.hpjx.core.security.UserSessionUtils; import com.baosight.hpjx.hp.constant.HPConstant; import com.baosight.hpjx.hp.sc.domain.HPSC001; import com.baosight.hpjx.hp.sc.domain.HPSC002; @@ -28,6 +29,7 @@ import com.baosight.iplat4j.core.service.impl.ServiceEPBase; import com.baosight.iplat4j.ed.util.SequenceGenerator; import java.util.Arrays; +import java.util.HashMap; import java.util.Map; /** @@ -50,10 +52,15 @@ public class ServiceHPZL004B extends ServiceEPBase { try { // 查询物料信息 this.setQualityInfo(inInfo); - CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.PROJ_RECORD_BLOCK_ID), null, false); - CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_RECORD_BLOCK_ID), null); - CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.ORG_RECORD_BLOCK_ID), null); - CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.USER_BLOCK_ID), null); + CommonMethod.initBlock(inInfo, + Arrays.asList( + DdynamicEnum.PROJ_RECORD_BLOCK_ID, + DdynamicEnum.INVENT_RECORD_BLOCK_ID, + DdynamicEnum.ORG_RECORD_BLOCK_ID, + DdynamicEnum.USER_BLOCK_ID), + new HashMap<String, Object>(){{ + put("companyCode", UserSessionUtils.getCompanyCode()); + }}, false); inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPZL004().eiMetadata); } catch (Exception e) { LogUtils.setDetailMsg(inInfo, e, "初始化失败"); -- libgit2 0.26.0