生产计划表结构增加

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

@@ -4304,4 +4304,57 @@ public class WmsEnumUtil {
         }
     }
 
+    /**
+     * 生产计划主表状态创建
+     * 默认为 10
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_ORDER_MASTER_STATUS {
+        CREATE(10,"CREATE", "创建"),
+        PLANNED(20,"PLANNED", "已计划"),
+        CLOSE(30,"CLOSE", "已关闭");
+
+        private int value;
+        private String code;
+        private String description;
+
+        WORK_ORDER_MASTER_STATUS(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        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;
+        }
+
+        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-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpDetails.java

@@ -0,0 +1,62 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : MES_生产计划主明细表
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2019-11-09 14:21
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_PP_DETAILS")
+@Api("MES_生产计划明细表")
+public class MesPpDetails extends BaseBean{
+
+    private static final long serialVersionUID = 9214639813072592727L;
+
+    @Column(name="WROKORDER_NO")
+    @ApiParam("工单号")
+    private String woekorderNo;
+
+    @Column(name="ITEM")
+    @ApiParam("行号")
+    private Integer item;
+
+    @Column(name="PART_NO")
+    @ApiParam("零件号")
+    private String partNo;
+
+    @Column(name="PART_NAME_RDD")
+    @ApiParam("零件名称")
+    private String partNameRdd;
+
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
+    @ApiParam(value = "工单数量", example = "0")
+    public Double qty;
+
+    public Integer getItem() {
+        return item == null ? 0 : this.item.intValue();
+    }
+
+    public Double getQty() {
+        return qty == null ? 0D : this.qty.doubleValue();
+    }
+}

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

@@ -0,0 +1,66 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : MES_生产计划主表
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2019-11-09 14:21
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_PP_MASTER")
+@Api("MES_生产计划主表")
+public class MesPpMaster extends BaseBean{
+
+    private static final long serialVersionUID = 9214639813072592726L;
+
+    @Column(name="WROKORDER_NO")
+    @ApiParam("工单号")
+    private String woekorderNo;
+
+    @Column(name="PDLINE_NO")
+    @ApiParam("产线代码")
+    private String pdlineNo;
+
+    @Column(name="PLAN_PRODUCT_TIME")
+    @ApiParam("生产日期")
+    private String planProductTime;
+
+    @Column(name="SHIFT_NO")
+    @ApiParam("班次代码")
+    private String shitNo;
+
+    @Column(name="START_PRODUCT_TIME")
+    @ApiParam("开始生产时间")
+    private String startProductTime;
+
+    @Column(name="END_PRODUCT_TIME")
+    @ApiParam("结束生产时间")
+    private String endProductTime;
+
+    @Column(name="ORDER_STATUS")
+    @ApiParam(value = "单据状态", example = "0")
+    private Integer orderStatus = 0;
+
+    public Integer getOrderStatus() {
+        return orderStatus == null ? 0 : this.orderStatus.intValue();
+    }
+
+
+}

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

@@ -0,0 +1,58 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+* @Description : 生产计划模板
+* @Reference :
+* @author: jessica.chen
+* @date: 2019/12/10 17:10
+* @Modify:
+*/
+
+@Data
+@Api(value="生产计划模板",description = "生产计划模板")
+public class MesPpTemplate extends BaseBean {
+
+    private static final long serialVersionUID = 2167743108452607913L;
+
+    @ApiParam(value = "工单号")
+    @AnnoOutputColumn
+    private String woekorderNo;
+
+    @ApiParam(value = "产线代码")
+    @AnnoOutputColumn
+    private String pdlineNo;
+
+    @ApiParam(value = "生产日期")
+    @AnnoOutputColumn
+    private String planProductTime;
+
+    @ApiParam(value = "班次代码")
+    @AnnoOutputColumn
+    private String shitNo;
+
+    @ApiParam(value = "开始生产时间")
+    @AnnoOutputColumn
+    private String startProductTime;
+
+    @ApiParam(value = "结束生产时间")
+    @AnnoOutputColumn
+    private String endProductTime;
+
+    @ApiParam(value = "零件号")
+    @AnnoOutputColumn
+    private String partNo;
+
+    @ApiParam(value = "零件描述")
+    @AnnoOutputColumn
+    private String partNameRdd;
+
+    @ApiParam(value = "工单数量")
+    @AnnoOutputColumn
+    private Double qty;
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/MesPpDetailsRepository.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.MesPpDetails;
+import cn.estsh.i3plus.pojo.wms.bean.MesPpMaster;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :MES_生产计划明细表
+ * @Reference :
+ * @Author : jessica,chen
+ * @CreateDate : 2019-11-27 14:49
+ * @Modify:
+ **/
+@Repository
+public interface MesPpDetailsRepository extends BaseRepository<MesPpDetails, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/MesPpMasterRepository.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.MesPpMaster;
+import cn.estsh.i3plus.pojo.wms.bean.WmsFile;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :MES_生产计划主表
+ * @Reference :
+ * @Author : jessica,chen
+ * @CreateDate : 2019-11-27 14:49
+ * @Modify:
+ **/
+@Repository
+public interface MesPpMasterRepository extends BaseRepository<MesPpMaster, Long> {
+}

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

@@ -2574,4 +2574,41 @@ public class WmsHqlPack {
         return result;
     }
 
+    /**
+     * 生产计划主表信息分页查询条件
+     *
+     * @param mesPpMaster
+     * @return
+     */
+    public static DdlPackBean packHqlMesPpMaster(MesPpMaster mesPpMaster) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringLikerPack(mesPpMaster.getWoekorderNo(), "woekorderNo", result);
+        DdlPreparedPack.getNumEqualPack(mesPpMaster.getOrderStatus(), "orderStatus", result);
+        DdlPreparedPack.getStringEqualPack(mesPpMaster.getPdlineNo(), "pdlineNo", result);
+        DdlPreparedPack.getStringBiggerPack(mesPpMaster.getStartProductTime(), "startProductTime", result);
+        DdlPreparedPack.getStringSmallerPack(mesPpMaster.getEndProductTime(), "endProductTime", result);
+
+        getStringBuilderPack(mesPpMaster, result);
+
+        return result;
+    }
+
+    /**
+     * 生产计划明细表信息分页查询条件
+     *
+     * @param mesPpDetails
+     * @return
+     */
+    public static DdlPackBean packHqlMesPpDetails(MesPpDetails mesPpDetails) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringLikerPack(mesPpDetails.getPartNo(), "partNo", result);
+        DdlPreparedPack.getStringEqualPack(mesPpDetails.getWoekorderNo(), "woekorderNo", result);
+
+        getStringBuilderPack(mesPpDetails, result);
+
+        return result;
+    }
+
 }