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

src/main/java/com/baosight/hggp/core/security/UserSessionUtils.java

@@ -19,6 +19,7 @@ import org.apache.commons.collections.MapUtils;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.stream.Collectors;
@@ -153,7 +154,10 @@ public class UserSessionUtils extends UserSession {
 				.filter(StringUtils::isNotBlank).collect(Collectors.toList());
 		// 查询组织信息
 		List<Org> orgs = HGXSTools.XsOrg.list(companyCodes);
-		return orgs.stream().map(item -> new Company(item.getOrgId(), item.getOrgCname())).collect(Collectors.toList());
+		Optional.ofNullable(companyCodes).orElse(new ArrayList<>()).stream().forEach( code -> {
+			orgs.addAll(HGXSTools.XsOrg.queryByParent(code,OrgTypeEnum.COMPANY.getCode()));
+		});
+		return orgs.stream().filter(o->StringUtils.equals(o.getOrgType(),OrgTypeEnum.COMPANY.getCode())).map(item -> new Company(item.getOrgId(), item.getOrgCname())).collect(Collectors.toList());
 	}
 	
 	/**

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

@@ -37,6 +37,7 @@ public class HGCW001 extends DaoEPBase {
 	public static final String FIELD_UPDATED_NAME = "updatedName";    		/* 记录修改名称*/
 	public static final String FIELD_UPDATED_TIME = "updatedTime";    		/* 记录修改时间*/
 	public static final String FIELD_DEP_CODE = "depCode";    		/* 部门编码*/
+	public static final String FIELD_COMPANY_CODES = "companyCodes";/*用户角色权限*/
 
 	public static final String COL_ID = "ID";    		
 	public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE";    		/* 企业编码*/
@@ -55,6 +56,8 @@ public class HGCW001 extends DaoEPBase {
 	public static final String COL_UPDATED_TIME = "UPDATED_TIME";    		/* 记录修改时间*/
 	public static final String COL_DEP_CODE = "DEP_CODE";    		/* 部门编码*/
 
+
+
 	public static final String QUERY = "HGCW001.query";
 	public static final String COUNT = "HGCW001.count";
 	public static final String INSERT = "HGCW001.insert";

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

@@ -62,6 +62,7 @@ public class HGCW002 extends DaoEPBase {
 	public static final String FIELD_UPDATED_NAME = "updatedName";    		/* 记录修改名称*/
 	public static final String FIELD_UPDATED_TIME = "updatedTime";    		/* 记录修改时间*/
 	public static final String FIELD_DEP_CODE = "depCode";    		/* 部门编码*/
+	public static final String FIELD_COMPANY_CODES = "companyCodes";
 
 	public static final String COL_ID = "ID";
 	public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE";    		/* 企业编码*/

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

@@ -43,6 +43,7 @@ public class HGCW003 extends DaoEPBase {
 	public static final String FIELD_UPDATED_NAME = "updatedName";    		/* 记录修改名称*/
 	public static final String FIELD_UPDATED_TIME = "updatedTime";    		/* 记录修改时间*/
 	public static final String FIELD_DEP_CODE = "depCode";    		/* 部门编码*/
+	public static final String FIELD_COMPANY_CODES = "companyCodes";
 
 	public static final String COL_ID = "ID";    		
 	public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE";    		/* 企业编码*/

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

@@ -46,6 +46,7 @@ public class HGCW004 extends DaoEPBase {
     public static final String FIELD_UPDATED_NAME = "updatedName";    		/* 记录修改名称*/
     public static final String FIELD_UPDATED_TIME = "updatedTime";    		/* 记录修改时间*/
     public static final String FIELD_DEP_CODE = "depCode";    		/* 部门编码*/
+    public static final String FIELD_COMPANY_CODES = "companyCodes";
 
     public static final String COL_ID = "ID";
     public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE";    		/* 企业编码*/

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

@@ -45,6 +45,7 @@ public class HGCW005 extends DaoEPBase {
     public static final String FIELD_UPDATED_NAME = "updatedName";    		/* 记录修改名称*/
     public static final String FIELD_UPDATED_TIME = "updatedTime";    		/* 记录修改时间*/
     public static final String FIELD_DEP_CODE = "depCode";    		/* 部门编码*/
+    public static final String FIELD_COMPANY_CODES = "companyCodes";
 
     public static final String COL_ID = "ID";
     public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE";    		/* 企业编码*/

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

@@ -56,6 +56,7 @@ public class HGCW006 extends DaoEPBase {
 	public static final String FIELD_UPDATED_TIME = "updatedTime";    		/* 记录修改时间*/
 	public static final String FIELD_DEP_CODE = "depCode";    		/* 部门编码*/
 	public static final String FIELD_REMAINING_AMOUNT = "remainingAmount";    		/* 剩余开票/收票金额*/
+	public static final String FIELD_COMPANY_CODES = "companyCodes";
 
 	public static final String COL_ID = "ID";    		
 	public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE";    		/* 企业编码*/

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

@@ -39,6 +39,7 @@ public class HGCW007 extends DaoEPBase {
 	public static final String FIELD_UPDATED_NAME = "updatedName";    		/* 记录修改名称*/
 	public static final String FIELD_UPDATED_TIME = "updatedTime";    		/* 记录修改时间*/
 	public static final String FIELD_DEP_CODE = "depCode";    		/* 部门编码*/
+	public static final String FIELD_COMPANY_CODES = "companyCodes";
 
 	public static final String COL_ID = "ID";    		
 	public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE";    		/* 企业编码*/

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

@@ -51,6 +51,7 @@ public class HGCW008 extends DaoEPBase {
 	public static final String FIELD_UPDATED_NAME = "updatedName";    		/* 记录修改名称*/
 	public static final String FIELD_UPDATED_TIME = "updatedTime";    		/* 记录修改时间*/
 	public static final String FIELD_DEP_CODE = "depCode";    		/* 部门编码*/
+	public static final String FIELD_COMPANY_CODES = "companyCodes";
 
 	public static final String COL_ID = "ID";
 	public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE";    		/* 企业编码*/

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

@@ -44,6 +44,7 @@ public class HGCW009 extends DaoEPBase {
 	public static final String FIELD_UPDATED_NAME = "updatedName";    		/* 记录修改名称*/
 	public static final String FIELD_UPDATED_TIME = "updatedTime";    		/* 记录修改时间*/
 	public static final String FIELD_DEP_CODE = "depCode";    		/* 部门编码*/
+	public static final String FIELD_COMPANY_CODES = "companyCodes";
 
 	public static final String COL_ID = "ID";    		
 	public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE";    		/* 企业编码*/

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

@@ -49,6 +49,7 @@ public class HGCW010 extends DaoEPBase {
 	public static final String FIELD_UPDATED_TIME = "updatedTime";    		/* 记录修改时间*/
 	public static final String FIELD_DEP_CODE = "depCode";    		/* 部门编码*/
 	public static final String FIELD_REMAINING_AMOUNT = "remainingAmount";    		/* 剩余开票/收票金额*/
+	public static final String FIELD_COMPANY_CODES = "companyCodes";
 
 	public static final String COL_ID = "ID";
 	public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE";    		/* 企业编码*/

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

@@ -53,6 +53,7 @@ public class HGCW010A extends DaoEPBase {
 	public static final String FIELD_UPDATED_NAME = "updatedName";    		/* 记录修改名称*/
 	public static final String FIELD_UPDATED_TIME = "updatedTime";    		/* 记录修改时间*/
 	public static final String FIELD_DEP_CODE = "depCode";    		/* 部门编码*/
+	public static final String FIELD_COMPANY_CODES = "companyCodes";/*用户角色权限*/
 
 	public static final String COL_ID = "ID";
 	public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE";    		/* 企业编码*/

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

@@ -45,6 +45,7 @@ public class HGCW011 extends DaoEPBase {
 	public static final String FIELD_UPDATED_NAME = "updatedName";    		/* 记录修改名称*/
 	public static final String FIELD_UPDATED_TIME = "updatedTime";    		/* 记录修改时间*/
 	public static final String FIELD_DEP_CODE = "depCode";    		/* 部门编码*/
+	public static final String FIELD_COMPANY_CODES = "companyCodes";/*用户角色权限*/
 
 	public static final String COL_ID = "ID";
 	public static final String COL_MAIN_ID = "MAIN_ID";    		/* 主表ID*/

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

@@ -49,6 +49,7 @@ public class HGCW012 extends DaoEPBase {
 	public static final String FIELD_REMAINING_AMOUNT = "remainingAmount";    		/* 剩余开票/收票金额*/
 	public static final String FIELD_RECEIVE_DATE = "receiveDate";    		/* 收票日期*/
 	public static final String FIELD_CONTRACT_TYPE = "contractType";    		/* 部门编码*/
+	public static final String FIELD_COMPANY_CODES = "companyCodes";/*用户角色权限*/
 
 	public static final String COL_ID = "ID";
 	public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE";    		/* 企业编码*/

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

@@ -52,6 +52,7 @@ public class HGCW012A extends DaoEPBase {
 	public static final String FIELD_UPDATED_NAME = "updatedName";    		/* 记录修改名称*/
 	public static final String FIELD_UPDATED_TIME = "updatedTime";    		/* 记录修改时间*/
 	public static final String FIELD_DEP_CODE = "depCode";    		/* 部门编码*/
+	public static final String FIELD_COMPANY_CODES = "companyCodes";/*用户角色权限*/
 
 	public static final String COL_ID = "ID";
 	public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE";    		/* 企业编码*/

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

@@ -43,6 +43,7 @@ public class HGCW013 extends DaoEPBase {
 	public static final String FIELD_UPDATED_NAME = "updatedName";    		/* 记录修改名称*/
 	public static final String FIELD_UPDATED_TIME = "updatedTime";    		/* 记录修改时间*/
 	public static final String FIELD_DEP_CODE = "depCode";    		/* 部门编码*/
+	public static final String FIELD_COMPANY_CODES = "companyCodes";/*用户角色权限*/
 
 	public static final String COL_ID = "ID";
 	public static final String COL_MAIN_ID = "MAIN_ID";    		/* 主表ID*/

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

@@ -43,6 +43,7 @@ public class HGCW014 extends DaoEPBase {
 	public static final String FIELD_UPDATED_NAME = "updatedName";    		/* 记录修改名称*/
 	public static final String FIELD_UPDATED_TIME = "updatedTime";    		/* 记录修改时间*/
 	public static final String FIELD_DEP_CODE = "depCode";    		/* 部门编码*/
+	public static final String FIELD_COMPANY_CODES = "companyCodes";/*用户角色权限*/
 
 	public static final String COL_ID = "ID";    		
 	public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE";    		/* 企业编码*/

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

@@ -40,6 +40,7 @@ public class HGCW015 extends DaoEPBase {
 	public static final String FIELD_UPDATED_NAME = "updatedName";    		/* 记录修改名称*/
 	public static final String FIELD_UPDATED_TIME = "updatedTime";    		/* 记录修改时间*/
 	public static final String FIELD_DEP_CODE = "depCode";    		/* 部门编码*/
+	public static final String FIELD_COMPANY_CODES = "companyCodes";/*用户角色权限*/
 
 	public static final String COL_ID = "ID";    		
 	public static final String COL_MAIN_ID = "MAIN_ID";    		/* 主表ID*/

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

@@ -40,6 +40,7 @@ public class HGCW016 extends DaoEPBase {
 	public static final String FIELD_UPDATED_NAME = "updatedName";    		/* 记录修改名称*/
 	public static final String FIELD_UPDATED_TIME = "updatedTime";    		/* 记录修改时间*/
 	public static final String FIELD_DEP_CODE = "depCode";    		/* 部门编码*/
+	public static final String FIELD_COMPANY_CODES = "companyCodes";/*用户角色权限*/
 
 	public static final String COL_ID = "ID";
 	public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE";    		/* 企业编码*/

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

@@ -37,6 +37,7 @@ public class HGCW017 extends DaoEPBase {
 	public static final String FIELD_UPDATED_NAME = "updatedName";    		/* 记录修改名称*/
 	public static final String FIELD_UPDATED_TIME = "updatedTime";    		/* 记录修改时间*/
 	public static final String FIELD_DEP_CODE = "depCode";    		/* 部门编码*/
+	public static final String FIELD_COMPANY_CODES = "companyCodes";/*用户角色权限*/
 
 	public static final String COL_ID = "ID";    		
 	public static final String COL_MAIN_ID = "MAIN_ID";    		/* 主表ID*/

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

@@ -35,6 +35,7 @@ public class HGCW999 extends DaoEPBase {
 	public static final String FIELD_UPDATED_NAME = "updatedName";    		/* 修改人名称*/
 	public static final String FIELD_UPDATED_TIME = "updatedTime";    		/* 修改时间*/
 	public static final String FIELD_DOC_NAME = "docName";    		/* 文件ID*/
+	public static final String FIELD_COMPANY_CODES = "companyCodes";/*用户角色权限*/
 
 
 	public static final String FIELD_BIZ_TYPE = "bizType";    		/* 业务类型*/

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

@@ -2,17 +2,27 @@ package com.baosight.hggp.hg.cw.service;
 
 import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
 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.security.UserSessionUtils;
 import com.baosight.hggp.hg.cw.domain.HGCW001;
+import com.baosight.hggp.hg.cw.domain.HGCW002;
+import com.baosight.hggp.hg.sb.domain.HGSB001;
+import com.baosight.hggp.hg.sb.tools.HGSBTools;
+import com.baosight.hggp.hg.xs.domain.Company;
+import com.baosight.hggp.hg.xs.domain.Org;
 import com.baosight.hggp.util.CommonMethod;
 import com.baosight.hggp.util.DateUtils;
+import com.baosight.hggp.util.EiInfoUtils;
 import com.baosight.hggp.util.LogUtils;
+import com.baosight.hggp.util.contants.ACConstants;
 import com.baosight.iplat4j.core.ei.EiConstant;
 import com.baosight.iplat4j.core.ei.EiInfo;
 import com.baosight.iplat4j.core.exception.PlatException;
 import com.baosight.iplat4j.core.service.impl.ServiceBase;
 
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -28,15 +38,27 @@ public class ServiceHGCW001 extends ServiceBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "账期维护",operType = "查询",operDesc = "初始化")
+
+
+
+@OperationLogAnnotation(operModul = "账期维护",operType = "查询",operDesc = "初始化")
 	public EiInfo initLoad(EiInfo inInfo) {
+		EiInfo outInfo = super.initLoad(inInfo,new HGCW001());
 		try {
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID), null, false);
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGCW001().eiMetadata);
-		} catch (PlatException e) {
-			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
-		}
-		return inInfo;
+			outInfo = super.query(inInfo, HGCW001.QUERY, new HGCW001());
+			Map<String,Object> qarma = new HashMap<>();
+ 				EiInfoUtils.addBlock(outInfo,"roleCompany", UserSessionUtils.getRoleCompany(), Company.class);
+			CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.GROUP_RECORD_BLOCK_ID));
+			//角色公司
+			List<String> roleCompanyCode = HGSBTools.getRoleCompanyCode();
+			qarma.put(Org.FIELD_ORG_ID,roleCompanyCode);
+			CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.USER_ID_BOX_BLOCK_ID),qarma);
+		}catch (Exception e){
+			LogUtils.setDetailMsg(inInfo,e,"初始化失败！");
+		}
+		return outInfo;
 	}
 	
 	/**
@@ -48,9 +70,14 @@ public class ServiceHGCW001 extends ServiceBase {
 	@OperationLogAnnotation(operModul = "账期维护",operType = "查询",operDesc = "查询")
 	@Override
 	public EiInfo query(EiInfo inInfo) {
+		List<String> roleCompanyCode = HGSBTools.getRoleCompanyCode();
+		if (!roleCompanyCode.isEmpty()) {
+			inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0,HGCW001.FIELD_COMPANY_CODES,roleCompanyCode);
+		}
 		try {
 			inInfo = super.query(inInfo, HGCW001.QUERY, new HGCW001());
-		} catch (Exception e) {
+		}
+		catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "查询失败");
 		}
 		return inInfo;

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

@@ -3,15 +3,22 @@ package com.baosight.hggp.hg.cw.service;
 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.security.UserSessionUtils;
 import com.baosight.hggp.hg.constant.HGConstant;
+import com.baosight.hggp.hg.cw.domain.HGCW001;
 import com.baosight.hggp.hg.cw.domain.HGCW002;
 import com.baosight.hggp.hg.cw.domain.HGCW003;
 import com.baosight.hggp.hg.cw.domain.HGCW999;
 import com.baosight.hggp.hg.cw.tools.HGCWTools;
 import com.baosight.hggp.hg.cw.vo.UserVO;
+import com.baosight.hggp.hg.sb.tools.HGSBTools;
+import com.baosight.hggp.hg.xs.domain.Company;
+import com.baosight.hggp.hg.xs.domain.Org;
 import com.baosight.hggp.util.CommonMethod;
 import com.baosight.hggp.util.DateUtils;
+import com.baosight.hggp.util.EiInfoUtils;
 import com.baosight.hggp.util.LogUtils;
+import com.baosight.hggp.util.contants.ACConstants;
 import com.baosight.iplat4j.core.ei.EiConstant;
 import com.baosight.iplat4j.core.ei.EiInfo;
 import com.baosight.iplat4j.core.exception.PlatException;
@@ -38,13 +45,22 @@ public class ServiceHGCW002 extends ServiceBase {
 	 */
 	@OperationLogAnnotation(operModul = "账期维护",operType = "查询",operDesc = "初始化")
 	public EiInfo initLoad(EiInfo inInfo) {
+		EiInfo outInfo = super.initLoad(inInfo,new HGCW002());
 		try {
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID), null, false);
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGCW002().eiMetadata);
-		} catch (PlatException e) {
-			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
+			outInfo = super.query(inInfo, HGCW002.QUERY, new HGCW002());
+			Map<String,Object> qarma = new HashMap<>();
+			EiInfoUtils.addBlock(outInfo,"roleCompany", UserSessionUtils.getRoleCompany(), Company.class);
+			CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.GROUP_RECORD_BLOCK_ID));
+			//角色公司
+			List<String> roleCompanyCode = HGSBTools.getRoleCompanyCode();
+			qarma.put(Org.FIELD_ORG_ID,roleCompanyCode);
+			CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.USER_ID_BOX_BLOCK_ID),qarma);
+		}catch (Exception e){
+			LogUtils.setDetailMsg(inInfo,e,"初始化失败！");
 		}
-		return inInfo;
+		return outInfo;
 	}
 
 	/**
@@ -56,6 +72,10 @@ public class ServiceHGCW002 extends ServiceBase {
 	@OperationLogAnnotation(operModul = "账期维护",operType = "查询",operDesc = "查询")
 	@Override
 	public EiInfo query(EiInfo inInfo) {
+		List<String> roleCompanyCode = HGSBTools.getRoleCompanyCode();
+		if (!roleCompanyCode.isEmpty()) {
+			inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0,HGCW002.FIELD_COMPANY_CODES,roleCompanyCode);
+		}
 		try {
 			inInfo = super.query(inInfo, HGCW002.QUERY, new HGCW002());
 		} catch (Exception e) {

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

@@ -3,13 +3,20 @@ package com.baosight.hggp.hg.cw.service;
 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.security.UserSessionUtils;
 import com.baosight.hggp.hg.constant.HGConstant;
+import com.baosight.hggp.hg.cw.domain.HGCW002;
 import com.baosight.hggp.hg.cw.domain.HGCW003;
 import com.baosight.hggp.hg.cw.tools.HGCWTools;
+import com.baosight.hggp.hg.sb.tools.HGSBTools;
+import com.baosight.hggp.hg.xs.domain.Company;
 import com.baosight.hggp.hg.cw.vo.UserVO;
+import com.baosight.hggp.hg.xs.domain.Org;
 import com.baosight.hggp.util.CommonMethod;
 import com.baosight.hggp.util.DateUtils;
+import com.baosight.hggp.util.EiInfoUtils;
 import com.baosight.hggp.util.LogUtils;
+import com.baosight.hggp.util.contants.ACConstants;
 import com.baosight.iplat4j.core.ei.EiConstant;
 import com.baosight.iplat4j.core.ei.EiInfo;
 import com.baosight.iplat4j.core.exception.PlatException;
@@ -19,10 +26,7 @@ import com.baosight.iplat4j.ed.util.SequenceGenerator;
 
 import java.math.BigDecimal;
 import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @author yukang
@@ -38,12 +42,21 @@ public class ServiceHGCW003 extends ServiceBase {
 	 */
 	@OperationLogAnnotation(operModul = "合同清单",operType = "查询",operDesc = "初始化")
 	public EiInfo initLoad(EiInfo inInfo) {
+		EiInfo outInfo = super.initLoad(inInfo,new HGCW003());
 		try {
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGCW003().eiMetadata);
-		} catch (PlatException e) {
-			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
-		}
-		return inInfo;
+			outInfo = super.query(inInfo, HGCW003.QUERY, new HGCW003());
+			Map<String,Object> qarma = new HashMap<>();
+			EiInfoUtils.addBlock(outInfo,"roleCompany", UserSessionUtils.getRoleCompany(), Company.class);
+			CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.GROUP_RECORD_BLOCK_ID));
+			//角色公司
+			List<String> roleCompanyCode = HGSBTools.getRoleCompanyCode();
+			qarma.put(Org.FIELD_ORG_ID,roleCompanyCode);
+			CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.USER_ID_BOX_BLOCK_ID),qarma);
+		}catch (Exception e){
+			LogUtils.setDetailMsg(inInfo,e,"初始化失败！");
+		}
+		return outInfo;
 	}
 
 	/**
@@ -55,6 +68,10 @@ public class ServiceHGCW003 extends ServiceBase {
 	@OperationLogAnnotation(operModul = "合同清单",operType = "查询",operDesc = "查询")
 	@Override
 	public EiInfo query(EiInfo inInfo) {
+		List<String> roleCompanyCode = HGSBTools.getRoleCompanyCode();
+		if (!roleCompanyCode.isEmpty()) {
+			inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0,HGCW003.FIELD_COMPANY_CODES,roleCompanyCode);
+		}
 		try {
 			inInfo = super.query(inInfo, HGCW003.QUERY, new HGCW003());
 		} catch (Exception e) {

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

@@ -73,6 +73,9 @@
 		<isNotEmpty prepend=" AND " property="depCode">
 			DEP_CODE = #depCode#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="companyCodes">
+			COMPANY_CODE IN <iterate close=")" open="(" conjunction="," property="companyCodes">#companyCodes[]#</iterate>
+		</isNotEmpty>
 	</sql>
 
 	<select id="query" parameterClass="java.util.HashMap"

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

@@ -173,6 +173,9 @@
 		<isNotEmpty prepend=" AND " property="depCode">
 			DEP_CODE = #depCode#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="companyCodes">
+			COMPANY_CODE IN <iterate close=")" open="(" conjunction="," property="companyCodes">#companyCodes[]#</iterate>
+		</isNotEmpty>
 	</sql>
 
 	<select id="query" parameterClass="java.util.HashMap"

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

@@ -97,6 +97,9 @@
 		<isNotEmpty prepend=" AND " property="ids">
 			ID NOT IN <iterate close=")" open="(" conjunction="," property="ids">#ids[]#</iterate>
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="companyCodes">
+			COMPANY_CODE IN <iterate close=")" open="(" conjunction="," property="companyCodes">#companyCodes[]#</iterate>
+		</isNotEmpty>
 	</sql>
 
 	<select id="query" parameterClass="java.util.HashMap"

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

@@ -95,6 +95,9 @@
         <isNotEmpty prepend=" AND " property="depCode">
             DEP_CODE = #depCode#
         </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="companyCodes">
+            COMPANY_CODE IN <iterate close=")" open="(" conjunction="," property="companyCodes">#companyCodes[]#</iterate>
+        </isNotEmpty>
     </sql>
 
     <select id="query" parameterClass="java.util.HashMap"

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

@@ -95,6 +95,9 @@
 		<isNotEmpty prepend=" AND " property="dids">
 			ID NOT IN <iterate close=")" open="(" conjunction="," property="dids">#dids[]#</iterate>
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="companyCodes">
+			COMPANY_CODE IN <iterate close=")" open="(" conjunction="," property="companyCodes">#companyCodes[]#</iterate>
+		</isNotEmpty>
 	</sql>
 
 	<select id="query" parameterClass="java.util.HashMap"

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

@@ -141,6 +141,9 @@
 		<isNotEmpty prepend=" AND " property="depCode">
 			DEP_CODE = #depCode#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="companyCodes">
+			COMPANY_CODE IN <iterate close=")" open="(" conjunction="," property="companyCodes">#companyCodes[]#</iterate>
+		</isNotEmpty>
 	</sql>
 
 	<select id="query" parameterClass="java.util.HashMap"

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

@@ -77,6 +77,9 @@
 		<isNotEmpty prepend=" AND " property="depCode">
 			DEP_CODE = #depCode#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="companyCodes">
+			COMPANY_CODE IN <iterate close=")" open="(" conjunction="," property="companyCodes">#companyCodes[]#</iterate>
+		</isNotEmpty>
 	</sql>
 
 	<select id="query" parameterClass="java.util.HashMap"

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

@@ -127,6 +127,9 @@
 		<isNotEmpty prepend=" AND " property="depCode">
 			DEP_CODE = #depCode#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="companyCodes">
+			COMPANY_CODE IN <iterate close=")" open="(" conjunction="," property="companyCodes">#companyCodes[]#</iterate>
+		</isNotEmpty>
 	</sql>
 
 	<select id="query" parameterClass="java.util.HashMap"

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

@@ -96,6 +96,9 @@
 		<isNotEmpty prepend=" AND " property="depCode">
 			DEP_CODE = #depCode#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="companyCodes">
+			COMPANY_CODE IN <iterate close=")" open="(" conjunction="," property="companyCodes">#companyCodes[]#</iterate>
+		</isNotEmpty>
 	</sql>
 
 	<select id="query" parameterClass="java.util.HashMap"

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

@@ -107,6 +107,9 @@
 		<isNotEmpty prepend=" AND " property="hiddenConditions">
 			REMAINING_AMOUNT > 0
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="companyCodes">
+			COMPANY_CODE IN <iterate close=")" open="(" conjunction="," property="companyCodes">#companyCodes[]#</iterate>
+		</isNotEmpty>
 	</sql>
 
 	<select id="query" parameterClass="java.util.HashMap"

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

@@ -152,6 +152,9 @@
 		<isNotEmpty prepend=" AND " property="depCode">
 			T1.DEP_CODE = #depCode#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="companyCodes">
+			COMPANY_CODE IN <iterate close=")" open="(" conjunction="," property="companyCodes">#companyCodes[]#</iterate>
+		</isNotEmpty>
 	</sql>
 
 	<select id="query" parameterClass="java.util.HashMap"

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

@@ -92,6 +92,9 @@
 		<isNotEmpty prepend=" AND " property="depCode">
 			DEP_CODE = #depCode#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="companyCodes">
+			COMPANY_CODE IN <iterate close=")" open="(" conjunction="," property="companyCodes">#companyCodes[]#</iterate>
+		</isNotEmpty>
 	</sql>
 
 	<select id="query" parameterClass="java.util.HashMap"

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

@@ -132,6 +132,9 @@
 		<isNotEmpty prepend=" AND " property="receiveDate">
 			RECEIVE_DATE = #receiveDate#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="companyCodes">
+			COMPANY_CODE IN <iterate close=")" open="(" conjunction="," property="companyCodes">#companyCodes[]#</iterate>
+		</isNotEmpty>
 	</sql>
 
 	<select id="query" parameterClass="java.util.HashMap"

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

@@ -181,6 +181,9 @@
 		<isNotEmpty prepend=" AND " property="contractType">
 			B.CONTRACT_TYPE = #contractType#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="companyCodes">
+			COMPANY_CODE IN <iterate close=")" open="(" conjunction="," property="companyCodes">#companyCodes[]#</iterate>
+		</isNotEmpty>
 	</sql>
 
 	<select id="query" parameterClass="java.util.HashMap"

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

@@ -106,6 +106,9 @@
 		<isNotEmpty prepend=" AND " property="depCode">
 			DEP_CODE = #depCode#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="companyCodes">
+			COMPANY_CODE IN <iterate close=")" open="(" conjunction="," property="companyCodes">#companyCodes[]#</iterate>
+		</isNotEmpty>
 	</sql>
 
 	<select id="query" parameterClass="java.util.HashMap"

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

@@ -95,6 +95,9 @@
 		<isNotEmpty prepend=" AND " property="depCode">
 			DEP_CODE = #depCode#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="companyCodes">
+			COMPANY_CODE IN <iterate close=")" open="(" conjunction="," property="companyCodes">#companyCodes[]#</iterate>
+		</isNotEmpty>
 	</sql>
 
 	<select id="query" parameterClass="java.util.HashMap"

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

@@ -77,6 +77,9 @@
 		<isNotEmpty prepend=" AND " property="depCode">
 			DEP_CODE = #depCode#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="companyCodes">
+			COMPANY_CODE IN <iterate close=")" open="(" conjunction="," property="companyCodes">#companyCodes[]#</iterate>
+		</isNotEmpty>
 	</sql>
 
 	<select id="query" parameterClass="java.util.HashMap"

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

@@ -84,6 +84,9 @@
 		<isNotEmpty prepend=" AND " property="depCode">
 			DEP_CODE = #depCode#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="companyCodes">
+			COMPANY_CODE IN <iterate close=")" open="(" conjunction="," property="companyCodes">#companyCodes[]#</iterate>
+		</isNotEmpty>
 	</sql>
 
 	<select id="query" parameterClass="java.util.HashMap"

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

@@ -69,6 +69,9 @@
 		<isNotEmpty prepend=" AND " property="depCode">
 			DEP_CODE = #depCode#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="companyCodes">
+			COMPANY_CODE IN <iterate close=")" open="(" conjunction="," property="companyCodes">#companyCodes[]#</iterate>
+		</isNotEmpty>
 	</sql>
 
 	<select id="query" parameterClass="java.util.HashMap"

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

@@ -91,6 +91,9 @@
 		<isNotEmpty prepend=" AND " property="bizType">
 			BIZ_TYPE = #bizType#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="companyCodes">
+			COMPANY_CODE IN <iterate close=")" open="(" conjunction="," property="companyCodes">#companyCodes[]#</iterate>
+		</isNotEmpty>
 	</sql>
 
 	<!-- 开发环境 -->

src/main/java/com/baosight/hggp/hg/sc/service/ServiceHGSC001.java

@@ -8,6 +8,7 @@ import com.baosight.hggp.core.security.UserSessionUtils;
 import com.baosight.hggp.hg.sc.domain.HGSC001;
 import com.baosight.hggp.hg.sc.domain.HGSC001A;
 import com.baosight.hggp.hg.sc.tools.HGSCTools;
+import com.baosight.hggp.hg.xs.domain.Company;
 import com.baosight.hggp.hg.xs.domain.Dept;
 import com.baosight.hggp.hg.xs.domain.User;
 import com.baosight.hggp.util.*;
@@ -157,7 +158,17 @@ public class ServiceHGSC001 extends ServiceBase {
 
     }
 
+    public EiInfo roleCompanyComboBox(EiInfo inInfo) {
+        try {
+            EiInfoUtils.addBlock(inInfo, "roleCompany", UserSessionUtils.getRoleCompany(), Company.class);
+        } catch (InstantiationException e) {
+            e.printStackTrace();
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        }
+        return inInfo;
 
+    }
 
     /**
      * 部门下拉框

src/main/java/com/baosight/hggp/hg/sc/sql/HGSC001.xml

@@ -162,7 +162,7 @@
     		  $orderBy$
 			</isNotEmpty>
 			<isEmpty property="orderBy">
-    		  id asc
+    		  id desc
 			</isEmpty>
 		</dynamic>
 

src/main/java/com/baosight/hggp/hg/sc/sql/HGSC006A.xml

@@ -94,7 +94,7 @@
 			product_type = #productType#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="productCode">
-			product_code = #productCode#
+			product_code LIKE CONCAT('%', #productCode#, '%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="productName">
 			product_name like ('%$productName$%')

src/main/java/com/baosight/hggp/hg/sc/sql/HGSC007.xml

@@ -105,7 +105,7 @@
 			product_type = #productType#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="productCode">
-			product_code = #productCode#
+			product_code LIKE CONCAT('%', #productCode#, '%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="productName">
 			product_name LIKE CONCAT('%', #productName#, '%')

src/main/resources/resources/ibatis/sqlmap-config.xml

@@ -13,9 +13,9 @@
     <sqlMap resource="com/baosight/hggp/hg/xs/sql/HGXSDataAuth.xml"/>
 
     <!--成本-->
-    <sqlMap resource="com/baosight/hggp/hg/cb/sql/HGCB002.xml"/>
+    <!--<sqlMap resource="com/baosight/hggp/hg/cb/sql/HGCB002.xml"/>
     <sqlMap resource="com/baosight/hggp/hg/cb/sql/HGCB003.xml"/>
-    <sqlMap resource="com/baosight/hggp/hg/cb/sql/HGCB004.xml"/>
+    <sqlMap resource="com/baosight/hggp/hg/cb/sql/HGCB004.xml"/>-->
 
     <!-- 采购 -->
     <sqlMap resource="com/baosight/hggp/hg/cg/sql/HGCG001.xml"/>

src/main/webapp/HG/CW/HGCW001.jsp

@@ -12,7 +12,7 @@
         <div class="row">
             <EF:EFSelect cname="公司名称" blockId="inqu_status" ename="companyCode" row="0" colWidth="3" filter="contains">
                 <EF:EFOption label="全部" value=""/>
-                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="roleCompany" textField="companyName" valueField="companyCode"/>
             </EF:EFSelect>
             <EF:EFDatePicker cname="会计期" blockId="inqu_status" ename="accountPeriod" row="0" colWidth="3"
                              format="yyyy-MM" parseFormats="['yyyyMM']" start="year" depth="year"/>
@@ -28,7 +28,7 @@
             <EF:EFColumn ename="id" cname="主键" hidden="true"/>
             <EF:EFComboColumn ename="companyCode" cname="公司名称" width="110" align="center"
                               filter="contains" readonly="true">
-                <EF:EFOptions blockId="companyBox_block_id" valueField="valueField" textField="textField"/>
+                <EF:EFOptions blockId="roleCompany" textField="companyName" valueField="companyCode"/>
             </EF:EFComboColumn>
             <EF:EFColumn ename="accountYear" cname="会计年度" width="100" align="center" start="decade" depth="decade"
                          editType="date" dateFormat="yyyy" parseFormats="['yyyy']" required="true"/>

src/main/webapp/HG/CW/HGCW002.jsp

@@ -12,7 +12,7 @@
         <div class="row">
             <EF:EFSelect cname="公司名称" blockId="inqu_status" ename="companyCode" row="0" colWidth="3" filter="contains">
                 <EF:EFOption label="全部" value=""/>
-                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="roleCompany" textField="companyName" valueField="companyCode"/>
             </EF:EFSelect>
             <EF:EFInput cname="项目名称" ename="projName" blockId="inqu_status" row="0" colWidth="3" />
             <EF:EFInput cname="合同号" ename="contractNumber" blockId="inqu_status" row="0" colWidth="3" />

src/main/webapp/HG/CW/HGCW004.jsp

@@ -12,7 +12,7 @@
         <div class="row">
             <EF:EFSelect cname="公司名称" blockId="inqu_status" ename="companyCode" row="0" colWidth="3" filter="contains">
                 <EF:EFOption label="全部" value=""/>
-                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="roleCompany" textField="companyName" valueField="companyCode"/>
             </EF:EFSelect>
             <EF:EFInput cname="项目名称" ename="projName" blockId="inqu_status" row="0" colWidth="3" />
             <EF:EFInput cname="主合同号" ename="contractNumber" blockId="inqu_status" row="0" colWidth="3" />

src/main/webapp/HG/CW/HGCW005.jsp

@@ -12,7 +12,7 @@
         <div class="row">
             <EF:EFSelect cname="公司名称" blockId="inqu_status" ename="companyCode" row="0" colWidth="3" filter="contains">
                 <EF:EFOption label="全部" value=""/>
-                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="roleCompany" textField="companyName" valueField="companyCode"/>
             </EF:EFSelect>
             <EF:EFInput cname="项目名称" ename="projName" blockId="inqu_status" row="0" colWidth="3" />
             <EF:EFInput cname="主合同号" ename="contractNumber" blockId="inqu_status" row="0" colWidth="3" />

src/main/webapp/HG/CW/HGCW006.jsp

@@ -12,7 +12,7 @@
         <div class="row">
             <EF:EFSelect cname="公司名称" blockId="inqu_status" ename="companyCode" row="0" colWidth="3" filter="contains">
                 <EF:EFOption label="全部" value=""/>
-                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="roleCompany" textField="companyName" valueField="companyCode"/>
             </EF:EFSelect>
             <EF:EFInput cname="项目名称" ename="projName" blockId="inqu_status" row="0" colWidth="3" />
             <EF:EFInput cname="合同号" ename="contractNumber" blockId="inqu_status" row="0" colWidth="3" />

src/main/webapp/HG/CW/HGCW008.jsp

@@ -12,7 +12,7 @@
         <div class="row">
             <EF:EFSelect cname="所属公司" blockId="inqu_status" ename="companyCode" row="0" colWidth="3" filter="contains">
                 <EF:EFOption label="全部" value=""/>
-                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="roleCompany" textField="companyName" valueField="companyCode"/>
             </EF:EFSelect>
             <EF:EFInput cname="项目名称" ename="projName" blockId="inqu_status" row="0" colWidth="3" />
             <EF:EFInput cname="合同号" ename="contractNumber" blockId="inqu_status" row="0" colWidth="3" />

src/main/webapp/HG/SC/HGSC006A.jsp

@@ -14,10 +14,14 @@
     <EF:EFRegion id="inqu" title="查询条件">
         <div class="row">
             <EF:EFInput ename="inqu_status-0-orderCode" cname="订单编码" type="hidden"/>
+            <EF:EFInput ename="inqu_status-0-productCode" cname="产品编码" placeholder="模糊查询" colWidth="3"/>
             <EF:EFInput ename="inqu_status-0-productName" cname="产品名称" placeholder="模糊查询" colWidth="3"/>
             <EF:EFInput ename="inqu_status-0-projName" cname="项目名称" placeholder="模糊查询" colWidth="3"/>
-            <EF:EFDatePicker cname="生产订单" ename="inqu_status-0-createdTime"  colWidth="3"
+<%--            <EF:EFDatePicker cname="生产订单日期" ename="inqu_status-0-createdTime"  colWidth="3"--%>
+<%--                             format="yyyy-MM-dd" readonly="false"/>--%>
+            <EF:EFDatePicker cname="计划开工日期" ename="inqu_status-0-planStartDate"  colWidth="3"
                              format="yyyy-MM-dd" readonly="false"/>
+
         </div>
     </EF:EFRegion>
     <EF:EFRegion id="result" title="记录集">
@@ -32,6 +36,8 @@
             <EF:EFColumn ename="productCode" cname="产品编码" width="120" enable="true" align="center" readOnly="true"/>
             <EF:EFColumn ename="productName" cname="产品名称" width="120" enable="true" align="center" readOnly="true"/>
             <EF:EFColumn ename="processName" cname="工序" width="120" enable="true" align="center" readOnly="true"/>
+            <EF:EFColumn ename="planStartDate" cname="计划开工日期" width="120" enable="true" align="center" editType="date"
+                         dateFormat="yyyy-MM-dd" parseFormats="['yyyy-MM-dd']" />
             <EF:EFColumn ename="planEndDate" cname="计划完工日期" width="120" enable="true" align="center" editType="date"
                          dateFormat="yyyy-MM-dd" parseFormats="['yyyy-MM-dd']" />
             <EF:EFColumn ename="singleWeight" cname="单重(kg)" format="{0:0.00}" editType="text" width="120" enable="true" align="center" readOnly="true"/>

src/main/webapp/HG/SC/HGSC007.jsp

@@ -19,7 +19,8 @@
 <EF:EFPage  title="生产任务">
     <EF:EFRegion id="inqu" title="查询条件">
         <div class="row">
-
+            <EF:EFInput ename="inqu_status-0-orderDetailId" cname="订单详情ID" type="hidden"/>
+            <EF:EFInput ename="inqu_status-0-productCode" cname="产品编码" placeholder="模糊查询" colWidth="3"/>
             <EF:EFInput blockId="inqu_status" row="0" ename="productName" cname="产品名称" placeholder="模糊查询" colWidth="3"/>
             <EF:EFInput blockId="inqu_status" row="0" ename="groupName" cname="班组名称" placeholder="模糊查询" colWidth="3"/>
             <EF:EFDatePicker blockId="inqu_status" row="0" ename="createdTime" cname="生产任务日期" role="date"