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

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java

@@ -120,6 +120,16 @@ public class CommonEnumUtil {
             }
             return tmp;
         }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
     }
 
     /**

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){
+    public DynTableRow putCell(DynTableCell cell){
-        this.cellList.add(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-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/CheckPointModel.java

@@ -41,5 +41,4 @@ public class CheckPointModel {
      *实际抽点数量【从前端输入获取】
      */
     private Integer actQty;
-
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java

@@ -42,10 +42,12 @@ public class SessionUser implements Serializable {
     public SessionUser() {
     }
 
-    public SessionUser(String userCode, String userName, String siteCode) {
+    public SessionUser(String userCode, String userName, String organizeCode) {
         this.userCode = userCode;
         this.userName = userName;
-
+        SysUserInfo sysUserInfo = new SysUserInfo();
+        sysUserInfo.setOrganizeCode(organizeCode);
+        this.userInfo = sysUserInfo;
     }
 
     public SessionUser(String userCode, String userName, String siteCode, String languageCode, String userTypeId) {
@@ -54,5 +56,4 @@ public class SessionUser implements Serializable {
         this.languageCode = languageCode;
         this.userType = userTypeId;
     }
-
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
@@ -13,6 +15,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description : 单号规则
@@ -20,6 +23,7 @@ import javax.persistence.Table;
  * @Author : yunhao
  * @CreateDate : 2018-11-21 15:12
  * @Modify:
+ *      Dev 2018-12-12 09:41:07
  **/
 @Data
 @Entity
@@ -58,24 +62,39 @@ public class SysOrderNoRule extends BaseBean {
     private Long serialNoLength;
 
     @Column(name = "IS_CYCLE")
-    @ApiParam(value = "达到最大值后是否循环",example = "1")
+    @ApiParam(value = "达到最大值后是否循环",example = "1",hidden = true)
     private Integer isCycle;
 
+    @Transient
+    @ApiParam(value = "达到最大值后是否循环",example = "否")
+    private String isCycleName;
+
+    public String getIsCycleName() {
+        if(isCycle != null){
+            CommonEnumUtil.TRUE_OR_FALSE.valueOf(isCycle);
+        }
+        return isCycleName;
+    }
+
+    public void setIsCycleName(String isCycleName) {
+        this.isCycleName = isCycleName;
+        this.isCycle = CommonEnumUtil.TRUE_OR_FALSE.descOf(isCycleName);
+    }
+
     @Column(name = "SERIAL_NO")
-    @ApiParam(value = "当前流水号",example = "-1")
+    @ApiParam(value = "当前流水号",example = "-1",hidden = true)
     @JsonSerialize(using = ToStringSerializer.class)
     private Long serialNo;
 
     @Column(name = "ORDER_NO")
-    @ApiParam(value = "当前单号")
+    @ApiParam(value = "当前单号",hidden = true)
     private String orderNo;
 
     @Column(name = "ORDER_NO_RULE_STATUS")
-    @ApiParam(value = "单号规则状态")
+    @ApiParam(value = "单号规则状态",hidden = true)
     private Integer orderNoRuleStatus;
 
     @Column(name="ORDER_NO_RULE_DESCRIPTION")
     @ApiParam(value ="描述")
     private String orderNoRuleDescription;
-
 }

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

@@ -62,15 +62,15 @@ public class WmsActionLogData extends BaseBean {
     @ApiParam(value="结束执行时间",example = "2000-01-01 01:00:00")
     private String endTime;
 
-    @Column(name = "IN_PARAMS")
+    @Column(name = "IN_PARAMS", columnDefinition = "TEXT")
     @ApiParam(value = "输入参数")
     private String inParams;
 
-    @Column(name = "OUT_PARAMS")
+    @Column(name = "OUT_PARAMS", columnDefinition = "TEXT")
     @ApiParam(value = "输出参数")
     private String outParams;
 
-    @Column(name = "OUT_RESULT")
+    @Column(name = "OUT_RESULT", columnDefinition = "TEXT")
     @ApiParam(value = "执行结果")
     private String outResult;
 }

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;
     }
+
 }

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

@@ -1154,10 +1154,16 @@ public class WmsHqlPack {
     public static String packHqlWmsActionLog(WmsActionLog wmsActionLog) {
         StringBuffer result = new StringBuffer();
 
+        if (StringUtils.isNotBlank(wmsActionLog.getStartTimeStart()) &&
+                StringUtils.isNotBlank(wmsActionLog.getStartTimeEnd())) {
             HqlPack.timeBuilder(wmsActionLog.getStartTimeStart(),wmsActionLog.getStartTimeEnd(),
                     "startTime", result, true);
+        } else if (StringUtils.isNotBlank(wmsActionLog.getEndTimeStart()) &&
+                StringUtils.isNotBlank(wmsActionLog.getEndTimeEnd())) {
             HqlPack.timeBuilder(wmsActionLog.getEndTimeStart(),wmsActionLog.getEndTimeEnd(),
                     "endTime", result, true);
+        }
+
         // 作业流程编号
         HqlPack.getNumEqualPack(wmsActionLog.getAgId(),"agId",result);
         // 作业流程名称