报屏优化

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

@@ -665,7 +665,7 @@ public class ServiceHPBI002 extends ServiceBase {
         Map result1 = (Map) result.get("a02eed6a3e3f4dd39dbd0851e6a7572a");
         List<Map> list1 = (List) result1.get("data");
         JSONArray tempArr = new JSONArray();
-        String json = "项目名称,计划完成时间,计划产量,实际产量,进度";
+        String json = "项目名称,计划完成时间,计划产量,实际产量,生产进度,发货进度";
         List tempContentList = Arrays.asList(json.split(","));
         tempArr.add(tempContentList);
         JSONObject item = new JSONObject();
@@ -676,7 +676,8 @@ public class ServiceHPBI002 extends ServiceBase {
             datalist.add(obj.get("计划完成时间"));
             datalist.add(obj.get("计划产量"));
             datalist.add(obj.get("实际产量"));
-            datalist.add(obj.get("进度"));
+            datalist.add(obj.get("生产进度"));
+            datalist.add(obj.get("发货进度"));
             tempArr.add(datalist);
         });
         JSONArray ids = new JSONArray();

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

@@ -943,6 +943,9 @@ public class HPSCTools {
 			Map queryMap = new HashMap();
 			queryMap.put("id", id);
 			List<HPSC006> results = DaoBase.getInstance().query(HPSC006.QUERY, queryMap);
+			if(results!=null&&results.size()==0){
+				results = null;
+			}
 			AssertUtils.isNull(results, String.format("生产下料ID[%s]信息不存在", id));
 			return results.get(0);
 		}