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

src/main/java/com/baosight/hggp/common/DdynamicEnum.java

@@ -174,6 +174,16 @@ public enum DdynamicEnum {
     COMPANY_RECORD_BLOCK_ID("company_record_block_id","companyCode","companyName","HPXSUser.queryCompanyComboBox"),
 
     /**
+     * 模块：用户公司
+     * 用途：公司下拉框
+     * 编写：ly
+     */
+    COMPANY_RECORD_BOX_BLOCK_ID("company_record_box_block_id","orgId","orgCname","HGXSOrg.queryParent",new HashMap(){{
+        put("orgType", OrgTypeEnum.COMPANY.getCode());
+        put("isParentOrgId","true");
+    }}),
+
+    /**
      * 模块：用户
      * 用途：用户下拉框
      * 编写：yk

src/main/java/com/baosight/hggp/hg/kc/domain/HGKC003.java

@@ -24,6 +24,7 @@ public class HGKC003 extends DaoEPBase {
     private static final long serialVersionUID = 1L;
 
 	public static final String FIELD_ID = "id";
+	public static final String FIELD_QUALITY_ID = "qualityId";    		/* 质检单ID*/
 	public static final String FIELD_ACCOUNT_CODE = "accountCode";    		/* 企业编码*/
 	public static final String FIELD_DEP_CODE = "depCode";    		/* 部门编码*/
 	public static final String FIELD_CREATED_BY = "createdBy";    		/* 记录创建者*/
@@ -66,6 +67,7 @@ public class HGKC003 extends DaoEPBase {
 	public static final String FIELD_SUBMIT_STATUS = "submitStatus";    		/* 提交状态 0未提交，1已提交*/
 
 	public static final String COL_ID = "ID";
+	public static final String COL_QUALITY_ID = "QUALITY_ID";    		/* 质检单ID*/
 	public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE";    		/* 企业编码*/
 	public static final String COL_DEP_CODE = "DEP_CODE";    		/* 部门编码*/
 	public static final String COL_CREATED_BY = "CREATED_BY";    		/* 记录创建者*/
@@ -115,6 +117,7 @@ public class HGKC003 extends DaoEPBase {
 	public static final String UPDATE_SUBMIT_STATUS = "HGKC003.updateSubmitStatus";
 
 	private Long id = new Long(0);
+	private Long qualityId = new Long(0); /* 质检单id*/
 	private String accountCode = " ";		/* 企业编码*/
 	private String depCode = " ";		/* 部门编码*/
 	private String createdBy = " ";		/* 记录创建者*/
@@ -167,6 +170,10 @@ public class HGKC003 extends DaoEPBase {
 		eiColumn.setDescName(" ");
 		eiMetadata.addMeta(eiColumn);
 
+		eiColumn = new EiColumn(FIELD_QUALITY_ID);
+		eiColumn.setDescName("质检单id");
+		eiMetadata.addMeta(eiColumn);
+
 		eiColumn = new EiColumn(FIELD_ACCOUNT_CODE);
 		eiColumn.setDescName("企业编码");
 		eiMetadata.addMeta(eiColumn);
@@ -1013,6 +1020,14 @@ public class HGKC003 extends DaoEPBase {
 		this.submitStatus = submitStatus;
 	}
 
+	public Long getQualityId() {
+		return qualityId;
+	}
+
+	public void setQualityId(Long qualityId) {
+		this.qualityId = qualityId;
+	}
+
 	/**
 	 * get the value from Map.
 	 *
@@ -1022,6 +1037,7 @@ public class HGKC003 extends DaoEPBase {
 	public void fromMap(Map map) {
 
 		setId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_ID)), id));
+		setQualityId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_QUALITY_ID)), qualityId));
 		setAccountCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_ACCOUNT_CODE)), accountCode));
 		setDepCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEP_CODE)), depCode));
 		setCreatedBy(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CREATED_BY)), createdBy));
@@ -1072,6 +1088,7 @@ public class HGKC003 extends DaoEPBase {
 
 		Map map = new HashMap();
 		map.put(FIELD_ID, StringUtils.toString(id, eiMetadata.getMeta(FIELD_ID)));
+		map.put(FIELD_QUALITY_ID, StringUtils.toString(qualityId, eiMetadata.getMeta(FIELD_QUALITY_ID)));
 		map.put(FIELD_ACCOUNT_CODE, StringUtils.toString(accountCode, eiMetadata.getMeta(FIELD_ACCOUNT_CODE)));
 		map.put(FIELD_DEP_CODE, StringUtils.toString(depCode, eiMetadata.getMeta(FIELD_DEP_CODE)));
 		map.put(FIELD_CREATED_BY, StringUtils.toString(createdBy, eiMetadata.getMeta(FIELD_CREATED_BY)));

src/main/java/com/baosight/hggp/hg/kc/domain/HGKC003A.java

@@ -112,12 +112,12 @@ public class HGKC003A extends DaoEPBase {
 	public static final String COL_AMOUNT = "AMOUNT";    		/* 金额*/
 	public static final String COL_STORAGE_TYPE = "STORAGE_TYPE";    		/* 入库类型：0：入库 1：退回*/
 
-	public static final String QUERY = "hgkc003a.query";
-	public static final String COUNT = "hgkc003a.count";
-	public static final String INSERT = "hgkc003a.insert";
-	public static final String UPDATE = "hgkc003a.update";
-	public static final String DELETE = "hgkc003a.delete";
-	public static final String BATCH_DELETE = "hgkc003a.batchDelete";
+	public static final String QUERY = "HGKC003A.query";
+	public static final String COUNT = "HGKC003A.count";
+	public static final String INSERT = "HGKC003A.insert";
+	public static final String UPDATE = "HGKC003A.update";
+	public static final String DELETE = "HGKC003A.delete";
+	public static final String BATCH_DELETE = "HGKC003A.batchDelete";
 
 	private Long id = new Long(0);
 	private String accountCode = " ";		/* 企业编码*/

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

@@ -7,10 +7,7 @@ import com.baosight.hggp.core.enums.DeleteFlagEnum;
 import com.baosight.hggp.hg.constant.HGConstant;
 import com.baosight.hggp.hg.kc.domain.HGKC003;
 import com.baosight.hggp.hg.kc.utils.HGKCUtils;
-import com.baosight.hggp.hg.sc.domain.HGSC003;
-import com.baosight.hggp.hg.sc.domain.HGSC004A;
 import com.baosight.hggp.util.*;
-import com.baosight.hggp.util.contants.ACConstants;
 import com.baosight.iplat4j.core.ei.EiBlock;
 import com.baosight.iplat4j.core.ei.EiConstant;
 import com.baosight.iplat4j.core.ei.EiInfo;

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

 package com.baosight.hggp.hg.kc.service;
 
+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;
@@ -24,6 +25,7 @@ public class ServiceHGKC003B extends ServiceEPBase {
 	public EiInfo initLoad(EiInfo inInfo) {
 		try {
 			inInfo = super.query(inInfo, HGKC003A.QUERY, new HGKC003A());
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.WH_RECORD_BLOCK_ID));
 		} catch (PlatException e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
 		}
@@ -33,6 +35,7 @@ public class ServiceHGKC003B extends ServiceEPBase {
 	public EiInfo query(EiInfo inInfo) {
 		try {
 			inInfo = super.query(inInfo, HGKC003A.QUERY, new HGKC003A());
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.WH_RECORD_BLOCK_ID));
 			inInfo.setStatus(EiConstant.STATUS_DEFAULT);
 		} catch (PlatException e) {
 			LogUtils.setDetailMsg(inInfo, e, "查询失败");

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

@@ -4,6 +4,7 @@
 
     <sql id="column">
         ID as "id",
+		QUALITY_ID as "qualityId",  <!-- 质检单id -->
         ACCOUNT_CODE as "accountCode",  <!-- 企业编码 -->
         DEP_CODE as "depCode",  <!-- 部门编码 -->
         CREATED_BY as "createdBy",  <!-- 记录创建者 -->
@@ -141,6 +142,9 @@
 		<isNotEmpty prepend=" AND " property="submitStatus">
 			SUBMIT_STATUS = #submitStatus#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="qualityId">
+			QUALITY_ID = #qualityId#
+		</isNotEmpty>
 	</sql>
 
     <sql id="idCondition">
@@ -193,6 +197,7 @@
 
     <insert id="insert">
         INSERT INTO ${hggpSchema}.HGKC003 (
+		QUALITY_ID,  <!-- 企业编码 -->
         ACCOUNT_CODE,  <!-- 企业编码 -->
         DEP_CODE,  <!-- 部门编码 -->
         CREATED_BY,  <!-- 记录创建者 -->
@@ -231,7 +236,7 @@
         PART_SPEC,  <!-- 零件规格 -->
 		SUBMIT_STATUS  <!-- 提交状态 -->
         ) VALUES (
-        #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#,
+		#qualityId#,#accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#,
         #deleteFlag#, #companyCode#, #companyName#, #depositDate#, #depositNo#, #whCode#, #whName#,
         #invQty#, #invUnitWeight#, #invWeight#, #depositNoOld#, #remark#, #factoryCode#, #prodOrderNo#, #prodTaskNo#,
         #projCode#, #projName#, #prdtType#, #prdtCode#, #prdtName#, #prdtLength#, #prdtWidth#, #prdtThick#, #prdtSpec#,
@@ -247,6 +252,7 @@
 	<update id="update">
 		UPDATE ${hggpSchema}.HGKC003
 		SET
+					QUALITY_ID	= #qualityId#,   <!-- 质检单id -->
 					ACCOUNT_CODE	= #accountCode#,   <!-- 企业编码 -->
 					DEP_CODE	= #depCode#,   <!-- 部门编码 -->
 					CREATED_BY	= #createdBy#,   <!-- 记录创建者 -->

src/main/java/com/baosight/hggp/hg/kc/tools/HGKCTools.java

 package com.baosight.hggp.hg.kc.tools;
 
 import com.baosight.hggp.core.dao.DaoBase;
+import com.baosight.hggp.core.dao.DaoUtils;
+import com.baosight.hggp.hg.constant.HGConstant;
 import com.baosight.hggp.hg.constant.HGSqlConstant;
-import com.baosight.hggp.hg.kc.domain.HGKC001;
-import com.baosight.hggp.hg.kc.domain.HGKC002;
-import com.baosight.hggp.hg.kc.domain.HGKC003;
-import com.baosight.hggp.hg.kc.domain.HGKC010;
-import com.baosight.hggp.hg.kc.domain.HGKC011;
+import com.baosight.hggp.hg.kc.domain.*;
+import com.baosight.hggp.hg.sc.domain.HGSC005;
 import com.baosight.hggp.util.AssertUtils;
 import com.baosight.hggp.util.StringUtils;
+import com.baosight.iplat4j.ed.util.SequenceGenerator;
 import org.apache.commons.collections.CollectionUtils;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -21,7 +22,7 @@ import java.util.stream.Collectors;
  * @date:2024/5/13,14:56
  */
 public class HGKCTools {
-	
+
 	/**
 	 * HGKC001 工具类
 	 *
@@ -29,7 +30,7 @@ public class HGKCTools {
 	 * @date:2024/5/9,14:33
 	 */
 	public static class HgKc001 {
-		
+
 		/**
 		 * 锁
 		 *
@@ -44,7 +45,7 @@ public class HGKCTools {
 			paramMap.put("depositNos", depositNos);
 			DaoBase.getInstance().update(HGSqlConstant.HgKc001.LOCK, paramMap);
 		}
-		
+
 		/**
 		 * 查询
 		 *
@@ -57,7 +58,7 @@ public class HGKCTools {
 			paramMap.put("depositNos", depositNos);
 			return DaoBase.getInstance().query(HGKC001.QUERY, paramMap);
 		}
-		
+
 		/**
 		 * 查询
 		 *
@@ -68,9 +69,9 @@ public class HGKCTools {
 			List<HGKC001> results = list(depositNos);
 			return results.stream().collect(Collectors.toMap(HGKC001::getDepositNo, item -> item));
 		}
-		
+
 	}
-	
+
 	/**
 	 * HGKC002 工具类
 	 *
@@ -78,7 +79,7 @@ public class HGKCTools {
 	 * @date:2024/5/9,14:33
 	 */
 	public static class HgKc002 {
-		
+
 		/**
 		 * 锁
 		 *
@@ -93,7 +94,7 @@ public class HGKCTools {
 			paramMap.put("reqNos", reqNos);
 			DaoBase.getInstance().update(HGSqlConstant.HgKc002.LOCK, paramMap);
 		}
-		
+
 		/**
 		 * 查询
 		 *
@@ -106,7 +107,7 @@ public class HGKCTools {
 			paramMap.put("reqNos", reqNos);
 			return DaoBase.getInstance().query(HGKC002.QUERY, paramMap);
 		}
-		
+
 		/**
 		 * 查询
 		 *
@@ -117,10 +118,10 @@ public class HGKCTools {
 			List<HGKC002> results = list(reqNos);
 			return results.stream().collect(Collectors.toMap(HGKC002::getReqNo, item -> item));
 		}
-		
+
 	}
-	
-	
+
+
 	/**
 	 * HGKC003 工具类
 	 *
@@ -128,7 +129,25 @@ public class HGKCTools {
 	 * @date:2024/5/15,9:49
 	 */
 	public static class HgKc003 {
-		
+
+
+		public static HGKC003 save(HGKC003 hgkc003){
+			checkSaveData(hgkc003);
+			hgkc003.setDepositNo(SequenceGenerator.getNextSequence(HGConstant.SequenceId.PROD_DEPOSIT_NO));
+			DaoUtils.insert(HGKC003.INSERT,hgkc003);
+			return hgkc003;
+		}
+
+		private static void checkSaveData(HGKC003 hgkc003) {
+			AssertUtils.isEmpty(hgkc003.getCompanyCode(), "公司编码不能为空！");
+			AssertUtils.isEmpty(hgkc003.getCompanyName(), "公司名称不能为空！");
+			AssertUtils.isEmpty(hgkc003.getWhCode(), "仓库编码不能为空！");
+			AssertUtils.isEmpty(hgkc003.getWhName(), "仓库名称不能为空！");
+			AssertUtils.isEmpty(hgkc003.getProjCode(), "项目编号不能为空！");
+			AssertUtils.isEmpty(hgkc003.getProjName(), "项目名称不能为空！");
+			AssertUtils.isTrue(Objects.isNull(hgkc003.getQualityId())||hgkc003.getQualityId()<=0, "质检单idID不能为空！");
+		}
+
 		/**
 		 * 锁
 		 *
@@ -143,7 +162,7 @@ public class HGKCTools {
 			paramMap.put("depositNos", depositNos);
 			DaoBase.getInstance().update(HGSqlConstant.HgKc003.LOCK, paramMap);
 		}
-		
+
 		/**
 		 * 查询
 		 *
@@ -156,7 +175,7 @@ public class HGKCTools {
 			paramMap.put("depositNos", depositNos);
 			return DaoBase.getInstance().query(HGKC003.QUERY, paramMap);
 		}
-		
+
 		/**
 		 * 查询
 		 *
@@ -168,7 +187,31 @@ public class HGKCTools {
 			return results.stream().collect(Collectors.toMap(HGKC003::getDepositNo, item -> item));
 		}
 	}
-	
+
+	/**
+	 * HGKC003A 工具类
+	 *
+	 * @author:songx
+	 * @date:2024/5/15,9:49
+	 */
+	public static class THGKC003A {
+
+
+		public static HGKC003A save(HGKC003A hgkc003a){
+			checkSaveData(hgkc003a);
+			hgkc003a.setDepositNo(SequenceGenerator.getNextSequence(HGConstant.SequenceId.PROD_DEPOSIT_NO));
+			DaoUtils.insert(HGKC003A.INSERT,hgkc003a);
+			return hgkc003a;
+		}
+
+		private static void checkSaveData(HGKC003A hgkc003a) {
+			AssertUtils.isEmpty(hgkc003a.getCompanyCode(), "公司编码不能为空！");
+			AssertUtils.isEmpty(hgkc003a.getCompanyName(), "公司名称不能为空！");
+
+//			AssertUtils.isTrue(Objects.isNull(hgkc003.getQualityId())||hgkc003.getQualityId()<=0, "质检单idID不能为空！");
+		}
+	}
+
 	/**
 	 * HGKC010 工具类
 	 *
@@ -176,7 +219,7 @@ public class HGKCTools {
 	 * @date:2024/5/9,14:33
 	 */
 	public static class HgKc010 {
-		
+
 		/**
 		 * 锁
 		 *
@@ -191,8 +234,8 @@ public class HGKCTools {
 			paramMap.put("ids", ids);
 			DaoBase.getInstance().update(HGSqlConstant.HgKc010.LOCKS, paramMap);
 		}
-		
-		
+
+
 		/**
 		 * 锁
 		 *
@@ -211,7 +254,7 @@ public class HGKCTools {
 			paramMap.put("specId", specId);
 			DaoBase.getInstance().update(HGSqlConstant.HgKc010.LOCK, paramMap);
 		}
-		
+
 		/**
 		 * @param companyCode
 		 * @param whCode
@@ -228,7 +271,7 @@ public class HGKCTools {
 			List<HGKC010> results = DaoBase.getInstance().query(HGKC010.QUERY, paramMap);
 			return CollectionUtils.isEmpty(results) ? null : results.get(0);
 		}
-		
+
 		/**
 		 * 查询
 		 *
@@ -241,7 +284,7 @@ public class HGKCTools {
 			paramMap.put("ids", ids);
 			return DaoBase.getInstance().query(HGKC010.QUERY, paramMap);
 		}
-		
+
 		/**
 		 * 查询
 		 *
@@ -252,9 +295,9 @@ public class HGKCTools {
 			List<HGKC010> results = list(ids);
 			return results.stream().collect(Collectors.toMap(HGKC010::getId, item -> item));
 		}
-		
+
 	}
-	
+
 	/**
 	 * HGKC010 工具类
 	 *
@@ -262,7 +305,7 @@ public class HGKCTools {
 	 * @date:2024/5/9,14:33
 	 */
 	public static class HgKc011 {
-		
+
 		/**
 		 * 锁
 		 *
@@ -277,8 +320,8 @@ public class HGKCTools {
 			paramMap.put("ids", ids);
 			DaoBase.getInstance().update(HGSqlConstant.HgKc011.LOCKS, paramMap);
 		}
-		
-		
+
+
 		/**
 		 * 锁
 		 *
@@ -297,7 +340,7 @@ public class HGKCTools {
 			paramMap.put("prodOrderNo", prodOrderNo);
 			DaoBase.getInstance().update(HGSqlConstant.HgKc011.LOCK, paramMap);
 		}
-		
+
 		/**
 		 * @param companyCode
 		 * @param whCode
@@ -314,7 +357,7 @@ public class HGKCTools {
 			List<HGKC011> results = DaoBase.getInstance().query(HGKC011.QUERY, paramMap);
 			return CollectionUtils.isEmpty(results) ? null : results.get(0);
 		}
-		
+
 		/**
 		 * 查询
 		 *
@@ -327,7 +370,7 @@ public class HGKCTools {
 			paramMap.put("ids", ids);
 			return DaoBase.getInstance().query(HGKC011.QUERY, paramMap);
 		}
-		
+
 		/**
 		 * 查询
 		 *
@@ -339,5 +382,5 @@ public class HGKCTools {
 			return results.stream().collect(Collectors.toMap(HGKC011::getId, item -> item));
 		}
 	}
-	
+
 }

src/main/java/com/baosight/hggp/hg/sb/domain/HGSB001.java

@@ -4,6 +4,7 @@ import com.baosight.iplat4j.core.util.NumberUtils;
 import com.baosight.iplat4j.core.ei.EiColumn;
 import com.baosight.iplat4j.core.data.DaoEPBase;
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 import com.baosight.iplat4j.core.util.StringUtils;
 
@@ -493,7 +494,7 @@ public class HGSB001 extends DaoEPBase {
 	 * @return the deviceCode
 	 */
 	public String getDeviceCode() {
-		return this.deviceCode;
+		return this.deviceCode.toUpperCase(Locale.ROOT);
 	}
 
 	/**
@@ -502,7 +503,7 @@ public class HGSB001 extends DaoEPBase {
 	 * @param deviceCode - 设备编码
 	 */
 	public void setDeviceCode(String deviceCode) {
-		this.deviceCode = deviceCode;
+		this.deviceCode = deviceCode.toUpperCase(Locale.ROOT);
 	}
 	/**
 	 * get the deviceName - 设备名称.

src/main/java/com/baosight/hggp/hg/sb/service/ServiceHGSB001.java

@@ -11,6 +11,7 @@ import com.baosight.hggp.hg.sb.domain.HGSB002;
 import com.baosight.hggp.hg.sb.tools.HGSBTools;
 import com.baosight.hggp.hg.xs.domain.Org;
 import com.baosight.hggp.hg.xs.domain.User;
+import com.baosight.hggp.hg.xs.tools.HGXSTools;
 import com.baosight.hggp.util.*;
 import com.baosight.hggp.util.contants.ACConstants;
 import com.baosight.iplat4j.core.ei.EiBlock;
@@ -38,11 +39,11 @@ public class ServiceHGSB001 extends ServiceEPBase {
         inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB001.FIELD_DELETE_FLAG,CommonConstant.YesNo.NO_0);
         outInfo = super.query(inInfo, HGSB001.QUERY, new HGSB001());
         Map qarma = new HashMap();
-        if (!HGSBTools.getRoleDataAuth()){
-            String userId = "admin".equals(UserSessionUtils.getUserId())?"":UserSessionUtils.getUserId();
-            qarma.put(User.FIELD_USER_ID,userId);
+        List<Org> orgList = HGXSTools.XsOrg.queryByUser();
+        if (orgList.size()>0) {
+            qarma.put(Org.FIELD_ORG_ID,orgList.get(0).getOrgId());
         }
-        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID),qarma);
+        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.COMPANY_RECORD_BOX_BLOCK_ID),qarma);
         qarma.clear();
 
         Map userCompany = HGSBTools.getUserCompany();

src/main/java/com/baosight/hggp/hg/sb/service/ServiceHGSB002.java

@@ -10,6 +10,7 @@ import com.baosight.hggp.hg.sb.domain.HGSB002A;
 import com.baosight.hggp.hg.sb.tools.HGSBTools;
 import com.baosight.hggp.hg.xs.domain.Org;
 import com.baosight.hggp.hg.xs.domain.User;
+import com.baosight.hggp.hg.xs.tools.HGXSTools;
 import com.baosight.hggp.util.*;
 import com.baosight.hggp.util.contants.ACConstants;
 import com.baosight.hggp.hg.sb.domain.HGSB002;
@@ -38,11 +39,11 @@ public class ServiceHGSB002 extends ServiceEPBase {
         inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB002.FIELD_DELETE_FLAG,CommonConstant.YesNo.NO_0);
         outInfo = super.query(inInfo, HGSB002.QUERY, new HGSB002());
         Map qarma = new HashMap();
-        if (!HGSBTools.getRoleDataAuth()){
-            String userId = "admin".equals(UserSessionUtils.getUserId())?"":UserSessionUtils.getUserId();
-            qarma.put(User.FIELD_USER_ID,userId);
+        List<Org> orgList = HGXSTools.XsOrg.queryByUser();
+        if (orgList.size()>0) {
+            qarma.put(Org.FIELD_ORG_ID,orgList.get(0).getOrgId());
         }
-        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID),qarma);
+        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.COMPANY_RECORD_BOX_BLOCK_ID),qarma);
         qarma.clear();
 
         Map userCompany = HGSBTools.getUserCompany();

src/main/java/com/baosight/hggp/hg/sb/service/ServiceHGSB003.java

@@ -9,8 +9,10 @@ import com.baosight.hggp.hg.constant.HGConstant;
 import com.baosight.hggp.hg.sb.domain.HGSB002;
 import com.baosight.hggp.hg.sb.domain.HGSB003;
 import com.baosight.hggp.hg.sb.tools.HGSBTools;
+import com.baosight.hggp.hg.sj.domain.HGSJ002A;
 import com.baosight.hggp.hg.xs.domain.Org;
 import com.baosight.hggp.hg.xs.domain.User;
+import com.baosight.hggp.hg.xs.tools.HGXSTools;
 import com.baosight.hggp.util.CommonMethod;
 import com.baosight.hggp.util.ErrorCodeUtils;
 import com.baosight.hggp.util.LogUtils;
@@ -23,6 +25,7 @@ import com.baosight.iplat4j.core.exception.PlatException;
 import com.baosight.iplat4j.core.resource.I18nMessages;
 import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
 import com.baosight.iplat4j.ed.util.SequenceGenerator;
+import org.apache.commons.collections.CollectionUtils;
 
 import java.util.Arrays;
 import java.util.HashMap;
@@ -41,18 +44,31 @@ public class ServiceHGSB003 extends ServiceEPBase {
         inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB003.FIELD_DELETE_FLAG, CommonConstant.YesNo.NO_0);
         outInfo = super.query(inInfo, HGSB003.QUERY, new HGSB003());
         Map qarma = new HashMap();
-        if (!HGSBTools.getRoleDataAuth()){
-            String userId = "admin".equals(UserSessionUtils.getUserId())?"":UserSessionUtils.getUserId();
-            qarma.put(User.FIELD_USER_ID,userId);
+        List<Org> orgList = HGXSTools.XsOrg.queryByUser();
+        if (orgList.size()>0) {
+            qarma.put(Org.FIELD_ORG_ID,orgList.get(0).getOrgId());
         }
-        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID),qarma);
+        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.COMPANY_RECORD_BOX_BLOCK_ID),qarma);
         qarma.clear();
         List<String> orgIds = HGSBTools.getOrgId();
         qarma.put(Org.FIELD_ORG_ID,orgIds);
         CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.USER_ID_BOX_BLOCK_ID),qarma);
         qarma.clear();
-        Map userCompany = HGSBTools.getUserCompany();
-        qarma.put(HGSB003.FIELD_COMPANY_CODE,userCompany.get(HGSB002.FIELD_COMPANY_CODE));
+
+        if (CollectionUtils.isNotEmpty(orgList)){
+            Org org = orgList.get(0);
+            if (!"company".equals(org.getOrgType())) {
+                //如果不是公司公司，则找到上一级
+                List<Org> orgList1 = HGXSTools.XsOrg.queryParent(org.getOrgId());
+                for (Org org1:orgList1) {
+                    if ("company".equals(org1.getOrgType()) && !"root".equals(org1.getParentOrgId())) {
+                        qarma.put(HGSB003.FIELD_COMPANY_CODE,org1.getOrgId());
+                    }
+                }
+            }else {
+                qarma.put(HGSB003.FIELD_COMPANY_CODE,org.getOrgId());
+            }
+        }
         qarma.put(HGSB003.FIELD_DELETE_FLAG,CommonConstant.YesNo.NO_0);
         CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.DEVICE_CODE_BOX_BLOCK_ID), qarma);
         return outInfo;

src/main/java/com/baosight/hggp/hg/sb/service/ServiceHGSB004.java

@@ -12,6 +12,7 @@ import com.baosight.hggp.hg.sb.domain.HGSB004;
 import com.baosight.hggp.hg.sb.tools.HGSBTools;
 import com.baosight.hggp.hg.xs.domain.Org;
 import com.baosight.hggp.hg.xs.domain.User;
+import com.baosight.hggp.hg.xs.tools.HGXSTools;
 import com.baosight.hggp.util.CommonMethod;
 import com.baosight.hggp.util.ErrorCodeUtils;
 import com.baosight.hggp.util.LogUtils;
@@ -42,11 +43,11 @@ public class ServiceHGSB004 extends ServiceEPBase {
         inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB004.FIELD_DELETE_FLAG, CommonConstant.YesNo.NO_0);
         outInfo = super.query(inInfo, HGSB004.QUERY, new HGSB004());
         Map qarma = new HashMap();
-        if (!HGSBTools.getRoleDataAuth()){
-            String userId = "admin".equals(UserSessionUtils.getUserId())?"":UserSessionUtils.getUserId();
-            qarma.put(User.FIELD_USER_ID,userId);
+        List<Org> orgList = HGXSTools.XsOrg.queryByUser();
+        if (orgList.size()>0) {
+            qarma.put(Org.FIELD_ORG_ID,orgList.get(0).getOrgId());
         }
-        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID),qarma);
+        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.COMPANY_RECORD_BOX_BLOCK_ID),qarma);
         qarma.clear();
         /*Map userCompany = HGSBTools.getUserCompany();
         if (!userCompany.isEmpty()) {

src/main/java/com/baosight/hggp/hg/sb/service/ServiceHGSB004B.java

@@ -10,6 +10,7 @@ import com.baosight.hggp.hg.sb.domain.*;
 import com.baosight.hggp.hg.sb.tools.HGSBTools;
 import com.baosight.hggp.hg.xs.domain.Org;
 import com.baosight.hggp.hg.xs.domain.User;
+import com.baosight.hggp.hg.xs.tools.HGXSTools;
 import com.baosight.hggp.util.*;
 import com.baosight.hggp.util.contants.ACConstants;
 import com.baosight.iplat4j.core.ei.EiBlock;
@@ -36,11 +37,11 @@ public class ServiceHGSB004B extends ServiceEPBase {
         inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB002.FIELD_PLAN_STATUS, CommonConstant.YesNo.YES_1);
         inInfo = super.query(inInfo, HGSB002.QUERY, new HGSB002());
         Map qarma = new HashMap();
-        if (!HGSBTools.getRoleDataAuth()){
-            String userId = "admin".equals(UserSessionUtils.getUserId())?"":UserSessionUtils.getUserId();
-            qarma.put(User.FIELD_USER_ID,userId);
+        List<Org> orgList = HGXSTools.XsOrg.queryByUser();
+        if (orgList.size()>0) {
+            qarma.put(Org.FIELD_ORG_ID,orgList.get(0).getOrgId());
         }
-        CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID),qarma);
+        CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.COMPANY_RECORD_BOX_BLOCK_ID),qarma);
         qarma.clear();
         Map userCompany = HGSBTools.getUserCompany();
         if (!userCompany.isEmpty()) {

src/main/java/com/baosight/hggp/hg/sb/service/ServiceHGSB005.java

@@ -12,6 +12,7 @@ import com.baosight.hggp.hg.sb.domain.HGSB005;
 import com.baosight.hggp.hg.sb.tools.HGSBTools;
 import com.baosight.hggp.hg.xs.domain.Org;
 import com.baosight.hggp.hg.xs.domain.User;
+import com.baosight.hggp.hg.xs.tools.HGXSTools;
 import com.baosight.hggp.util.*;
 import com.baosight.hggp.util.contants.ACConstants;
 import com.baosight.iplat4j.core.ei.EiBlock;
@@ -39,11 +40,11 @@ public class ServiceHGSB005 extends ServiceEPBase {
         inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB005.FIELD_DELETE_FLAG, CommonConstant.YesNo.NO_0);
         outInfo = super.query(inInfo, HGSB005.QUERY, new HGSB005());
         Map qarma = new HashMap();
-        if (!HGSBTools.getRoleDataAuth()){
-            String userId = "admin".equals(UserSessionUtils.getUserId())?"":UserSessionUtils.getUserId();
-            qarma.put(User.FIELD_USER_ID,userId);
+        List<Org> orgList = HGXSTools.XsOrg.queryByUser();
+        if (orgList.size()>0) {
+            qarma.put(Org.FIELD_ORG_ID,orgList.get(0).getOrgId());
         }
-        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID),qarma);
+        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.COMPANY_RECORD_BOX_BLOCK_ID),qarma);
         qarma.clear();
 
         Map userCompany = HGSBTools.getUserCompany();

src/main/java/com/baosight/hggp/hg/sb/service/ServiceHGSB006.java

@@ -6,7 +6,9 @@ import com.baosight.hggp.core.security.UserSessionUtils;
 import com.baosight.hggp.hg.sb.domain.HGSB004;
 import com.baosight.hggp.hg.sb.domain.HGSB006;
 import com.baosight.hggp.hg.sb.tools.HGSBTools;
+import com.baosight.hggp.hg.xs.domain.Org;
 import com.baosight.hggp.hg.xs.domain.User;
+import com.baosight.hggp.hg.xs.tools.HGXSTools;
 import com.baosight.hggp.util.CommonMethod;
 import com.baosight.hggp.util.contants.ACConstants;
 import com.baosight.iplat4j.core.ei.EiConstant;
@@ -15,6 +17,7 @@ import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
 
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -30,11 +33,11 @@ public class ServiceHGSB006 extends ServiceEPBase {
         inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB004.FIELD_INIT_CHECK_STATUS, CommonConstant.YesNo.YES_1);
         outInfo = super.query(inInfo, HGSB006.QUERY, new HGSB006());
         Map qarma = new HashMap();
-        if (!HGSBTools.getRoleDataAuth()){
-            String userId = "admin".equals(UserSessionUtils.getUserId())?"":UserSessionUtils.getUserId();
-            qarma.put(User.FIELD_USER_ID,userId);
+        List<Org> orgList = HGXSTools.XsOrg.queryByUser();
+        if (orgList.size()>0) {
+            qarma.put(Org.FIELD_ORG_ID,orgList.get(0).getOrgId());
         }
-        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID),qarma);
+        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.COMPANY_RECORD_BOX_BLOCK_ID),qarma);
         CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.DEVICE_CODE_BOX_BLOCK_ID),null);
         //outInfo.getBlock(EiConstant.queryBlock).removeCol(HGSB004.FIELD_CHECK_STATUS);
         return outInfo;

src/main/java/com/baosight/hggp/hg/sb/service/ServiceHGSB007.java

@@ -8,7 +8,9 @@ import com.baosight.hggp.hg.sb.domain.HGSB004;
 import com.baosight.hggp.hg.sb.domain.HGSB005;
 import com.baosight.hggp.hg.sb.domain.HGSB007;
 import com.baosight.hggp.hg.sb.tools.HGSBTools;
+import com.baosight.hggp.hg.xs.domain.Org;
 import com.baosight.hggp.hg.xs.domain.User;
+import com.baosight.hggp.hg.xs.tools.HGXSTools;
 import com.baosight.hggp.util.CommonMethod;
 import com.baosight.hggp.util.contants.ACConstants;
 import com.baosight.iplat4j.core.ei.EiBlockMeta;
@@ -18,6 +20,7 @@ import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
 
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -33,11 +36,11 @@ public class ServiceHGSB007 extends ServiceEPBase {
         inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB005.FIELD_CHECK_STATUS, CommonConstant.YesNo.YES_1);
         outInfo = super.query(inInfo, HGSB007.QUERY, new HGSB007(),false, new HGSB007().eiMetadata, EiConstant.queryBlock, CommonConstant.Field.DETAIL, CommonConstant.Field.DETAIL);
         Map qarma = new HashMap();
-        if (!HGSBTools.getRoleDataAuth()){
-            String userId = "admin".equals(UserSessionUtils.getUserId())?"":UserSessionUtils.getUserId();
-            qarma.put(User.FIELD_USER_ID,userId);
+        List<Org> orgList = HGXSTools.XsOrg.queryByUser();
+        if (orgList.size()>0) {
+            qarma.put(Org.FIELD_ORG_ID,orgList.get(0).getOrgId());
         }
-        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID),qarma);
+        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.COMPANY_RECORD_BOX_BLOCK_ID),qarma);
         CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.DEVICE_CODE_BOX_BLOCK_ID),null);
         return outInfo;
     }

src/main/java/com/baosight/hggp/hg/sb/tools/HGSBTools.java

@@ -47,7 +47,7 @@ public class HGSBTools {
             if (!org.getOrgType().equals("company")) {
                 //如果不是公司公司，则找到上一级
                 Org org1 = HGXSTools.XsOrg.queryCompany(org.getOrgId());
-                orgMap.put(HGSB002.FIELD_COMPANY_CODE,org.getOrgId());
+                orgMap.put(HGSB002.FIELD_COMPANY_CODE,org1.getOrgId());
             }else {
                 orgMap.put(HGSB002.FIELD_COMPANY_CODE, org.getOrgId());
             }

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

+package com.baosight.hggp.hg.sc.service;
+
+import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
+import com.baosight.hggp.hg.sb.domain.HGSB003;
+import com.baosight.hggp.hg.sc.domain.HGSC007;
+import com.baosight.hggp.util.LogUtils;
+import com.baosight.hggp.util.StringUtil;
+import com.baosight.hggp.util.contants.ACConstants;
+import com.baosight.iplat4j.core.ei.EiBlock;
+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.ServiceEPBase;
+
+
+
+/**
+     * @author Zhang JiHui
+     * @version 1.0 2024/5/24
+     */
+    public class ServiceHGSC007 extends ServiceEPBase {
+
+    @OperationLogAnnotation(operModul = "生产任务", operType = "查询", operDesc = "初始化页面")
+    public EiInfo initLoad(EiInfo inInfo) {
+        try {
+            inInfo = super.query(inInfo, HGSC007.QUERY, new HGSC007());
+        } catch (PlatException e) {
+            LogUtils.setDetailMsg(inInfo, e, "初始化失败");
+        }
+        return inInfo;
+    }
+
+        /*
+        * 查询*/
+        @OperationLogAnnotation(operModul = "生产任务", operType = "查询", operDesc = "查询")
+        public EiInfo query(EiInfo inInfo) {
+            try {
+                EiBlock block = inInfo.getBlock(EiConstant.queryBlock);
+                String orderDate = block.getCellStr(ACConstants.ROW_CODE_0, HGSC007.FIELD_order_date);
+                if (!orderDate.isEmpty()) {
+                    inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0,HGSC007.FIELD_order_date, StringUtil.removeHorizontalLine(orderDate));
+                }
+
+                inInfo = super.query(inInfo,HGSC007.QUERY,new HGSC007() );
+
+            } catch (PlatException e) {
+                LogUtils.setDetailMsg(inInfo, e, "查询失败");
+            }
+            return inInfo;
+        }
+
+    }
+
+

src/main/java/com/baosight/hggp/hg/sj/service/ServiceHGSJ001.java

@@ -34,12 +34,13 @@ public class ServiceHGSJ001 extends ServiceEPBase {
     @Override
     public EiInfo initLoad(EiInfo inInfo) {
         inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSJ001.FIELD_DELETE_FLAG,CommonConstant.YesNo.NO_0);
-        EiInfo outInfo = super.initLoad(inInfo,new HGSJ002());
-        outInfo = super.query(inInfo, HGSJ001.QUERY, new HGSJ001());
+        EiInfo outInfo = super.query(inInfo, HGSJ001.QUERY, new HGSJ001());
         Map qarma = new HashMap();
-        String userId = "admin".equals(UserSessionUtils.getUserId())?"":UserSessionUtils.getUserId();
-        qarma.put(User.FIELD_USER_ID,userId);
-        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID),qarma);
+        List<Org> orgList = HGXSTools.XsOrg.queryByUser();
+        if (orgList.size()>0) {
+            qarma.put(Org.FIELD_ORG_ID,orgList.get(0).getOrgId());
+        }
+        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.COMPANY_RECORD_BOX_BLOCK_ID),qarma);
         qarma.clear();
         List orgIds = getOrgId();
         qarma.put(Org.FIELD_ORG_ID,orgIds);

src/main/java/com/baosight/hggp/hg/sj/service/ServiceHGSJ002.java

@@ -8,7 +8,9 @@ import com.baosight.hggp.core.enums.OrgTypeEnum;
 import com.baosight.hggp.core.security.UserSessionUtils;
 import com.baosight.hggp.hg.constant.HGConstant;
 import com.baosight.hggp.hg.sj.domain.HGSJ002;
+import com.baosight.hggp.hg.xs.domain.Org;
 import com.baosight.hggp.hg.xs.domain.User;
+import com.baosight.hggp.hg.xs.tools.HGXSTools;
 import com.baosight.hggp.util.CommonMethod;
 import com.baosight.hggp.util.ErrorCodeUtils;
 import com.baosight.hggp.util.LogUtils;
@@ -35,12 +37,13 @@ public class ServiceHGSJ002 extends ServiceEPBase {
     @Override
     public EiInfo initLoad(EiInfo inInfo) {
         inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSJ002.FIELD_DELETE_FLAG, CommonConstant.YesNo.NO_0);
-        EiInfo outInfo = super.initLoad(inInfo,new HGSJ002());
-        outInfo = super.query(inInfo, HGSJ002.QUERY, new HGSJ002());
+        EiInfo outInfo = super.query(inInfo, HGSJ002.QUERY, new HGSJ002());
         Map qarma = new HashMap();
-        String userId = "admin".equals(UserSessionUtils.getUserId())?"":UserSessionUtils.getUserId();
-        qarma.put(User.FIELD_USER_ID,userId);
-        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID),qarma);
+        List<Org> orgList = HGXSTools.XsOrg.queryByUser();
+        if (orgList.size()>0) {
+            qarma.put(Org.FIELD_ORG_ID,orgList.get(0).getOrgId());
+        }
+        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.COMPANY_RECORD_BOX_BLOCK_ID),qarma);
         return outInfo;
     }
 

src/main/java/com/baosight/hggp/hg/sj/service/ServiceHGSJ002A.java

@@ -35,8 +35,7 @@ public class ServiceHGSJ002A extends ServiceEPBase {
         //inInfo.setCell(EiConstant.queryBlock,ACConstants.ROW_CODE_0,HGPZ002A.FIELD_PARENT_ID,inInfo.get("inqu_status-0-parendId"));
         //inInfo.setCell(EiConstant.queryBlock,ACConstants.ROW_CODE_0,HGPZ002A.FIELD_FLOW_CODE,inInfo.get("inqu_status-0-flowCode"));
         String factoryCode = inInfo.getCell(EiConstant.queryBlock,ACConstants.ROW_CODE_0,HGSJ002A.FIELD_FACTORY_CODE).toString();
-        EiInfo outInfo = super.initLoad(inInfo,new HGSJ002());
-        outInfo = super.query(inInfo, HGSJ002A.QUERY, new HGSJ002A());
+        EiInfo outInfo = super.query(inInfo, HGSJ002A.QUERY, new HGSJ002A());
         CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID,DdynamicEnum.PROCESS_CODE_BLOCK_ID),
                 new HashMap<String,Object>(){{
                     put(HGSJ002A.FIELD_FACTORY_CODE,factoryCode);

src/main/java/com/baosight/hggp/hg/sj/service/ServiceHGSJ003.java

@@ -38,26 +38,29 @@ public class ServiceHGSJ003 extends ServiceEPBase {
     @Override
     public EiInfo initLoad(EiInfo inInfo) {
         inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSJ003.FIELD_DELETE_FLAG, CommonConstant.YesNo.NO_0);
-        EiInfo outInfo = super.initLoad(inInfo,new HGSJ002());
-        outInfo = super.query(inInfo, HGSJ003.QUERY, new HGSJ003());
-        List asList = new ArrayList<>();
+        EiInfo outInfo = super.query(inInfo, HGSJ003.QUERY, new HGSJ003());
         Map qarma = new HashMap();
-        String userId = "admin".equals(UserSessionUtils.getUserId())?"":UserSessionUtils.getUserId();
-        qarma.put(User.FIELD_USER_ID,userId);
-        asList.add(DdynamicEnum.COMPANY_BOX_BLOCK_ID);
-        asList.add(DdynamicEnum.PROCESS_CODE_BLOCK_ID);
         List<Org> orgList = HGXSTools.XsOrg.queryByUser();
+        if (orgList.size()>0) {
+            qarma.put(Org.FIELD_ORG_ID,orgList.get(0).getOrgId());
+        }
+        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.COMPANY_RECORD_BOX_BLOCK_ID),qarma);
+        qarma.clear();
         if (CollectionUtils.isNotEmpty(orgList)){
             Org org = orgList.get(0);
             if (!org.getOrgType().equals("company")) {
                 //如果不是公司公司，则找到上一级
-                Org org1 = HGXSTools.XsOrg.queryCompany(org.getOrgId());
-                qarma.put(HGSJ002A.FIELD_FACTORY_CODE,org1.getOrgId());
+                List<Org> orgList1 = HGXSTools.XsOrg.queryParent(org.getOrgId());
+                for (Org org1:orgList1) {
+                    if ("company".equals(org1.getOrgType()) && !"root".equals(org1.getParentOrgId())) {
+                        qarma.put(HGSJ002A.FIELD_FACTORY_CODE,org1.getOrgId());
+                    }
+                }
             }else {
                 qarma.put(HGSJ002A.FIELD_FACTORY_CODE,org.getOrgId());
             }
         }
-        CommonMethod.initBlock(outInfo, asList, qarma);
+        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.PROCESS_CODE_BLOCK_ID), qarma);
         return outInfo;
     }
 
@@ -221,9 +224,23 @@ public class ServiceHGSJ003 extends ServiceEPBase {
     @OperationLogAnnotation(operModul = "工艺单价",operType = "下载模板",operDesc = "下载模板")
     public EiInfo downloadTemplate(EiInfo inInfo){
         Map<String, Object> param = new HashMap<>(4);
-        Map map = HGSJTools.Hgsj003.getCompany(UserSession.getLoginName(),OrgTypeEnum.COMPANY.getCode());
-        param.put(HGSJ003.FIELD_FACTORY_CODE, map.get("orgEname"));
-        param.put(HGSJ003.FIELD_FACTORY_NAME, map.get("orgCname"));
+        List<Org> orgList = HGXSTools.XsOrg.queryByUser();
+        if (CollectionUtils.isNotEmpty(orgList)){
+            Org org = orgList.get(0);
+            if (!"company".equals(org.getOrgType())) {
+                //如果不是公司公司，则找到上一级
+                List<Org> orgList1 = HGXSTools.XsOrg.queryParent(org.getOrgId());
+                for (Org org1:orgList1) {
+                    if ("company".equals(org1.getOrgType()) && !"root".equals(org1.getParentOrgId())) {
+                        param.put(HGSJ003.FIELD_FACTORY_CODE,org1.getOrgId());
+                        param.put(HGSJ003.FIELD_FACTORY_NAME,org1.getOrgCname());
+                    }
+                }
+            }else {
+                param.put(HGSJ003.FIELD_FACTORY_CODE,org.getOrgId());
+                param.put(HGSJ003.FIELD_FACTORY_NAME,org.getOrgCname());
+            }
+        }
         param.put(HGSJ003.FIELD_DELETE_FLAG, CommonConstant.YesNo.NO_0);
         param.put(HGSJ003.FIELD_STATUS, CommonConstant.YesNo.YES_1);
         //param.put("orgType", OrgTypeEnum.COMPANY.getCode());

src/main/java/com/baosight/hggp/hg/xs/sql/HGXSOrg.xml

@@ -130,6 +130,9 @@
         <isNotEmpty prepend=" AND " property="orgType">
             ORG_TYPE = #orgType#
         </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="isParentOrgId">
+            PARENT_ORG_ID != 'root'
+        </isNotEmpty>
         AND ACCOUNT_CODE = #accountCode#
         ORDER BY T2.LEVEL, T3.ORG_ID
     </select>

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

@@ -19,9 +19,6 @@ $(function () {
 	// 查询
 	$("#QUERY").on("click", query);
 
-	// 选择生产任务
-	$("#SELECT_TASK").on("click", selectTask);
-
 });
 
 /**

src/main/webapp/HG/SB/HGSB001.js

 $(function () {
 
-    var companyCodeBox = __eiInfo.getBlock("companyBox_block_id").getMappedRows();
+    var companyCodeBox = __eiInfo.getBlock("company_record_box_block_id").getMappedRows();
     var groupCodeBox = __eiInfo.getBlock("group_record_block_id").getMappedRows();
 
     $(".row").children().attr("class", "col-md-3");

src/main/webapp/HG/SB/HGSB001.jsp

@@ -21,7 +21,7 @@
         <div class="row">
             <EF:EFSelect blockId="inqu_status" row="0" ename="companyCode" cname="公司名称" colWidth="3" filter="contains">
                 <EF:EFOption label="全部" value=""/>
-                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="company_record_box_block_id" textField="textField" valueField="valueField"/>
             </EF:EFSelect>
             <EF:EFInput blockId="inqu_status" row="0" ename="groupName" cname="设备区域" placeholder="模糊查询" colWidth="3"/>
             <%--<EF:EFSelect blockId="inqu_status" row="0" ename="groupCode" cname="设备区域" colWidth="3" filter="contains">
@@ -48,7 +48,7 @@
                               textField="textField" valueField="valueField"
                               maxLength="16" readonly="false" width="120" required="false"
                               align="center" filter="contains" sort="true">
-                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="company_record_box_block_id" textField="textField" valueField="valueField"/>
             </EF:EFComboColumn>
             <EF:EFComboColumn ename="groupCode" cname="设备区域"
                               columnTemplate="#=textField#" itemTemplate="#=textField#"

src/main/webapp/HG/SB/HGSB002.js

 $(function () {
 
-    var companyCodeBox = __eiInfo.getBlock("companyBox_block_id").getMappedRows();
+    var companyCodeBox = __eiInfo.getBlock("company_record_box_block_id").getMappedRows();
     var groupCodeBox = __eiInfo.getBlock("group_record_block_id").getMappedRows();
     var userIdBox = __eiInfo.getBlock("user_block_id").getMappedRows();
 

src/main/webapp/HG/SB/HGSB002.jsp

@@ -22,7 +22,7 @@
         <div class="row">
             <EF:EFSelect blockId="inqu_status" row="0" ename="companyCode" cname="公司名称" colWidth="3" filter="contains">
                 <EF:EFOption label="全部" value=""/>
-                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="company_record_box_block_id" textField="textField" valueField="valueField"/>
             </EF:EFSelect>
             <EF:EFInput blockId="inqu_status" row="0" ename="groupName" cname="设备区域" placeholder="模糊查询" colWidth="3"/>
                 <%--<EF:EFSelect blockId="inqu_status" row="0" ename="groupCode" cname="设备区域" colWidth="3" filter="contains">
@@ -55,7 +55,7 @@
                               textField="textField" valueField="valueField"
                               maxLength="16" readonly="false" width="120" required="true"
                               align="center" filter="contains" sort="true">
-                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="company_record_box_block_id" textField="textField" valueField="valueField"/>
             </EF:EFComboColumn>
             <EF:EFComboColumn ename="groupCode" cname="设备区域"
                               columnTemplate="#=textField#" itemTemplate="#=textField#"

src/main/webapp/HG/SB/HGSB003.js

 $(function () {
 
     var deviceCodeBox = __eiInfo.getBlock("deviceCodeBox_block_id").getMappedRows();
-    var companyCodeBox = __eiInfo.getBlock("companyBox_block_id").getMappedRows();
+    var companyCodeBox = __eiInfo.getBlock("company_record_box_block_id").getMappedRows();
     var userIdBox = __eiInfo.getBlock("user_block_id").getMappedRows();
 
     $(".row").children().attr("class", "col-md-3");

src/main/webapp/HG/SB/HGSB003.jsp

@@ -21,7 +21,7 @@
         <div class="row">
             <EF:EFSelect blockId="inqu_status" row="0" ename="companyCode" cname="公司名称" colWidth="3" filter="contains">
                 <EF:EFOption label="全部" value=""/>
-                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="company_record_box_block_id" textField="textField" valueField="valueField"/>
             </EF:EFSelect>
             <EF:EFDatePicker blockId="inqu_status" row="0" ename="applyDate" cname="申请日期" role="date"
                              format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="3"/>
@@ -42,7 +42,7 @@
                               textField="textField" valueField="valueField"
                               maxLength="16" readonly="false" width="120" required="true"
                               align="center" filter="contains" sort="true">
-                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="company_record_box_block_id" textField="textField" valueField="valueField"/>
             </EF:EFComboColumn>
             <EF:EFColumn ename="applyDate" cname="申请日期" width="120" enable="true" readonly="false" align="center" editType="date"
                          dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>

src/main/webapp/HG/SB/HGSB004.js

 $(function () {
 
-    var companyCodeBox = __eiInfo.getBlock("companyBox_block_id").getMappedRows();
+    var companyCodeBox = __eiInfo.getBlock("company_record_box_block_id").getMappedRows();
     //var groupCodeBox = __eiInfo.getBlock("groupCodeBox_block_id").getMappedRows();
     var userIdBox = __eiInfo.getBlock("user_block_id").getMappedRows();
 

src/main/webapp/HG/SB/HGSB004.jsp

@@ -22,7 +22,7 @@
         <div class="row">
             <EF:EFSelect blockId="inqu_status" row="0" ename="companyCode" cname="公司名称" colWidth="3" filter="contains">
                 <EF:EFOption label="全部" value=""/>
-                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="company_record_box_block_id" textField="textField" valueField="valueField"/>
             </EF:EFSelect>
             <EF:EFDatePicker blockId="inqu_status" row="0" ename="inspecDate" cname="点检日期" role="date"
                              format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="3"/>
@@ -42,7 +42,7 @@
                               textField="textField" valueField="valueField"
                               maxLength="16" readonly="true" width="120" required="true"
                               align="center" filter="contains" sort="true">
-                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="company_record_box_block_id" textField="textField" valueField="valueField"/>
             </EF:EFComboColumn>
             <EF:EFColumn ename="inspecDate" cname="点检日期" width="120" enable="true" align="center" editType="date"
                          dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>

src/main/webapp/HG/SB/HGSB004B.jsp

@@ -25,7 +25,7 @@
         <div class="row">
             <EF:EFSelect blockId="inqu_status" row="0" ename="companyCode" cname="公司名称" colWidth="3" filter="contains">
                 <EF:EFOption label="全部" value=""/>
-                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="company_record_box_block_id" textField="textField" valueField="valueField"/>
             </EF:EFSelect>
             <EF:EFInput blockId="inqu_status" row="0" ename="groupName" cname="设备区域" placeholder="模糊查询" colWidth="3"/>
             <EF:EFDatePicker blockId="inqu_status" row="0" ename="planDate" cname="计划日期" role="date" format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="3"/>
@@ -47,7 +47,7 @@
                               textField="textField" valueField="valueField"
                               maxLength="16" readonly="true" width="120" required="true"
                               align="center" filter="contains" sort="true">
-                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="company_record_box_block_id" textField="textField" valueField="valueField"/>
             </EF:EFComboColumn>
             <EF:EFComboColumn ename="groupCode" cname="设备区域"
                               columnTemplate="#=textField#" itemTemplate="#=textField#"

src/main/webapp/HG/SB/HGSB005.js

 $(function () {
 
-    var companyCodeBox = __eiInfo.getBlock("companyBox_block_id").getMappedRows();
+    var companyCodeBox = __eiInfo.getBlock("company_record_box_block_id").getMappedRows();
     //var groupCodeBox = __eiInfo.getBlock("group_record_block_id").getMappedRows();
     var userIdBox = __eiInfo.getBlock("user_block_id").getMappedRows();
 

src/main/webapp/HG/SB/HGSB005.jsp

@@ -22,7 +22,7 @@
         <div class="row">
             <EF:EFSelect blockId="inqu_status" row="0" ename="companyCode" cname="公司名称" colWidth="3" filter="contains">
                 <EF:EFOption label="全部" value=""/>
-                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="company_record_box_block_id" textField="textField" valueField="valueField"/>
             </EF:EFSelect>
             <EF:EFDatePicker blockId="inqu_status" row="0" ename="upkeepDate" cname="保养日期" role="date"
                              format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="3"/>
@@ -41,7 +41,7 @@
                               textField="textField" valueField="valueField"
                               maxLength="16" readonly="true" width="120" required="true"
                               align="center" filter="contains" sort="true">
-                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="company_record_box_block_id" textField="textField" valueField="valueField"/>
             </EF:EFComboColumn>
             <EF:EFColumn ename="upkeepDate" cname="保养日期" width="120" enable="true" readonly="false" align="center" editType="date"
                          dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>

src/main/webapp/HG/SB/HGSB006.jsp

@@ -17,7 +17,7 @@
         <div class="row">
             <EF:EFSelect blockId="inqu_status" row="0" ename="companyCode" cname="公司名称" colWidth="3" filter="contains">
                 <EF:EFOption label="全部" value=""/>
-                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="company_record_box_block_id" textField="textField" valueField="valueField"/>
             </EF:EFSelect>
             <EF:EFInput blockId="inqu_status" row="0" ename="deviceName" cname="设备名称" placeholder="模糊查询" colWidth="3"/>
             <EF:EFSelect blockId="inqu_status" row="0" ename="checkStatus" cname="点检状态" colWidth="3" filter="contains">
@@ -37,7 +37,7 @@
                                   textField="textField" valueField="valueField"
                                   maxLength="16" readonly="true" width="120" required="true"
                                   align="center" filter="contains" sort="true">
-                    <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
+                    <EF:EFOptions blockId="company_record_box_block_id" textField="textField" valueField="valueField"/>
                 </EF:EFComboColumn>
                 <EF:EFColumn ename="planCode" cname="计划单号" width="100" enable="false" readonly="true" align="center" required="true"/>
                 <EF:EFComboColumn ename="deviceCode" cname="设备名称"

src/main/webapp/HG/SB/HGSB007.jsp

@@ -18,7 +18,7 @@
         <div class="row">
             <EF:EFSelect blockId="inqu_status" row="0" ename="companyCode" cname="公司名称" colWidth="3" filter="contains">
                 <EF:EFOption label="全部" value=""/>
-                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="company_record_box_block_id" textField="textField" valueField="valueField"/>
             </EF:EFSelect>
             <EF:EFInput blockId="inqu_status" row="0" ename="deviceName" cname="设备名称" placeholder="模糊查询" colWidth="3"/>
             <EF:EFSelect blockId="inqu_status" row="0" ename="upkeepStatus" cname="保养状态" colWidth="3" filter="contains">
@@ -37,7 +37,7 @@
                               textField="textField" valueField="valueField"
                               maxLength="16" readonly="true" width="120" required="true"
                               align="center" filter="contains" sort="true">
-                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="company_record_box_block_id" textField="textField" valueField="valueField"/>
             </EF:EFComboColumn>
             <EF:EFColumn ename="planCode" cname="计划单号" width="120" align="center" readonly="true" required="true"/>
             <EF:EFComboColumn ename="deviceCode" cname="设备名称"

src/main/webapp/HG/SJ/HGSJ001.js

 $(function (){
 
-    var factoryCodes = __eiInfo.getBlock("companyBox_block_id").getMappedRows();
+    var factoryCodes = __eiInfo.getBlock("company_record_box_block_id").getMappedRows();
     var userIdBox = __eiInfo.getBlock("user_block_id").getMappedRows();
 
     $(".row").children().attr("class", "col-md-3");

src/main/webapp/HG/SJ/HGSJ001.jsp

@@ -22,7 +22,7 @@
         <div class="row">
             <EF:EFSelect blockId="inqu_status" row="0" ename="factoryCode" cname="公司名称" colWidth="3" filter="contains">
                 <EF:EFOption label="全部" value=""/>
-                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="company_record_box_block_id" textField="textField" valueField="valueField"/>
             </EF:EFSelect>
             <EF:EFInput blockId="inqu_status" row="0" ename="processName" cname="工序名称" placeholder="模糊查询" colWidth="3"/>
             <EF:EFInput blockId="inqu_status" row="0" ename="princName" cname="负责人" placeholder="模糊查询" colWidth="3"/>
@@ -43,7 +43,7 @@
                               textField="textField" valueField="valueField"
                               maxLength="16" width="120" required="true"
                               align="center" filter="contains" sort="true">
-                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="company_record_box_block_id" textField="textField" valueField="valueField"/>
             </EF:EFComboColumn>
             <EF:EFColumn ename="factoryName" cname="公司名称" hidden="true"/>
             <EF:EFColumn ename="processCode" cname="工序编码" enable="false" width="100" align="center"/>

src/main/webapp/HG/SJ/HGSJ002.js

 $(function (){
 
-    var factoryCodes = __eiInfo.getBlock("companyBox_block_id").getMappedRows();
+    var factoryCodes = __eiInfo.getBlock("company_record_box_block_id").getMappedRows();
 
     $(".row").children().attr("class", "col-md-3");
 

src/main/webapp/HG/SJ/HGSJ002.jsp

@@ -17,7 +17,7 @@
         <div class="row">
             <EF:EFSelect blockId="inqu_status" row="0" ename="factoryCode" cname="公司名称" colWidth="3" filter="contains">
                 <EF:EFOption label="全部" value=""/>
-                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="company_record_box_block_id" textField="textField" valueField="valueField"/>
             </EF:EFSelect>
             <EF:EFInput blockId="inqu_status" row="0" ename="flowName" cname="流程名称" placeholder="模糊查询" colWidth="3"/>
             <EF:EFSelect blockId="inqu_status" row="0" ename="status" cname="状态" colWidth="3" filter="contains">
@@ -37,7 +37,7 @@
                               textField="textField" valueField="valueField"
                               maxLength="16" width="120" required="true"
                               align="center" filter="contains" sort="true">
-                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="company_record_box_block_id" textField="textField" valueField="valueField"/>
             </EF:EFComboColumn>
             <EF:EFColumn ename="flowCode" cname="流程编码" enable="false" width="100" align="center"/>
             <EF:EFColumn ename="flowName" cname="流程名称" width="120" enable="true" readonly="false" align="center" required="true"/>

src/main/webapp/HG/SJ/HGSJ003.js

 $(function (){
 
-    var factoryCodes = __eiInfo.getBlock("companyBox_block_id").getMappedRows();
+    var factoryCodes = __eiInfo.getBlock("company_record_box_block_id").getMappedRows();
     var processCodes = __eiInfo.getBlock("processCode_block_id").getMappedRows();
 
     $(".row").children().attr("class", "col-md-3");

src/main/webapp/HG/SJ/HGSJ003.jsp

@@ -17,7 +17,7 @@
         <div class="row">
             <EF:EFSelect blockId="inqu_status" row="0" ename="factoryCode" cname="公司名称" colWidth="3" filter="contains">
                 <EF:EFOption label="全部" value=""/>
-                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="company_record_box_block_id" textField="textField" valueField="valueField"/>
             </EF:EFSelect>
             <%--<EF:EFSelect blockId="inqu_status" row="0" ename="processCode" cname="工序名称" colWidth="3" filter="contains">
                 <EF:EFOption label="全部" value=""/>
@@ -41,7 +41,7 @@
                               textField="textField" valueField="valueField"
                               maxLength="16" width="120" required="true"
                               align="center" filter="contains" sort="true">
-                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="company_record_box_block_id" textField="textField" valueField="valueField"/>
             </EF:EFComboColumn>
             <EF:EFComboColumn ename="processCode" cname="工序名称"
                               columnTemplate="#=textField#" itemTemplate="#=textField#"