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

@@ -300,18 +300,55 @@ public class ServiceHPSC003 extends ServiceBase {
 			AssertUtils.isNull(planInfoNo, "计划号不能为空");
 			// 查询计划主信息
 			HPSC003 dbSc003 = HPSCTools.HpSc003.getByNo(planInfoNo);
+			Map dbSc003Map = dbSc003.toMap();
 			// 查询计划明细信息
-			List<HPSC004> dbSc004s = HPSCTools.HpSc004.queryByParent(dbSc003.getPlanInfoNo());
+			this.buildPlanDetail(dbSc003Map);
+			inInfo.set("planInfo", dbSc003Map);
+		} catch (Exception e) {
+			LogUtils.setMsg(inInfo, e, "查询计划详情失败");
+			// 小程序端要求，错误码使用500
+			inInfo.setStatus(500);
+		}
+		return inInfo;
+	}
+	
+	/**
+	 * 计划明细
+	 *
+	 * @param dbSc003Map
+	 */
+	private void buildPlanDetail(Map dbSc003Map) {
+		String planInfoNo = MapUtils.getString(dbSc003Map, HPSC003.FIELD_PLAN_INFO_NO);
+		// 查询计划明细信息
+		List<HPSC004> dbSc004s = HPSCTools.HpSc004.queryByParent(planInfoNo);
+		if (CollectionUtils.isEmpty(dbSc004s)) {
+			dbSc003Map.put("planDetail", new ArrayList<>());
+			return;
+		}
 		List<Map> dbSc004Maps = dbSc004s.stream().map(HPSC004::toMap).collect(Collectors.toList());
+		// 派工信息
+		buildProdOrder(dbSc004Maps);
+	}
+	
+	/**
+	 * 派工信息
+	 *
+	 * @param dbSc004Maps
+	 */
+	private void buildProdOrder(List<Map> dbSc004Maps) {
 		// 订单号
-			List<String> prodOrderNos = ObjectUtils.listEpKey(dbSc004s, HPSC004.FIELD_PROD_ORDER_NO);
+		List<String> prodOrderNos = ObjectUtils.listKey(dbSc004Maps, HPSC004.FIELD_PROD_ORDER_NO);
 		// 查询派工信息
 		List<HPSC005B> dbSc005bs = HPSCTools.HpSc005b.listByOrder(prodOrderNos);
 		// 填充数据
-			Map<String, List<HPSC005B>> dbSc005bMap = dbSc005bs.stream()
-					.collect(Collectors.groupingBy(HPSC005B::getProdOrderNo));
+		Map<String, List<HPSC005B>> dbSc005bMap = CollectionUtils.isEmpty(dbSc005bs) ? null
+				: dbSc005bs.stream().collect(Collectors.groupingBy(HPSC005B::getProdOrderNo));
 		for (Map dbSc004Map : dbSc004Maps) {
 			String prodOrderNo = MapUtils.getString(dbSc004Map, HPSC004.FIELD_PROD_ORDER_NO);
+			if (dbSc005bMap == null) {
+				dbSc004Map.put("prodOrders", new ArrayList<>());
+				continue;
+			}
 			List<HPSC005B> dbSc005Items = dbSc005bMap.get(prodOrderNo);
 			if (CollectionUtils.isNotEmpty(dbSc005Items)) {
 				dbSc004Map.put("prodOrders", dbSc005Items.stream().map(HPSC005B::toMap)
@@ -320,15 +357,7 @@ public class ServiceHPSC003 extends ServiceBase {
 				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
-			inInfo.setStatus(500);
-		}
-		return inInfo;
 	}
 	
+	
 }