Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java

@@ -85,4 +85,8 @@ public class WmsShipping extends BaseBean {
     @Transient
     @ApiParam(value = "发往地简称")
     private String flagName;
+
+    @Column(name="AREA_NO")
+    @ApiParam("ERP库存地")
+    public String areaNo;
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -2053,4 +2053,18 @@ public class WmsHqlPack {
         return result;
     }
 
+    /**
+     * 根据id集合查询生产报工明细表的数据
+     *
+     * @param ids
+     * @return
+     */
+    public static DdlPackBean packHqlWmsDocFgDetail(List<Long> ids) {
+        DdlPackBean result = new DdlPackBean();
+
+        //查询参数封装
+        DdlPreparedPack.getInPackList(ids,"id",result);
+
+        return result;
+    }
 }