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
1111 6 years ago
parent 7452d49930 7d623560b6
commit f1cfe26378
15 changed files with 235 additions and 118 deletions
Show Stats Download Patch File Download Diff File

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

@ -252,10 +252,10 @@ public class LacEnumUtil {
}
/**
* 指令操作类型
* 指令操作对象类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum COMMAND_OPERATE_TYPE{
public enum OPERATE_OBJ_TYPE{
COMMAND_STACK(10,"指令集"),
COMMAND_STACK_STEP(20,"指令集步骤"),
COMMAND_STACK_STEP_TASK(30,"指令集步骤任务");
@ -263,7 +263,7 @@ public class LacEnumUtil {
private int value;
private String description;
COMMAND_OPERATE_TYPE(int value, String description) {
OPERATE_OBJ_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
@ -288,24 +288,24 @@ public class LacEnumUtil {
}
/**
* 指令操作类型
* 操作指令
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum COMMAND_OPERATE{
RESUME(11,"恢复",COMMAND_OPERATE_TYPE.COMMAND_STACK),
PAUSE(12,"暂停",COMMAND_OPERATE_TYPE.COMMAND_STACK),
CLOSE(13,"关闭",COMMAND_OPERATE_TYPE.COMMAND_STACK),
NEXT_STEP(14,"下一步",COMMAND_OPERATE_TYPE.COMMAND_STACK),
INTERRUPT(21,"中断",COMMAND_OPERATE_TYPE.COMMAND_STACK_STEP_TASK);
public enum OPERATE_COMMAND{
STACK_RESUME(11,"恢复",OPERATE_OBJ_TYPE.COMMAND_STACK),
STACK_PAUSE(12,"暂停",OPERATE_OBJ_TYPE.COMMAND_STACK),
STACK_CLOSE(13,"关闭",OPERATE_OBJ_TYPE.COMMAND_STACK),
STACK_SKIP(14,"跳过",OPERATE_OBJ_TYPE.COMMAND_STACK),
TASK_INTERRUPT(21,"中断",OPERATE_OBJ_TYPE.COMMAND_STACK_STEP_TASK);
private int value;
private String description;
private COMMAND_OPERATE_TYPE commandOperateType;
private OPERATE_OBJ_TYPE operateObjType;
COMMAND_OPERATE(int value, String description,COMMAND_OPERATE_TYPE commandOperateType) {
OPERATE_COMMAND(int value, String description,OPERATE_OBJ_TYPE operateObjType) {
this.value = value;
this.description = description;
this.commandOperateType = commandOperateType;
this.operateObjType = operateObjType;
}
public int getValue() {
@ -325,6 +325,20 @@ public class LacEnumUtil {
}
return tmp;
}
public static OPERATE_COMMAND valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
return values()[i];
}
}
return null;
}
public OPERATE_OBJ_TYPE getOperateObjType() {
return operateObjType;
}
}
}

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

@ -14,6 +14,41 @@ public class MesEnumUtil {
/**
* MES_TYPE_CFG 类型信息
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_TYPE_CFG {
DEFECT("DEFECT", "缺陷"),
DEFECT_CAUSE("DEFECT_CAUSE", "缺陷原因"),
REPAIR("REPAIR", "处理措施");
private String value;
private String description;
MES_TYPE_CFG(String value, String description) {
this.value = value;
this.description = description;
}
public String getValue() { return value;}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(val)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* RAW_PART_STATUS 原材料状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)

23
modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandOperate.java
Unescape Escape View File

@ -1,5 +1,7 @@
package cn.estsh.i3plus.pojo.lac.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.enumutil.LacEnumUtil;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -16,15 +18,22 @@ import lombok.Data;
public class LacCommandOperate {
@ApiParam(value ="指令集记录id" , example = "-1")
private Long commandStackRecordId;
private Long operateObjId;
@ApiParam(value ="步骤任务id" , example = "-1")
private Long commandStackStepTaskIdId;
@ApiParam(value ="操作类型" , example = "-1")
private Integer operateType;
@ApiParam(value ="操作对象类型" , example = "-1")
@AnnoOutputColumn(refClass = LacEnumUtil.OPERATE_OBJ_TYPE.class)
private Integer operateObjType;
@ApiParam(value ="操作" , example = "-1")
private Integer operate;
@AnnoOutputColumn(refClass = LacEnumUtil.OPERATE_COMMAND.class)
private Integer operateCommand;
public LacCommandOperate(){}
public LacCommandOperate(Long operateObjId,LacEnumUtil.OPERATE_COMMAND operateCommand){
this.operateObjId = operateObjId;
this.operateCommand = operateCommand.getValue();
this.operateObjType = operateCommand.getOperateObjType().getValue();
}
}

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

@ -116,7 +116,7 @@ public class LacCommandStackStepTask extends BaseBean {
private LacLogTask logTask;
public Long getTaskInstanceId(){
if(lacSuitTask == null){
if(logTask != null){
return logTask.getId();
}
return null;

28
modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java
Unescape Escape View File

@ -29,6 +29,34 @@ public class LacHqlPack {
private LacHqlPack() {
}
/**
* In 参数封装
* @param columnName
* @return
*/
public static DdlPackBean packHqlInArray(String columnName, Object[] params){
DdlPackBean ddlPackBean =DdlPackBean.getDdlPackBean();
// 参数数组 [1,2,3] -> "1,2,3"
DdlPreparedPack.getInPackArray(params,columnName,ddlPackBean);
return ddlPackBean;
}
/**
* In 参数封装
* @param columnName
* @return
*/
public static DdlPackBean packHqlInList(String columnName, List params){
DdlPackBean ddlPackBean =DdlPackBean.getDdlPackBean();
// 参数数组 [1,2,3] -> "1,2,3"
DdlPreparedPack.getInPackList(params,columnName,ddlPackBean);
return ddlPackBean;
}
public static DdlPackBean packHqlLacTaskType(LacTaskType bean) {
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();

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

@ -132,6 +132,14 @@ public class MesProduceSn extends BaseBean implements Serializable {
@ApiParam("操作类型")
private Integer operateType;
@Transient
@ApiParam("下线时间开始")
private String outWorkCenterTimeStart;
@Transient
@ApiParam("下线时间截止")
private String outWorkCenterTimeEnd;
public double getQtyVal() {
return this.qty == null ? 0.0d : this.qty;
}
@ -178,9 +186,12 @@ public class MesProduceSn extends BaseBean implements Serializable {
", workOrderNo='" + workOrderNo + '\'' +
", custSn='" + custSn + '\'' +
", custPartNo='" + custPartNo + '\'' +
", snType='" + snType + '\'' +
", snType=" + snType +
", tray='" + tray + '\'' +
", resultMsg='" + resultMsg + '\'' +
", operateType=" + operateType +
", outWorkCenterTimeStart='" + outWorkCenterTimeStart + '\'' +
", outWorkCenterTimeEnd='" + outWorkCenterTimeEnd + '\'' +
'}';
}
}

10
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintDataModel.java → modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintDataModel.java
Unescape Escape View File

@ -1,6 +1,6 @@
package cn.estsh.i3plus.pojo.mes.model;
package cn.estsh.i3plus.pojo.mes.pcn.model;
import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplate;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesLabelTemplate;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -8,18 +8,18 @@ import lombok.Data;
import java.util.List;
/**
* @Description: 打印信息封装模板
* @Description: 打印信息封装
* @Reference:
* @Author: wangjie
* @CreateDate:2019-08-27-13:24
* @Modify:
**/
@Data
@Api("打印信息封装模板")
@Api("打印信息封装")
public class SnPrintDataModel {
@ApiParam("打印数据")
private List<SnPrintValueModel> snPrintValueModel;
private List<SnPrintValueModel> valueList;
@ApiParam("打印模板及参数")
private MesLabelTemplate labelTemplate;

12
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintModel.java → modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintModel.java
Unescape Escape View File

@ -1,27 +1,27 @@
package cn.estsh.i3plus.pojo.mes.model;
package cn.estsh.i3plus.pojo.mes.pcn.model;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* @Description: 条码补打印
* @Description: 打印信息汇总
* @Reference:
* @Author: wangjie
* @CreateDate:2019-08-27-13:24
* @Modify:
**/
@Data
@Api("打印信息模板")
@Api("打印信息汇总")
public class SnPrintModel extends SnPrintValueModel {
@ApiParam("过程条码")
private SnPrintDataModel snPrintModel;
private SnPrintDataModel serialPrintDataModel;
@ApiParam("产品条码")
private SnPrintDataModel prodPrintModel;
private SnPrintDataModel prodPrintDataModel;
@ApiParam("包装条码")
private SnPrintDataModel packagePrintModel;
private SnPrintDataModel packPrintDataModel;
}

8
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintValueModel.java → modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintValueModel.java
Unescape Escape View File

@ -1,19 +1,19 @@
package cn.estsh.i3plus.pojo.mes.model;
package cn.estsh.i3plus.pojo.mes.pcn.model;
import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceSn;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* @Description: 条码补打印
* @Description: 打印信息
* @Reference:
* @Author: wangjie
* @CreateDate:2019-08-27-13:24
* @Modify:
**/
@Data
@Api("打印信息模板")
@Api("打印信息")
public class SnPrintValueModel extends MesProduceSn {
@ApiParam("打印描述")
private String printDesc;

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

@ -280,4 +280,74 @@ public class MesHqlPack {
return packBean;
}
/**
* 按条件分页查询产品条码补打印数据
* @param mesProduceSn
* @return
*/
public static DdlPackBean getProdSnPrint(MesProduceSn mesProduceSn) {
DdlPackBean packBean = getAllBaseData(mesProduceSn.getOrganizeCode());
if (!org.springframework.util.StringUtils.isEmpty(mesProduceSn.getSerialNumber())) {
DdlPreparedPack.getStringLikerPack(mesProduceSn.getSerialNumber(), "serialNumber", packBean);
}
if (!org.springframework.util.StringUtils.isEmpty(mesProduceSn.getProductSn())) {
DdlPreparedPack.getStringLikerPack(mesProduceSn.getProductSn(), "productSn", packBean);
}
if (!org.springframework.util.StringUtils.isEmpty(mesProduceSn.getPartNo())) {
DdlPreparedPack.getStringLikerPack(mesProduceSn.getPartNo(), "partNo", packBean);
}
if (!org.springframework.util.StringUtils.isEmpty(mesProduceSn.getSnStatus())) {
DdlPreparedPack.getNumEqualPack(mesProduceSn.getSnStatus(), "snStatus", packBean);
}
// 时间段查询
DdlPreparedPack.timeBuilder(
mesProduceSn.getCreateDateTimeStart(),
mesProduceSn.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
DdlPreparedPack.timeBuilder(
mesProduceSn.getOutWorkCenterTimeStart(),
mesProduceSn.getOutWorkCenterTimeEnd(),
"outWorkCenterTime", packBean, true);
return packBean;
}
/**
* 按条件分页查询包装条码补打印数据
* @param mesPackage
* @return
*/
public static DdlPackBean getPackageSnPrint(MesPackage mesPackage) {
DdlPackBean packBean = getAllBaseData(mesPackage.getOrganizeCode());
if (!org.springframework.util.StringUtils.isEmpty(mesPackage.getPartNo())) {
DdlPreparedPack.getStringLikerPack(mesPackage.getPartNo(), "partNo", packBean);
}
if (!org.springframework.util.StringUtils.isEmpty(mesPackage.getPackLevel())) {
DdlPreparedPack.getNumEqualPack(mesPackage.getPackLevel(), "packLevel", packBean);
}
if (!org.springframework.util.StringUtils.isEmpty(mesPackage.getPackageNo())) {
DdlPreparedPack.getStringLikerPack(mesPackage.getPackageNo(), "packageNo", packBean);
}
if (!org.springframework.util.StringUtils.isEmpty(mesPackage.getWorkCenterCode())) {
DdlPreparedPack.getStringLikerPack(mesPackage.getWorkCenterCode(), "workCenterCode", packBean);
}
// 时间段查询
DdlPreparedPack.timeBuilder(
mesPackage.getCreateDateTimeStart(),
mesPackage.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
return packBean;
}
}

13
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartObject.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:
@ -39,4 +40,16 @@ public class MesPartObject extends BaseBean {
@Column(name = "OBJECT_NAME")
@ApiParam("物料名称")
private String objectName;
@Transient
@ApiParam("产品条码")
private String productSn;
@Transient
@ApiParam("产品条码")
private String serialNumber;
@Transient
@ApiParam("字段总数")
private Integer fieldNum;
}

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

@ -129,15 +129,6 @@ public class MesProduceSn extends BaseBean {
@ApiParam("返回信息")
private String resultMsg;
@Transient
@ApiParam("下线时间开始")
private String outWorkCenterTimeStart;
@Transient
@ApiParam("下线时间截止")
private String outWorkCenterTimeEnd;
public double getQtyVal() {
return this.qty == null ? 0.0d : this.qty;
}
@ -184,11 +175,10 @@ public class MesProduceSn extends BaseBean {
", workOrderNo='" + workOrderNo + '\'' +
", custSn='" + custSn + '\'' +
", custPartNo='" + custPartNo + '\'' +
", snType='" + snType + '\'' +
", snType=" + snType +
", tray='" + tray + '\'' +
", operateType=" + operateType +
", resultMsg='" + resultMsg + '\'' +
", outWorkCenterTimeStart='" + outWorkCenterTimeStart + '\'' +
", outWorkCenterTimeEnd='" + outWorkCenterTimeEnd + '\'' +
'}';
}
}

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

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesPartObject;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\11\21 17:06
* @Modify:
**/
public interface MesPartObjectRepository extends BaseRepository<MesPartObject, Long> {
}

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

@ -1923,73 +1923,4 @@ public class MesHqlPack {
return packBean;
}
/**
* 按条件分页查询产品条码补打印数据
* @param mesProduceSn
* @return
*/
public static DdlPackBean getProdSnPrint(MesProduceSn mesProduceSn) {
DdlPackBean packBean = getMesAllData(mesProduceSn.getOrganizeCode());
if (!StringUtils.isEmpty(mesProduceSn.getSerialNumber())) {
DdlPreparedPack.getStringLikerPack(mesProduceSn.getSerialNumber(), "serialNumber", packBean);
}
if (!StringUtils.isEmpty(mesProduceSn.getProductSn())) {
DdlPreparedPack.getStringLikerPack(mesProduceSn.getProductSn(), "productSn", packBean);
}
if (!StringUtils.isEmpty(mesProduceSn.getPartNo())) {
DdlPreparedPack.getStringLikerPack(mesProduceSn.getPartNo(), "partNo", packBean);
}
if (!StringUtils.isEmpty(mesProduceSn.getSnStatus())) {
DdlPreparedPack.getNumEqualPack(mesProduceSn.getSnStatus(), "snStatus", packBean);
}
// 时间段查询
DdlPreparedPack.timeBuilder(
mesProduceSn.getCreateDateTimeStart(),
mesProduceSn.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
DdlPreparedPack.timeBuilder(
mesProduceSn.getOutWorkCenterTimeStart(),
mesProduceSn.getOutWorkCenterTimeEnd(),
"outWorkCenterTime", packBean, true);
return packBean;
}
/**
* 按条件分页查询包装条码补打印数据
* @param mesPackage
* @return
*/
public static DdlPackBean getPackageSnPrint(MesPackage mesPackage) {
DdlPackBean packBean = getMesAllData(mesPackage.getOrganizeCode());
if (!StringUtils.isEmpty(mesPackage.getPartNo())) {
DdlPreparedPack.getStringLikerPack(mesPackage.getPartNo(), "partNo", packBean);
}
if (!StringUtils.isEmpty(mesPackage.getPackLevel())) {
DdlPreparedPack.getNumEqualPack(mesPackage.getPackLevel(), "packLevel", packBean);
}
if (!StringUtils.isEmpty(mesPackage.getPackageNo())) {
DdlPreparedPack.getStringLikerPack(mesPackage.getPackageNo(), "packageNo", packBean);
}
if (!StringUtils.isEmpty(mesPackage.getWorkCenterCode())) {
DdlPreparedPack.getStringLikerPack(mesPackage.getWorkCenterCode(), "workCenterCode", packBean);
}
// 时间段查询
DdlPreparedPack.timeBuilder(
mesPackage.getCreateDateTimeStart(),
mesPackage.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
return packBean;
}
}

2
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/Task.java
Unescape Escape View File

@ -17,6 +17,8 @@ public class Task {
private String code;
private String stepCode;
@XStreamCDATA
private Object paramList;
}

Write Preview
Loading…
Cancel
Save