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

Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

Browse Source
yun-zuoyi
yihang.lv 6 years ago
parent 6ea6b3d54b 8227353cbd
commit 8f90949525
12 changed files with 364 additions and 9 deletions
Show Stats Download Patch File Download Diff File

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

@ -457,4 +457,41 @@ public class MesEnumUtil {
return tmp;
}
}
/**
* MesPartCategory实体对应的categoryType值 条码表条码质量状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PART_CATEGORY_TYPE{
CATEGORY_ONE("Category1","类型1"),
CATEGORY_TWO("Category2","类型2"),
CATEGORY_THREE("Category3","类型3");
private String value;
private String description;
PART_CATEGORY_TYPE(String value, String description) {
this.value = value;
this.description = description;
}
public String getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (val.equals(values()[i].value) ) {
tmp = values()[i].description;
}
}
return tmp;
}
}
}

10
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStep.java
Unescape Escape View File

@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description :工步
@ -46,4 +47,13 @@ public class MesStep extends BaseBean {
@Column(name = "STEP_OBJECT")
@ApiParam("工步对象")
private String stepObject;
@Transient
@ApiParam("工步执行完毕")
private boolean isComplete;
@Transient
@ApiParam("工步是否跳过")
private boolean isJump;
}

6
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationRequestBean.java
Unescape Escape View File

@ -16,12 +16,18 @@ import java.io.Serializable;
@Data
public class StationRequestBean implements Serializable {
@ApiParam("扫描信息")
private String scanInfo;
@ApiParam("产品条码")
private String serialNumber;
@ApiParam("物料号")
private String partNo;
@ApiParam("组织代码")
private String organizeCode;
@ApiParam("工作中心代码")
private String workCenterCode;

37
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java
Unescape Escape View File

@ -0,0 +1,37 @@
package cn.estsh.i3plus.pojo.mes.pcn.model;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesStep;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* @Description : 工位结果bean
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-24
* @Modify:
**/
@Data
public class StationResultBean implements Serializable {
/**
* 根据客户端所需数据结构，约定不同数据类型
*/
@ApiParam("数据类型")
private String flagType;
@ApiParam("是否错误信息")
private boolean fail;
@ApiParam("执行结果信息")
private String message;
@ApiParam("工步展示信息")
private String stepHtml;
@ApiParam("工步清单")
private List<MesStep> stepList;
}

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

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description :物料信息
@ -71,4 +72,8 @@ public class MesPart extends BaseBean {
@Column(name="PRODUCE_CATEGORY")
@ApiParam("产品类型")
private String produceCategory;
@Transient
@ApiParam("分类名称")
private String categoryName;
}

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

@ -34,7 +34,7 @@ public class MesProdCfg extends BaseBean {
@Column(name="PROD_CFG_NAME")
@ApiParam("产品配置名称")
private String prodCfgTypeName;
private String prodCfgName;
@Column(name="PROD_CFG_Type_CODE")
@ApiParam("产品配置类型代码")

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

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description :产品配置明细
@ -40,6 +41,10 @@ public class MesProdCfgDetail extends BaseBean {
@ApiParam("是否虚零件")
private Integer isVirtual;
@Transient
@ApiParam("零件名称")
private String partName;
public int getIsVirtualVal() {
return this.isVirtual == null ? 0 : this.isVirtual;
}

76
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.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:
@ -35,6 +40,10 @@ public class MesWorkOrder extends BaseBean {
@ApiParam("物料号")
private String partNo;
@Column(name="PART_NAME_RDD")
@ApiParam("物料名称")
private String partNameRdd;
@Column(name="PROD_CFG_CODE")
@ApiParam("产品配置代码")
private String prodCfgCode;
@ -111,6 +120,73 @@ public class MesWorkOrder extends BaseBean {
@ApiParam("备注")
private String memo;
/********************** 冗余字段 *********************************/
@Transient
@ApiParam(value="工作中心名称")
public String workCenterName;
@Transient
@ApiParam(value="工作单元名称")
public String workCellName;
@Transient
@ApiParam(value="客户产线名称")
public String custProdLineName;
@Transient
@ApiParam(value="班次名称")
public String shiftName;
@Transient
@ApiParam(value="产品配置名称")
public String prodCfgName;
@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;
@Transient
@ApiParam("工单类型枚举")
private List<MesEnumUtil.WORK_ORDER_TYPE> workOrderTypeDropData;
public List<MesEnumUtil.WORK_ORDER_TYPE> getWorkOrderTypeDropData() {
return Arrays.asList(MesEnumUtil.WORK_ORDER_TYPE.values());
}
@Transient
@ApiParam("工单状态枚举")
private List<MesEnumUtil.WORK_ORDER_STATUS> workOrderStatusDropData;
public List<MesEnumUtil.WORK_ORDER_STATUS> getWorkOrderStatusDropData() {
return Arrays.asList(MesEnumUtil.WORK_ORDER_STATUS.values());
}
@Transient
@ApiParam("工单来源枚举")
private List<MesEnumUtil.WORK_ORDER_SOURCE> workOrderSourceDropData;
public List<MesEnumUtil.WORK_ORDER_SOURCE> getWorkOrderSourceDropData() {
return Arrays.asList(MesEnumUtil.WORK_ORDER_SOURCE.values());
}
public double getQtyVal() {
return this.qty == null ? 0.0d : this.qty;
}

66
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistence.java
Unescape Escape View File

@ -0,0 +1,66 @@
package cn.estsh.i3plus.pojo.mes.engine.script;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
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;
import javax.persistence.Transient;
import javax.script.CompiledScript;
/**
* 脚本持久化实体类
*
* @author Rock.Yu
* @since 2019-03-18 14:22
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "SCRIPT_PERSISTENCE")
@Api("系统动态脚本")
public class EngineScriptPersistence extends BaseBean {
// 脚本调用的唯一编号，例如：WMS_PDA_0001
@Column(name = "SCRIPT_NO", length = 50)
private String scriptNo;
// 脚本的中文名称
@Column(name = "SCRIPT_NAME", length = 50)
private String scriptName;
// 10=组件脚本，20=表单脚本，30=报表脚本，40=JOB脚本，50=其他脚本
@Column(name = "SCRIPT_TYPE")
private int scriptType;
// 脚本编写的语言
// 10=Groovy, 20=Jython, 30=JavaScript, 40=Scala, 50=JRuby
@Column(name = "LANGUAGE_TYPE")
private int languageType;
// 脚本的具体内容
@Column(name = "SCRIPT_CONTENT", columnDefinition = "TEXT")
private String scriptContent;
// 脚本的描述，包含脚本的用法，参数说明等
@Column(name = "SCRIPT_REMARK", length = 2000)
private String scriptRemark;
// 编译后的脚本内容，通过预编译加快脚本的运行速度
@Transient
private CompiledScript compiledScript;
public EngineScriptPersistence() {}
// 构造方法，便于批量创建数据
public EngineScriptPersistence(long id, String scriptNo, String scriptName, int scriptType, int languageType,
String scriptContent, String scriptRemark) {
this.id = id;
this.scriptNo = scriptNo;
this.scriptName = scriptName;
this.scriptType = scriptType;
this.languageType = languageType;
this.scriptContent = scriptContent;
this.scriptRemark = scriptRemark;
}
}

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

@ -4,7 +4,9 @@ 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.MesPart;
import cn.estsh.i3plus.pojo.mes.bean.MesPlanOrder;
import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder;
import org.apache.commons.lang3.StringUtils;
/**
@ -34,9 +36,9 @@ public class MesHqlPack {
* @param mesPlanOrder
* @return
*/
public static DdlPackBean getPlanOrderCondition(MesPlanOrder mesPlanOrder) {
public static DdlPackBean getPlanOrderCondition(MesPlanOrder mesPlanOrder, String organizeCode) {
DdlPackBean packBean = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(mesPlanOrder.getCustCode(), "organizeCode", packBean);
DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean);
@ -49,7 +51,6 @@ public class MesHqlPack {
if (StringUtils.isNotEmpty(mesPlanOrder.getPlanType() + "")) {
DdlPreparedPack.getNumEqualPack(mesPlanOrder.getPlanType(), "planType", packBean);
}
if (StringUtils.isNotEmpty(mesPlanOrder.getStatusVal() + "")) {
DdlPreparedPack.getNumEqualPack(mesPlanOrder.getStatusVal(), "status", packBean);
}
@ -57,6 +58,7 @@ public class MesHqlPack {
DdlPreparedPack.getStringEqualPack(mesPlanOrder.getCreateUser(), "createUser", packBean);
}
// 时间段查询
DdlPreparedPack.timeBuilder(
mesPlanOrder.getStartTimeStart(),
mesPlanOrder.getStartTimeEnd(),
@ -69,11 +71,88 @@ public class MesHqlPack {
mesPlanOrder.getCreateDateTimeStart(),
mesPlanOrder.getCreateDateTimeEnd(),
"createDateTime", packBean, true);
// 排序
DdlPreparedPack.getOrderByPack(new Object[]{"2"},new String[]{mesPlanOrder.getOrderByParam()} , packBean);
DdlPreparedPack.getOrderDefault(mesPlanOrder);
DdlPreparedPack.getOrderByPack(new Object[]{"2"},new String[]{mesPlanOrder.getOrderByParam()} , packBean);
return packBean;
}
/**
* 物料信息查询条件封装
* @param mesPart
* @return
*/
public static DdlPackBean getPartCondition(MesPart mesPart, 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);
if (StringUtils.isNotEmpty(mesPart.getPartNo())) {
DdlPreparedPack.getStringLikerPack(mesPart.getPartNo(), "partNo", packBean);
}
if (StringUtils.isNotEmpty(mesPart.getPartName())) {
DdlPreparedPack.getStringLikerPack(mesPart.getPartName(), "partName", packBean);
}
if (StringUtils.isNotEmpty(mesPart.getCategoryCode1())) {
DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode1(), "categoryCode1", packBean);
}
if (StringUtils.isNotEmpty(mesPart.getCategoryCode2())) {
DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode2(), "categoryCode2", packBean);
}
if (StringUtils.isNotEmpty(mesPart.getCategoryCode3())) {
DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode3(), "categoryCode3", packBean);
}
DdlPreparedPack.getOrderDefault(mesPart);
DdlPreparedPack.getOrderByPack(new Object[]{"2"},new String[]{mesPart.getOrderByParam()} , packBean);
return packBean;
}
/**
* 物料信息查询条件封装
* @param mesPart
* @return
*/
public static DdlPackBean getWorkOrderCondition(MesWorkOrder mesWorkOrder, String organizeCode) {
DdlPackBean packBean = getAllBaseData(organizeCode);
if (StringUtils.isNotEmpty(mesWorkOrder.getOrderNo())) {
DdlPreparedPack.getStringLikerPack(mesWorkOrder.getOrderNo(), "orderNo", packBean);
}
if (StringUtils.isNotEmpty(mesWorkOrder.getPartNo())) {
DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean);
}
if (StringUtils.isNotEmpty(mesWorkOrder.getWorkOrderStatus() + "")) {
DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderStatus(), "workOrderStatus", packBean);
}
if (StringUtils.isNotEmpty(mesWorkOrder.getWorkCenterCode())) {
DdlPreparedPack.getStringEqualPack(mesWorkOrder.getWorkCenterCode(), "workCenterCode", packBean);
}
if (StringUtils.isNotEmpty(mesWorkOrder.getWorkCellCode())) {
DdlPreparedPack.getStringEqualPack(mesWorkOrder.getWorkCellCode(), "workCellCode", packBean);
}
if (StringUtils.isNotEmpty(mesWorkOrder.getWorkOrderType() + "")) {
DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderType(), "workOrderType", packBean);
}
if (StringUtils.isNotEmpty(mesWorkOrder.getProdCfgCode())) {
DdlPreparedPack.getStringEqualPack(mesWorkOrder.getProdCfgCode(), "prodCfgCode", packBean);
}
if (StringUtils.isNotEmpty(mesWorkOrder.getPlanOrderNo())) {
DdlPreparedPack.getStringEqualPack(mesWorkOrder.getPlanOrderNo(), "planOrderNo", packBean);
}
// 时间段查询
DdlPreparedPack.timeBuilder(
mesWorkOrder.getStartTimeStart(),
mesWorkOrder.getStartTimeEnd(),
"startTime", packBean, true);
DdlPreparedPack.timeBuilder(
mesWorkOrder.getEndTimeStart(),
mesWorkOrder.getEndTimeEnd(),
"endTime", packBean, true);
DdlPreparedPack.getOrderDefault(mesWorkOrder);
DdlPreparedPack.getOrderByPack(new Object[]{"2"},new String[]{mesWorkOrder.getOrderByParam()} , packBean);
return packBean;
}
}

34
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java
Unescape Escape View File

@ -0,0 +1,34 @@
package cn.estsh.i3plus.pojo.model.wms;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
/**
* @Description : 任务单模型
* @Reference :
* @Author : siliter.yuan
* @CreateDate : 2019-03-06 15:50
* @Modify:
**/
@Data
public class WmsTaskInfoModel implements Serializable {
@ApiParam("任务单号")
public String orderNo;
@ApiParam("关联单号")
public String refSrc;
/**
* 状态:1=创建,10=待处理,20=已处理
*/
@ApiParam(value = "任务状态", example = "1")
public Integer taskStatus;
@ApiParam("作业类型名称")
public String opTypeName;
@ApiParam(value = "关联单据类型")
private String refType;
}

8
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
Unescape Escape View File

@ -1468,7 +1468,7 @@ public class WmsHqlPack {
* @param groupDataAuth
* @return
*/
public static DdlPackBean packHqlWmsTaskDetail(Map<String, List<WmsDataAuth>> groupDataAuth) {
public static DdlPackBean packHqlWmsTaskDetail(Map<String, List<WmsDataAuth>> groupDataAuth, String refSrc) {
DdlPackBean result = new DdlPackBean();
Set<Map.Entry<String, List<WmsDataAuth>>> entries = groupDataAuth.entrySet();
//拼sql
@ -1514,12 +1514,12 @@ public class WmsHqlPack {
* 给定字段动态in sql
*
* @param columnName
* @param values
* @param orderNo
* @return
*/
public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName, List<String> values) {
public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName , String orderNo) {
DdlPackBean packBean = new DdlPackBean();
DdlPreparedPack.getInPackList(values, columnName, packBean);
DdlPreparedPack.getInPack(orderNo, columnName, packBean);
DdlPreparedPack.getStringRightLikerPack(bean.getOrderNo(), "orderNo", packBean);
DdlPreparedPack.getNumNOEqualPack(bean.getTaskStatus(), "taskStatus", packBean);

Write Preview
Loading…
Cancel
Save