Merge branch 'dev' of huasheng.qian/i3plus-pojo into dev

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlArea.java

@@ -14,7 +14,10 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author Wynne.Lu
@@ -42,4 +45,16 @@ public class PtlArea extends BaseBean implements Serializable {
     @ApiParam("区域名称")
     private String areaName;
 
+    @Transient
+    @ApiParam("区段集合")
+    private List<PtlSection> ptlSectionList=new ArrayList<>();
+
+    @Transient
+    @ApiParam("区域名称")
+    private String name;
+
+
+    public String getName() {
+        return areaName;
+    }
 }

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java

@@ -88,4 +88,8 @@ public class PtlAreaSectionTask extends BaseBean implements Serializable {
     @Column(name = "SEQ")
     @ApiParam("区段任务顺序号")
     private Integer seq;
+
+    @Column(name = "qty")
+    @ApiParam("数量")
+    private Integer qty;
 }

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTaskDetail.java

@@ -28,7 +28,7 @@ import java.io.Serializable;
 @EqualsAndHashCode(callSuper = true)
 @Api("区段亮灯任务明细")
 public class PtlAreaSectionTaskDetail extends BaseBean implements Serializable {
-    private static final long serialVersionUID = -7563481752643393714L;
+    private static final long serialVersionUID = -7563431552643393714L;
 
     @Column(name = "SECTION_TASK_NO")
     @ApiParam("区段任务编号")

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java

@@ -88,4 +88,8 @@ public class PtlAreaTask extends BaseBean implements Serializable {
     @Column(name = "STATUS")
     @ApiParam("任务状态")
     private Integer status;
+
+    @Column(name = "qty")
+    @ApiParam("数量")
+    private Integer qty;
 }

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSection.java

@@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**
@@ -52,4 +53,11 @@ public class PtlSection extends BaseBean implements Serializable {
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String areaNo;
 
+    @Transient
+    @ApiParam("区域名称")
+    private String name;
+
+    public String getName() {
+        return sectionName;
+    }
 }

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java

@@ -218,4 +218,91 @@ public class PtlHqlPack {
         }
         return packBean;
     }
+
+    /**
+     * 区域任务主表
+     *
+     * @param ptlAreaTask 区域任务主表
+     * @return
+     */
+    public static DdlPackBean packPtlAreaTask(PtlAreaTask ptlAreaTask) {
+        DdlPackBean result = new DdlPackBean();
+        //查询参数封装
+        DdlPreparedPack.getStringEqualPack(ptlAreaTask.getTaskNo(), "taskNo", result);
+        DdlPreparedPack.getStringEqualPack(ptlAreaTask.getPartNo(), "partNo", result);
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(ptlAreaTask.getCreateDateTimeStart())
+                && org.apache.commons.lang3.StringUtils.isNotBlank(ptlAreaTask.getCreateDateTimeEnd())) {
+            DdlPreparedPack.timeBuilder(ptlAreaTask.getCreateDateTimeStart(), ptlAreaTask.getCreateDateTimeEnd()
+                    , "createDatetime", result, true);
+        }
+        DdlPreparedPack.getNumEqualPack(ptlAreaTask.getStatus(), "status", result);
+        DdlPreparedPack.getStringEqualPack(ptlAreaTask.getTaskType(), "taskType", result);
+        DdlPreparedPack.getStringEqualPack(ptlAreaTask.getOrganizeCode(), "organizeCode", result);
+        DdlPreparedPack.getNumEqualPack(ptlAreaTask.getIsValid(), "isValid", result);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", result);
+        return result;
+    }
+
+    /**
+     * 主任务表
+     *
+     * @param ptlMainTask 主任务表
+     * @return
+     */
+    public static DdlPackBean packPtlMainTask(PtlMainTask ptlMainTask) {
+        DdlPackBean result = new DdlPackBean();
+        //查询参数封装
+        DdlPreparedPack.getStringEqualPack(ptlMainTask.getTaskNo(), "taskNo", result);
+        DdlPreparedPack.getStringEqualPack(ptlMainTask.getPartNo(), "partNo", result);
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(ptlMainTask.getCreateDateTimeStart())
+                && org.apache.commons.lang3.StringUtils.isNotBlank(ptlMainTask.getCreateDateTimeEnd())) {
+            DdlPreparedPack.timeBuilder(ptlMainTask.getCreateDateTimeStart(), ptlMainTask.getCreateDateTimeEnd()
+                    , "createDatetime", result, true);
+        }
+        DdlPreparedPack.getNumEqualPack(ptlMainTask.getStatus(), "status", result);
+        DdlPreparedPack.getStringEqualPack(ptlMainTask.getTaskType(), "taskType", result);
+        DdlPreparedPack.getStringEqualPack(ptlMainTask.getOrganizeCode(), "organizeCode", result);
+        DdlPreparedPack.getNumEqualPack(ptlMainTask.getIsValid(), "isValid", result);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", result);
+        return result;
+    }
+    /**
+     * 区段
+     *
+     * @param ptlAreaSectionTask 区段任务
+     * @return
+     */
+    public static DdlPackBean packPtlAreaSectionTask(PtlAreaSectionTask ptlAreaSectionTask) {
+        DdlPackBean result = new DdlPackBean();
+        //查询参数封装
+        DdlPreparedPack.getStringEqualPack(ptlAreaSectionTask.getAreaTaskNo(), "areaTaskNo", result);
+        DdlPreparedPack.getStringEqualPack(ptlAreaSectionTask.getPartNo(), "partNo", result);
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(ptlAreaSectionTask.getCreateDateTimeStart())
+                && org.apache.commons.lang3.StringUtils.isNotBlank(ptlAreaSectionTask.getCreateDateTimeEnd())) {
+            DdlPreparedPack.timeBuilder(ptlAreaSectionTask.getCreateDateTimeStart(), ptlAreaSectionTask.getCreateDateTimeEnd()
+                    , "createDatetime", result, true);
+        }
+        DdlPreparedPack.getStringEqualPack(ptlAreaSectionTask.getAreaNo(), "areaNo", result);
+        DdlPreparedPack.getStringEqualPack(ptlAreaSectionTask.getSectionNo(), "sectionNo", result);
+        DdlPreparedPack.getStringEqualPack(ptlAreaSectionTask.getOrganizeCode(), "organizeCode", result);
+        DdlPreparedPack.getNumEqualPack(ptlAreaSectionTask.getIsValid(), "isValid", result);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", result);
+        return result;
+    }
+
+    /**
+     * 区段任务明细
+     *
+     * @param ptlAreaSectionTaskDetail 区段任务明细
+     * @return
+     */
+    public static DdlPackBean packPtlAreaSectionTaskDetail(PtlAreaSectionTaskDetail ptlAreaSectionTaskDetail) {
+        DdlPackBean result = new DdlPackBean();
+        //查询参数封装
+        DdlPreparedPack.getStringEqualPack(ptlAreaSectionTaskDetail.getSectionTaskNo(), "sectionTaskNo", result);
+        DdlPreparedPack.getStringEqualPack(ptlAreaSectionTaskDetail.getOrganizeCode(), "organizeCode", result);
+        DdlPreparedPack.getNumEqualPack(ptlAreaSectionTaskDetail.getIsValid(), "isValid", result);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", result);
+        return result;
+    }
 }