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

@@ -1320,7 +1320,7 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ALD_EXECUTE_STATUS {
-        NORMAL(10, "创建"),
+        CREATE(10, "创建"),
         PROCESSING(20, "处理中"),
         COMPLETED(30, "已完成");
         private int value;
@@ -2759,7 +2759,7 @@ public class WmsEnumUtil {
     public enum STOCK_LEVEL_STATUS {
         LOW("LOW", "低于最低库存"),
         HIGH("HIGH", "高于最高库存"),
-        NORMAL("NORMAL", "安全库存");
+        NORMAL("CREATE", "安全库存");
 
         private String value;
         private String description;

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

@@ -28,102 +28,99 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="WMS_ACTION_LOG")
+@Table(name = "WMS_ACTION_LOG")
-@Api(value="作业记录表")
+@Api(value = "作业记录表")
 public class WmsActionLog extends BaseBean {
 
     private static final long serialVersionUID = 8664373854844368861L;
-    @Column(name="TASK_NO")
+    @Column(name = "TASK_NO")
     @ApiParam(value = "作业任务编号", example = "1")
     @JsonSerialize(using = ToStringSerializer.class)
     public String taskNo;
 
-    @Column(name="TRANS_TYPE_CODE")
+    @Column(name = "TRANS_TYPE_CODE")
     @ApiParam(value = "交易类型编号")
     public String transTypeCode;
 
-    @Column(name="MOVE_NO")
+    @Transient
+    @Column(name = "MOVE_NO")
     @ApiParam(value = "移动单单号")
     public String moveNo;
 
-    @Column(name="AG_ID")
+    @Column(name = "AG_ID")
     @ApiParam(value = "作业流程编号", example = "1")
     @JsonSerialize(using = ToStringSerializer.class)
     public Long agId;
 
     //get单独处理
-    public Long getAgId() {
+    public long getAgIdVal() {
-        if(agId != null) {
+        return agId == null ? 0 : agId.longValue();
-            return agId.longValue();
-        }else{
-            return agId;
-        }
     }
 
     @Column(name = "AL_NAME_RDD")
     @ApiParam(value = "流程名称")
     public String agNameRdd;
 
-    @Column(name="ACTION_USER_NAME")
+    @Column(name = "ACTION_USER_NAME")
     @ApiParam(value = "作业人员")
     public String actionUserName;
 
-    @Column(name="FIX_NO")
+    @Column(name = "FIX_NO")
     @ApiParam(value = "设备编号")
     public String fixNo;
 
-    @Column(name="START_TIME")
+    @Column(name = "START_TIME")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value = "开始作业时间")
     public String startTime;
 
-    @Column(name="END_TIME")
+    @Column(name = "END_TIME")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value = "结束作业时间")
     public String endTime;
 
     @Transient
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiParam(value="开始作业时间查询用，查询起始日期",example = "2018-01-01 01:00:00")
+    @ApiParam(value = "开始作业时间查询用，查询起始日期", example = "2018-01-01 01:00:00")
     public String startTimeStart;
 
     @Transient
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiParam(value="开始作业时间查询用，查询结束日期",example = "2018-12-31 23:59:59")
+    @ApiParam(value = "开始作业时间查询用，查询结束日期", example = "2018-12-31 23:59:59")
     public String startTimeEnd;
 
     @Transient
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiParam(value="结束作业时间查询用，查询起始日期",example = "2018-01-01 01:00:00")
+    @ApiParam(value = "结束作业时间查询用，查询起始日期", example = "2018-01-01 01:00:00")
     public String endTimeStart;
 
     @Transient
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiParam(value="结束作业时间查询用，查询结束日期",example = "2018-12-31 23:59:59")
+    @ApiParam(value = "结束作业时间查询用，查询结束日期", example = "2018-12-31 23:59:59")
     public String endTimeEnd;
 
     // 状态:1=创建,10=处理中,20=已完成
-    @Column(name="ACTION_STATUS")
+    @Column(name = "ACTION_STATUS")
     @ApiParam(value = "作业状态", example = "1")
     public Integer actionStatus;
 
-    @Column(name="TOTAL_STEP")
+    @Column(name = "TOTAL_STEP")
     @ApiParam(value = "总步数", example = "1")
     public Integer totalStep;
 
-    @Column(name="CURRENT_STEP")
+    @Column(name = "CURRENT_STEP")
     @ApiParam(value = "当前步骤", example = "1")
     public Integer currentStep;
 
-    @Column(name="INIT_AM_ID")
+    @Column(name = "INIT_AM_ID")
     @ApiParam(value = "初始化组件编号", example = "0")
     public Long initAmId;
 
-    @Column(name="DETAILS_AM_ID")
+    @Column(name = "DETAILS_AM_ID")
     @ApiParam(value = "明细处理组件编号", example = "0")
     public Long detailsAmId;
 
-    @Column(name="END_AM_ID")
+    @Column(name = "END_AM_ID")
     @ApiParam(value = "结束组件编号", example = "0")
     public Long endAmId;
 

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

@@ -36,9 +36,9 @@ public class WmsActionLogDetails extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     public Long alId;
 
-    @Column(name = "AL_NAME_RDD")
+    @Column(name = "AG_ID")
-    @ApiParam(value = "流程名称")
+    @ApiParam(value = "流程ID")
-    public String agNameRdd;
+    public Long agId;
 
     @Column(name = "SEQ")
     @ApiParam(value = "序号", example = "1")
@@ -113,6 +113,9 @@ public class WmsActionLogDetails extends BaseBean {
     @ApiParam(value = "作业流程明细ID", example = "1")
     public Long agdId;
 
+    @Column(name="MOVE_NO")
+    @ApiParam(value = "移动单单号")
+    public String moveNo;
     public Long getAsId() {
         if (asId != null) {
             return asId.longValue();

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

@@ -2272,7 +2272,7 @@ public class WmsHqlPack {
     public static DdlPackBean packHqlWmsActionLogByActionLog(WmsActionLog actionLog) {
         DdlPackBean packBean = new DdlPackBean();
         DdlPreparedPack.timeBuilder(actionLog.getCreateDatetime(), "createDatetime", packBean, false, false);
-        DdlPreparedPack.getStringEqualPack(actionLog.getMoveNo(), "moveNo", packBean);
+//        DdlPreparedPack.getStringEqualPack(actionLog.getMoveNo(), "moveNo", packBean);
         DdlPreparedPack.getStringEqualPack(actionLog.getTransTypeCode(), "transTypeCode", packBean);
         DdlPreparedPack.getStringEqualPack(actionLog.getFixNo(), "fixNo", packBean);
         DdlPreparedPack.getNumEqualPack(actionLog.getAgId(), "agId", packBean);