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

src/main/java/com/baosight/hggp/hg/pz/service/ServiceHGPZ005.java

@@ -418,6 +418,7 @@ public class ServiceHGPZ005 extends ServiceBase {
 			for (Map resultRow : resultRows) {
 				HGPZ005 hgpz005 = new HGPZ005();
 				hgpz005.fromMap(resultRow);
+				hgpz005 = HGPZTools.HgPz005.getById(hgpz005.getId());
 				HGSJ002 hgsj002 = new HGSJ002();
 				hgsj002.fromMap((Map) resultRow.get("flow"));
 

src/main/java/com/baosight/hggp/hg/pz/tools/HGPZTools.java

@@ -8,10 +8,7 @@ import com.baosight.hggp.core.dao.DaoUtils;
 import com.baosight.hggp.core.enums.ValidFlagEnum;
 import com.baosight.hggp.hg.constant.HGConstant;
 import com.baosight.hggp.hg.pz.domain.*;
-import com.baosight.hggp.hg.sc.domain.HGSC001A;
-import com.baosight.hggp.hg.sc.domain.HGSC005A;
-import com.baosight.hggp.hg.sc.domain.HGSC009;
-import com.baosight.hggp.hg.sc.domain.HGSC009A;
+import com.baosight.hggp.hg.sc.domain.*;
 import com.baosight.hggp.hg.sj.domain.HGSJ003;
 import com.baosight.hggp.util.*;
 import com.baosight.iplat4j.common.ed.domain.TEDCM01;
@@ -258,6 +255,18 @@ public class HGPZTools {
 		/**
 		 * 查询
 		 *
+		 * @param id
+		 * @return
+		 */
+		public static HGPZ005 getById(Long id) {
+			AssertUtils.isTrue(Objects.isNull(id)||id<=0, "存货档案ID不能为空！");
+			HGPZ005 result = (HGPZ005)DaoBase.getInstance().get(HGPZ005.QUERY, HGPZ005.FIELD_ID, id);
+			return result;
+		}
+
+		/**
+		 * 查询
+		 *
 		 * @param ids
 		 * @return
 		 */