Merge branch 'dev' into test

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableCell.java

@@ -15,6 +15,8 @@ import java.util.Date;
 @Data
 public class DynTableCell {
 
+    // 单元格名称
+    private String cellKey;
     // 排序
     private Integer cellSeq;
     // 单元格名称

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTablePackTool.java

@@ -1,5 +1,7 @@
 package cn.estsh.i3plus.pojo.model.dynamic.table;
 
+import java.util.Map;
+
 /**
  * @Description :
  * @Reference :
@@ -54,23 +56,25 @@ public class DynTablePackTool {
      * @return
      */
     public static DynTableCell getTableCell(Integer seq,String name,Object value) {
-        return getTableCell(seq, name, null, value,null);
+        return getTableCell(seq,seq.toString(), name, null, value,null);
     }
 
     public static DynTableCell getTableCell(Integer seq,String name,Object value,Integer valueType) {
-        return getTableCell(seq, name, null, value,valueType);
+        return getTableCell(seq,seq.toString(), name, null, value,valueType);
     }
 
     /**
      *  创建一个单元格
      * @param seq       单元格排序
+     * @param key       单元格Key
      * @param name      单元格名称
      * @param nameEn    单元格名称En
      * @param value     单元格数据
      * @return
      */
-    public static DynTableCell getTableCell(Integer seq,String name,String nameEn,Object value,Integer valueType){
+    public static DynTableCell getTableCell(Integer seq,String key,String name,String nameEn,Object value,Integer valueType){
         DynTableCell cell = new DynTableCell();
+        cell.setCellKey(key);
         cell.setCellSeq(seq);
         cell.setCellName(name);
         cell.setCellNameEn(nameEn);
@@ -79,4 +83,21 @@ public class DynTablePackTool {
         return cell;
     }
 
+    /**
+     *  获取Table 中的单元格数据
+     * @param table     要获取的Table
+     * @param rowKey    要获取的行 Key
+     * @param cellKey   要获取的列 Key
+     * @return
+     */
+    public static DynTableCell getCell(ImppDynTable table,String rowKey,String cellKey){
+        if(table != null && rowKey != null && cellKey != null){
+            DynTableRow row = table.getTable().get(rowKey);
+            if(row != null){
+                return row.getCellMap().get(cellKey);
+            }
+        }
+        return null;
+    }
+
 }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableRow.java

@@ -27,16 +27,16 @@ public class DynTableRow {
     private Integer cellSize = 0;
 
     // 行数据
-    private List<DynTableCell> cellList = new ArrayList<>();
+    private Map<String,DynTableCell> cellMap = new HashMap<>();
 
 
-    public DynTableRow addList(DynTableCell cell){
-        this.cellList.add(cell);
+    public DynTableRow putCell(DynTableCell cell){
+        this.cellMap.put(cell.getCellKey(),cell);
         return this;
     }
 
     public Integer getCellSize() {
-        return cellList != null ? cellList.size() : 0;
+        return cellMap != null ? cellMap.size() : 0;
     }
 
     /**

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/ImppDynTable.java

@@ -23,6 +23,8 @@ public class ImppDynTable {
 
     // 表单标题
     private String tableTitle;
+    // 表单总记录数
+    private Long tableSize;
 
     public ImppDynTable() {
     }
@@ -30,4 +32,12 @@ public class ImppDynTable {
     public ImppDynTable(String tableTitle) {
         this.tableTitle = tableTitle;
     }
+
+    public Long getTableSize() {
+        return new Long(table.size());
+    }
+
+    private void setTableSize(Long tableSize) {
+        this.tableSize = tableSize;
+    }
 }

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

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.bean.BaseResultBean;
 import cn.estsh.i3plus.pojo.model.wms.OptionModel;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -23,7 +24,7 @@ import java.util.Map;
 @NoArgsConstructor
 @AllArgsConstructor
 @Api("返回前端数据实体")
-public class WmsActionResponseBean {
+public class WmsActionResponseBean<Obj> {
 
     @ApiParam("进度")
     public Double percent;
@@ -44,7 +45,7 @@ public class WmsActionResponseBean {
     public List<OptionModel> options;
 
     @ApiParam("选中的明细数据")
-    public List<Map<String, Object>> details;
+    public Obj details;
 
     @ApiParam(value = "结果代码")
     public Boolean codeStatus;
@@ -72,11 +73,12 @@ public class WmsActionResponseBean {
         this.message = message;
     }
 
-    public WmsActionResponseBean(Double percent, String message, List<String> informations, List<Map<String, Object>> details, Boolean codeStatus) {
+    public WmsActionResponseBean(Double percent, String message, List<String> informations, Obj details, Boolean codeStatus) {
         this.percent = percent;
         this.message = message;
         this.informations = informations;
         this.details = details;
         this.codeStatus = codeStatus;
     }
+
 }