Merge branch 'dev' of http://git.pseer.com/platform/hp-smart into dev-ly

src/main/java/com/baosight/hpjx/hp/bi/service/ServiceHPBI003.java

@@ -59,6 +59,13 @@ public class ServiceHPBI003 extends ServiceBase {
         JSONObject jsonObject = (JSONObject) jsonArray.get(0);
         JSONArray idsArr = (JSONArray) jsonObject.get("ids");
         String idsStr = idsArr.getString(0);
+        JSONObject paramsObj =  null;
+        if (jsonObject.get("params") instanceof String) {
+            paramsObj=JSON.parseObject((String) jsonObject.get("params"));
+        } else {
+            paramsObj= (JSONObject) jsonObject.get("params");
+        }
+        String deviceCodeStr = paramsObj.getString("deviceCode");
         EiInfo eiInfo = new EiInfo();
         String serviceId = "S_BE_XP_17";
         eiInfo.set(EiConstant.serviceId,serviceId);
@@ -74,6 +81,7 @@ public class ServiceHPBI003 extends ServiceBase {
         //数据集入参
         Map params =new HashMap();
         params.put("companycode",companycode);
+        params.put("deviceCode",deviceCodeStr);
         map.put("params",params);
         List list =new ArrayList();
         list.add(map);
@@ -122,6 +130,13 @@ public class ServiceHPBI003 extends ServiceBase {
         JSONObject jsonObject = (JSONObject) jsonArray.get(0);
         JSONArray idsArr = (JSONArray) jsonObject.get("ids");
         String idsStr = idsArr.getString(0);
+        JSONObject paramsObj =  null;
+        if (jsonObject.get("params") instanceof String) {
+            paramsObj=JSON.parseObject((String) jsonObject.get("params"));
+        } else {
+            paramsObj= (JSONObject) jsonObject.get("params");
+        }
+        String deviceCodeStr = paramsObj.getString("deviceCode");
         EiInfo eiInfo = new EiInfo();
         String serviceId = "S_BE_XP_17";
         eiInfo.set(EiConstant.serviceId,serviceId);
@@ -137,6 +152,7 @@ public class ServiceHPBI003 extends ServiceBase {
         //数据集入参
         Map params =new HashMap();
         params.put("companycode",companycode);
+        params.put("deviceCode",deviceCodeStr);
         map.put("params",params);
         List list =new ArrayList();
         list.add(map);

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

@@ -27,6 +27,7 @@ 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;
@@ -296,6 +297,10 @@ 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, "计划号不能为空");
 			// 查询计划主信息
@@ -326,6 +331,7 @@ public class ServiceHPSC003 extends ServiceBase {
 			return;
 		}
 		List<Map> dbSc004Maps = dbSc004s.stream().map(HPSC004::toMap).collect(Collectors.toList());
+		dbSc003Map.put("planDetail", dbSc004Maps);
 		// 派工信息
 		buildProdOrder(dbSc004Maps);
 	}