拆弹派工生产组代码更新

src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC005A.java

@@ -49,11 +49,15 @@ public class ServiceHPSC005A extends ServiceBase {
 			String prodOrderNo = MapUtils.getString(queryMap, CommonConstant.Field.PROD_ORDER_NO);
 			HPSC005 dbSc005 = HPSCTools.HpSc005.get(prodOrderNo);
 			inInfo.addBlock(CommonConstant.Field.DETAIL).addRow(dbSc005);
-			queryMap.put("userId", UserSessionUtils.getUserId());
+			queryMap.put("userId", dbSc005.getFactoryCode());
+			queryMap.put("orgType", "prodGroup");
+			queryMap.put(HPSC005.FIELD_FACTORY_CODE, dbSc005.getFactoryCode());
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.USER_GROUP_BLOCK_ID), queryMap, false);
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.FACTORY_RECORD_BLOCK_ID), null, false);
-			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.FACTORY_RECORD_BLOCK_ID,DdynamicEnum.GROUP_PRO_BLOCK_ID),
-					new HashMap<String,Object>(){{put(HPSC005.FIELD_FACTORY_CODE,dbSc005.getFactoryCode());}}, false);
+
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.FACTORY_RECORD_BLOCK_ID,DdynamicEnum.GROUP_RECORD_BLOCK_ID),
+					queryMap, false);
+			/*new HashMap<String,Object>(){{put(HPSC005.FIELD_FACTORY_CODE,dbSc005.getFactoryCode());}}*/
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPSC005A().eiMetadata);
 		} catch (Exception e) {
 			LogUtils.setMsg(inInfo, e, "初始化失败");

src/main/java/com/baosight/hpjx/hp/xs/sql/HPXSOrg.xml

@@ -182,6 +182,9 @@
         <isNotEmpty prepend=" AND " property="orgType">
             T3.ORG_TYPE = #orgType#
         </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="factoryCode">
+            T3.FACTORY_CODE = #factoryCode#
+        </isNotEmpty>
         ORDER BY T2.LEVEL, T3.ORG_ID
     </select>
 

src/main/webapp/HP/SC/HPSC005A.jsp

@@ -50,7 +50,7 @@
 			<EF:EFColumn ename="factoryName" cname="工厂" enable="false" align="center" hidden="true"/>--%>
 			<EF:EFComboColumn ename="orgNo" cname="生产组" width="110" align="center" defaultValue="" required="true"
 							  filter="contains" readonly="true">
-				<EF:EFOptions blockId="group_pro_block_id" valueField="valueField" textField="textField"/>
+				<EF:EFOptions blockId="group_record_block_id" valueField="valueField" textField="textField"/>
 			</EF:EFComboColumn>
 			<EF:EFColumn ename="orgName" cname="生产组名称" enable="false" align="center" hidden="true"/>
 			<EF:EFColumn ename="workDate" cname="派工时间" enable="false" width="100" align="center"