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

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

@@ -146,14 +146,17 @@ public enum DdynamicEnum {
      * 用途：工序设计下拉框
      * 编写：ly
      */
-    COMPANY_BOX_BLOCK_ID("companyBox_block_id","orgEname","orgCname","HGSJ001.queryCompany"),
+    COMPANY_BOX_BLOCK_ID("companyBox_block_id","orgEname","orgCname","HGSJ001.queryCompany",
+            new HashMap<String,Object>(){{
+                put("orgType", OrgTypeEnum.COMPANY.getCode());
+            }}),
 
     /**
      * 模块：工序编码
      * 用途：工序编码下拉框
      * 编写：ly
      */
-    PROCESS_CODE_BLOCK_ID("processCode_block_id","processCode","processName","factoryCode","factoryName","HGSJ001.queryProcessCode")
+    PROCESS_CODE_BLOCK_ID("processCode_block_id","processCode","processName","factoryCode","factoryName","unit","HGSJ001.queryProcessCode")
     ;
 
 

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

@@ -35,8 +35,7 @@ public class ServiceHGSJ001 extends ServiceEPBase {
         inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSJ001.FIELD_DELETE_FLAG,CommonConstant.YesNo.NO_0);
         inInfo = super.query(inInfo, HGSJ001.QUERY, new HGSJ001());
         CommonMethod.initBlock(inInfo,
-                Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID,DdynamicEnum.USER_BLOCK_ID),
-                new HashMap<String,Object>(){{put("orgType", OrgTypeEnum.COMPANY.getCode());}}
+                Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID,DdynamicEnum.USER_BLOCK_ID),null
         );
         return inInfo;
     }

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

@@ -34,10 +34,7 @@ public class ServiceHGSJ002 extends ServiceEPBase {
     public EiInfo initLoad(EiInfo inInfo) {
         inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSJ002.FIELD_DELETE_FLAG, CommonConstant.YesNo.NO_0);
         inInfo = super.query(inInfo, HGSJ002.QUERY, new HGSJ002());
-        CommonMethod.initBlock(inInfo,
-                Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID),
-                new HashMap<String,Object>(){{put("orgType", OrgTypeEnum.COMPANY.getCode());}}
-        );
+        CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID),null);
         return inInfo;
     }
 

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

@@ -35,10 +35,9 @@ public class ServiceHGSJ002A extends ServiceEPBase {
         //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();
         inInfo = super.query(inInfo, HGSJ002A.QUERY, new HGSJ002A());
-        CommonMethod.initBlock(inInfo,
-                Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID,DdynamicEnum.PROCESS_CODE_BLOCK_ID),
+        CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID),null);
+        CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.PROCESS_CODE_BLOCK_ID),
                 new HashMap<String,Object>(){{
-                    put("orgType", OrgTypeEnum.COMPANY.getCode());
                     put(HGSJ002A.FIELD_FACTORY_CODE,factoryCode);
                     put(HGSJ002A.FIELD_DELETE_FLAG,CommonConstant.YesNo.NO_0);}}
         );

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

@@ -34,11 +34,9 @@ public class ServiceHGSJ003 extends ServiceEPBase {
     public EiInfo initLoad(EiInfo inInfo) {
         inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSJ003.FIELD_DELETE_FLAG, CommonConstant.YesNo.NO_0);
         inInfo = super.query(inInfo, HGSJ003.QUERY, new HGSJ003());
-        CommonMethod.initBlock(inInfo,
-                Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID,DdynamicEnum.PROCESS_CODE_BLOCK_ID),
-                new HashMap<String,Object>(){{
-                    put("orgType", OrgTypeEnum.COMPANY.getCode());
-                    put(HGSJ003.FIELD_DELETE_FLAG,CommonConstant.YesNo.NO_0);}}
+        CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID),null);
+        CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.PROCESS_CODE_BLOCK_ID),
+                new HashMap<String,Object>(){{put(HGSJ003.FIELD_DELETE_FLAG,CommonConstant.YesNo.NO_0);}}
         );
         return inInfo;
     }

src/main/java/com/baosight/hggp/hg/sj/sql/HGSJ001.xml

@@ -278,19 +278,24 @@
 		PROCESS_CODE	as "processCode",  <!-- 工序编码 -->
 		CONCAT('[',FACTORY_NAME,']',PROCESS_NAME)	as "processName",  <!-- 工序名称 -->
 		FACTORY_CODE	as "factoryCode",  <!-- 厂区编码 -->
-		FACTORY_NAME	as "factoryName"  <!-- 厂区名称 -->
+		FACTORY_NAME	as "factoryName",  <!-- 厂区名称 -->
+		UNIT AS "unit"
 		FROM ${hggpSchema}.HGGY001 WHERE 1=1
 		<include refid="condition" />
-		group by PROCESS_CODE,PROCESS_NAME,FACTORY_CODE,FACTORY_NAME
-
+		group by PROCESS_CODE,PROCESS_NAME,FACTORY_CODE,FACTORY_NAME,UNIT
 	</select>
 
+	<!--查询用户所在的公司-->
 	<select id="queryCompany" parameterClass="java.util.HashMap" resultClass="java.util.HashMap">
-		select distinct
-			ORG_ENAME as "orgEname",
-		 	ORG_CNAME as "orgCname"
-		from iplat_hggp.txsog01
-		where ACCOUNT_CODE = #accountCode# and ORG_TYPE in (#orgType#)
+		select
+		a.ORG_ENAME as "orgEname",
+		a.ORG_CNAME as "orgCname"
+		from iplat_hggp.txsog01 a
+		left join iplat_hggp.txsog02 b on a.ORG_ID = b.ORG_ID
+		where
+		a.ACCOUNT_CODE = #accountCode#
+		and a.ORG_TYPE = #orgType#
+		<!--and b.USER_ID = #userId#-->
 	</select>
 
 </sqlMap>

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

@@ -67,6 +67,7 @@ $(function (){
                         for (let i = 0; i < processCodes.length; i++) {
                             if (processCodes[i]['valueField'] === dataItem['processCode']) {
                                 dataItem['processName'] = processCodes[i]['textField'].split("]")[1];
+                                dataItem['unit'] = processCodes[i]['param3Field']
                                 return processCodes[i]['textField'].split("]")[1];
                             }
                         }
@@ -110,6 +111,8 @@ $(function (){
                         if (e.items[0].factoryCode.length===0){
                             loadChange(grid,e,"factoryCode");
                         }
+                        loadChange(grid,e,"unit");
+                        loadChange(grid,e,"processClass");
                     }
                 });
             },