调整驾驶舱工厂选择

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

@@ -399,9 +399,15 @@ public class ServiceHGSC007 extends ServiceEPBase {
 		List<Org> factoryCodes = new ArrayList<>();
 		try {
 			List<String> roleCompanyCode = HGSBTools.getRoleCompanyCode();
-			Optional.ofNullable(roleCompanyCode).orElse(new ArrayList<>()).stream().forEach(code -> {
-				factoryCodes.addAll(HGXSTools.XsOrg.queryByParent(code, OrgTypeEnum.FACTORY.getCode()));
-			});
+			String accountCode = UserSessionUtils.getAccountCode();
+			if ("Q24072514".equals(accountCode)){
+				factoryCodes.addAll(HGXSTools.XsOrg.queryByParent("R24072632", OrgTypeEnum.FACTORY.getCode()));
+			}else {
+				Optional.ofNullable(roleCompanyCode).orElse(new ArrayList<>()).stream().forEach(code -> {
+					factoryCodes.addAll(HGXSTools.XsOrg.queryByParent(code, OrgTypeEnum.FACTORY.getCode()));
+				});
+			}
+
 			List list = factoryCodes.stream()
 					.filter(o -> com.baosight.hggp.util.StringUtils.equals(o.getOrgType(), OrgTypeEnum.FACTORY.getCode()))
 					.map(item -> new Factory(item.getCompanyCode(), item.getCompanyName(), item.getOrgId(),

src/main/webapp/HG/KC/HGKC006.jsp

@@ -59,10 +59,10 @@
 			<EF:EFColumn ename="otherEnterNo" cname="其他入库单号" enable="false" width="140" align="center"/>
 			<EF:EFColumn ename="whCode" cname="仓库名称" width="120" align="center" required="true"/>
 			<EF:EFColumn ename="whName" cname="仓库名称" hidden="true"/>
-			<EF:EFComboColumn cname="状态" ename="submitStatus" width="90" align="center"  enable="false">
+			<EF:EFComboColumn cname="状态" ename="submitStatus" width="90" align="center"  enable="false" defaultValue="0">
 				<EF:EFCodeOption codeName="hggp.hpkc.submitStatus"/>
 			</EF:EFComboColumn>
-			<EF:EFComboColumn cname="数据来源" ename="source" width="90" align="center"  enable="false">
+			<EF:EFComboColumn cname="数据来源" ename="source" width="90" align="center"  enable="false" defaultValue="1">
 				<EF:EFCodeOption codeName="hggp.hpkc.source"/>
 			</EF:EFComboColumn>
 		</EF:EFGrid>