I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mes生产计划开发

Browse Source
yun-zuoyi
crish 6 years ago
parent 97e992f05f
commit e5e0c05b9f
6 changed files with 210 additions and 5 deletions
Show Stats Download Patch File Download Diff File

10
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
Unescape Escape View File

@ -51,7 +51,7 @@ public class MesEnumUtil {
* MesPlanOrder实体对应的status值 计划状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PALN_ORDER_STATUS{
public enum PLAN_ORDER_STATUS{
CREATE(10,"创建"),
DE_COMPOSE_ING(20,"分解中"),
@ -61,7 +61,7 @@ public class MesEnumUtil {
private int value;
private String description;
PALN_ORDER_STATUS(int value, String description) {
PLAN_ORDER_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
@ -166,14 +166,14 @@ public class MesEnumUtil {
* MesPlanOrder实体对应的planType值 计划类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PALN_ORDER_TYPE{
public enum PLAN_ORDER_TYPE{
ATTEMPT_ORDER(10,"标准");
STANDARD_ORDER(10,"标准");
private int value;
private String description;
PALN_ORDER_TYPE(int value, String description) {
PLAN_ORDER_TYPE(int value, String description) {
this.value = value;
this.description = description;
}

54
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java
Unescape Escape View File

@ -0,0 +1,54 @@
package cn.estsh.i3plus.pojo.mes.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 : crish
* @CreateDate : 2019-04-22
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_CUSTOMER")
@Api("客户产线代码")
public class MesCustomer extends BaseBean {
@Column(name="CUSTOMER_CODE")
@ApiParam("客户代码")
private String CUSTOMER_CODE;
@Column(name="CUSTOMER_NAME")
@ApiParam("客户名称")
private String CUSTOMER_NAME;
@Column(name="BRIEF_TEXT")
@ApiParam("客户简称")
private String BRIEF_TEXT;
@Column(name="ADDRESS")
@ApiParam("客户地址")
private String ADDRESS;
@Column(name="CONTACT")
@ApiParam("客户联系人")
private String CONTACT;
@Column(name="TELEPHONE")
@ApiParam("客户电话")
private String TELEPHONE;
}

44
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java
Unescape Escape View File

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -11,6 +13,9 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.Arrays;
import java.util.List;
/**
* @Description:
@ -43,6 +48,10 @@ public class MesPlanOrder extends BaseBean {
@ApiParam("物料号")
private String partNo;
@Column(name="PART_NAME_RDD")
@ApiParam("物料名称")
private String partNameRdd;
@Column(name="PLAN_QTY")
@ApiParam("计划数量")
private Double planQty;
@ -83,6 +92,41 @@ public class MesPlanOrder extends BaseBean {
@ApiParam("备注")
private String memo;
/********************** 冗余字段 *********************************/
@Transient
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="创建日期查询用，查询结束日期",example = "2018-12-31 23:59:59")
public String startTimeStart;
@Transient
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@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-12-31 23:59:59")
public String endTimeStart;
@Transient
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="计划结束日期查询用，查询结束日期",example = "2018-12-31 23:59:59")
public String endTimeEnd;
public List<MesEnumUtil.PLAN_ORDER_TYPE> planTypeEnum;
public List<MesEnumUtil.PLAN_ORDER_STATUS> planOrderStatusEnum;
public List<MesEnumUtil.PLAN_ORDER_TYPE> getPlanTypeEnum() {
return Arrays.asList(MesEnumUtil.PLAN_ORDER_TYPE.values());
}
public List<MesEnumUtil.PLAN_ORDER_STATUS> getPlanOrderStatusEnum() {
return Arrays.asList(MesEnumUtil.PLAN_ORDER_STATUS.values());
}
public double getPlanQtyVal() {
return this.planQty == null ? 0.0d : this.planQty;
}

14
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlanOrderModel.java
Unescape Escape View File

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.mes.model;
import cn.estsh.i3plus.pojo.mes.bean.MesPart;
import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder;
/**
* @Description:
* @Reference:
* @Author: Crish
* @CreateDate:2019-04-18-14:16
* @Modify:
**/
public class MesPlanOrderModel extends MesWorkOrder {
}

17
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustomerRepository.java
Unescape Escape View File

@ -0,0 +1,17 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesCustomer;
import org.springframework.stereotype.Repository;
/**
* @Description:
* @Reference:
* @Author: Crish
* @CreateDate:2019-04-22-16:12
* @Modify:
**/
@Repository
public interface MesCustomerRepository extends BaseRepository<MesCustomer, Long> {
}

76
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
Unescape Escape View File

@ -0,0 +1,76 @@
package cn.estsh.i3plus.pojo.mes.sqlpack;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.mes.bean.MesPlanOrder;
import org.apache.commons.lang3.StringUtils;
/**
* @Description:
* @Reference: Mes 条件封装
* @Author: Crish
* @CreateDate:2019-04-22-14:58
* @Modify:
**/
public class MesHqlPack {
/**
* 通用查询条件
* @param organizeCode
* @return
*/
public static DdlPackBean getAllBaseData(String organizeCode) {
DdlPackBean packBean = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean);
return packBean;
}
/**
* 生产计划查询条件封装
* @param mesPlanOrder
* @return
*/
public static DdlPackBean getPlanOrderCondition(MesPlanOrder mesPlanOrder) {
DdlPackBean packBean = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(mesPlanOrder.getCustCode(), "organizeCode", packBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean);
if (StringUtils.isNotEmpty(mesPlanOrder.getOrderNo())) {
DdlPreparedPack.getStringEqualPack(mesPlanOrder.getOrderNo(), "orderNo", packBean);
}
if (StringUtils.isNotEmpty(mesPlanOrder.getPartNo())) {
DdlPreparedPack.getStringEqualPack(mesPlanOrder.getPartNo(), "partNo", packBean);
}
if (StringUtils.isNotEmpty(mesPlanOrder.getPlanType() + "")) {
DdlPreparedPack.getNumEqualPack(mesPlanOrder.getPlanType(), "planType", packBean);
}
if (StringUtils.isNotEmpty(mesPlanOrder.getStatusVal() + "")) {
DdlPreparedPack.getNumEqualPack(mesPlanOrder.getStatusVal(), "status", packBean);
}
if (StringUtils.isNotEmpty(mesPlanOrder.getStatusVal() + "")) {
DdlPreparedPack.getStringEqualPack(mesPlanOrder.getCreateUser(), "createUser", packBean);
}
DdlPreparedPack.timeBuilder(
mesPlanOrder.getStartTimeStart(),
mesPlanOrder.getStartTimeEnd(),
"startTime", packBean, true);
DdlPreparedPack.timeBuilder(
mesPlanOrder.getEndTimeStart(),
mesPlanOrder.getEndTimeEnd(),
"endTime", packBean, true);
DdlPreparedPack.timeBuilder(
mesPlanOrder.getCreateDateTimeStart(),
mesPlanOrder.getCreateDateTimeEnd(),
"createDateTime", packBean, true);
return packBean;
}
}
Write Preview
Loading…
Cancel
Save