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

@@ -576,7 +576,6 @@ public class CommonEnumUtil {
         }
     }
 
-
     /**
      * 性别
      */
@@ -612,4 +611,39 @@ public class CommonEnumUtil {
         }
     }
 
+    /**
+     * 服务状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum CLOUD_STATUS {
+        REGISTERED(1, "注册"),
+        DISCONNECT(2, "断开");
+
+        private int value;
+        private String description;
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        private CLOUD_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }

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

@@ -689,7 +689,7 @@ public class ImppEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MESSAGE_TYPE_CONTENT {
 
-        HTML(1,"HTML","text/plain;charset=UTF-8"),
+        HTML(1,"HTML","text/html;charset=UTF-8"),
         TEXT(2,"TEXT","text/plain;charset=UTF-8");
 
         private int value;

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

@@ -1740,7 +1740,8 @@ public class WmsEnumUtil {
 
         INTERACTIVE_ACTION(10, "交互动作"),
         BACKSTAGE_ACTION(20, "后台动作"),
-        SUBMIT_ACTION(30, "提交动作");
+        SUBMIT_ACTION(30, "提交动作"),
+        SELECT_ACTION(40, "选择动作");
 
         private int value;
         private String description;

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

@@ -18,6 +18,10 @@ import java.util.Map;
 @Data
 public class DynTableRow {
 
+    // 是否选中
+    private boolean isChecked;
+
+    // 行ID
     private String key;
 
     // 行号

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/SysMessage.java

@@ -56,7 +56,7 @@ public class SysMessage extends BaseBean {
     private String messageSenderNameRdd;
 
     @Column(name="MESSAGE_RECEIVERS_ID")
-    @ApiParam(value ="发送者名称" )
+    @ApiParam(value ="发送者id" )
     private String messageReceiversId;
 
     @Column(name="MESSAGE_RECEIVERS_NAME_RDD")

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/WmsActionLogDetails.java

@@ -27,20 +27,20 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="WMS_ACTION_LOG_DETAILS")
-@Api(value="作业记录明细表",description = "作业记录表")
+@Table(name = "WMS_ACTION_LOG_DETAILS")
+@Api(value = "作业记录明细表", description = "作业记录表")
 public class WmsActionLogDetails extends BaseBean {
 
-    @Column(name="AL_ID")
+    @Column(name = "AL_ID")
     @ApiParam(value = "作业流程ID", example = "1")
     @JsonSerialize(using = ToStringSerializer.class)
     public Long alId;
 
     //get单独处理
     public Long getAlId() {
-        if(alId != null) {
+        if (alId != null) {
             return alId.longValue();
-        }else{
+        } else {
             return alId;
         }
     }
@@ -49,56 +49,65 @@ public class WmsActionLogDetails extends BaseBean {
     @ApiParam(value = "流程名称")
     public String agNameC;
 
-    @Column(name="SEQ")
+    @Column(name = "SEQ")
     @ApiParam(value = "序号", example = "1")
     public Integer seq;
 
-    @Column(name="OK_SEQ")
+    @Column(name = "OK_SEQ")
     @ApiParam(value = "成功跳转步骤", example = "1")
     public Integer okSeq;
 
-    @Column(name="NG_SEQ")
+    @Column(name = "NG_SEQ")
     @ApiParam(value = "失败跳转步骤", example = "1")
     public Integer ngSeq;
 
     // 10=只输入一次,20=输入多次,30=输入多次不允许重复,40=本流程结束
-    @Column(name="VALUE_TYPE")
+    @Column(name = "VALUE_TYPE")
     @ApiParam(value = "动作类型", example = "1")
     public Integer valueType;
 
     // 1=是,2=否
-    @Column(name="TO_UPPER")
+    @Column(name = "TO_UPPER")
     @ApiParam(value = "是否转为大写", example = "1")
     public Integer toUpper;
 
-    @Column(name="LEN_CHECK")
+    @Column(name = "LEN_CHECK")
     @ApiParam(value = "长度检查", example = "1")
     public Integer lenCheck;
 
-    @Column(name="AS_ID")
+    @Column(name = "AS_ID")
     @ApiParam(value = "作业步骤", example = "1")
     @JsonSerialize(using = ToStringSerializer.class)
     public Long asId;
 
     //get单独处理
     public Long getAsId() {
-        if(asId != null) {
+        if (asId != null) {
             return asId.longValue();
-        }else{
+        } else {
             return asId;
         }
     }
 
-    @Column(name="ALD_STATUS")
+    @Column(name = "ALD_STATUS")
     @ApiParam(value = "执行状态", example = "1")
     public Integer aldStatus;
 
-    @Column(name="START_TIME")
+    @Column(name = "START_TIME")
     @ApiParam(value = "开始执行时间")
     public String startTime;
 
-    @Column(name="END_TIME")
+    @Column(name = "END_TIME")
     @ApiParam(value = "结束执行时间")
     public String endTime;
 
+    public WmsActionLogDetails() {
+
+    }
+
+    public WmsActionLogDetails(String createUser, Long id, Integer seq) {
+        this.createUser = createUser;
+        this.id = id;
+        this.seq = seq;
+    }
 }

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

@@ -6,7 +6,6 @@ import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * @Description : PDA传输到后台的实体bean对象
@@ -32,13 +31,17 @@ public class WmsOperationBean extends BaseBean {
     public String alId;
 
     /**
-     * 触发源:10=扫描枪,
-     * 20=提交按钮,30=重置按钮,40=查看明细， 50=明细(删除)
+     * 触发源:
+     * 10=扫描枪,
+     * 20=提交按钮,
+     * 30=重置按钮,
+     * 40=查看明细,
+     * 50=明细(删除),
      * 60=明细（清空）
      */
     @ApiParam("触发源")
     public int sourceOwner;
 
     @ApiParam("选中的明细数据")
-    public List<Map<String, Object>> details;
+    public List<String> details;
 }

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

@@ -181,8 +181,12 @@ public class WmsHqlPack {
         //查询参数封装
         HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNo(), "partNo", result);
         HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNameRdd(), "partNameRdd", result);
-        HqlPack.timeBuilder(wmsIbCheckPlan.getStartDateStart(), wmsIbCheckPlan.getStartDateEnd(), "startDate", result, false);
-        HqlPack.timeBuilder(wmsIbCheckPlan.getEndDateStart(), wmsIbCheckPlan.getEndDateEnd(), "endDate", result, false);
+        if (StringUtils.isNotBlank(wmsIbCheckPlan.getStartDateStart()) && StringUtils.isNotBlank(wmsIbCheckPlan.getStartDateEnd())) {
+            HqlPack.timeBuilder(wmsIbCheckPlan.getStartDateStart(), wmsIbCheckPlan.getStartDateEnd(), "startDate", result, false);
+        }
+        if (StringUtils.isNotBlank(wmsIbCheckPlan.getEndDateStart()) && StringUtils.isNotBlank(wmsIbCheckPlan.getEndDateEnd())) {
+            HqlPack.timeBuilder(wmsIbCheckPlan.getEndDateStart(), wmsIbCheckPlan.getEndDateEnd(), "endDate", result, false);
+        }
 
         getStringBuilderPack(wmsIbCheckPlan, result);
 
@@ -1154,10 +1158,16 @@ public class WmsHqlPack {
     public static String packHqlWmsActionLog(WmsActionLog wmsActionLog) {
         StringBuffer result = new StringBuffer();
 
-        HqlPack.timeBuilder(wmsActionLog.getStartTimeStart(),wmsActionLog.getStartTimeEnd(),
-                "startTime", result, true);
-        HqlPack.timeBuilder(wmsActionLog.getEndTimeStart(),wmsActionLog.getEndTimeEnd(),
-                "endTime", result, true);
+        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);
         // 作业流程名称