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

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

@@ -29,6 +29,7 @@ import com.baosight.iplat4j.core.exception.PlatException;
 import com.baosight.iplat4j.core.service.impl.ServiceBase;
 import com.baosight.iplat4j.core.web.threadlocal.UserSession;
 import com.baosight.iplat4j.ed.util.SequenceGenerator;
+import org.apache.commons.collections.CollectionUtils;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -37,6 +38,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  *
@@ -294,20 +296,33 @@ public class ServiceHPSC003 extends ServiceBase {
 	 */
 	public EiInfo qrcodePlanDetail(EiInfo inInfo) {
 		try {
-			Map queryRow = EiInfoUtils.getFirstRow(inInfo);
-			String planInfoNo = MapUtils.getString(queryRow, HPSC003.FIELD_PLAN_INFO_NO);
+			String planInfoNo = inInfo.getString(HPSC003.FIELD_PLAN_INFO_NO);
 			AssertUtils.isNull(planInfoNo, "计划号不能为空");
 			// 查询计划主信息
 			HPSC003 dbSc003 = HPSCTools.HpSc003.getByNo(planInfoNo);
-			EiInfoUtils.addBlock(inInfo, "planMain", dbSc003, HPSC003.class);
 			// 查询计划明细信息
 			List<HPSC004> dbSc004s = HPSCTools.HpSc004.queryByParent(dbSc003.getPlanInfoNo());
-			EiInfoUtils.addBlock(inInfo, "planDetail", dbSc004s, HPSC004.class);
+			List<Map> dbSc004Maps = dbSc004s.stream().map(HPSC004::toMap).collect(Collectors.toList());
 			// 订单号
 			List<String> prodOrderNos = ObjectUtils.listEpKey(dbSc004s, HPSC004.FIELD_PROD_ORDER_NO);
 			// 查询派工信息
 			List<HPSC005B> dbSc005bs = HPSCTools.HpSc005b.listByOrder(prodOrderNos);
-			EiInfoUtils.addBlock(inInfo, "prodOrder", dbSc005bs, HPSC005B.class);
+			// 填充数据
+			Map<String, List<HPSC005B>> dbSc005bMap = dbSc005bs.stream()
+					.collect(Collectors.groupingBy(HPSC005B::getProdOrderNo));
+			for (Map dbSc004Map : dbSc004Maps) {
+				String prodOrderNo = MapUtils.getString(dbSc004Map, HPSC004.FIELD_PROD_ORDER_NO);
+				List<HPSC005B> dbSc005Items = dbSc005bMap.get(prodOrderNo);
+				if (CollectionUtils.isNotEmpty(dbSc005Items)) {
+					dbSc004Map.put("prodOrders", dbSc005Items.stream().map(HPSC005B::toMap)
+							.collect(Collectors.toList()));
+				} else {
+					dbSc004Map.put("prodOrders", new ArrayList<>());
+				}
+			}
+			Map dbSc003Map = dbSc003.toMap();
+			dbSc003Map.put("planDetail", dbSc004Maps);
+			inInfo.set("planInfo", dbSc003Map);
 		} catch (Exception e) {
 			LogUtils.setMsg(inInfo, e, "查询计划详情失败");
 			// 小程序端要求，错误码使用500

src/main/java/com/baosight/hpjx/hp/sc/tools/HPSCTools.java

@@ -425,7 +425,6 @@ public class HPSCTools {
 		/**
 		 * 生成二维码
 		 *
-		 * @param id
 		 * @param planInfoNo
 		 */
 		public static void createQrCode(String planInfoNo) throws Exception {