1.设置厂区名称

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

@@ -12,6 +12,8 @@ import com.baosight.hpjx.hp.sc.domain.HPSC004;
 import com.baosight.hpjx.hp.sc.domain.HPSC005;
 import com.baosight.hpjx.hp.sc.domain.HPSC005B;
 import com.baosight.hpjx.hp.sc.tools.HPSCTools;
+import com.baosight.hpjx.hp.xs.domain.Org;
+import com.baosight.hpjx.hp.xs.tools.HPXSTools;
 import com.baosight.hpjx.util.AssertUtils;
 import com.baosight.hpjx.util.BeanUtils;
 import com.baosight.hpjx.util.CommonMethod;
@@ -27,7 +29,6 @@ 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 com.baosight.iplat4j.core.service.soa.XLocalManager;
 import com.baosight.iplat4j.core.web.threadlocal.UserSession;
 import com.baosight.iplat4j.ed.util.SequenceGenerator;
 import org.apache.commons.collections.CollectionUtils;
@@ -297,15 +298,18 @@ public class ServiceHPSC003 extends ServiceBase {
 	 */
 	public EiInfo qrcodePlanDetail(EiInfo inInfo) {
 		try {
-//			EiInfo callInfo = new EiInfo();
-//			callInfo.set(EiConstant.serviceName, "");
-//			callInfo.set(EiConstant.methodName, "");
-//			XLocalManager.call(callInfo);
 			String planInfoNo = inInfo.getString(HPSC003.FIELD_PLAN_INFO_NO);
 			AssertUtils.isNull(planInfoNo, "计划号不能为空");
 			// 查询计划主信息
 			HPSC003 dbSc003 = HPSCTools.HpSc003.getByNo(planInfoNo);
 			Map dbSc003Map = dbSc003.toMap();
+			// 设置厂区名称
+			if (StringUtils.isNotBlank(dbSc003.getFactoryCode())) {
+				Org org = HPXSTools.XsOrg.get(dbSc003.getFactoryCode());
+				dbSc003Map.put("factoryName", org.getOrgCname());
+			} else {
+				dbSc003Map.put("factoryName", "");
+			}
 			// 查询计划明细信息
 			this.buildPlanDetail(dbSc003Map);
 			inInfo.set("planInfo", dbSc003Map);

src/main/java/com/baosight/iplat4j/core/data/ibatis/dao/SqlMapDaoLogProxy.java

@@ -187,7 +187,7 @@ public class SqlMapDaoLogProxy extends SqlMapDao {
 	 */
 	private void setCompanyCode(String name, Object parameters) {
 		// 需要过滤部分sql name，否则会形成死循环
-		String[] serviceFilter = {"HPXSUser"};
+		String[] serviceFilter = {"HPXSUser", "HPPZ009.query"};
 		if (StringUtils.startsWithAny(name, serviceFilter)) {
 			return;
 		}